perf（encrypt）:加解密调整

CHANGELOG.md

@@ -1,48 +1,38 @@
+## 1.0.10
+
+- feat(login)：登录接口增加验签步骤，可通过**validLoginSign**属性开启或关闭（默认）。
+- perf(login)：可重写**onSignError**方法自定义验签错误的跳转。
+- fix(login)：修复微信、钉钉授权跳转地址错误的bug
+
 ## 1.0.7
 
-## 新增
+- feat(web): 增加uploadFileCustomize方法，允许自定义文件存放情况
-
+- feat(database): 增加db/data目录，存放初始化数据的sql
-> feat(web): 增加uploadFileCustomize方法，允许自定义文件存放情况  
+- perf(login): 增加默认值，防止token解析异常
-> feat(database): 增加db/data目录，存放初始化数据的sql  
-
-## 优化
-
-> perf(login): 增加默认值，防止token解析异常
 
 ## 1.0.6
 
-### 新增
+- feat(web)：新增 **OperationIgnore** 注解，可以指定接口忽略操作日志的收集。
-
+- feat(web)：**OperationLog** 增加 desensitize 属性，用来脱敏指定的字段。
-> 1，新增 **OperationIgnore** 注解，可以指定接口忽略操作日志的收集。  
-> 2，**OperationLog** 增加 desensitize 属性，用来脱敏指定的字段。
 
 ## 1.0.2
 
-### 调整
+- feat(database)：增加数据库定时备份；
-
+- feat(database)：增加过期备份的删除操作，默认过期时间为7天；
-> 1，增加数据库定时备份；  
+- perf(message)：调整阿里云短信类，方便扩展其他方法。
-> 2，增加过期备份的删除操作，默认过期时间为7天；  
+- perf(message)：消息发送接口该body类型为 **JSONObject**
-> 3，调整阿里云短信类，方便扩展其他方法。  
+- perf(message)：调整消息发送接口和方法（不兼容旧版本）
-> 4，消息发送接口该body类型为 **JSONObject**   
-> 5，调整消息发送接口和方法（不兼容旧版本）
 
 ## 1.0.1
 
-### 调整
+- perf(web)：fastjson增加配置 **DisableCircularReferenceDetect**，禁用相同的对象写成引用的形式。
-
-fastjson增加配置 **DisableCircularReferenceDetect**，禁用相同的对象写成引用的形式。
 
 ## 1.0.0
 
-### 升级
+- perf：hutool依赖升级：5.8.11 -> 5.8.16
-
+- perf：fastjson依赖升级：1.2.78 -> 1.2.83
-> 1，hutool依赖升级：5.8.11 -> 5.8.16  
+- perf：mybatis-plus依赖升级：3.5.1 -> 3.5.3
-> 2，fastjson依赖升级：1.2.78 -> 1.2.83  
+- perf：**TieshengWebConfigurer** 增加 **configSystemCheck** 方法，可根据情况校验系统配置参数。
-> 3，mybatis-plus依赖升级：3.5.1 -> 3.5.3
-
-### 调整
-
-> 1，**TieshengWebConfigurer** 增加 **configSystemCheck** 方法，可根据情况校验系统配置参数。
 
 从该版本开始，仓库地址改为：
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.12</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.8</version>
+                <version>1.0.12</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java

@@ -3,7 +3,6 @@ package com.tiesheng.demo;
 
 import com.tiesheng.core.EnableTieshengWeb;
 import com.tiesheng.demo.config.DemoWebConfigurer;
-import com.tiesheng.encrypt.EnableEncryptConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java

@@ -1,21 +0,0 @@
-package com.tiesheng.encrypt;
-
-
-import com.tiesheng.encrypt.config.DecryptRequestBodyAdvice;
-import com.tiesheng.encrypt.config.EncryptResponseBodyAdvice;
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.*;
-
-/**
- * @author hao
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-@Documented
-@Import({
-        DecryptRequestBodyAdvice.class,
-        EncryptResponseBodyAdvice.class,
-})
-public @interface EnableEncryptConfig {
-}

springboot-encrypt/src/main/java/com/tiesheng/encrypt/EncryptAutoConfigurer.java

@@ -0,0 +1,10 @@
+package com.tiesheng.encrypt;
+
+
+import org.springframework.context.annotation.ComponentScan;
+
+@ComponentScan({
+        "com.tiesheng.encrypt.**.*",
+})
+public class EncryptAutoConfigurer {
+}

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java

@@ -37,7 +37,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<ApiResp> {
         try {
 
             Object data = body.getData();
-            if (data == null || !body.successful()) {
+            if (data == null || !body.successful() || !encryptConfig.isBody()) {
                 return body;
             }
 

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java

@@ -27,6 +27,7 @@ public class TsTokenConfig {
     private String encryptKey = "%kIp9frQCu";
     private Integer expireHours = 48;
     private String[] ignorePaths;
+    private boolean validLoginSign = false;
 
 
     /**
@@ -148,4 +149,12 @@ public class TsTokenConfig {
     public void setIgnorePaths(String[] ignorePaths) {
         this.ignorePaths = ignorePaths;
     }
+
+    public boolean isValidLoginSign() {
+        return validLoginSign;
+    }
+
+    public void setValidLoginSign(boolean validLoginSign) {
+        this.validLoginSign = validLoginSign;
+    }
 }

springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.URLUtil;
 import com.alibaba.fastjson.JSON;
 import com.tiesheng.annotation.operation.OperationIgnore;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.login.pojos.CodeExtraDTO;
 import com.tiesheng.login.pojos.DoLoginInfo;
@@ -50,6 +51,8 @@ public class LoginController {
     TieshengLoginConfigurer tieshengLoginConfigurer;
     @Autowired
     GlobalConfig globalConfig;
+    @Autowired
+    TsTokenConfig tsTokenConfig;
 
 
     /**
@@ -60,6 +63,11 @@ public class LoginController {
     @GetMapping("/unique/redirect")
     @OperationIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
+        if (tsTokenConfig.isValidLoginSign() && !dto.validSign()) {
+            tieshengLoginConfigurer.onSignError(response);
+            return;
+        }
+
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("web_unique_redirect",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
         tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);

springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java

@@ -1,6 +1,10 @@
 package com.tiesheng.login.pojos;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
+
+import java.util.Objects;
 
 public class UniqueIndexDTO extends LoginToInfo {
 
@@ -8,6 +12,26 @@ public class UniqueIndexDTO extends LoginToInfo {
     private String extra;
     private String info;
     private String platform = "web";
+    private Long timestamp;
+    private String sign;
+
+
+    /**
+     * 验证签名是否正确
+     */
+    public boolean validSign() {
+        if (StrUtil.isEmpty(getNo()) || getTimestamp() == null) {
+            return false;
+        }
+        if ((DateUtil.currentSeconds() - getTimestamp()) > 60) {
+            return false;
+        }
+        String mySign = getNo() + getTimestamp();
+        for (int i = 0; i < 11; i++) {
+            mySign = SecureUtil.md5(mySign);
+        }
+        return Objects.equals(sign, mySign);
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
@@ -47,4 +71,20 @@ public class UniqueIndexDTO extends LoginToInfo {
     public void setPlatform(String platform) {
         this.platform = platform;
     }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
 }

springboot-login/src/main/java/com/tiesheng/login/service/TieshengLoginConfigurer.java

@@ -2,6 +2,7 @@ package com.tiesheng.login.service;
 
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.login.pojos.DoLoginInfo;
+import com.tiesheng.util.ServletKit;
 import org.springframework.context.annotation.Configuration;
 
 import javax.servlet.http.HttpServletResponse;
@@ -28,4 +29,9 @@ public interface TieshengLoginConfigurer {
     void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response);
 
 
+    /**
+     * 签名错误的时候
+     */
+    void onSignError(HttpServletResponse response);
+
 }

springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java

@@ -24,4 +24,9 @@ public class DefaultLoginConfigurer implements TieshengLoginConfigurer {
     public void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response) {
 
     }
+
+    @Override
+    public void onSignError(HttpServletResponse response) {
+
+    }
 }

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java

@@ -30,6 +30,7 @@ public class EncryptConfig {
      */
     private String key = "WmdUzPJXbngVNiaSsQrihg==";
     private Integer saltSize = 8;
+    private boolean body = false;
 
     public EncryptConfig() {
         sm4 = SmUtil.sm4(Base64.decode(getKey()));
@@ -133,4 +134,12 @@ public class EncryptConfig {
     public void setSaltSize(Integer saltSize) {
         this.saltSize = saltSize;
     }
+
+    public boolean isBody() {
+        return body;
+    }
+
+    public void setBody(boolean body) {
+        this.body = body;
+    }
 }

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.12</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java

@@ -2,6 +2,7 @@ package com.tiesheng.core;
 
 import com.tiesheng.core.service.TieshengWebConfigurer;
 import com.tiesheng.database.DatabaseAutoConfigurer;
+import com.tiesheng.encrypt.EncryptAutoConfigurer;
 import com.tiesheng.login.LoginAutoConfigurer;
 import com.tiesheng.message.MessageAutoConfigurer;
 import com.tiesheng.util.UtilAutoConfigurer;
@@ -20,7 +21,8 @@ import java.lang.annotation.*;
         MessageAutoConfigurer.class,
         CoreAutoConfigurer.class,
         LoginAutoConfigurer.class,
-        DatabaseAutoConfigurer.class
+        DatabaseAutoConfigurer.class,
+        EncryptAutoConfigurer.class
 })
 public @interface EnableTieshengWeb {
 

springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java

@@ -48,6 +48,10 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         tieshengWebConfigurer.redirect(bean, to, extra, response);
     }
 
+    @Override
+    public void onSignError(HttpServletResponse response) {
+        tieshengWebConfigurer.onSignError(response);
+    }
 
     /**
      * 更新用户id

springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java

@@ -5,6 +5,7 @@ import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CoreConfigSystem;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.exception.ApiRespEnum;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.web.multipart.MultipartFile;
@@ -91,5 +92,11 @@ public interface TieshengWebConfigurer {
      */
     void redirect(TokenBean bean, String to, String extra, HttpServletResponse response);
 
+    /**
+     * 签名错误的时候
+     */
+    default void onSignError(HttpServletResponse response) {
+        ServletKit.write(response, "404", "text");
+    }
 
 }