From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/factory/WechatFactory.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/WechatFactory.java b/java110-core/src/main/java/com/java110/core/factory/WechatFactory.java
index 8f06cf2..8f175b3 100755
--- a/java110-core/src/main/java/com/java110/core/factory/WechatFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/WechatFactory.java
@@ -7,11 +7,11 @@
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.client.RestTemplate;
-import sun.misc.BASE64Decoder;
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import com.java110.core.log.LoggerFactory;
+import org.springframework.web.client.RestTemplate;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
@@ -68,7 +68,7 @@
* @return
*/
private static String refreshAccessToken(String appId, String appSecure) {
- String getAccessToken = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_ACCESS_TOKEN_URL);
+ String getAccessToken = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_ACCESS_TOKEN_URL);
if(StringUtil.isEmpty(getAccessToken)){
getAccessToken = WechatConstant.GET_ACCESS_TOKEN;
}
@@ -122,13 +122,13 @@
public static String decryptS5(String sSrc, String encodingFormat, String sKey, String ivParameter) {
try {
- BASE64Decoder decoder = new BASE64Decoder();
- byte[] raw = decoder.decodeBuffer(sKey);
+ Base64 base64 = new Base64();
+ byte[] raw = base64.decode(sKey);
SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
- IvParameterSpec iv = new IvParameterSpec(decoder.decodeBuffer(ivParameter));
+ IvParameterSpec iv = new IvParameterSpec(base64.decode(ivParameter));
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
- byte[] myendicod = decoder.decodeBuffer(sSrc);
+ byte[] myendicod = base64.decode(sSrc);
byte[] original = cipher.doFinal(myendicod);
String originalString = new String(original, encodingFormat);
return originalString;
--
Gitblit v1.8.0