publish 1.0.6

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.6
+
+### 新增
+
+> 1，新增 **OperationIgnore** 注解，可以指定接口忽略操作日志的收集。  
+> 2，**OperationLog** 增加 desensitize 属性，用来脱敏指定的字段。  
+
 ## 1.0.2
 
 ### 调整
@@ -6,7 +13,7 @@
 > 2，增加过期备份的删除操作，默认过期时间为7天；  
 > 3，调整阿里云短信类，方便扩展其他方法。  
 > 4，消息发送接口该body类型为 **JSONObject**   
-> 5，调整消息发送接口和方法（不兼容旧版本）  
+> 5，调整消息发送接口和方法（不兼容旧版本）
 
 ## 1.0.1
 

pom.xml

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

springboot-ademo/pom.xml

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

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

@@ -8,6 +8,7 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
+import com.tiesheng.annotation.operation.OperationLog;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.core.service.CoreLogService;
 import com.tiesheng.core.service.CoreMessageService;
@@ -24,10 +25,13 @@ import com.tiesheng.util.config.Ip2regionConfig;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.util.pojos.FileUploadPath;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -88,11 +92,11 @@ public class TestController {
     }
 
 
-    @RequestMapping("/send")
+    @PostMapping("/send")
-    @TokenIgnore
+    @OperationLog(desensitize = "fdyNo")
-    public ApiResp<MessageReqResp> sendMessage() {
+    public ApiResp<MessageReqResp> sendMessage(@RequestBody @Valid PoiBean dto) {
 
-        MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
+        MessageReqResp reqResp = coreMessageService.send(new UserChannel(dto.getFdyNo(), "sms"),
                 JSONUtil.createObj().putOpt("code", "123456").putOpt("template_code", "SMS_154950909"));
 
         return ApiResp.respOK(reqResp);

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.6</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-annotation/src/main/java/com/tiesheng/annotation/operation/OperationIgnore.java

@@ -0,0 +1,13 @@
+package com.tiesheng.annotation.operation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author hao
+ */
+@Target(ElementType.METHOD)
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OperationIgnore {
+
+}

springboot-annotation/src/main/java/com/tiesheng/annotation/operation/OperationLog.java

@@ -21,4 +21,12 @@ public @interface OperationLog {
      */
     String insertKey() default "";
 
+
+    /**
+     * 需要脱敏的字段
+     *
+     * @return
+     */
+    String[] desensitize() default {};
+
 }

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.6</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>1.0.2</version>
+        <version>1.0.6</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>1.0.2</version>
+        <version>1.0.6</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import com.alibaba.fastjson.JSON;
+import com.tiesheng.annotation.operation.OperationIgnore;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.login.pojos.CodeExtraDTO;
@@ -57,6 +58,7 @@ public class LoginController {
      * @return
      */
     @GetMapping("/unique/redirect")
+    @OperationIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("web_unique_redirect",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
@@ -71,6 +73,7 @@ public class LoginController {
      * @return
      */
     @PostMapping("/unique/index")
+    @OperationIgnore
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("web_unique_index",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
@@ -93,6 +96,7 @@ public class LoginController {
      * @param response
      */
     @GetMapping("/ding/index/{service}")
+    @OperationIgnore
     public void dingIndex(@PathVariable String service, String extra, HttpServletResponse response) {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
@@ -116,6 +120,7 @@ public class LoginController {
      * @param service
      */
     @RequestMapping("/ding/oauth2/{service}")
+    @OperationIgnore
     public void dingOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
         String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
         DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
@@ -149,6 +154,7 @@ public class LoginController {
      * @return
      */
     @RequestMapping("/wxmp/index/{service}")
+    @OperationIgnore
     public void wxmpIndex(@PathVariable String service, String extra, HttpServletResponse response) throws IOException {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
@@ -163,6 +169,7 @@ public class LoginController {
      * 微信授权回调
      */
     @RequestMapping("/wxmp/oauth2/{service}")
+    @OperationIgnore
     public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
         WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(wxUserInfo.getAppId(),
@@ -193,6 +200,7 @@ public class LoginController {
      * @return
      */
     @RequestMapping("/wxmini/index/{service}")
+    @OperationIgnore
     public ApiResp<WxminiLoginVo> wxminiIndex(@PathVariable String service, String code) {
         String openid = platformWxminiConfig.jscode2session(service, code);
         WxConfigBean configBean = platformWxminiConfig.getConfigBean(service);

springboot-message/pom.xml

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

springboot-web/src/main/java/com/tiesheng/core/config/operation/OperationAspect.java

@@ -2,7 +2,9 @@ package com.tiesheng.core.config.operation;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
+import com.tiesheng.annotation.operation.OperationIgnore;
 import com.tiesheng.annotation.operation.OperationLog;
 import com.tiesheng.core.service.CoreLogService;
 import com.tiesheng.util.ServletKit;
@@ -16,7 +18,6 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -58,11 +59,16 @@ public class OperationAspect {
             return joinPoint.proceed(joinPoint.getArgs());
         }
 
-        String title = "", subject = "";
-        String insertKey = "";
-
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
+
+        // 当存在忽略注解时，不添加操作日志
+        if (method.getAnnotation(OperationIgnore.class) != null) {
+            return joinPoint.proceed(joinPoint.getArgs());
+        }
+
+        String title = "", subject = "";
+        String insertKey = "";
         OperationLog operationLog = method.getAnnotation(OperationLog.class);
         if (operationLog != null) {
             title = operationLog.title();
@@ -70,15 +76,15 @@ public class OperationAspect {
             insertKey = operationLog.insertKey();
         }
 
-        Object reqObj = null;
+        Map<String, Object> reqMaps = null;
         ConcurrentHashMap<String, Object> allParams = new ConcurrentHashMap<>(16);
         if (joinPoint.getArgs().length > 0) {
-            reqObj = joinPoint.getArgs()[0];
+            reqMaps = BeanUtil.beanToMap(joinPoint.getArgs()[0], false, true);
-            allParams.putAll(BeanUtil.beanToMap(reqObj));
+            allParams.putAll(reqMaps);
         }
 
         Object response = joinPoint.proceed(joinPoint.getArgs());
-        allParams.putAll(BeanUtil.beanToMap(response));
+        allParams.putAll(BeanUtil.beanToMap(response, false, true));
 
         if (!StrUtil.isEmpty(subject)) {
             // 添加、编辑关键字处理
@@ -94,7 +100,15 @@ public class OperationAspect {
             subject = ServletKit.getRequest().getRequestURI();
         }
 
-        coreLogService.addOperationLog(title, subject, reqObj);
+        // 指定字段脱敏
+        if (reqMaps != null && operationLog != null
+                && ArrayUtil.isNotEmpty(operationLog.desensitize())) {
+            for (String key : operationLog.desensitize()) {
+                reqMaps.put(key, "******");
+            }
+        }
+
+        coreLogService.addOperationLog(title, subject, reqMaps);
 
         return response;
     }

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

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -84,12 +85,13 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcessMapper.insert(coreLogProcess);
 
         ThreadUtil.execute(() -> {
+            List<Exception> errorList = new ArrayList<>();
             CollUtil.split(list, 100).forEach((it) -> {
                 int accept = 0;
                 try {
                     accept = consumer.accept(it);
                 } catch (Exception e) {
-                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
+                    errorList.add(e);
                 }
                 coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
                 coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
@@ -100,6 +102,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
             // 执行结束
             coreLogProcess.setFailFile(consumer.getFailFile());
             coreLogProcess.setStatus(1);
+            coreLogProcess.setError(JSONUtil.toJsonStr(errorList));
             coreLogProcessMapper.updateById(coreLogProcess);
         });
 
@@ -130,6 +133,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         ThreadUtil.execute(() -> {
             int pageSize = 1000;
             int pageNum = 1, lastCount = pageSize;
+            List<Exception> errorList = new ArrayList<>();
             while (lastCount == pageSize) {
                 try {
                     lastCount = consumer.accept(pageNum, pageSize);
@@ -137,13 +141,14 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
                     coreLogProcess.setProcess(coreLogProcess.getTotal());
                     coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
                 } catch (Exception e) {
-                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
+                    errorList.add(e);
                 }
                 coreLogProcessMapper.updateById(coreLogProcess);
                 pageNum++;
             }
 
             // 执行结束
+            coreLogProcess.setError(JSONUtil.toJsonStr(errorList));
             coreLogProcess.setStatus(1);
             coreLogProcessMapper.updateById(coreLogProcess);
         });