From c4a61db314610d01caba641ee3243350deca3eec Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 十月 2024 13:35:29 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 b9135cf..83fb8c8 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
@@ -1,12 +1,15 @@
package com.doumee.cloud.openapi;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
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.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;
@@ -14,12 +17,15 @@
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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.*;
/**
@@ -28,11 +34,14 @@
*/
@Api(tags = "鎻愪緵瀹夐槻骞冲彴瀵规帴鎺ュ彛锛堟暟鎹ぇ灞忓熀纭�鏁版嵁绛夛級")
@RestController
+@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/hk/api")
public class HkOpenApiController extends BaseController {
@Autowired
private PlatformService platformService;
+ @Autowired
+ private InterfaceLogService interfaceLogService;
@Autowired
private PlatformLogService platformLogService;
@@ -59,17 +68,30 @@
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
public Map<String,Object> decodeToken(@RequestParam String token) {
+ String token1 =token;
+ log.info("銆愬畨闃插钩鍙板崟鐐圭櫥褰晅oken瑙ｆ瀽銆�================="+token1);
+ int success = Constants.ZERO;
+ Map<String,Object> result = new HashMap<>() ;
try {
- token = URLDecoder.decode(token,"UTF-8");
+ token = URLEncoder.encode(token1);
+ HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
+ hkBaseTokenRequest.setToken(token);
+ result = this.decodeTokenForHk(hkBaseTokenRequest);
+ }catch (BusinessException e){
+ log.error("銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙�===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
}catch (Exception e){
-
+ log.error("銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "銆愬畨闃插钩鍙般�戝崟鐐圭櫥褰晅oken瑙ｆ瀽",token1,
+ success, JSONObject.toJSONString(result),Constants.ZERO);
}
- HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
- hkBaseTokenRequest.setToken(token);
- return this.decodeTokenForHk(hkBaseTokenRequest);
+ return result;
}
- public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){
+ public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest) {
Map<String,Object> result = new HashMap<>();
result.put("code","0");
result.put("msg","success");
@@ -84,7 +106,11 @@
result.put("msg","token鏃犳晥!");
return result;
}
- String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
+ String userName = null;
+ try {
+ userName = DESUtil.verifyHkToken(URLDecoder.decode(hkBaseTokenRequest.getToken(),"UTF-8"));
+ }catch (Exception e){
+ }
if(StringUtils.isBlank(userName)){
result.put("code","-1");
result.put("msg","token鍙傛暟涓虹┖");
--
Gitblit v1.9.3