diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index a324c518..91308ef9 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -8,7 +8,6 @@ import com.czg.sa.StpKit; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,7 +28,7 @@ public class AdminOrderController { * 订单列表 */ @GetMapping - public CzgResult> getOrderPage(@RequestBody OrderInfoQueryDTO queryDTO) { + public CzgResult> getOrderPage(OrderInfoQueryDTO queryDTO) { queryDTO.setShopId(StpKit.USER.getShopId()); return CzgResult.success(orderInfoService.getOrderByPage(queryDTO)); } diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java index f6228879..151c7c69 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java @@ -4,7 +4,6 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.utils.ServletUtil; -import com.google.gson.Gson; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -17,14 +16,16 @@ import org.springframework.stereotype.Component; /** * 方法调用统一切面处理 + * @author ww */ @Aspect @Component @Slf4j -//@Profile({"dev"}) +@Profile({"test", "dev", "prod"}) +//@Profile({"test"}) public class ControllerAspect { - @Pointcut("execution(public * (com.czg.controller.*.controller..*).*(..)))") + @Pointcut("execution(public * (com.czg.controller..*).*(..)))") public void pkg() { } @@ -41,7 +42,7 @@ public class ControllerAspect { } } - String params = new Gson().toJson(args); + String params = JSONObject.toJSONString(args); // 执行被拦截的方法 Object result = pjp.proceed(); @@ -56,11 +57,14 @@ public class ControllerAspect { String resultJson = JSONObject.toJSONString(result); try { if (StrUtil.isNotBlank(resultJson) && !"null" .equals(resultJson)) { - log.info("\n>>>>>> {} {}" + - "\n>>>>>> IP: {} " + - "\n>>>>>> execute time:{}ms " + - "\n>>>>>> Request: {}" + - "\n>>>>>> Response: {}", + log.info(""" + + >>>>>> {} {} + >>>>>> IP: {} + >>>>>> execute time:{}ms + >>>>>> Request: {} + >>>>>> Response: {} + """, method, requestUrl, requestIp, useTime, params, resultJson