diff --git a/src/main/java/ink/wgink/gateway/filter/global/CountGlobalFilter.java b/src/main/java/ink/wgink/gateway/filter/global/CountGlobalFilter.java index 2d75b0e..9993f97 100644 --- a/src/main/java/ink/wgink/gateway/filter/global/CountGlobalFilter.java +++ b/src/main/java/ink/wgink/gateway/filter/global/CountGlobalFilter.java @@ -34,6 +34,7 @@ public class CountGlobalFilter implements GlobalFilter, Ordered { System.out.println("uri: " + uri); System.out.println("count: "+ count.getAndAdd(1)); System.out.println(); + return chain.filter(exchange); // return exchange.getResponse().setComplete(); } diff --git a/src/main/java/ink/wgink/gateway/config/WebFluxFilterConfig.java b/src/main/java/ink/wgink/gateway/filter/wg/WebFluxFilter.java similarity index 58% rename from src/main/java/ink/wgink/gateway/config/WebFluxFilterConfig.java rename to src/main/java/ink/wgink/gateway/filter/wg/WebFluxFilter.java index 255c99f..4ac1525 100644 --- a/src/main/java/ink/wgink/gateway/config/WebFluxFilterConfig.java +++ b/src/main/java/ink/wgink/gateway/filter/wg/WebFluxFilter.java @@ -1,10 +1,9 @@ -package ink.wgink.gateway.config; +package ink.wgink.gateway.filter.wg; import org.springframework.context.annotation.Configuration; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** @@ -18,23 +17,15 @@ import reactor.core.publisher.Mono; * @Version: 1.0 */ @Configuration -public class WebFluxFilterConfig implements WebFilter { +public class WebFluxFilter implements WebFilter { + + public static final String SESSION_USER = "SESSION_USER"; @Override public Mono filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) { - serverWebExchange.getRequest().getHeaders().forEach((k, list) -> { - System.out.println(k); - list.forEach(System.out::println); - }); - + serverWebExchange.getSession().filter(webSession -> webSession.getAttributes().get(SESSION_USER) == null).then(); + serverWebExchange.getRequest().mutate().path("").build(); return webFilterChain.filter(serverWebExchange); } - public static void main(String[] args) { - Flux.just("你好1", "你好2").subscribe(c -> { - System.out.println(c); - }); - - Mono.just("1").subscribe(System.out::println); - } } diff --git a/src/main/resources/static/wg/assets/layui-v2.6.4/layui/modules/regex.js b/src/main/resources/static/wg/assets/layui-v2.6.4/layui/modules/regex.js new file mode 100644 index 0000000..df3e360 --- /dev/null +++ b/src/main/resources/static/wg/assets/layui-v2.6.4/layui/modules/regex.js @@ -0,0 +1,21 @@ +layui.define(function(exports) { + + var pathRegex = function(value) { + if(/^\/[^\s]+/.test(value)) { + return true; + } + return false; + } + + var uriRegex = function(value) { + if(/(^#)|(^http(s*):\/\/[^\s]+)/.test(value)) { + return true; + } + return false; + } + + exports('regex', { + path: pathRegex, + uri: uriRegex + }) +}); \ No newline at end of file diff --git a/src/main/resources/static/wg/route/index.html b/src/main/resources/static/wg/route/index.html index 3ff3907..14da829 100644 --- a/src/main/resources/static/wg/route/index.html +++ b/src/main/resources/static/wg/route/index.html @@ -34,9 +34,7 @@
首页 - 国际新闻 - 亚太地区 - 正文 + 路由映射
diff --git a/src/main/resources/static/wg/route/route/list.html b/src/main/resources/static/wg/route/route/list.html index 43d7514..49846de 100644 --- a/src/main/resources/static/wg/route/route/list.html +++ b/src/main/resources/static/wg/route/route/list.html @@ -16,12 +16,14 @@
- - +
+ + +
@@ -43,7 +45,9 @@ diff --git a/src/main/resources/static/wg/route/route/update.html b/src/main/resources/static/wg/route/route/update.html index 350c7cd..96c840e 100644 --- a/src/main/resources/static/wg/route/route/update.html +++ b/src/main/resources/static/wg/route/route/update.html @@ -35,14 +35,14 @@
- +
直接访问网关的路径,支持通配符,路径中的变量用{}包含,如/p1/**,/p2/{pq1}/{pq2}
- +
需要映射的服务器uri路径,如http://127.0.0.1:8080
@@ -60,10 +60,13 @@