From 533b9e241db36404cd3f51e8d2e5bd8cd5ed51a8 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 11 Apr 2022 10:41:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/util/SymmetricCryptoUtil.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java diff --git a/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java new file mode 100644 index 0000000..e578dc4 --- /dev/null +++ b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java @@ -0,0 +1,32 @@ +package com.ccsens.util; + +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.symmetric.SymmetricAlgorithm; +import cn.hutool.crypto.symmetric.SymmetricCrypto; + +/** + * @author 逗 + */ +public class SymmetricCryptoUtil { + + /**生成密钥*/ + public String generateKey(){ + byte[] key = SecureUtil.generateKey(SymmetricAlgorithm.AES.getValue()).getEncoded(); + return Base64.encode(key); + } + + /**加密*/ + public String encrypt(String key, String value){ + SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); + return aes.encryptHex(value); + } + + /**解密*/ + public String decode(String key, String encryptString){ + SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); + //解密为字符串 + return aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8); + } +} From 9fcb357ca282e19861c8330681f2771dfe8bed15 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 11 Apr 2022 11:00:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/util/SymmetricCryptoUtil.java | 18 ++++++++++++++---- .../test/java/com/ccsens/util/OtherTest.java | 10 +++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java index e578dc4..48cb55c 100644 --- a/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java +++ b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java @@ -5,28 +5,38 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; /** * @author 逗 */ +@Slf4j +@Component public class SymmetricCryptoUtil { /**生成密钥*/ - public String generateKey(){ + public static String generateKey(){ byte[] key = SecureUtil.generateKey(SymmetricAlgorithm.AES.getValue()).getEncoded(); return Base64.encode(key); } /**加密*/ - public String encrypt(String key, String value){ + public static String encrypt(String key, String value){ SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); return aes.encryptHex(value); } /**解密*/ - public String decode(String key, String encryptString){ + public static String decode(String key, String encryptString){ SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); //解密为字符串 - return aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8); + String decodeString = null; + try { + decodeString = aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8); + }catch (Exception e){ + log.error("解密失败"); + } + return decodeString; } } diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index 3a9d08f..654d51d 100644 --- a/util/src/test/java/com/ccsens/util/OtherTest.java +++ b/util/src/test/java/com/ccsens/util/OtherTest.java @@ -37,7 +37,15 @@ public class OtherTest { public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,1-9]))\\d{8}$"; - + @Test + public void test19() { + String s = SymmetricCryptoUtil.generateKey(); + String s1 = SymmetricCryptoUtil.encrypt(s, "测试的文字"); + String s2 = SymmetricCryptoUtil.decode(s, "测试的文字"); + System.out.println(s); + System.out.println(s1); + System.out.println(s2); + } @Test public void test18() { // RSA rsa = new RSA(); From 14c0511f3837fded91dc1d2702f8f6b138a78b33 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 11 Apr 2022 11:21:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/util/SymmetricCryptoUtil.java | 10 ++++++++-- util/src/test/java/com/ccsens/util/OtherTest.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java index 48cb55c..33fb162 100644 --- a/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java +++ b/util/src/main/java/com/ccsens/util/SymmetricCryptoUtil.java @@ -2,6 +2,8 @@ package com.ccsens.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; @@ -23,8 +25,12 @@ public class SymmetricCryptoUtil { /**加密*/ public static String encrypt(String key, String value){ - SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); - return aes.encryptHex(value); + String encryptString = null; + if(StrUtil.isNotBlank(key) && StrUtil.isNotBlank(value)){ + SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key)); + encryptString = aes.encryptHex(value); + } + return encryptString; } /**解密*/ diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index 654d51d..05f49dc 100644 --- a/util/src/test/java/com/ccsens/util/OtherTest.java +++ b/util/src/test/java/com/ccsens/util/OtherTest.java @@ -40,12 +40,13 @@ public class OtherTest { @Test public void test19() { String s = SymmetricCryptoUtil.generateKey(); - String s1 = SymmetricCryptoUtil.encrypt(s, "测试的文字"); + String s1 = SymmetricCryptoUtil.encrypt(s, null); String s2 = SymmetricCryptoUtil.decode(s, "测试的文字"); System.out.println(s); System.out.println(s1); System.out.println(s2); } + @Test public void test18() { // RSA rsa = new RSA(); From 883c1986c6dcc25e060ad5bcd67a25458ed3be1c Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Sat, 23 Apr 2022 13:43:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=B8=BA=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/ptos_tall/service/WxUserService.java | 2 +- .../main/java/com/ccsens/ptos_tall/util/PtOsConstant.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java index a2cc783..af581b8 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java @@ -64,7 +64,7 @@ public class WxUserService implements IWxUserService { WxOfficial wxOfficial = wxOfficialDao.getByEquipmentId(equipmentId); if(ObjectUtil.isNotNull(wxOfficial)){ appId = wxOfficial.getAppId(); - secret = wxOfficial.getAppId(); + secret = wxOfficial.getSecret(); } } //如果appId和secret为空，使用默认的信息 diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java index 81d0208..6ba5e11 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java @@ -25,7 +25,10 @@ public class PtOsConstant { public static final String DEFAULT_APP_ID = "wxb3be21dcd7912555"; /**默认公众号secret*/ public static final String DEFAULT_SECRET = "9213776254878a8065f1a29d1f58a02c"; - +// /**默认公众号appId*/ +// public static final String DEFAULT_APP_ID = "wx7af1bf1e14facf82"; +// /**默认公众号secret*/ +// public static final String DEFAULT_SECRET = "a6613fae11b497639c0224b820aaf6d9"; /**图片类型*/ public static final String FILE_TYPE_IMG = "bmp,jpg,jpeg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp"; /**文档类型*/