publish 0.6.2

pom.xml

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

springboot-ademo/pom.xml

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

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

@@ -1,8 +1,10 @@
 package com.tiesheng.demo.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.log.LogFactory;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.demo.pojos.TestFile;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.config.aliyun.AliyunSmsConfig;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @author hao
@@ -92,4 +95,13 @@ public class TestController {
         return ApiResp.respOK(search);
     }
 
+
+    @RequestMapping("desensitize")
+    @TokenIgnore
+    public ApiResp<List<TestFile>> desensitize() {
+        TestFile file = new TestFile("11111");
+        TestFile file1 = new TestFile("22222");
+        return ApiResp.respOK(CollUtil.newArrayList(file, file1));
+    }
+
 }

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

@@ -1,27 +1,27 @@
-//package com.tiesheng.demo.pojos;
+package com.tiesheng.demo.pojos;
-//
+
-//import com.alibaba.excel.annotation.ExcelProperty;
+import com.tiesheng.annotation.desensitize.Desensitize;
-//import com.tiesheng.poi.pojos.PoiWriteBase;
+import com.tiesheng.poi.pojos.PoiWriteBase;
-//
+
-//public class TestFile implements PoiWriteBase {
+public class TestFile implements PoiWriteBase {
-//
+
-//
+
-//    @ExcelProperty("测试")
+    @Desensitize()
-//    private String test;
+    private String test;
-//
+
-//    public TestFile(String test) {
+    public TestFile(String test) {
-//        this.test = test;
+        this.test = test;
-//    }
+    }
-//
+
-//    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
-//    // setter、getter
+    // setter、getter
-//    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
-//
+
-//    public String getTest() {
+    public String getTest() {
-//        return test;
+        return test;
-//    }
+    }
-//
+
-//    public void setTest(String test) {
+    public void setTest(String test) {
-//        this.test = 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.6.0</version>
+        <version>0.6.2</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-annotation/src/main/java/com/tiesheng/annotation/desensitize/Desensitize.java

@@ -0,0 +1,16 @@
+package com.tiesheng.annotation.desensitize;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author hao
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Desensitize {
+
+    int prefix() default 1;
+
+    int suffix() default 1;
+
+}

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.0</version>
+        <version>0.6.2</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

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

@@ -0,0 +1,16 @@
+package com.tiesheng.database.service;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hao
+ */
+@Component
+public interface DbDataInitializer {
+
+    /**
+     * 初始化数据
+     */
+    void init();
+
+}

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

@@ -35,12 +35,17 @@ public class DbMigrationInitializer implements ServletContextInitializer {
     DataSource dataSource;
     @Autowired
     DbMigrationConfig dbMigrationConfig;
+    @Autowired(required = false)
+    List<DbDataInitializer> dbDataInitializerList;
 
 
     @Override
     public void onStartup(ServletContext servletContext) {
         try {
             startDeal();
+            if (dbDataInitializerList != null) {
+                dbDataInitializerList.forEach(DbDataInitializer::init);
+            }
         } catch (Exception ignore) {
         }
     }

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</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.6.0</version>
+        <version>0.6.2</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/core/config/desensitize/ValueDesensitizeFilter.java

@@ -0,0 +1,31 @@
+package com.tiesheng.core.config.desensitize;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.serializer.ValueFilter;
+import com.tiesheng.annotation.desensitize.Desensitize;
+
+import java.lang.reflect.Field;
+
+public class ValueDesensitizeFilter implements ValueFilter {
+
+    @Override
+    public Object process(Object object, String name, Object value) {
+        if (ObjectUtil.isEmpty(value) || !(value instanceof String)) {
+            return value;
+        }
+
+        try {
+            Field field = object.getClass().getDeclaredField(name);
+            Desensitize desensitize = field.getAnnotation(Desensitize.class);
+            if (String.class != field.getType() || ObjectUtil.isEmpty(desensitize)) {
+                return value;
+            }
+            String originVal = String.valueOf(value);
+            return StrUtil.hide(originVal, desensitize.prefix(), StrUtil.length(originVal) - desensitize.suffix());
+        } catch (NoSuchFieldException ignored) {
+        }
+
+        return value;
+    }
+}

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

@@ -3,6 +3,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.ValueDesensitizeFilter;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,6 +31,7 @@ public class FastJsonMessageConverter {
                 SerializerFeature.WriteNullStringAsEmpty,
                 SerializerFeature.WriteEnumUsingName);
         config.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        config.setSerializeFilters(new ValueDesensitizeFilter());
 
         FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
         fastConverter.setFastJsonConfig(config);