publish 1.0.13

1，不再返回params字段
2，params字段有text改为longtext

.gitlab-ci.yml

@@ -1,18 +1,5 @@
 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

CHANGELOG.md

@@ -1,5 +1,15 @@
-## 1.0.10
+## 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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.0.12</version>
+    <version>1.0.13</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.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.12</version>
+                <version>1.0.13</version>
             </dependency>
 
             <dependency>
@@ -136,7 +136,7 @@
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.6</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.12</version>
+        <version>1.0.13</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.1.0</version>
+    <version>1.0.13</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

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-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.12</version>
+        <version>1.0.13</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.12</version>
+        <version>1.0.13</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.12</version>
+        <version>1.0.13</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

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

springboot-message/pom.xml

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

springboot-platform/pom.xml

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

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

@@ -5,6 +5,7 @@ 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;
@@ -125,9 +126,11 @@ public class PlatformDingConfig {
      * @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) {
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo?access_token=" + getAccessToken(service))
-                .body(JSONUtil.createObj().putOpt("code", code).toString()).execute().body();
-        return JSONUtil.parseObj(response).getJSONObject("result").getStr("userid");
+        HttpRequest request = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo?access_token=" + getAccessToken(service))
+                .body(JSONUtil.createObj().putOpt("code", code).toString());
+        try (HttpResponse response = request.execute()) {
+            return JSONUtil.parseObj(response.body()).getJSONObject("result").getStr("userid");
+        }
     }
 
 
@@ -141,15 +144,16 @@ 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);
-
-        // 设置一下job_number
-        userInfo.setJobNumber(resultJson.getStr("job_number"));
-        userInfo.setAppId(dingConfigBean.getAppKey());
-        return userInfo;
+        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/get?access_token="
+                        + getAccessToken(service))
+                .body(JSONUtil.createObj().putOpt("userid", ddUserId).toString()).execute()) {
+            JSONObject resultJson = JSONUtil.parseObj(response.body()).getJSONObject("result");
+            DingUserInfo userInfo = JSONUtil.toBean(resultJson, DingUserInfo.class);
+            // 设置一下job_number
+            userInfo.setJobNumber(resultJson.getStr("job_number"));
+            userInfo.setAppId(dingConfigBean.getAppKey());
+            return userInfo;
+        }
     }
 
     /**
@@ -164,15 +168,16 @@ 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);
+        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/department/listsub?access_token=" + token)
+                .body(JSONUtil.createObj().putOpt("dept_id", deptId).toString()).execute()) {
+            DingResponse<List<DingDeptVo>> result = JSONUtil.toBean(response.body(), new TypeReference<DingResponse<List<DingDeptVo>>>() {
+            }.getType(), true);
 
-        if (!result.isOk()) {
-            result.setResult(new ArrayList<>());
+            if (!result.isOk()) {
+                result.setResult(new ArrayList<>());
+            }
+            return result.getResult();
         }
-        return result.getResult();
     }
 
 
@@ -187,16 +192,16 @@ public class PlatformDingConfig {
         if (StrUtil.isEmpty(token)) {
             return DingUserListVo.fail();
         }
-
-        String response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/list?access_token=" + token)
+        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/list?access_token=" + token)
                 .body(JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100).toString())
-                .execute().body();
-        DingResponse<DingUserListVo> result = JSONUtil.toBean(response, new TypeReference<DingResponse<DingUserListVo>>() {
-        }.getType(), true);
-        if (!result.isOk()) {
-            result.setResult(DingUserListVo.fail());
+                .execute()) {
+            DingResponse<DingUserListVo> result = JSONUtil.toBean(response.body(), new TypeReference<DingResponse<DingUserListVo>>() {
+            }.getType(), true);
+            if (!result.isOk()) {
+                result.setResult(DingUserListVo.fail());
+            }
+            return result.getResult();
         }
-        return result.getResult();
     }
 
     /**

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();
-        JSONObject object = JSONUtil.parseObj(body);
-        return object.getStr("openid");
+                + "&js_code=" + code + "&grant_type=authorization_code").execute()) {
+            JSONObject object = JSONUtil.parseObj(response.body());
+            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();
-        JSONObject object = JSONUtil.parseObj(body);
-        return object.getStr("access_token");
+                + "&secret=" + configBean.getAppSecret()).execute()) {
+            JSONObject object = JSONUtil.parseObj(response.body());
+            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.12</version>
+        <version>1.0.13</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.12</version>
+        <version>1.0.13</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

@@ -73,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)) {

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

@@ -5,7 +5,7 @@ import cn.hutool.core.comparator.VersionComparator;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 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 +13,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 +33,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)) {
@@ -138,4 +167,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.12</version>
+        <version>1.0.13</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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/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/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/CorePlatformUniqueService.java

@@ -8,6 +8,7 @@ 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;
 
@@ -23,6 +24,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());

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) -> {
-            if (Integer.parseInt(o1.getName()) > Integer.parseInt(o2.getName())) {
-                return 1;
-            }
-            return -1;
-        });
+        chunkFileList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getName())));
         return chunkFileList;
     }
 

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>