From 05709d6c78e27507192bc41cb10dcdf20dc98514 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 九月 2024 15:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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 c2292a7..f26fc55 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,13 +1,9 @@
package com.doumee.cloud.openapi;
-import cn.emay.sdk.util.AES;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
@@ -61,25 +57,32 @@
@LoginNoRequired
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
- public ApiResponse<Map<String,Object>> decodeToken(@RequestParam String token) {
+ public Map<String,Object> decodeToken(@RequestParam String token) {
HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
hkBaseTokenRequest.setToken(token);
- return ApiResponse.success(this.decodeTokenForHk(hkBaseTokenRequest));
+ return this.decodeTokenForHk(hkBaseTokenRequest);
}
-
public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){
+ Map<String,Object> result = new HashMap<>();
+ result.put("code","0");
+ result.put("msg","success");
if(Objects.isNull(hkBaseTokenRequest)||StringUtils.isBlank(hkBaseTokenRequest.getToken())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"token鍙傛暟涓虹┖");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(redisToken)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
-
String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(userName)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
//鏌ヨ鐢ㄦ埛淇℃伅鏄惁瀛樺湪
SystemUser systemUser = new SystemUser();
@@ -87,14 +90,19 @@
systemUser.setDeleted(Boolean.FALSE);
SystemUser queryBean = systemUserService.findOne(systemUser);
if(Objects.isNull(queryBean)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
if(Constants.equalsInteger(queryBean.getStatus(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鐢ㄦ埛宸茬鐢�");
+ result.put("code","-2");
+ result.put("msg","鐢ㄦ埛宸茬鐢�");
+ return result;
}
redisTemplate.delete(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
- Map<String,Object> result = new HashMap<>();
- result.put("userId",userName);
+ Map<String,Object> data = new HashMap<>();
+ data.put("userId",userName);
+ result.put("data",data);
return result;
}
--
Gitblit v1.9.3