Merge branch 'pro' of http://git.mokasz.com/liuwei/launch-webFlux-platform into pro

launch-admin/src/main/java/com/webflux/launchadmin/aspect/ParameterLogAspect.java

@@ -18,9 +18,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 /**
  * @author lqc
  */
-@Aspect
-@Component
-@Order
+// @Aspect
+// @Component
+// @Order
 @RequiredArgsConstructor
 @Slf4j
 public class ParameterLogAspect {
@@ -31,7 +31,7 @@ public class ParameterLogAspect {
     /**
      * 申明一个切点 里面是 execution表达式
      */
-    @Pointcut("execution(public * com.webflux.launchadmin.mysql.controller.*.*(..))")
+    @Pointcut("execution(public * com.webflux.launchadmin.mysql.controller.*.*.*(..))")
     private void controllerAspect() {
     }
 

launch-admin/src/main/java/com/webflux/launchadmin/filter/TraceIdFilter.java

@@ -5,7 +5,6 @@ import lombok.SneakyThrows;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
@@ -23,7 +22,7 @@ public class TraceIdFilter implements WebFilter {
     public Mono<Void> filter(@NotNull ServerWebExchange exchange, @NotNull WebFilterChain chain) {
         try {
             ServerHttpRequest request = exchange.getRequest();
-            String traceId = request.getQueryParams().getFirst("traceId");
+            String traceId = request.getHeaders().getFirst("Trace-Id");
             if (traceId == null || traceId.isEmpty()) {
                 TraceId.set();
             } else {

launch-admin/src/main/java/com/webflux/launchadmin/global/GlobalExceptionHandler.java

@@ -30,10 +30,8 @@ import java.util.Objects;
 @RestControllerAdvice
 @Slf4j
 public class GlobalExceptionHandler {
-    @ResponseBody
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(BaseException.class)
-    public Mono<RW<Object>> handleException(BaseException e, ServerWebExchange exchange) {
+    public Mono<RW<Object>> handleException(ServerWebExchange exchange, BaseException e) {
         log.warn("接口异常 uri={} e={}", exchange.getRequest().getPath().value(), LogExceptionStackTrace.erroStackTrace(e));
         return RW.fail("500", e.getMessage(), Mono.just(e.getMessage()));
     }
@@ -51,12 +49,14 @@ public class GlobalExceptionHandler {
         log.warn("接口异常 uri = {} e = {}", exchange.getRequest().getPath().value(), LogExceptionStackTrace.erroStackTrace(e));
         return RW.fail(HttpStatus.FORBIDDEN.toString(), "没有权限，请联系管理员授权", Mono.just(e.getMessage()));
     }
+
     //@ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MissingRequestValueException.class)
-    public Mono<RW<Object>> handleMissingRequestValueException(ServerWebExchange exchange, AccessDeniedException e) {
+    public Mono<RW<Object>> handleMissingRequestValueException(ServerWebExchange exchange, MissingRequestValueException e) {
         log.warn("接口异常 uri = {} e = {}", exchange.getRequest().getPath().value(), LogExceptionStackTrace.erroStackTrace(e));
         return RW.fail(HttpStatus.FORBIDDEN.toString(), "请求参数异常", Mono.just(e.getMessage()));
     }
+
     @ExceptionHandler(AccountExpiredException.class)
     public Mono<RW<Object>> handleAccountExpiredException(ServerWebExchange exchange, AccountExpiredException e) {
         log.warn("接口异常 uri = {} e = {}", exchange.getRequest().getPath().value(), LogExceptionStackTrace.erroStackTrace(e));
@@ -64,7 +64,7 @@ public class GlobalExceptionHandler {
     }
 
     @ExceptionHandler(DataAccessException.class)
-    public Mono<RW<Object>> handleDataAccessException(ServerWebExchange exchange, AccountExpiredException e) {
+    public Mono<RW<Object>> handleDataAccessException(ServerWebExchange exchange, DataAccessException e) {
         log.error("接口异常 uri = {} e = {}", exchange.getRequest().getPath().value(), LogExceptionStackTrace.erroStackTrace(e));
         return RW.fail(e.getMessage(), Mono.just(e.getMessage()));
     }