publish 1.0.0

.gitlab-ci.yml

@@ -9,8 +9,8 @@ deploy-jar:
   rules:
     - if: $CI_COMMIT_TAG
   script:
-    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:/usr/local/nginx/html/kepai-repo
-    - cd /usr/local/nginx/html/kepai-repo
+    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:/usr/local/nginx/html/tiesheng-repo
+    - cd /usr/local/nginx/html/tiesheng-repo
     - git checkout master
     - git pull
     - git add .

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.9.11</version>
+    <version>1.0.0</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>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.9.11</version>
+                <version>1.0.0</version>
             </dependency>
 
             <dependency>
@@ -117,7 +117,7 @@
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.3</version>
             </dependency>
 
         </dependencies>
@@ -126,7 +126,7 @@
     <pluginRepositories>
         <pluginRepository>
             <id>kepai-repo-plugin</id>
-            <url>http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master</url>
+            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
         </pluginRepository>
     </pluginRepositories>
 

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.11</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
@@ -36,7 +36,7 @@
     <repositories>
         <repository>
             <id>kepai-repo</id>
-            <url>http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master</url>
+            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
         </repository>
     </repositories>
 

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.11</version>
+        <version>1.0.0</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>0.9.11</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
@@ -33,14 +33,14 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.11</version>
+            <version>5.8.16</version>
         </dependency>
 
         <!-- fastJson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.78</version>
+            <version>1.2.83</version>
         </dependency>
 
         <!--   加解密     -->

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

@@ -5,6 +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.log.LogFactory;
 import com.tiesheng.util.exception.ApiException;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -13,6 +14,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,12 +73,24 @@ public class GlobalConfig {
         }
         PathMatchingResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
         try {
-            Resource[] resources = patternResolver.getResources(String.format("classpath*:static/%s*/index.html", htmlDir));
             List<String> versions = new ArrayList<>();
+
+            // jar包中的资源
+            Resource[] resources = patternResolver.getResources(String.format("classpath*:static/%s*/index.html", htmlDir));
             for (Resource resource : resources) {
                 String path = FileUtil.normalize(resource.getURL().getPath());
                 versions.add(StrUtil.subBetween(path, htmlDir, "/index.html"));
             }
+
+            // 目录中的资源
+            String folder = String.format("%s/static/%s", System.getProperty("user.dir"), htmlDir);
+            if (FileUtil.exist(folder)) {
+                File[] files = FileUtil.ls(folder);
+                for (File file : files) {
+                    versions.add(StrUtil.subAfter(file.getAbsolutePath(), htmlDir, true));
+                }
+            }
+
             if (CollUtil.isEmpty(versions)) {
                 throw new ApiException("无法重定向，请检查资源");
             }

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

@@ -16,7 +16,7 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "tiesheng.ip2region")
 public class Ip2regionConfig {
 
-    private String dbUrl = "http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master/ipdb/ip2region.xdb";
+    private String dbUrl = "http://git.kepai365.com/tiesheng/repository/raw/master/ipdb/ip2region.xdb";
     private String dbPath = System.getProperty("user.dir") + "/runtime/ip2region/ip2region.xdb";
 
     ///////////////////////////////////////////////////////////////////////////

springboot-web/pom.xml

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

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

@@ -14,6 +14,7 @@ import com.tiesheng.core.pojos.dto.config.ConfigFuncDTO;
 import com.tiesheng.core.pojos.dto.config.ConfigSystemDTO;
 import com.tiesheng.core.pojos.dto.config.EnumTypeDTO;
 import com.tiesheng.core.service.CoreConfigService;
+import com.tiesheng.core.service.TieshengWebConfigurer;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@ public class ConfigController {
 
     @Autowired
     CoreConfigService coreConfigService;
+    @Autowired
+    TieshengWebConfigurer tieshengWebConfigurer;
 
 
     /**
@@ -72,6 +75,8 @@ public class ConfigController {
         configKey.setConfigVal(dto.getConfigVal());
         configKey.setRemark(dto.getRemark());
         configKey.setExtra(dto.getExtra());
+
+        tieshengWebConfigurer.configSystemCheck(configKey);
         coreConfigService.updateById(configKey);
 
         return ApiResp.respOK("");

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.tiesheng.core.pojos.DaoBase;
-
 import java.util.Date;
 
 /**
@@ -37,12 +36,6 @@ public class CoreLogProcess extends DaoBase {
     @TableField(value = "fail_num")
     private Integer failNum;
 
-    /**
-     * 失败的文件
-     */
-    @TableField(value = "fail_file")
-    private String failFile;
-
     /**
      * 类型（import-导入，sync-同步）
      */
@@ -50,11 +43,29 @@ public class CoreLogProcess extends DaoBase {
     private String type;
 
     /**
-     * 状态(0-未完成，1-完成)
+     * 状态（0-未完成，1-已完成）
      */
     @TableField(value = "`status`")
     private Integer status;
 
+    /**
+     * 失败的文件
+     */
+    @TableField(value = "fail_file")
+    private String failFile;
+
+    /**
+     * 异常说明
+     */
+    @TableField(value = "error")
+    private String error;
+
+    /**
+     * 进度
+     */
+    @TableField(value = "`process`")
+    private Integer process;
+
     /**
      * 获取标题
      *
@@ -127,14 +138,6 @@ public class CoreLogProcess extends DaoBase {
         this.failNum = failNum;
     }
 
-    public String getFailFile() {
-        return failFile;
-    }
-
-    public void setFailFile(String failFile) {
-        this.failFile = failFile;
-    }
-
     /**
      * 获取类型（import-导入，sync-同步）
      *
@@ -154,20 +157,74 @@ public class CoreLogProcess extends DaoBase {
     }
 
     /**
-     * 获取状态(0-未完成，1-完成)
+     * 获取状态（0-未完成，1-已完成）
      *
-     * @return status - 状态(0-未完成，1-完成)
+     * @return status - 状态（0-未完成，1-已完成）
      */
     public Integer getStatus() {
         return status;
     }
 
     /**
-     * 设置状态(0-未完成，1-完成)
+     * 设置状态（0-未完成，1-已完成）
      *
-     * @param status 状态(0-未完成，1-完成)
+     * @param status 状态（0-未完成，1-已完成）
      */
     public void setStatus(Integer status) {
         this.status = status;
     }
-}
+
+    /**
+     * 获取失败的文件
+     *
+     * @return fail_file - 失败的文件
+     */
+    public String getFailFile() {
+        return failFile;
+    }
+
+    /**
+     * 设置失败的文件
+     *
+     * @param failFile 失败的文件
+     */
+    public void setFailFile(String failFile) {
+        this.failFile = failFile;
+    }
+
+    /**
+     * 获取异常说明
+     *
+     * @return error - 异常说明
+     */
+    public String getError() {
+        return error;
+    }
+
+    /**
+     * 设置异常说明
+     *
+     * @param error 异常说明
+     */
+    public void setError(String error) {
+        this.error = error;
+    }
+
+    /**
+     * 获取进度
+     *
+     * @return process - 进度
+     */
+    public Integer getProcess() {
+        return process;
+    }
+
+    /**
+     * 设置进度
+     *
+     * @param process 进度
+     */
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
+}

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

@@ -13,12 +13,16 @@ public class ProcessDetailVo {
 
     private Integer failNum;
 
+    private Integer process;
+
     private String type;
 
     private Integer status;
 
     private String failFile;
 
+    private String error;
+
     public Integer getStatus() {
         return status;
     }
@@ -74,4 +78,20 @@ public class ProcessDetailVo {
     public void setFailFile(String failFile) {
         this.failFile = failFile;
     }
+
+    public Integer getProcess() {
+        return process;
+    }
+
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
 }

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

@@ -79,21 +79,28 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcess.setType("import");
         coreLogProcess.setSuccessNum(0);
         coreLogProcess.setFailNum(0);
+        coreLogProcess.setProcess(0);
+        coreLogProcess.setError("");
         coreLogProcessMapper.insert(coreLogProcess);
 
         ThreadUtil.execute(() -> {
             CollUtil.split(list, 100).forEach((it) -> {
-                int accept = consumer.accept(it);
+                int accept = 0;
+                try {
+                    accept = consumer.accept(it);
+                } catch (Exception e) {
+                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
+                }
+                coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
                 coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
                 coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
-
-                if (coreLogProcess.getFailNum() + coreLogProcess.getSuccessNum() >= list.size()) {
-                    coreLogProcess.setFailFile(consumer.getFailFile());
-                    coreLogProcess.setStatus(1);
-                }
-
                 coreLogProcessMapper.updateById(coreLogProcess);
             });
+
+            // 执行结束
+            coreLogProcess.setFailFile(consumer.getFailFile());
+            coreLogProcess.setStatus(1);
+            coreLogProcessMapper.updateById(coreLogProcess);
         });
 
 
@@ -111,24 +118,34 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     public CoreLogProcess addProcess(String title, ProcessSyncConsumer consumer) {
         CoreLogProcess coreLogProcess = new CoreLogProcess();
         coreLogProcess.setTitle(title);
-        coreLogProcess.setTotal(0);
+
         coreLogProcess.setType("sync");
         coreLogProcess.setSuccessNum(0);
         coreLogProcess.setFailNum(0);
+        coreLogProcess.setTotal(0);
+        coreLogProcess.setProcess(0);
+        coreLogProcess.setError("");
         coreLogProcessMapper.insert(coreLogProcess);
 
         ThreadUtil.execute(() -> {
             int pageSize = 1000;
             int pageNum = 1, lastCount = pageSize;
             while (lastCount == pageSize) {
-                lastCount = consumer.accept(pageNum, pageSize);
-                coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
-                if (lastCount != pageSize) {
-                    coreLogProcess.setStatus(1);
+                try {
+                    lastCount = consumer.accept(pageNum, pageSize);
+                    coreLogProcess.setTotal(coreLogProcess.getTotal() + lastCount);
+                    coreLogProcess.setProcess(coreLogProcess.getTotal());
+                    coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
+                } catch (Exception e) {
+                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
                 }
                 coreLogProcessMapper.updateById(coreLogProcess);
                 pageNum++;
             }
+
+            // 执行结束
+            coreLogProcess.setStatus(1);
+            coreLogProcessMapper.updateById(coreLogProcess);
         });
 
         return coreLogProcess;

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

@@ -2,6 +2,7 @@ package com.tiesheng.core.service;
 
 import cn.hutool.log.LogFactory;
 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.exception.ApiRespEnum;
@@ -54,6 +55,14 @@ public interface TieshengWebConfigurer {
         return uploadPath;
     }
 
+
+    /**
+     * 系统配置验证
+     * 如果不符合规则，可以抛出异常
+     */
+    default void configSystemCheck(CoreConfigSystem configSystem) {
+    }
+
     /**
      * 登录逻辑
      *

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

@@ -64,6 +64,12 @@ ALTER TABLE core_log_process
 ALTER TABLE core_log_process
     ADD fail_file varchar(500) null default null COMMENT '失败的文件';
 
+ALTER TABLE core_log_process
+    ADD error text null default null COMMENT '异常说明';
+
+ALTER TABLE core_log_process
+    ADD process int(6) not null default 0 COMMENT '进度';
+
 -- ----------------------------
 -- Table structure for core_log_operation
 -- ----------------------------

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

@@ -15,10 +15,12 @@
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="fail_file" jdbcType="VARCHAR" property="failFile" />
+    <result column="error" jdbcType="LONGVARCHAR" property="error" />
+    <result column="process" jdbcType="INTEGER" property="process" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`,
-    `status`, fail_file
+    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, 
+    `status`, fail_file, error, `process`
   </sql>
-</mapper>
+</mapper>