增加日志模块，自动打印controller、dubbo接口入参出参

sckw-common/pom.xml

@@ -24,6 +24,7 @@
         <module>sckw-common-sentinel</module>
         <module>sckw-common-seata</module>
         <module>sckw-common-startup</module>
+        <module>sckw-common-log</module>
     </modules>
 
     <properties>

sckw-common/sckw-common-log/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.sckw</groupId>
+        <artifactId>sckw-service-platform</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>sckw-common-log</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

sckw-common/sckw-common-log/src/main/java/com/sckw/log/aspect/LogInfoAspect.java

@@ -0,0 +1,135 @@
+package com.sckw.log.aspect;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @desc: controller层接口日志打印
+ * @author: yzc
+ * @date: 2023-08-21 11:23
+ */
+@Aspect
+@Component
+@Slf4j
+@Configuration
+public class LogInfoAspect {
+
+    public static final String TIME_PATTERN = "yyyy-MM-dd HH:mm:ss:SSS";
+
+    @Pointcut("execution(* com.sckw.*.controller.*.*(..))")
+    public void cutController() {
+    }
+
+    @Around(value = "cutController()", argNames = "p")
+    public Object cutController(ProceedingJoinPoint p) throws Throwable {
+        log.info("开始记录controller------------------->");
+        return getResult(p);
+
+    }
+
+    @Pointcut("execution(* com.sckw.*.dubbo.*.*(..))")
+    public void cutDubbo() {
+    }
+
+    @Around(value = "cutDubbo()", argNames = "p")
+    public Object around(ProceedingJoinPoint p) throws Throwable {
+        log.info("开始记录dubbo------------------->");
+        return getResult(p);
+    }
+
+    private Object getResult(ProceedingJoinPoint p) throws Throwable {
+        Object result = null;
+        //开始时间
+        Date startTime = new Date();
+        String targetName = p.getTarget().getClass().getName();
+        String methodName = p.getSignature().getName();
+        Object[] args = p.getArgs();
+        Stream<?> stream = ArrayUtils.isEmpty(args) ? Stream.empty() : Arrays.stream(args);
+        List<Object> logArgs = stream
+                .filter(arg -> (!(arg instanceof HttpServletRequest) && !(arg instanceof HttpServletResponse)) && !(arg instanceof MultipartFile))
+                .collect(Collectors.toList());
+        //过滤后序列化无异常
+        String param = JSON.toJSONString(logArgs);
+        String exception = "";
+        try {
+            //执行结果，返回参数
+            result = p.proceed();
+        } catch (Throwable e) {
+            exception = e.getMessage();
+            //异常抛出
+            throw e;
+        } finally {
+            Date endTime = new Date();
+            long time = endTime.getTime() - startTime.getTime();
+            Boolean slowRequest = (time > 1500L);
+            log.info("{}.{}," +
+                            "param={}," +
+                            "result={}," +
+                            "exception={}," +
+                            "[{}->{}],slowRequest{}=[{}]", targetName, methodName,
+                    param,
+                    JSON.toJSONString(result),
+                    exception,
+                    DateFormatUtils.format(startTime, TIME_PATTERN),
+                    DateFormatUtils.format(endTime, TIME_PATTERN),
+                    slowRequest,
+                    time);
+        }
+        return result;
+    }
+
+    @Pointcut("execution(* com.sckw.*.service.*.*(..))")
+    public void cutService() {
+    }
+
+    @AfterThrowing(pointcut = "cutService()", throwing = "e")
+    public void doAfterThrowing(JoinPoint point, Throwable e) throws Throwable {
+        log.info("开始记录service------------------->");
+        Date startTime = new Date();
+        String targetName = point.getTarget().getClass().getName();
+        String methodName = point.getSignature().getName();
+        //获取用户请求方法的参数并序列化为JSON格式字符串
+        StringBuilder params = new StringBuilder();
+        if (point.getArgs() != null && point.getArgs().length > 0) {
+            for (int i = 0; i < point.getArgs().length; i++) {
+                Object object = point.getArgs()[i];
+                if (!(object instanceof MultipartFile)) {
+                    params.append(JSONObject.toJSONString(point.getArgs()[i])).append(";");
+                }
+            }
+        }
+
+        Date endTime = new Date();
+        long time = endTime.getTime() - startTime.getTime();
+        log.error("{}.{}," +
+                        "param={}," +
+                        "exception={}," +
+                        "[{}->{}]=[{}]", targetName, methodName,
+                params,
+                e.getMessage(),
+                DateFormatUtils.format(startTime, TIME_PATTERN),
+                DateFormatUtils.format(endTime, TIME_PATTERN),
+                time);
+    }
+
+}

sckw-common/sckw-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.sckw.log.aspect.LogInfoAspect

sckw-modules/sckw-message/pom.xml

@@ -67,6 +67,11 @@
             <groupId>com.sckw</groupId>
             <artifactId>sckw-message-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
     </dependencies>
 

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/MessageController.java

@@ -2,12 +2,14 @@ package com.sckw.message.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sckw.core.annotation.Log;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.message.model.KwmMessage;
-import com.sckw.message.model.vo.req.*;
+import com.sckw.message.model.vo.req.DeleteMessagesReqVO;
+import com.sckw.message.model.vo.req.FindMessagesReqVO;
+import com.sckw.message.model.vo.req.ReadMessagesReqVO;
+import com.sckw.message.model.vo.req.SelectMessagesReqVO;
 import com.sckw.message.model.vo.res.MessagesStatisticsResVO;
 import com.sckw.message.service.MessageService;
 import jakarta.validation.Valid;
@@ -39,7 +41,6 @@ public class MessageController {
      * @date: 2023-06-13 16:17
      */
     @GetMapping("/detail")
-    @Log(description = "获取消息详情")
     public HttpResult detail(@RequestParam Long id) {
         KwmMessage message = messageService.detail(id);
         return HttpResult.ok(message);
@@ -53,7 +54,6 @@ public class MessageController {
      * @date: 2023-06-09 15:12
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "分页查询消息列表")
     public HttpResult select(@RequestBody @Valid SelectMessagesReqVO params) {
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<KwmMessage> list = messageService.select(params);
@@ -69,7 +69,6 @@ public class MessageController {
      * @date: 2023-06-09 14:21
      */
     @PostMapping(value = "/read", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "消息已读")
     public HttpResult read(@RequestBody ReadMessagesReqVO readMessagesReqVO) {
         messageService.read(readMessagesReqVO);
         return HttpResult.ok();
@@ -83,7 +82,6 @@ public class MessageController {
      * @date: 2023-06-09 14:21
      */
     @PostMapping(value = "/delete", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "删除消息")
     public HttpResult delete(@RequestBody DeleteMessagesReqVO deleteMessagesReqVO) {
         messageService.delete(deleteMessagesReqVO);
         return HttpResult.ok();
@@ -97,7 +95,6 @@ public class MessageController {
      * @return com.sckw.core.web.response.HttpResult
      */
     @GetMapping(value = "/statistics")
-    @Log(description = "消息统计查询")
     public HttpResult statistics(@RequestParam(required = false) String category) {
         List<MessagesStatisticsResVO> result = messageService.statistics(category);
         return HttpResult.ok(result);
@@ -111,7 +108,6 @@ public class MessageController {
      * @date: 2023-06-09 15:12
      */
     @PostMapping(value = "/findList", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "查找消息列表")
     public HttpResult findList(@RequestBody FindMessagesReqVO findMessagesReqVO) {
         return HttpResult.ok(messageService.selectMessages(findMessagesReqVO));
     }

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/SmsController.java

@@ -1,6 +1,5 @@
 package com.sckw.message.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.message.model.vo.req.SendSmsVerifyCoderReqVO;
 import com.sckw.message.service.SmsService;
@@ -35,7 +34,6 @@ public class SmsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/sendVerifyCode", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "发送短信验证码")
     public HttpResult sendVerifyCode(@Valid @RequestBody SendSmsVerifyCoderReqVO param) {
         smsService.sendVerifyCode(param);
         return HttpResult.ok();

sckw-modules/sckw-order/pom.xml

@@ -96,6 +96,11 @@
             <artifactId>sckw-manage-api</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
     </dependencies>
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -1,6 +1,5 @@
 package com.sckw.order.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.order.model.vo.req.*;
 import com.sckw.order.serivce.KwoTradeOrderService;
@@ -31,7 +30,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addPurchaseOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "采购下单草稿")
     public HttpResult addPurchaseOrderDraft(@RequestBody @Validated PurchaseOrderDraftParam param) {
         kwoTradeOrderService.addPurchaseOrderDraft(param);
         return HttpResult.ok("采购下单草稿保存成功");
@@ -46,7 +44,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addPurchaseOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "采购下单提交")
     public HttpResult addPurchaseOrderSubmit(@RequestBody @Validated PurchaseOrderParam purchaseOrderParam) {
         kwoTradeOrderService.addPurchaseOrderSubmit(purchaseOrderParam);
         return HttpResult.ok("采购下单提交成功");
@@ -61,7 +58,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addValetOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "代客下单草稿")
     public HttpResult addValetOrderDraft(@RequestBody @Validated ValetOrderDraftParam param) {
         kwoTradeOrderService.addValetOrderDraft(param);
         return HttpResult.ok("代客下单草稿保存成功");
@@ -77,7 +73,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addValetOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "代客下单提交")
     public HttpResult addValetOrderSubmit(@RequestBody @Validated ValetOrderParam valetOrderParam) {
         kwoTradeOrderService.addValetOrderSubmit(valetOrderParam);
         return HttpResult.ok("代客下单提交成功");
@@ -91,7 +86,6 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/detail")
-    @Log(description = "贸易订单详情")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok("贸易订单详情查询成功",kwoTradeOrderService.getDetail(id));
     }
@@ -105,7 +99,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单修改")
     public HttpResult update(@RequestBody @Validated UpdateOrderParam updateOrderParam) {
         kwoTradeOrderService.update(updateOrderParam);
         return HttpResult.ok("订单修改成功");
@@ -120,7 +113,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/acceptanceOrder", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单受理")
     public HttpResult acceptanceOrder(@RequestBody @Validated AcceptanceOrderParam acceptanceOrderParam) {
         kwoTradeOrderService.acceptanceOrder(acceptanceOrderParam);
         return HttpResult.ok("订单受理成功");
@@ -135,7 +127,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/rejectOrder", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单驳回")
     public HttpResult rejectOrder(@RequestBody @Validated RejectOrderParam rejectOrderParam) {
         kwoTradeOrderService.rejectOrder(rejectOrderParam);
         return HttpResult.ok("订单驳回成功");
@@ -149,7 +140,6 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/rejectReason")
-    @Log(description = "贸易订单驳回原因查询")
     public HttpResult rejectReason(@RequestParam Long id) {
         return HttpResult.ok("驳回订单原因查询成功", kwoTradeOrderService.rejectReason(id));
     }
@@ -163,7 +153,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/completeOrder", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "完结贸易订单")
     public HttpResult completeOrder(@RequestBody @Validated CompleteOrderParam completeOrderParam) {
         kwoTradeOrderService.completeOrder(completeOrderParam);
         return HttpResult.ok("订单完结成功");
@@ -179,7 +168,6 @@ public class KwoTradeOrderController {
      */
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/batchDelete", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "批量删除贸易订单")
     public HttpResult batchDelete(@RequestBody @Validated BatchDeleteParam param) {
         kwoTradeOrderService.batchDelete(param);
         return HttpResult.ok("订单批量删除成功");
@@ -193,7 +181,6 @@ public class KwoTradeOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/getAddressDropList")
-    @Log(description = "获取贸易订单地址下拉列表")
     public HttpResult getAddressDropList() {
         return HttpResult.ok("获取贸易订单地址下拉列表成功",kwoTradeOrderService.getAddressDropList());
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTransportDemandController.java

@@ -1,6 +1,5 @@
 package com.sckw.order.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
@@ -37,7 +36,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "新增运需草稿")
     public HttpResult addDraft(@RequestBody @Validated AddTransportDemandDraftParam param) {
         kwoTransportDemandService.addDraft(param);
         return HttpResult.ok("新增运需草稿成功");
@@ -52,7 +50,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "新增运需上架")
     public HttpResult addShelves(@RequestBody @Validated AddTransportDemandParam param) {
         kwoTransportDemandService.addShelves(param);
         return HttpResult.ok("新增运需上架成功");
@@ -67,7 +64,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/detail")
-    @Log(description = "获取运需详情")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(kwoTransportDemandService.detail(id));
     }
@@ -80,7 +76,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "运需修改")
     public HttpResult update(@RequestBody @Validated UpdateTransportDemandParam param) {
         kwoTransportDemandService.update(param);
         return HttpResult.ok("运需修改成功!");
@@ -94,7 +89,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "运需分页查询")
     public HttpResult select(@RequestBody @Validated SelectTransportDemandParam param) {
         return HttpResult.ok(kwoTransportDemandService.select(param));
     }
@@ -107,7 +101,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/statistic", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "运需统计")
     public HttpResult statistic(@RequestBody StatisticTransportDemandParam param) {
         return HttpResult.ok(kwoTransportDemandService.statistic(param));
     }
@@ -137,7 +130,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/putOnShelves")
-    @Log(description = "运需上架")
     public HttpResult putOnShelves(@RequestParam Long id) {
         kwoTransportDemandService.putOnShelves(id);
         return HttpResult.ok("上架成功");
@@ -151,7 +143,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/batchTakeOffShelves")
-    @Log(description = "运需批量下架")
     public HttpResult batchTakeOffShelves(@RequestParam String ids) {
         List<Long> list = StringUtils.splitStrToList(ids, ",", Long.class);
         kwoTransportDemandService.batchTakeOffShelves(list);
@@ -166,7 +157,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/batchDelete")
-    @Log(description = "运需批量删除")
     public HttpResult batchDelete(@RequestParam String ids) {
         List<Long> list = StringUtils.splitStrToList(ids, ",", Long.class);
         kwoTransportDemandService.batchDelete(list);
@@ -181,7 +171,6 @@ public class KwoTransportDemandController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/demandSquaresList", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "运需广场列表")
     public HttpResult demandSquaresList(@RequestBody @Validated TransportDemandSquaresParam param) {
         return HttpResult.ok(kwoTransportDemandService.demandSquaresList(param));
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwpWantBuyController.java

@@ -1,6 +1,5 @@
 package com.sckw.order.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.HttpResult;
@@ -34,7 +33,6 @@ public class KwpWantBuyController {
      * @Date 15:34 2023/7/26 0026
      **/
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购分页查询")
     public HttpResult select(@RequestBody WantBuySelectParam wantBuySelectParam) {
         return HttpResult.ok(kwpWantBuyService.select(wantBuySelectParam));
     }
@@ -45,7 +43,6 @@ public class KwpWantBuyController {
      * @Date 15:34 2023/7/26 0026
      **/
     @PostMapping(value = "/buyHallList", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购大厅")
     public HttpResult buyHallList(@RequestBody WantBuySelectParam wantBuySelectParam) {
         return HttpResult.ok(kwpWantBuyService.buyHallList(wantBuySelectParam));
     }
@@ -58,7 +55,6 @@ public class KwpWantBuyController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "新增求购草稿")
     public HttpResult addDraft(@RequestBody AddDraftWantBuyParam addDraftWantBuyParam) {
         kwpWantBuyService.addDraft(addDraftWantBuyParam);
         return HttpResult.ok("新增求购草稿成功");
@@ -72,7 +68,6 @@ public class KwpWantBuyController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "新增求购上架")
     public HttpResult addShelves(@RequestBody @Validated AddWantBuyParam addWantBuyParam) {
         kwpWantBuyService.addShelves(addWantBuyParam);
         return HttpResult.ok("新增求购上架成功");
@@ -84,7 +79,6 @@ public class KwpWantBuyController {
      * @Date: 13:39 2023/7/25 0025
      **/
     @GetMapping(value = "/putOnShelves", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购上架")
     public HttpResult putOnShelves(@RequestParam Long id) {
         kwpWantBuyService.putOnShelves(id);
         return HttpResult.ok("求购上架成功");
@@ -96,7 +90,6 @@ public class KwpWantBuyController {
      * @Date: 13:39 2023/7/25 0025
      **/
     @PostMapping(value = "/batchTakeOffShelves", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购批量下架")
     public HttpResult batchTakeOffShelves(@RequestBody @Validated WantBuyDels wantBuyDels) {
         kwpWantBuyService.batchTakeOffShelves(wantBuyDels);
         return HttpResult.ok("批量下架成功");
@@ -108,7 +101,6 @@ public class KwpWantBuyController {
      * @Date: 13:39 2023/7/25 0025
      **/
     @PostMapping(value = "/dels", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购批量删除")
     public HttpResult dels(@RequestBody @Validated WantBuyDels wantBuyDels) {
         kwpWantBuyService.dels(wantBuyDels);
         return HttpResult.ok("批量删除成功");
@@ -122,7 +114,6 @@ public class KwpWantBuyController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/detail")
-    @Log(description = "求购详情")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(kwpWantBuyService.detail(id));
     }
@@ -133,7 +124,6 @@ public class KwpWantBuyController {
      * @Date 15:22 2023/7/26 0026
      **/
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购编辑")
     public HttpResult update(@RequestBody @Validated UpdateWantBuyParam updateWantBuyParam) {
         kwpWantBuyService.update(updateWantBuyParam);
         return HttpResult.ok("求购修改成功!");
@@ -145,7 +135,6 @@ public class KwpWantBuyController {
      * @Date 15:23 2023/7/26 0026
      **/
     @PostMapping(value = "/statistic", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "求购统计")
     public HttpResult statistic(@RequestBody WantBuySelectParam params) {
         return HttpResult.ok(kwpWantBuyService.statistic(params));
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -61,7 +61,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateOrderStatus(UpdateOrderStatusParam param) {
-        log.info("更新订单状态入参：{}", JSON.toJSONString(param));
         if (Objects.isNull(param.getUpdateBy()) || StringUtils.isBlank(param.getUpdateByName())) {
             throw new BusinessException("操作人信息不能为空!");
         }
@@ -99,7 +98,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult createOrCancelLogisticsOrder(CreateOrCancelLogisticsOrderParam param) {
-        log.info("生成或撤销物流订单入参：{}", JSON.toJSONString(param));
         Long id = param.getTOrderId();
         BigDecimal entrustAmount = param.getEntrustAmount();
         Long updateBy = param.getUpdateBy();
@@ -142,7 +140,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult completeLogisticsOrder(CompleteLogisticsOrderParam param) {
-        log.info("物流订单完结入参：{}", JSON.toJSONString(param));
         Long id = param.getTOrderId();
         BigDecimal actualLoadAmount = param.getActualLoadAmount();
         BigDecimal actualUnloadAmount = param.getActualUnloadAmount();
@@ -193,7 +190,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void contractSignCompleted(ContractSignCompletedParam param) {
-        log.info("合同签约完成入参：{}", JSON.toJSONString(param));
         if (Objects.isNull(param.getUpdateBy()) || StringUtils.isBlank(param.getUpdateByName())) {
             throw new BusinessException("操作人信息不能为空!");
         }
@@ -240,7 +236,6 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
 
     @Override
     public void updateAssociateStatement(UpdateAssociateStatementParam param) {
-        log.info("更新订单是否关联对账单入参：{}", JSON.toJSONString(param));
         Long tOrderId = param.getTOrderId();
         Integer associateStatement = param.getAssociateStatement();
         Long updateBy = param.getUpdateBy();

sckw-modules/sckw-product/pom.xml

@@ -76,6 +76,11 @@
             <groupId>com.sckw</groupId>
             <artifactId>sckw-payment-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
     </dependencies>
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -1,6 +1,5 @@
 package com.sckw.product.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
@@ -37,7 +36,6 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "添加草稿商品")
     public HttpResult addDraft(@RequestBody @Validated AddGoodsDraftParam param) {
         kwpGoodsService.addDraft(param);
         return HttpResult.ok("添加草稿商品成功");
@@ -50,7 +48,6 @@ public class KwpGoodsController {
      * @Param addGoodsParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "添加上架商品")
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addShelves(@RequestBody @Validated AddGoodsParam addGoodsParam) {
         kwpGoodsService.addShelves(addGoodsParam);
@@ -65,7 +62,6 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/detail")
-    @Log(description = "获取商品详情")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(kwpGoodsService.getDetail(id));
     }
@@ -77,7 +73,6 @@ public class KwpGoodsController {
      * @Param updateGoodsParam:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "修改商品")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult update(@RequestBody @Validated UpdateGoodsParam updateGoodsParam) {
         kwpGoodsService.update(updateGoodsParam);
@@ -92,7 +87,6 @@ public class KwpGoodsController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "分页查询商品列表")
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult select(@RequestBody SelectGoodsListParam params) {
         return HttpResult.ok(kwpGoodsService.select(params));
@@ -105,7 +99,6 @@ public class KwpGoodsController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品列表统计查询")
     @PostMapping(value = "/statistic", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult statistic(@RequestBody StatisticGoodsListParam params) {
         return HttpResult.ok(kwpGoodsService.statistic(params));
@@ -135,7 +128,6 @@ public class KwpGoodsController {
      * @Param id:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品上架")
     @GetMapping("/batchPutOnShelves")
     public HttpResult batchPutOnShelves(@RequestParam Long id) {
         kwpGoodsService.batchPutOnShelves(id);
@@ -149,7 +141,6 @@ public class KwpGoodsController {
      * @Param ids:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品批量下架")
     @GetMapping("/batchTakeOffShelves")
     public HttpResult batchTakeOffShelves(@RequestParam String ids) {
         List<Long> goodIds = StringUtils.splitStrToList(ids, ",", Long.class);
@@ -164,7 +155,6 @@ public class KwpGoodsController {
      * @Param ids:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品批量删除")
     @GetMapping("/batchDelete")
     public HttpResult batchDelete(@RequestParam String ids) {
         List<Long> goodIds = StringUtils.splitStrToList(ids, ",", Long.class);
@@ -179,7 +169,6 @@ public class KwpGoodsController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "建材市场分页查询")
     @PostMapping(value = "/buildingMaterialsMarketList", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult buildingMaterialsMarketList(@RequestBody BuildingMaterialsMarketListParam params) {
         return HttpResult.ok(kwpGoodsService.buildingMaterialsMarketList(params));
@@ -192,7 +181,6 @@ public class KwpGoodsController {
      * @Param params:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品下拉列表")
     @PostMapping(value = "/dropList", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult dropList(@RequestBody @Validated GoodsDropListReq params) {
         return HttpResult.ok(kwpGoodsService.dropList(params));
@@ -205,7 +193,6 @@ public class KwpGoodsController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "获取商品预计最大可购数量")
     @PostMapping(value = "/maxPurchaseNum", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult maxPurchaseNum(@RequestBody @Validated MaxPurchaseNumParam param) {
         return HttpResult.ok(kwpGoodsService.maxPurchaseNum(param));
@@ -219,7 +206,6 @@ public class KwpGoodsController {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "更新商品库存")
     @PostMapping(value = "/updateAmount", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult updateAmount(@RequestBody @Validated UpdateAmountParam param) {
         kwpGoodsService.updateAmount(param);
@@ -233,7 +219,6 @@ public class KwpGoodsController {
      * @Param name:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    @Log(description = "商品名称判重")
     @GetMapping("/nameDuplicationJudgment")
     public HttpResult nameDuplicationJudgment(@RequestParam String name, @RequestParam Long supplyEntId) {
         return HttpResult.ok("商品名称判重成功", kwpGoodsService.nameDuplicationJudgment(name, supplyEntId, null));

sckw-modules/sckw-product/src/main/java/com/sckw/product/dubbo/GoodsInfoServiceImpl.java

@@ -44,7 +44,6 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
     @Override
     public Map<Long, KwpGoods> getGoodsByIds(List<Long> ids) {
-        log.info("批量获取商品基本信息，ids：{}", ids);
         if (CollectionUtils.isEmpty(ids)) {
             return Collections.emptyMap();
         }
@@ -57,7 +56,6 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
     @Override
     public HttpResult updateGoodsAmount(Long id, BigDecimal amount) {
-        log.info("更新商品库存id：{}，amount：{}", id, amount);
         String lockKey = String.format(RedisConstant.GOODS_UPDATE_AMOUNT_KEY, id);
         if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 10L, 30L))) {
             return HttpResult.error("业务繁忙，请稍后再试!");

sckw-modules/sckw-report/pom.xml

@@ -104,6 +104,11 @@
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwOrderController.java

@@ -1,6 +1,5 @@
 package com.sckw.report.controller;
 
-import com.sckw.core.annotation.Log;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.HttpResult;
@@ -35,7 +34,6 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/tradeOrderDetail")
-    @Log(description = "贸易订单详情")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(orderService.tradeOrderDetail(id));
     }
@@ -48,7 +46,6 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderSelect", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单列表分页查询")
     public HttpResult select(@RequestBody @Validated TradeOrderListSelectParam params) {
         return HttpResult.ok(orderService.tradeOrderSelect(params));
     }
@@ -61,7 +58,6 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderStatistic", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单列表统计查询")
     public HttpResult statistic(@RequestBody @Validated TradeOrderListStatisticParam params) {
         return HttpResult.ok(orderService.tradeOrderStatistic(params));
     }
@@ -90,7 +86,6 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderStatementList", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "贸易订单对账单分页列表查询")
     public HttpResult tradeOrderStatementList(@RequestBody @Validated TradeOrderStatementList params) {
         return HttpResult.ok(orderService.tradeOrderStatementList(params));
     }
@@ -103,7 +98,6 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderContractList", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Log(description = "合同关联贸易订单列表查询")
     public HttpResult tradeOrderContractList(@RequestBody @Validated TradeOrderContractParam params) {
         return HttpResult.ok(orderService.tradeOrderContractList(params));
     }