diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java b/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java index df49a63..8bb6b60 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java @@ -3,7 +3,6 @@ package com.tiesheng.demo; import com.tiesheng.core.EnableTieshengWeb; import com.tiesheng.demo.config.DemoWebConfigurer; -import com.tiesheng.encrypt.EnableEncryptConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java b/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java deleted file mode 100644 index 41ed5bf..0000000 --- a/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tiesheng.encrypt; - - -import com.tiesheng.encrypt.config.DecryptRequestBodyAdvice; -import com.tiesheng.encrypt.config.EncryptResponseBodyAdvice; -import org.springframework.context.annotation.Import; - -import java.lang.annotation.*; - -/** - * @author hao - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -@Documented -@Import({ - DecryptRequestBodyAdvice.class, - EncryptResponseBodyAdvice.class, -}) -public @interface EnableEncryptConfig { -} diff --git a/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EncryptAutoConfigurer.java b/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EncryptAutoConfigurer.java new file mode 100644 index 0000000..f552389 --- /dev/null +++ b/springboot-encrypt/src/main/java/com/tiesheng/encrypt/EncryptAutoConfigurer.java @@ -0,0 +1,10 @@ +package com.tiesheng.encrypt; + + +import org.springframework.context.annotation.ComponentScan; + +@ComponentScan({ + "com.tiesheng.encrypt.**.*", +}) +public class EncryptAutoConfigurer { +} diff --git a/springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java b/springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java index bf8ace7..e9f7c49 100644 --- a/springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java +++ b/springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java @@ -37,7 +37,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice { try { Object data = body.getData(); - if (data == null || !body.successful()) { + if (data == null || !body.successful() || !encryptConfig.isBody()) { return body; } diff --git a/springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java b/springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java index 7bf32e4..2853d9b 100644 --- a/springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java +++ b/springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java @@ -30,6 +30,7 @@ public class EncryptConfig { */ private String key = "WmdUzPJXbngVNiaSsQrihg=="; private Integer saltSize = 8; + private boolean body = false; public EncryptConfig() { sm4 = SmUtil.sm4(Base64.decode(getKey())); @@ -133,4 +134,12 @@ public class EncryptConfig { public void setSaltSize(Integer saltSize) { this.saltSize = saltSize; } + + public boolean isBody() { + return body; + } + + public void setBody(boolean body) { + this.body = body; + } } diff --git a/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java b/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java index dc043ab..974d0cb 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java +++ b/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java @@ -2,6 +2,7 @@ package com.tiesheng.core; import com.tiesheng.core.service.TieshengWebConfigurer; import com.tiesheng.database.DatabaseAutoConfigurer; +import com.tiesheng.encrypt.EncryptAutoConfigurer; import com.tiesheng.login.LoginAutoConfigurer; import com.tiesheng.message.MessageAutoConfigurer; import com.tiesheng.util.UtilAutoConfigurer; @@ -20,7 +21,8 @@ import java.lang.annotation.*; MessageAutoConfigurer.class, CoreAutoConfigurer.class, LoginAutoConfigurer.class, - DatabaseAutoConfigurer.class + DatabaseAutoConfigurer.class, + EncryptAutoConfigurer.class }) public @interface EnableTieshengWeb {