From f0e930c03ed0ccfbaa4fa2fc2359082483327163 Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Tue, 19 Oct 2021 10:39:23 +0800 Subject: [PATCH] Delete MyApiConfig --- .../src/main/java/we/MyApiConfig.java | 43 ------------------- .../match/FizzApiMatchHttpHandler.java} | 16 +++---- .../match/FizzApiMatchWebServer.java} | 13 +++--- .../we/global_resource/GlobalResource.java | 2 +- 4 files changed, 17 insertions(+), 57 deletions(-) delete mode 100644 fizz-bootstrap/src/main/java/we/MyApiConfig.java rename fizz-core/src/main/java/we/{incubator/FizzApiDispatchHttpHandler.java => api/match/FizzApiMatchHttpHandler.java} (89%) rename fizz-core/src/main/java/we/{incubator/FizzApiDispatchWebServer.java => api/match/FizzApiMatchWebServer.java} (83%) diff --git a/fizz-bootstrap/src/main/java/we/MyApiConfig.java b/fizz-bootstrap/src/main/java/we/MyApiConfig.java deleted file mode 100644 index 8099b54..0000000 --- a/fizz-bootstrap/src/main/java/we/MyApiConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package we; - -import org.springframework.context.annotation.Configuration; -import we.config.ManualApiConfig; -import we.plugin.PluginConfig; -import we.plugin.auth.ApiConfig; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * 定义 MyApiConfig 继承 ManualApiConfig， 并注解为 Configuration， - * 然后实现 setApiConfigs 方法，在方法中添加路由配置 - */ -@Configuration -public class MyApiConfig extends ManualApiConfig { - - @Override - public List setApiConfigs() { - - List apiConfigs = new ArrayList<>(); - - ApiConfig ac = new ApiConfig(); // 一个路由配置 - ac.id = 1000; // 路由 id，建议从 1000 开始 - ac.service = "xservice"; // 前端服务名 - ac.path = "/ypath"; // 前端路径 - ac.type = ApiConfig.Type.REVERSE_PROXY; // 路由类型，此处为反向代理 - ac.httpHostPorts = Collections.singletonList("http://127.0.0.1:9094"); // 被代理接口的地址 - // ac.httpHostPorts = Collections.singletonList("https://self-signed.badssl.com"); - ac.backendPath = "/@ypath"; // 被代理接口的路径 - // ac.backendPath = "/"; - ac.pluginConfigs = new ArrayList<>(); - PluginConfig pc = new PluginConfig(); - pc.plugin = "myPlugin"; // 应用 id 为 myPlugin 的插件 - ac.pluginConfigs.add(pc); - - apiConfigs.add(ac); - - log.info("set api configs end"); - return apiConfigs; // 返回路由配置 - } -} diff --git a/fizz-core/src/main/java/we/incubator/FizzApiDispatchHttpHandler.java b/fizz-core/src/main/java/we/api/match/FizzApiMatchHttpHandler.java similarity index 89% rename from fizz-core/src/main/java/we/incubator/FizzApiDispatchHttpHandler.java rename to fizz-core/src/main/java/we/api/match/FizzApiMatchHttpHandler.java index 32b9a50..160b4c6 100644 --- a/fizz-core/src/main/java/we/incubator/FizzApiDispatchHttpHandler.java +++ b/fizz-core/src/main/java/we/api/match/FizzApiMatchHttpHandler.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.incubator; +package we.api.match; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,15 +48,15 @@ import java.util.Set; * @author hongqiaowei */ -public class FizzApiDispatchHttpHandler implements HttpHandler { +public class FizzApiMatchHttpHandler implements HttpHandler { - private static final String disconnected_client_log_category = "DisconnectedClient"; + private static final String disconnected_client_log_category = "DisconnectedClient"; - private static final Logger log = LoggerFactory.getLogger(FizzApiDispatchHttpHandler.class); + private static final Logger log = LoggerFactory.getLogger(FizzApiMatchHttpHandler.class); - private static final Logger lostClientLog = LoggerFactory.getLogger(disconnected_client_log_category); + private static final Logger lostClientLog = LoggerFactory.getLogger(disconnected_client_log_category); - private static final Set disconnected_client_exceptions = new HashSet<>(Arrays.asList("AbortedException", "ClientAbortException", "EOFException", "EofException")); + private static final Set disconnected_client_exceptions = new HashSet<>(Arrays.asList("AbortedException", "ClientAbortException", "EOFException", "EofException")); private WebSessionManager sessionManager; private ServerCodecConfigurer serverCodecConfigurer; @@ -64,8 +64,8 @@ public class FizzApiDispatchHttpHandler implements HttpHandler { private ForwardedHeaderTransformer forwardedHeaderTransformer; private boolean enableLoggingRequestDetails = false; - public FizzApiDispatchHttpHandler(WebSessionManager sessionManager, ServerCodecConfigurer codecConfigurer, - LocaleContextResolver localeContextResolver, ForwardedHeaderTransformer forwardedHeaderTransformer) { + public FizzApiMatchHttpHandler(WebSessionManager sessionManager, ServerCodecConfigurer codecConfigurer, + LocaleContextResolver localeContextResolver, ForwardedHeaderTransformer forwardedHeaderTransformer) { this.sessionManager = sessionManager; this.serverCodecConfigurer = codecConfigurer; this.localeContextResolver = localeContextResolver; diff --git a/fizz-core/src/main/java/we/incubator/FizzApiDispatchWebServer.java b/fizz-core/src/main/java/we/api/match/FizzApiMatchWebServer.java similarity index 83% rename from fizz-core/src/main/java/we/incubator/FizzApiDispatchWebServer.java rename to fizz-core/src/main/java/we/api/match/FizzApiMatchWebServer.java index e13e313..e3bda8f 100644 --- a/fizz-core/src/main/java/we/incubator/FizzApiDispatchWebServer.java +++ b/fizz-core/src/main/java/we/api/match/FizzApiMatchWebServer.java @@ -15,12 +15,15 @@ * along with this program. If not, see . */ -package we.incubator; +package we.api.match; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration; import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; import org.springframework.boot.web.server.WebServer; +import org.springframework.context.annotation.Configuration; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.web.server.adapter.HttpWebHandlerAdapter; import org.springframework.web.server.session.DefaultWebSessionManager; @@ -35,9 +38,9 @@ import javax.annotation.Resource; //@Configuration //@AutoConfigureAfter({HttpHandlerAutoConfiguration.class}) -public class FizzApiDispatchWebServer { +public class FizzApiMatchWebServer { - private static final Logger log = LoggerFactory.getLogger(FizzApiDispatchWebServer.class); + private static final Logger log = LoggerFactory.getLogger(FizzApiMatchWebServer.class); @Resource private HttpHandler httpHandler; @@ -51,7 +54,7 @@ public class FizzApiDispatchWebServer { HttpWebHandlerAdapter adapter = (HttpWebHandlerAdapter) httpHandler; NettyReactiveWebServerFactory factory = new NettyReactiveWebServerFactory(port); server = factory.getWebServer( - new FizzApiDispatchHttpHandler( + new FizzApiMatchHttpHandler( new DefaultWebSessionManager(), adapter.getCodecConfigurer(), adapter.getLocaleContextResolver(), @@ -59,7 +62,7 @@ public class FizzApiDispatchWebServer { ) ); server.start(); - log.info("fizz api dispatch web server listen on {}", port); + log.info("fizz api match web server listen on {}", port); } @PreDestroy diff --git a/fizz-core/src/main/java/we/global_resource/GlobalResource.java b/fizz-core/src/main/java/we/global_resource/GlobalResource.java index 644b29d..db900b4 100644 --- a/fizz-core/src/main/java/we/global_resource/GlobalResource.java +++ b/fizz-core/src/main/java/we/global_resource/GlobalResource.java @@ -49,7 +49,7 @@ public class GlobalResource { public String val; - public Object originalVal; /** for aggregate use mainly */ + public Object originalVal; /** for aggregate use mostly */ public boolean booleanVal;