From 7a62afb5cec9a5c7caf6babc1c63706d8fe516dc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 f26fc55..1643760 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
@@ -22,6 +22,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import java.net.URLDecoder;
import java.util.*;
/**
@@ -58,6 +59,11 @@
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
public Map<String,Object> decodeToken(@RequestParam String token) {
+ try {
+ token = URLDecoder.decode(token,"UTF-8");
+ }catch (Exception e){
+
+ }
HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
hkBaseTokenRequest.setToken(token);
return this.decodeTokenForHk(hkBaseTokenRequest);
@@ -75,7 +81,7 @@
String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(redisToken)){
result.put("code","-1");
- result.put("msg","token鍙傛暟涓虹┖");
+ result.put("msg","token鏃犳晥!");
return result;
}
String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
@@ -189,4 +195,12 @@
public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
return ApiResponse.success(new ArrayList<>());
}
+
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬�")
+ @PostMapping("/platform/getStatusList")
+ public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
+ return ApiResponse.success(platformService.getPlatformStatusList());
+ }
}
--
Gitblit v1.9.3