From d42abea76c42d895e3e27c964a0fee68bd076bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 18:43:21 +0800
Subject: [PATCH] 代码初始化

---
 server/system_service/src/main/java/com/doumee/core/utils/DESUtil.java                                    |    9 ++++++++-
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java               |    8 +++++++-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DESUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DESUtil.java
index 959cc6e..ca03698 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DESUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DESUtil.java
@@ -14,6 +14,8 @@
 import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.IvParameterSpec;
 import java.io.*;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.security.Key;
 import java.util.Base64;
 import java.util.concurrent.TimeUnit;
@@ -185,10 +187,15 @@
      * @param hour
      * @return
      */
-    public static  String generateTokenToHk(String userName,Integer hour, RedisTemplate<String,Object> redisTemplate){
+    public static  String generateTokenToHk(String userName,Integer hour, RedisTemplate<String,Object> redisTemplate) {
          long currentTimeMillis = System.currentTimeMillis() + 1000*60*60*hour;
          String encrypt = DESUtil.encrypt("12345678",currentTimeMillis + "_" + userName );
          redisTemplate.opsForValue().set(Constants.REDIS_HK_TOKEN_KEY+encrypt, encrypt,1000*60*60*hour, TimeUnit.MILLISECONDS);
+        try{
+            encrypt = URLEncoder.encode(encrypt,"UTF-8");
+        }catch (Exception e){
+            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鐢熸垚鍔犲瘑鐮佸け璐�!");
+        }
          return encrypt;
     }
 
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..0170f1c 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瑙f瀽")
     @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());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 32c7945..1ed89f0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -124,7 +124,7 @@
                 multifileMapper.insert(multifile);
             }
         }
-        String title = "銆愰殣鎮i殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname();
+        String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname();
         //json鏁版嵁
         Map<String,Object> jsonMap = new HashMap<>();
         jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());

--
Gitblit v1.9.3