publish 2.0.7

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

CHANGELOG.md

@@ -1,8 +1,11 @@
-## 2.0.0.rc44
+## 2.0.0.rc46
+
+现在导入导出都接入底层流程，无需新增接口，只需要实现接口即可。
 
-#### 优化导入导出过程
 - 过程日志不再和操作日志同时存在
 - 过程日志新增params参数
+- 通过实现*TsImportHandler*接口编写导入逻辑
+- 通过实现*TsExportHandler*接口编写导出逻辑
 
 ## 2.0.0.rc4
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.0.rc46</version>
+    <version>2.0.7</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -23,10 +23,8 @@
         <module>springboot-login</module>
         <module>springboot-web</module>
         <module>springboot-util</module>
-        <module>springboot-poi</module>
         <module>springboot-platform</module>
         <module>springboot-message</module>
-        <module>springboot-encrypt</module>
         <module>springboot-annotation</module>
         <module>springboot-role</module>
     </modules>
@@ -35,6 +33,8 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <hutool.version>5.8.31</hutool.version>
     </properties>
 
     <developers>
@@ -58,61 +58,49 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.0.rc46</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.tiesheng.springboot-parent</groupId>
-                <artifactId>springboot-encrypt</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.0.rc46</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.tiesheng.springboot-parent</groupId>
-                <artifactId>springboot-poi</artifactId>
-                <version>2.0.0.rc46</version>
+                <version>2.0.7</version>
             </dependency>
 
             <dependency>

qodana.yaml

@@ -0,0 +1,31 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+projectJDK: 17 #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-jvm:latest

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.0.rc46</version>
+    <version>2.0.7</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

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

@@ -16,16 +16,11 @@ import java.util.Objects;
 @Component
 public class DemoWebConfigurer implements TieshengWebConfigurer, TsLoginConfigurer {
 
-    @Autowired
-    GlobalConfig globalConfig;
-
-
     @Override
     public RequestUserInfo getCurrentUserName(TokenBean tokenBean) {
         RequestUserInfo info = new RequestUserInfo();
         info.setId(tokenBean.getId());
         info.setName(tokenBean.getExtra());
-        info.setData(info);
         return info;
     }
 

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

@@ -1,8 +1,6 @@
 package com.tiesheng.demo.config;
 
 
-import com.tiesheng.web.service.CoreConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -13,9 +11,6 @@ import javax.annotation.PostConstruct;
 @Component
 public class TestJobConfig {
 
-    @Autowired
-    CoreConfigService coreConfigService;
-
     @PostConstruct
     public void init() {
     }

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

@@ -1,35 +1,41 @@
 package com.tiesheng.demo.controller;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.log.LogFactory;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.database.config.DbBackupConfig;
 import com.tiesheng.demo.pojos.JsonTest;
 import com.tiesheng.demo.pojos.PoiBean;
-import com.tiesheng.demo.pojos.TestFile;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
 import com.tiesheng.platform.config.ding.bean.DingUserInfo;
 import com.tiesheng.util.config.EncryptConfig;
 import com.tiesheng.util.config.GlobalConfig;
 import com.tiesheng.util.config.Ip2regionConfig;
 import com.tiesheng.util.config.TsTokenConfig;
+import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.util.pojos.FileUploadPath;
 import com.tiesheng.util.service.TsCacheService;
+import com.tiesheng.util.service.http.OkHttpUtil;
 import com.tiesheng.web.service.CoreLogService;
+import okhttp3.Request;
+import okhttp3.Response;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -67,7 +73,9 @@ public class TestController {
     @RequestMapping("/redirect")
     @TokenIgnore
     @RoleAuthority("redirect")
-    public ApiResp<JsonTest> redirect(@RequestBody JsonTest dto, HttpServletResponse response) {
+    public ApiResp<JsonTest> redirect(HttpServletResponse response) {
+
+        encryptConfig.passwdCreate("111111@Zz", "");
 
         JsonTest jsonTest = new JsonTest();
         jsonTest.setNow(DateUtil.date());
@@ -76,7 +84,8 @@ public class TestController {
         String jsonString = JSON.toJSONString(jsonTest);
         LogFactory.get().info(jsonString);
 
-        LogFactory.get().info(JSON.toJSONString(dto));
+        String s = OkHttpUtil.get("http://toolbox.tieshengkeji.com/test/login/23232/3232");
+        LogFactory.get().info(s);
 
 //        ArrayList<String> strings = CollUtil.newArrayList("11111", "22222");
 //        coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer<String>() {
@@ -154,16 +163,6 @@ public class TestController {
         return ApiResp.respOK(search);
     }
 
-    @RequestMapping("desensitize")
-    @TokenIgnore
-    public ApiResp<List<TestFile>> desensitize() {
-        TestFile file = new TestFile("11111");
-        file.setTest("111111");
-        TestFile file1 = new TestFile("22222");
-        file1.setTest("22222");
-        return ApiResp.respOK(CollUtil.newArrayList(file, file1));
-    }
-
 
     @RequestMapping("passwd")
     @TokenIgnore
@@ -201,4 +200,33 @@ public class TestController {
         return ApiResp.respOK("");
     }
 
+
+    @GetMapping("getwxacode")
+    @TokenIgnore
+    public ApiResp<String> getwxacode() {
+        String id = "test_1111111";
+        FileUploadPath path = FileUploadPath.random("png");
+        JSONObject paramJson = new JSONObject();
+        paramJson.put("page", "pages/login/index");
+        paramJson.put("scene", "no=" + id);
+        paramJson.put("env_version", "develop");
+        paramJson.put("width", 430);
+        paramJson.put("is_hyaline", false);
+        paramJson.put("auto_color", false);
+        FileUploadPath file = FileUploadPath.file(id + ".png");
+        try {
+            Request request = OkHttpUtil.ofPost("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" +
+                            "83_7xqG36kdgwuf8zzWLY3jtz7bg4ucziN-0oxbE0X9zBzwbjZ4S4Ss2RM9uHeSIcRp2K-wEp6MLzWhqo2AXj0Jpzd6IiJdUsRxqdHPvEWqAdOgt83vzZwdDf7tZBkGNGeAFASZS",
+                    paramJson);
+            Response execute1 = OkHttpUtil.ofHttpClient().build().newCall(request).execute();
+            if (execute1.body() != null) {
+                FileUtil.writeFromStream(execute1.body().byteStream(), file.getAbsolutePath());
+                execute1.close();
+            }
+        } catch (Exception e) {
+            throw new ApiException("每分钟最多生成5000个二维码，请稍后再试！");
+        }
+        return ApiResp.respOK(path.getHttpPath());
+    }
+
 }

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java

@@ -1,21 +0,0 @@
-package com.tiesheng.demo.pojos;
-
-import com.tiesheng.poi.pojos.PoiWriteBase;
-
-
-public class TestFile extends TestParent implements PoiWriteBase {
-
-    private String name;
-
-    public TestFile(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/TestParent.java

@@ -1,31 +0,0 @@
-package com.tiesheng.demo.pojos;
-
-import com.tiesheng.poi.pojos.PoiWriteBase;
-
-
-public class TestParent implements PoiWriteBase {
-
-    private String id;
-
-    private String test;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // setter、getter
-    ///////////////////////////////////////////////////////////////////////////
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTest() {
-        return test;
-    }
-
-    public void setTest(String test) {
-        this.test = test;
-    }
-}

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</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>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.tiesheng.springboot-parent</groupId>
-        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
-    </parent>
-
-    <artifactId>springboot-encrypt</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-util</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-annotation</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

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

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

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -65,7 +65,7 @@ public class LoginController {
     @OperationIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
         if (tsTokenConfig.isValidLoginSign() && !dto.validSign()) {
-            corePlatformUniqueService.onSignError(response);
+            corePlatformUniqueService.redirect(null, dto.getTo(), dto.getExtra(), response);
             return;
         }
 
@@ -86,7 +86,7 @@ public class LoginController {
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
         TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo("web_unique_index",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
-        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
+        if (!TsTokenConfig.validToken(tokenBean)) {
             throw new ApiException("登录失败");
         }
         return ApiResp.respOK(tokenBean.toToken());
@@ -219,7 +219,7 @@ public class LoginController {
 
         WxminiLoginVo loginVo = new WxminiLoginVo();
         loginVo.setOpenid(openid);
-        if (tokenBean != null) {
+        if (TsTokenConfig.validToken(tokenBean)) {
             loginVo.setToken(tokenBean.toToken());
         }
         return ApiResp.respOK(loginVo);

springboot-login/src/main/java/com/tiesheng/login/mapper/CoreLogLoginMapper.java

@@ -2,6 +2,17 @@ package com.tiesheng.login.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tiesheng.login.pojos.dao.CoreLogLogin;
+import org.apache.ibatis.annotations.Param;
 
 public interface CoreLogLoginMapper extends BaseMapper<CoreLogLogin> {
+
+
+    /**
+     * 获取登录失败的次数
+     *
+     * @param ip
+     * @return
+     */
+    int getLoginErrorTimes(@Param("ip") String ip);
+
 }

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

@@ -1,5 +1,9 @@
 package com.tiesheng.login.pojos;
 
+import com.tiesheng.util.ServletKit;
+
+import javax.servlet.http.HttpServletRequest;
+
 public class DoLoginInfo {
 
     private String appId;
@@ -7,12 +11,16 @@ public class DoLoginInfo {
     private String platform;
     private String info;
     private String extra;
+    private String loginIp;
 
     public DoLoginInfo(String appId, String unique, String platform, String info) {
         this.appId = appId;
         this.unique = unique;
         this.platform = platform;
         this.info = info;
+
+        // 设置IP
+        this.loginIp = ServletKit.getClientIP();
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -58,4 +66,12 @@ public class DoLoginInfo {
     public void setExtra(String extra) {
         this.extra = extra;
     }
+
+    public String getLoginIp() {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp) {
+        this.loginIp = loginIp;
+    }
 }

springboot-login/src/main/java/com/tiesheng/login/pojos/dao/CoreLogLogin.java

@@ -16,13 +16,13 @@ public class CoreLogLogin extends DaoBase {
     private String userId;
 
     /**
-     * 用户id
+     * 用户姓名
      */
     @TableField(value = "user_name")
     private String userName;
 
     /**
-     * ip
+     * 登录方式
      */
     @TableField(value = "platform")
     private String platform;
@@ -39,6 +39,18 @@ public class CoreLogLogin extends DaoBase {
     @TableField(value = "address")
     private String address;
 
+    /**
+     * 登录结果,0否，1是
+     */
+    @TableField(value = "`result`")
+    private Integer result;
+
+    /**
+     * 请求参数
+     */
+    @TableField(value = "params")
+    private String params;
+
     /**
      * 获取用户id
      *
@@ -57,18 +69,38 @@ public class CoreLogLogin extends DaoBase {
         this.userId = userId;
     }
 
+    /**
+     * 获取用户姓名
+     *
+     * @return user_name - 用户姓名
+     */
     public String getUserName() {
         return userName;
     }
 
+    /**
+     * 设置用户姓名
+     *
+     * @param userName 用户姓名
+     */
     public void setUserName(String userName) {
         this.userName = userName;
     }
 
+    /**
+     * 获取登录方式
+     *
+     * @return platform - 登录方式
+     */
     public String getPlatform() {
         return platform;
     }
 
+    /**
+     * 设置登录方式
+     *
+     * @param platform 登录方式
+     */
     public void setPlatform(String platform) {
         this.platform = platform;
     }
@@ -108,4 +140,40 @@ public class CoreLogLogin extends DaoBase {
     public void setAddress(String address) {
         this.address = address;
     }
+
+    /**
+     * 获取登录结果,0否，1是
+     *
+     * @return result - 登录结果,0否，1是
+     */
+    public Integer getResult() {
+        return result;
+    }
+
+    /**
+     * 设置登录结果,0否，1是
+     *
+     * @param result 登录结果,0否，1是
+     */
+    public void setResult(Integer result) {
+        this.result = result;
+    }
+
+    /**
+     * 获取请求参数
+     *
+     * @return params - 请求参数
+     */
+    public String getParams() {
+        return params;
+    }
+
+    /**
+     * 设置请求参数
+     *
+     * @param params 请求参数
+     */
+    public void setParams(String params) {
+        this.params = params;
+    }
 }

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

@@ -1,23 +1,23 @@
 package com.tiesheng.login.service;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.tiesheng.login.mapper.CoreLogLoginMapper;
 import com.tiesheng.login.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.login.pojos.DoLoginInfo;
 import com.tiesheng.login.pojos.RequestUserInfo;
 import com.tiesheng.login.pojos.dao.CoreLogLogin;
 import com.tiesheng.login.pojos.dao.CorePlatformUnique;
-import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.config.Ip2regionConfig;
+import com.tiesheng.util.config.TsTokenConfig;
+import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.TokenBean;
 import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
 import com.tiesheng.util.service.role.TsAuthorityHandler;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
@@ -35,9 +35,19 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
     TsLoginConfigurer tsLoginConfigurer;
 
 
-    @Transactional(rollbackFor = Exception.class)
+    /**
+     * 登录操作
+     *
+     * @param loginInfo
+     * @return
+     */
     public TokenBean login(DoLoginInfo loginInfo) {
 
+        int loginErrorTimes = coreLogLoginMapper.getLoginErrorTimes(loginInfo.getLoginIp());
+        if (loginErrorTimes > 4) {
+            throw new ApiException("登录失败已达5次，请10分钟后再试");
+        }
+
         CorePlatformUnique platformUnique = getOneByColumn("unique_id", loginInfo.getUnique());
         if (platformUnique == null) {
             platformUnique = new CorePlatformUnique();
@@ -48,24 +58,32 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         platformUnique.setInfo(loginInfo.getInfo());
         saveOrUpdate(platformUnique);
 
-        String oldUserId = platformUnique.getUserId();
-        TokenBean tokenBean = tsLoginConfigurer.login(platformUnique);
-        if (tokenBean != null) {
+        TokenBean tokenBean = null;
+        String errorMsg = null;
+        try {
+            tokenBean = tsLoginConfigurer.login(platformUnique);
+        } catch (Exception e) {
+            errorMsg = e.getMessage();
+        }
+
+        if (TsTokenConfig.validToken(tokenBean)) {
 
             // 清除授权信息
-            TsCacheService.of().remove(StrUtil.format(TsAuthorityHandler.CACHE_HAS_AUTHORITY,
+            TsCacheService.of().remove(StrUtil.format(TsAuthorityHandler.CACHE_AUTHORITY,
                     tokenBean.getRoleId(), tokenBean.getId()));
 
-            // 添加登录日志
-            addLoginLog(platformUnique, tokenBean);
-
             // 更新唯一值
-            if (!StrUtil.isEmpty(tokenBean.getId()) &&
-                    !Objects.equals(oldUserId, tokenBean.getId())) {
+            String oldUserId = platformUnique.getUserId();
+            if (!Objects.equals(oldUserId, tokenBean.getId())) {
                 platformUnique.setUserId(tokenBean.getId());
                 saveOrUpdate(platformUnique);
             }
+        }
 
+        addLoginLog(tokenBean, loginInfo);
+
+        if (StrUtil.isNotEmpty(errorMsg)) {
+            throw new ApiException(errorMsg);
         }
 
         return tokenBean;
@@ -78,40 +96,37 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
      * @param bean
      */
     public void redirect(TokenBean bean, String to, String extra, HttpServletResponse response) {
-        tsLoginConfigurer.redirect(bean, to, extra, response);
+        if (TsTokenConfig.validToken(bean)) {
+            tsLoginConfigurer.redirect(bean, to, extra, response);
+        } else {
+            tsLoginConfigurer.onLoginError(to, response);
+        }
     }
 
 
-    /**
-     * 签名错误的时候
-     */
-    public void onSignError(HttpServletResponse response) {
-        tsLoginConfigurer.onSignError(response);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // 登录日志
-    ///////////////////////////////////////////////////////////////////////////
-
     /**
      * 添加登录日志
      *
-     * @param platformUnique
      * @param tokenBean
+     * @param info
      */
-    public void addLoginLog(CorePlatformUnique platformUnique, TokenBean tokenBean) {
-
-        HttpServletRequest request = ServletKit.getRequest();
-        String ip = ServletKit.getClientIP(request);
+    public void addLoginLog(TokenBean tokenBean, DoLoginInfo info) {
 
         CoreLogLogin login = new CoreLogLogin();
-        login.setUserId(tokenBean.getId());
-        login.setPlatform(platformUnique.getPlatform());
+        login.setPlatform(info.getPlatform());
+        login.setParams(JSON.toJSONString(info));
 
-        RequestUserInfo requestUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean, true);
-        login.setUserName(requestUserInfo.getName());
+        if (TsTokenConfig.validToken(tokenBean)) {
+            RequestUserInfo requestUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean, true);
+            login.setUserId(tokenBean.getId());
+            login.setUserName(requestUserInfo.getName());
+            login.setResult(1);
+        } else {
+            login.setUserName(info.getUnique());
+            login.setResult(0);
+        }
 
-        login.setIp(ip);
+        login.setIp(info.getLoginIp());
         login.setAddress(ip2regionConfig.search(login.getIp()));
         coreLogLoginMapper.insert(login);
     }

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

@@ -34,9 +34,9 @@ public interface TsLoginConfigurer {
 
 
     /**
-     * 签名错误的时候
+     * 登录失败的时候
      */
-    default void onSignError(HttpServletResponse response) {
+    default void onLoginError(String to,HttpServletResponse response) {
         ServletKit.write(response, "404", "text");
     }
 

springboot-login/src/main/resources/mapper/CoreLogLoginMapper.xml

@@ -13,9 +13,21 @@
     <result column="platform" jdbcType="VARCHAR" property="platform" />
     <result column="ip" jdbcType="VARCHAR" property="ip" />
     <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="result" jdbcType="INTEGER" property="result" />
+    <result column="params" jdbcType="LONGVARCHAR" property="params" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, user_id, user_name, platform, ip, address
+    id, create_time, update_time, is_deleted, user_id, user_name, platform, ip, address,
+    `result`, params
   </sql>
+
+  <select id="getLoginErrorTimes" resultType="int">
+      select count(1)
+      from core_log_login
+      where ip = #{ip}
+        and result = 0
+        and create_time > date_add(now(), interval -10 minute)
+  </select>
+
 </mapper>

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

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

@@ -99,7 +99,7 @@ public class AliyunSmsSender implements TsMessageSender {
         String signature = specialUrlEncode(digest);
         queryMap.put("Signature", signature);
 
-        String respBody = "";
+        String respBody;
         try {
             respBody = OkHttpUtil.get(ENDPOINT + "?Signature=" + signature + sortQueryStringTmp);
         } catch (Exception e) {

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

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

@@ -76,15 +76,16 @@ public class PlatformDingConfig {
             request = OkHttpUtil.ofPost(url, body);
         }
         request = request.newBuilder().header("x-acs-dingtalk-access-token", accessToken).build();
-        try {
-            Response response = OkHttpUtil.ofHttpClient().build().newCall(request).execute();
+        try (Response response = OkHttpUtil.ofHttpClient().build().newCall(request).execute()) {
             if (response.isSuccessful() && response.body() != null) {
                 String rawBody = response.body().string();
                 DingResponse<T> bean = JSON.parseObject(rawBody, typeReference);
                 bean.setRawBody(rawBody);
                 return bean;
             } else {
-                LogFactory.get().info(response.body().string());
+                if (response.body() != null) {
+                    LogFactory.get().info(response.body().string());
+                }
             }
         } catch (Exception e) {
             LogFactory.get().error(e);
@@ -246,7 +247,7 @@ public class PlatformDingConfig {
         JSONObject object = new JSONObject();
         object.put("dept_id", deptId);
         object.put("cursor", cursor);
-        object.put("size", 100);
+        object.put("size", 200);
 
         return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list",
                 object, new TypeReference<DingResponse<DingUserListVo>>() {

springboot-poi/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.tiesheng.springboot-parent</groupId>
-        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
-    </parent>
-
-    <artifactId>springboot-poi</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-util</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

springboot-poi/src/main/java/com/tiesheng/poi/pojos/PoiReadBase.java

@@ -1,8 +0,0 @@
-package com.tiesheng.poi.pojos;
-
-/**
- * @author hao
- */
-public interface PoiReadBase {
-
-}

springboot-poi/src/main/java/com/tiesheng/poi/pojos/PoiWriteBase.java

@@ -1,19 +0,0 @@
-package com.tiesheng.poi.pojos;
-
-import com.alibaba.excel.annotation.write.style.*;
-import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
-import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-
-/**
- * @author hao
- */
-@HeadRowHeight(24)
-@HeadFontStyle(fontHeightInPoints = 13)
-@HeadStyle(horizontalAlignment = HorizontalAlignmentEnum.LEFT)
-@ContentRowHeight(20)
-@ContentFontStyle(fontHeightInPoints = 12)
-@ContentStyle(verticalAlignment = VerticalAlignmentEnum.CENTER)
-@ColumnWidth(20)
-public interface PoiWriteBase {
-
-}

springboot-poi/src/main/java/com/tiesheng/poi/util/PoiReadUtil.java

@@ -1,23 +0,0 @@
-package com.tiesheng.poi.util;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.listener.ReadListener;
-import com.tiesheng.poi.pojos.PoiReadBase;
-
-import java.io.File;
-
-public class PoiReadUtil {
-
-
-    /**
-     * 读取文件
-     *
-     * @param file
-     * @param readListener
-     * @return
-     */
-    public static <T extends PoiReadBase> void read(File file, Class<T> tClass, ReadListener<T> readListener) {
-        EasyExcel.read(file, tClass, readListener).autoTrim(true).headRowNumber(1).sheet().doRead();
-    }
-
-}

springboot-poi/src/main/java/com/tiesheng/poi/util/PoiWriteUtil.java

@@ -1,38 +0,0 @@
-package com.tiesheng.poi.util;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.annotation.write.style.*;
-import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
-import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.tiesheng.poi.pojos.PoiWriteBase;
-
-import java.util.List;
-
-/**
- * @author hao
- */
-@HeadRowHeight(24)
-@HeadFontStyle(fontHeightInPoints = 13)
-@HeadStyle(horizontalAlignment = HorizontalAlignmentEnum.LEFT)
-@ContentRowHeight(20)
-@ContentFontStyle(fontHeightInPoints = 12)
-@ContentStyle(verticalAlignment = VerticalAlignmentEnum.CENTER)
-@ColumnWidth(20)
-public class PoiWriteUtil {
-
-
-    /**
-     * 导出数据
-     *
-     * @param list
-     * @return
-     */
-    public static <T extends PoiWriteBase> boolean export(List<T> list, Class<T> tClass, String absPath, String sheetName) {
-        EasyExcel.write(absPath, tClass).excelType(ExcelTypeEnum.XLSX)
-                .sheet(sheetName)
-                .doWrite(list);
-        return true;
-    }
-
-}

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java

@@ -3,10 +3,13 @@ package com.tiesheng.role.controller;
 import cn.hutool.core.collection.CollUtil;
 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.role.pojos.dao.CoreRoleAuthority;
+import com.tiesheng.role.pojos.dao.CoreRoleGroup;
 import com.tiesheng.role.pojos.dao.CoreRoleServer;
 import com.tiesheng.role.pojos.dto.OwnerMenuDTO;
 import com.tiesheng.role.pojos.dto.OwnerPointDTO;
+import com.tiesheng.role.pojos.vo.GroupTypeDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
 import com.tiesheng.role.service.CoreRoleService;
 import com.tiesheng.util.pojos.ApiResp;
@@ -101,4 +104,24 @@ public class CommRoleController {
     }
 
 
+    /**
+     * 角色、职位列表
+     *
+     * @return
+     */
+    @GetMapping("/group")
+    public ApiResp<List<CoreRoleGroup>> groupPage(@Valid GroupTypeDTO dto) {
+
+        QueryWrapper<CoreRoleGroup> queryWrapper = new QueryWrapper<CoreRoleGroup>()
+                .eq("is_deleted", 0)
+                .eq(StrUtil.isNotEmpty(dto.getType()), "type", dto.getType())
+                .orderByAsc("sort");
+        dto.likeColumns(queryWrapper, "name");
+
+        Page<CoreRoleGroup> page = dto.pageObj();
+        coreRoleService.page(page, queryWrapper);
+
+        return ApiResp.respOK(page.getRecords(), page.getTotal());
+    }
+
 }

springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java

@@ -138,7 +138,6 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
             coreRoleGroupRxMapper.batchInsert(list);
             onRoleChange(dto.getId(), "");
         }
-
     }
 
 
@@ -148,13 +147,16 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * @param roleUser
      */
     public void roleUserUpdate(CoreRoleUser roleUser) {
+        Validator.validateNotEmpty(roleUser.getType(), "请选择授权方式");
+        Validator.validateNotEmpty(roleUser.getTypeId(), "请选择授权" + (Objects.equals(roleUser.getType(), "menu") ? "菜单" : "职位"));
+
         if (StrUtil.isNotEmpty(roleUser.getId())) {
             coreRoleUserMapper.updateById(roleUser);
         } else {
             coreRoleUserMapper.insert(roleUser);
         }
 
-        onRoleChange(roleUser.getTypeId(), roleUser.getUserId());
+        onRoleChange("", roleUser.getUserId());
     }
 
 
@@ -171,7 +173,7 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
         coreRoleUser.setIsDeleted(1);
         coreRoleUserMapper.updateById(coreRoleUser);
 
-        onRoleChange(coreRoleUser.getTypeId(), coreRoleUser.getUserId());
+        onRoleChange("", coreRoleUser.getUserId());
     }
 
 
@@ -179,8 +181,13 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * 当授权发生变化时
      */
     public void onRoleChange(String roleId, String userId) {
-        TsCacheService.of().keys(StrUtil.format(TsAuthorityHandler.CACHE_HAS_AUTHORITY,
-                roleId, userId)).forEach(key -> TsCacheService.of().remove(key));
+        if (StrUtil.isEmpty(roleId)) {
+            TsCacheService.of().keys(StrUtil.replace(TsAuthorityHandler.CACHE_AUTHORITY,
+                    ":{}", "")).forEach(key -> TsCacheService.of().remove(key));
+        } else {
+            TsCacheService.of().keys(StrUtil.format(TsAuthorityHandler.CACHE_AUTHORITY,
+                    roleId, userId)).forEach(key -> TsCacheService.of().remove(key));
+        }
     }
 
 

springboot-role/src/main/java/com/tiesheng/role/service/RoleAuthorityHandler.java

@@ -60,6 +60,7 @@ public class RoleAuthorityHandler implements TsAuthorityHandler {
             groupAuthority.setParent(parentId);
             groupAuthority.setVersion(version);
             groupAuthority.setSource("auto");
+            groupAuthority.setDeps("[]");
             groupAuthority.setId(StrUtil.join("_", groupAuthority.getService(), groupAuthority.getNo()));
             list.add(groupAuthority);
         }

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
@@ -15,7 +15,6 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hutool.version>5.8.31</hutool.version>
     </properties>
 
     <dependencies>

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

@@ -17,7 +17,25 @@ public class ServletKit extends ServletUtil {
     public static HttpServletRequest getRequest() {
         ServletRequestAttributes attributes = (ServletRequestAttributes)
                 RequestContextHolder.getRequestAttributes();
-        return attributes.getRequest();
+        if (attributes != null) {
+            return attributes.getRequest();
+        }
+        return null;
+    }
+
+
+    /**
+     * 获取请求头
+     *
+     * @param name 请求头
+     * @return 请求头
+     */
+    public static String getHeader(String name) {
+        HttpServletRequest request = getRequest();
+        if (request == null) {
+            return "";
+        }
+        return getHeader(request, name, "utf-8");
     }
 
     /**
@@ -27,6 +45,9 @@ public class ServletKit extends ServletUtil {
      */
     public static String getClientIP() {
         HttpServletRequest request = getRequest();
+        if (request == null) {
+            return "";
+        }
         return getClientIP(request);
     }
 

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

@@ -1,15 +1,12 @@
 package com.tiesheng.util.config;
 
 import cn.hutool.core.codec.Base64;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.symmetric.SM4;
-import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.exception.ApiException;
-import com.tiesheng.util.service.TsCacheService;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -31,6 +28,7 @@ public class EncryptConfig {
     private String key = "WmdUzPJXbngVNiaSsQrihg==";
     private Integer saltSize = 8;
     private boolean body = false;
+    private String pwdPatten = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
 
     public EncryptConfig() {
         sm4 = SmUtil.sm4(Base64.decode(getKey()));
@@ -76,25 +74,13 @@ public class EncryptConfig {
         if (StrUtil.isEmpty(salt) || StrUtil.length(salt) != getSaltSize()) {
             salt = RandomUtil.randomString(saltSize);
         }
-        if (!passwdComplexity(inputPasswd)) {
-            throw new ApiException("需要包含数字、大小写字母、特殊符号，且长度不低于8位");
+        if (!inputPasswd.matches(getPwdPatten())) {
+            throw new ApiException("密码复杂度不够，请重新设置");
         }
         return encrypt(salt + SecureUtil.sha1(salt + inputPasswd));
     }
 
 
-    /**
-     * 复杂度校验
-     *
-     * @param inputPasswd
-     * @return
-     */
-    public boolean passwdComplexity(String inputPasswd) {
-        String password = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
-        return inputPasswd.matches(password);
-    }
-
-
     /**
      * 密码校验
      *
@@ -104,12 +90,6 @@ public class EncryptConfig {
         String salt = decrypt(encrypted).substring(0, saltSize);
         String inputEncrypted = passwdCreate(inputPasswd, salt);
         if (!StrUtil.equals(inputEncrypted, encrypted)) {
-            String clientIp = "passwdVerify_" + ServletKit.getClientIP();
-            int num = NumberUtil.parseInt(TsCacheService.of().get(clientIp, -1));
-            if (num > 5) {
-                throw new ApiException("登录失败已达6次，请10分钟后再试");
-            }
-            TsCacheService.of().put(clientIp, String.valueOf(num + 1), 10 * 60);
             throw new ApiException("账号或密码错误");
         }
     }
@@ -142,4 +122,12 @@ public class EncryptConfig {
     public void setBody(boolean body) {
         this.body = body;
     }
+
+    public String getPwdPatten() {
+        return pwdPatten;
+    }
+
+    public void setPwdPatten(String pwdPatten) {
+        this.pwdPatten = pwdPatten;
+    }
 }

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

@@ -66,6 +66,16 @@ public class TsTokenConfig {
         return validToken(token, thrExp);
     }
 
+    /**
+     * token是否有效
+     *
+     * @param token
+     * @return
+     */
+    public static boolean validToken(TokenBean token) {
+        return token != null && StrUtil.isNotEmpty(token.getId());
+    }
+
 
     /**
      * 验证token

springboot-util/src/main/java/com/tiesheng/util/jwt/JWT.java

@@ -384,7 +384,7 @@ public class JWT implements RegisteredPayload<JWT> {
 	 * @since 5.7.4
 	 */
 	public boolean validate(long leeway) {
-		if (false == verify()) {
+		if (!verify()) {
 			return false;
 		}
 

springboot-util/src/main/java/com/tiesheng/util/jwt/JWTValidator.java

@@ -160,13 +160,13 @@ public class JWTValidator {
 		}
 
 		final String algorithmIdInSigner = signer.getAlgorithmId();
-		if (false == StrUtil.equals(algorithmId, algorithmIdInSigner)) {
+		if (!StrUtil.equals(algorithmId, algorithmIdInSigner)) {
 			throw new ValidateException("Algorithm [{}] defined in header doesn't match to [{}]!"
 					, algorithmId, algorithmIdInSigner);
 		}
 
 		// 通过算法验证签名是否正确
-		if (false == jwt.verify(signer)) {
+		if (!jwt.verify(signer)) {
 			throw new ValidateException("Signature verification failed!");
 		}
 	}

springboot-util/src/main/java/com/tiesheng/util/service/TsCacheService.java

@@ -68,11 +68,11 @@ public class TsCacheService {
     /**
      * 获取key
      *
-     * @param pattern
+     * @param prefix
      * @return
      */
-    public Set<String> keys(String pattern) {
-        return tsCacheHandler.keys(pattern);
+    public Set<String> keys(String prefix) {
+        return tsCacheHandler.keys(prefix);
     }
 
 
@@ -84,7 +84,7 @@ public class TsCacheService {
      * 验证 图片验证码
      */
     public void verifyCaptcha(String value) {
-        String captchaKey = ServletUtil.getHeader(ServletKit.getRequest(), "captcha", "utf-8");
+        String captchaKey = ServletKit.getHeader("captcha");
         String cache = get(captchaKey);
         if (StrUtil.isEmpty(cache) || !StrUtil.equals(cache, value)) {
             throw new ApiException("验证码不正确");

springboot-util/src/main/java/com/tiesheng/util/service/cache/TsCacheTimedHandler.java

@@ -10,7 +10,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 @Configuration
-@ConditionalOnMissingBean(value = TsCacheHandler.class, ignored = {TsCacheTimedHandler.class, TsCacheTimedHandler.class})
+@ConditionalOnMissingBean(value = TsCacheHandler.class, ignored = {TsCacheTimedHandler.class})
 public class TsCacheTimedHandler implements TsCacheHandler {
 
     private static volatile TimedCache<String, String> timedCache;

springboot-util/src/main/java/com/tiesheng/util/service/http/OkHttpUtil.java

@@ -83,9 +83,11 @@ public class OkHttpUtil {
     }
 
     public static String get(String urlString, int timeout) {
-        try {
-            return ofHttpClient().connectTimeout(timeout, TimeUnit.MILLISECONDS)
-                    .build().newCall(ofGet(urlString)).execute().body().string();
+        try (Response execute = ofHttpClient().connectTimeout(timeout, TimeUnit.MILLISECONDS)
+                .build().newCall(ofGet(urlString)).execute()) {
+            if (execute.body() != null) {
+                return execute.body().string();
+            }
         } catch (IOException ignored) {
         }
         return null;
@@ -117,9 +119,11 @@ public class OkHttpUtil {
     }
 
     public static String post(String urlString, RequestBody body, int timeout) {
-        try {
-            return ofHttpClient().connectTimeout(timeout, TimeUnit.MILLISECONDS)
-                    .build().newCall(ofPost(urlString, body)).execute().body().string();
+        try (Response response = ofHttpClient().connectTimeout(timeout, TimeUnit.MILLISECONDS)
+                .build().newCall(ofPost(urlString, body)).execute()) {
+            if (response.body() != null) {
+                return response.body().string();
+            }
         } catch (IOException ignored) {
         }
         return null;
@@ -135,11 +139,10 @@ public class OkHttpUtil {
     }
 
     public static File downloadFile(String url, File destFile) {
-        try {
-            Response response = ofHttpClient()
-                    .connectTimeout(0, TimeUnit.MILLISECONDS)
-                    .readTimeout(0, TimeUnit.MILLISECONDS)
-                    .build().newCall(ofGet(url)).execute();
+        try (Response response = ofHttpClient()
+                .connectTimeout(0, TimeUnit.MILLISECONDS)
+                .readTimeout(0, TimeUnit.MILLISECONDS)
+                .build().newCall(ofGet(url)).execute()) {
             if (response.isSuccessful() && response.body() != null) {
                 FileUtil.writeFromStream(response.body().byteStream(), destFile);
             }
@@ -150,11 +153,10 @@ public class OkHttpUtil {
     }
 
     public static byte[] downloadBytes(String url) {
-        try {
-            Response response = ofHttpClient()
-                    .connectTimeout(0, TimeUnit.MILLISECONDS)
-                    .readTimeout(0, TimeUnit.MILLISECONDS)
-                    .build().newCall(ofGet(url)).execute();
+        try (Response response = ofHttpClient()
+                .connectTimeout(0, TimeUnit.MILLISECONDS)
+                .readTimeout(0, TimeUnit.MILLISECONDS)
+                .build().newCall(ofGet(url)).execute()) {
             if (response.isSuccessful() && response.body() != null) {
                 return response.body().bytes();
             }

springboot-util/src/main/java/com/tiesheng/util/service/role/TsAuthorityHandler.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Service
 public interface TsAuthorityHandler {
 
-    String CACHE_HAS_AUTHORITY = "CACHE:HAS_AUTHORITY:{}:{}";
+    String CACHE_AUTHORITY = "CACHE:AUTHORITY:{}:{}";
 
 
     /**

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc46</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
@@ -49,11 +49,6 @@
             <artifactId>springboot-database</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-poi</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.tiesheng.springboot-parent</groupId>
             <artifactId>springboot-login</artifactId>
@@ -64,11 +59,6 @@
             <artifactId>springboot-message</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-encrypt</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

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

@@ -1,7 +1,6 @@
 package com.tiesheng.web;
 
 import com.tiesheng.database.DatabaseAutoConfigurer;
-import com.tiesheng.encrypt.EncryptAutoConfigurer;
 import com.tiesheng.message.MessageAutoConfigurer;
 import com.tiesheng.platform.PlatformAutoConfigurer;
 import com.tiesheng.util.UtilAutoConfigurer;
@@ -21,7 +20,6 @@ import java.lang.annotation.*;
         MessageAutoConfigurer.class,
         WebAutoConfigurer.class,
         DatabaseAutoConfigurer.class,
-        EncryptAutoConfigurer.class,
         PlatformAutoConfigurer.class,
 })
 public @interface EnableTieshengWeb {

springboot-web/src/main/java/com/tiesheng/web/config/encrypt/DecryptRequestBodyAdvice.java

@@ -1,4 +1,4 @@
-package com.tiesheng.encrypt.config;
+package com.tiesheng.web.config.encrypt;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;

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

@@ -1,4 +1,4 @@
-package com.tiesheng.encrypt.config;
+package com.tiesheng.web.config.encrypt;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.log.LogFactory;

springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java

@@ -56,8 +56,12 @@ public class OperationAspect {
     @Around("methodArgs()")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
 
-        // GET请求不处理
         HttpServletRequest request = ServletKit.getRequest();
+        if (request == null) {
+            return joinPoint.proceed();
+        }
+
+        // GET请求不处理
         if (StrUtil.equalsIgnoreCase(request.getMethod(), "GET")) {
             return joinPoint.proceed(joinPoint.getArgs());
         }

springboot-web/src/main/java/com/tiesheng/web/config/role/RoleAuthorityAspect.java

@@ -15,6 +15,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
 
 @Aspect
 @Component
+@ConditionalOnBean(value = TsAuthorityHandler.class)
 public class RoleAuthorityAspect {
 
     @Resource
@@ -56,7 +58,7 @@ public class RoleAuthorityAspect {
 
         HttpServletRequest request = ServletKit.getRequest();
         TokenBean tokenBean = tsTokenConfig.validToken(request, true);
-        String cacheKey = StrUtil.format(TsAuthorityHandler.CACHE_HAS_AUTHORITY, tokenBean.getRoleId(), tokenBean.getId());
+        String cacheKey = StrUtil.format(TsAuthorityHandler.CACHE_AUTHORITY, tokenBean.getRoleId(), tokenBean.getId());
         List<String> authorityList = StrUtil.split(TsCacheService.of().get(cacheKey), ";")
                 .stream().filter(StrUtil::isNotEmpty).collect(Collectors.toList());
         if (CollUtil.isEmpty(authorityList)) {

springboot-web/src/main/java/com/tiesheng/web/config/role/RoleAuthorityCreator.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.util.service.role.TsAuthorityHandler;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -18,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
+@ConditionalOnBean(value = TsAuthorityHandler.class)
 public class RoleAuthorityCreator implements ApplicationListener<ContextRefreshedEvent> {
 
     @Resource

springboot-web/src/main/java/com/tiesheng/web/controller/comm/CommWebController.java

@@ -62,6 +62,7 @@ public class CommWebController {
         QueryWrapper<CoreConfigEnum> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", 0);
         queryWrapper.eq("type", dto.getType());
+        queryWrapper.orderByAsc("type", "sort");
         List<CoreConfigEnum> selectList = coreConfigService.getEnumMapper().selectList(queryWrapper);
 
         return ApiResp.respOK(selectList);

springboot-web/src/main/java/com/tiesheng/web/controller/system/ConfigEnumController.java

@@ -41,6 +41,7 @@ public class ConfigEnumController {
         if (!StrUtil.isEmpty(dto.getType())) {
             queryWrapper.eq("type", dto.getType());
         }
+        queryWrapper.orderByAsc("type", "sort");
         List<CoreConfigEnum> selectList = coreConfigService.getEnumMapper().selectList(queryWrapper);
 
         return ApiResp.respOK(selectList);

springboot-web/src/main/java/com/tiesheng/web/controller/system/LogApiController.java

@@ -41,7 +41,7 @@ public class LogApiController {
         if (!StrUtil.isEmpty(result)) {
             queryWrapper.eq("result", result);
         }
-        dto.likeColumns(queryWrapper, "type", "content");
+        dto.likeColumns(queryWrapper, "type", "url", "content");
         queryWrapper.orderByDesc("create_time");
 
         Page<CoreLogApi> page = dto.pageObj();

springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigEnum.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.tiesheng.util.pojos.DaoBase;
 
 /**
-    * 配置-枚举
-    */
+ * 配置-枚举
+ */
 @TableName(value = "core_config_enum")
 public class CoreConfigEnum extends DaoBase {
     /**
@@ -21,6 +21,12 @@ public class CoreConfigEnum extends DaoBase {
     @TableField(value = "`name`")
     private String name;
 
+    /**
+     * 排序
+     */
+    @TableField(value = "sort")
+    private Integer sort;
+
     /**
      * 备注
      */
@@ -69,6 +75,24 @@ public class CoreConfigEnum extends DaoBase {
         this.name = name;
     }
 
+    /**
+     * 获取排序
+     *
+     * @return sort - 排序
+     */
+    public Integer getSort() {
+        return sort;
+    }
+
+    /**
+     * 设置排序
+     *
+     * @param sort 排序
+     */
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
     /**
      * 获取备注
      *

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

@@ -26,6 +26,10 @@ public class ImageCodeDTO {
         if (height == null) {
             height = 62;
         }
+
+        width = Math.min(width, 500);
+        height = Math.min(height, 200);
+
         LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(width, height, 4, lineCount);
         lineCaptcha.setGenerator(new RandomGenerator("0123456789", 4));
 

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

@@ -23,7 +23,6 @@ import com.tiesheng.web.util.ProcessSyncConsumer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -32,11 +31,6 @@ import java.util.List;
 @Service
 public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLogOperation> {
 
-    /**
-     * 日志缓存
-     */
-    private static final List<CoreLogOperation> cacheOperations = new ArrayList<>();
-
     @Autowired
     TieshengWebConfigurer tieshengWebConfigurer;
     @Autowired
@@ -180,14 +174,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         if (params != null) {
             operation.setParams(JSON.toJSONString(params));
         }
-
-        synchronized (CoreLogOperation.class) {
-            cacheOperations.add(operation);
-            if (cacheOperations.size() >= 100) {
-                getBaseMapper().batchInsert(cacheOperations);
-                cacheOperations.clear();
-            }
-        }
+        save(operation);
     }
 
 

springboot-web/src/main/java/com/tiesheng/web/service/OkHttpLogInterceptor.java

@@ -1,6 +1,7 @@
 package com.tiesheng.web.service;
 
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.util.service.http.OkHttpUtil;
 import com.tiesheng.web.mapper.CoreLogApiMapper;
@@ -13,7 +14,7 @@ import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 @Component
-public class LogApiOkHttpInterceptor implements Interceptor {
+public class OkHttpLogInterceptor implements Interceptor {
 
     @Resource
     CoreLogApiMapper coreLogApiMapper;
@@ -32,10 +33,18 @@ public class LogApiOkHttpInterceptor implements Interceptor {
         Response response;
         try {
             response = chain.proceed(request);
-            ResponseBody peekBody = response.peekBody(Long.MAX_VALUE);
-            logApi.setRespBody(peekBody.string());
             logApi.setResult(response.code());
-            peekBody.close();
+
+            // 如果是json,xml,text，则保存记录
+            if (response.body() != null) {
+                MediaType mediaType = response.body().contentType();
+                String contentType = mediaType == null ? "" : mediaType.toString();
+                if (StrUtil.containsAny(contentType, "json", "xml", "text")) {
+                    ResponseBody peekBody = response.peekBody(Long.MAX_VALUE);
+                    logApi.setRespBody(peekBody.string());
+                    peekBody.close();
+                }
+            }
         } catch (Exception e) {
 
             JSONObject object = new JSONObject();
@@ -46,6 +55,9 @@ public class LogApiOkHttpInterceptor implements Interceptor {
 
             response = new Response.Builder()
                     .request(request)
+                    .protocol(Protocol.HTTP_1_1)
+                    .code(logApi.getResult())
+                    .message(e.getMessage())
                     .body(OkHttpUtil.ofJsonResponse(logApi.getRespBody()))
                     .build();
         }

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

@@ -33,4 +33,7 @@ CREATE TABLE `core_config_system`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='配置-系统';
 
+alter table core_config_enum
+    add sort int(10) not null default 0 comment '排序' after name;
+
 SET FOREIGN_KEY_CHECKS = 1;

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

@@ -78,4 +78,12 @@ alter table core_log_process
 alter table core_log_process
     change fail_file result_file varchar(500) null comment '失败的文件';
 
+## 2.0.2
+
+alter table core_log_login
+    add result int(10) not null default 1 comment '登录结果,0否，1是';
+
+alter table core_log_login
+    add params longtext null comment '请求参数';
+
 SET FOREIGN_KEY_CHECKS = 1;

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

@@ -10,11 +10,12 @@
     <result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="ext" jdbcType="VARCHAR" property="ext" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, `type`, `name`, remark, ext
+    id, create_time, update_time, is_deleted, `type`, `name`, sort, remark, ext
   </sql>
-</mapper>
+</mapper>