From 118a4df66606e0976fb25c2bb9c4f75fe470c2ed Mon Sep 17 00:00:00 2001 From: hongqiaowei Date: Thu, 1 Apr 2021 11:06:10 +0800 Subject: [PATCH] init --- fizz-bootstrap/pom.xml | 278 ++++++++ .../java/we/FizzBootstrapApplication.java | 6 +- .../main/resources/META-INF/app.properties | 0 .../src}/main/resources/apollo-env.properties | 0 .../src}/main/resources/application.yml | 4 +- .../src}/main/resources/js/common.js | 0 .../src}/main/resources/log4j2-spring.xml | 0 .../src}/main/resources/static/favicon.ico | Bin .../src/test/resource}/application.properties | 0 .../src/test/resource}/log4j2-test.xml | 0 fizz-common/pom.xml | 79 +++ .../java/we/config/RedisReactiveConfig.java | 0 .../we/config/RedisReactiveProperties.java | 0 .../src}/main/java/we/config/SchedConfig.java | 0 .../main/java/we/config/WebClientConfig.java | 0 .../src}/main/java/we/util/Constants.java | 2 +- .../src}/main/java/we/util/DateTimeUtils.java | 0 .../src}/main/java/we/util/DigestUtils.java | 0 .../src}/main/java/we/util/JacksonUtils.java | 1 - .../main/java/we/util/JsonSchemaUtils.java | 0 .../src}/main/java/we/util/MapUtil.java | 0 .../src}/main/java/we/util/NetworkUtils.java | 41 +- .../src}/main/java/we/util/PemUtils.java | 0 .../main/java/we/util/ReactiveResult.java | 0 .../src}/main/java/we/util/ReactorUtils.java | 0 .../main/java/we/util/ReflectionUtils.java | 0 .../src}/main/java/we/util/Result.java | 0 .../src}/main/java/we/util/Script.java | 0 .../src}/main/java/we/util/ScriptUtils.java | 0 .../src}/main/java/we/util/ThreadContext.java | 0 .../main/java/we/util/UrlTransformUtils.java | 2 +- .../src}/main/java/we/util/Utils.java | 0 fizz-core/pom.xml | 266 ++++++++ .../src}/main/java/we/FizzAppContext.java | 0 .../ApolloLog4j2ConfigurationFactory.java | 0 .../java/we/config/AggrWebClientConfig.java | 0 .../java/we/config/AggregateRedisConfig.java | 0 .../main/java/we/config/ApolloConfig.java | 0 .../java/we/config/AppConfigProperties.java | 0 .../java/we/config/FlowControlConfig.java | 0 .../java/we/config/FlowStatSchedConfig.java | 0 .../java/we/config/ProxyWebClientConfig.java | 0 .../main/java/we/config/SystemConfig.java | 0 .../main/java/we/config/WebFluxConfig.java | 1 + .../java/we/constants/CommonConstants.java | 0 .../we/controller/CacheCheckController.java | 0 .../we/controller/CallbackController.java | 0 .../java/we/controller/ConfigController.java | 0 .../we/controller/FlowControlController.java | 0 .../we/controller/HealthCheckController.java | 0 .../controller/ManagerConfigController.java | 0 .../controller/req/BaseManagerConfigReq.java | 0 .../java/we/controller/req/GetConfigReq.java | 0 .../we/controller/req/GetConfigStrReq.java | 0 .../java/we/controller/resp/ConfigResp.java | 0 .../we/controller/resp/ConfigStrResp.java | 0 .../we/exception/ExecuteScriptException.java | 0 .../java/we/exception/RedirectException.java | 0 .../exception/StopAndResponseException.java | 0 .../main/java/we/filter/AggregateFilter.java | 0 .../main/java/we/filter/CallbackFilter.java | 0 .../main/java/we/filter/CorsFilterConfig.java | 0 .../filter/FilterExceptionHandlerConfig.java | 0 .../main/java/we/filter/FilterResult.java | 0 .../main/java/we/filter/FizzLogFilter.java | 0 .../main/java/we/filter/FizzWebFilter.java | 0 .../java/we/filter/FlowControlFilter.java | 0 .../main/java/we/filter/PreprocessFilter.java | 0 .../src}/main/java/we/filter/RouteFilter.java | 0 .../main/java/we/fizz/AggregateResource.java | 0 .../main/java/we/fizz/AggregateResult.java | 0 .../main/java/we/fizz/AggregateService.java | 0 .../src}/main/java/we/fizz/ConfigLoader.java | 0 .../src}/main/java/we/fizz/Pipeline.java | 0 .../src}/main/java/we/fizz/Step.java | 0 .../src}/main/java/we/fizz/StepContext.java | 0 .../src}/main/java/we/fizz/StepResponse.java | 0 .../java/we/fizz/exception/FizzException.java | 0 .../fizz/exception/FizzRuntimeException.java | 0 .../java/we/fizz/input/ClientInputConfig.java | 0 .../src}/main/java/we/fizz/input/IInput.java | 0 .../src}/main/java/we/fizz/input/Input.java | 0 .../main/java/we/fizz/input/InputConfig.java | 0 .../main/java/we/fizz/input/InputContext.java | 0 .../main/java/we/fizz/input/InputFactory.java | 0 .../main/java/we/fizz/input/InputType.java | 0 .../main/java/we/fizz/input/PathMapping.java | 0 .../main/java/we/fizz/input/RPCInput.java | 0 .../main/java/we/fizz/input/RPCResponse.java | 0 .../main/java/we/fizz/input/ScriptHelper.java | 0 .../input/extension/dubbo/DubboInput.java | 0 .../extension/dubbo/DubboInputConfig.java | 0 .../extension/dubbo/DubboRPCResponse.java | 0 .../input/extension/grpc/GRPCResponse.java | 0 .../fizz/input/extension/grpc/GrpcInput.java | 0 .../input/extension/grpc/GrpcInputConfig.java | 0 .../input/extension/mysql/MySQLInput.java | 0 .../extension/mysql/MySQLInputConfig.java | 0 .../input/extension/request/RequestInput.java | 0 .../extension/request/RequestInputConfig.java | 0 .../extension/request/RequestRPCResponse.java | 0 .../clients/log4j2appender/LogService.java | 0 .../clients/log4j2appender/ThreadContext.java | 0 .../src}/main/java/we/legacy/RespEntity.java | 0 .../we/listener/AggregateChannelListener.java | 0 .../src}/main/java/we/log/LogSend.java | 0 .../main/java/we/log/LogSendAppender.java | 0 .../src}/main/java/we/log/LogSendService.java | 0 .../java/we/log/RedisLogSendServiceImpl.java | 0 .../java/we/plugin/FixedPluginFilter.java | 0 .../main/java/we/plugin/PluginConfig.java | 0 .../main/java/we/plugin/PluginFilter.java | 0 .../main/java/we/plugin/auth/ApiConfig.java | 4 +- .../java/we/plugin/auth/ApiConfig2apps.java | 0 .../java/we/plugin/auth/ApiConfigService.java | 0 .../we/plugin/auth/ApiConifg2appsService.java | 0 .../src}/main/java/we/plugin/auth/App.java | 0 .../main/java/we/plugin/auth/AppService.java | 0 .../java/we/plugin/auth/AuthPluginFilter.java | 0 .../java/we/plugin/auth/CallbackConfig.java | 0 .../main/java/we/plugin/auth/CustomAuth.java | 0 .../java/we/plugin/auth/GatewayGroup.java | 0 .../plugin/auth/GatewayGroup2apiConfig.java | 0 .../we/plugin/auth/GatewayGroupService.java | 0 .../main/java/we/plugin/auth/Receiver.java | 0 .../java/we/plugin/auth/ServiceConfig.java | 4 +- .../java/we/plugin/stat/StatPluginFilter.java | 0 .../AbstractDiscoveryClientUriSelector.java | 0 .../main/java/we/proxy/CallBackendConfig.java | 0 .../main/java/we/proxy/CallbackReplayReq.java | 0 .../main/java/we/proxy/CallbackService.java | 0 .../we/proxy/DisableDiscoveryUriSelector.java | 0 .../we/proxy/DiscoveryClientUriSelector.java | 0 .../main/java/we/proxy/EurekaUriSelector.java | 0 .../java/we/proxy/FailAggregateResult.java | 0 .../java/we/proxy/FizzFailClientResponse.java | 0 .../main/java/we/proxy/FizzWebClient.java | 0 .../main/java/we/proxy/NacosUriSelector.java | 0 .../main/java/we/proxy/ServiceInstance.java | 0 .../main/java/we/proxy/ServiceTypePath.java | 0 .../dubbo/ApacheDubboGenericService.java | 0 .../dubbo/DubboInterfaceDeclaration.java | 0 .../main/java/we/proxy/dubbo/DubboUtils.java | 0 .../we/proxy/grpc/GrpcGenericService.java | 0 .../we/proxy/grpc/GrpcInstanceService.java | 0 .../proxy/grpc/GrpcInstanceServiceImpl.java | 0 .../proxy/grpc/GrpcInterfaceDeclaration.java | 0 .../proxy/grpc/ListenableFutureAdapter.java | 0 .../java/we/proxy/grpc/client/CallParams.java | 0 .../we/proxy/grpc/client/CallResults.java | 0 .../java/we/proxy/grpc/client/GrpcClient.java | 0 .../we/proxy/grpc/client/GrpcProxyClient.java | 0 .../client/core/CompositeStreamObserver.java | 0 .../proxy/grpc/client/core/DoneObserver.java | 0 .../client/core/DynamicMessageMarshaller.java | 0 .../client/core/GrpcMethodDefinition.java | 0 .../client/core/ServerReflectionClient.java | 0 .../grpc/client/core/ServiceResolver.java | 0 .../grpc/client/utils/ChannelFactory.java | 0 .../client/utils/GrpcReflectionUtils.java | 0 .../grpc/client/utils/MessageWriter.java | 0 .../src}/main/java/we/proxy/package-info.java | 0 .../src}/main/java/we/stats/BlockType.java | 0 .../src}/main/java/we/stats/FlowStat.java | 0 .../main/java/we/stats/IncrRequestResult.java | 0 .../main/java/we/stats/ResourceConfig.java | 0 .../src}/main/java/we/stats/ResourceStat.java | 0 .../java/we/stats/ResourceTimeWindowStat.java | 0 .../src}/main/java/we/stats/TimeSlot.java | 0 .../main/java/we/stats/TimeWindowStat.java | 0 .../ratelimit/ResourceRateLimitConfig.java | 0 .../ResourceRateLimitConfigService.java | 0 .../src}/main/java/we/util/WebUtils.java | 0 .../we/filter/FlowControlFilterTests.java | 2 +- .../test/java/we/fizz/group/DevTestGroup.java | 0 .../java/we/fizz/group/FastTestGroup.java | 0 .../java/we/fizz/group/SlowTestGroup.java | 0 .../we/fizz/input/DubboInputMockTests.java | 0 .../java/we/fizz/input/DubboInputTests.java | 0 .../we/fizz/input/GrpcInputMockTests.java | 0 .../java/we/fizz/input/PathMappingTests.java | 0 .../java/we/fizz/input/RequestInputTests.java | 0 .../ApacheDubboGenericServiceMockTests.java | 0 .../dubbo/ApacheDubboGenericServiceTests.java | 0 .../auth/ApiConifg2appsServiceTests.java | 0 .../java/we/proxy/CallbackServiceTests.java | 0 .../java/we/proxy/FizzWebClientTests.java | 0 .../test/java/we/redis/RedisProperties.java | 0 .../we/redis/RedisServerConfiguration.java | 0 .../we/redis/RedisTemplateConfiguration.java | 0 .../test/java/we/stats/FlowStatTests.java | 0 .../we/stats/ratelimit/RateLimitTests.java | 0 .../ResourceRateLimitConfigServiceTests.java | 0 .../ResourceRateLimitConfigTests.java | 0 .../src}/test/java/we/util/WebUtilsTests.java | 0 .../src/test/resources/application.properties | 5 + fizz-core/src/test/resources/log4j2-test.xml | 18 + fizz-plugin/pom.xml | 266 ++++++++ .../basicAuth/BasicAuthPluginFilter.java | 7 +- .../we/plugin/basicAuth/GlobalConfig.java | 0 .../main/java/we/plugin/jwt/GlobalConfig.java | 0 .../we/plugin/jwt/JwtAuthPluginFilter.java | 22 +- .../basicAuth/BasicAuthPluginFilterTests.java | 8 +- .../jwtAuth/JwtAuthPluginFilterTests.java | 9 +- fizz-spring-boot-starter/pom.xml | 324 ++++++++++ .../main/resources/META-INF/spring.factories | 45 ++ pom.xml | 593 ++++++++++-------- .../org/springframework/http/HttpMethod.java | 70 --- .../java/we/FizzGatewayApplicationTests.java | 9 - 209 files changed, 1656 insertions(+), 410 deletions(-) create mode 100644 fizz-bootstrap/pom.xml rename src/main/java/we/FizzGatewayApplication.java => fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java (96%) rename {src => fizz-bootstrap/src}/main/resources/META-INF/app.properties (100%) rename {src => fizz-bootstrap/src}/main/resources/apollo-env.properties (100%) rename {src => fizz-bootstrap/src}/main/resources/application.yml (96%) rename {src => fizz-bootstrap/src}/main/resources/js/common.js (100%) rename {src => fizz-bootstrap/src}/main/resources/log4j2-spring.xml (100%) rename {src => fizz-bootstrap/src}/main/resources/static/favicon.ico (100%) rename {src/test/resources => fizz-bootstrap/src/test/resource}/application.properties (100%) rename {src/test/resources => fizz-bootstrap/src/test/resource}/log4j2-test.xml (100%) create mode 100644 fizz-common/pom.xml rename {src => fizz-common/src}/main/java/we/config/RedisReactiveConfig.java (100%) rename {src => fizz-common/src}/main/java/we/config/RedisReactiveProperties.java (100%) rename {src => fizz-common/src}/main/java/we/config/SchedConfig.java (100%) rename {src => fizz-common/src}/main/java/we/config/WebClientConfig.java (100%) rename {src => fizz-common/src}/main/java/we/util/Constants.java (98%) rename {src => fizz-common/src}/main/java/we/util/DateTimeUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/DigestUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/JacksonUtils.java (99%) rename {src => fizz-common/src}/main/java/we/util/JsonSchemaUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/MapUtil.java (100%) rename {src => fizz-common/src}/main/java/we/util/NetworkUtils.java (68%) rename {src => fizz-common/src}/main/java/we/util/PemUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/ReactiveResult.java (100%) rename {src => fizz-common/src}/main/java/we/util/ReactorUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/ReflectionUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/Result.java (100%) rename {src => fizz-common/src}/main/java/we/util/Script.java (100%) rename {src => fizz-common/src}/main/java/we/util/ScriptUtils.java (100%) rename {src => fizz-common/src}/main/java/we/util/ThreadContext.java (100%) rename {src => fizz-common/src}/main/java/we/util/UrlTransformUtils.java (98%) rename {src => fizz-common/src}/main/java/we/util/Utils.java (100%) create mode 100644 fizz-core/pom.xml rename {src => fizz-core/src}/main/java/we/FizzAppContext.java (100%) rename {src => fizz-core/src}/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java (100%) rename {src => fizz-core/src}/main/java/we/config/AggrWebClientConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/AggregateRedisConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/ApolloConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/AppConfigProperties.java (100%) rename {src => fizz-core/src}/main/java/we/config/FlowControlConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/FlowStatSchedConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/ProxyWebClientConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/SystemConfig.java (100%) rename {src => fizz-core/src}/main/java/we/config/WebFluxConfig.java (99%) rename {src => fizz-core/src}/main/java/we/constants/CommonConstants.java (100%) rename {src => fizz-core/src}/main/java/we/controller/CacheCheckController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/CallbackController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/ConfigController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/FlowControlController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/HealthCheckController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/ManagerConfigController.java (100%) rename {src => fizz-core/src}/main/java/we/controller/req/BaseManagerConfigReq.java (100%) rename {src => fizz-core/src}/main/java/we/controller/req/GetConfigReq.java (100%) rename {src => fizz-core/src}/main/java/we/controller/req/GetConfigStrReq.java (100%) rename {src => fizz-core/src}/main/java/we/controller/resp/ConfigResp.java (100%) rename {src => fizz-core/src}/main/java/we/controller/resp/ConfigStrResp.java (100%) rename {src => fizz-core/src}/main/java/we/exception/ExecuteScriptException.java (100%) rename {src => fizz-core/src}/main/java/we/exception/RedirectException.java (100%) rename {src => fizz-core/src}/main/java/we/exception/StopAndResponseException.java (100%) rename {src => fizz-core/src}/main/java/we/filter/AggregateFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/CallbackFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/CorsFilterConfig.java (100%) rename {src => fizz-core/src}/main/java/we/filter/FilterExceptionHandlerConfig.java (100%) rename {src => fizz-core/src}/main/java/we/filter/FilterResult.java (100%) rename {src => fizz-core/src}/main/java/we/filter/FizzLogFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/FizzWebFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/FlowControlFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/PreprocessFilter.java (100%) rename {src => fizz-core/src}/main/java/we/filter/RouteFilter.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/AggregateResource.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/AggregateResult.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/AggregateService.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/ConfigLoader.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/Pipeline.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/Step.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/StepContext.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/StepResponse.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/exception/FizzException.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/exception/FizzRuntimeException.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/ClientInputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/IInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/Input.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/InputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/InputContext.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/InputFactory.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/InputType.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/PathMapping.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/RPCInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/RPCResponse.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/ScriptHelper.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/dubbo/DubboInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/grpc/GRPCResponse.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/grpc/GrpcInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/mysql/MySQLInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/mysql/MySQLInputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/request/RequestInput.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/request/RequestInputConfig.java (100%) rename {src => fizz-core/src}/main/java/we/fizz/input/extension/request/RequestRPCResponse.java (100%) rename {src => fizz-core/src}/main/java/we/flume/clients/log4j2appender/LogService.java (100%) rename {src => fizz-core/src}/main/java/we/flume/clients/log4j2appender/ThreadContext.java (100%) rename {src => fizz-core/src}/main/java/we/legacy/RespEntity.java (100%) rename {src => fizz-core/src}/main/java/we/listener/AggregateChannelListener.java (100%) rename {src => fizz-core/src}/main/java/we/log/LogSend.java (100%) rename {src => fizz-core/src}/main/java/we/log/LogSendAppender.java (100%) rename {src => fizz-core/src}/main/java/we/log/LogSendService.java (100%) rename {src => fizz-core/src}/main/java/we/log/RedisLogSendServiceImpl.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/FixedPluginFilter.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/PluginConfig.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/PluginFilter.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/ApiConfig.java (98%) rename {src => fizz-core/src}/main/java/we/plugin/auth/ApiConfig2apps.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/ApiConfigService.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/ApiConifg2appsService.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/App.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/AppService.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/AuthPluginFilter.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/CallbackConfig.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/CustomAuth.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/GatewayGroup.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/GatewayGroup2apiConfig.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/GatewayGroupService.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/Receiver.java (100%) rename {src => fizz-core/src}/main/java/we/plugin/auth/ServiceConfig.java (99%) rename {src => fizz-core/src}/main/java/we/plugin/stat/StatPluginFilter.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/CallBackendConfig.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/CallbackReplayReq.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/CallbackService.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/DisableDiscoveryUriSelector.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/DiscoveryClientUriSelector.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/EurekaUriSelector.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/FailAggregateResult.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/FizzFailClientResponse.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/FizzWebClient.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/NacosUriSelector.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/ServiceInstance.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/ServiceTypePath.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/dubbo/ApacheDubboGenericService.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/dubbo/DubboUtils.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/GrpcGenericService.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/GrpcInstanceService.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/ListenableFutureAdapter.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/CallParams.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/CallResults.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/GrpcClient.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/GrpcProxyClient.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/DoneObserver.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/core/ServiceResolver.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/utils/ChannelFactory.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/grpc/client/utils/MessageWriter.java (100%) rename {src => fizz-core/src}/main/java/we/proxy/package-info.java (100%) rename {src => fizz-core/src}/main/java/we/stats/BlockType.java (100%) rename {src => fizz-core/src}/main/java/we/stats/FlowStat.java (100%) rename {src => fizz-core/src}/main/java/we/stats/IncrRequestResult.java (100%) rename {src => fizz-core/src}/main/java/we/stats/ResourceConfig.java (100%) rename {src => fizz-core/src}/main/java/we/stats/ResourceStat.java (100%) rename {src => fizz-core/src}/main/java/we/stats/ResourceTimeWindowStat.java (100%) rename {src => fizz-core/src}/main/java/we/stats/TimeSlot.java (100%) rename {src => fizz-core/src}/main/java/we/stats/TimeWindowStat.java (100%) rename {src => fizz-core/src}/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java (100%) rename {src => fizz-core/src}/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java (100%) rename {src => fizz-core/src}/main/java/we/util/WebUtils.java (100%) rename {src => fizz-core/src}/test/java/we/filter/FlowControlFilterTests.java (99%) rename {src => fizz-core/src}/test/java/we/fizz/group/DevTestGroup.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/group/FastTestGroup.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/group/SlowTestGroup.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/DubboInputMockTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/DubboInputTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/GrpcInputMockTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/PathMappingTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/RequestInputTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java (100%) rename {src => fizz-core/src}/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java (100%) rename {src => fizz-core/src}/test/java/we/plugin/auth/ApiConifg2appsServiceTests.java (100%) rename {src => fizz-core/src}/test/java/we/proxy/CallbackServiceTests.java (100%) rename {src => fizz-core/src}/test/java/we/proxy/FizzWebClientTests.java (100%) rename {src => fizz-core/src}/test/java/we/redis/RedisProperties.java (100%) rename {src => fizz-core/src}/test/java/we/redis/RedisServerConfiguration.java (100%) rename {src => fizz-core/src}/test/java/we/redis/RedisTemplateConfiguration.java (100%) rename {src => fizz-core/src}/test/java/we/stats/FlowStatTests.java (100%) rename {src => fizz-core/src}/test/java/we/stats/ratelimit/RateLimitTests.java (100%) rename {src => fizz-core/src}/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java (100%) rename {src => fizz-core/src}/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java (100%) rename {src => fizz-core/src}/test/java/we/util/WebUtilsTests.java (100%) create mode 100644 fizz-core/src/test/resources/application.properties create mode 100644 fizz-core/src/test/resources/log4j2-test.xml create mode 100644 fizz-plugin/pom.xml rename {src => fizz-plugin/src}/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java (99%) rename {src => fizz-plugin/src}/main/java/we/plugin/basicAuth/GlobalConfig.java (100%) rename {src => fizz-plugin/src}/main/java/we/plugin/jwt/GlobalConfig.java (100%) rename {src => fizz-plugin/src}/main/java/we/plugin/jwt/JwtAuthPluginFilter.java (99%) rename {src => fizz-plugin/src}/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java (98%) rename {src => fizz-plugin/src}/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java (98%) create mode 100644 fizz-spring-boot-starter/pom.xml create mode 100644 fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories delete mode 100644 src/main/java/org/springframework/http/HttpMethod.java delete mode 100644 src/test/java/we/FizzGatewayApplicationTests.java diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml new file mode 100644 index 0000000..2340d64 --- /dev/null +++ b/fizz-bootstrap/pom.xml @@ -0,0 +1,278 @@ + + + + fizz-gateway-community + we + 1.5.0 + ../pom.xml + + 4.0.0 + + fizz-bootstrap + + + + + + + com.networknt + json-schema-validator-i18n-support + 1.0.39_4 + system + ${project.basedir}/../lib/json-schema-validator-i18n-support-1.0.39_4.jar + + + + we + fizz-core + + + + + org.springframework.session + spring-session-bom + Dragonfruit-RELEASE + pom + import + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + org.skyscreamer + jsonassert + + + + + + io.projectreactor + reactor-test + test + + + + com.alibaba + fastjson + + + + com.google.code.gson + gson + + + + net.minidev + json-smart + + + + org.codehaus.jettison + jettison + + + + org.json + json + + + + org.apache.tapestry + tapestry-json + + + + org.apache.commons + commons-lang3 + + + + org.codehaus.groovy + groovy-all + + + + commons-io + commons-io + + + + com.ctrip.framework.apollo + apollo-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + com.alibaba.boot + nacos-config-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + + + + org.apache.commons + commons-pool2 + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + + it.ozimov + embedded-redis + test + + + org.slf4j + slf4j-simple + + + + + + org.noear + snack3 + + + + org.springframework.session + spring-session-data-redis + + + + com.auth0 + java-jwt + + + + org.mockito + mockito-core + test + + + + org.mockito + mockito-inline + test + + + + org.apache.dubbo + dubbo + + + + + io.grpc + grpc-all + + + io.grpc + grpc-services + + + org.projectlombok + lombok + + + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + junit + junit + test + + + + commons-codec + commons-codec + + + + org.bouncycastle + bcpkix-jdk15on + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + \ No newline at end of file diff --git a/src/main/java/we/FizzGatewayApplication.java b/fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java similarity index 96% rename from src/main/java/we/FizzGatewayApplication.java rename to fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java index 1361c40..42e746e 100644 --- a/src/main/java/we/FizzGatewayApplication.java +++ b/fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java @@ -43,11 +43,11 @@ import we.log.LogSendAppender; ) @NacosPropertySource(dataId = "${nacos.config.data-id}", groupId = "${nacos.config.group}", autoRefreshed = true) @EnableDiscoveryClient -public class FizzGatewayApplication { - private static final Logger LOGGER = LoggerFactory.getLogger(FizzGatewayApplication.class); +public class FizzBootstrapApplication { + private static final Logger LOGGER = LoggerFactory.getLogger(FizzBootstrapApplication.class); public static void main(String[] args) { - SpringApplication springApplication = new SpringApplication(FizzGatewayApplication.class); + SpringApplication springApplication = new SpringApplication(FizzBootstrapApplication.class); springApplication.setApplicationContextClass(CustomReactiveWebServerApplicationContext.class); FizzAppContext.appContext = springApplication.run(args); } diff --git a/src/main/resources/META-INF/app.properties b/fizz-bootstrap/src/main/resources/META-INF/app.properties similarity index 100% rename from src/main/resources/META-INF/app.properties rename to fizz-bootstrap/src/main/resources/META-INF/app.properties diff --git a/src/main/resources/apollo-env.properties b/fizz-bootstrap/src/main/resources/apollo-env.properties similarity index 100% rename from src/main/resources/apollo-env.properties rename to fizz-bootstrap/src/main/resources/apollo-env.properties diff --git a/src/main/resources/application.yml b/fizz-bootstrap/src/main/resources/application.yml similarity index 96% rename from src/main/resources/application.yml rename to fizz-bootstrap/src/main/resources/application.yml index ee97d06..2015ee1 100644 --- a/src/main/resources/application.yml +++ b/fizz-bootstrap/src/main/resources/application.yml @@ -64,13 +64,13 @@ spring: aggregate: redis: # need replace - host: localhost #please input the redis host (default:localhost) + host: 128.1.1.1 #please input the redis host (default:localhost) # need replace port: 6379 #please input the redis port (default:6379) # need replace password: 123456 #please input the redis password (default:123456) # need replace - database: 9 #please input the redis database (default:9) + database: 10 #please input the redis database (default:9) proxy-webclient: name: proxy aggr-webclient: diff --git a/src/main/resources/js/common.js b/fizz-bootstrap/src/main/resources/js/common.js similarity index 100% rename from src/main/resources/js/common.js rename to fizz-bootstrap/src/main/resources/js/common.js diff --git a/src/main/resources/log4j2-spring.xml b/fizz-bootstrap/src/main/resources/log4j2-spring.xml similarity index 100% rename from src/main/resources/log4j2-spring.xml rename to fizz-bootstrap/src/main/resources/log4j2-spring.xml diff --git a/src/main/resources/static/favicon.ico b/fizz-bootstrap/src/main/resources/static/favicon.ico similarity index 100% rename from src/main/resources/static/favicon.ico rename to fizz-bootstrap/src/main/resources/static/favicon.ico diff --git a/src/test/resources/application.properties b/fizz-bootstrap/src/test/resource/application.properties similarity index 100% rename from src/test/resources/application.properties rename to fizz-bootstrap/src/test/resource/application.properties diff --git a/src/test/resources/log4j2-test.xml b/fizz-bootstrap/src/test/resource/log4j2-test.xml similarity index 100% rename from src/test/resources/log4j2-test.xml rename to fizz-bootstrap/src/test/resource/log4j2-test.xml diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml new file mode 100644 index 0000000..7ccbdb0 --- /dev/null +++ b/fizz-common/pom.xml @@ -0,0 +1,79 @@ + + + + fizz-gateway-community + we + 1.5.0 + ../pom.xml + + 4.0.0 + + fizz-common + + + + + + + com.networknt + json-schema-validator-i18n-support + 1.0.39_4 + system + ${project.basedir}/../lib/json-schema-validator-i18n-support-1.0.39_4.jar + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + + org.apache.commons + commons-lang3 + + + + org.apache.commons + commons-pool2 + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + + org.springframework.session + spring-session-data-redis + + + + commons-codec + commons-codec + + + + org.bouncycastle + bcpkix-jdk15on + + + + com.alibaba + fastjson + + + + \ No newline at end of file diff --git a/src/main/java/we/config/RedisReactiveConfig.java b/fizz-common/src/main/java/we/config/RedisReactiveConfig.java similarity index 100% rename from src/main/java/we/config/RedisReactiveConfig.java rename to fizz-common/src/main/java/we/config/RedisReactiveConfig.java diff --git a/src/main/java/we/config/RedisReactiveProperties.java b/fizz-common/src/main/java/we/config/RedisReactiveProperties.java similarity index 100% rename from src/main/java/we/config/RedisReactiveProperties.java rename to fizz-common/src/main/java/we/config/RedisReactiveProperties.java diff --git a/src/main/java/we/config/SchedConfig.java b/fizz-common/src/main/java/we/config/SchedConfig.java similarity index 100% rename from src/main/java/we/config/SchedConfig.java rename to fizz-common/src/main/java/we/config/SchedConfig.java diff --git a/src/main/java/we/config/WebClientConfig.java b/fizz-common/src/main/java/we/config/WebClientConfig.java similarity index 100% rename from src/main/java/we/config/WebClientConfig.java rename to fizz-common/src/main/java/we/config/WebClientConfig.java diff --git a/src/main/java/we/util/Constants.java b/fizz-common/src/main/java/we/util/Constants.java similarity index 98% rename from src/main/java/we/util/Constants.java rename to fizz-common/src/main/java/we/util/Constants.java index ae3100a..eba2a52 100644 --- a/src/main/java/we/util/Constants.java +++ b/fizz-common/src/main/java/we/util/Constants.java @@ -57,7 +57,7 @@ public final class Constants { public static final char TAB = '\t'; public static final char NUL = '\u0000'; - static final char c0 = SystemUtils.IS_OS_WINDOWS ? Constants.Symbol.BACK_SLASH : Constants.Symbol.FORWARD_SLASH; + static final char c0 = SystemUtils.IS_OS_WINDOWS ? Symbol.BACK_SLASH : Symbol.FORWARD_SLASH; public static final char PATH_SEPARATOR = c0; public static final String LINE_SEPARATOR = System.lineSeparator(); diff --git a/src/main/java/we/util/DateTimeUtils.java b/fizz-common/src/main/java/we/util/DateTimeUtils.java similarity index 100% rename from src/main/java/we/util/DateTimeUtils.java rename to fizz-common/src/main/java/we/util/DateTimeUtils.java diff --git a/src/main/java/we/util/DigestUtils.java b/fizz-common/src/main/java/we/util/DigestUtils.java similarity index 100% rename from src/main/java/we/util/DigestUtils.java rename to fizz-common/src/main/java/we/util/DigestUtils.java diff --git a/src/main/java/we/util/JacksonUtils.java b/fizz-common/src/main/java/we/util/JacksonUtils.java similarity index 99% rename from src/main/java/we/util/JacksonUtils.java rename to fizz-common/src/main/java/we/util/JacksonUtils.java index 0b186bf..43c0670 100644 --- a/src/main/java/we/util/JacksonUtils.java +++ b/fizz-common/src/main/java/we/util/JacksonUtils.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; -import we.plugin.auth.ApiConfig; import we.util.Constants.DatetimePattern; import java.io.IOException; diff --git a/src/main/java/we/util/JsonSchemaUtils.java b/fizz-common/src/main/java/we/util/JsonSchemaUtils.java similarity index 100% rename from src/main/java/we/util/JsonSchemaUtils.java rename to fizz-common/src/main/java/we/util/JsonSchemaUtils.java diff --git a/src/main/java/we/util/MapUtil.java b/fizz-common/src/main/java/we/util/MapUtil.java similarity index 100% rename from src/main/java/we/util/MapUtil.java rename to fizz-common/src/main/java/we/util/MapUtil.java diff --git a/src/main/java/we/util/NetworkUtils.java b/fizz-common/src/main/java/we/util/NetworkUtils.java similarity index 68% rename from src/main/java/we/util/NetworkUtils.java rename to fizz-common/src/main/java/we/util/NetworkUtils.java index 579a35c..dc6a936 100644 --- a/src/main/java/we/util/NetworkUtils.java +++ b/fizz-common/src/main/java/we/util/NetworkUtils.java @@ -17,6 +17,7 @@ package we.util; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,31 +42,37 @@ public class NetworkUtils { private static String serverIp; + private static final String SERVER_IP = "SERVER_IP"; + public static String getServerIp() { try { if (serverIp == null) { - boolean found = false; - Enumeration nis = null; - nis = NetworkInterface.getNetworkInterfaces(); - while (nis.hasMoreElements()) { - NetworkInterface ni = (NetworkInterface) nis.nextElement(); - Enumeration ias = ni.getInetAddresses(); - while (ias.hasMoreElements()) { - InetAddress ia = ias.nextElement(); - if (ia.isSiteLocalAddress()) { - serverIp = ia.getHostAddress(); - found = true; + serverIp = System.getenv(SERVER_IP); + log.info("SERVER_IP is " + serverIp); + if (StringUtils.isBlank(serverIp)) { + boolean found = false; + Enumeration nis = null; + nis = NetworkInterface.getNetworkInterfaces(); + while (nis.hasMoreElements()) { + NetworkInterface ni = (NetworkInterface) nis.nextElement(); + Enumeration ias = ni.getInetAddresses(); + while (ias.hasMoreElements()) { + InetAddress ia = ias.nextElement(); + if (ia.isSiteLocalAddress()) { + serverIp = ia.getHostAddress(); + found = true; + break; + } + } + if (found) { break; } } - if (found) { - break; + if (!found) { + InetAddress ia = InetAddress.getLocalHost(); + serverIp = ia.getHostAddress(); } } - if (!found) { - InetAddress ia = InetAddress.getLocalHost(); - serverIp = ia.getHostAddress(); - } } return serverIp; } catch (SocketException | UnknownHostException e) { diff --git a/src/main/java/we/util/PemUtils.java b/fizz-common/src/main/java/we/util/PemUtils.java similarity index 100% rename from src/main/java/we/util/PemUtils.java rename to fizz-common/src/main/java/we/util/PemUtils.java diff --git a/src/main/java/we/util/ReactiveResult.java b/fizz-common/src/main/java/we/util/ReactiveResult.java similarity index 100% rename from src/main/java/we/util/ReactiveResult.java rename to fizz-common/src/main/java/we/util/ReactiveResult.java diff --git a/src/main/java/we/util/ReactorUtils.java b/fizz-common/src/main/java/we/util/ReactorUtils.java similarity index 100% rename from src/main/java/we/util/ReactorUtils.java rename to fizz-common/src/main/java/we/util/ReactorUtils.java diff --git a/src/main/java/we/util/ReflectionUtils.java b/fizz-common/src/main/java/we/util/ReflectionUtils.java similarity index 100% rename from src/main/java/we/util/ReflectionUtils.java rename to fizz-common/src/main/java/we/util/ReflectionUtils.java diff --git a/src/main/java/we/util/Result.java b/fizz-common/src/main/java/we/util/Result.java similarity index 100% rename from src/main/java/we/util/Result.java rename to fizz-common/src/main/java/we/util/Result.java diff --git a/src/main/java/we/util/Script.java b/fizz-common/src/main/java/we/util/Script.java similarity index 100% rename from src/main/java/we/util/Script.java rename to fizz-common/src/main/java/we/util/Script.java diff --git a/src/main/java/we/util/ScriptUtils.java b/fizz-common/src/main/java/we/util/ScriptUtils.java similarity index 100% rename from src/main/java/we/util/ScriptUtils.java rename to fizz-common/src/main/java/we/util/ScriptUtils.java diff --git a/src/main/java/we/util/ThreadContext.java b/fizz-common/src/main/java/we/util/ThreadContext.java similarity index 100% rename from src/main/java/we/util/ThreadContext.java rename to fizz-common/src/main/java/we/util/ThreadContext.java diff --git a/src/main/java/we/util/UrlTransformUtils.java b/fizz-common/src/main/java/we/util/UrlTransformUtils.java similarity index 98% rename from src/main/java/we/util/UrlTransformUtils.java rename to fizz-common/src/main/java/we/util/UrlTransformUtils.java index 3381729..a7671db 100644 --- a/src/main/java/we/util/UrlTransformUtils.java +++ b/fizz-common/src/main/java/we/util/UrlTransformUtils.java @@ -59,7 +59,7 @@ public class UrlTransformUtils { /** * 自定义Ant风格路径匹配器 * 设置默认路径分隔符为{@code #} - * 使用{@link FizzGatewayUrlAntPathMatcher.FizzGatewayAntPathStringMatcher}设置自定义的参数变量值（额外返回变量名为$1...n的键值对） + * 使用{@link FizzGatewayAntPathStringMatcher}设置自定义的参数变量值（额外返回变量名为$1...n的键值对） * * @author zhongjie */ diff --git a/src/main/java/we/util/Utils.java b/fizz-common/src/main/java/we/util/Utils.java similarity index 100% rename from src/main/java/we/util/Utils.java rename to fizz-common/src/main/java/we/util/Utils.java diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml new file mode 100644 index 0000000..6038730 --- /dev/null +++ b/fizz-core/pom.xml @@ -0,0 +1,266 @@ + + + + fizz-gateway-community + we + 1.5.0 + ../pom.xml + + 4.0.0 + + fizz-core + + + + + + + com.networknt + json-schema-validator-i18n-support + 1.0.39_4 + system + ${project.basedir}/../lib/json-schema-validator-i18n-support-1.0.39_4.jar + + + + we + fizz-common + + + + + org.springframework.session + spring-session-bom + Dragonfruit-RELEASE + pom + import + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + org.skyscreamer + jsonassert + + + + + + io.projectreactor + reactor-test + test + + + + com.alibaba + fastjson + + + + com.google.code.gson + gson + + + + net.minidev + json-smart + + + + org.codehaus.jettison + jettison + + + + org.json + json + + + + org.apache.tapestry + tapestry-json + + + + org.apache.commons + commons-lang3 + + + + org.codehaus.groovy + groovy-all + + + + commons-io + commons-io + + + + com.ctrip.framework.apollo + apollo-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + com.alibaba.boot + nacos-config-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + + + + org.apache.commons + commons-pool2 + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + + it.ozimov + embedded-redis + test + + + org.slf4j + slf4j-simple + + + + + + org.noear + snack3 + + + + org.springframework.session + spring-session-data-redis + + + + com.auth0 + java-jwt + + + + org.mockito + mockito-core + test + + + + org.mockito + mockito-inline + test + + + + org.apache.dubbo + dubbo + + + + + io.grpc + grpc-all + + + io.grpc + grpc-services + + + org.projectlombok + lombok + + + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + junit + junit + test + + + + commons-codec + commons-codec + + + + org.bouncycastle + bcpkix-jdk15on + + + + \ No newline at end of file diff --git a/src/main/java/we/FizzAppContext.java b/fizz-core/src/main/java/we/FizzAppContext.java similarity index 100% rename from src/main/java/we/FizzAppContext.java rename to fizz-core/src/main/java/we/FizzAppContext.java diff --git a/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java b/fizz-core/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java similarity index 100% rename from src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java rename to fizz-core/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java diff --git a/src/main/java/we/config/AggrWebClientConfig.java b/fizz-core/src/main/java/we/config/AggrWebClientConfig.java similarity index 100% rename from src/main/java/we/config/AggrWebClientConfig.java rename to fizz-core/src/main/java/we/config/AggrWebClientConfig.java diff --git a/src/main/java/we/config/AggregateRedisConfig.java b/fizz-core/src/main/java/we/config/AggregateRedisConfig.java similarity index 100% rename from src/main/java/we/config/AggregateRedisConfig.java rename to fizz-core/src/main/java/we/config/AggregateRedisConfig.java diff --git a/src/main/java/we/config/ApolloConfig.java b/fizz-core/src/main/java/we/config/ApolloConfig.java similarity index 100% rename from src/main/java/we/config/ApolloConfig.java rename to fizz-core/src/main/java/we/config/ApolloConfig.java diff --git a/src/main/java/we/config/AppConfigProperties.java b/fizz-core/src/main/java/we/config/AppConfigProperties.java similarity index 100% rename from src/main/java/we/config/AppConfigProperties.java rename to fizz-core/src/main/java/we/config/AppConfigProperties.java diff --git a/src/main/java/we/config/FlowControlConfig.java b/fizz-core/src/main/java/we/config/FlowControlConfig.java similarity index 100% rename from src/main/java/we/config/FlowControlConfig.java rename to fizz-core/src/main/java/we/config/FlowControlConfig.java diff --git a/src/main/java/we/config/FlowStatSchedConfig.java b/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java similarity index 100% rename from src/main/java/we/config/FlowStatSchedConfig.java rename to fizz-core/src/main/java/we/config/FlowStatSchedConfig.java diff --git a/src/main/java/we/config/ProxyWebClientConfig.java b/fizz-core/src/main/java/we/config/ProxyWebClientConfig.java similarity index 100% rename from src/main/java/we/config/ProxyWebClientConfig.java rename to fizz-core/src/main/java/we/config/ProxyWebClientConfig.java diff --git a/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/we/config/SystemConfig.java similarity index 100% rename from src/main/java/we/config/SystemConfig.java rename to fizz-core/src/main/java/we/config/SystemConfig.java diff --git a/src/main/java/we/config/WebFluxConfig.java b/fizz-core/src/main/java/we/config/WebFluxConfig.java similarity index 99% rename from src/main/java/we/config/WebFluxConfig.java rename to fizz-core/src/main/java/we/config/WebFluxConfig.java index e9e0d96..2522220 100644 --- a/src/main/java/we/config/WebFluxConfig.java +++ b/fizz-core/src/main/java/we/config/WebFluxConfig.java @@ -25,6 +25,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.web.reactive.config.EnableWebFlux; import org.springframework.web.reactive.config.ResourceHandlerRegistry; diff --git a/src/main/java/we/constants/CommonConstants.java b/fizz-core/src/main/java/we/constants/CommonConstants.java similarity index 100% rename from src/main/java/we/constants/CommonConstants.java rename to fizz-core/src/main/java/we/constants/CommonConstants.java diff --git a/src/main/java/we/controller/CacheCheckController.java b/fizz-core/src/main/java/we/controller/CacheCheckController.java similarity index 100% rename from src/main/java/we/controller/CacheCheckController.java rename to fizz-core/src/main/java/we/controller/CacheCheckController.java diff --git a/src/main/java/we/controller/CallbackController.java b/fizz-core/src/main/java/we/controller/CallbackController.java similarity index 100% rename from src/main/java/we/controller/CallbackController.java rename to fizz-core/src/main/java/we/controller/CallbackController.java diff --git a/src/main/java/we/controller/ConfigController.java b/fizz-core/src/main/java/we/controller/ConfigController.java similarity index 100% rename from src/main/java/we/controller/ConfigController.java rename to fizz-core/src/main/java/we/controller/ConfigController.java diff --git a/src/main/java/we/controller/FlowControlController.java b/fizz-core/src/main/java/we/controller/FlowControlController.java similarity index 100% rename from src/main/java/we/controller/FlowControlController.java rename to fizz-core/src/main/java/we/controller/FlowControlController.java diff --git a/src/main/java/we/controller/HealthCheckController.java b/fizz-core/src/main/java/we/controller/HealthCheckController.java similarity index 100% rename from src/main/java/we/controller/HealthCheckController.java rename to fizz-core/src/main/java/we/controller/HealthCheckController.java diff --git a/src/main/java/we/controller/ManagerConfigController.java b/fizz-core/src/main/java/we/controller/ManagerConfigController.java similarity index 100% rename from src/main/java/we/controller/ManagerConfigController.java rename to fizz-core/src/main/java/we/controller/ManagerConfigController.java diff --git a/src/main/java/we/controller/req/BaseManagerConfigReq.java b/fizz-core/src/main/java/we/controller/req/BaseManagerConfigReq.java similarity index 100% rename from src/main/java/we/controller/req/BaseManagerConfigReq.java rename to fizz-core/src/main/java/we/controller/req/BaseManagerConfigReq.java diff --git a/src/main/java/we/controller/req/GetConfigReq.java b/fizz-core/src/main/java/we/controller/req/GetConfigReq.java similarity index 100% rename from src/main/java/we/controller/req/GetConfigReq.java rename to fizz-core/src/main/java/we/controller/req/GetConfigReq.java diff --git a/src/main/java/we/controller/req/GetConfigStrReq.java b/fizz-core/src/main/java/we/controller/req/GetConfigStrReq.java similarity index 100% rename from src/main/java/we/controller/req/GetConfigStrReq.java rename to fizz-core/src/main/java/we/controller/req/GetConfigStrReq.java diff --git a/src/main/java/we/controller/resp/ConfigResp.java b/fizz-core/src/main/java/we/controller/resp/ConfigResp.java similarity index 100% rename from src/main/java/we/controller/resp/ConfigResp.java rename to fizz-core/src/main/java/we/controller/resp/ConfigResp.java diff --git a/src/main/java/we/controller/resp/ConfigStrResp.java b/fizz-core/src/main/java/we/controller/resp/ConfigStrResp.java similarity index 100% rename from src/main/java/we/controller/resp/ConfigStrResp.java rename to fizz-core/src/main/java/we/controller/resp/ConfigStrResp.java diff --git a/src/main/java/we/exception/ExecuteScriptException.java b/fizz-core/src/main/java/we/exception/ExecuteScriptException.java similarity index 100% rename from src/main/java/we/exception/ExecuteScriptException.java rename to fizz-core/src/main/java/we/exception/ExecuteScriptException.java diff --git a/src/main/java/we/exception/RedirectException.java b/fizz-core/src/main/java/we/exception/RedirectException.java similarity index 100% rename from src/main/java/we/exception/RedirectException.java rename to fizz-core/src/main/java/we/exception/RedirectException.java diff --git a/src/main/java/we/exception/StopAndResponseException.java b/fizz-core/src/main/java/we/exception/StopAndResponseException.java similarity index 100% rename from src/main/java/we/exception/StopAndResponseException.java rename to fizz-core/src/main/java/we/exception/StopAndResponseException.java diff --git a/src/main/java/we/filter/AggregateFilter.java b/fizz-core/src/main/java/we/filter/AggregateFilter.java similarity index 100% rename from src/main/java/we/filter/AggregateFilter.java rename to fizz-core/src/main/java/we/filter/AggregateFilter.java diff --git a/src/main/java/we/filter/CallbackFilter.java b/fizz-core/src/main/java/we/filter/CallbackFilter.java similarity index 100% rename from src/main/java/we/filter/CallbackFilter.java rename to fizz-core/src/main/java/we/filter/CallbackFilter.java diff --git a/src/main/java/we/filter/CorsFilterConfig.java b/fizz-core/src/main/java/we/filter/CorsFilterConfig.java similarity index 100% rename from src/main/java/we/filter/CorsFilterConfig.java rename to fizz-core/src/main/java/we/filter/CorsFilterConfig.java diff --git a/src/main/java/we/filter/FilterExceptionHandlerConfig.java b/fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java similarity index 100% rename from src/main/java/we/filter/FilterExceptionHandlerConfig.java rename to fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java diff --git a/src/main/java/we/filter/FilterResult.java b/fizz-core/src/main/java/we/filter/FilterResult.java similarity index 100% rename from src/main/java/we/filter/FilterResult.java rename to fizz-core/src/main/java/we/filter/FilterResult.java diff --git a/src/main/java/we/filter/FizzLogFilter.java b/fizz-core/src/main/java/we/filter/FizzLogFilter.java similarity index 100% rename from src/main/java/we/filter/FizzLogFilter.java rename to fizz-core/src/main/java/we/filter/FizzLogFilter.java diff --git a/src/main/java/we/filter/FizzWebFilter.java b/fizz-core/src/main/java/we/filter/FizzWebFilter.java similarity index 100% rename from src/main/java/we/filter/FizzWebFilter.java rename to fizz-core/src/main/java/we/filter/FizzWebFilter.java diff --git a/src/main/java/we/filter/FlowControlFilter.java b/fizz-core/src/main/java/we/filter/FlowControlFilter.java similarity index 100% rename from src/main/java/we/filter/FlowControlFilter.java rename to fizz-core/src/main/java/we/filter/FlowControlFilter.java diff --git a/src/main/java/we/filter/PreprocessFilter.java b/fizz-core/src/main/java/we/filter/PreprocessFilter.java similarity index 100% rename from src/main/java/we/filter/PreprocessFilter.java rename to fizz-core/src/main/java/we/filter/PreprocessFilter.java diff --git a/src/main/java/we/filter/RouteFilter.java b/fizz-core/src/main/java/we/filter/RouteFilter.java similarity index 100% rename from src/main/java/we/filter/RouteFilter.java rename to fizz-core/src/main/java/we/filter/RouteFilter.java diff --git a/src/main/java/we/fizz/AggregateResource.java b/fizz-core/src/main/java/we/fizz/AggregateResource.java similarity index 100% rename from src/main/java/we/fizz/AggregateResource.java rename to fizz-core/src/main/java/we/fizz/AggregateResource.java diff --git a/src/main/java/we/fizz/AggregateResult.java b/fizz-core/src/main/java/we/fizz/AggregateResult.java similarity index 100% rename from src/main/java/we/fizz/AggregateResult.java rename to fizz-core/src/main/java/we/fizz/AggregateResult.java diff --git a/src/main/java/we/fizz/AggregateService.java b/fizz-core/src/main/java/we/fizz/AggregateService.java similarity index 100% rename from src/main/java/we/fizz/AggregateService.java rename to fizz-core/src/main/java/we/fizz/AggregateService.java diff --git a/src/main/java/we/fizz/ConfigLoader.java b/fizz-core/src/main/java/we/fizz/ConfigLoader.java similarity index 100% rename from src/main/java/we/fizz/ConfigLoader.java rename to fizz-core/src/main/java/we/fizz/ConfigLoader.java diff --git a/src/main/java/we/fizz/Pipeline.java b/fizz-core/src/main/java/we/fizz/Pipeline.java similarity index 100% rename from src/main/java/we/fizz/Pipeline.java rename to fizz-core/src/main/java/we/fizz/Pipeline.java diff --git a/src/main/java/we/fizz/Step.java b/fizz-core/src/main/java/we/fizz/Step.java similarity index 100% rename from src/main/java/we/fizz/Step.java rename to fizz-core/src/main/java/we/fizz/Step.java diff --git a/src/main/java/we/fizz/StepContext.java b/fizz-core/src/main/java/we/fizz/StepContext.java similarity index 100% rename from src/main/java/we/fizz/StepContext.java rename to fizz-core/src/main/java/we/fizz/StepContext.java diff --git a/src/main/java/we/fizz/StepResponse.java b/fizz-core/src/main/java/we/fizz/StepResponse.java similarity index 100% rename from src/main/java/we/fizz/StepResponse.java rename to fizz-core/src/main/java/we/fizz/StepResponse.java diff --git a/src/main/java/we/fizz/exception/FizzException.java b/fizz-core/src/main/java/we/fizz/exception/FizzException.java similarity index 100% rename from src/main/java/we/fizz/exception/FizzException.java rename to fizz-core/src/main/java/we/fizz/exception/FizzException.java diff --git a/src/main/java/we/fizz/exception/FizzRuntimeException.java b/fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java similarity index 100% rename from src/main/java/we/fizz/exception/FizzRuntimeException.java rename to fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java diff --git a/src/main/java/we/fizz/input/ClientInputConfig.java b/fizz-core/src/main/java/we/fizz/input/ClientInputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/ClientInputConfig.java rename to fizz-core/src/main/java/we/fizz/input/ClientInputConfig.java diff --git a/src/main/java/we/fizz/input/IInput.java b/fizz-core/src/main/java/we/fizz/input/IInput.java similarity index 100% rename from src/main/java/we/fizz/input/IInput.java rename to fizz-core/src/main/java/we/fizz/input/IInput.java diff --git a/src/main/java/we/fizz/input/Input.java b/fizz-core/src/main/java/we/fizz/input/Input.java similarity index 100% rename from src/main/java/we/fizz/input/Input.java rename to fizz-core/src/main/java/we/fizz/input/Input.java diff --git a/src/main/java/we/fizz/input/InputConfig.java b/fizz-core/src/main/java/we/fizz/input/InputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/InputConfig.java rename to fizz-core/src/main/java/we/fizz/input/InputConfig.java diff --git a/src/main/java/we/fizz/input/InputContext.java b/fizz-core/src/main/java/we/fizz/input/InputContext.java similarity index 100% rename from src/main/java/we/fizz/input/InputContext.java rename to fizz-core/src/main/java/we/fizz/input/InputContext.java diff --git a/src/main/java/we/fizz/input/InputFactory.java b/fizz-core/src/main/java/we/fizz/input/InputFactory.java similarity index 100% rename from src/main/java/we/fizz/input/InputFactory.java rename to fizz-core/src/main/java/we/fizz/input/InputFactory.java diff --git a/src/main/java/we/fizz/input/InputType.java b/fizz-core/src/main/java/we/fizz/input/InputType.java similarity index 100% rename from src/main/java/we/fizz/input/InputType.java rename to fizz-core/src/main/java/we/fizz/input/InputType.java diff --git a/src/main/java/we/fizz/input/PathMapping.java b/fizz-core/src/main/java/we/fizz/input/PathMapping.java similarity index 100% rename from src/main/java/we/fizz/input/PathMapping.java rename to fizz-core/src/main/java/we/fizz/input/PathMapping.java diff --git a/src/main/java/we/fizz/input/RPCInput.java b/fizz-core/src/main/java/we/fizz/input/RPCInput.java similarity index 100% rename from src/main/java/we/fizz/input/RPCInput.java rename to fizz-core/src/main/java/we/fizz/input/RPCInput.java diff --git a/src/main/java/we/fizz/input/RPCResponse.java b/fizz-core/src/main/java/we/fizz/input/RPCResponse.java similarity index 100% rename from src/main/java/we/fizz/input/RPCResponse.java rename to fizz-core/src/main/java/we/fizz/input/RPCResponse.java diff --git a/src/main/java/we/fizz/input/ScriptHelper.java b/fizz-core/src/main/java/we/fizz/input/ScriptHelper.java similarity index 100% rename from src/main/java/we/fizz/input/ScriptHelper.java rename to fizz-core/src/main/java/we/fizz/input/ScriptHelper.java diff --git a/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java b/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java similarity index 100% rename from src/main/java/we/fizz/input/extension/dubbo/DubboInput.java rename to fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java diff --git a/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java b/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java rename to fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java diff --git a/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java b/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java similarity index 100% rename from src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java rename to fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java diff --git a/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java b/fizz-core/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java similarity index 100% rename from src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java rename to fizz-core/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java diff --git a/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java b/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java similarity index 100% rename from src/main/java/we/fizz/input/extension/grpc/GrpcInput.java rename to fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java diff --git a/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java b/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java rename to fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java diff --git a/src/main/java/we/fizz/input/extension/mysql/MySQLInput.java b/fizz-core/src/main/java/we/fizz/input/extension/mysql/MySQLInput.java similarity index 100% rename from src/main/java/we/fizz/input/extension/mysql/MySQLInput.java rename to fizz-core/src/main/java/we/fizz/input/extension/mysql/MySQLInput.java diff --git a/src/main/java/we/fizz/input/extension/mysql/MySQLInputConfig.java b/fizz-core/src/main/java/we/fizz/input/extension/mysql/MySQLInputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/extension/mysql/MySQLInputConfig.java rename to fizz-core/src/main/java/we/fizz/input/extension/mysql/MySQLInputConfig.java diff --git a/src/main/java/we/fizz/input/extension/request/RequestInput.java b/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java similarity index 100% rename from src/main/java/we/fizz/input/extension/request/RequestInput.java rename to fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java diff --git a/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java b/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java similarity index 100% rename from src/main/java/we/fizz/input/extension/request/RequestInputConfig.java rename to fizz-core/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java diff --git a/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java b/fizz-core/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java similarity index 100% rename from src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java rename to fizz-core/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java diff --git a/src/main/java/we/flume/clients/log4j2appender/LogService.java b/fizz-core/src/main/java/we/flume/clients/log4j2appender/LogService.java similarity index 100% rename from src/main/java/we/flume/clients/log4j2appender/LogService.java rename to fizz-core/src/main/java/we/flume/clients/log4j2appender/LogService.java diff --git a/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java b/fizz-core/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java similarity index 100% rename from src/main/java/we/flume/clients/log4j2appender/ThreadContext.java rename to fizz-core/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java diff --git a/src/main/java/we/legacy/RespEntity.java b/fizz-core/src/main/java/we/legacy/RespEntity.java similarity index 100% rename from src/main/java/we/legacy/RespEntity.java rename to fizz-core/src/main/java/we/legacy/RespEntity.java diff --git a/src/main/java/we/listener/AggregateChannelListener.java b/fizz-core/src/main/java/we/listener/AggregateChannelListener.java similarity index 100% rename from src/main/java/we/listener/AggregateChannelListener.java rename to fizz-core/src/main/java/we/listener/AggregateChannelListener.java diff --git a/src/main/java/we/log/LogSend.java b/fizz-core/src/main/java/we/log/LogSend.java similarity index 100% rename from src/main/java/we/log/LogSend.java rename to fizz-core/src/main/java/we/log/LogSend.java diff --git a/src/main/java/we/log/LogSendAppender.java b/fizz-core/src/main/java/we/log/LogSendAppender.java similarity index 100% rename from src/main/java/we/log/LogSendAppender.java rename to fizz-core/src/main/java/we/log/LogSendAppender.java diff --git a/src/main/java/we/log/LogSendService.java b/fizz-core/src/main/java/we/log/LogSendService.java similarity index 100% rename from src/main/java/we/log/LogSendService.java rename to fizz-core/src/main/java/we/log/LogSendService.java diff --git a/src/main/java/we/log/RedisLogSendServiceImpl.java b/fizz-core/src/main/java/we/log/RedisLogSendServiceImpl.java similarity index 100% rename from src/main/java/we/log/RedisLogSendServiceImpl.java rename to fizz-core/src/main/java/we/log/RedisLogSendServiceImpl.java diff --git a/src/main/java/we/plugin/FixedPluginFilter.java b/fizz-core/src/main/java/we/plugin/FixedPluginFilter.java similarity index 100% rename from src/main/java/we/plugin/FixedPluginFilter.java rename to fizz-core/src/main/java/we/plugin/FixedPluginFilter.java diff --git a/src/main/java/we/plugin/PluginConfig.java b/fizz-core/src/main/java/we/plugin/PluginConfig.java similarity index 100% rename from src/main/java/we/plugin/PluginConfig.java rename to fizz-core/src/main/java/we/plugin/PluginConfig.java diff --git a/src/main/java/we/plugin/PluginFilter.java b/fizz-core/src/main/java/we/plugin/PluginFilter.java similarity index 100% rename from src/main/java/we/plugin/PluginFilter.java rename to fizz-core/src/main/java/we/plugin/PluginFilter.java diff --git a/src/main/java/we/plugin/auth/ApiConfig.java b/fizz-core/src/main/java/we/plugin/auth/ApiConfig.java similarity index 98% rename from src/main/java/we/plugin/auth/ApiConfig.java rename to fizz-core/src/main/java/we/plugin/auth/ApiConfig.java index fe816f4..3ec0adb 100644 --- a/src/main/java/we/plugin/auth/ApiConfig.java +++ b/fizz-core/src/main/java/we/plugin/auth/ApiConfig.java @@ -68,7 +68,7 @@ public class ApiConfig { public String backendService; - public HttpMethod method = HttpMethod.X; + public HttpMethod method = HttpMethod.TRACE; public String path = match_all; @@ -155,7 +155,7 @@ public class ApiConfig { public void setMethod(String m) { method = HttpMethod.resolve(m); if (method == null) { - method = HttpMethod.X; + method = HttpMethod.TRACE; } } diff --git a/src/main/java/we/plugin/auth/ApiConfig2apps.java b/fizz-core/src/main/java/we/plugin/auth/ApiConfig2apps.java similarity index 100% rename from src/main/java/we/plugin/auth/ApiConfig2apps.java rename to fizz-core/src/main/java/we/plugin/auth/ApiConfig2apps.java diff --git a/src/main/java/we/plugin/auth/ApiConfigService.java b/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java similarity index 100% rename from src/main/java/we/plugin/auth/ApiConfigService.java rename to fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java diff --git a/src/main/java/we/plugin/auth/ApiConifg2appsService.java b/fizz-core/src/main/java/we/plugin/auth/ApiConifg2appsService.java similarity index 100% rename from src/main/java/we/plugin/auth/ApiConifg2appsService.java rename to fizz-core/src/main/java/we/plugin/auth/ApiConifg2appsService.java diff --git a/src/main/java/we/plugin/auth/App.java b/fizz-core/src/main/java/we/plugin/auth/App.java similarity index 100% rename from src/main/java/we/plugin/auth/App.java rename to fizz-core/src/main/java/we/plugin/auth/App.java diff --git a/src/main/java/we/plugin/auth/AppService.java b/fizz-core/src/main/java/we/plugin/auth/AppService.java similarity index 100% rename from src/main/java/we/plugin/auth/AppService.java rename to fizz-core/src/main/java/we/plugin/auth/AppService.java diff --git a/src/main/java/we/plugin/auth/AuthPluginFilter.java b/fizz-core/src/main/java/we/plugin/auth/AuthPluginFilter.java similarity index 100% rename from src/main/java/we/plugin/auth/AuthPluginFilter.java rename to fizz-core/src/main/java/we/plugin/auth/AuthPluginFilter.java diff --git a/src/main/java/we/plugin/auth/CallbackConfig.java b/fizz-core/src/main/java/we/plugin/auth/CallbackConfig.java similarity index 100% rename from src/main/java/we/plugin/auth/CallbackConfig.java rename to fizz-core/src/main/java/we/plugin/auth/CallbackConfig.java diff --git a/src/main/java/we/plugin/auth/CustomAuth.java b/fizz-core/src/main/java/we/plugin/auth/CustomAuth.java similarity index 100% rename from src/main/java/we/plugin/auth/CustomAuth.java rename to fizz-core/src/main/java/we/plugin/auth/CustomAuth.java diff --git a/src/main/java/we/plugin/auth/GatewayGroup.java b/fizz-core/src/main/java/we/plugin/auth/GatewayGroup.java similarity index 100% rename from src/main/java/we/plugin/auth/GatewayGroup.java rename to fizz-core/src/main/java/we/plugin/auth/GatewayGroup.java diff --git a/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java b/fizz-core/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java similarity index 100% rename from src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java rename to fizz-core/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java diff --git a/src/main/java/we/plugin/auth/GatewayGroupService.java b/fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java similarity index 100% rename from src/main/java/we/plugin/auth/GatewayGroupService.java rename to fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java diff --git a/src/main/java/we/plugin/auth/Receiver.java b/fizz-core/src/main/java/we/plugin/auth/Receiver.java similarity index 100% rename from src/main/java/we/plugin/auth/Receiver.java rename to fizz-core/src/main/java/we/plugin/auth/Receiver.java diff --git a/src/main/java/we/plugin/auth/ServiceConfig.java b/fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java similarity index 99% rename from src/main/java/we/plugin/auth/ServiceConfig.java rename to fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java index bfc7a86..2065fb0 100644 --- a/src/main/java/we/plugin/auth/ServiceConfig.java +++ b/fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java @@ -20,11 +20,11 @@ package we.plugin.auth; import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpMethod; import org.springframework.util.AntPathMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.HttpMethod; import we.util.JacksonUtils; import we.util.ThreadContext; @@ -196,7 +196,7 @@ public class ServiceConfig { private GatewayGroup2apiConfig getGatewayGroup2apiConfig(HttpMethod method, EnumMap method2apiConfigMap) { GatewayGroup2apiConfig r = method2apiConfigMap.get(method); if (r == null) { - return method2apiConfigMap.get(HttpMethod.X); + return method2apiConfigMap.get(HttpMethod.TRACE); } else { return r; } diff --git a/src/main/java/we/plugin/stat/StatPluginFilter.java b/fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java similarity index 100% rename from src/main/java/we/plugin/stat/StatPluginFilter.java rename to fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java diff --git a/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java b/fizz-core/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java similarity index 100% rename from src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java rename to fizz-core/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java diff --git a/src/main/java/we/proxy/CallBackendConfig.java b/fizz-core/src/main/java/we/proxy/CallBackendConfig.java similarity index 100% rename from src/main/java/we/proxy/CallBackendConfig.java rename to fizz-core/src/main/java/we/proxy/CallBackendConfig.java diff --git a/src/main/java/we/proxy/CallbackReplayReq.java b/fizz-core/src/main/java/we/proxy/CallbackReplayReq.java similarity index 100% rename from src/main/java/we/proxy/CallbackReplayReq.java rename to fizz-core/src/main/java/we/proxy/CallbackReplayReq.java diff --git a/src/main/java/we/proxy/CallbackService.java b/fizz-core/src/main/java/we/proxy/CallbackService.java similarity index 100% rename from src/main/java/we/proxy/CallbackService.java rename to fizz-core/src/main/java/we/proxy/CallbackService.java diff --git a/src/main/java/we/proxy/DisableDiscoveryUriSelector.java b/fizz-core/src/main/java/we/proxy/DisableDiscoveryUriSelector.java similarity index 100% rename from src/main/java/we/proxy/DisableDiscoveryUriSelector.java rename to fizz-core/src/main/java/we/proxy/DisableDiscoveryUriSelector.java diff --git a/src/main/java/we/proxy/DiscoveryClientUriSelector.java b/fizz-core/src/main/java/we/proxy/DiscoveryClientUriSelector.java similarity index 100% rename from src/main/java/we/proxy/DiscoveryClientUriSelector.java rename to fizz-core/src/main/java/we/proxy/DiscoveryClientUriSelector.java diff --git a/src/main/java/we/proxy/EurekaUriSelector.java b/fizz-core/src/main/java/we/proxy/EurekaUriSelector.java similarity index 100% rename from src/main/java/we/proxy/EurekaUriSelector.java rename to fizz-core/src/main/java/we/proxy/EurekaUriSelector.java diff --git a/src/main/java/we/proxy/FailAggregateResult.java b/fizz-core/src/main/java/we/proxy/FailAggregateResult.java similarity index 100% rename from src/main/java/we/proxy/FailAggregateResult.java rename to fizz-core/src/main/java/we/proxy/FailAggregateResult.java diff --git a/src/main/java/we/proxy/FizzFailClientResponse.java b/fizz-core/src/main/java/we/proxy/FizzFailClientResponse.java similarity index 100% rename from src/main/java/we/proxy/FizzFailClientResponse.java rename to fizz-core/src/main/java/we/proxy/FizzFailClientResponse.java diff --git a/src/main/java/we/proxy/FizzWebClient.java b/fizz-core/src/main/java/we/proxy/FizzWebClient.java similarity index 100% rename from src/main/java/we/proxy/FizzWebClient.java rename to fizz-core/src/main/java/we/proxy/FizzWebClient.java diff --git a/src/main/java/we/proxy/NacosUriSelector.java b/fizz-core/src/main/java/we/proxy/NacosUriSelector.java similarity index 100% rename from src/main/java/we/proxy/NacosUriSelector.java rename to fizz-core/src/main/java/we/proxy/NacosUriSelector.java diff --git a/src/main/java/we/proxy/ServiceInstance.java b/fizz-core/src/main/java/we/proxy/ServiceInstance.java similarity index 100% rename from src/main/java/we/proxy/ServiceInstance.java rename to fizz-core/src/main/java/we/proxy/ServiceInstance.java diff --git a/src/main/java/we/proxy/ServiceTypePath.java b/fizz-core/src/main/java/we/proxy/ServiceTypePath.java similarity index 100% rename from src/main/java/we/proxy/ServiceTypePath.java rename to fizz-core/src/main/java/we/proxy/ServiceTypePath.java diff --git a/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java b/fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java similarity index 100% rename from src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java rename to fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java diff --git a/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java b/fizz-core/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java similarity index 100% rename from src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java rename to fizz-core/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java diff --git a/src/main/java/we/proxy/dubbo/DubboUtils.java b/fizz-core/src/main/java/we/proxy/dubbo/DubboUtils.java similarity index 100% rename from src/main/java/we/proxy/dubbo/DubboUtils.java rename to fizz-core/src/main/java/we/proxy/dubbo/DubboUtils.java diff --git a/src/main/java/we/proxy/grpc/GrpcGenericService.java b/fizz-core/src/main/java/we/proxy/grpc/GrpcGenericService.java similarity index 100% rename from src/main/java/we/proxy/grpc/GrpcGenericService.java rename to fizz-core/src/main/java/we/proxy/grpc/GrpcGenericService.java diff --git a/src/main/java/we/proxy/grpc/GrpcInstanceService.java b/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceService.java similarity index 100% rename from src/main/java/we/proxy/grpc/GrpcInstanceService.java rename to fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceService.java diff --git a/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java b/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java similarity index 100% rename from src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java rename to fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java diff --git a/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java b/fizz-core/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java similarity index 100% rename from src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java rename to fizz-core/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java diff --git a/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java b/fizz-core/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java similarity index 100% rename from src/main/java/we/proxy/grpc/ListenableFutureAdapter.java rename to fizz-core/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java diff --git a/src/main/java/we/proxy/grpc/client/CallParams.java b/fizz-core/src/main/java/we/proxy/grpc/client/CallParams.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/CallParams.java rename to fizz-core/src/main/java/we/proxy/grpc/client/CallParams.java diff --git a/src/main/java/we/proxy/grpc/client/CallResults.java b/fizz-core/src/main/java/we/proxy/grpc/client/CallResults.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/CallResults.java rename to fizz-core/src/main/java/we/proxy/grpc/client/CallResults.java diff --git a/src/main/java/we/proxy/grpc/client/GrpcClient.java b/fizz-core/src/main/java/we/proxy/grpc/client/GrpcClient.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/GrpcClient.java rename to fizz-core/src/main/java/we/proxy/grpc/client/GrpcClient.java diff --git a/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java b/fizz-core/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/GrpcProxyClient.java rename to fizz-core/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java diff --git a/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java diff --git a/src/main/java/we/proxy/grpc/client/core/DoneObserver.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/DoneObserver.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/DoneObserver.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/DoneObserver.java diff --git a/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java diff --git a/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java diff --git a/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java diff --git a/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java b/fizz-core/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/core/ServiceResolver.java rename to fizz-core/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java diff --git a/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java b/fizz-core/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java rename to fizz-core/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java diff --git a/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java b/fizz-core/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java rename to fizz-core/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java diff --git a/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java b/fizz-core/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java similarity index 100% rename from src/main/java/we/proxy/grpc/client/utils/MessageWriter.java rename to fizz-core/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java diff --git a/src/main/java/we/proxy/package-info.java b/fizz-core/src/main/java/we/proxy/package-info.java similarity index 100% rename from src/main/java/we/proxy/package-info.java rename to fizz-core/src/main/java/we/proxy/package-info.java diff --git a/src/main/java/we/stats/BlockType.java b/fizz-core/src/main/java/we/stats/BlockType.java similarity index 100% rename from src/main/java/we/stats/BlockType.java rename to fizz-core/src/main/java/we/stats/BlockType.java diff --git a/src/main/java/we/stats/FlowStat.java b/fizz-core/src/main/java/we/stats/FlowStat.java similarity index 100% rename from src/main/java/we/stats/FlowStat.java rename to fizz-core/src/main/java/we/stats/FlowStat.java diff --git a/src/main/java/we/stats/IncrRequestResult.java b/fizz-core/src/main/java/we/stats/IncrRequestResult.java similarity index 100% rename from src/main/java/we/stats/IncrRequestResult.java rename to fizz-core/src/main/java/we/stats/IncrRequestResult.java diff --git a/src/main/java/we/stats/ResourceConfig.java b/fizz-core/src/main/java/we/stats/ResourceConfig.java similarity index 100% rename from src/main/java/we/stats/ResourceConfig.java rename to fizz-core/src/main/java/we/stats/ResourceConfig.java diff --git a/src/main/java/we/stats/ResourceStat.java b/fizz-core/src/main/java/we/stats/ResourceStat.java similarity index 100% rename from src/main/java/we/stats/ResourceStat.java rename to fizz-core/src/main/java/we/stats/ResourceStat.java diff --git a/src/main/java/we/stats/ResourceTimeWindowStat.java b/fizz-core/src/main/java/we/stats/ResourceTimeWindowStat.java similarity index 100% rename from src/main/java/we/stats/ResourceTimeWindowStat.java rename to fizz-core/src/main/java/we/stats/ResourceTimeWindowStat.java diff --git a/src/main/java/we/stats/TimeSlot.java b/fizz-core/src/main/java/we/stats/TimeSlot.java similarity index 100% rename from src/main/java/we/stats/TimeSlot.java rename to fizz-core/src/main/java/we/stats/TimeSlot.java diff --git a/src/main/java/we/stats/TimeWindowStat.java b/fizz-core/src/main/java/we/stats/TimeWindowStat.java similarity index 100% rename from src/main/java/we/stats/TimeWindowStat.java rename to fizz-core/src/main/java/we/stats/TimeWindowStat.java diff --git a/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java b/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java similarity index 100% rename from src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java rename to fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java diff --git a/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java b/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java similarity index 100% rename from src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java rename to fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java diff --git a/src/main/java/we/util/WebUtils.java b/fizz-core/src/main/java/we/util/WebUtils.java similarity index 100% rename from src/main/java/we/util/WebUtils.java rename to fizz-core/src/main/java/we/util/WebUtils.java diff --git a/src/test/java/we/filter/FlowControlFilterTests.java b/fizz-core/src/test/java/we/filter/FlowControlFilterTests.java similarity index 99% rename from src/test/java/we/filter/FlowControlFilterTests.java rename to fizz-core/src/test/java/we/filter/FlowControlFilterTests.java index f93a7e1..b546200 100644 --- a/src/test/java/we/filter/FlowControlFilterTests.java +++ b/fizz-core/src/test/java/we/filter/FlowControlFilterTests.java @@ -49,7 +49,7 @@ public class FlowControlFilterTests { Thread.sleep(3000); } - //@Test + @Test void flowControlFilterTest() throws NoSuchFieldException, InterruptedException { FlowControlFilter flowControlFilter = new FlowControlFilter(); diff --git a/src/test/java/we/fizz/group/DevTestGroup.java b/fizz-core/src/test/java/we/fizz/group/DevTestGroup.java similarity index 100% rename from src/test/java/we/fizz/group/DevTestGroup.java rename to fizz-core/src/test/java/we/fizz/group/DevTestGroup.java diff --git a/src/test/java/we/fizz/group/FastTestGroup.java b/fizz-core/src/test/java/we/fizz/group/FastTestGroup.java similarity index 100% rename from src/test/java/we/fizz/group/FastTestGroup.java rename to fizz-core/src/test/java/we/fizz/group/FastTestGroup.java diff --git a/src/test/java/we/fizz/group/SlowTestGroup.java b/fizz-core/src/test/java/we/fizz/group/SlowTestGroup.java similarity index 100% rename from src/test/java/we/fizz/group/SlowTestGroup.java rename to fizz-core/src/test/java/we/fizz/group/SlowTestGroup.java diff --git a/src/test/java/we/fizz/input/DubboInputMockTests.java b/fizz-core/src/test/java/we/fizz/input/DubboInputMockTests.java similarity index 100% rename from src/test/java/we/fizz/input/DubboInputMockTests.java rename to fizz-core/src/test/java/we/fizz/input/DubboInputMockTests.java diff --git a/src/test/java/we/fizz/input/DubboInputTests.java b/fizz-core/src/test/java/we/fizz/input/DubboInputTests.java similarity index 100% rename from src/test/java/we/fizz/input/DubboInputTests.java rename to fizz-core/src/test/java/we/fizz/input/DubboInputTests.java diff --git a/src/test/java/we/fizz/input/GrpcInputMockTests.java b/fizz-core/src/test/java/we/fizz/input/GrpcInputMockTests.java similarity index 100% rename from src/test/java/we/fizz/input/GrpcInputMockTests.java rename to fizz-core/src/test/java/we/fizz/input/GrpcInputMockTests.java diff --git a/src/test/java/we/fizz/input/PathMappingTests.java b/fizz-core/src/test/java/we/fizz/input/PathMappingTests.java similarity index 100% rename from src/test/java/we/fizz/input/PathMappingTests.java rename to fizz-core/src/test/java/we/fizz/input/PathMappingTests.java diff --git a/src/test/java/we/fizz/input/RequestInputTests.java b/fizz-core/src/test/java/we/fizz/input/RequestInputTests.java similarity index 100% rename from src/test/java/we/fizz/input/RequestInputTests.java rename to fizz-core/src/test/java/we/fizz/input/RequestInputTests.java diff --git a/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java b/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java similarity index 100% rename from src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java rename to fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java diff --git a/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java b/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java similarity index 100% rename from src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java rename to fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java diff --git a/src/test/java/we/plugin/auth/ApiConifg2appsServiceTests.java b/fizz-core/src/test/java/we/plugin/auth/ApiConifg2appsServiceTests.java similarity index 100% rename from src/test/java/we/plugin/auth/ApiConifg2appsServiceTests.java rename to fizz-core/src/test/java/we/plugin/auth/ApiConifg2appsServiceTests.java diff --git a/src/test/java/we/proxy/CallbackServiceTests.java b/fizz-core/src/test/java/we/proxy/CallbackServiceTests.java similarity index 100% rename from src/test/java/we/proxy/CallbackServiceTests.java rename to fizz-core/src/test/java/we/proxy/CallbackServiceTests.java diff --git a/src/test/java/we/proxy/FizzWebClientTests.java b/fizz-core/src/test/java/we/proxy/FizzWebClientTests.java similarity index 100% rename from src/test/java/we/proxy/FizzWebClientTests.java rename to fizz-core/src/test/java/we/proxy/FizzWebClientTests.java diff --git a/src/test/java/we/redis/RedisProperties.java b/fizz-core/src/test/java/we/redis/RedisProperties.java similarity index 100% rename from src/test/java/we/redis/RedisProperties.java rename to fizz-core/src/test/java/we/redis/RedisProperties.java diff --git a/src/test/java/we/redis/RedisServerConfiguration.java b/fizz-core/src/test/java/we/redis/RedisServerConfiguration.java similarity index 100% rename from src/test/java/we/redis/RedisServerConfiguration.java rename to fizz-core/src/test/java/we/redis/RedisServerConfiguration.java diff --git a/src/test/java/we/redis/RedisTemplateConfiguration.java b/fizz-core/src/test/java/we/redis/RedisTemplateConfiguration.java similarity index 100% rename from src/test/java/we/redis/RedisTemplateConfiguration.java rename to fizz-core/src/test/java/we/redis/RedisTemplateConfiguration.java diff --git a/src/test/java/we/stats/FlowStatTests.java b/fizz-core/src/test/java/we/stats/FlowStatTests.java similarity index 100% rename from src/test/java/we/stats/FlowStatTests.java rename to fizz-core/src/test/java/we/stats/FlowStatTests.java diff --git a/src/test/java/we/stats/ratelimit/RateLimitTests.java b/fizz-core/src/test/java/we/stats/ratelimit/RateLimitTests.java similarity index 100% rename from src/test/java/we/stats/ratelimit/RateLimitTests.java rename to fizz-core/src/test/java/we/stats/ratelimit/RateLimitTests.java diff --git a/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java b/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java similarity index 100% rename from src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java rename to fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java diff --git a/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java b/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java similarity index 100% rename from src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java rename to fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java diff --git a/src/test/java/we/util/WebUtilsTests.java b/fizz-core/src/test/java/we/util/WebUtilsTests.java similarity index 100% rename from src/test/java/we/util/WebUtilsTests.java rename to fizz-core/src/test/java/we/util/WebUtilsTests.java diff --git a/fizz-core/src/test/resources/application.properties b/fizz-core/src/test/resources/application.properties new file mode 100644 index 0000000..c0ba817 --- /dev/null +++ b/fizz-core/src/test/resources/application.properties @@ -0,0 +1,5 @@ +# author: hongqiaowei + +embeded.redis.host = localhost +embeded.redis.port = 6379 +embeded.redis.database = 4 diff --git a/fizz-core/src/test/resources/log4j2-test.xml b/fizz-core/src/test/resources/log4j2-test.xml new file mode 100644 index 0000000..bc9be98 --- /dev/null +++ b/fizz-core/src/test/resources/log4j2-test.xml @@ -0,0 +1,18 @@ + + + + + fizz-core + + + + + + + + + + + + + diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml new file mode 100644 index 0000000..4833cc4 --- /dev/null +++ b/fizz-plugin/pom.xml @@ -0,0 +1,266 @@ + + + + fizz-gateway-community + we + 1.5.0 + ../pom.xml + + 4.0.0 + + fizz-plugin + + + + + + + com.networknt + json-schema-validator-i18n-support + 1.0.39_4 + system + ${project.basedir}/../lib/json-schema-validator-i18n-support-1.0.39_4.jar + + + + we + fizz-common + + + we + fizz-core + + + + org.springframework.session + spring-session-bom + Dragonfruit-RELEASE + pom + import + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + org.skyscreamer + jsonassert + + + + + + io.projectreactor + reactor-test + test + + + + com.alibaba + fastjson + + + + com.google.code.gson + gson + + + + net.minidev + json-smart + + + + org.codehaus.jettison + jettison + + + + org.json + json + + + + org.apache.tapestry + tapestry-json + + + + org.apache.commons + commons-lang3 + + + + org.codehaus.groovy + groovy-all + + + + commons-io + commons-io + + + + com.ctrip.framework.apollo + apollo-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + com.alibaba.boot + nacos-config-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + + + + org.apache.commons + commons-pool2 + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + + + it.ozimov + embedded-redis + test + + + org.slf4j + slf4j-simple + + + + + + org.noear + snack3 + + + + org.springframework.session + spring-session-data-redis + + + + com.auth0 + java-jwt + + + + org.mockito + mockito-core + test + + + + org.mockito + mockito-inline + test + + + + org.apache.dubbo + dubbo + + + + + io.grpc + grpc-all + + + io.grpc + grpc-services + + + org.projectlombok + lombok + + + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + junit + junit + test + + + + commons-codec + commons-codec + + + + org.bouncycastle + bcpkix-jdk15on + + + + \ No newline at end of file diff --git a/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java b/fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java similarity index 99% rename from src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java rename to fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java index fbad11c..2947055 100644 --- a/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java +++ b/fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java @@ -17,9 +17,6 @@ package we.plugin.basicAuth; -import java.util.Base64; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,12 +25,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; - import reactor.core.publisher.Mono; import we.plugin.PluginFilter; import we.util.JacksonUtils; import we.util.WebUtils; +import java.util.Base64; +import java.util.Map; + /** * * @author Francis Dong diff --git a/src/main/java/we/plugin/basicAuth/GlobalConfig.java b/fizz-plugin/src/main/java/we/plugin/basicAuth/GlobalConfig.java similarity index 100% rename from src/main/java/we/plugin/basicAuth/GlobalConfig.java rename to fizz-plugin/src/main/java/we/plugin/basicAuth/GlobalConfig.java diff --git a/src/main/java/we/plugin/jwt/GlobalConfig.java b/fizz-plugin/src/main/java/we/plugin/jwt/GlobalConfig.java similarity index 100% rename from src/main/java/we/plugin/jwt/GlobalConfig.java rename to fizz-plugin/src/main/java/we/plugin/jwt/GlobalConfig.java diff --git a/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java b/fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java similarity index 99% rename from src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java rename to fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java index 9ce2b05..13ad9c7 100644 --- a/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java +++ b/fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java @@ -17,11 +17,11 @@ package we.plugin.jwt; -import java.security.interfaces.ECPublicKey; -import java.security.interfaces.RSAPublicKey; -import java.util.List; -import java.util.Map; - +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.exceptions.JWTVerificationException; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.auth0.jwt.interfaces.JWTVerifier; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,19 +29,17 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTVerificationException; -import com.auth0.jwt.interfaces.DecodedJWT; -import com.auth0.jwt.interfaces.JWTVerifier; - import reactor.core.publisher.Mono; import we.plugin.PluginFilter; import we.util.JacksonUtils; import we.util.PemUtils; import we.util.WebUtils; +import java.security.interfaces.ECPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.List; +import java.util.Map; + /** * * @author Francis Dong diff --git a/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java b/fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java similarity index 98% rename from src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java rename to fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java index cd3e6e1..842d5f1 100644 --- a/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java +++ b/fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java @@ -17,16 +17,14 @@ package we.plugin.basicAuth; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.Base64; import java.util.HashMap; -import java.util.List; import java.util.Map; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * diff --git a/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java b/fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java similarity index 98% rename from src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java rename to fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java index a84904c..8e45a28 100644 --- a/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java +++ b/fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java @@ -17,15 +17,12 @@ package we.plugin.jwtAuth; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import org.junit.jupiter.api.Test; -import org.springframework.http.HttpStatus; - import com.auth0.jwt.interfaces.DecodedJWT; - +import org.junit.jupiter.api.Test; import we.plugin.jwt.JwtAuthPluginFilter; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * * @author Francis Dong diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml new file mode 100644 index 0000000..fe55da8 --- /dev/null +++ b/fizz-spring-boot-starter/pom.xml @@ -0,0 +1,324 @@ + + + 4.0.0 + + + + 1.5.0 + 2.2.13.RELEASE + 5.2.13.RELEASE + Dysprosium-SR18 + 5.3.6.RELEASE + 0.2.7 + 4.1.62.Final + 4.4.14 + 2.13.3 + 2.7.5 + 1.16.1 + 3.4.6 + 4.0.1 + 3.5.9 + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.13.RELEASE + + + we + fizz-spring-boot-starter + 1.5.0 + + + + + + org.springframework.session + spring-session-bom + Dragonfruit-RELEASE + pom + import + + + + org.springframework.boot + spring-boot-starter-webflux + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + ${spring-boot.version} + + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + org.junit.vintage + junit-vintage-engine + + + org.skyscreamer + jsonassert + + + + + + io.projectreactor + reactor-test + 3.3.15.RELEASE + test + + + + com.alibaba + fastjson + 1.2.75 + + + + com.google.code.gson + gson + 2.8.6 + + + + net.minidev + json-smart + 2.3 + + + + org.codehaus.jettison + jettison + 1.3.8 + + + + org.json + json + 20190722 + + + + org.apache.tapestry + tapestry-json + 5.4.5 + + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + org.codehaus.groovy + groovy-all + 2.4.21 + + + + commons-io + commons-io + 2.8.0 + + + + com.ctrip.framework.apollo + apollo-client + 1.5.1 + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.2.7.RELEASE + + + + com.alibaba.boot + nacos-config-spring-boot-starter + ${nacos.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + ${nacos.version} + + + + org.apache.commons + commons-pool2 + ${commons-pool2.version} + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + ${spring-boot.version} + + + + it.ozimov + embedded-redis + 0.7.3 + test + + + org.slf4j + slf4j-simple + + + + + + org.noear + snack3 + 3.1.6.4 + + + + org.springframework.session + spring-session-data-redis + 2.3.0.RELEASE + + + + com.auth0 + java-jwt + 3.12.1 + + + + org.mockito + mockito-core + ${mockito.version} + test + + + + org.mockito + mockito-inline + ${mockito.version} + test + + + + org.apache.dubbo + dubbo + ${apache.dubbo.version} + + + + io.grpc + grpc-all + ${grpc.version} + + + io.grpc + grpc-services + ${grpc.version} + + + org.projectlombok + lombok + 1.18.18 + + + + org.apache.curator + curator-client + ${curator.version} + + + org.apache.curator + curator-framework + ${curator.version} + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + junit + junit + ${junit.version} + test + + + + commons-codec + commons-codec + 1.15 + + + + org.bouncycastle + bcpkix-jdk15on + 1.64 + + + + we + fizz-common + ${fizz.version} + + + we + fizz-core + ${fizz.version} + + + we + fizz-plugin + ${fizz.version} + + + + \ No newline at end of file diff --git a/fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories b/fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..15839dc --- /dev/null +++ b/fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,45 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +we.config.AggregateRedisConfig,\ +we.config.AggrWebClientConfig,\ +we.config.ApolloConfig,\ +we.config.AppConfigProperties,\ +we.config.FlowControlConfig,\ +we.config.FlowStatSchedConfig,\ +we.config.ProxyWebClientConfig,\ +we.config.SystemConfig,\ +we.config.WebFluxConfig,\ +we.controller.HealthCheckController,\ +we.controller.CacheCheckController,\ +we.controller.CallbackController,\ +we.controller.ConfigController,\ +we.controller.FlowControlController,\ +we.controller.ManagerConfigController,\ +we.filter.AggregateFilter,\ +we.filter.CallbackFilter,\ +we.filter.CorsFilterConfig,\ +we.filter.FilterExceptionHandlerConfig,\ +we.filter.FizzLogFilter,\ +we.filter.FlowControlFilter,\ +we.filter.PreprocessFilter,\ +we.filter.RouteFilter,\ +we.fizz.AggregateService,\ +we.fizz.ConfigLoader,\ +we.listener.AggregateChannelListener,\ +we.plugin.auth.ApiConfigService,\ +we.plugin.auth.ApiConifg2appsService,\ +we.plugin.auth.AppService,\ +we.plugin.auth.AuthPluginFilter,\ +we.plugin.auth.GatewayGroupService,\ +we.plugin.basicAuth.BasicAuthPluginFilter,\ +we.plugin.jwt.JwtAuthPluginFilter,\ +we.plugin.stat.StatPluginFilter,\ +we.proxy.dubbo.ApacheDubboGenericService,\ +we.proxy.grpc.client.GrpcProxyClient,\ +we.proxy.grpc.GrpcGenericService,\ +we.proxy.grpc.GrpcInstanceServiceImpl,\ +we.proxy.CallbackService,\ +we.proxy.DisableDiscoveryUriSelector,\ +we.proxy.EurekaUriSelector,\ +we.proxy.FizzWebClient,\ +we.proxy.NacosUriSelector,\ +we.stats.ratelimit.ResourceRateLimitConfigService diff --git a/pom.xml b/pom.xml index acc706d..44d1c97 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,26 @@ 4.0.0 + + + + 1.5.0 + + 2.2.13.RELEASE + 5.2.13.RELEASE + Dysprosium-SR18 + 5.3.6.RELEASE + 0.2.7 + 4.1.62.Final + 4.4.14 + 2.13.3 + 2.7.5 + 1.16.1 + 3.4.6 + 4.0.1 + 3.5.9 + + org.springframework.boot spring-boot-starter-parent @@ -11,7 +31,13 @@ we fizz-gateway-community 1.5.0 - fizz-gateway-community + pom + + fizz-common + fizz-core + fizz-plugin + fizz-bootstrap + @@ -32,24 +58,32 @@ - - 1.8 - 5.2.13.RELEASE - Dysprosium-SR17 - 5.3.6.RELEASE - 0.2.7 - 4.1.60.Final - 4.4.14 - 2.13.3 - 2.7.5 - 1.16.1 - 3.4.0 - 4.0.1 - 3.5.6 - - + + + + we + fizz-common + ${fizz.version} + + + we + fizz-core + ${fizz.version} + + + we + fizz-plugin + ${fizz.version} + + org.springframework.session spring-session-bom @@ -57,264 +91,275 @@ pom import + + + org.springframework.boot + spring-boot-starter-webflux + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + ${spring-boot.version} + + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + org.junit.vintage + junit-vintage-engine + + + org.skyscreamer + jsonassert + + + + + + io.projectreactor + reactor-test + 3.3.15.RELEASE + test + + + + com.alibaba + fastjson + 1.2.75 + + + + com.google.code.gson + gson + 2.8.6 + + + + net.minidev + json-smart + 2.3 + + + + org.codehaus.jettison + jettison + 1.3.8 + + + + org.json + json + 20190722 + + + + org.apache.tapestry + tapestry-json + 5.4.5 + + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + org.codehaus.groovy + groovy-all + 2.4.21 + + + + commons-io + commons-io + 2.8.0 + + + + com.ctrip.framework.apollo + apollo-client + 1.5.1 + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.2.7.RELEASE + + + + com.alibaba.boot + nacos-config-spring-boot-starter + ${nacos.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + ${nacos.version} + + + + org.apache.commons + commons-pool2 + ${commons-pool2.version} + + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + ${spring-boot.version} + + + + it.ozimov + embedded-redis + 0.7.3 + test + + + org.slf4j + slf4j-simple + + + + + + org.noear + snack3 + 3.1.6.4 + + + + org.springframework.session + spring-session-data-redis + 2.3.0.RELEASE + + + + com.auth0 + java-jwt + 3.12.1 + + + + org.mockito + mockito-core + ${mockito.version} + test + + + + org.mockito + mockito-inline + ${mockito.version} + test + + + + org.apache.dubbo + dubbo + ${apache.dubbo.version} + + + + + io.grpc + grpc-all + ${grpc.version} + + + io.grpc + grpc-services + ${grpc.version} + + + org.projectlombok + lombok + 1.18.18 + + + + + org.apache.curator + curator-client + ${curator.version} + + + org.apache.curator + curator-framework + ${curator.version} + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + junit + junit + ${junit.version} + test + + + + commons-codec + commons-codec + 1.15 + + + + org.bouncycastle + bcpkix-jdk15on + 1.64 + - - - com.networknt - json-schema-validator-i18n-support - 1.0.39_4 - system - ${project.basedir}/lib/json-schema-validator-i18n-support-1.0.39_4.jar - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-logging - - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - - com.alibaba - fastjson - 1.2.75 - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - org.skyscreamer - jsonassert - - - - - io.projectreactor - reactor-test - test - - - - com.google.code.gson - gson - 2.8.6 - - - - net.minidev - json-smart - 2.3 - - - - org.codehaus.jettison - jettison - 1.3.8 - - - org.json - json - 20190722 - - - org.apache.tapestry - tapestry-json - 5.4.5 - - - - org.apache.commons - commons-lang3 - 3.11 - - - - org.codehaus.groovy - groovy-all - 2.4.21 - - - - commons-io - commons-io - 2.8.0 - - - - com.ctrip.framework.apollo - apollo-client - 1.5.1 - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - 2.2.7.RELEASE - - - - com.alibaba.boot - nacos-config-spring-boot-starter - ${nacos.version} - - - org.springframework.boot - spring-boot-starter-logging - - - - - com.alibaba.boot - nacos-discovery-spring-boot-starter - ${nacos.version} - - - - org.apache.commons - commons-pool2 - - - org.springframework.boot - spring-boot-starter-data-redis-reactive - - - it.ozimov - embedded-redis - 0.7.3 - test - - - org.slf4j - slf4j-simple - - - - - - org.noear - snack3 - 3.1.6.4 - - - - org.springframework.session - spring-session-data-redis - - - - com.auth0 - java-jwt - 3.12.1 - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-inline - ${mockito.version} - test - - - - org.apache.dubbo - dubbo - ${apache.dubbo.version} - - - - - io.grpc - grpc-all - ${grpc.version} - - - - io.grpc - grpc-services - ${grpc.version} - - - org.projectlombok - lombok - 1.18.16 - - - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - junit - junit - - test - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - + + + diff --git a/src/main/java/org/springframework/http/HttpMethod.java b/src/main/java/org/springframework/http/HttpMethod.java deleted file mode 100644 index b61074c..0000000 --- a/src/main/java/org/springframework/http/HttpMethod.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.http; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.lang.Nullable; - -/** - * Java 5 enumeration of HTTP request methods. Intended for use - * with {@link org.springframework.http.client.ClientHttpRequest} - * and {@link org.springframework.web.client.RestTemplate}. - * - * @author Arjen Poutsma - * @author Juergen Hoeller - * @since 3.0 - */ -public enum HttpMethod { - - X, GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; - - - private static final Map mappings = new HashMap<>(16); - - static { - for (HttpMethod httpMethod : values()) { - mappings.put(httpMethod.name(), httpMethod); - } - } - - - /** - * Resolve the given method value to an {@code HttpMethod}. - * @param method the method value as a String - * @return the corresponding {@code HttpMethod}, or {@code null} if not found - * @since 4.2.4 - */ - @Nullable - public static HttpMethod resolve(@Nullable String method) { - return (method != null ? mappings.get(method) : null); - } - - - /** - * Determine whether this {@code HttpMethod} matches the given - * method value. - * @param method the method value as a String - * @return {@code true} if it matches, {@code false} otherwise - * @since 4.2.4 - */ - public boolean matches(String method) { - return (this == resolve(method)); - } - -} diff --git a/src/test/java/we/FizzGatewayApplicationTests.java b/src/test/java/we/FizzGatewayApplicationTests.java deleted file mode 100644 index a9d103c..0000000 --- a/src/test/java/we/FizzGatewayApplicationTests.java +++ /dev/null @@ -1,9 +0,0 @@ -package we; - -import org.junit.jupiter.api.Test; - -class FizzGatewayApplicationTests { - @Test - void contextLoads() { - } -}