publish 1.1.6

优化移除特殊字符方法

See merge request tiesheng/tiesheng!5

.gitea/workflows/mvn-deploy.yaml

@@ -0,0 +1,25 @@
+## 工作流触发时机
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+
+  ## 任务名称
+  local-deploy:
+
+    ## 任务执行的服务器
+    runs-on: tiesheng-local
+
+    ## 任务步骤
+    steps:
+
+      ## 检出代码（固定配置）
+      - name: Check out repository code
+        uses: https://git.tieshengkeji.com/actions/checkout@v4
+
+      ## maven打包
+      - name: Maven deploy
+        run: |
+          mvn deploy          

.gitlab-ci.yml

@@ -1,30 +0,0 @@
-stages:
-  - deploy
-  - package
-
-build-jar:
-  stage: deploy
-  tags:
-    - hzkepai
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-  script:
-    - mvn clean package -Dmaven.test.skip=true
-    - systemctl stop tieshengboot-ademo
-    - cp springboot-ademo/target/*.jar /usr/local/nginx/html/demo.tmp.kepai365.ltd/
-    - systemctl start tieshengboot-ademo
-
-deploy-jar:
-  stage: deploy
-  tags:
-    - hzkepai
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER
-    - cd $TAG_REPO_FOLDER
-    - git checkout master
-    - git pull
-    - git add .
-    - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
-    - git push origin master

CHANGELOG.md

@@ -1,48 +1,48 @@
+## 1.1.0
+
+- feat：globalConfig增加ext属性。
+- feat：增加网络请求超时、重定向的配置。
+- perf：更新数据库对比插件。
+- feat(web)：增加DaoBase的常量。
+- perf(web)：操作日志优化。  
+
+
+## 1.0.12
+
+- perf(encrypt)：开启关闭加解密移动到**yaml**中配置，移除**EnableEncryptConfig**注解。  
+- 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.7</version>
+    <version>1.1.6</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.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.7</version>
+                <version>1.1.6</version>
             </dependency>
 
             <dependency>
@@ -125,18 +125,25 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>kepai-repo-plugin</id>
+            <id>gitea</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.5</version>
+                    <version>1.0.0</version>
                     <executions>
                         <execution>
                             <goals>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.7</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.6</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-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java

@@ -31,9 +31,6 @@ public class DemoWebConfigurer implements TieshengWebConfigurer {
         TokenBean tokenBean = null;
         if (!StrUtil.isEmpty(platformUnique.getUserId())) {
             tokenBean = new TokenBean(platformUnique.getUserId(), "", globalConfig.getService());
-        } else {
-            // 获取用户信息判断是否可登录
-
         }
 
         return tokenBean;

springboot-ademo/src/main/java/com/tiesheng/demo/config/JWTAuthenticationFilter.java

@@ -0,0 +1,43 @@
+//package com.tiesheng.demo.config;
+//
+//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.authority.SimpleGrantedAuthority;
+//import org.springframework.security.core.context.SecurityContextHolder;
+//import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+//import org.springframework.web.filter.OncePerRequestFilter;
+//
+//import javax.servlet.FilterChain;
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class JWTAuthenticationFilter extends OncePerRequestFilter {
+//
+//    public JWTAuthenticationFilter(JwtTokenProvider tokenProvider) {
+//        this.tokenProvider = tokenProvider;
+//    }
+//
+//    @Override
+//    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+//        String authHeader = request.getHeader("Authorization");
+//        if (authHeader != null && authHeader.startsWith("Bearer ")) {
+//            String token = authHeader.substring(7);
+//            String username = tokenProvider.getUsername(token);
+//            if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
+//                if (tokenProvider.validateToken(token)) {
+//                    List<GrantedAuthority> authorities = new ArrayList<>();
+//                    // 根据你的应用程序需求设置权限
+//                    authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+//                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, null, authorities);
+//                    authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+//                    SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+//                }
+//            }
+//        }
+//        filterChain.doFilter(request, response);
+//    }
+//}

springboot-ademo/src/main/java/com/tiesheng/demo/config/TieshengSecurityAdapter.java

@@ -0,0 +1,29 @@
+//package com.tiesheng.demo.config;
+//
+//import cn.hutool.extra.spring.SpringUtil;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+//
+//import javax.servlet.http.HttpServletResponse;
+//
+//@Configuration
+//@EnableWebSecurity
+//public class TieshengSecurityAdapter extends WebSecurityConfigurerAdapter {
+//
+//    @Override
+//    protected void configure(HttpSecurity http) throws Exception {
+//        SpringUtil.getBeanFactory().getA
+//        http.csrf().disable() // JWT 通常与状态无关，因此 CSRF 保护不适用
+//                .authorizeRequests()
+//                .antMatchers("/login").permitAll() // 登录接口允许所有人访问
+//                .anyRequest().authenticated() // 其他所有请求需要认证
+//                .and()
+//                .exceptionHandling()
+//                .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED))
+//                .and()
+//                .addFilterBefore(new JWTAuthenticationFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
+//    }
+//}

springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java

@@ -58,7 +58,6 @@ public class TestController {
 
     @RequestMapping("/index")
     public ApiResp<String> index() {
-        dbBackupConfig.dbBackup();
         return ApiResp.respOK("hello world");
     }
 
@@ -94,7 +93,7 @@ public class TestController {
     public ApiResp<MessageReqResp> sendMessage() {
 
         MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
-                JSONUtil.createObj().putOpt("code", "123456").putOpt("template_code", "SMS_154950909"));
+                JSONUtil.createObj().putOpt("action", "sms-visitor-invite"));
 
         return ApiResp.respOK(reqResp);
     }

springboot-ademo/src/main/java/com/tiesheng/demo/service/DemoSmsHandler.java

@@ -0,0 +1,32 @@
+package com.tiesheng.demo.service;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.tiesheng.message.config.aliyun.AliyunSmsHandler;
+import com.tiesheng.message.pojos.AliyunTempParam;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+public class DemoSmsHandler implements AliyunSmsHandler {
+
+    @Override
+    public AliyunTempParam handler(JSONObject obj) {
+
+        String action = obj.getStr("action");
+
+        AliyunTempParam param = new AliyunTempParam();
+        param.setSignName("智慧校园");
+
+        if (Objects.equals(action, "sms-visitor-invite")) {
+            param.setTemplateCode("SMS_276125463");
+            param.setTemplateParam(JSONUtil.createObj()
+                    .putOpt("date", DateUtil.today())
+            );
+        }
+
+        return param;
+    }
+}

springboot-ademo/src/main/resources/application-test.yml

@@ -25,4 +25,5 @@ tiesheng:
   aliyun:
     access-key-id: LTAI5tJtbgBCnTY5eS4SmrTf
     access-key-secret: JIHqpRUFffCHhXaJEVvWN31WcexWqG
-    sign-name: 阿里云短信测试
+  encrypt:
+    body: true

springboot-ademo/src/main/resources/application.yml

@@ -9,6 +9,7 @@ spring:
   servlet:
     multipart:
       max-file-size: 20MB
+      max-request-size: 20MB
   web:
     resources:
       static-locations: classpath:/static/,file:static/
@@ -24,3 +25,4 @@ tiesheng:
   token:
     ignore-paths:
       - /test/index
+

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.7</version>
+        <version>1.1.6</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.7</version>
+        <version>1.1.6</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.7</version>
+        <version>1.1.6</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.7</version>
+        <version>1.1.6</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 = true;
 
 
     /**
@@ -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;
@@ -15,6 +16,7 @@ import com.tiesheng.login.service.TieshengLoginConfigurer;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
 import com.tiesheng.platform.config.ding.bean.DingJsapiSignature;
 import com.tiesheng.platform.config.ding.bean.DingUserInfo;
+import com.tiesheng.platform.config.ding.bean.DingUserSimple;
 import com.tiesheng.platform.config.wxmini.PlatformWxminiConfig;
 import com.tiesheng.platform.config.wxmp.PlatformWxmpConfig;
 import com.tiesheng.platform.config.wxmp.bean.WxConfigBean;
@@ -50,6 +52,8 @@ public class LoginController {
     TieshengLoginConfigurer tieshengLoginConfigurer;
     @Autowired
     GlobalConfig globalConfig;
+    @Autowired
+    TsTokenConfig tsTokenConfig;
 
 
     /**
@@ -60,6 +64,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);
@@ -77,7 +86,7 @@ public class LoginController {
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("web_unique_index",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
-        if (tokenBean == null) {
+        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
             throw new ApiException("登录失败");
         }
         return ApiResp.respOK(tokenBean.toToken());
@@ -105,6 +114,7 @@ public class LoginController {
         map.put("corpId", platformDingConfig.getConfigBean(service).getCorpId());
         map.put("service", service);
         map.put("extra", extra);
+        map.put("context", globalConfig.getContextPath());
         String query = URLUtil.buildQuery(map, Charset.defaultCharset());
         String configUrl = globalConfig.buildPath("/ding/index.html?" + query);
         try {
@@ -122,8 +132,8 @@ public class LoginController {
     @RequestMapping("/ding/oauth2/{service}")
     @OperationIgnore
     public void dingOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
-        String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
+        DingUserSimple userSimple = platformDingConfig.getUserIdByCode(service, dto.getCode());
-        DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
+        DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, userSimple.getUserid());
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(dingUserInfo.getAppId(),
                 dingUserInfo.getUserid(), "ding", JSON.toJSONString(dingUserInfo)));
         tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
@@ -159,7 +169,7 @@ public class LoginController {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
         }
-        String configUrl = globalConfig.buildPath("/auth/wxmp/oauth2/" + service + "?extra=" + extra);
+        String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
         String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
         response.sendRedirect(authorizationUrl);
     }

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()) > 10) {
+            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-login/src/main/resources/static/ding/index.html

@@ -24,10 +24,10 @@
     corpId: getQueryString("corpId"),
     onSuccess: function (result) {
       let search = window.location.search + "&code=" + result.code;
-      window.location.href = "/auth/ding/oauth2/" + getQueryString("service") + search;
+      window.location.replace(getQueryString("context") +  "/login/ding/oauth2/" + getQueryString("service") + search);
     },
     onFail: function (err) {
-      window.location.href = "./error.html?message=" + JSON.stringify(err);
+      window.location.replace("./error.html?message=" + JSON.stringify(err));
     }
   })
 

springboot-message/pom.xml

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

springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsHandler.java

@@ -0,0 +1,16 @@
+package com.tiesheng.message.config.aliyun;
+
+import cn.hutool.json.JSONObject;
+import com.tiesheng.message.pojos.AliyunTempParam;
+
+public interface AliyunSmsHandler {
+
+
+    /**
+     * 数据处理
+     *
+     * @param obj
+     */
+    AliyunTempParam handler(JSONObject obj);
+
+}

springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java

@@ -1,14 +1,18 @@
 package com.tiesheng.message.config.aliyun;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.tiesheng.message.pojos.AliyunTempParam;
 import com.tiesheng.message.pojos.MessageReqResp;
 import com.tiesheng.message.service.TieshengMessageSender;
+import com.tiesheng.util.exception.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -36,7 +40,9 @@ public class AliyunSmsSender implements TieshengMessageSender {
 
     private String accessKeyId;
     private String accessKeySecret;
-    private String signName;
+
+    @Autowired(required = false)
+    AliyunSmsHandler aliyunSmsHandler;
 
     /**
      * 特殊字符替换
@@ -94,7 +100,16 @@ public class AliyunSmsSender implements TieshengMessageSender {
         String signature = specialUrlEncode(digest);
         queryMap.put("Signature", signature);
 
-        return HttpUtil.get(ENDPOINT + "?Signature=" + signature + sortQueryStringTmp, 10 * 1000);
+        String respBody = "";
+        try {
+            respBody = HttpUtil.get(ENDPOINT + "?Signature=" + signature + sortQueryStringTmp, 10 * 1000);
+        } catch (Exception e) {
+            respBody = JSONUtil.createObj()
+                    .putOpt("Code", "Error")
+                    .putOpt("Message", "消息通道异常")
+                    .toString();
+        }
+        return respBody;
     }
 
 
@@ -102,29 +117,28 @@ public class AliyunSmsSender implements TieshengMessageSender {
      * 创建发送请求
      *
      * @param phoneNumbers 手机号，多个用,隔开
-     * @param templateCode 短信模板
+     * @param tempParam    短信模板
-     * @param params       模板参数
      * @return
      */
-    public MessageReqResp sendSms(String phoneNumbers, String templateCode, JSONObject params) {
+    public MessageReqResp sendSms(String phoneNumbers, AliyunTempParam tempParam) {
 
         MessageReqResp reqResp = new MessageReqResp("阿里云短信");
         reqResp.setTarget(phoneNumbers);
         reqResp.setResult(1);
         reqResp.setContent(JSONUtil.createObj()
                 .putOpt("PhoneNumbers", phoneNumbers)
-                .putOpt("SignName", getSignName())
+                .putOpt("SignName", tempParam.getSignName())
-                .putOpt("TemplateCode", templateCode)
+                .putOpt("TemplateCode", tempParam.getTemplateCode())
-                .putOpt("TemplateParam", params)
+                .putOpt("TemplateParam", tempParam.getTemplateParam())
                 .toString());
 
         // 业务API参数
         ConcurrentHashMap<String, String> queryMap = new ConcurrentHashMap<>();
         queryMap.put("PhoneNumbers", phoneNumbers);
-        queryMap.put("SignName", getSignName());
+        queryMap.put("SignName", tempParam.getSignName());
-        queryMap.put("TemplateCode", templateCode);
+        queryMap.put("TemplateCode", tempParam.getTemplateCode());
-        if (params != null) {
+        if (tempParam.getTemplateParam() != null) {
-            queryMap.put("TemplateParam", params.toString());
+            queryMap.put("TemplateParam", tempParam.getTemplateParam().toString());
         }
 
         reqResp.setRespBody(request("SendSms", queryMap));
@@ -139,7 +153,21 @@ public class AliyunSmsSender implements TieshengMessageSender {
 
     @Override
     public MessageReqResp send(String user, JSONObject body) {
-        return sendSms(user, body.getStr("template_code"), body);
+        boolean mobile = Validator.isMobile(user);
+        if (!mobile) {
+            return null;
+        }
+
+        if (aliyunSmsHandler == null) {
+            throw new ApiException("未注册短信参数处理器");
+        }
+
+        AliyunTempParam tempParam = aliyunSmsHandler.handler(body);
+        if (tempParam == null) {
+            throw new ApiException("未配置短信参数处理器");
+        }
+
+        return sendSms(user, tempParam);
     }
 
     @Override
@@ -149,7 +177,7 @@ public class AliyunSmsSender implements TieshengMessageSender {
 
     @Override
     public boolean support() {
-        return StrUtil.isAllNotEmpty(accessKeyId, accessKeySecret, signName);
+        return StrUtil.isAllNotEmpty(accessKeyId, accessKeySecret);
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -172,12 +200,5 @@ public class AliyunSmsSender implements TieshengMessageSender {
         this.accessKeySecret = accessKeySecret;
     }
 
-    public String getSignName() {
-        return signName;
-    }
-
-    public void setSignName(String signName) {
-        this.signName = signName;
-    }
 
 }

springboot-message/src/main/java/com/tiesheng/message/pojos/AliyunTempParam.java

@@ -0,0 +1,38 @@
+package com.tiesheng.message.pojos;
+
+import cn.hutool.json.JSONObject;
+
+public class AliyunTempParam {
+
+    private String signName;
+    private String templateCode;
+    private JSONObject templateParam;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getSignName() {
+        return signName;
+    }
+
+    public void setSignName(String signName) {
+        this.signName = signName;
+    }
+
+    public String getTemplateCode() {
+        return templateCode;
+    }
+
+    public void setTemplateCode(String templateCode) {
+        this.templateCode = templateCode;
+    }
+
+    public JSONObject getTemplateParam() {
+        return templateParam;
+    }
+
+    public void setTemplateParam(JSONObject templateParam) {
+        this.templateParam = templateParam;
+    }
+}

springboot-platform/pom.xml

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

springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -48,6 +48,40 @@ public class PlatformDingConfig {
         return bean;
     }
 
+
+    /**
+     * 发送get请求
+     * 会自动增加accessToken在url上面
+     *
+     * @param service
+     * @return
+     */
+    public <T> DingResponse<T> doRequest(String service, String url, JSONObject body, TypeReference<DingResponse<T>> typeReference) {
+        if (StrUtil.contains(url, "?")) {
+            url = url + "&access_token=" + getAccessToken(service);
+        } else {
+            url = url + "?access_token=" + getAccessToken(service);
+        }
+
+        HttpResponse execute;
+        if (body == null) {
+            execute = HttpUtil.createGet(url).execute();
+        } else {
+            execute = HttpUtil.createPost(url).body(body.toString()).execute();
+        }
+
+        if (execute.isOk()) {
+            DingResponse<T> bean = JSONUtil.toBean(execute.body(), typeReference, true);
+            if (!bean.isOk()) {
+                LogFactory.get().info(bean.getErrmsg());
+            }
+            return bean;
+        }
+
+        return null;
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
     ///////////////////////////////////////////////////////////////////////////
@@ -88,14 +122,15 @@ public class PlatformDingConfig {
         DingConfigBean dingConfigBean = getConfigBean(service);
         String jsapiTicket = TimedCacheHelper.getTimedCache().get(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(), false);
         if (StrUtil.isEmpty(jsapiTicket)) {
-            String response = HttpUtil.get("https://oapi.dingtalk.com/get_jsapi_ticket?access_token=" + getAccessToken(service));
+            DingResponse<String> respJson = doRequest(service, "https://oapi.dingtalk.com/get_jsapi_ticket", null,
-            LogFactory.get().info("getJsapiTicket: " + response);
+                    new TypeReference<DingResponse<String>>() {
-            JSONObject respJson = JSONUtil.parseObj(response);
+                    });
-            if (!Objects.equals(respJson.getStr("errcode"), "0")) {
+            if (!respJson.isOk()) {
-                throw new ApiException(respJson.getStr("errmsg"));
+                throw new ApiException(respJson.getErrmsg());
             }
-            jsapiTicket = respJson.getStr("ticket");
+            jsapiTicket = respJson.getTicket();
-            TimedCacheHelper.getTimedCache().put(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(), jsapiTicket, respJson.getLong("expires_in"));
+            TimedCacheHelper.getTimedCache().put(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(),
+                    jsapiTicket, respJson.getExpiresIn());
         }
         return jsapiTicket;
     }
@@ -124,10 +159,11 @@ public class PlatformDingConfig {
      * @return
      * @see <a href="https://open.dingtalk.com/document/isvapp-server/obtain-the-userid-of-a-user-by-using-the-log-free"></a>
      */
-    public String getUserIdByCode(String service, String code) {
+    public DingUserSimple getUserIdByCode(String service, String code) {
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo?access_token=" + getAccessToken(service))
+        DingResponse<DingUserSimple> resp = doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/getuserinfo",
-                .body(JSONUtil.createObj().putOpt("code", code).toString()).execute().body();
+                JSONUtil.createObj().putOpt("code", code), new TypeReference<DingResponse<DingUserSimple>>() {
-        return JSONUtil.parseObj(response).getJSONObject("result").getStr("userid");
+                });
+        return resp.getResult();
     }
 
 
@@ -141,13 +177,12 @@ public class PlatformDingConfig {
      */
     public DingUserInfo topapiV2UserGet(String service, String ddUserId) {
         DingConfigBean dingConfigBean = getConfigBean(service);
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/get?access_token=" + getAccessToken(service))
-                .body(JSONUtil.createObj().putOpt("userid", ddUserId).toString()).execute().body();
-        JSONObject resultJson = JSONUtil.parseObj(response).getJSONObject("result");
-        DingUserInfo userInfo = JSONUtil.toBean(resultJson, DingUserInfo.class);
 
+        DingUserInfo userInfo = doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/get",
+                JSONUtil.createObj().putOpt("userid", ddUserId), new TypeReference<DingResponse<DingUserInfo>>() {
+                }).getResult();
         // 设置一下job_number
-        userInfo.setJobNumber(resultJson.getStr("job_number"));
+        userInfo.setJobNumber(userInfo.getJobNumber());
         userInfo.setAppId(dingConfigBean.getAppKey());
         return userInfo;
     }
@@ -164,15 +199,10 @@ public class PlatformDingConfig {
         if (StrUtil.isEmpty(token)) {
             return new ArrayList<>();
         }
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/department/listsub?access_token=" + token)
-                .body(JSONUtil.createObj().putOpt("dept_id", deptId).toString()).execute().body();
-        DingResponse<List<DingDeptVo>> result = JSONUtil.toBean(response, new TypeReference<DingResponse<List<DingDeptVo>>>() {
-        }.getType(), true);
 
-        if (!result.isOk()) {
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/department/listsub",
-            result.setResult(new ArrayList<>());
+                JSONUtil.createObj().putOpt("dept_id", deptId), new TypeReference<DingResponse<List<DingDeptVo>>>() {
-        }
+                }).getResult();
-        return result.getResult();
     }
 
 
@@ -188,19 +218,16 @@ public class PlatformDingConfig {
             return DingUserListVo.fail();
         }
 
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/list?access_token=" + token)
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list",
-                .body(JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100).toString())
+                JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100),
-                .execute().body();
+                new TypeReference<DingResponse<DingUserListVo>>() {
-        DingResponse<DingUserListVo> result = JSONUtil.toBean(response, new TypeReference<DingResponse<DingUserListVo>>() {
+                }).getResult();
-        }.getType(), true);
-        if (!result.isOk()) {
-            result.setResult(DingUserListVo.fail());
-        }
-        return result.getResult();
     }
 
     /**
      * 同步钉钉的通讯录
+     * <br />
+     * PS：如果需要钉钉用户手机号，需要开通权限：企业员工手机号信息
      *
      * @param deptVo   为null时从第一级获取
      * @param consumer 回调
@@ -239,18 +266,19 @@ public class PlatformDingConfig {
      * @param content
      * @param actionUrl
      * @param userIds
+     * @return
      */
-    public void messageNotification(String service, String title, String content, String actionUrl, List<String> userIds) {
+    public DingResponse<String> messageNotification(String service, String title, String markdown, String actionUrl, List<String> userIds) {
 
         if (CollUtil.isEmpty(userIds)) {
-            return;
+            return null;
         }
 
         DingConfigBean configBean = getConfigBean(service);
 
         JSONObject actionCard = new JSONObject();
         actionCard.set("title", title);
-        actionCard.set("markdown", "### " + title + "\n" + content);
+        actionCard.set("markdown", markdown);
         actionCard.set("single_title", "点击查看");
         actionCard.set("single_url", actionUrl);
 
@@ -258,17 +286,18 @@ public class PlatformDingConfig {
         msg.set("msgtype", "action_card");
         msg.set("action_card", actionCard);
 
-        HashMap<String, Object> body = new HashMap<>(10);
+        JSONObject body = new JSONObject();
-        body.put("agent_id", configBean.getAgentId());
+        body.putOpt("agent_id", configBean.getAgentId());
-        body.put("userid_list", CollUtil.join(userIds, ","));
+        body.putOpt("userid_list", CollUtil.join(userIds, ","));
-        body.put("msg", msg);
+        body.putOpt("msg", msg);
-        String resp = HttpUtil.post("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2?access_token=" + getAccessToken(service),
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2", body,
-                JSONUtil.toJsonStr(body));
+                new TypeReference<DingResponse<String>>() {
+                });
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
-    // setter\getter
+// setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 
     public Map<String, DingConfigBean> getConfigs() {
         return configs;

springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingResponse.java

@@ -6,6 +6,8 @@ public class DingResponse<T> {
 
     private String errcode;
     private String errmsg;
+    private String ticket;
+    private Long expiresIn;
     private T result;
 
     ///////////////////////////////////////////////////////////////////////////
@@ -43,4 +45,20 @@ public class DingResponse<T> {
     public void setResult(T result) {
         this.result = result;
     }
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public Long getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Long expiresIn) {
+        this.expiresIn = expiresIn;
+    }
 }

springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserInfo.java

@@ -6,10 +6,8 @@ import java.util.List;
 /**
  * @author hao
  */
-public class DingUserInfo {
+public class DingUserInfo extends DingUserSimple {
 
-    private String name;
-    private String userid;
     private String avatar;
     private String mobile;
     private String email;
@@ -17,7 +15,6 @@ public class DingUserInfo {
     private String nickname;
     private String title;
     private String remark;
-    private String unionid;
     private String appId;
     private List<String> deptIdList;
     private boolean leader;
@@ -34,30 +31,6 @@ public class DingUserInfo {
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUnionid() {
-        return unionid;
-    }
-
-    public void setUnionid(String unionid) {
-        this.unionid = unionid;
-    }
-
-    public String getUserid() {
-        return userid;
-    }
-
-    public void setUserid(String userid) {
-        this.userid = userid;
-    }
-
     public String getAvatar() {
         return avatar;
     }

springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserSimple.java

@@ -0,0 +1,32 @@
+package com.tiesheng.platform.config.ding.bean;
+
+public class DingUserSimple {
+
+    private String unionid;
+    private String name;
+    private String userid;
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+}

springboot-platform/src/main/java/com/tiesheng/platform/config/wxmini/PlatformWxminiConfig.java

@@ -3,6 +3,7 @@ package com.tiesheng.platform.config.wxmini;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.tiesheng.platform.config.wxmp.bean.WxConfigBean;
@@ -50,12 +51,13 @@ public class PlatformWxminiConfig {
      */
     public String jscode2session(String service, String code) {
         WxConfigBean configBean = getConfigBean(service);
-        String body = HttpRequest.get("https://api.weixin.qq.com/sns/jscode2session"
+        try (HttpResponse response = HttpRequest.get("https://api.weixin.qq.com/sns/jscode2session"
                 + "?appid=" + configBean.getAppId()
                 + "&secret=" + configBean.getAppSecret()
-                + "&js_code=" + code + "&grant_type=authorization_code").execute().body();
+                + "&js_code=" + code + "&grant_type=authorization_code").execute()) {
-        JSONObject object = JSONUtil.parseObj(body);
+            JSONObject object = JSONUtil.parseObj(response.body());
-        return object.getStr("openid");
+            return object.getStr("openid");
+        }
     }
 
     /**
@@ -65,11 +67,12 @@ public class PlatformWxminiConfig {
      */
     public String getAccessToken(String service) {
         WxConfigBean configBean = getConfigBean(service);
-        String body = HttpRequest.get("https://api.weixin.qq.com/cgi-bin/token"
+        try (HttpResponse response = HttpRequest.get("https://api.weixin.qq.com/cgi-bin/token"
                 + "?grant_type=client_credential&appid=" + configBean.getAppId()
-                + "&secret=" + configBean.getAppSecret()).execute().body();
+                + "&secret=" + configBean.getAppSecret()).execute()) {
-        JSONObject object = JSONUtil.parseObj(body);
+            JSONObject object = JSONUtil.parseObj(response.body());
-        return object.getStr("access_token");
+            return object.getStr("access_token");
+        }
     }
 
 

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.7</version>
+        <version>1.1.6</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.7</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/ServletKit.java

@@ -26,7 +26,8 @@ public class ServletKit extends ServletUtil {
      * @return
      */
     public static String getClientIP() {
-        return getClientIP(getRequest());
+        HttpServletRequest request = getRequest();
+        return getClientIP(request);
     }
 
 

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()));
@@ -72,7 +73,7 @@ public class EncryptConfig {
      * @return
      */
     public String passwdCreate(String inputPasswd, String salt) {
-        if (StrUtil.isEmpty(salt)) {
+        if (StrUtil.isEmpty(salt) || StrUtil.length(salt) != getSaltSize()) {
             salt = RandomUtil.randomString(saltSize);
         }
         if (!passwdComplexity(inputPasswd)) {
@@ -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-util/src/main/java/com/tiesheng/util/config/GlobalConfig.java

@@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.comparator.VersionComparator;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.hutool.json.JSONUtil;
+import cn.hutool.http.HttpGlobalConfig;
 import cn.hutool.log.LogFactory;
 import com.tiesheng.util.exception.ApiException;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -13,10 +14,12 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -31,10 +34,37 @@ public class GlobalConfig {
     private String version;
     private String uploadDir = System.getProperty("user.dir");
 
+    /**
+     * 其他属性
+     */
+    private HashMap<String, String> ext;
+
+
+    @PostConstruct
+    public void init() {
+        // 默认10s的超时时间
+        HttpGlobalConfig.setTimeout(10 * 1000);
+        // 最多重定向3次
+        HttpGlobalConfig.setMaxRedirectCount(3);
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * 获取扩展属性内容
+     *
+     * @param extkey
+     * @return
+     */
+    public String getExtValue(String extkey) {
+        if (getExt() == null) {
+            return "";
+        }
+        return getExt().get(extkey);
+    }
+
     public String getContextPath() {
         String context = SpringUtil.getProperty("server.servlet.context-path");
         if (StrUtil.isEmpty(context)) {
@@ -87,7 +117,8 @@ public class GlobalConfig {
             if (FileUtil.exist(folder)) {
                 File[] files = FileUtil.ls(folder);
                 for (File file : files) {
-                    versions.add(StrUtil.subAfter(file.getAbsolutePath(), htmlDir, true));
+                    String normalize = FileUtil.normalize(file.getAbsolutePath());
+                    versions.add(StrUtil.subAfter(normalize, htmlDir, true));
                 }
             }
 
@@ -138,4 +169,12 @@ public class GlobalConfig {
     public void setVersion(String version) {
         this.version = version;
     }
+
+    public HashMap<String, String> getExt() {
+        return ext;
+    }
+
+    public void setExt(HashMap<String, String> ext) {
+        this.ext = ext;
+    }
 }

springboot-util/src/main/java/com/tiesheng/util/ip2region/Searcher.java

@@ -179,7 +179,7 @@ public class Searcher {
         this.ioCount = 0;
 
         // locate the segment index block based on the vector index
-        int sPtr = 0, ePtr = 0;
+        int sPtr, ePtr;
         int il0 = (int) ((ip >> 24) & 0xFF);
         int il1 = (int) ((ip >> 16) & 0xFF);
         int idx = il0 * VectorIndexCols * VectorIndexSize + il1 * VectorIndexSize;

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.7</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>com.tiesheng.springboot-parent</groupId>
             <artifactId>springboot-encrypt</artifactId>
-        </dependency>
+        </dependency><dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>3.1.0</version><scope>compile</scope></dependency>
 
     </dependencies>
 

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/config/mybatis/MybatisTimeMetaHandler.java

@@ -19,7 +19,11 @@ public class MybatisTimeMetaHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
         // 其中方法参数中第一个是前面自动填充所对应的字段，第二个是要自动填充的值。第三个是指定实体类的对象
-        this.setFieldValByName("createTime", DateUtil.date(), metaObject);
+        Object createTime = getFieldValByName("createTime", metaObject);
+        if (createTime == null) {
+            createTime = DateUtil.date();
+        }
+        this.setFieldValByName("createTime", createTime, metaObject);
         this.setFieldValByName("updateTime", DateUtil.date(), metaObject);
     }
 

springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java

@@ -0,0 +1,34 @@
+package com.tiesheng.core.config.template;
+
+import com.tiesheng.core.pojos.dto.TemplateDealDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TieshengTemplateHandler implements ToolTemplateHandler {
+    @Override
+    public String handler(TemplateDealDTO dto) {
+        return "";
+    }
+
+    @Override
+    public String getTemplateUrl() {
+        return "";
+    }
+
+    @Override
+    public Object getParms(Object params) {
+        return "";
+    }
+
+
+    @Override
+    public String getAction() {
+        return "";
+    }
+
+    @Override
+    public int getSort() {
+        return 0;
+    }
+
+}

springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java

@@ -0,0 +1,54 @@
+package com.tiesheng.core.config.template;
+
+import cn.hutool.core.util.StrUtil;
+import com.tiesheng.core.pojos.dto.TemplateDealDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface ToolTemplateHandler {
+
+
+    /**
+     * 处理对象
+     *
+     * @param dto
+     * @return
+     */
+    String handler(TemplateDealDTO dto);
+
+
+    /**
+     * 获取模版地址
+     *
+     * @return
+     */
+    String getTemplateUrl();
+
+    Object getParms(Object params);
+
+
+    /**
+     * 动作说明（唯一）
+     *
+     * @return
+     */
+    String getAction();
+
+
+    /**
+     * 排序，如果action相同，只会使用sort大的来处理
+     *
+     * @return
+     */
+    int getSort();
+
+    /**
+     * 获取模版ID
+     *
+     * @return
+     */
+    default String getTeamplateId() {
+        return StrUtil.format("{}_{}", getAction(), getSort());
+    }
+
+}

springboot-web/src/main/java/com/tiesheng/core/controller/LogController.java

@@ -3,6 +3,7 @@ package com.tiesheng.core.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
@@ -40,11 +41,11 @@ public class LogController {
 
         QueryWrapper<CoreLogOperation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", 0);
-        dto.likeColumns(queryWrapper, "user_name", "title", "subject", "params");
+        dto.likeColumns(queryWrapper, "user_name", "title", "subject");
         queryWrapper.orderByDesc("create_time");
 
         Page<CoreLogOperation> page = dto.pageObj();
-        coreLogService.page(page, queryWrapper);
+        coreLogService.getBaseMapper().page(page, queryWrapper);
 
         return ApiResp.respOK(page.getRecords(), page.getTotal());
     }

springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java

@@ -2,20 +2,26 @@ package com.tiesheng.core.controller;
 
 
 import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
-import com.tiesheng.core.pojos.dto.ChunkCheckDTO;
+import com.tiesheng.core.config.template.ToolTemplateHandler;
-import com.tiesheng.core.pojos.dto.ChunkMergeDTO;
+import com.tiesheng.core.pojos.dto.*;
-import com.tiesheng.core.pojos.dto.ChunkStartDTO;
+import com.tiesheng.core.pojos.vo.TemplateInfoVO;
-import com.tiesheng.core.pojos.dto.ImageCodeDTO;
 import com.tiesheng.core.pojos.vo.PicVerifyVo;
 import com.tiesheng.core.service.FileUploadService;
 import com.tiesheng.core.service.TimedCacheService;
+import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 工具类
  *
@@ -29,6 +35,8 @@ public class ToolController {
     TimedCacheService timedCacheService;
     @Autowired
     FileUploadService fileUploadService;
+    @Autowired
+    List<ToolTemplateHandler> templateHandlerList;
 
 
     /**
@@ -117,4 +125,40 @@ public class ToolController {
     }
 
 
+    @TokenIgnore
+    @GetMapping("/template/info")
+    public ApiResp<TemplateInfoVO> templateInfo(TemplateInfoDTO dto) {
+
+        List<ToolTemplateHandler> collect = templateHandlerList.stream()
+                .filter(it -> Objects.equals(it.getAction(), dto.getAction()))
+                .sorted((it, it2) -> it2.getSort() - it.getSort())
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(collect)) {
+            throw new ApiException("没有找到对应的模版");
+        }
+
+        ToolTemplateHandler toolTemplateHandler = collect.get(0);
+
+        TemplateInfoVO template = new TemplateInfoVO();
+        template.setTemplateUrl(toolTemplateHandler.getTemplateUrl());
+        template.setParams(toolTemplateHandler.getParms(dto.getParams()));
+        template.setTemplateId(toolTemplateHandler.getTeamplateId());
+
+        return ApiResp.respOK(template);
+    }
+
+    @TokenIgnore
+    @PostMapping("/template/deal")
+    public ApiResp<String> templateDeal(@RequestBody TemplateDealDTO dto) {
+
+        List<ToolTemplateHandler> collect = templateHandlerList.stream().
+                filter(it -> Objects.equals(it.getTeamplateId(), dto.getTemplateId()))
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(collect)) {
+            throw new ApiException("模版ID不存在");
+        }
+
+        return ApiResp.respOK(collect.get(0).handler(dto));
+    }
+
 }

springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogOperationMapper.java

@@ -1,8 +1,23 @@
 package com.tiesheng.core.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
+import org.apache.ibatis.annotations.Param;
 
 public interface CoreLogOperationMapper extends BaseMapper<CoreLogOperation> {
 
+
+    /**
+     * 获取日志列表
+     *
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    Page<CoreLogOperation> page(IPage<CoreLogOperation> page, @Param("ew") QueryWrapper<CoreLogOperation> queryWrapper);
+
+
 }

springboot-web/src/main/java/com/tiesheng/core/pojos/DaoBase.java

@@ -9,6 +9,12 @@ import java.util.Date;
 
 public class DaoBase {
 
+    public static final String ID = "id";
+    public static final String CREATE_TIME = "create_time";
+    public static final String UPDATE_TIME = "update_time";
+    public static final String IS_DELETED = "is_deleted";
+    public static final String LIMIT_1 = "limit 1";
+
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java

@@ -0,0 +1,40 @@
+package com.tiesheng.core.pojos.dto;
+
+import javax.validation.constraints.NotEmpty;
+
+public class TemplateDealDTO {
+
+    @NotEmpty(message = "模版ID")
+    private String templateId;
+    @NotEmpty(message = "文件路径必填")
+    private String file;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java

@@ -0,0 +1,28 @@
+package com.tiesheng.core.pojos.dto;
+
+
+public class TemplateInfoDTO {
+
+    private String action;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java

@@ -0,0 +1,37 @@
+package com.tiesheng.core.pojos.vo;
+
+
+public class TemplateInfoVO {
+
+    private String templateId;
+    private String templateUrl;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateUrl() {
+        return templateUrl;
+    }
+
+    public void setTemplateUrl(String templateUrl) {
+        this.templateUrl = templateUrl;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}

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

@@ -28,6 +28,28 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
     }
 
 
+    /**
+     * 获取（或创建）一个文本类型的配置
+     *
+     * @param configKey
+     * @param defaultValue
+     * @return
+     */
+    public CoreConfigSystem getTextOrCreate(String configKey, String defaultValue) {
+        CoreConfigSystem oneByColumn = getOneByColumn("config_key", configKey);
+        if (oneByColumn == null) {
+            oneByColumn = new CoreConfigSystem();
+            oneByColumn.setId(configKey);
+            oneByColumn.setConfigKey(configKey);
+            oneByColumn.setConfigVal(defaultValue);
+            oneByColumn.setRemark(defaultValue);
+            oneByColumn.setConfigType(0);
+            save(oneByColumn);
+        }
+        return oneByColumn;
+    }
+
+
     /**
      * 刷新功能点
      *

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

@@ -11,6 +11,7 @@ import com.tiesheng.core.pojos.dao.CoreJobUser;
 import com.tiesheng.util.pojos.IdName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +36,7 @@ public class CoreJobService extends TsServiceBase<CoreJobMapper, CoreJob> {
      * @param remark
      * @param isSystem
      */
+    @Transactional(rollbackFor = Exception.class)
     public void refresh(String id, String name, String remark, Integer isSystem) {
         CoreJob coreJob = new CoreJob();
         coreJob.setId(id);

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

@@ -96,6 +96,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
                 coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
                 coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
                 coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
+                coreLogProcess.setError(JSONUtil.toJsonStr(errorList));
                 coreLogProcessMapper.updateById(coreLogProcess);
             });
 
@@ -139,6 +140,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
                     lastCount = consumer.accept(pageNum, pageSize);
                     coreLogProcess.setTotal(coreLogProcess.getTotal() + lastCount);
                     coreLogProcess.setProcess(coreLogProcess.getTotal());
+                    coreLogProcess.setError(JSONUtil.toJsonStr(errorList));
                     coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
                 } catch (Exception e) {
                     errorList.add(e);

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

@@ -28,10 +28,38 @@ public class CoreMessageService {
     CoreLogMessageMapper coreLogMessageMapper;
 
 
+    /**
+     * 插入数据
+     *
+     * @param reqResp
+     */
+    private void insertMessageLog(MessageReqResp reqResp) {
+        if (reqResp == null) {
+            return;
+        }
+        coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
+    }
+
+    /**
+     * 发送所有消息
+     *
+     * @param userIds
+     * @param body
+     */
+    public void all(List<String> userIds, JSONObject body) {
+        messageSenderList.stream().filter(TieshengMessageSender::support)
+                .forEach(sender -> {
+                    for (String user : userIds) {
+                        insertMessageLog(sender.send(user, body));
+                    }
+                });
+    }
+
+
     /**
      * 发送消息
      *
-     * @param title
+     * @param channels
      * @param body
      * @param channels 消息通道，如果为all时，表示发送全部通道
      */
@@ -41,12 +69,8 @@ public class CoreMessageService {
         }
 
         messageSenderList.stream().filter(TieshengMessageSender::support)
-                .forEach(sender -> {
+                .forEach(sender -> channels.stream().filter(it -> Objects.equals(it.getChannel(), sender.getChannel()))
-                    channels.stream().filter(it -> Objects.equals(it.getChannel(), sender.getChannel())).forEach(it -> {
+                        .forEach(it -> insertMessageLog(sender.send(it.getUser(), body))));
-                        MessageReqResp reqResp = sender.send(it.getUser(), body);
-                        coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
-                    });
-                });
     }
 
 
@@ -54,7 +78,6 @@ public class CoreMessageService {
      * 发送消息
      *
      * @param userChannel
-     * @param title
      * @param body
      */
     public MessageReqResp send(UserChannel userChannel, JSONObject body) {
@@ -67,7 +90,7 @@ public class CoreMessageService {
                 sender -> Objects.equals(sender.getChannel(), userChannel.getChannel()) && sender.support());
         if (messageSender != null) {
             MessageReqResp reqResp = messageSender.send(userChannel.getUser(), body);
-            coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
+            insertMessageLog(reqResp);
             return reqResp;
         }
         return null;

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

@@ -1,6 +1,6 @@
 package com.tiesheng.core.service;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -8,8 +8,10 @@ import com.tiesheng.login.pojos.DoLoginInfo;
 import com.tiesheng.login.service.TieshengLoginConfigurer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
 
 /**
  * @author hao
@@ -23,6 +25,7 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
     CoreLogService coreLogService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public TokenBean doLogin(DoLoginInfo loginInfo) {
 
         CorePlatformUnique platformUnique = getOneByColumn("unique_id", loginInfo.getUnique());
@@ -35,11 +38,22 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         platformUnique.setInfo(loginInfo.getInfo());
         saveOrUpdate(platformUnique);
 
+        String oldUserId = platformUnique.getUserId();
         TokenBean tokenBean = tieshengWebConfigurer.login(platformUnique);
         if (tokenBean != null) {
+
             // 添加登录日志
             coreLogService.addLoginLog(platformUnique, tokenBean);
+
+            // 更新唯一值
+            if (!StrUtil.isEmpty(tokenBean.getId()) &&
+                    !Objects.equals(oldUserId, tokenBean.getId())) {
+                platformUnique.setUserId(tokenBean.getId());
+                saveOrUpdate(platformUnique);
+            }
         }
+
+
         return tokenBean;
     }
 
@@ -48,19 +62,9 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         tieshengWebConfigurer.redirect(bean, to, extra, response);
     }
 
-
+    @Override
-    /**
+    public void onSignError(HttpServletResponse response) {
-     * 更新用户id
+        tieshengWebConfigurer.onSignError(response);
-     *
-     * @param uniqueId
-     * @param userId
-     * @return
-     */
-    public boolean updateUserId(String uniqueId, String userId) {
-        return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
-                .set("user_id", userId)
-                .set("is_deleted", 0)
-        );
     }
 
 

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

@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -159,12 +160,7 @@ public class FileUploadService {
         //将文件数组转成list，并排序
         List<File> chunkFileList = new ArrayList<>(Arrays.asList(chunkFiles));
         //排序
-        chunkFileList.sort((o1, o2) -> {
+        chunkFileList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getName())));
-            if (Integer.parseInt(o1.getName()) > Integer.parseInt(o2.getName())) {
-                return 1;
-            }
-            return -1;
-        });
         return chunkFileList;
     }
 

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");
+    }
 
 }

springboot-web/src/main/java/com/tiesheng/core/util/CharacterUtils.java

@@ -0,0 +1,44 @@
+package com.tiesheng.core.util;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+
+import java.util.Map;
+
+public class CharacterUtils {
+
+
+    /**
+     * 移除特殊字符
+     *
+     * @param o 类
+     */
+    public static void removeSymbol(Object o) {
+        removeSymbol(o, "\n|\r|\t| ");
+    }
+
+    /**
+     * 移除特殊字符
+     *
+     * @param o 类
+     * @param searchStr 规则
+     */
+    public static void removeSymbol(Object o, String searchStr) {
+        JSONObject object = JSONUtil.parseObj(o, false);
+        for (Map.Entry<String, Object> entry : object) {
+            if (ObjectUtil.isEmpty(entry.getValue()) || StrUtil.equals("null", String.valueOf(entry.getValue()))) {
+                entry.setValue("");
+                continue;
+            }
+            if (StrUtil.isNotEmpty(entry.getKey())) {
+                entry.setValue(StrUtil.trim(StrUtil.replace(entry.getValue().toString(), searchStr, "")));
+            }
+        }
+        BeanUtil.copyProperties(object, o);
+    }
+
+}

springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql

@@ -84,7 +84,7 @@ CREATE TABLE `core_log_operation`
     `user_name`   varchar(255)         DEFAULT NULL COMMENT '用户名称',
     `title`       varchar(255)         DEFAULT NULL COMMENT '标题',
     `subject`     varchar(500)         DEFAULT NULL COMMENT '小标题',
-    `params`      text COMMENT '其他参数',
+    `params`      longtext COMMENT '其他参数',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='日志-操作';

springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml

@@ -19,4 +19,9 @@
     id, create_time, update_time, is_deleted, user_id, user_name, title, subject, params
   </sql>
 
+  <select id="page" resultMap="BaseResultMap">
+    select id,create_time,update_time,is_deleted,user_name,user_id,title,subject from core_log_operation
+    ${ew.customSqlSegment}
+  </select>
+
 </mapper>