From 96db02e17376fdafc801609f9b6664c86d434d63 Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Fri, 4 Sep 2020 19:43:19 +0800 Subject: [PATCH] update package name --- .gitignore | 3 ++- README.md | 2 +- pom.xml | 2 +- .../FizzGatewayApplication.java | 2 +- .../ApolloLog4j2ConfigurationFactory.java | 2 +- .../config/AggrWebClientConfig.java | 2 +- .../config/AppConfigProperties.java | 2 +- .../config/ProxyWebClientConfig.java | 2 +- .../config/RedisReactiveConfig.java | 2 +- .../config/RedisReactiveProperties.java | 6 ++--- .../wehotel => we}/config/SystemConfig.java | 12 +++++----- .../config/WebClientConfig.java | 2 +- .../wehotel => we}/config/WebFluxConfig.java | 2 +- .../constants/CommonConstants.java | 2 +- .../controller/ConfigController.java | 6 ++--- .../controller/HealthController.java | 8 +++---- .../controller/ManagerConfigController.java | 14 ++++++------ .../controller/req/BaseManagerConfigReq.java | 2 +- .../controller/req/GetConfigReq.java | 2 +- .../controller/req/GetConfigStrReq.java | 2 +- .../controller/resp/ConfigResp.java | 4 ++-- .../controller/resp/ConfigStrResp.java | 2 +- .../exception/StopAndResponseException.java | 2 +- .../filter/CorsFilterConfig.java | 4 ++-- .../filter/FilterExceptionHandlerConfig.java | 6 ++--- .../wehotel => we}/filter/FilterResult.java | 2 +- .../filter/FizzGatewayFilter.java | 22 +++++++++---------- .../wehotel => we}/filter/FizzLogFilter.java | 6 ++--- .../{com/wehotel => we}/filter/PreFilter.java | 20 ++++++++--------- .../filter/ProxyAggrFilter.java | 4 ++-- .../wehotel => we}/filter/RouteFilter.java | 12 +++++----- .../fizz/AggregateResource.java | 4 ++-- .../wehotel => we}/fizz/AggregateResult.java | 2 +- .../wehotel => we}/fizz/ConfigLoader.java | 14 ++++++------ .../{com/wehotel => we}/fizz/Pipeline.java | 20 ++++++++--------- .../java/{com/wehotel => we}/fizz/Step.java | 12 +++++----- .../{com/wehotel => we}/fizz/StepContext.java | 4 ++-- .../wehotel => we}/fizz/StepResponse.java | 2 +- .../fizz/input/ClientInputConfig.java | 2 +- .../{com/wehotel => we}/fizz/input/Input.java | 6 ++--- .../fizz/input/InputConfig.java | 2 +- .../fizz/input/InputContext.java | 6 ++--- .../fizz/input/InputFactory.java | 2 +- .../wehotel => we}/fizz/input/InputType.java | 2 +- .../wehotel => we}/fizz/input/MySQLInput.java | 2 +- .../fizz/input/MySQLInputConfig.java | 2 +- .../fizz/input/PathMapping.java | 6 ++--- .../fizz/input/RequestInput.java | 16 +++++++------- .../fizz/input/RequestInputConfig.java | 2 +- .../fizz/input/ScriptHelper.java | 12 +++++----- .../clients/log4j2appender/LogService.java | 2 +- .../wehotel => we}/legacy/RespEntity.java | 6 ++--- .../listener/AggregateChannelListener.java | 6 ++--- .../listener/AggregateRedisConfig.java | 6 ++--- .../plugin/FixedPluginFilter.java | 4 ++-- .../wehotel => we}/plugin/PluginConfig.java | 4 ++-- .../wehotel => we}/plugin/PluginFilter.java | 10 ++++----- .../wehotel => we}/plugin/auth/ApiConfig.java | 8 +++---- .../plugin/auth/ApiConfigService.java | 10 ++++----- .../{com/wehotel => we}/plugin/auth/App.java | 4 ++-- .../plugin/auth/AppService.java | 12 +++++----- .../plugin/auth/AuthPluginFilter.java | 8 +++---- .../plugin/auth/CustomAuth.java | 2 +- .../plugin/auth/GatewayGroup.java | 2 +- .../plugin/auth/ServiceConfig.java | 4 ++-- .../plugin/stat/StatPluginFilter.java | 12 +++++----- .../proxy/CallBackendConfig.java | 2 +- .../wehotel => we}/proxy/FizzWebClient.java | 14 ++++++------ .../wehotel => we}/proxy/package-info.java | 4 ++-- .../{com/wehotel => we}/util/Constants.java | 2 +- .../wehotel => we}/util/DateTimeUtils.java | 4 ++-- .../{com/wehotel => we}/util/DigestUtils.java | 2 +- .../wehotel => we}/util/JacksonUtils.java | 6 ++--- .../wehotel => we}/util/JsonSchemaUtils.java | 2 +- .../{com/wehotel => we}/util/MapUtil.java | 2 +- .../wehotel => we}/util/NetworkUtils.java | 2 +- .../wehotel => we}/util/ReactorUtils.java | 2 +- .../java/{com/wehotel => we}/util/Script.java | 2 +- .../{com/wehotel => we}/util/ScriptUtils.java | 2 +- .../wehotel => we}/util/ThreadContext.java | 2 +- .../java/{com/wehotel => we}/util/Utils.java | 2 +- .../{com/wehotel => we}/util/WebUtils.java | 8 +++---- .../FizzGatewayApplicationTests.java | 2 +- 83 files changed, 220 insertions(+), 219 deletions(-) rename src/main/java/{com/wehotel => we}/FizzGatewayApplication.java (98%) rename src/main/java/{com/wehotel => we}/apollo/ApolloLog4j2ConfigurationFactory.java (99%) rename src/main/java/{com/wehotel => we}/config/AggrWebClientConfig.java (97%) rename src/main/java/{com/wehotel => we}/config/AppConfigProperties.java (97%) rename src/main/java/{com/wehotel => we}/config/ProxyWebClientConfig.java (98%) rename src/main/java/{com/wehotel => we}/config/RedisReactiveConfig.java (99%) rename src/main/java/{com/wehotel => we}/config/RedisReactiveProperties.java (95%) rename src/main/java/{com/wehotel => we}/config/SystemConfig.java (96%) rename src/main/java/{com/wehotel => we}/config/WebClientConfig.java (99%) rename src/main/java/{com/wehotel => we}/config/WebFluxConfig.java (99%) rename src/main/java/{com/wehotel => we}/constants/CommonConstants.java (97%) rename src/main/java/{com/wehotel => we}/controller/ConfigController.java (94%) rename src/main/java/{com/wehotel => we}/controller/HealthController.java (92%) rename src/main/java/{com/wehotel => we}/controller/ManagerConfigController.java (91%) rename src/main/java/{com/wehotel => we}/controller/req/BaseManagerConfigReq.java (98%) rename src/main/java/{com/wehotel => we}/controller/req/GetConfigReq.java (98%) rename src/main/java/{com/wehotel => we}/controller/req/GetConfigStrReq.java (98%) rename src/main/java/{com/wehotel => we}/controller/resp/ConfigResp.java (95%) rename src/main/java/{com/wehotel => we}/controller/resp/ConfigStrResp.java (97%) rename src/main/java/{com/wehotel => we}/exception/StopAndResponseException.java (97%) rename src/main/java/{com/wehotel => we}/filter/CorsFilterConfig.java (97%) rename src/main/java/{com/wehotel => we}/filter/FilterExceptionHandlerConfig.java (95%) rename src/main/java/{com/wehotel => we}/filter/FilterResult.java (98%) rename src/main/java/{com/wehotel => we}/filter/FizzGatewayFilter.java (91%) rename src/main/java/{com/wehotel => we}/filter/FizzLogFilter.java (94%) rename src/main/java/{com/wehotel => we}/filter/PreFilter.java (95%) rename src/main/java/{com/wehotel => we}/filter/ProxyAggrFilter.java (95%) rename src/main/java/{com/wehotel => we}/filter/RouteFilter.java (96%) rename src/main/java/{com/wehotel => we}/fizz/AggregateResource.java (95%) rename src/main/java/{com/wehotel => we}/fizz/AggregateResult.java (97%) rename src/main/java/{com/wehotel => we}/fizz/ConfigLoader.java (97%) rename src/main/java/{com/wehotel => we}/fizz/Pipeline.java (96%) rename src/main/java/{com/wehotel => we}/fizz/Step.java (94%) rename src/main/java/{com/wehotel => we}/fizz/StepContext.java (99%) rename src/main/java/{com/wehotel => we}/fizz/StepResponse.java (98%) rename src/main/java/{com/wehotel => we}/fizz/input/ClientInputConfig.java (99%) rename src/main/java/{com/wehotel => we}/fizz/input/Input.java (94%) rename src/main/java/{com/wehotel => we}/fizz/input/InputConfig.java (97%) rename src/main/java/{com/wehotel => we}/fizz/input/InputContext.java (94%) rename src/main/java/{com/wehotel => we}/fizz/input/InputFactory.java (98%) rename src/main/java/{com/wehotel => we}/fizz/input/InputType.java (96%) rename src/main/java/{com/wehotel => we}/fizz/input/MySQLInput.java (96%) rename src/main/java/{com/wehotel => we}/fizz/input/MySQLInputConfig.java (96%) rename src/main/java/{com/wehotel => we}/fizz/input/PathMapping.java (98%) rename src/main/java/{com/wehotel => we}/fizz/input/RequestInput.java (97%) rename src/main/java/{com/wehotel => we}/fizz/input/RequestInputConfig.java (98%) rename src/main/java/{com/wehotel => we}/fizz/input/ScriptHelper.java (95%) rename src/main/java/{com/wehotel => we}/flume/clients/log4j2appender/LogService.java (94%) rename src/main/java/{com/wehotel => we}/legacy/RespEntity.java (94%) rename src/main/java/{com/wehotel => we}/listener/AggregateChannelListener.java (97%) rename src/main/java/{com/wehotel => we}/listener/AggregateRedisConfig.java (95%) rename src/main/java/{com/wehotel => we}/plugin/FixedPluginFilter.java (98%) rename src/main/java/{com/wehotel => we}/plugin/PluginConfig.java (95%) rename src/main/java/{com/wehotel => we}/plugin/PluginFilter.java (92%) rename src/main/java/{com/wehotel => we}/plugin/auth/ApiConfig.java (94%) rename src/main/java/{com/wehotel => we}/plugin/auth/ApiConfigService.java (98%) rename src/main/java/{com/wehotel => we}/plugin/auth/App.java (97%) rename src/main/java/{com/wehotel => we}/plugin/auth/AppService.java (95%) rename src/main/java/{com/wehotel => we}/plugin/auth/AuthPluginFilter.java (92%) rename src/main/java/{com/wehotel => we}/plugin/auth/CustomAuth.java (97%) rename src/main/java/{com/wehotel => we}/plugin/auth/GatewayGroup.java (98%) rename src/main/java/{com/wehotel => we}/plugin/auth/ServiceConfig.java (98%) rename src/main/java/{com/wehotel => we}/plugin/stat/StatPluginFilter.java (94%) rename src/main/java/{com/wehotel => we}/proxy/CallBackendConfig.java (97%) rename src/main/java/{com/wehotel => we}/proxy/FizzWebClient.java (97%) rename src/main/java/{com/wehotel => we}/proxy/package-info.java (95%) rename src/main/java/{com/wehotel => we}/util/Constants.java (99%) rename src/main/java/{com/wehotel => we}/util/DateTimeUtils.java (98%) rename src/main/java/{com/wehotel => we}/util/DigestUtils.java (98%) rename src/main/java/{com/wehotel => we}/util/JacksonUtils.java (98%) rename src/main/java/{com/wehotel => we}/util/JsonSchemaUtils.java (99%) rename src/main/java/{com/wehotel => we}/util/MapUtil.java (99%) rename src/main/java/{com/wehotel => we}/util/NetworkUtils.java (99%) rename src/main/java/{com/wehotel => we}/util/ReactorUtils.java (97%) rename src/main/java/{com/wehotel => we}/util/Script.java (97%) rename src/main/java/{com/wehotel => we}/util/ScriptUtils.java (99%) rename src/main/java/{com/wehotel => we}/util/ThreadContext.java (99%) rename src/main/java/{com/wehotel => we}/util/Utils.java (99%) rename src/main/java/{com/wehotel => we}/util/WebUtils.java (98%) rename src/test/java/{com/wehotel => we}/FizzGatewayApplicationTests.java (84%) diff --git a/.gitignore b/.gitignore index a77f79d..0d24627 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ .settings .project .classpath -.factorypath \ No newline at end of file +.factorypath +.idea \ No newline at end of file diff --git a/README.md b/README.md index 8c22ba8..0ff742d 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,6 @@ jar启动: 1. 网关核心项目fizz-gateway-community社区版本以GNU v3的方式进行的开放，可以免费使用。 -2. 管理后台项目(fizz-manager-professional和fizz-admin-professional)作为商业版本仅开放二进制包的免费下载，而商业项目请联系我们（ewing.lin@wehotelglobal.com）进行授权。 +2. 管理后台项目(fizz-manager-professional和fizz-admin-professional)作为商业版本仅开放二进制包的免费下载，而商业项目请联系我们（524423586@qq.com）进行授权。 diff --git a/pom.xml b/pom.xml index 0c67e81..eb93547 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 2.2.9.RELEASE - com.wehotel + we fizz-gateway-community 1.0.0 fizz-gateway diff --git a/src/main/java/com/wehotel/FizzGatewayApplication.java b/src/main/java/we/FizzGatewayApplication.java similarity index 98% rename from src/main/java/com/wehotel/FizzGatewayApplication.java rename to src/main/java/we/FizzGatewayApplication.java index 49ca6be..a45c023 100644 --- a/src/main/java/com/wehotel/FizzGatewayApplication.java +++ b/src/main/java/we/FizzGatewayApplication.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel; +package we; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/wehotel/apollo/ApolloLog4j2ConfigurationFactory.java b/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java similarity index 99% rename from src/main/java/com/wehotel/apollo/ApolloLog4j2ConfigurationFactory.java rename to src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java index 3c2a141..f29889f 100644 --- a/src/main/java/com/wehotel/apollo/ApolloLog4j2ConfigurationFactory.java +++ b/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.apollo; +package we.apollo; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; diff --git a/src/main/java/com/wehotel/config/AggrWebClientConfig.java b/src/main/java/we/config/AggrWebClientConfig.java similarity index 97% rename from src/main/java/com/wehotel/config/AggrWebClientConfig.java rename to src/main/java/we/config/AggrWebClientConfig.java index acddb79..6f628f7 100644 --- a/src/main/java/com/wehotel/config/AggrWebClientConfig.java +++ b/src/main/java/we/config/AggrWebClientConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/wehotel/config/AppConfigProperties.java b/src/main/java/we/config/AppConfigProperties.java similarity index 97% rename from src/main/java/com/wehotel/config/AppConfigProperties.java rename to src/main/java/we/config/AppConfigProperties.java index 6b5ddee..f5346b6 100644 --- a/src/main/java/com/wehotel/config/AppConfigProperties.java +++ b/src/main/java/we/config/AppConfigProperties.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/wehotel/config/ProxyWebClientConfig.java b/src/main/java/we/config/ProxyWebClientConfig.java similarity index 98% rename from src/main/java/com/wehotel/config/ProxyWebClientConfig.java rename to src/main/java/we/config/ProxyWebClientConfig.java index fa49a9e..6a4ee94 100644 --- a/src/main/java/com/wehotel/config/ProxyWebClientConfig.java +++ b/src/main/java/we/config/ProxyWebClientConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/wehotel/config/RedisReactiveConfig.java b/src/main/java/we/config/RedisReactiveConfig.java similarity index 99% rename from src/main/java/com/wehotel/config/RedisReactiveConfig.java rename to src/main/java/we/config/RedisReactiveConfig.java index c5fd3e9..a6279bc 100644 --- a/src/main/java/com/wehotel/config/RedisReactiveConfig.java +++ b/src/main/java/we/config/RedisReactiveConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import io.lettuce.core.ClientOptions; import io.lettuce.core.resource.ClientResources; diff --git a/src/main/java/com/wehotel/config/RedisReactiveProperties.java b/src/main/java/we/config/RedisReactiveProperties.java similarity index 95% rename from src/main/java/com/wehotel/config/RedisReactiveProperties.java rename to src/main/java/we/config/RedisReactiveProperties.java index 19a9115..bf40def 100644 --- a/src/main/java/com/wehotel/config/RedisReactiveProperties.java +++ b/src/main/java/we/config/RedisReactiveProperties.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; -import com.wehotel.util.Constants; -import com.wehotel.util.Utils; +import we.util.Constants; +import we.util.Utils; /** * @author lancer diff --git a/src/main/java/com/wehotel/config/SystemConfig.java b/src/main/java/we/config/SystemConfig.java similarity index 96% rename from src/main/java/com/wehotel/config/SystemConfig.java rename to src/main/java/we/config/SystemConfig.java index 2620b04..c2048d9 100644 --- a/src/main/java/com/wehotel/config/SystemConfig.java +++ b/src/main/java/we/config/SystemConfig.java @@ -15,16 +15,16 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener; -import com.wehotel.plugin.auth.GatewayGroup; -import com.wehotel.util.Constants; -import com.wehotel.util.JacksonUtils; -import com.wehotel.util.NetworkUtils; -import com.wehotel.util.WebUtils; +import we.plugin.auth.GatewayGroup; +import we.util.Constants; +import we.util.JacksonUtils; +import we.util.NetworkUtils; +import we.util.WebUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/wehotel/config/WebClientConfig.java b/src/main/java/we/config/WebClientConfig.java similarity index 99% rename from src/main/java/com/wehotel/config/WebClientConfig.java rename to src/main/java/we/config/WebClientConfig.java index 4288592..6e3b84e 100644 --- a/src/main/java/com/wehotel/config/WebClientConfig.java +++ b/src/main/java/we/config/WebClientConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/src/main/java/com/wehotel/config/WebFluxConfig.java b/src/main/java/we/config/WebFluxConfig.java similarity index 99% rename from src/main/java/com/wehotel/config/WebFluxConfig.java rename to src/main/java/we/config/WebFluxConfig.java index 52da819..ba7c8af 100644 --- a/src/main/java/com/wehotel/config/WebFluxConfig.java +++ b/src/main/java/we/config/WebFluxConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.config; +package we.config; import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/src/main/java/com/wehotel/constants/CommonConstants.java b/src/main/java/we/constants/CommonConstants.java similarity index 97% rename from src/main/java/com/wehotel/constants/CommonConstants.java rename to src/main/java/we/constants/CommonConstants.java index c2c86b2..e5bac3c 100644 --- a/src/main/java/com/wehotel/constants/CommonConstants.java +++ b/src/main/java/we/constants/CommonConstants.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.constants; +package we.constants; /** * @author unknown diff --git a/src/main/java/com/wehotel/controller/ConfigController.java b/src/main/java/we/controller/ConfigController.java similarity index 94% rename from src/main/java/com/wehotel/controller/ConfigController.java rename to src/main/java/we/controller/ConfigController.java index 049d7ef..b787340 100644 --- a/src/main/java/com/wehotel/controller/ConfigController.java +++ b/src/main/java/we/controller/ConfigController.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.controller; +package we.controller; -import com.wehotel.fizz.ConfigLoader; -import com.wehotel.util.ScriptUtils; +import we.fizz.ConfigLoader; +import we.util.ScriptUtils; import org.apache.commons.io.FileUtils; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/wehotel/controller/HealthController.java b/src/main/java/we/controller/HealthController.java similarity index 92% rename from src/main/java/com/wehotel/controller/HealthController.java rename to src/main/java/we/controller/HealthController.java index c78edb3..f9e3207 100644 --- a/src/main/java/com/wehotel/controller/HealthController.java +++ b/src/main/java/we/controller/HealthController.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.wehotel.controller; +package we.controller; import java.util.Date; -import com.wehotel.plugin.auth.ApiConfigService; -import com.wehotel.plugin.auth.AppService; -import com.wehotel.util.JacksonUtils; +import we.plugin.auth.ApiConfigService; +import we.plugin.auth.AppService; +import we.util.JacksonUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; diff --git a/src/main/java/com/wehotel/controller/ManagerConfigController.java b/src/main/java/we/controller/ManagerConfigController.java similarity index 91% rename from src/main/java/com/wehotel/controller/ManagerConfigController.java rename to src/main/java/we/controller/ManagerConfigController.java index 93fff7c..b3d83ca 100644 --- a/src/main/java/com/wehotel/controller/ManagerConfigController.java +++ b/src/main/java/we/controller/ManagerConfigController.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.wehotel.controller; +package we.controller; -import com.wehotel.controller.req.BaseManagerConfigReq; -import com.wehotel.controller.req.GetConfigStrReq; -import com.wehotel.controller.req.GetConfigReq; -import com.wehotel.controller.resp.ConfigStrResp; -import com.wehotel.controller.resp.ConfigResp; -import com.wehotel.fizz.ConfigLoader; +import we.controller.req.BaseManagerConfigReq; +import we.controller.req.GetConfigStrReq; +import we.controller.req.GetConfigReq; +import we.controller.resp.ConfigStrResp; +import we.controller.resp.ConfigResp; +import we.fizz.ConfigLoader; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/wehotel/controller/req/BaseManagerConfigReq.java b/src/main/java/we/controller/req/BaseManagerConfigReq.java similarity index 98% rename from src/main/java/com/wehotel/controller/req/BaseManagerConfigReq.java rename to src/main/java/we/controller/req/BaseManagerConfigReq.java index 36fdc7d..e491ab5 100644 --- a/src/main/java/com/wehotel/controller/req/BaseManagerConfigReq.java +++ b/src/main/java/we/controller/req/BaseManagerConfigReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.controller.req; +package we.controller.req; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/src/main/java/com/wehotel/controller/req/GetConfigReq.java b/src/main/java/we/controller/req/GetConfigReq.java similarity index 98% rename from src/main/java/com/wehotel/controller/req/GetConfigReq.java rename to src/main/java/we/controller/req/GetConfigReq.java index 51844ea..cc364c6 100644 --- a/src/main/java/com/wehotel/controller/req/GetConfigReq.java +++ b/src/main/java/we/controller/req/GetConfigReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.controller.req; +package we.controller.req; import org.springframework.util.DigestUtils; diff --git a/src/main/java/com/wehotel/controller/req/GetConfigStrReq.java b/src/main/java/we/controller/req/GetConfigStrReq.java similarity index 98% rename from src/main/java/com/wehotel/controller/req/GetConfigStrReq.java rename to src/main/java/we/controller/req/GetConfigStrReq.java index abb6aee..a25d795 100644 --- a/src/main/java/com/wehotel/controller/req/GetConfigStrReq.java +++ b/src/main/java/we/controller/req/GetConfigStrReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.controller.req; +package we.controller.req; import org.springframework.util.DigestUtils; diff --git a/src/main/java/com/wehotel/controller/resp/ConfigResp.java b/src/main/java/we/controller/resp/ConfigResp.java similarity index 95% rename from src/main/java/com/wehotel/controller/resp/ConfigResp.java rename to src/main/java/we/controller/resp/ConfigResp.java index f49a254..49d5a84 100644 --- a/src/main/java/com/wehotel/controller/resp/ConfigResp.java +++ b/src/main/java/we/controller/resp/ConfigResp.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.wehotel.controller.resp; +package we.controller.resp; -import com.wehotel.fizz.ConfigLoader; +import we.fizz.ConfigLoader; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/wehotel/controller/resp/ConfigStrResp.java b/src/main/java/we/controller/resp/ConfigStrResp.java similarity index 97% rename from src/main/java/com/wehotel/controller/resp/ConfigStrResp.java rename to src/main/java/we/controller/resp/ConfigStrResp.java index a7f1409..f06e6fa 100644 --- a/src/main/java/com/wehotel/controller/resp/ConfigStrResp.java +++ b/src/main/java/we/controller/resp/ConfigStrResp.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.controller.resp; +package we.controller.resp; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/com/wehotel/exception/StopAndResponseException.java b/src/main/java/we/exception/StopAndResponseException.java similarity index 97% rename from src/main/java/com/wehotel/exception/StopAndResponseException.java rename to src/main/java/we/exception/StopAndResponseException.java index 7e057af..fc7c182 100644 --- a/src/main/java/com/wehotel/exception/StopAndResponseException.java +++ b/src/main/java/we/exception/StopAndResponseException.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.exception; +package we.exception; /** * @author unknown diff --git a/src/main/java/com/wehotel/filter/CorsFilterConfig.java b/src/main/java/we/filter/CorsFilterConfig.java similarity index 97% rename from src/main/java/com/wehotel/filter/CorsFilterConfig.java rename to src/main/java/we/filter/CorsFilterConfig.java index 6ba8433..ebf4e2b 100644 --- a/src/main/java/com/wehotel/filter/CorsFilterConfig.java +++ b/src/main/java/we/filter/CorsFilterConfig.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.config.SystemConfig; +import we.config.SystemConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/src/main/java/com/wehotel/filter/FilterExceptionHandlerConfig.java b/src/main/java/we/filter/FilterExceptionHandlerConfig.java similarity index 95% rename from src/main/java/com/wehotel/filter/FilterExceptionHandlerConfig.java rename to src/main/java/we/filter/FilterExceptionHandlerConfig.java index a623415..1bdca11 100644 --- a/src/main/java/com/wehotel/filter/FilterExceptionHandlerConfig.java +++ b/src/main/java/we/filter/FilterExceptionHandlerConfig.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.exception.StopAndResponseException; -import com.wehotel.util.WebUtils; +import we.exception.StopAndResponseException; +import we.util.WebUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; diff --git a/src/main/java/com/wehotel/filter/FilterResult.java b/src/main/java/we/filter/FilterResult.java similarity index 98% rename from src/main/java/com/wehotel/filter/FilterResult.java rename to src/main/java/we/filter/FilterResult.java index 48595ce..67a0a75 100644 --- a/src/main/java/com/wehotel/filter/FilterResult.java +++ b/src/main/java/we/filter/FilterResult.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; import java.util.Map; diff --git a/src/main/java/com/wehotel/filter/FizzGatewayFilter.java b/src/main/java/we/filter/FizzGatewayFilter.java similarity index 91% rename from src/main/java/com/wehotel/filter/FizzGatewayFilter.java rename to src/main/java/we/filter/FizzGatewayFilter.java index c45deb6..cec27a2 100644 --- a/src/main/java/com/wehotel/filter/FizzGatewayFilter.java +++ b/src/main/java/we/filter/FizzGatewayFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -38,16 +38,16 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; import com.alibaba.fastjson.JSON; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.constants.CommonConstants; -import com.wehotel.fizz.AggregateResource; -import com.wehotel.fizz.AggregateResult; -import com.wehotel.fizz.ConfigLoader; -import com.wehotel.fizz.Pipeline; -import com.wehotel.fizz.input.Input; -import com.wehotel.util.Constants; -import com.wehotel.util.MapUtil; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.constants.CommonConstants; +import we.fizz.AggregateResource; +import we.fizz.AggregateResult; +import we.fizz.ConfigLoader; +import we.fizz.Pipeline; +import we.fizz.input.Input; +import we.util.Constants; +import we.util.MapUtil; +import we.util.WebUtils; import io.netty.buffer.UnpooledByteBufAllocator; import reactor.core.publisher.Flux; diff --git a/src/main/java/com/wehotel/filter/FizzLogFilter.java b/src/main/java/we/filter/FizzLogFilter.java similarity index 94% rename from src/main/java/com/wehotel/filter/FizzLogFilter.java rename to src/main/java/we/filter/FizzLogFilter.java index f73975d..6653ba5 100644 --- a/src/main/java/com/wehotel/filter/FizzLogFilter.java +++ b/src/main/java/we/filter/FizzLogFilter.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/src/main/java/com/wehotel/filter/PreFilter.java b/src/main/java/we/filter/PreFilter.java similarity index 95% rename from src/main/java/com/wehotel/filter/PreFilter.java rename to src/main/java/we/filter/PreFilter.java index ca4cb93..01d2615 100644 --- a/src/main/java/com/wehotel/filter/PreFilter.java +++ b/src/main/java/we/filter/PreFilter.java @@ -15,17 +15,17 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.config.SystemConfig; -import com.wehotel.plugin.FixedPluginFilter; -import com.wehotel.plugin.PluginConfig; -import com.wehotel.plugin.PluginFilter; -import com.wehotel.plugin.auth.*; -import com.wehotel.plugin.stat.StatPluginFilter; -import com.wehotel.util.Constants; -import com.wehotel.util.ReactorUtils; -import com.wehotel.util.WebUtils; +import we.config.SystemConfig; +import we.plugin.FixedPluginFilter; +import we.plugin.PluginConfig; +import we.plugin.PluginFilter; +import we.plugin.auth.*; +import we.plugin.stat.StatPluginFilter; +import we.util.Constants; +import we.util.ReactorUtils; +import we.util.WebUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/wehotel/filter/ProxyAggrFilter.java b/src/main/java/we/filter/ProxyAggrFilter.java similarity index 95% rename from src/main/java/com/wehotel/filter/ProxyAggrFilter.java rename to src/main/java/we/filter/ProxyAggrFilter.java index 05a67a7..a7a90c1 100644 --- a/src/main/java/com/wehotel/filter/ProxyAggrFilter.java +++ b/src/main/java/we/filter/ProxyAggrFilter.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.util.WebUtils; +import we.util.WebUtils; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; diff --git a/src/main/java/com/wehotel/filter/RouteFilter.java b/src/main/java/we/filter/RouteFilter.java similarity index 96% rename from src/main/java/com/wehotel/filter/RouteFilter.java rename to src/main/java/we/filter/RouteFilter.java index c953446..7fe853e 100644 --- a/src/main/java/com/wehotel/filter/RouteFilter.java +++ b/src/main/java/we/filter/RouteFilter.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.wehotel.filter; +package we.filter; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.legacy.RespEntity; -import com.wehotel.proxy.FizzWebClient; -import com.wehotel.util.ThreadContext; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.legacy.RespEntity; +import we.proxy.FizzWebClient; +import we.util.ThreadContext; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; diff --git a/src/main/java/com/wehotel/fizz/AggregateResource.java b/src/main/java/we/fizz/AggregateResource.java similarity index 95% rename from src/main/java/com/wehotel/fizz/AggregateResource.java rename to src/main/java/we/fizz/AggregateResource.java index 84eb1b7..b3603f8 100644 --- a/src/main/java/com/wehotel/fizz/AggregateResource.java +++ b/src/main/java/we/fizz/AggregateResource.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; -import com.wehotel.fizz.input.Input; +import we.fizz.input.Input; /** * diff --git a/src/main/java/com/wehotel/fizz/AggregateResult.java b/src/main/java/we/fizz/AggregateResult.java similarity index 97% rename from src/main/java/com/wehotel/fizz/AggregateResult.java rename to src/main/java/we/fizz/AggregateResult.java index 368b107..3f8abaa 100644 --- a/src/main/java/com/wehotel/fizz/AggregateResult.java +++ b/src/main/java/we/fizz/AggregateResult.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/ConfigLoader.java b/src/main/java/we/fizz/ConfigLoader.java similarity index 97% rename from src/main/java/com/wehotel/fizz/ConfigLoader.java rename to src/main/java/we/fizz/ConfigLoader.java index 27b6194..df7146f 100644 --- a/src/main/java/com/wehotel/fizz/ConfigLoader.java +++ b/src/main/java/we/fizz/ConfigLoader.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.wehotel.config.AppConfigProperties; -import com.wehotel.fizz.input.ClientInputConfig; -import com.wehotel.fizz.input.Input; -import com.wehotel.fizz.input.InputType; +import we.config.AppConfigProperties; +import we.fizz.input.ClientInputConfig; +import we.fizz.input.Input; +import we.fizz.input.InputType; import org.apache.commons.io.FileUtils; import org.noear.snack.ONode; import org.springframework.beans.factory.annotation.Value; @@ -42,8 +42,8 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import static com.wehotel.listener.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE; -import static com.wehotel.util.Constants.Symbol.FORWARD_SLASH; +import static we.listener.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE; +import static we.util.Constants.Symbol.FORWARD_SLASH; /** * * @author francis diff --git a/src/main/java/com/wehotel/fizz/Pipeline.java b/src/main/java/we/fizz/Pipeline.java similarity index 96% rename from src/main/java/com/wehotel/fizz/Pipeline.java rename to src/main/java/we/fizz/Pipeline.java index 83bca9b..9b5d8ba 100644 --- a/src/main/java/com/wehotel/fizz/Pipeline.java +++ b/src/main/java/we/fizz/Pipeline.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import java.util.HashMap; import java.util.LinkedList; @@ -25,10 +25,10 @@ import java.util.Map; import javax.script.ScriptException; -import com.wehotel.fizz.input.ClientInputConfig; -import com.wehotel.fizz.input.InputConfig; -import com.wehotel.schema.util.I18nUtils; -import com.wehotel.util.JsonSchemaUtils; +import we.fizz.input.ClientInputConfig; +import we.fizz.input.InputConfig; +import we.schema.util.I18nUtils; +import we.util.JsonSchemaUtils; import org.noear.snack.ONode; import org.slf4j.Logger; @@ -37,11 +37,11 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSON; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.fizz.input.Input; -import com.wehotel.fizz.input.PathMapping; -import com.wehotel.fizz.input.ScriptHelper; -import com.wehotel.util.MapUtil; +import we.flume.clients.log4j2appender.LogService; +import we.fizz.input.Input; +import we.fizz.input.PathMapping; +import we.fizz.input.ScriptHelper; +import we.util.MapUtil; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/fizz/Step.java b/src/main/java/we/fizz/Step.java similarity index 94% rename from src/main/java/com/wehotel/fizz/Step.java rename to src/main/java/we/fizz/Step.java index 1135950..9a44f41 100644 --- a/src/main/java/com/wehotel/fizz/Step.java +++ b/src/main/java/we/fizz/Step.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import java.util.ArrayList; import java.util.HashMap; @@ -30,11 +30,11 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.WebClient; import com.alibaba.fastjson.JSON; -import com.wehotel.fizz.input.Input; -import com.wehotel.fizz.input.InputConfig; -import com.wehotel.fizz.input.InputContext; -import com.wehotel.fizz.input.InputFactory; -import com.wehotel.fizz.input.InputType; +import we.fizz.input.Input; +import we.fizz.input.InputConfig; +import we.fizz.input.InputContext; +import we.fizz.input.InputFactory; +import we.fizz.input.InputType; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/fizz/StepContext.java b/src/main/java/we/fizz/StepContext.java similarity index 99% rename from src/main/java/com/wehotel/fizz/StepContext.java rename to src/main/java/we/fizz/StepContext.java index 160bb9e..342ad0c 100644 --- a/src/main/java/com/wehotel/fizz/StepContext.java +++ b/src/main/java/we/fizz/StepContext.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import java.util.ArrayList; import java.util.HashMap; @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.wehotel.constants.CommonConstants; +import we.constants.CommonConstants; /** * diff --git a/src/main/java/com/wehotel/fizz/StepResponse.java b/src/main/java/we/fizz/StepResponse.java similarity index 98% rename from src/main/java/com/wehotel/fizz/StepResponse.java rename to src/main/java/we/fizz/StepResponse.java index 5da80a0..70e2230 100644 --- a/src/main/java/com/wehotel/fizz/StepResponse.java +++ b/src/main/java/we/fizz/StepResponse.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz; +package we.fizz; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/input/ClientInputConfig.java b/src/main/java/we/fizz/input/ClientInputConfig.java similarity index 99% rename from src/main/java/com/wehotel/fizz/input/ClientInputConfig.java rename to src/main/java/we/fizz/input/ClientInputConfig.java index cc96dfa..68f5b87 100644 --- a/src/main/java/com/wehotel/fizz/input/ClientInputConfig.java +++ b/src/main/java/we/fizz/input/ClientInputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/input/Input.java b/src/main/java/we/fizz/input/Input.java similarity index 94% rename from src/main/java/com/wehotel/fizz/input/Input.java rename to src/main/java/we/fizz/input/Input.java index 0e9c625..9cd571c 100644 --- a/src/main/java/com/wehotel/fizz/input/Input.java +++ b/src/main/java/we/fizz/input/Input.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.HashMap; import java.util.Map; -import com.wehotel.fizz.StepContext; -import com.wehotel.fizz.StepResponse; +import we.fizz.StepContext; +import we.fizz.StepResponse; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/fizz/input/InputConfig.java b/src/main/java/we/fizz/input/InputConfig.java similarity index 97% rename from src/main/java/com/wehotel/fizz/input/InputConfig.java rename to src/main/java/we/fizz/input/InputConfig.java index 2994f07..897efee 100644 --- a/src/main/java/com/wehotel/fizz/input/InputConfig.java +++ b/src/main/java/we/fizz/input/InputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/input/InputContext.java b/src/main/java/we/fizz/input/InputContext.java similarity index 94% rename from src/main/java/com/wehotel/fizz/input/InputContext.java rename to src/main/java/we/fizz/input/InputContext.java index d3a8e2b..58bfb0a 100644 --- a/src/main/java/com/wehotel/fizz/input/InputContext.java +++ b/src/main/java/we/fizz/input/InputContext.java @@ -16,13 +16,13 @@ */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.HashMap; import java.util.Map; -import com.wehotel.fizz.StepContext; -import com.wehotel.fizz.StepResponse; +import we.fizz.StepContext; +import we.fizz.StepResponse; /** * diff --git a/src/main/java/com/wehotel/fizz/input/InputFactory.java b/src/main/java/we/fizz/input/InputFactory.java similarity index 98% rename from src/main/java/com/wehotel/fizz/input/InputFactory.java rename to src/main/java/we/fizz/input/InputFactory.java index 3eced67..733a6ca 100644 --- a/src/main/java/com/wehotel/fizz/input/InputFactory.java +++ b/src/main/java/we/fizz/input/InputFactory.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/input/InputType.java b/src/main/java/we/fizz/input/InputType.java similarity index 96% rename from src/main/java/com/wehotel/fizz/input/InputType.java rename to src/main/java/we/fizz/input/InputType.java index 302483e..752e8fe 100644 --- a/src/main/java/com/wehotel/fizz/input/InputType.java +++ b/src/main/java/we/fizz/input/InputType.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; /** * diff --git a/src/main/java/com/wehotel/fizz/input/MySQLInput.java b/src/main/java/we/fizz/input/MySQLInput.java similarity index 96% rename from src/main/java/com/wehotel/fizz/input/MySQLInput.java rename to src/main/java/we/fizz/input/MySQLInput.java index 2aae698..f482d0c 100644 --- a/src/main/java/com/wehotel/fizz/input/MySQLInput.java +++ b/src/main/java/we/fizz/input/MySQLInput.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; /** * diff --git a/src/main/java/com/wehotel/fizz/input/MySQLInputConfig.java b/src/main/java/we/fizz/input/MySQLInputConfig.java similarity index 96% rename from src/main/java/com/wehotel/fizz/input/MySQLInputConfig.java rename to src/main/java/we/fizz/input/MySQLInputConfig.java index 471d6db..2ba2319 100644 --- a/src/main/java/com/wehotel/fizz/input/MySQLInputConfig.java +++ b/src/main/java/we/fizz/input/MySQLInputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.Map; diff --git a/src/main/java/com/wehotel/fizz/input/PathMapping.java b/src/main/java/we/fizz/input/PathMapping.java similarity index 98% rename from src/main/java/com/wehotel/fizz/input/PathMapping.java rename to src/main/java/we/fizz/input/PathMapping.java index 3c6c834..8449d3e 100644 --- a/src/main/java/com/wehotel/fizz/input/PathMapping.java +++ b/src/main/java/we/fizz/input/PathMapping.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.Arrays; import java.util.Collection; @@ -28,8 +28,8 @@ import java.util.stream.Collectors; import org.noear.snack.ONode; import org.springframework.util.CollectionUtils; -import com.wehotel.constants.CommonConstants; -import com.wehotel.fizz.StepContext; +import we.constants.CommonConstants; +import we.fizz.StepContext; /** * diff --git a/src/main/java/com/wehotel/fizz/input/RequestInput.java b/src/main/java/we/fizz/input/RequestInput.java similarity index 97% rename from src/main/java/com/wehotel/fizz/input/RequestInput.java rename to src/main/java/we/fizz/input/RequestInput.java index 30651b0..e5ebe79 100644 --- a/src/main/java/com/wehotel/fizz/input/RequestInput.java +++ b/src/main/java/we/fizz/input/RequestInput.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.HashMap; import java.util.Map; @@ -34,13 +34,13 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; import com.alibaba.fastjson.JSON; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.FizzGatewayApplication; -import com.wehotel.constants.CommonConstants; -import com.wehotel.fizz.StepContext; -import com.wehotel.fizz.StepResponse; -import com.wehotel.proxy.FizzWebClient; -import com.wehotel.util.MapUtil; +import we.flume.clients.log4j2appender.LogService; +import we.FizzGatewayApplication; +import we.constants.CommonConstants; +import we.fizz.StepContext; +import we.fizz.StepResponse; +import we.proxy.FizzWebClient; +import we.util.MapUtil; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/fizz/input/RequestInputConfig.java b/src/main/java/we/fizz/input/RequestInputConfig.java similarity index 98% rename from src/main/java/com/wehotel/fizz/input/RequestInputConfig.java rename to src/main/java/we/fizz/input/RequestInputConfig.java index 978d656..a473599 100644 --- a/src/main/java/com/wehotel/fizz/input/RequestInputConfig.java +++ b/src/main/java/we/fizz/input/RequestInputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/com/wehotel/fizz/input/ScriptHelper.java b/src/main/java/we/fizz/input/ScriptHelper.java similarity index 95% rename from src/main/java/com/wehotel/fizz/input/ScriptHelper.java rename to src/main/java/we/fizz/input/ScriptHelper.java index 249d607..15e42cb 100644 --- a/src/main/java/com/wehotel/fizz/input/ScriptHelper.java +++ b/src/main/java/we/fizz/input/ScriptHelper.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.fizz.input; +package we.fizz.input; import java.util.Collection; import java.util.HashMap; @@ -30,11 +30,11 @@ import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSON; import com.ctrip.framework.apollo.core.utils.StringUtils; -import com.wehotel.constants.CommonConstants; -import com.wehotel.exception.StopAndResponseException; -import com.wehotel.fizz.StepContext; -import com.wehotel.util.Script; -import com.wehotel.util.ScriptUtils; +import we.constants.CommonConstants; +import we.exception.StopAndResponseException; +import we.fizz.StepContext; +import we.util.Script; +import we.util.ScriptUtils; /** * diff --git a/src/main/java/com/wehotel/flume/clients/log4j2appender/LogService.java b/src/main/java/we/flume/clients/log4j2appender/LogService.java similarity index 94% rename from src/main/java/com/wehotel/flume/clients/log4j2appender/LogService.java rename to src/main/java/we/flume/clients/log4j2appender/LogService.java index cee9dec..0aaf5cf 100644 --- a/src/main/java/com/wehotel/flume/clients/log4j2appender/LogService.java +++ b/src/main/java/we/flume/clients/log4j2appender/LogService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.flume.clients.log4j2appender; +package we.flume.clients.log4j2appender; /** * @author lancer diff --git a/src/main/java/com/wehotel/legacy/RespEntity.java b/src/main/java/we/legacy/RespEntity.java similarity index 94% rename from src/main/java/com/wehotel/legacy/RespEntity.java rename to src/main/java/we/legacy/RespEntity.java index 14833df..b3a656d 100644 --- a/src/main/java/com/wehotel/legacy/RespEntity.java +++ b/src/main/java/we/legacy/RespEntity.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.legacy; +package we.legacy; -import com.wehotel.util.Constants; -import com.wehotel.util.ThreadContext; +import we.util.Constants; +import we.util.ThreadContext; import org.springframework.lang.Nullable; /** diff --git a/src/main/java/com/wehotel/listener/AggregateChannelListener.java b/src/main/java/we/listener/AggregateChannelListener.java similarity index 97% rename from src/main/java/com/wehotel/listener/AggregateChannelListener.java rename to src/main/java/we/listener/AggregateChannelListener.java index a3338b0..24374d9 100644 --- a/src/main/java/com/wehotel/listener/AggregateChannelListener.java +++ b/src/main/java/we/listener/AggregateChannelListener.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.wehotel.listener; +package we.listener; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.wehotel.fizz.ConfigLoader; +import we.fizz.ConfigLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -37,7 +37,7 @@ import javax.annotation.PreDestroy; import java.net.InetAddress; import java.util.List; -import static com.wehotel.listener.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_MESSAGE_LISTENER_CONTAINER; +import static we.listener.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_MESSAGE_LISTENER_CONTAINER; /** * 聚合Channel监听器 diff --git a/src/main/java/com/wehotel/listener/AggregateRedisConfig.java b/src/main/java/we/listener/AggregateRedisConfig.java similarity index 95% rename from src/main/java/com/wehotel/listener/AggregateRedisConfig.java rename to src/main/java/we/listener/AggregateRedisConfig.java index 83a69ea..252025d 100644 --- a/src/main/java/com/wehotel/listener/AggregateRedisConfig.java +++ b/src/main/java/we/listener/AggregateRedisConfig.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.wehotel.listener; +package we.listener; -import com.wehotel.config.RedisReactiveConfig; -import com.wehotel.config.RedisReactiveProperties; +import we.config.RedisReactiveConfig; +import we.config.RedisReactiveProperties; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/wehotel/plugin/FixedPluginFilter.java b/src/main/java/we/plugin/FixedPluginFilter.java similarity index 98% rename from src/main/java/com/wehotel/plugin/FixedPluginFilter.java rename to src/main/java/we/plugin/FixedPluginFilter.java index f54275f..d56c5ff 100644 --- a/src/main/java/com/wehotel/plugin/FixedPluginFilter.java +++ b/src/main/java/we/plugin/FixedPluginFilter.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin; +package we.plugin; -import com.wehotel.FizzGatewayApplication; +import we.FizzGatewayApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/wehotel/plugin/PluginConfig.java b/src/main/java/we/plugin/PluginConfig.java similarity index 95% rename from src/main/java/com/wehotel/plugin/PluginConfig.java rename to src/main/java/we/plugin/PluginConfig.java index 402f9c3..1fcd1fa 100644 --- a/src/main/java/com/wehotel/plugin/PluginConfig.java +++ b/src/main/java/we/plugin/PluginConfig.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin; +package we.plugin; import com.fasterxml.jackson.core.JsonProcessingException; -import com.wehotel.util.JacksonUtils; +import we.util.JacksonUtils; import org.apache.commons.lang3.StringUtils; import java.util.Collections; diff --git a/src/main/java/com/wehotel/plugin/PluginFilter.java b/src/main/java/we/plugin/PluginFilter.java similarity index 92% rename from src/main/java/com/wehotel/plugin/PluginFilter.java rename to src/main/java/we/plugin/PluginFilter.java index 1d962e2..41edf4a 100644 --- a/src/main/java/com/wehotel/plugin/PluginFilter.java +++ b/src/main/java/we/plugin/PluginFilter.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin; +package we.plugin; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.filter.FilterResult; -import com.wehotel.legacy.RespEntity; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.filter.FilterResult; +import we.legacy.RespEntity; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/wehotel/plugin/auth/ApiConfig.java b/src/main/java/we/plugin/auth/ApiConfig.java similarity index 94% rename from src/main/java/com/wehotel/plugin/auth/ApiConfig.java rename to src/main/java/we/plugin/auth/ApiConfig.java index ce34b95..03ea86f 100644 --- a/src/main/java/com/wehotel/plugin/auth/ApiConfig.java +++ b/src/main/java/we/plugin/auth/ApiConfig.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; -import com.wehotel.plugin.PluginConfig; -import com.wehotel.util.Constants; -import com.wehotel.util.JacksonUtils; +import we.plugin.PluginConfig; +import we.util.Constants; +import we.util.JacksonUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpMethod; diff --git a/src/main/java/com/wehotel/plugin/auth/ApiConfigService.java b/src/main/java/we/plugin/auth/ApiConfigService.java similarity index 98% rename from src/main/java/com/wehotel/plugin/auth/ApiConfigService.java rename to src/main/java/we/plugin/auth/ApiConfigService.java index c14f860..83c5dc9 100644 --- a/src/main/java/com/wehotel/plugin/auth/ApiConfigService.java +++ b/src/main/java/we/plugin/auth/ApiConfigService.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.config.SystemConfig; -import com.wehotel.listener.AggregateRedisConfig; -import com.wehotel.util.*; +import we.flume.clients.log4j2appender.LogService; +import we.config.SystemConfig; +import we.listener.AggregateRedisConfig; +import we.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/wehotel/plugin/auth/App.java b/src/main/java/we/plugin/auth/App.java similarity index 97% rename from src/main/java/com/wehotel/plugin/auth/App.java rename to src/main/java/we/plugin/auth/App.java index 249650c..beaffc5 100644 --- a/src/main/java/com/wehotel/plugin/auth/App.java +++ b/src/main/java/we/plugin/auth/App.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; -import com.wehotel.util.JacksonUtils; +import we.util.JacksonUtils; import org.apache.commons.lang3.StringUtils; import java.util.Arrays; diff --git a/src/main/java/com/wehotel/plugin/auth/AppService.java b/src/main/java/we/plugin/auth/AppService.java similarity index 95% rename from src/main/java/com/wehotel/plugin/auth/AppService.java rename to src/main/java/we/plugin/auth/AppService.java index 4e3ca8e..06d4be0 100644 --- a/src/main/java/com/wehotel/plugin/auth/AppService.java +++ b/src/main/java/we/plugin/auth/AppService.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.listener.AggregateRedisConfig; -import com.wehotel.util.Constants; -import com.wehotel.util.JacksonUtils; -import com.wehotel.util.ReactorUtils; +import we.flume.clients.log4j2appender.LogService; +import we.listener.AggregateRedisConfig; +import we.util.Constants; +import we.util.JacksonUtils; +import we.util.ReactorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; diff --git a/src/main/java/com/wehotel/plugin/auth/AuthPluginFilter.java b/src/main/java/we/plugin/auth/AuthPluginFilter.java similarity index 92% rename from src/main/java/com/wehotel/plugin/auth/AuthPluginFilter.java rename to src/main/java/we/plugin/auth/AuthPluginFilter.java index d37354e..8dad4b3 100644 --- a/src/main/java/com/wehotel/plugin/auth/AuthPluginFilter.java +++ b/src/main/java/we/plugin/auth/AuthPluginFilter.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.plugin.PluginFilter; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.plugin.PluginFilter; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/wehotel/plugin/auth/CustomAuth.java b/src/main/java/we/plugin/auth/CustomAuth.java similarity index 97% rename from src/main/java/com/wehotel/plugin/auth/CustomAuth.java rename to src/main/java/we/plugin/auth/CustomAuth.java index c6400dc..9987724 100644 --- a/src/main/java/com/wehotel/plugin/auth/CustomAuth.java +++ b/src/main/java/we/plugin/auth/CustomAuth.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/plugin/auth/GatewayGroup.java b/src/main/java/we/plugin/auth/GatewayGroup.java similarity index 98% rename from src/main/java/com/wehotel/plugin/auth/GatewayGroup.java rename to src/main/java/we/plugin/auth/GatewayGroup.java index 9eab921..a632e75 100644 --- a/src/main/java/com/wehotel/plugin/auth/GatewayGroup.java +++ b/src/main/java/we/plugin/auth/GatewayGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; import com.fasterxml.jackson.annotation.JsonIgnore; import org.slf4j.Logger; diff --git a/src/main/java/com/wehotel/plugin/auth/ServiceConfig.java b/src/main/java/we/plugin/auth/ServiceConfig.java similarity index 98% rename from src/main/java/com/wehotel/plugin/auth/ServiceConfig.java rename to src/main/java/we/plugin/auth/ServiceConfig.java index c36d3a4..6979b78 100644 --- a/src/main/java/com/wehotel/plugin/auth/ServiceConfig.java +++ b/src/main/java/we/plugin/auth/ServiceConfig.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.auth; +package we.plugin.auth; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.wehotel.util.Constants; +import we.util.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpMethod; diff --git a/src/main/java/com/wehotel/plugin/stat/StatPluginFilter.java b/src/main/java/we/plugin/stat/StatPluginFilter.java similarity index 94% rename from src/main/java/com/wehotel/plugin/stat/StatPluginFilter.java rename to src/main/java/we/plugin/stat/StatPluginFilter.java index 2c1e297..24bca24 100644 --- a/src/main/java/com/wehotel/plugin/stat/StatPluginFilter.java +++ b/src/main/java/we/plugin/stat/StatPluginFilter.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.plugin.stat; +package we.plugin.stat; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.plugin.PluginFilter; -import com.wehotel.util.Constants; -import com.wehotel.util.ThreadContext; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.plugin.PluginFilter; +import we.util.Constants; +import we.util.ThreadContext; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/wehotel/proxy/CallBackendConfig.java b/src/main/java/we/proxy/CallBackendConfig.java similarity index 97% rename from src/main/java/com/wehotel/proxy/CallBackendConfig.java rename to src/main/java/we/proxy/CallBackendConfig.java index ae929dd..7d61112 100644 --- a/src/main/java/com/wehotel/proxy/CallBackendConfig.java +++ b/src/main/java/we/proxy/CallBackendConfig.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.proxy; +package we.proxy; /** * @author lancer diff --git a/src/main/java/com/wehotel/proxy/FizzWebClient.java b/src/main/java/we/proxy/FizzWebClient.java similarity index 97% rename from src/main/java/com/wehotel/proxy/FizzWebClient.java rename to src/main/java/we/proxy/FizzWebClient.java index dd6161d..348385e 100644 --- a/src/main/java/com/wehotel/proxy/FizzWebClient.java +++ b/src/main/java/we/proxy/FizzWebClient.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.proxy; +package we.proxy; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.EurekaClient; import com.netflix.discovery.shared.Applications; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.config.AggrWebClientConfig; -import com.wehotel.config.ProxyWebClientConfig; -import com.wehotel.util.Constants; -import com.wehotel.util.ThreadContext; -import com.wehotel.util.WebUtils; +import we.flume.clients.log4j2appender.LogService; +import we.config.AggrWebClientConfig; +import we.config.ProxyWebClientConfig; +import we.util.Constants; +import we.util.ThreadContext; +import we.util.WebUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/wehotel/proxy/package-info.java b/src/main/java/we/proxy/package-info.java similarity index 95% rename from src/main/java/com/wehotel/proxy/package-info.java rename to src/main/java/we/proxy/package-info.java index 9f91315..88bcdd4 100644 --- a/src/main/java/com/wehotel/proxy/package-info.java +++ b/src/main/java/we/proxy/package-info.java @@ -18,7 +18,7 @@ * @author lancer * * 设想的包结构： - * com.wehotel.fizz + * we.fizz * .config * .filter * .util @@ -27,4 +27,4 @@ * .route 路由逻辑 * .legacy */ -package com.wehotel.proxy; +package we.proxy; diff --git a/src/main/java/com/wehotel/util/Constants.java b/src/main/java/we/util/Constants.java similarity index 99% rename from src/main/java/com/wehotel/util/Constants.java rename to src/main/java/we/util/Constants.java index d2bbb0c..3152b26 100644 --- a/src/main/java/com/wehotel/util/Constants.java +++ b/src/main/java/we/util/Constants.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import org.apache.commons.lang3.SystemUtils; diff --git a/src/main/java/com/wehotel/util/DateTimeUtils.java b/src/main/java/we/util/DateTimeUtils.java similarity index 98% rename from src/main/java/com/wehotel/util/DateTimeUtils.java rename to src/main/java/we/util/DateTimeUtils.java index f7c6ece..2b2a20d 100644 --- a/src/main/java/com/wehotel/util/DateTimeUtils.java +++ b/src/main/java/we/util/DateTimeUtils.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; -import com.wehotel.util.Constants.DatetimePattern; +import we.util.Constants.DatetimePattern; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/wehotel/util/DigestUtils.java b/src/main/java/we/util/DigestUtils.java similarity index 98% rename from src/main/java/com/wehotel/util/DigestUtils.java rename to src/main/java/we/util/DigestUtils.java index 11c15ba..0f89972 100644 --- a/src/main/java/com/wehotel/util/DigestUtils.java +++ b/src/main/java/we/util/DigestUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/com/wehotel/util/JacksonUtils.java b/src/main/java/we/util/JacksonUtils.java similarity index 98% rename from src/main/java/com/wehotel/util/JacksonUtils.java rename to src/main/java/we/util/JacksonUtils.java index 2f59649..c4dce6d 100644 --- a/src/main/java/com/wehotel/util/JacksonUtils.java +++ b/src/main/java/we/util/JacksonUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonFactory; @@ -23,8 +23,8 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.wehotel.plugin.auth.ApiConfig; -import com.wehotel.util.Constants.DatetimePattern; +import we.plugin.auth.ApiConfig; +import we.util.Constants.DatetimePattern; import java.io.IOException; import java.time.LocalDate; diff --git a/src/main/java/com/wehotel/util/JsonSchemaUtils.java b/src/main/java/we/util/JsonSchemaUtils.java similarity index 99% rename from src/main/java/com/wehotel/util/JsonSchemaUtils.java rename to src/main/java/we/util/JsonSchemaUtils.java index 21b984f..92852ce 100644 --- a/src/main/java/com/wehotel/util/JsonSchemaUtils.java +++ b/src/main/java/we/util/JsonSchemaUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/wehotel/util/MapUtil.java b/src/main/java/we/util/MapUtil.java similarity index 99% rename from src/main/java/com/wehotel/util/MapUtil.java rename to src/main/java/we/util/MapUtil.java index b650e52..913a130 100644 --- a/src/main/java/com/wehotel/util/MapUtil.java +++ b/src/main/java/we/util/MapUtil.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/wehotel/util/NetworkUtils.java b/src/main/java/we/util/NetworkUtils.java similarity index 99% rename from src/main/java/com/wehotel/util/NetworkUtils.java rename to src/main/java/we/util/NetworkUtils.java index f8456d4..5d8d503 100644 --- a/src/main/java/com/wehotel/util/NetworkUtils.java +++ b/src/main/java/we/util/NetworkUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/wehotel/util/ReactorUtils.java b/src/main/java/we/util/ReactorUtils.java similarity index 97% rename from src/main/java/com/wehotel/util/ReactorUtils.java rename to src/main/java/we/util/ReactorUtils.java index 048040d..58f5700 100644 --- a/src/main/java/com/wehotel/util/ReactorUtils.java +++ b/src/main/java/we/util/ReactorUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import reactor.core.publisher.Mono; diff --git a/src/main/java/com/wehotel/util/Script.java b/src/main/java/we/util/Script.java similarity index 97% rename from src/main/java/com/wehotel/util/Script.java rename to src/main/java/we/util/Script.java index 270528a..ceede2f 100644 --- a/src/main/java/com/wehotel/util/Script.java +++ b/src/main/java/we/util/Script.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; /** * @author lancer diff --git a/src/main/java/com/wehotel/util/ScriptUtils.java b/src/main/java/we/util/ScriptUtils.java similarity index 99% rename from src/main/java/com/wehotel/util/ScriptUtils.java rename to src/main/java/we/util/ScriptUtils.java index 4c59b57..b00afd7 100644 --- a/src/main/java/com/wehotel/util/ScriptUtils.java +++ b/src/main/java/we/util/ScriptUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/wehotel/util/ThreadContext.java b/src/main/java/we/util/ThreadContext.java similarity index 99% rename from src/main/java/com/wehotel/util/ThreadContext.java rename to src/main/java/we/util/ThreadContext.java index 47613e9..ffb53ec 100644 --- a/src/main/java/com/wehotel/util/ThreadContext.java +++ b/src/main/java/we/util/ThreadContext.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import java.text.SimpleDateFormat; import java.util.HashMap; diff --git a/src/main/java/com/wehotel/util/Utils.java b/src/main/java/we/util/Utils.java similarity index 99% rename from src/main/java/com/wehotel/util/Utils.java rename to src/main/java/we/util/Utils.java index ae8e2ed..71d7438 100644 --- a/src/main/java/com/wehotel/util/Utils.java +++ b/src/main/java/we/util/Utils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/wehotel/util/WebUtils.java b/src/main/java/we/util/WebUtils.java similarity index 98% rename from src/main/java/com/wehotel/util/WebUtils.java rename to src/main/java/we/util/WebUtils.java index f10946b..f09b2f7 100644 --- a/src/main/java/com/wehotel/util/WebUtils.java +++ b/src/main/java/we/util/WebUtils.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.wehotel.util; +package we.util; -import com.wehotel.flume.clients.log4j2appender.LogService; -import com.wehotel.filter.FilterResult; -import com.wehotel.legacy.RespEntity; +import we.flume.clients.log4j2appender.LogService; +import we.filter.FilterResult; +import we.legacy.RespEntity; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/wehotel/FizzGatewayApplicationTests.java b/src/test/java/we/FizzGatewayApplicationTests.java similarity index 84% rename from src/test/java/com/wehotel/FizzGatewayApplicationTests.java rename to src/test/java/we/FizzGatewayApplicationTests.java index 60f30cd..a9d103c 100644 --- a/src/test/java/com/wehotel/FizzGatewayApplicationTests.java +++ b/src/test/java/we/FizzGatewayApplicationTests.java @@ -1,4 +1,4 @@ -package com.wehotel; +package we; import org.junit.jupiter.api.Test;