publish 0.8.7

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.8.6</version>
+    <version>0.8.7</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.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.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>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
+import cn.hutool.log.LogFactory;
 import com.tiesheng.database.config.DbMigrationConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
@@ -22,6 +23,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.zip.Checksum;
 
 /**
@@ -92,6 +94,8 @@ public class DbMigrationInitializer implements ServletContextInitializer {
         if (entity == null) {
             return;
         }
+        AtomicReference<Integer> success= new AtomicReference<>(0);
+        AtomicReference<Integer> fail= new AtomicReference<>(0);
         db.tx((VoidFunc1<Db>) parameter -> {
             List<String> split = StrUtil.split(readUtf8, ";");
             for (String sql : split) {
@@ -104,11 +108,13 @@ public class DbMigrationInitializer implements ServletContextInitializer {
                 }
                 try {
                     parameter.execute(sql);
+                    success.getAndSet(success.get() + 1);
                 } catch (Exception ignore) {
+                    fail.getAndSet(fail.get() + 1);
                 }
             }
         });
-
+        LogFactory.get().info("执行sql文件{},成功数：{}，失败数：{}。",filename,success.get(),fail.get());
         entity.set("checksum", checksum.getValue());
         entity.set("update_time", DateUtil.date());
         db.update(entity, Entity.create(dbMigrationConfig.getTable()).set("id", entity.get("id")));

springboot-encrypt/pom.xml

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

springboot-web/pom.xml

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

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

@@ -42,6 +42,12 @@ public class CoreLogProcess extends DaoBase {
     @TableField(value = "`type`")
     private String type;
 
+    /**
+     * 状态(0-未完成，1-完成)
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
     /**
      * 获取标题
      *
@@ -131,4 +137,22 @@ public class CoreLogProcess extends DaoBase {
     public void setType(String type) {
         this.type = type;
     }
+
+    /**
+     * 获取状态(0-未完成，1-完成)
+     *
+     * @return status - 状态(0-未完成，1-完成)
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态(0-未完成，1-完成)
+     *
+     * @param status 状态(0-未完成，1-完成)
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

@@ -15,6 +15,16 @@ public class ProcessDetailVo {
 
     private String type;
 
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getTitle() {
         return title;
     }

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

@@ -74,8 +74,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      * @param successNum 成功数
      * @param failNum    失败数
      * @param type       类型（import-导出，sync-同步）
+     * @param status     状态（0-未完成，1-完成）
      */
-    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type) {
+    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type, Integer status) {
         CoreLogProcess coreLogProcess = new CoreLogProcess();
         coreLogProcess.setId(id);
         coreLogProcess.setTitle(title);
@@ -83,6 +84,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcess.setSuccessNum(successNum);
         coreLogProcess.setFailNum(failNum);
         coreLogProcess.setType(type);
+        coreLogProcess.setStatus(status);
         coreLogProcessMapper.updateById(coreLogProcess);
     }
 
@@ -97,7 +99,6 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     }
 
 
-
     /**
      * 添加操作日志
      */

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

@@ -33,8 +33,12 @@ CREATE TABLE `core_log_process`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Records of core_log_process
 -- ----------------------------
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+ALTER TABLE core_log_process ADD status int(6) default 0 COMMENT '状态（0-未完成，1-已完成）';
+commit;

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

@@ -13,9 +13,11 @@
     <result column="success_num" jdbcType="INTEGER" property="successNum" />
     <result column="fail_num" jdbcType="INTEGER" property="failNum" />
     <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`
+    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, 
+    `status`
   </sql>
 </mapper>