Merge remote-tracking branch 'origin/tall3' into tall3

signin/src/main/java/com/ccsens/signin/config/SpringConfig.java

@@ -126,8 +126,8 @@ public class SpringConfig implements WebMvcConfigurer {
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        //addPathPatterns 用于添加拦截规则
-        //excludePathPatterns 用于排除拦截
+//        addPathPatterns 用于添加拦截规则
+//        excludePathPatterns 用于排除拦截
         registry.addInterceptor(tokenInterceptor())
 //                .addPathPatterns("/projects/**")
 //                .addPathPatterns("/messages/**")
@@ -138,16 +138,17 @@ public class SpringConfig implements WebMvcConfigurer {
                     .excludePathPatterns("/users/password")
                     .excludePathPatterns("/users/account")
                     .excludePathPatterns("/users/token")
-                    .excludePathPatterns("/users/claims");
+                    .excludePathPatterns("/users/claims")
+                    .excludePathPatterns("/users/userId");
 //                .addPathPatterns("/plugins/**")
 //                .addPathPatterns("/delivers/**")
 //                .addPathPatterns("/tasks/**")
 //                .addPathPatterns("/members/**")
 //                .addPathPatterns("/templates/**")
 //                .addPathPatterns("/hardware/**");
-        //super.addInterceptors(registry);
+//        super.addInterceptors(registry);
     }
-//
+
     @Bean
     public TokenInterceptor tokenInterceptor(){
         return new TokenInterceptor();

signin/src/main/java/com/ccsens/signin/config/TokenInterceptor.java

@@ -2,7 +2,6 @@ package com.ccsens.signin.config;
 
 import com.ccsens.signin.bean.po.SysUser;
 import com.ccsens.signin.service.IUserService;
-import com.ccsens.signin.service.IUserService;
 import com.ccsens.util.*;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;

util/src/main/java/com/ccsens/util/Md5Util.java

@@ -100,4 +100,6 @@ public class Md5Util {
 //        System.out.println(getMd5File(path1));
 //    }
 
+
+
 }

util/src/test/java/com/ccsens/util/Base64Test.java

@@ -1,8 +1,13 @@
 package com.ccsens.util;
 
 import cn.hutool.core.codec.Base64;
+import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import com.alibaba.fastjson.JSONObject;
 import com.ccsens.util.exception.BaseException;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import sun.misc.BASE64Decoder;
@@ -12,6 +17,7 @@ import sun.misc.BASE64Encoder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.security.MessageDigest;
 
 /**
  * @description:
@@ -22,6 +28,8 @@ import java.io.FileOutputStream;
 public class Base64Test {
 
 
+    private static Object TestEncrypt;
+
     @Test
     public void test01() throws Exception {
         File file = new File("d:" + File.separator + "1.png");
@@ -118,4 +126,45 @@ public class Base64Test {
         System.out.println(((Class)c.getClass().getField("TYPE").get(null)).isPrimitive());
     }
 
+    public static class TestEncrypt{
+        private Long p = 1386496320902139904L;
+        private Long r = 1386496320902139904L;
+    }
+
+    /**加密*/
+    @Test
+    public void test3()throws Exception{
+        String string1 = Md5Util.stringTo(JSONObject.toJSONString(Base64Test.TestEncrypt));
+        System.out.println(string1);
+//        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+//        String encryptHex = aes.encryptHex(string);
+//        System.out.println(encryptHex);
+        String s = Base64Test.shaEncode(JSONObject.toJSONString(Base64Test.TestEncrypt));
+        System.out.println(s);
+
+    }
+
+    public static String shaEncode(String inStr) throws Exception {
+        MessageDigest sha = null;
+        try {
+            sha = MessageDigest.getInstance("SHA");
+        } catch (Exception e) {
+            System.out.println(e.toString());
+            e.printStackTrace();
+            return "";
+        }
+
+        byte[] byteArray = inStr.getBytes("UTF-8");
+        byte[] md5Bytes = sha.digest(byteArray);
+        StringBuffer hexValue = new StringBuffer();
+        for (int i = 0; i < md5Bytes.length; i++) {
+            int val = ((int) md5Bytes[i]) & 0xff;
+            if (val < 16) {
+                hexValue.append("0");
+            }
+            hexValue.append(Integer.toHexString(val));
+        }
+        return hexValue.toString();
+    }
+
 }