publish 1.0.24-test2

This reverts commit a7024f7a8d.

.gitea/workflows/mvn-deploy-icbc-sandbox.yml

@@ -1,25 +0,0 @@
-## 工作流触发时机
-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                    

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>icbc-sandbox-1.0.0</version>
+    <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>icbc-sandbox-1.0.0</version>
+                <version>1.0.24-test2</version>
             </dependency>
 
             <dependency>
@@ -130,13 +130,6 @@
         </pluginRepository>
     </pluginRepositories>
 
-    <distributionManagement>
-        <repository>
-            <id>gitea</id>
-            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
-        </repository>
-    </distributionManagement>
-
     <build>
         <pluginManagement>
             <plugins>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>icbc-sandbox-1.0.0</version>
+    <version>1.0.24-test2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</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>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

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

@@ -7,6 +7,7 @@ import com.tiesheng.util.config.DesensitizeValueFilter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 public class CommonUtil {
 
@@ -18,6 +19,7 @@ public class CommonUtil {
      */
     public static FastJsonConfig fastJsonConfig() {
         FastJsonConfig config = new FastJsonConfig();
+        config.setCharset(StandardCharsets.UTF_8);
         config.setSerializerFeatures(SerializerFeature.WriteMapNullValue,
                 SerializerFeature.WriteNullStringAsEmpty,
                 SerializerFeature.WriteEnumUsingName,

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

@@ -17,6 +17,7 @@ public class ApiResp<T> {
 
     private int code;
     private String message;
+    private Throwable exception;
     private T data;
     private long recordsTotal = 0;
     private boolean encrypt = false;
@@ -181,4 +182,11 @@ public class ApiResp<T> {
         this.encrypt = encrypt;
     }
 
+    public Throwable getException() {
+        return exception;
+    }
+
+    public void setException(Throwable exception) {
+        this.exception = exception;
+    }
 }

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>icbc-sandbox-1.0.0</version>
+        <version>1.0.24-test2</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -115,8 +115,6 @@ public class FileUploadService {
      * @param fileMd5
      */
     public String chunkMerge(String fileMd5, String fileExt) {
-        // 0，校验文件类型是否合法
-        tieshengWebConfigurer.uploadFileCheck(fileExt);
 
         // 1，获取文件块的目录
         FileUploadPath folder = FileUploadPath.folder(fileMd5);

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

@@ -35,7 +35,8 @@ public interface TieshengWebConfigurer {
      */
     default ApiResp<String> addExceptionHandler(Exception e) {
         ApiResp<String> apiResp = ApiResp.respCust(ApiRespEnum.ServerError);
-        LogFactory.get().info(e);
+        apiResp.setException(e);
+        LogFactory.get().info(apiResp.getException());
         return apiResp;
     }