publish 0.8.4

.gitea/workflows/mvn-deploy.yaml

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

.gitignore

@@ -6,3 +6,4 @@ rebel.xml
 /static/
 /config/
 /runtime/
+.DS_Store

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.8.6</version>
+    <version>0.8.4</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.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.4</version>
             </dependency>
 
             <dependency>
@@ -125,18 +125,25 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>kepai-repo-plugin</id>
-            <url>http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master</url>
+            <id>tiesheng-repo-plugin</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>tiesheng-gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.5</version>
+                    <version>1.0.0</version>
                     <executions>
                         <execution>
                             <goals>

springboot-ademo/pom.xml

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

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

@@ -41,6 +41,7 @@ public class TestController {
 
 
     @RequestMapping("/index")
+    @TokenIgnore
     public ApiResp<String> index() {
 
         TokenBean tokenBean = new TokenBean("11", "", "fdfd");
@@ -66,6 +67,7 @@ public class TestController {
 
 
     @RequestMapping("/export")
+    @TokenIgnore
     public ApiResp<String> export() {
 
 //        List<TestFile> list = new ArrayList<>();

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

@@ -20,7 +20,3 @@ spring:
 logging:
   file:
     name: runtime/logs/tiesheng.log
-tiesheng:
-  token:
-    ignore-paths:
-      - /test/index

springboot-annotation/pom.xml

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

springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java

@@ -1,6 +1,5 @@
 package com.tiesheng.login.config.token;
 
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.util.ServletKit;
@@ -51,18 +50,8 @@ public class TsTokenAspect {
 
         // 过滤不要需要验证的接口（path）
         String requestURI = ServletKit.getRequest().getRequestURI();
-        String[] ignorePaths = tsTokenConfig.getIgnorePaths();
-        if (ObjUtil.isNotEmpty(ignorePaths)) {
-            for (String path : ignorePaths) {
-                if (path.contains("/**") &&
-                        StrUtil.startWith(requestURI, path.replace("/**", ""))) {
-                    // 通配路径
-                    return;
-                } else if (requestURI.equals(path)) {
-                    // 完整路径
-                    return;
-                }
-            }
+        if (StrUtil.startWithAnyIgnoreCase(requestURI, tsTokenConfig.getIgnorePaths())) {
+            return;
         }
 
         // 过滤不要需要验证的接口（注解）

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.4</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.4</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.4</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.4</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

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

@@ -23,7 +23,6 @@ public class GlobalConfig {
     private String host;
     private String service;
     private String version;
-    private String uploadDir = System.getProperty("user.dir");
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -81,15 +80,6 @@ public class GlobalConfig {
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////
 
-
-    public String getUploadDir() {
-        return uploadDir;
-    }
-
-    public void setUploadDir(String uploadDir) {
-        this.uploadDir = uploadDir;
-    }
-
     public String getHost() {
         return host;
     }

springboot-util/src/main/java/com/tiesheng/util/pojos/FileUploadPath.java

@@ -5,9 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HttpUtil;
-import com.tiesheng.util.config.GlobalConfig;
 
 public class FileUploadPath {
 
@@ -48,7 +46,7 @@ public class FileUploadPath {
         }
         pathBean.setHttpPath(tempPath);
 
-        String tempAbs = String.format("%s/static%s", SpringUtil.getBean(GlobalConfig.class).getUploadDir(), tempPath);
+        String tempAbs = String.format("%s/static%s", System.getProperty("user.dir"), tempPath);
         tempAbs = FileUtil.normalize(tempAbs);
         pathBean.setAbsolutePath(tempAbs);
 

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.4</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
-import com.tiesheng.core.pojos.dao.CoreLogProcess;
 import com.tiesheng.core.pojos.dto.PageDTO;
-import com.tiesheng.core.pojos.vo.ProcessDetailVo;
 import com.tiesheng.core.service.CoreLogService;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,36 +88,4 @@ public class LogController {
         return ApiResp.respOK(page.getRecords(), page.getTotal());
     }
 
-
-    /**
-     * 过程日志列表
-     *
-     * @return
-     */
-    @GetMapping("/process/page")
-    public ApiResp<List<CoreLogProcess>> processPage(String type, @Valid PageDTO dto) {
-
-        QueryWrapper<CoreLogProcess> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted", 0);
-        if (!StrUtil.isEmpty(type)) {
-            queryWrapper.eq("type", type);
-        }
-        dto.likeColumns(queryWrapper, "title");
-        queryWrapper.orderByDesc("create_time");
-
-        Page<CoreLogProcess> page = dto.pageObj();
-        coreLogService.getCoreLogProcessMapper().selectPage(page, queryWrapper);
-        return ApiResp.respOK(page.getRecords(), page.getTotal());
-    }
-
-    /**
-     * 过程日志详情
-     *
-     * @return
-     */
-    @GetMapping("/process/detail")
-    public ApiResp<ProcessDetailVo> processPage(String id) {
-        ProcessDetailVo processDetail = coreLogService.getProcessDetail(id);
-        return ApiResp.respOK(processDetail);
-    }
 }

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

@@ -1,7 +0,0 @@
-package com.tiesheng.core.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tiesheng.core.pojos.dao.CoreLogProcess;
-
-public interface CoreLogProcessMapper extends BaseMapper<CoreLogProcess> {
-}

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

@@ -1,134 +0,0 @@
-package com.tiesheng.core.pojos.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-
-/**
-    * 日志-过程
-    */
-@TableName(value = "core_log_process")
-public class CoreLogProcess extends DaoBase {
-    /**
-     * 标题
-     */
-    @TableField(value = "title")
-    private String title;
-
-    /**
-     * 总数
-     */
-    @TableField(value = "total")
-    private Integer total;
-
-    /**
-     * 成功数
-     */
-    @TableField(value = "success_num")
-    private Integer successNum;
-
-    /**
-     * 失败数
-     */
-    @TableField(value = "fail_num")
-    private Integer failNum;
-
-    /**
-     * 类型（import-导入，sync-同步）
-     */
-    @TableField(value = "`type`")
-    private String type;
-
-    /**
-     * 获取标题
-     *
-     * @return title - 标题
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 设置标题
-     *
-     * @param title 标题
-     */
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    /**
-     * 获取总数
-     *
-     * @return total - 总数
-     */
-    public Integer getTotal() {
-        return total;
-    }
-
-    /**
-     * 设置总数
-     *
-     * @param total 总数
-     */
-    public void setTotal(Integer total) {
-        this.total = total;
-    }
-
-    /**
-     * 获取成功数
-     *
-     * @return success_num - 成功数
-     */
-    public Integer getSuccessNum() {
-        return successNum;
-    }
-
-    /**
-     * 设置成功数
-     *
-     * @param successNum 成功数
-     */
-    public void setSuccessNum(Integer successNum) {
-        this.successNum = successNum;
-    }
-
-    /**
-     * 获取失败数
-     *
-     * @return fail_num - 失败数
-     */
-    public Integer getFailNum() {
-        return failNum;
-    }
-
-    /**
-     * 设置失败数
-     *
-     * @param failNum 失败数
-     */
-    public void setFailNum(Integer failNum) {
-        this.failNum = failNum;
-    }
-
-    /**
-     * 获取类型（import-导入，sync-同步）
-     *
-     * @return type - 类型（import-导入，sync-同步）
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * 设置类型（import-导入，sync-同步）
-     *
-     * @param type 类型（import-导入，sync-同步）
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.tiesheng.core.pojos.vo;
-
-/**
- * @author lgc
- */
-public class ProcessDetailVo {
-
-    private String title;
-
-    private Integer total;
-
-    private Integer successNum;
-
-    private Integer failNum;
-
-    private String type;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Integer getTotal() {
-        return total;
-    }
-
-    public void setTotal(Integer total) {
-        this.total = total;
-    }
-
-    public Integer getSuccessNum() {
-        return successNum;
-    }
-
-    public void setSuccessNum(Integer successNum) {
-        this.successNum = successNum;
-    }
-
-    public Integer getFailNum() {
-        return failNum;
-    }
-
-    public void setFailNum(Integer failNum) {
-        this.failNum = failNum;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

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

@@ -4,14 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
 import com.tiesheng.core.mapper.CoreLogOperationMapper;
-import com.tiesheng.core.mapper.CoreLogProcessMapper;
 import com.tiesheng.core.pojos.RequestUserInfo;
-import com.tiesheng.core.pojos.dao.*;
-import com.tiesheng.core.pojos.vo.ProcessDetailVo;
+import com.tiesheng.core.pojos.dao.CoreLogLogin;
+import com.tiesheng.core.pojos.dao.CoreLogMessage;
+import com.tiesheng.core.pojos.dao.CoreLogOperation;
+import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.pojos.MessageReqResp;
@@ -37,8 +37,6 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     CoreLogMessageMapper coreLogMessageMapper;
     @Autowired
     Ip2regionConfig ip2regionConfig;
-    @Autowired
-    CoreLogProcessMapper coreLogProcessMapper;
 
     public CoreLogLoginMapper getLogLoginMapper() {
         return coreLogLoginMapper;
@@ -48,56 +46,11 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         return coreLogMessageMapper;
     }
 
-    public CoreLogProcessMapper getCoreLogProcessMapper() {
-        return coreLogProcessMapper;
-    }
-///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
     // 操作日志
     ///////////////////////////////////////////////////////////////////////////
 
 
-    /**
-     * 添加空的过程 返回id 用于更新
-     */
-    public String addProcess() {
-        CoreLogProcess coreLogProcess = new CoreLogProcess();
-        coreLogProcessMapper.insert(coreLogProcess);
-        return coreLogProcess.getId();
-    }
-
-    /**
-     * 更新过程
-     *
-     * @param id         过程id
-     * @param title      过程标题/说明
-     * @param total      总数
-     * @param successNum 成功数
-     * @param failNum    失败数
-     * @param type       类型（import-导出，sync-同步）
-     */
-    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type) {
-        CoreLogProcess coreLogProcess = new CoreLogProcess();
-        coreLogProcess.setId(id);
-        coreLogProcess.setTitle(title);
-        coreLogProcess.setTotal(total);
-        coreLogProcess.setSuccessNum(successNum);
-        coreLogProcess.setFailNum(failNum);
-        coreLogProcess.setType(type);
-        coreLogProcessMapper.updateById(coreLogProcess);
-    }
-
-    /**
-     * 根据id 获取过程详情
-     */
-    public ProcessDetailVo getProcessDetail(String id) {
-        QueryWrapper<CoreLogProcess> wrapper = new QueryWrapper<>();
-        wrapper.eq("id", id);
-        CoreLogProcess coreLogProcess = coreLogProcessMapper.selectOne(wrapper);
-        return BeanUtil.copyProperties(coreLogProcess, ProcessDetailVo.class);
-    }
-
-
-
     /**
      * 添加操作日志
      */

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

@@ -1,40 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : 47.96.30.85
- Source Server Type    : MySQL
- Source Server Version : 50730
- Source Host           : localhost:3306
- Source Schema         : com_tiesheng_web
-
- Target Server Type    : MySQL
- Target Server Version : 50730
- File Encoding         : 65001
-
- Date: 22/03/2023 10:39:06
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for core_log_process
--- ----------------------------
-CREATE TABLE `core_log_process`  (
-  `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `create_time` datetime NOT NULL,
-  `update_time` datetime NOT NULL,
-  `is_deleted` int(6) NOT NULL DEFAULT 0,
-  `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
-  `total` int(11) NOT NULL DEFAULT 0 COMMENT '总数',
-  `success_num` int(11) NOT NULL DEFAULT 0 COMMENT '成功数',
-  `fail_num` int(11) NOT NULL DEFAULT 0 COMMENT '失败数',
-  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'import' COMMENT '类型（import-导入，sync-同步）',
-  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;

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tiesheng.core.mapper.CoreLogProcessMapper">
-  <resultMap id="BaseResultMap" type="com.tiesheng.core.pojos.dao.CoreLogProcess">
-    <!--@mbg.generated-->
-    <!--@Table core_log_process-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="total" jdbcType="INTEGER" property="total" />
-    <result column="success_num" jdbcType="INTEGER" property="successNum" />
-    <result column="fail_num" jdbcType="INTEGER" property="failNum" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`
-  </sql>
-</mapper>