添加用户查询列表

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -251,7 +251,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             return true;
         } else {
             AreaEntity areaTemp = areaService.getExtCache(areaCode);
-            if (!ObjectUtils.isEmpty(areaTemp.getPid())) {
+            if (!ObjectUtils.isEmpty(areaTemp)&&!ObjectUtils.isEmpty(areaTemp.getPid())) {
                 AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
                 if (!ObjectUtils.isEmpty(areaEntity)) {
                     return getSite(rootAreaCode, areaEntity.getAreaCode(), siteList, siteEntity);

smart-gateway/src/main/java/com/mortals/xhx/base/framework/handler/SentinelFallbackHandler.java

-//package com.mortals.xhx.base.framework.handler;
-//
-//import com.mortals.xhx.common.utils.WebFluxUtils;
-//import org.springframework.web.reactive.function.server.ServerResponse;
-//import org.springframework.web.server.ServerWebExchange;
-//import org.springframework.web.server.WebExceptionHandler;
-//import reactor.core.publisher.Mono;
-//
-///**
-// * 自定义限流异常处理
-// *
-// * @author: zxfei
-// * @date: 2022/6/20 13:53
-// */
-//public class SentinelFallbackHandler implements WebExceptionHandler {
-//    private Mono<Void> writeResponse(ServerResponse response, ServerWebExchange exchange) {
-//        return WebFluxUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数，请稍候再试");
-//    }
-//
-//    @Override
-//    public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
-//        ex.printStackTrace();
-//        if (exchange.getResponse().isCommitted()) {
-//            return Mono.error(ex);
-//        }
-//        return null;
-///*        if (!BlockException.isBlockException(ex)) {
-//            return Mono.error(ex);
-//        }
-//        return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange));*/
-//    }
-//
-///*    private Mono<ServerResponse> handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) {
-//        return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable);
-//    }*/
-//}
+package com.mortals.xhx.base.framework.handler;
+
+import com.mortals.xhx.common.utils.WebFluxUtils;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebExceptionHandler;
+import reactor.core.publisher.Mono;
+
+/**
+ * 自定义限流异常处理
+ *
+ * @author: zxfei
+ * @date: 2022/6/20 13:53
+ */
+public class SentinelFallbackHandler implements WebExceptionHandler {
+    private Mono<Void> writeResponse(ServerResponse response, ServerWebExchange exchange) {
+        return WebFluxUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数，请稍候再试");
+    }
+
+    @Override
+    public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
+        // TODO: 2022/7/6
+        return Mono.error(ex);
+       /* ex.printStackTrace();
+        if (exchange.getResponse().isCommitted()) {
+            return Mono.error(ex);
+        }
+
+        if (!BlockException.isBlockException(ex)) {
+            return Mono.error(ex);
+        }
+        return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange));
+   */
+
+    }
+
+    /*private Mono<ServerResponse> handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) {
+        return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable);
+    }*/
+}