publish 0.7.1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>40.6.1</version>
+    <version>0.7.1</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>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>40.6.1</version>
+                <version>0.7.1</version>
             </dependency>
 
             <dependency>
@@ -136,7 +136,7 @@
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.4</version>
+                    <version>0.0.5</version>
                     <executions>
                         <execution>
                             <goals>

springboot-ademo/pom.xml

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

springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java

@@ -1,7 +1,7 @@
 package com.tiesheng.demo.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.core.service.TieshengWebConfigurer;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -19,7 +19,7 @@ public class DemoWebConfigurer implements TieshengWebConfigurer {
     GlobalConfig globalConfig;
 
     @Override
-    public CurrentWebUser getCurrentUserName(TokenBean tokenBean) {
+    public RequestUserInfo getCurrentUserName(TokenBean tokenBean) {
         return null;
     }
 

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

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

@@ -35,7 +35,7 @@ public class DbMigrationInitializer implements ServletContextInitializer {
     DataSource dataSource;
     @Autowired
     DbMigrationConfig dbMigrationConfig;
-    @Autowired
+    @Autowired(required = false)
     List<DbDataInitializer> dbDataInitializerList;
 
 
@@ -43,7 +43,9 @@ public class DbMigrationInitializer implements ServletContextInitializer {
     public void onStartup(ServletContext servletContext) {
         try {
             startDeal();
-            dbDataInitializerList.forEach(DbDataInitializer::init);
+            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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</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>40.6.1</version>
+        <version>0.7.1</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -0,0 +1,37 @@
+package com.tiesheng.core.config.desensitize;
+
+import cn.hutool.core.util.ClassUtil;
+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;
+
+/**
+ * 脱敏过滤类
+ *
+ * @author hao
+ */
+public class DesensitizeValueFilter implements ValueFilter {
+
+    @Override
+    public Object process(Object object, String name, Object value) {
+        if (ObjectUtil.isEmpty(value) || !(value instanceof String)) {
+            return value;
+        }
+
+        Field field = ClassUtil.getDeclaredField(object.getClass(), name);
+        if (ObjectUtil.isEmpty(field)) {
+            return value;
+        }
+        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());
+
+    }
+}

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.DesensitizeValueFilter;
 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 DesensitizeValueFilter());
 
         FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
         fastConverter.setFastJsonConfig(config);

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

@@ -1,6 +1,11 @@
 package com.tiesheng.core.pojos;
 
-public class CurrentWebUser {
+/**
+ * 当前token的数据
+ *
+ * @author hao
+ */
+public class RequestUserInfo {
 
     private String id;
     private String name;

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

@@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
 import com.tiesheng.core.mapper.CoreLogOperationMapper;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
@@ -55,9 +55,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      */
     public void addOperationLog(String title, String subject, Object params) {
         CoreLogOperation operation = new CoreLogOperation();
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
-        operation.setUserId(currentWebUser.getId());
-        operation.setUserName(currentWebUser.getName());
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
+        operation.setUserId(requestUserInfo.getId());
+        operation.setUserName(requestUserInfo.getName());
         operation.setTitle(title);
         operation.setSubject(subject);
         if (params != null) {
@@ -85,8 +85,8 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         login.setUserId(platformUnique.getUserId());
         login.setPlatform(platformUnique.getPlatform());
 
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(tokenBean);
-        login.setUserName(currentWebUser.getName());
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(tokenBean);
+        login.setUserName(requestUserInfo.getName());
 
         login.setIp(ip);
         login.setAddress(ip2regionConfig.search(login.getIp()));

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

@@ -1,7 +1,6 @@
 package com.tiesheng.core.service;
 
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * @author hao
@@ -35,15 +33,12 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
             platformUnique.setUniqueId(loginInfo.getUnique());
         }
         platformUnique.setInfo(loginInfo.getInfo());
+        saveOrUpdate(platformUnique);
 
         TokenBean tokenBean = tieshengWebConfigurer.loginConfigurer().doLogin(platformUnique, loginInfo.getTo());
         if (tokenBean != null) {
-            platformUnique.setUserId(tokenBean.getId());
-            platformUnique.setIsDeleted(0);
-            saveOrUpdate(platformUnique);
-
             // 添加登录日志
-            coreLogService.addLoginLog(platformUnique,tokenBean);
+            coreLogService.addLoginLog(platformUnique, tokenBean);
         }
         return tokenBean;
     }
@@ -55,22 +50,18 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
 
 
     /**
-     * 通过平台和用户id查询
+     * 更新用户id
      *
-     * @param platform
-     * @param userIds
+     * @param uniqueId
+     * @param userId
      * @return
      */
-    private List<CorePlatformUnique> getByPlatformAndUser(String platform, List<String> userIds) {
-        if (CollUtil.isEmpty(userIds)) {
-            return CollUtil.newArrayList();
-        }
-
-        QueryWrapper<CorePlatformUnique> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id", userIds);
-        queryWrapper.eq("platform", platform);
-        queryWrapper.last("limit 1");
-        return list(queryWrapper);
+    public boolean updateUserId(String uniqueId, String userId) {
+        return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
+                .set("user_id", userId)
+                .set("is_deleted", 0)
+        );
     }
 
+
 }

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

@@ -1,7 +1,7 @@
 package com.tiesheng.core.service;
 
 import cn.hutool.log.LogFactory;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.exception.ApiRespEnum;
@@ -22,7 +22,7 @@ public interface TieshengWebConfigurer {
      *
      * @return
      */
-    CurrentWebUser getCurrentUserName(TokenBean userId);
+    RequestUserInfo getCurrentUserName(TokenBean userId);
 
 
     /**