Ver código fonte

refactor(electric):重构充电工具类并重命名TokenManager

- 将TokenManager重命名为ElectricTokenManager以明确用途
- 更新ChargingUtil中的token管理器引用
- 修改加密方法使用的密钥常量为平台专用密钥
- 在OkHttpUtil中添加Content-Type请求头设置
wzq 4 semanas atrás
pai
commit
32d9a5b8cc

+ 2 - 0
src/main/java/com/zsElectric/boot/common/util/OkHttpUtil.java

@@ -154,6 +154,8 @@ public class OkHttpUtil {
             headers.forEach(requestBuilder::addHeader);
         }
 
+        requestBuilder.addHeader("Content-Type", "application/json");
+
         Request request = requestBuilder.build();
 
         try (Response response = okHttpClient.newCall(request).execute()) {

+ 2 - 2
src/main/java/com/zsElectric/boot/common/util/electric/ChargingUtil.java

@@ -21,7 +21,7 @@ import java.util.Objects;
 public class ChargingUtil {
 
     @Resource
-    private TokenManager tokenManager;
+    private ElectricTokenManager tokenManager;
     @Resource
     private OkHttpUtil okHttpUtil;
 
@@ -43,7 +43,7 @@ public class ChargingUtil {
 
             requestParms
                     .setOperatorID(ConnectivityConstants.OPERATOR_ID)
-                    .setData(AESCryptoUtil.encrypt(queryParms.toString(),ConnectivityConstants.DATA_SECRET,ConnectivityConstants.DATA_SECRET_IV))
+                    .setData(AESCryptoUtil.encrypt(queryParms.toString(),ConnectivityConstants.PLATFORM_DATA_SECRET,ConnectivityConstants.PLATFORM_DATA_SECRET_IV))
                     .setTimeStamp(result.getTimestamp())
                     .setSeq(result.getSequence())
                     .setSig(HmacMD5Util.genSign(requestParms.getOperatorID(),requestParms.getData(),requestParms.getTimeStamp(),requestParms.getSeq(),ConnectivityConstants.SIG_SECRET));

+ 3 - 3
src/main/java/com/zsElectric/boot/common/util/electric/TokenManager.java → src/main/java/com/zsElectric/boot/common/util/electric/ElectricTokenManager.java

@@ -8,16 +8,16 @@ import com.zsElectric.boot.common.util.AESCryptoUtil;
 import com.zsElectric.boot.common.util.HmacMD5Util;
 import com.zsElectric.boot.common.util.OkHttpUtil;
 import com.zsElectric.boot.common.util.SequenceGenUtil;
-import com.zsElectric.boot.core.exception.BusinessException;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class TokenManager {
+public class ElectricTokenManager {
 
     @Resource
     private OkHttpUtil okHttpUtil;