publish 0.8.5

GlobalConfig新加uploadDir配置

See merge request tiesheng/tiesheng!2

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.3
+
+### 调整
+
+> 1，优化返回数据加密；  
+> 2，上传文件接口调整，统一为**application/json**格式;
+
 ## 0.8.0
 
 ### 调整

pom.xml

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

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

@@ -41,7 +41,6 @@ public class TestController {
 
 
     @RequestMapping("/index")
-    @TokenIgnore
     public ApiResp<String> index() {
 
         TokenBean tokenBean = new TokenBean("11", "", "fdfd");
@@ -67,7 +66,6 @@ public class TestController {
 
 
     @RequestMapping("/export")
-    @TokenIgnore
     public ApiResp<String> export() {
 
 //        List<TestFile> list = new ArrayList<>();
@@ -102,7 +100,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 name;
-    private String test;
 
-    public TestFile(String test) {
+    public TestFile(String name) {
-        this.test = test;
+        this.name = name;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    public String getName() {
-    // setter、getter
+        return name;
-    ///////////////////////////////////////////////////////////////////////////
-
-    public String getTest() {
-        return test;
     }
 
-    public void setTest(String test) {
+    public void setName(String name) {
-        this.test = test;
+        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-ademo/src/main/resources/application.yml

@@ -20,3 +20,7 @@ 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.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -1,5 +1,6 @@
 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;
@@ -50,8 +51,18 @@ public class TsTokenAspect {
 
         // 过滤不要需要验证的接口（path）
         String requestURI = ServletKit.getRequest().getRequestURI();
-        if (StrUtil.startWithAnyIgnoreCase(requestURI, tsTokenConfig.getIgnorePaths())) {
+        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;
+                }
+            }
         }
 
         // 过滤不要需要验证的接口（注解）

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</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.3</version>
+        <version>0.8.5</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

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

@@ -1,16 +1,12 @@
 package com.tiesheng.util;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializeFilter;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.tiesheng.util.config.desensitize.DesensitizeValueFilter;
+import com.tiesheng.util.config.DesensitizeValueFilter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 public class CommonUtil {
 
@@ -40,13 +36,10 @@ public class CommonUtil {
      */
     public static String writeJsonString(Object value) throws IOException {
         FastJsonConfig fastJsonConfig = fastJsonConfig();
-        SerializeFilter[] globalFilters = fastJsonConfig.getSerializeFilters();
-        List<SerializeFilter> allFilters = new ArrayList(Arrays.asList(globalFilters));
-
         ByteArrayOutputStream outnew = new ByteArrayOutputStream();
         JSON.writeJSONStringWithFastJsonConfig(outnew, fastJsonConfig.getCharset(),
                 value, fastJsonConfig.getSerializeConfig(),
-                allFilters.toArray(new SerializeFilter[allFilters.size()]),
+                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.util.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/config/GlobalConfig.java

@@ -23,6 +23,7 @@ public class GlobalConfig {
     private String host;
     private String service;
     private String version;
+    private String uploadDir = System.getProperty("user.dir");
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -80,6 +81,15 @@ 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,7 +5,9 @@ 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 {
 
@@ -46,7 +48,7 @@ public class FileUploadPath {
         }
         pathBean.setHttpPath(tempPath);
 
-        String tempAbs = String.format("%s/static%s", System.getProperty("user.dir"), tempPath);
+        String tempAbs = String.format("%s/static%s", SpringUtil.getBean(GlobalConfig.class).getUploadDir(), 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.3</version>
+        <version>0.8.5</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>