xusl 1 år sedan
förälder
incheckning
40477c4d43

+ 8 - 4
backend/src/main/java/com/jiayue/ssi/aspectj/PreventReplayAspect.java

@@ -41,16 +41,20 @@ public class PreventReplayAspect {
             // 判断客户端的时间是否超过60秒
             if (sj / 1000 >= 60) {
                 // 超过60秒视为无效请求
-                log.error(request.getRemoteAddr() + "本次请求时间戳无效");
-                return ResponseVO.fail("本次请求时间戳无效");
+                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效!", 406);
+                return null;
+//                log.error(request.getRemoteAddr() + "本次请求时间戳无效");
+//                return ResponseVO.fail("本次请求时间戳无效");
             }
             String lk = request.getParameter("lk");
             Object islk = LocalCache.get(lk);
             // 校验服务端授权码
             if (islk == null || "".equals(islk)) {
                 // 记录用户失败日志
-                log.error(request.getRemoteAddr() + "本次请求授权码无效");
-                return ResponseVO.fail("本次请求授权码无效");
+                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效!", 406);
+                return null;
+//                log.error(request.getRemoteAddr() + "本次请求授权码无效");
+//                return ResponseVO.fail("本次请求授权码无效");
             } else {
                 // 清除本地授权码存储
                 LocalCache.remove(lk);

+ 18 - 4
backend/src/test/java/com/jiayue/ssi/service/Sm2UiTest.java

@@ -1,6 +1,8 @@
 package com.jiayue.ssi.service;
 
 import cn.hutool.crypto.SmUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSON;
 import com.jiayue.ssi.constant.SecretKeyConstants;
 import com.jiayue.ssi.util.SM2CryptUtils;
 
@@ -26,8 +28,20 @@ public class Sm2UiTest {
 
 //        String jiami = SM2CryptUtils.encrypt("root","041967638ca43d4577d8dba166bff4437fde944270101f398a95b846ec2f8177d09f8abc5d62b6cd2c7216274d7abe0c8e04b0bb691207a32dd2e12d6bd2798672");
 //        System.out.println("加密:"+jiami);
-//        String jiemi = SM2CryptUtils.decrypt(jiami,"6155d63ee27cbeca07f3e40c4f8856f1be8119fcbda1aadc7e0e595e52bad7bd");
-//        System.out.println("解密:"+jiemi);
+        String jiemi = SM2CryptUtils.decrypt("859605db44ad8ddb4ea74241ed051917ec11b62380d59e1fa879bd4febc47eabdd15812c4f46a8bfb0614f5165e068a9e2adac11e79a52929812305c29fade8bcaee16312b14d30e12339dd9d23142eccbaa704072f64f3bd26601ca2acd374182a3ee7a6f60a7bfbefc7b0e6c7ef4ef71ad0bb39c5651d2a010aabc314cfef96116f0f578d409188d571d4e2d920ebd908a0fb7c817d6dfcc4f77aef03aa4c6e1f912db444e12e967205ddb5ef99b5f80857dda4ea43de430bd38c74d5c10afc0d602294c01e2a3f5155239b7c23a8f4d62f2580f4a28c77f9f80f851fb23aa3310f523aed5a435063be4eabf91dbd42a1ed186f1583a",SecretKeyConstants.CLIENT_PRIVATE_KEY);
+        System.out.println("解密:"+jiemi);
+        Object sysTime = JSONUtil.parseObj(JSONUtil.parseObj(jiemi).get("data")).get("sysTime");
+        Object lk = JSONUtil.parseObj(JSONUtil.parseObj(jiemi).get("data")).get("lk");
+
+        String jiemi1 = SM2CryptUtils.decrypt("076a067abdb37b6aa48ec8aa16df410cd570be34d7c2f316331e82e0afb866a4cd730407f5c71e2e9615325a316fb7a7856295d6b6a21d697314f16b023d0665816886491ab6e290b5c4be1b1f87af0cc52fd59f5705983b39fee1497d5ff89e1ab6875317bfcee70700f600aa744b22289891db3e73a1e8fd0494eb8e543d05091179292c09626c51e9272b7af41400bdcc83006bf7d8413524eaaed8486ca50ba450822cfce490dbedba9a0b66386cb722d7257ea3df470b9b50b88e",SecretKeyConstants.SERVER_PRIVATE_KEY);
+        System.out.println("解密:"+jiemi1);
+
+        String commitStr = JSONUtil.parseObj(jiemi1).put("sysTime",sysTime).put("lk",lk).toString();
+
+        String qdjiami = SM2CryptUtils.encrypt(commitStr,SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("前端加密:"+qdjiami);
+        String qdqianming = SM2CryptUtils.sign(SecretKeyConstants.CLIENT_PRIVATE_KEY,commitStr);
+        System.out.println("前端签名:"+qdqianming);
 //
 //
 //        String qianming = SM2CryptUtils.sign("6155d63ee27cbeca07f3e40c4f8856f1be8119fcbda1aadc7e0e595e52bad7bd",jiemi);
@@ -37,8 +51,8 @@ public class Sm2UiTest {
 //        System.out.println("验签:"+yanqian);
 
 
-        String a= SmUtil.sm3("Xsl147258").toUpperCase();
-        System.out.println(SM2CryptUtils.encrypt(a,SecretKeyConstants.SERVER_PUBLIC_KEY));
+//        String a= SmUtil.sm3("Xsl147258").toUpperCase();
+//        System.out.println(SM2CryptUtils.encrypt(a,SecretKeyConstants.SERVER_PUBLIC_KEY));
 
 
     }

+ 1 - 1
ui/src/views/auditManager/operlog/index.vue

@@ -169,7 +169,7 @@
             <el-form-item label="操作模块:">{{ form.title }}</el-form-item>
             <el-form-item
               label="登录信息:"
-            >{{ form.operName }} / {{ form.operIp }} }
+            >{{ form.operName }} / {{ form.operIp }}
             </el-form-item>
           </el-col>
           <el-col :span="12">