网关增强

febs-cloud/sql/febs_cloud_route.sql

@@ -0,0 +1,104 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MongoDB
+ Source Server Version : 40202
+ Source Host           : localhost:27017
+ Source Schema         : febs_cloud_route
+
+ Target Server Type    : MongoDB
+ Target Server Version : 40202
+ File Encoding         : 65001
+
+ Date: 14/01/2020 11:04:22
+*/
+
+
+// ----------------------------
+// Collection structure for blackList
+// ----------------------------
+db.getCollection("blackList").drop();
+db.createCollection("blackList");
+
+// ----------------------------
+// Documents of blackList
+// ----------------------------
+db.getCollection("blackList").insert([ {
+    _id: ObjectId("5e1425e7a548e77106e43b40"),
+    ip: "",
+    requestUri: "/**/actuator/**",
+    requestMethod: "ALL",
+    limitFrom: "",
+    limitTo: "",
+    location: "",
+    status: "1",
+    createTime: "2020-01-07 14:32:07",
+    _class: "cc.mrbird.febs.gateway.entity.BlackList"
+} ]);
+
+// ----------------------------
+// Collection structure for blockLog
+// ----------------------------
+db.getCollection("blockLog").drop();
+db.createCollection("blockLog");
+
+// ----------------------------
+// Collection structure for rateLimitLog
+// ----------------------------
+db.getCollection("rateLimitLog").drop();
+db.createCollection("rateLimitLog");
+
+// ----------------------------
+// Collection structure for rateLimitRule
+// ----------------------------
+db.getCollection("rateLimitRule").drop();
+db.createCollection("rateLimitRule");
+
+// ----------------------------
+// Documents of rateLimitRule
+// ----------------------------
+db.getCollection("rateLimitRule").insert([ {
+    _id: ObjectId("5e1abc9ef51708123d94b1f8"),
+    requestUri: "/auth/captcha",
+    requestMethod: "GET",
+    limitFrom: "06:00:00",
+    limitTo: "22:30:00",
+    count: "1",
+    intervalSec: "10",
+    status: "1",
+    createTime: "2020-01-12 14:28:46",
+    _class: "cc.mrbird.febs.gateway.enhance.entity.RateLimitRule"
+} ]);
+
+// ----------------------------
+// Collection structure for routeLog
+// ----------------------------
+db.getCollection("routeLog").drop();
+db.createCollection("routeLog");
+
+// ----------------------------
+// Collection structure for routeUser
+// ----------------------------
+db.getCollection("routeUser").drop();
+db.createCollection("routeUser");
+
+// ----------------------------
+// Documents of routeUser
+// ----------------------------
+db.getCollection("routeUser").insert([ {
+    _id: ObjectId("5e1d2ee055165e6516c23057"),
+    username: "Jack",
+    password: "$2a$10$NBv548VFJ6OyTkxcHy9o5uRNaYSMPHWHW9fL3ZRlS1Hy5kxlR1qdy",
+    roles: "user",
+    createTime: "2020-01-14 11:00:48",
+    _class: "cc.mrbird.febs.gateway.enhance.entity.RouteUser"
+} ]);
+db.getCollection("routeUser").insert([ {
+    _id: ObjectId("5e1d2eee55165e6516c23058"),
+    username: "admin",
+    password: "$2a$10$WeUSapCOv8uDb2MrUu19cOo6O.Xb4PAJN/4GdAfIcgJ3SAWw.NY3m",
+    roles: "admin",
+    createTime: "2020-01-14 11:01:02",
+    _class: "cc.mrbird.febs.gateway.enhance.entity.RouteUser"
+} ]);

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/auth/WebFluxSecurityCorsConfigure.java → febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/auth/WebFluxSecurityCorsFilter.java

@@ -19,7 +19,7 @@ import reactor.core.publisher.Mono;
  */
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE)
-public class WebFluxSecurityCorsConfigure implements WebFilter {
+public class WebFluxSecurityCorsFilter implements WebFilter {
 
     @Override
     @SuppressWarnings("all")

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlackListServiceImpl.java

@@ -41,7 +41,8 @@ public class BlackListServiceImpl implements BlackListService {
     @Override
     public Mono<BlackList> create(BlackList blackList) {
         blackList.setCreateTime(DateUtil.formatFullTime(LocalDateTime.now(), DateUtil.FULL_TIME_SPLIT_PATTERN));
-        blackList.setLocation(AddressUtil.getCityInfo(blackList.getIp()));
+        if (StringUtils.isNotBlank(blackList.getIp()))
+            blackList.setLocation(AddressUtil.getCityInfo(blackList.getIp()));
         return blackListMapper.insert(blackList).doOnSuccess(b -> routeEnhanceCacheService.saveBlackList(blackList));
     }
 

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlockLogServiceImpl.java

@@ -63,9 +63,6 @@ public class BlockLogServiceImpl implements BlockLogService {
         if (StringUtils.isNotBlank(blockLog.getIp())) {
             criteria.and("ip").is(blockLog.getIp());
         }
-        if (StringUtils.isNotBlank(blockLog.getRequestUri())) {
-            criteria.and("requestUri").is(blockLog.getRequestUri());
-        }
         if (StringUtils.isNotBlank(blockLog.getCreateTimeFrom())
                 && StringUtils.isNotBlank(blockLog.getCreateTimeTo())) {
             criteria.andOperator(
@@ -73,6 +70,9 @@ public class BlockLogServiceImpl implements BlockLogService {
                     Criteria.where("createTime").lt(blockLog.getCreateTimeTo())
             );
         }
+        if (StringUtils.isNotBlank(blockLog.getRequestUri())) {
+            criteria.and("requestUri").is(blockLog.getRequestUri());
+        }
         query.addCriteria(criteria);
         return query;
     }

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteEnhanceServiceImpl.java

@@ -160,7 +160,6 @@ public class RouteEnhanceServiceImpl implements RouteEnhanceService {
         }
     }
 
-
     private void doBlackListCheck(AtomicBoolean forbid, Set<Object> blackList, URI uri, String requestMethod) {
         for (Object o : blackList) {
             BlackList b = JSONObject.parseObject(o.toString(), BlackList.class);

febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/utils/PageableExecutionUtil.java

@@ -15,11 +15,13 @@ import reactor.core.publisher.Flux;
  */
 public class PageableExecutionUtil {
 
-    public static <FEBS> Flux<FEBS> getPages(Query query, QueryRequest request, Class<FEBS> clazz, ReactiveMongoTemplate template) {
+    public static <FEBS> Flux<FEBS> getPages(Query query, QueryRequest request, Class<FEBS> clazz,
+                                             ReactiveMongoTemplate template) {
         Sort sort = Sort.by("id").descending();
-        if (StringUtils.isNotBlank(request.getField())
-                && StringUtils.isNotBlank(request.getOrder()))
-            sort = FebsConstant.ORDER_ASC.equals(request.getOrder()) ? Sort.by(request.getField()).ascending() : Sort.by(request.getField()).descending();
+        if (StringUtils.isNotBlank(request.getField()) && StringUtils.isNotBlank(request.getOrder()))
+            sort = FebsConstant.ORDER_ASC.equals(request.getOrder()) ?
+                    Sort.by(request.getField()).ascending() :
+                    Sort.by(request.getField()).descending();
         Pageable pageable = PageRequest.of(request.getPageNum(), request.getPageSize(), sort);
         return template.find(query.with(pageable), clazz);
     }

febs-gateway/src/main/resources/bootstrap.yml

@@ -11,9 +11,6 @@ spring:
       discovery:
         server-addr: ${nacos.url}:8001
 
-#  autoconfigure:
-#    exclude: org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration,org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration,org.springframework.boot.autoconfigure.data.mongo.MongoReactiveRepositoriesAutoConfiguration,org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration
-
 logging:
   level:
     com: