From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index 83fb8c8..5f591d0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -6,10 +6,9 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
import com.doumee.dao.system.model.SystemUser;
@@ -23,9 +22,6 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.util.*;
/**
@@ -68,12 +64,10 @@
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
public Map<String,Object> decodeToken(@RequestParam String token) {
- String token1 =token;
- log.info("銆愬畨闃插钩鍙板崟鐐圭櫥褰晅oken瑙ｆ瀽銆�================="+token1);
+ log.info("銆愬畨闃插钩鍙板崟鐐圭櫥褰晅oken瑙ｆ瀽銆�================="+token);
int success = Constants.ZERO;
Map<String,Object> result = new HashMap<>() ;
try {
- token = URLEncoder.encode(token1);
HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
hkBaseTokenRequest.setToken(token);
result = this.decodeTokenForHk(hkBaseTokenRequest);
@@ -85,7 +79,7 @@
e.printStackTrace();
success = Constants.ONE;
}finally {
- interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽",token1,
+ interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽",token,
success, JSONObject.toJSONString(result),Constants.ZERO);
}
return result;
@@ -106,11 +100,7 @@
result.put("msg","token鏃犳晥!");
return result;
}
- String userName = null;
- try {
- userName = DESUtil.verifyHkToken(URLDecoder.decode(hkBaseTokenRequest.getToken(),"UTF-8"));
- }catch (Exception e){
- }
+ String userName = DESUtil.verifyHkToken( redisToken);;
if(StringUtils.isBlank(userName)){
result.put("code","-1");
result.put("msg","token鍙傛暟涓虹┖");
@@ -246,4 +236,5 @@
public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
return ApiResponse.success(platformService.getPlatformStatusList());
}
+
}
--
Gitblit v1.9.3