diff --git a/pom.xml b/pom.xml index 3b24073..626f414 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -57,55 +57,55 @@ com.tiesheng.springboot-parent springboot-database - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-login - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-web - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-util - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-platform - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-message - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-encrypt - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-annotation - 1.1.6 + zjut-1.1.6 com.tiesheng.springboot-parent springboot-poi - 1.1.6 + zjut-1.1.6 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 2ca8f8a..f3316da 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-ademo - 1.1.6 + zjut-1.1.6 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 2a204c8..c9419fd 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index 63aaaed..ca33888 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 47d8b87..5c8204c 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 23e90bb..7c56649 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index ae62279..0cca366 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 5fd27b4..40e58ca 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index 60f7e72..d133b60 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-poi diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index 51b80bf..47dba9c 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-util 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 0439d66..01cfb3b 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 @@ -23,17 +23,26 @@ public class EncryptConfig { /** * 加解密对象 */ - private final SM4 sm4; + private static SM4 sm4; /** * 加密密钥 */ - private String key = "WmdUzPJXbngVNiaSsQrihg=="; + private String key = "Z1mn6fKe6ubnm5762KR3Cg=="; private Integer saltSize = 8; private boolean body = false; - public EncryptConfig() { - sm4 = SmUtil.sm4(Base64.decode(getKey())); + + /** + * 获取SM4对象 + * + * @return + */ + private SM4 getSm4() { + if (sm4 == null) { + sm4 = SmUtil.sm4(Base64.decode(getKey())); + } + return sm4; } /** @@ -46,7 +55,7 @@ public class EncryptConfig { if (StrUtil.isEmpty(content)) { return ""; } - return sm4.encryptBase64(content); + return getSm4().encryptBase64(content); } @@ -58,7 +67,7 @@ public class EncryptConfig { */ public String decrypt(String base64) { try { - return sm4.decryptStr(base64); + return getSm4().decryptStr(base64); } catch (Exception ignore) { } return base64; @@ -117,7 +126,8 @@ public class EncryptConfig { /////////////////////////////////////////////////////////////////////////// // setter\getter - /////////////////////////////////////////////////////////////////////////// + + /// //////////////////////////////////////////////////////////////////////// public String getKey() { return key; diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index ee42805..d2ca0a8 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.6 + zjut-1.1.6 springboot-web