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

CHANGELOG.md

@@ -1,9 +1,16 @@
+## 0.8.3
+
+### 调整
+
+> 1，优化返回数据加密；  
+> 2，上传文件接口调整，统一为**application/json**格式;
+
 ## 0.8.0
 
 ### 调整
 
 > 1，移除**PasswordUtil**类，新增**EncryptConfig**配置；  
-> 2，默认启用网络请求的加解密，前端请配合接口使用。  
+> 2，默认启用网络请求的加解密，前端请配合接口使用。
 
 ## 0.7.4
 

pom.xml

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

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

@@ -102,7 +102,9 @@ public class TestController {
     @TokenIgnore
     public ApiResp<List<TestFile>> desensitize() {
         TestFile file = new TestFile("11111");
+        file.setTest("111111");
         TestFile file1 = new TestFile("22222");
+        file1.setTest("22222");
         return ApiResp.respOK(CollUtil.newArrayList(file, file1));
     }
 

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/TestFile.java

@@ -1,27 +1,21 @@
 package com.tiesheng.demo.pojos;
 
-import com.tiesheng.annotation.desensitize.Desensitize;
 import com.tiesheng.poi.pojos.PoiWriteBase;
 
-public class TestFile implements PoiWriteBase {
 
+public class TestFile extends TestParent implements PoiWriteBase {
 
-    @Desensitize()
-    private String test;
+    private String name;
 
-    public TestFile(String test) {
-        this.test = test;
+    public TestFile(String name) {
+        this.name = name;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // setter、getter
-    ///////////////////////////////////////////////////////////////////////////
-
-    public String getTest() {
-        return test;
+    public String getName() {
+        return name;
     }
 
-    public void setTest(String test) {
-        this.test = test;
+    public void setName(String name) {
+        this.name = name;
     }
 }

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/TestParent.java

@@ -0,0 +1,33 @@
+package com.tiesheng.demo.pojos;
+
+import com.tiesheng.annotation.desensitize.Desensitize;
+import com.tiesheng.poi.pojos.PoiWriteBase;
+
+
+public class TestParent implements PoiWriteBase {
+
+    private String id;
+
+    @Desensitize()
+    private String test;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter、getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTest() {
+        return test;
+    }
+
+    public void setTest(String test) {
+        this.test = test;
+    }
+}

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.1</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.1</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.1</version>
+        <version>0.8.4</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-encrypt/src/main/java/com/tiesheng/encrypt/EnableEncryptConfig.java

@@ -1,7 +1,7 @@
 package com.tiesheng.encrypt;
 
 
-import com.tiesheng.encrypt.config.EncryptRequestBodyAdvice;
+import com.tiesheng.encrypt.config.DecryptRequestBodyAdvice;
 import com.tiesheng.encrypt.config.EncryptResponseBodyAdvice;
 import org.springframework.context.annotation.Import;
 
@@ -14,7 +14,7 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE})
 @Documented
 @Import({
-        EncryptRequestBodyAdvice.class,
+        DecryptRequestBodyAdvice.class,
         EncryptResponseBodyAdvice.class,
 })
 public @interface EnableEncryptConfig {

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/DecryptRequestBodyAdvice.java

@@ -21,7 +21,7 @@ import java.nio.charset.Charset;
  * @author hao
  */
 @ControllerAdvice
-public class EncryptRequestBodyAdvice implements RequestBodyAdvice {
+public class DecryptRequestBodyAdvice implements RequestBodyAdvice {
 
 
     @Autowired

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/EncryptResponseBodyAdvice.java

@@ -1,11 +1,10 @@
 package com.tiesheng.encrypt.config;
 
 import cn.hutool.core.annotation.AnnotationUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import cn.hutool.log.LogFactory;
+import com.tiesheng.util.CommonUtil;
 import com.tiesheng.util.config.EncryptConfig;
+import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
@@ -21,7 +20,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
  * @author hao
  */
 @ControllerAdvice
-public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<Object> {
+public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<ApiResp> {
 
     @Autowired
     EncryptConfig encryptConfig;
@@ -32,25 +31,19 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<Object> {
     }
 
     @Override
-    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class<? extends
+    public ApiResp beforeBodyWrite(ApiResp body, MethodParameter returnType, MediaType selectedContentType, Class<? extends
             HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 
         try {
 
-            String content = JSONUtil.toJsonStr(body);
-            String respData = JSONUtil.parseObj(content).getStr("data");
-
-            if (StrUtil.isEmpty(respData)) {
-                // 无需加密
+            Object data = body.getData();
+            if (data == null || !body.successful()) {
                 return body;
             }
 
-            JSONObject resp = JSONUtil.parseObj(content);
-            resp.set("encrypt", true);
-            if (resp.getInt("code") == 200) {
-                resp.set("data", encryptConfig.encrypt(respData));
-            }
-            return resp;
+            body.setEncrypt(true);
+            body.setData(encryptConfig.encrypt(CommonUtil.writeJsonString(data)));
+            return body;
         } catch (Exception var17) {
             LogFactory.get().info("加密数据异常", var17);
         }

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.1</version>
+        <version>0.8.4</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.1</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.1</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.1</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.1</version>
+        <version>0.8.4</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
@@ -25,6 +25,11 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.tiesheng.springboot-parent</groupId>
+            <artifactId>springboot-annotation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

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

@@ -0,0 +1,48 @@
+package com.tiesheng.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.tiesheng.util.config.DesensitizeValueFilter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class CommonUtil {
+
+
+    /**
+     * FastJson配置
+     *
+     * @return
+     */
+    public static FastJsonConfig fastJsonConfig() {
+        FastJsonConfig config = new FastJsonConfig();
+        config.setSerializerFeatures(SerializerFeature.WriteMapNullValue,
+                SerializerFeature.WriteNullStringAsEmpty,
+                SerializerFeature.WriteEnumUsingName);
+        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        config.setSerializeFilters(new DesensitizeValueFilter());
+        return config;
+    }
+
+
+    /**
+     * 格式化数据
+     *
+     * @param value
+     * @return
+     * @throws IOException
+     */
+    public static String writeJsonString(Object value) throws IOException {
+        FastJsonConfig fastJsonConfig = fastJsonConfig();
+        ByteArrayOutputStream outnew = new ByteArrayOutputStream();
+        JSON.writeJSONStringWithFastJsonConfig(outnew, fastJsonConfig.getCharset(),
+                value, fastJsonConfig.getSerializeConfig(),
+                fastJsonConfig.getSerializeFilters(),
+                fastJsonConfig.getDateFormat(), JSON.DEFAULT_GENERATE_FEATURE,
+                fastJsonConfig.getSerializerFeatures());
+        return outnew.toString();
+    }
+
+}

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

@@ -1,7 +1,7 @@
-package com.tiesheng.core.config.desensitize;
+package com.tiesheng.util.config;
 
-import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.serializer.ValueFilter;
 import com.tiesheng.annotation.desensitize.Desensitize;
@@ -21,7 +21,7 @@ public class DesensitizeValueFilter implements ValueFilter {
             return value;
         }
 
-        Field field = ClassUtil.getDeclaredField(object.getClass(), name);
+        Field field = ReflectUtil.getField(object.getClass(), name);
         if (ObjectUtil.isEmpty(field)) {
             return value;
         }

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

@@ -129,6 +129,15 @@ public class ApiResp<T> {
     }
 
 
+    /**
+     * 是否成功
+     *
+     * @return
+     */
+    public boolean successful() {
+        return code == CODE_OK;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.1</version>
+        <version>0.8.4</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
@@ -72,11 +72,6 @@
             <artifactId>springboot-poi</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.tiesheng.springboot-parent</groupId>
-            <artifactId>springboot-annotation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.tiesheng.springboot-parent</groupId>
             <artifactId>springboot-login</artifactId>

springboot-web/src/main/java/com/tiesheng/core/config/json/FastJsonMessageConverter.java

@@ -1,9 +1,7 @@
 package com.tiesheng.core.config.json;
 
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.tiesheng.core.config.desensitize.DesensitizeValueFilter;
+import com.tiesheng.util.CommonUtil;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,15 +24,9 @@ public class FastJsonMessageConverter {
      */
     @Bean
     public HttpMessageConverters fastJsonHttpMessageConverters() {
-        FastJsonConfig config = new FastJsonConfig();
-        config.setSerializerFeatures(SerializerFeature.WriteMapNullValue,
-                SerializerFeature.WriteNullStringAsEmpty,
-                SerializerFeature.WriteEnumUsingName);
-        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
-        config.setSerializeFilters(new DesensitizeValueFilter());
 
         FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-        fastConverter.setFastJsonConfig(config);
+        fastConverter.setFastJsonConfig(CommonUtil.fastJsonConfig());
         fastConverter.setDefaultCharset(StandardCharsets.UTF_8);
 
         List<MediaType> mediaTypes = new ArrayList<>();

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

@@ -4,6 +4,9 @@ package com.tiesheng.core.controller;
 import cn.hutool.captcha.LineCaptcha;
 import cn.hutool.core.util.IdUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.core.pojos.dto.ChunkCheckDTO;
+import com.tiesheng.core.pojos.dto.ChunkMergeDTO;
+import com.tiesheng.core.pojos.dto.ChunkStartDTO;
 import com.tiesheng.core.pojos.dto.ImageCodeDTO;
 import com.tiesheng.core.pojos.vo.PicVerifyVo;
 import com.tiesheng.core.service.FileUploadService;
@@ -68,8 +71,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping(value = "/file/chunk_start")
-    public ApiResp<String> fileChunkStart(String fileExt) {
-        fileUploadService.chunkStart(fileExt);
+    public ApiResp<String> fileChunkStart(@RequestBody ChunkStartDTO dto) {
+        fileUploadService.chunkStart(dto.getFileExt());
         return ApiResp.respOK("");
     }
 
@@ -81,8 +84,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_check")
-    public ApiResp<Boolean> fileChunkCheck(String fileMd5, Integer chunk) {
-        boolean exist = fileUploadService.chunkCheck(fileMd5, chunk);
+    public ApiResp<Boolean> fileChunkCheck(@RequestBody ChunkCheckDTO dto) {
+        boolean exist = fileUploadService.chunkCheck(dto.getFileMd5(), dto.getChunk());
         return ApiResp.respOK(exist);
     }
 
@@ -108,8 +111,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_merge")
-    public ApiResp<String> fileChunkMerge(String fileMd5, String fileExt) {
-        String path = fileUploadService.chunkMerge(fileMd5, fileExt);
+    public ApiResp<String> fileChunkMerge(@RequestBody ChunkMergeDTO dto) {
+        String path = fileUploadService.chunkMerge(dto.getFileMd5(), dto.getFileExt());
         return ApiResp.respOK(path);
     }
 

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkCheckDTO.java

@@ -0,0 +1,30 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkCheckDTO {
+
+    private String fileMd5;
+    private Integer chunk;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileMd5() {
+        return fileMd5;
+    }
+
+    public void setFileMd5(String fileMd5) {
+        this.fileMd5 = fileMd5;
+    }
+
+    public Integer getChunk() {
+        return chunk;
+    }
+
+    public void setChunk(Integer chunk) {
+        this.chunk = chunk;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkMergeDTO.java

@@ -0,0 +1,30 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkMergeDTO {
+
+    private String fileMd5;
+    private String fileExt;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileMd5() {
+        return fileMd5;
+    }
+
+    public void setFileMd5(String fileMd5) {
+        this.fileMd5 = fileMd5;
+    }
+
+    public String getFileExt() {
+        return fileExt;
+    }
+
+    public void setFileExt(String fileExt) {
+        this.fileExt = fileExt;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkStartDTO.java

@@ -0,0 +1,21 @@
+package com.tiesheng.core.pojos.dto;
+
+/**
+ * @author hao
+ */
+public class ChunkStartDTO {
+
+    private String fileExt;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getFileExt() {
+        return fileExt;
+    }
+
+    public void setFileExt(String fileExt) {
+        this.fileExt = fileExt;
+    }
+}