diff --git a/README.en-us.md b/README.en-us.md index 777e257..f2bcb7e 100644 --- a/README.en-us.md +++ b/README.en-us.md @@ -4,7 +4,7 @@ English | [简体中文](./README.md)

- Version + Version Documentation @@ -128,6 +128,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer | v2.6.5 | v2.6.5 | | v2.6.6 | v2.6.6 | | v2.7.0 | v2.7.0 | +| v2.7.1 | v2.7.1 | Please download the corresponding management backend version according to the version of the community version @@ -242,7 +243,7 @@ docker run --rm -d -p 8600:8600 \ -v $PWD/logs:/opt/fizz-gateway-community/logs fizzgate/fizz-gateway-community:{version} ``` -Finally visit the gateway, the address format is: http://127.0.0.1:8600/proxy/[Service name]/[API Path] +Finally visit the gateway, the address format is: http://127.0.0.1:8600/[Service name]/[API Path] ## Official technical exchange group diff --git a/README.md b/README.md index 95794a2..422432f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Version + Version Documentation @@ -130,6 +130,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path] | v2.6.5 | v2.6.5 | | v2.6.6 | v2.6.6 | | v2.7.0 | v2.7.0 | +| v2.7.1 | v2.7.1 | 请根据社区版的版本下载对应的管理后台版本 @@ -243,7 +244,7 @@ docker run --rm -d -p 8600:8600 \ -v $PWD/logs:/opt/fizz-gateway-community/logs fizzgate/fizz-gateway-community:{version} ``` -最后访问网关，地址形式为：http://127.0.0.1:8600/proxy/[服务名]/[API_Path] +最后访问网关，地址形式为：http://127.0.0.1:8600/[服务名]/[API_Path] ## 官方技术交流群 diff --git a/docker-compose.yml b/docker-compose.yml index 0c999fc..77d39ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.6" services: fizz-mysql: - image: "fizzgate/fizz-mysql:2.7.0" + image: "fizzgate/fizz-mysql:2.7.1" container_name: fizz-mysql restart: always hostname: fizz-mysql @@ -27,7 +27,7 @@ services: - fizz fizz-gateway-community: - image: "fizzgate/fizz-gateway-community:2.7.0" + image: "fizzgate/fizz-gateway-community:2.7.1" container_name: fizz-gateway-community restart: always hostname: fizz-gateway-community @@ -48,7 +48,7 @@ services: - fizz fizz-manager-professional: - image: "fizzgate/fizz-manager-professional:2.7.0" + image: "fizzgate/fizz-manager-professional:2.7.1" container_name: fizz-manager-professional restart: always hostname: fizz-manager-professional diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 761cb3a..40c2cd6 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -6,7 +6,7 @@ fizz-gateway-community com.fizzgate - 2.7.0 + 2.7.1 ../pom.xml @@ -18,12 +18,12 @@ Dragonfruit-SR3 Dysprosium-SR25 5.3.7.RELEASE - 4.1.82.Final - 4.4.15 + 4.1.89.Final + 4.4.16 2.17.2 1.7.36 3.12.0 - 1.18.24 + 1.18.26 2.7.7 1.16.1 3.4.6 @@ -32,9 +32,9 @@ 1.15 2.11.1 2.8.9 - 2.0.54.Final + 2.0.58.Final 2.2.9.RELEASE - 1.31 + 1.33 Moore-SR13--> @@ -60,7 +60,7 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_5 + 1.0.39_6 diff --git a/fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java b/fizz-bootstrap/src/main/java/com/fizzgate/FizzBootstrapApplication.java similarity index 98% rename from fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java rename to fizz-bootstrap/src/main/java/com/fizzgate/FizzBootstrapApplication.java index 74ed6e7..3eb0b3e 100644 --- a/fizz-bootstrap/src/main/java/we/FizzBootstrapApplication.java +++ b/fizz-bootstrap/src/main/java/com/fizzgate/FizzBootstrapApplication.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we; +package com.fizzgate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,9 +83,12 @@ import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfigurati import org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration; import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import we.config.AggregateRedisConfig; -import we.log.LogSendAppender; -import we.util.FileUtils; + +import com.fizzgate.Fizz; +import com.fizzgate.FizzAppContext; +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.log.LogSendAppender; +import com.fizzgate.util.FileUtils; /** * fizz gateway application boot entrance diff --git a/fizz-bootstrap/src/main/resources/application.yml b/fizz-bootstrap/src/main/resources/application.yml index 586ac8c..9bd105e 100644 --- a/fizz-bootstrap/src/main/resources/application.yml +++ b/fizz-bootstrap/src/main/resources/application.yml @@ -125,6 +125,11 @@ fizz: fast-fail-when-registry-center-down: false + web-client: + x-forwarded-for: + enable: true # default + append-gateway-ip: true # default + # dedicated-line: # server: # enable: true diff --git a/fizz-bootstrap/src/main/resources/log4j2-spring.xml b/fizz-bootstrap/src/main/resources/log4j2-spring.xml index a6a93bf..b6ea1fd 100644 --- a/fizz-bootstrap/src/main/resources/log4j2-spring.xml +++ b/fizz-bootstrap/src/main/resources/log4j2-spring.xml @@ -29,7 +29,7 @@ - + diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 27ff035..9953932 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.7.0 + 2.7.1 ../pom.xml 4.0.0 @@ -44,7 +44,7 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_5 + 1.0.39_6 @@ -163,7 +163,7 @@ com.networknt - we.repackaged.com.networknt + com.fizzgate.repackaged.com.networknt diff --git a/fizz-common/src/main/java/we/config/RedisReactiveConfig.java b/fizz-common/src/main/java/com/fizzgate/config/RedisReactiveConfig.java similarity index 99% rename from fizz-common/src/main/java/we/config/RedisReactiveConfig.java rename to fizz-common/src/main/java/com/fizzgate/config/RedisReactiveConfig.java index 854a559..cdfd84b 100644 --- a/fizz-common/src/main/java/we/config/RedisReactiveConfig.java +++ b/fizz-common/src/main/java/com/fizzgate/config/RedisReactiveConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import io.lettuce.core.ClientOptions; import io.lettuce.core.ReadFrom; diff --git a/fizz-common/src/main/java/we/config/RedisReactiveProperties.java b/fizz-common/src/main/java/com/fizzgate/config/RedisReactiveProperties.java similarity index 98% rename from fizz-common/src/main/java/we/config/RedisReactiveProperties.java rename to fizz-common/src/main/java/com/fizzgate/config/RedisReactiveProperties.java index a227aa2..c6aee0f 100644 --- a/fizz-common/src/main/java/we/config/RedisReactiveProperties.java +++ b/fizz-common/src/main/java/com/fizzgate/config/RedisReactiveProperties.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import io.lettuce.core.ReadFrom; import org.springframework.data.redis.connection.RedisNode; -import we.util.Consts; -import we.util.StringUtils; -import we.util.Utils; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.StringUtils; +import com.fizzgate.util.Utils; import java.time.Duration; import java.util.ArrayList; diff --git a/fizz-common/src/main/java/we/config/SchedConfig.java b/fizz-common/src/main/java/com/fizzgate/config/SchedConfig.java similarity index 98% rename from fizz-common/src/main/java/we/config/SchedConfig.java rename to fizz-common/src/main/java/com/fizzgate/config/SchedConfig.java index 8616d93..58114bf 100644 --- a/fizz-common/src/main/java/we/config/SchedConfig.java +++ b/fizz-common/src/main/java/com/fizzgate/config/SchedConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import java.util.Date; import java.util.concurrent.Executor; diff --git a/fizz-common/src/main/java/we/config/WebClientBuilderConfig.java b/fizz-common/src/main/java/com/fizzgate/config/WebClientBuilderConfig.java similarity index 98% rename from fizz-common/src/main/java/we/config/WebClientBuilderConfig.java rename to fizz-common/src/main/java/com/fizzgate/config/WebClientBuilderConfig.java index 516725f..3b937fb 100644 --- a/fizz-common/src/main/java/we/config/WebClientBuilderConfig.java +++ b/fizz-common/src/main/java/com/fizzgate/config/WebClientBuilderConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; diff --git a/fizz-common/src/main/java/we/config/WebClientConfig.java b/fizz-common/src/main/java/com/fizzgate/config/WebClientConfig.java similarity index 99% rename from fizz-common/src/main/java/we/config/WebClientConfig.java rename to fizz-common/src/main/java/com/fizzgate/config/WebClientConfig.java index 98efd99..ad82d70 100644 --- a/fizz-common/src/main/java/we/config/WebClientConfig.java +++ b/fizz-common/src/main/java/com/fizzgate/config/WebClientConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import io.netty.channel.ChannelOption; import io.netty.handler.ssl.SslContext; diff --git a/fizz-common/src/main/java/we/constants/CommonConstants.java b/fizz-common/src/main/java/com/fizzgate/constants/CommonConstants.java similarity index 98% rename from fizz-common/src/main/java/we/constants/CommonConstants.java rename to fizz-common/src/main/java/com/fizzgate/constants/CommonConstants.java index e389199..df37c94 100644 --- a/fizz-common/src/main/java/we/constants/CommonConstants.java +++ b/fizz-common/src/main/java/com/fizzgate/constants/CommonConstants.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.constants; +package com.fizzgate.constants; /** * @author unknown diff --git a/fizz-common/src/main/java/we/flume/clients/log4j2appender/LogService.java b/fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/LogService.java similarity index 92% rename from fizz-common/src/main/java/we/flume/clients/log4j2appender/LogService.java rename to fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/LogService.java index 11179b6..26c8bcb 100644 --- a/fizz-common/src/main/java/we/flume/clients/log4j2appender/LogService.java +++ b/fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/LogService.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.flume.clients.log4j2appender; +package com.fizzgate.flume.clients.log4j2appender; import org.apache.logging.log4j.ThreadContext; -import we.constants.CommonConstants; -import we.util.Consts; + +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.util.Consts; public enum LogService { diff --git a/fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/ThreadContext.java b/fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/ThreadContext.java new file mode 100644 index 0000000..76aaf5a --- /dev/null +++ b/fizz-common/src/main/java/com/fizzgate/flume/clients/log4j2appender/ThreadContext.java @@ -0,0 +1,2 @@ +package com.fizzgate.flume.clients.log4j2appender; + diff --git a/fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java b/fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java similarity index 98% rename from fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java rename to fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java index 083fb13..914d15d 100644 --- a/fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java +++ b/fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpRequestDecorator.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.spring.http.server.reactive.ext; +package com.fizzgate.spring.http.server.reactive.ext; import io.netty.handler.codec.http.cookie.Cookie; import org.springframework.core.io.buffer.DataBuffer; @@ -30,9 +30,11 @@ import org.springframework.lang.Nullable; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; + +import com.fizzgate.util.NettyDataBufferUtils; + import reactor.core.publisher.Flux; import reactor.netty.http.server.HttpServerRequest; -import we.util.NettyDataBufferUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java b/fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java similarity index 96% rename from fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java rename to fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java index f0f1cdd..0641784 100644 --- a/fizz-common/src/main/java/we/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java +++ b/fizz-common/src/main/java/com/fizzgate/spring/http/server/reactive/ext/FizzServerHttpResponseDecorator.java @@ -15,15 +15,17 @@ * along with this program. If not, see . */ -package we.spring.http.server.reactive.ext; +package com.fizzgate.spring.http.server.reactive.ext; import org.reactivestreams.Publisher; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.PooledDataBuffer; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.http.server.reactive.ServerHttpResponseDecorator; + +import com.fizzgate.util.NettyDataBufferUtils; + import reactor.core.publisher.Mono; -import we.util.NettyDataBufferUtils; /** * @author hongqiaowei diff --git a/fizz-common/src/main/java/we/spring/web/server/ext/FizzServerWebExchangeDecorator.java b/fizz-common/src/main/java/com/fizzgate/spring/web/server/ext/FizzServerWebExchangeDecorator.java similarity index 96% rename from fizz-common/src/main/java/we/spring/web/server/ext/FizzServerWebExchangeDecorator.java rename to fizz-common/src/main/java/com/fizzgate/spring/web/server/ext/FizzServerWebExchangeDecorator.java index 2467161..7013db8 100644 --- a/fizz-common/src/main/java/we/spring/web/server/ext/FizzServerWebExchangeDecorator.java +++ b/fizz-common/src/main/java/com/fizzgate/spring/web/server/ext/FizzServerWebExchangeDecorator.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.spring.web.server.ext; +package com.fizzgate.spring.web.server.ext; import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; @@ -26,11 +26,13 @@ import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchangeDecorator; + +import com.fizzgate.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.ThreadContext; + import reactor.core.publisher.Mono; -import we.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; -import we.util.Consts; -import we.util.NettyDataBufferUtils; -import we.util.ThreadContext; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/fizz-common/src/main/java/we/util/Constants.java b/fizz-common/src/main/java/com/fizzgate/util/Constants.java similarity index 98% rename from fizz-common/src/main/java/we/util/Constants.java rename to fizz-common/src/main/java/com/fizzgate/util/Constants.java index b9da0ad..1c080c2 100644 --- a/fizz-common/src/main/java/we/util/Constants.java +++ b/fizz-common/src/main/java/com/fizzgate/util/Constants.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.lang3.SystemUtils; /** * @author hongqiaowei - * @deprecated and use {@link we.util.Consts} instead + * @deprecated and use {@link com.fizzgate.util.Consts} instead */ @Deprecated diff --git a/fizz-common/src/main/java/we/util/Consts.java b/fizz-common/src/main/java/com/fizzgate/util/Consts.java similarity index 99% rename from fizz-common/src/main/java/we/util/Consts.java rename to fizz-common/src/main/java/com/fizzgate/util/Consts.java index 7a3dcec..4925ea3 100644 --- a/fizz-common/src/main/java/we/util/Consts.java +++ b/fizz-common/src/main/java/com/fizzgate/util/Consts.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; /** * @author hongqiaowei diff --git a/fizz-common/src/main/java/we/util/DateTimeUtils.java b/fizz-common/src/main/java/com/fizzgate/util/DateTimeUtils.java similarity index 80% rename from fizz-common/src/main/java/we/util/DateTimeUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/DateTimeUtils.java index 2a9589f..23fde6c 100644 --- a/fizz-common/src/main/java/we/util/DateTimeUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/DateTimeUtils.java @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -package we.util; - -import we.util.Consts.DP; +package com.fizzgate.util; import java.time.Instant; import java.time.LocalDate; @@ -31,34 +29,43 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; +import com.fizzgate.util.Consts.DP; + /** * @author hongqiaowei */ public abstract class DateTimeUtils { - private static Map dateTimeFormatters = new HashMap<>(); + private static Map dateTimeFormatterMap = new HashMap<>(); - private static ZoneId defaultZone = ZoneId.systemDefault(); + private static ZoneId defaultZone = ZoneId.systemDefault(); - private static final String zeroTimeSuffix = " 00:00:00.000"; + @Deprecated + private static final String zeroTimeSuffix = " 00:00:00.000"; private DateTimeUtils() { } public static DateTimeFormatter getDateTimeFormatter(String pattern) { - DateTimeFormatter f = dateTimeFormatters.get(pattern); + DateTimeFormatter f = dateTimeFormatterMap.get(pattern); if (f == null) { f = DateTimeFormatter.ofPattern(pattern); - dateTimeFormatters.put(pattern, f); + dateTimeFormatterMap.put(pattern, f); } return f; } + public static long toMillis(LocalDate ld) { + LocalDateTime ldt = ld.atStartOfDay(); + return toMillis(ldt); + } + public static long toMillis(LocalDateTime ldt) { return ldt.atZone(defaultZone).toInstant().toEpochMilli(); } + @Deprecated public static long toMillis(String dateTime, String... pattern) { if (dateTime.length() == 10) { dateTime += zeroTimeSuffix; @@ -72,6 +79,12 @@ public abstract class DateTimeUtils { return toMillis(ldt); } + public static long toMillis(String dateTime, String pattern) { + DateTimeFormatter f = getDateTimeFormatter(pattern); + LocalDateTime ldt = LocalDateTime.parse(dateTime, f); + return toMillis(ldt); + } + public static LocalDate transform(Date date) { return date.toInstant().atZone(defaultZone).toLocalDate(); } @@ -96,6 +109,7 @@ public abstract class DateTimeUtils { return Date.from(localDateTime.atZone(defaultZone).toInstant()); } + @Deprecated public static String convert(long mills, String... pattern) { String p = DP.DP10; if (pattern.length != 0) { @@ -106,6 +120,13 @@ public abstract class DateTimeUtils { return ldt.format(f); } + public static String convert(long mills, String pattern) { + LocalDateTime ldt = LocalDateTime.ofInstant(Instant.ofEpochMilli(mills), defaultZone); + DateTimeFormatter f = getDateTimeFormatter(pattern); + return ldt.format(f); + } + + @Deprecated public static String convert(LocalDate date, String... pattern) { String p = DP.DP10; if (pattern.length != 0) { @@ -115,6 +136,12 @@ public abstract class DateTimeUtils { return date.format(f); } + public static String convert(LocalDate date, String pattern) { + DateTimeFormatter f = getDateTimeFormatter(pattern); + return date.format(f); + } + + @Deprecated public static String convert(LocalDateTime localDateTime, String... pattern) { String p = DP.DP23; if (pattern.length != 0) { @@ -124,6 +151,11 @@ public abstract class DateTimeUtils { return localDateTime.format(f); } + public static String convert(LocalDateTime localDateTime, String pattern) { + DateTimeFormatter f = getDateTimeFormatter(pattern); + return localDateTime.format(f); + } + public static List datesBetween(String start, String end) { LocalDate sd = LocalDate.parse(start); LocalDate ed = LocalDate.parse(end); @@ -146,7 +178,7 @@ public abstract class DateTimeUtils { long numOfDaysBetween = ChronoUnit.DAYS.between(sd, ed); return IntStream.iterate(0, i -> i + 1) .limit(numOfDaysBetween) - .mapToObj(i -> sd.plusDays(i)) + .mapToObj(sd::plusDays) .collect(Collectors.toList()); } @@ -155,19 +187,14 @@ public abstract class DateTimeUtils { } public static LocalDateTime beforeNowNoTime(long offsetDays) { - return LocalDate.now().minusDays(offsetDays).atTime(0, 0, 0, 0); + return LocalDate.now().minusDays(offsetDays).atStartOfDay(); } + @Deprecated public static LocalDateTime time2zero(LocalDateTime ldt) { return ldt.withHour(0).withMinute(0).withSecond(0).with(ChronoField.MILLI_OF_SECOND, 0); } - public static boolean isSameDay(Date date1, Date date2) { - LocalDate localDate1 = date1.toInstant().atZone(defaultZone).toLocalDate(); - LocalDate localDate2 = date2.toInstant().atZone(defaultZone).toLocalDate(); - return localDate1.isEqual(localDate2); - } - public static long get10sTimeWinStart(int n) { LocalDateTime now = LocalDateTime.now().with(ChronoField.MILLI_OF_SECOND, 0); int sec = now.getSecond(); diff --git a/fizz-common/src/main/java/we/util/DigestUtils.java b/fizz-common/src/main/java/com/fizzgate/util/DigestUtils.java similarity index 98% rename from fizz-common/src/main/java/we/util/DigestUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/DigestUtils.java index b474962..f70217f 100644 --- a/fizz-common/src/main/java/we/util/DigestUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/DigestUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.codec.binary.Hex; diff --git a/fizz-common/src/main/java/we/util/FileUtils.java b/fizz-common/src/main/java/com/fizzgate/util/FileUtils.java similarity index 97% rename from fizz-common/src/main/java/we/util/FileUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/FileUtils.java index 9a31fa1..701fc92 100644 --- a/fizz-common/src/main/java/we/util/FileUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/FileUtils.java @@ -1,4 +1,4 @@ -package we.util; +package com.fizzgate.util; import java.io.File; import java.util.Objects; diff --git a/fizz-common/src/main/java/we/util/JacksonUtils.java b/fizz-common/src/main/java/com/fizzgate/util/JacksonUtils.java similarity index 56% rename from fizz-common/src/main/java/we/util/JacksonUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/JacksonUtils.java index aabd53f..f81fd19 100644 --- a/fizz-common/src/main/java/we/util/JacksonUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/JacksonUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonFactory; @@ -26,7 +26,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.type.TypeFactory; -import we.util.Consts.DP; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fizzgate.util.Consts.DP; import java.io.IOException; import java.time.LocalDate; @@ -58,21 +59,24 @@ public abstract class JacksonUtils { m.configure( DeserializationFeature. FAIL_ON_UNKNOWN_PROPERTIES, false); m.configure( JsonParser.Feature. ALLOW_UNQUOTED_CONTROL_CHARS, true); - SimpleModule m0 = new SimpleModule(); - m0.addDeserializer(Date.class, new DateDeseralizer()); - m.registerModule(m0); + JavaTimeModule javaTimeModule = new JavaTimeModule(); + m.registerModule(javaTimeModule); - SimpleModule m1 = new SimpleModule(); - m1.addDeserializer(LocalDate.class, new LocalDateDeseralizer()); - m.registerModule(m1); - - SimpleModule m2 = new SimpleModule(); - m2.addDeserializer(LocalDateTime.class, new LocalDateTimeDeseralizer()); - m.registerModule(m2); - - SimpleModule m3 = new SimpleModule(); - m3.addSerializer(LocalDateTime.class, new LocalDateTimeSeralizer()); - m.registerModule(m3); +// SimpleModule m0 = new SimpleModule(); +// m0.addDeserializer(Date.class, new DateDeseralizer()); +// m.registerModule(m0); +// +// SimpleModule m1 = new SimpleModule(); +// m1.addDeserializer(LocalDate.class, new LocalDateDeseralizer()); +// m.registerModule(m1); +// +// SimpleModule m2 = new SimpleModule(); +// m2.addDeserializer(LocalDateTime.class, new LocalDateTimeDeseralizer()); +// m.registerModule(m2); +// +// SimpleModule m3 = new SimpleModule(); +// m3.addSerializer(LocalDateTime.class, new LocalDateTimeSeralizer()); +// m.registerModule(m3); } private JacksonUtils() { @@ -157,79 +161,79 @@ public abstract class JacksonUtils { } } -class DateDeseralizer extends JsonDeserializer { - - public Date deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { - - String s = jp.getText(); - int sl = s.length(); - if (sl == DP.MILLS_LEN) { - return new Date(Long.parseLong(s)); - } else { - String dtp = DP.DP10; - DateTimeFormatter dtf = null; - if (sl == DP.DP10.length()) { - } else if (sl == DP.DP14.length()) { - dtp = DP.DP14; - } else if (sl == DP.DP19.length()) { - dtp = DP.DP19; - } else if (sl == DP.DP23.length()) { - dtp = DP.DP23; - } else { - throw new IOException("invalid datetime pattern: " + s); - } - dtf = DateTimeUtils.getDateTimeFormatter(dtp); - LocalDateTime ldt = LocalDateTime.parse(s, dtf); - return DateTimeUtils.from(ldt); - } - } -} - -class LocalDateDeseralizer extends JsonDeserializer { - - public LocalDate deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { - - String s = jp.getText(); - if (s.length() == DP.DP10.length()) { - DateTimeFormatter dtf = DateTimeUtils.getDateTimeFormatter(DP.DP10); - return LocalDate.parse(s, dtf); - } else { - throw new IOException("invalid datetime pattern: " + s); - } - } -} - -class LocalDateTimeDeseralizer extends JsonDeserializer { - - public LocalDateTime deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { - - String s = jp.getText(); - int sl = s.length(); - if (sl == DP.MILLS_LEN) { - return DateTimeUtils.transform(Long.parseLong(s)); - } else { - String dtp = DP.DP10; - DateTimeFormatter dtf = null; - if (sl == DP.DP10.length()) { - } else if (sl == DP.DP14.length()) { - dtp = DP.DP14; - } else if (sl == DP.DP19.length()) { - dtp = DP.DP19; - } else if (sl == DP.DP23.length()) { - dtp = DP.DP23; - } else { - throw new IOException("invalid datetime pattern: " + s); - } - dtf = DateTimeUtils.getDateTimeFormatter(dtp); - return LocalDateTime.parse(s, dtf); - } - } -} - -class LocalDateTimeSeralizer extends JsonSerializer { - - @Override - public void serialize(LocalDateTime ldt, JsonGenerator jg, SerializerProvider sp) throws IOException { - jg.writeNumber(DateTimeUtils.toMillis(ldt)); - } -} +//class DateDeseralizer extends JsonDeserializer { +// +// public Date deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { +// +// String s = jp.getText(); +// int sl = s.length(); +// if (sl == DP.MILLS_LEN) { +// return new Date(Long.parseLong(s)); +// } else { +// String dtp = DP.DP10; +// DateTimeFormatter dtf = null; +// if (sl == DP.DP10.length()) { +// } else if (sl == DP.DP14.length()) { +// dtp = DP.DP14; +// } else if (sl == DP.DP19.length()) { +// dtp = DP.DP19; +// } else if (sl == DP.DP23.length()) { +// dtp = DP.DP23; +// } else { +// throw new IOException("invalid datetime pattern: " + s); +// } +// dtf = DateTimeUtils.getDateTimeFormatter(dtp); +// LocalDateTime ldt = LocalDateTime.parse(s, dtf); +// return DateTimeUtils.from(ldt); +// } +// } +//} +// +//class LocalDateDeseralizer extends JsonDeserializer { +// +// public LocalDate deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { +// +// String s = jp.getText(); +// if (s.length() == DP.DP10.length()) { +// DateTimeFormatter dtf = DateTimeUtils.getDateTimeFormatter(DP.DP10); +// return LocalDate.parse(s, dtf); +// } else { +// throw new IOException("invalid datetime pattern: " + s); +// } +// } +//} +// +//class LocalDateTimeDeseralizer extends JsonDeserializer { +// +// public LocalDateTime deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { +// +// String s = jp.getText(); +// int sl = s.length(); +// if (sl == DP.MILLS_LEN) { +// return DateTimeUtils.transform(Long.parseLong(s)); +// } else { +// String dtp = DP.DP10; +// DateTimeFormatter dtf = null; +// if (sl == DP.DP10.length()) { +// } else if (sl == DP.DP14.length()) { +// dtp = DP.DP14; +// } else if (sl == DP.DP19.length()) { +// dtp = DP.DP19; +// } else if (sl == DP.DP23.length()) { +// dtp = DP.DP23; +// } else { +// throw new IOException("invalid datetime pattern: " + s); +// } +// dtf = DateTimeUtils.getDateTimeFormatter(dtp); +// return LocalDateTime.parse(s, dtf); +// } +// } +//} +// +//class LocalDateTimeSeralizer extends JsonSerializer { +// +// @Override +// public void serialize(LocalDateTime ldt, JsonGenerator jg, SerializerProvider sp) throws IOException { +// jg.writeNumber(DateTimeUtils.toMillis(ldt)); +// } +//} diff --git a/fizz-common/src/main/java/we/util/JsonSchemaUtils.java b/fizz-common/src/main/java/com/fizzgate/util/JsonSchemaUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/JsonSchemaUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/JsonSchemaUtils.java index 92852ce..1625391 100644 --- a/fizz-common/src/main/java/we/util/JsonSchemaUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/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 we.util; +package com.fizzgate.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/fizz-common/src/main/java/com/fizzgate/util/LocalDate2millsSerializer.java b/fizz-common/src/main/java/com/fizzgate/util/LocalDate2millsSerializer.java new file mode 100644 index 0000000..95665e9 --- /dev/null +++ b/fizz-common/src/main/java/com/fizzgate/util/LocalDate2millsSerializer.java @@ -0,0 +1,16 @@ +package com.fizzgate.util; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.time.LocalDate; + +public class LocalDate2millsSerializer extends JsonSerializer { + + @Override + public void serialize(LocalDate ld, JsonGenerator jg, SerializerProvider sp) throws IOException { + jg.writeNumber(DateTimeUtils.toMillis(ld)); + } +} \ No newline at end of file diff --git a/fizz-common/src/main/java/com/fizzgate/util/LocalDateTime2millsSerializer.java b/fizz-common/src/main/java/com/fizzgate/util/LocalDateTime2millsSerializer.java new file mode 100644 index 0000000..f6a7b09 --- /dev/null +++ b/fizz-common/src/main/java/com/fizzgate/util/LocalDateTime2millsSerializer.java @@ -0,0 +1,16 @@ +package com.fizzgate.util; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.time.LocalDateTime; + +public class LocalDateTime2millsSerializer extends JsonSerializer { + + @Override + public void serialize(LocalDateTime ldt, JsonGenerator jg, SerializerProvider sp) throws IOException { + jg.writeNumber(DateTimeUtils.toMillis(ldt)); + } +} \ No newline at end of file diff --git a/fizz-common/src/main/java/we/util/MapUtil.java b/fizz-common/src/main/java/com/fizzgate/util/MapUtil.java similarity index 99% rename from fizz-common/src/main/java/we/util/MapUtil.java rename to fizz-common/src/main/java/com/fizzgate/util/MapUtil.java index 0347697..50ce684 100644 --- a/fizz-common/src/main/java/we/util/MapUtil.java +++ b/fizz-common/src/main/java/com/fizzgate/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 we.util; +package com.fizzgate.util; import java.util.ArrayList; import java.util.Collection; diff --git a/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateDeserializer.java b/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateDeserializer.java new file mode 100644 index 0000000..41045a0 --- /dev/null +++ b/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateDeserializer.java @@ -0,0 +1,21 @@ +package com.fizzgate.util; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import java.io.IOException; +import java.time.LocalDate; +import java.time.LocalDateTime; + +public class Mills2localDateDeserializer extends JsonDeserializer { + + public LocalDate deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { + String text = jp.getText(); + if (StringUtils.isBlank(text)) { + return null; + } + LocalDateTime ldt = DateTimeUtils.transform(Long.parseLong(text)); + return ldt.toLocalDate(); + } +} \ No newline at end of file diff --git a/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateTimeDeserializer.java b/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateTimeDeserializer.java new file mode 100644 index 0000000..50ba739 --- /dev/null +++ b/fizz-common/src/main/java/com/fizzgate/util/Mills2localDateTimeDeserializer.java @@ -0,0 +1,19 @@ +package com.fizzgate.util; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import java.io.IOException; +import java.time.LocalDateTime; + +public class Mills2localDateTimeDeserializer extends JsonDeserializer { + + public LocalDateTime deserialize(JsonParser jp, DeserializationContext ctx) throws IOException { + String text = jp.getText(); + if (StringUtils.isBlank(text)) { + return null; + } + return DateTimeUtils.transform(Long.parseLong(text)); + } +} \ No newline at end of file diff --git a/fizz-common/src/main/java/we/util/NettyDataBufferUtils.java b/fizz-common/src/main/java/com/fizzgate/util/NettyDataBufferUtils.java similarity index 98% rename from fizz-common/src/main/java/we/util/NettyDataBufferUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/NettyDataBufferUtils.java index 9b5a4b6..09bbeb4 100644 --- a/fizz-common/src/main/java/we/util/NettyDataBufferUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/NettyDataBufferUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import io.netty.buffer.ByteBufAllocator; import org.springframework.core.io.buffer.DataBuffer; diff --git a/fizz-common/src/main/java/we/util/NetworkUtils.java b/fizz-common/src/main/java/com/fizzgate/util/NetworkUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/NetworkUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/NetworkUtils.java index 9e9d96b..7a0acb1 100644 --- a/fizz-common/src/main/java/we/util/NetworkUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/NetworkUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/fizz-common/src/main/java/we/util/PemUtils.java b/fizz-common/src/main/java/com/fizzgate/util/PemUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/PemUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/PemUtils.java index 7141533..ab694dc 100644 --- a/fizz-common/src/main/java/we/util/PemUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/PemUtils.java @@ -3,7 +3,7 @@ //The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. //THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -package we.util; +package com.fizzgate.util; import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemReader; diff --git a/fizz-common/src/main/java/we/util/PropertiesUtils.java b/fizz-common/src/main/java/com/fizzgate/util/PropertiesUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/PropertiesUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/PropertiesUtils.java index 4260b77..6aa322a 100644 --- a/fizz-common/src/main/java/we/util/PropertiesUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/PropertiesUtils.java @@ -1,4 +1,4 @@ -package we.util; +package com.fizzgate.util; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.PropertyAccessor; diff --git a/fizz-common/src/main/java/we/util/ReactiveRedisHelper.java b/fizz-common/src/main/java/com/fizzgate/util/ReactiveRedisHelper.java similarity index 98% rename from fizz-common/src/main/java/we/util/ReactiveRedisHelper.java rename to fizz-common/src/main/java/com/fizzgate/util/ReactiveRedisHelper.java index 85cd310..954112f 100644 --- a/fizz-common/src/main/java/we/util/ReactiveRedisHelper.java +++ b/fizz-common/src/main/java/com/fizzgate/util/ReactiveRedisHelper.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import io.lettuce.core.ClientOptions; import io.lettuce.core.TimeoutOptions; @@ -29,8 +29,9 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; -import we.config.RedisReactiveConfig; -import we.config.RedisReactiveProperties; + +import com.fizzgate.config.RedisReactiveConfig; +import com.fizzgate.config.RedisReactiveProperties; import java.time.Duration; diff --git a/fizz-common/src/main/java/we/util/ReactorUtils.java b/fizz-common/src/main/java/com/fizzgate/util/ReactorUtils.java similarity index 98% rename from fizz-common/src/main/java/we/util/ReactorUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/ReactorUtils.java index b9c3e2b..78016da 100644 --- a/fizz-common/src/main/java/we/util/ReactorUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/ReactorUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/fizz-common/src/main/java/we/util/ReflectionUtils.java b/fizz-common/src/main/java/com/fizzgate/util/ReflectionUtils.java similarity index 98% rename from fizz-common/src/main/java/we/util/ReflectionUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/ReflectionUtils.java index a3047d7..a44b777 100644 --- a/fizz-common/src/main/java/we/util/ReflectionUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/ReflectionUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/fizz-common/src/main/java/we/util/Result.java b/fizz-common/src/main/java/com/fizzgate/util/Result.java similarity index 99% rename from fizz-common/src/main/java/we/util/Result.java rename to fizz-common/src/main/java/com/fizzgate/util/Result.java index dc9e25d..2f1047e 100644 --- a/fizz-common/src/main/java/we/util/Result.java +++ b/fizz-common/src/main/java/com/fizzgate/util/Result.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import java.util.Collections; import java.util.Map; diff --git a/fizz-common/src/main/java/we/util/Script.java b/fizz-common/src/main/java/com/fizzgate/util/Script.java similarity index 97% rename from fizz-common/src/main/java/we/util/Script.java rename to fizz-common/src/main/java/com/fizzgate/util/Script.java index fd1e791..2da358e 100644 --- a/fizz-common/src/main/java/we/util/Script.java +++ b/fizz-common/src/main/java/com/fizzgate/util/Script.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; /** * @author hongqiaowei diff --git a/fizz-common/src/main/java/we/util/ScriptUtils.java b/fizz-common/src/main/java/com/fizzgate/util/ScriptUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/ScriptUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/ScriptUtils.java index 3167b0f..45e7d7c 100644 --- a/fizz-common/src/main/java/we/util/ScriptUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/ScriptUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.lang3.StringUtils; import org.springframework.core.io.ClassPathResource; diff --git a/fizz-common/src/main/java/we/util/StringUtils.java b/fizz-common/src/main/java/com/fizzgate/util/StringUtils.java similarity index 97% rename from fizz-common/src/main/java/we/util/StringUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/StringUtils.java index 776ad56..d684ba8 100644 --- a/fizz-common/src/main/java/we/util/StringUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/StringUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import java.util.Objects; diff --git a/fizz-common/src/main/java/we/util/SymmetricCryptoUtils.java b/fizz-common/src/main/java/com/fizzgate/util/SymmetricCryptoUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/SymmetricCryptoUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/SymmetricCryptoUtils.java index 9a7fd30..7d8f2d5 100644 --- a/fizz-common/src/main/java/we/util/SymmetricCryptoUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/SymmetricCryptoUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; diff --git a/fizz-common/src/main/java/we/util/SymmetricDecryptor.java b/fizz-common/src/main/java/com/fizzgate/util/SymmetricDecryptor.java similarity index 98% rename from fizz-common/src/main/java/we/util/SymmetricDecryptor.java rename to fizz-common/src/main/java/com/fizzgate/util/SymmetricDecryptor.java index 8fb06ec..b8ff904 100644 --- a/fizz-common/src/main/java/we/util/SymmetricDecryptor.java +++ b/fizz-common/src/main/java/com/fizzgate/util/SymmetricDecryptor.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; diff --git a/fizz-common/src/main/java/we/util/SymmetricEncryptor.java b/fizz-common/src/main/java/com/fizzgate/util/SymmetricEncryptor.java similarity index 98% rename from fizz-common/src/main/java/we/util/SymmetricEncryptor.java rename to fizz-common/src/main/java/com/fizzgate/util/SymmetricEncryptor.java index c81c13d..f03cee8 100644 --- a/fizz-common/src/main/java/we/util/SymmetricEncryptor.java +++ b/fizz-common/src/main/java/com/fizzgate/util/SymmetricEncryptor.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; diff --git a/fizz-common/src/main/java/we/util/ThreadContext.java b/fizz-common/src/main/java/com/fizzgate/util/ThreadContext.java similarity index 99% rename from fizz-common/src/main/java/we/util/ThreadContext.java rename to fizz-common/src/main/java/com/fizzgate/util/ThreadContext.java index aa9b368..8da6bc7 100644 --- a/fizz-common/src/main/java/we/util/ThreadContext.java +++ b/fizz-common/src/main/java/com/fizzgate/util/ThreadContext.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/fizz-common/src/main/java/we/util/TypeUtils.java b/fizz-common/src/main/java/com/fizzgate/util/TypeUtils.java similarity index 98% rename from fizz-common/src/main/java/we/util/TypeUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/TypeUtils.java index 104e4d7..ab54cf0 100644 --- a/fizz-common/src/main/java/we/util/TypeUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/TypeUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import java.math.BigDecimal; diff --git a/fizz-common/src/main/java/we/util/UUIDUtil.java b/fizz-common/src/main/java/com/fizzgate/util/UUIDUtil.java similarity index 97% rename from fizz-common/src/main/java/we/util/UUIDUtil.java rename to fizz-common/src/main/java/com/fizzgate/util/UUIDUtil.java index 7a5cec3..329ba7d 100644 --- a/fizz-common/src/main/java/we/util/UUIDUtil.java +++ b/fizz-common/src/main/java/com/fizzgate/util/UUIDUtil.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 we.util; +package com.fizzgate.util; import java.util.UUID; diff --git a/fizz-common/src/main/java/we/util/UrlTransformUtils.java b/fizz-common/src/main/java/com/fizzgate/util/UrlTransformUtils.java similarity index 99% rename from fizz-common/src/main/java/we/util/UrlTransformUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/UrlTransformUtils.java index e10f17c..396d1d3 100644 --- a/fizz-common/src/main/java/we/util/UrlTransformUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/UrlTransformUtils.java @@ -1,4 +1,4 @@ -package we.util; +package com.fizzgate.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fizz-common/src/main/java/we/util/Utils.java b/fizz-common/src/main/java/com/fizzgate/util/Utils.java similarity index 99% rename from fizz-common/src/main/java/we/util/Utils.java rename to fizz-common/src/main/java/com/fizzgate/util/Utils.java index 341ba5d..fcc55ed 100644 --- a/fizz-common/src/main/java/we/util/Utils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/Utils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.lang3.StringUtils; diff --git a/fizz-common/src/main/java/we/util/YmlUtils.java b/fizz-common/src/main/java/com/fizzgate/util/YmlUtils.java similarity index 97% rename from fizz-common/src/main/java/we/util/YmlUtils.java rename to fizz-common/src/main/java/com/fizzgate/util/YmlUtils.java index 91112f8..8c76def 100644 --- a/fizz-common/src/main/java/we/util/YmlUtils.java +++ b/fizz-common/src/main/java/com/fizzgate/util/YmlUtils.java @@ -1,4 +1,4 @@ -package we.util; +package com.fizzgate.util; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.io.ByteArrayResource; diff --git a/fizz-common/src/main/java/we/xml/FileReader.java b/fizz-common/src/main/java/com/fizzgate/xml/FileReader.java similarity index 98% rename from fizz-common/src/main/java/we/xml/FileReader.java rename to fizz-common/src/main/java/com/fizzgate/xml/FileReader.java index fe23fc3..a9a7b2e 100644 --- a/fizz-common/src/main/java/we/xml/FileReader.java +++ b/fizz-common/src/main/java/com/fizzgate/xml/FileReader.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package we.xml; +package com.fizzgate.xml; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/fizz-common/src/main/java/we/xml/JsonToXml.java b/fizz-common/src/main/java/com/fizzgate/xml/JsonToXml.java similarity index 99% rename from fizz-common/src/main/java/we/xml/JsonToXml.java rename to fizz-common/src/main/java/com/fizzgate/xml/JsonToXml.java index 2fe76cb..652e999 100644 --- a/fizz-common/src/main/java/we/xml/JsonToXml.java +++ b/fizz-common/src/main/java/com/fizzgate/xml/JsonToXml.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package we.xml; +package com.fizzgate.xml; //import android.util.Xml; diff --git a/fizz-common/src/main/java/we/xml/Node.java b/fizz-common/src/main/java/com/fizzgate/xml/Node.java similarity index 98% rename from fizz-common/src/main/java/we/xml/Node.java rename to fizz-common/src/main/java/com/fizzgate/xml/Node.java index 7bdb2c9..bc536d3 100644 --- a/fizz-common/src/main/java/we/xml/Node.java +++ b/fizz-common/src/main/java/com/fizzgate/xml/Node.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package we.xml; +package com.fizzgate.xml; import java.util.ArrayList; diff --git a/fizz-common/src/main/java/we/xml/Tag.java b/fizz-common/src/main/java/com/fizzgate/xml/Tag.java similarity index 99% rename from fizz-common/src/main/java/we/xml/Tag.java rename to fizz-common/src/main/java/com/fizzgate/xml/Tag.java index 4a5db33..435282e 100644 --- a/fizz-common/src/main/java/we/xml/Tag.java +++ b/fizz-common/src/main/java/com/fizzgate/xml/Tag.java @@ -1,4 +1,4 @@ -package we.xml; +package com.fizzgate.xml; /* Copyright 2016 Arnaud Guyon diff --git a/fizz-common/src/main/java/we/xml/XmlToJson.java b/fizz-common/src/main/java/com/fizzgate/xml/XmlToJson.java similarity index 99% rename from fizz-common/src/main/java/we/xml/XmlToJson.java rename to fizz-common/src/main/java/com/fizzgate/xml/XmlToJson.java index b7e777d..88db7e8 100644 --- a/fizz-common/src/main/java/we/xml/XmlToJson.java +++ b/fizz-common/src/main/java/com/fizzgate/xml/XmlToJson.java @@ -1,4 +1,4 @@ -package we.xml; +package com.fizzgate.xml; /* Copyright 2016 Arnaud Guyon diff --git a/fizz-common/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java b/fizz-common/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java deleted file mode 100644 index fbceff1..0000000 --- a/fizz-common/src/main/java/we/flume/clients/log4j2appender/ThreadContext.java +++ /dev/null @@ -1,90 +0,0 @@ -///* -// * Copyright (C) 2020 the original author or authors. -// * -// * This program is free software: you can redistribute it and/or modify -// * it under the terms of the GNU General Public License as published by -// * the Free Software Foundation, either version 3 of the License, or -// * any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU General Public License -// * along with this program. If not, see . -// */ -// -//package we.flume.clients.log4j2appender; -// -//import java.text.SimpleDateFormat; -//import java.util.HashMap; -//import java.util.Map; -// -///** for internal use */ -//public abstract class ThreadContext { -// -// private static ThreadLocal> tl = new ThreadLocal<>(); -// private static final int mapCap = 32; -// -// private static final String sb = "sb"; -// private static final int sbCap = 256; -// -// public static StringBuilder getStringBuilder() { -// return getStringBuilder(true); -// } -// -// public static StringBuilder getStringBuilder(boolean clean) { -// Map m = getMap(); -// StringBuilder b = (StringBuilder) m.get(sb); -// if (b == null) { -// b = new StringBuilder(sbCap); -// m.put(sb, b); -// } else { -// if (clean) { -// b.delete(0, b.length()); -// } -// } -// return b; -// } -// -// public static SimpleDateFormat getSimpleDateFormat(String pattern) { -// Map m = getMap(); -// SimpleDateFormat sdf = (SimpleDateFormat) m.get(pattern); -// if (sdf == null) { -// sdf = new SimpleDateFormat(pattern); -// m.put(pattern, sdf); -// } -// return sdf; -// } -// -// public static Object get(String key, Class clz) { -// Object obj = get(key); -// if (obj == null) { -// try { -// obj = clz.newInstance(); -// set(key, obj); -// } catch (InstantiationException | IllegalAccessException e) { -// throw new RuntimeException(e); -// } -// } -// return obj; -// } -// -// private static Map getMap() { -// Map m = tl.get(); -// if (m == null) { -// m = new HashMap<>(mapCap); -// tl.set(m); -// } -// return m; -// } -// -// public static Object get(String key) { -// return getMap().get(key); -// } -// -// public static void set(String key, Object obj) { -// getMap().put(key, obj); -// } -//} diff --git a/fizz-common/src/test/java/we/OgnlTests.java b/fizz-common/src/test/java/com/fizzgate/OgnlTests.java similarity index 97% rename from fizz-common/src/test/java/we/OgnlTests.java rename to fizz-common/src/test/java/com/fizzgate/OgnlTests.java index c371400..526f0a5 100644 --- a/fizz-common/src/test/java/we/OgnlTests.java +++ b/fizz-common/src/test/java/com/fizzgate/OgnlTests.java @@ -1,4 +1,4 @@ -package we; +package com.fizzgate; import ognl.Ognl; import org.junit.jupiter.api.Test; diff --git a/fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java b/fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java similarity index 95% rename from fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java rename to fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java index a003ef0..5a6b705 100644 --- a/fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java +++ b/fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java @@ -15,11 +15,10 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.junit.jupiter.api.Test; -import we.schema.util.I18nUtils; - +import com.fizzgate.schema.util.I18nUtils; import java.util.List; import java.util.Locale; diff --git a/fizz-common/src/test/java/we/util/MapUtilTests.java b/fizz-common/src/test/java/com/fizzgate/util/MapUtilTests.java similarity index 98% rename from fizz-common/src/test/java/we/util/MapUtilTests.java rename to fizz-common/src/test/java/com/fizzgate/util/MapUtilTests.java index c0d3ce0..2ce28e7 100644 --- a/fizz-common/src/test/java/we/util/MapUtilTests.java +++ b/fizz-common/src/test/java/com/fizzgate/util/MapUtilTests.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,6 +26,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import com.fizzgate.util.MapUtil; + /** * * @author Francis Dong diff --git a/fizz-common/src/test/java/we/util/SymmetricCryptoTests.java b/fizz-common/src/test/java/com/fizzgate/util/SymmetricCryptoTests.java similarity index 88% rename from fizz-common/src/test/java/we/util/SymmetricCryptoTests.java rename to fizz-common/src/test/java/com/fizzgate/util/SymmetricCryptoTests.java index 14ad470..d8d5ac4 100644 --- a/fizz-common/src/test/java/we/util/SymmetricCryptoTests.java +++ b/fizz-common/src/test/java/com/fizzgate/util/SymmetricCryptoTests.java @@ -1,9 +1,12 @@ -package we.util; +package com.fizzgate.util; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import com.fizzgate.util.SymmetricDecryptor; +import com.fizzgate.util.SymmetricEncryptor; + public class SymmetricCryptoTests { @Test diff --git a/fizz-common/src/test/java/we/xml/XmlTests.java b/fizz-common/src/test/java/com/fizzgate/xml/XmlTests.java similarity index 98% rename from fizz-common/src/test/java/we/xml/XmlTests.java rename to fizz-common/src/test/java/com/fizzgate/xml/XmlTests.java index 85b1f64..c875005 100644 --- a/fizz-common/src/test/java/we/xml/XmlTests.java +++ b/fizz-common/src/test/java/com/fizzgate/xml/XmlTests.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.xml; +package com.fizzgate.xml; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -23,6 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.json.JSONObject; import org.junit.jupiter.api.Test; +import com.fizzgate.xml.JsonToXml; +import com.fizzgate.xml.XmlToJson; + public class XmlTests { private String xmlStr = "\n" + "\n" diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index 3aa5b62..d4278cd 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.7.0 + 2.7.1 ../pom.xml 4.0.0 @@ -24,7 +24,7 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_5 + 1.0.39_6 provided diff --git a/fizz-core/src/main/java/we/Fizz.java b/fizz-core/src/main/java/com/fizzgate/Fizz.java similarity index 97% rename from fizz-core/src/main/java/we/Fizz.java rename to fizz-core/src/main/java/com/fizzgate/Fizz.java index 733adf2..3fef92c 100644 --- a/fizz-core/src/main/java/we/Fizz.java +++ b/fizz-core/src/main/java/com/fizzgate/Fizz.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we; +package com.fizzgate; import org.springframework.context.ConfigurableApplicationContext; diff --git a/fizz-core/src/main/java/we/FizzAppContext.java b/fizz-core/src/main/java/com/fizzgate/FizzAppContext.java similarity index 91% rename from fizz-core/src/main/java/we/FizzAppContext.java rename to fizz-core/src/main/java/com/fizzgate/FizzAppContext.java index e011348..0b74fd7 100644 --- a/fizz-core/src/main/java/we/FizzAppContext.java +++ b/fizz-core/src/main/java/com/fizzgate/FizzAppContext.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package we; +package com.fizzgate; import org.springframework.context.ConfigurableApplicationContext; /** - * @deprecated and use {@link we.Fizz} instead + * @deprecated and use {@link com.fizzgate.Fizz} instead */ @Deprecated diff --git a/fizz-core/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java b/fizz-core/src/main/java/com/fizzgate/apollo/ApolloLog4j2ConfigurationFactory.java similarity index 99% rename from fizz-core/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java rename to fizz-core/src/main/java/com/fizzgate/apollo/ApolloLog4j2ConfigurationFactory.java index 19288d9..7030dff 100644 --- a/fizz-core/src/main/java/we/apollo/ApolloLog4j2ConfigurationFactory.java +++ b/fizz-core/src/main/java/com/fizzgate/apollo/ApolloLog4j2ConfigurationFactory.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.apollo; +package com.fizzgate.apollo; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; diff --git a/fizz-core/src/main/java/we/beans/factory/config/FizzBeanFactoryPostProcessor.java b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanFactoryPostProcessor.java similarity index 92% rename from fizz-core/src/main/java/we/beans/factory/config/FizzBeanFactoryPostProcessor.java rename to fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanFactoryPostProcessor.java index 19ac54c..573cc60 100644 --- a/fizz-core/src/main/java/we/beans/factory/config/FizzBeanFactoryPostProcessor.java +++ b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanFactoryPostProcessor.java @@ -15,9 +15,13 @@ * along with this program. If not, see . */ -package we.beans.factory.config; +package com.fizzgate.beans.factory.config; -import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.config.FizzConfigConfiguration; +import com.fizzgate.context.config.annotation.FizzRefreshScope; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReflectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -35,15 +39,10 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import we.config.FizzConfigConfiguration; -import we.config.RedisReactiveProperties; -import we.context.config.annotation.FizzRefreshScope; -import we.context.event.FizzRefreshEvent; -import we.util.*; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * @author hongqiaowei @@ -53,25 +52,36 @@ public class FizzBeanFactoryPostProcessor implements BeanFactoryPostProcessor, E private static final Logger LOGGER = LoggerFactory.getLogger(FizzBeanFactoryPostProcessor.class); - private ApplicationContext applicationContext; + private static ApplicationContext applicationContext; + private ConfigurableEnvironment environment; - private final Map property2beanMap = new HashMap<>(); + private final Map property2beanMap = new HashMap<>(); private ReactiveStringRedisTemplate reactiveStringRedisTemplate; + + protected static ApplicationContext getApplicationContext() { + return applicationContext; + } + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { String fizzConfigEnable = environment.getProperty("fizz.config.enable", Consts.S.TRUE); if (fizzConfigEnable.equals(Consts.S.TRUE)) { - initReactiveStringRedisTemplate(); - initFizzPropertySource(); + // initReactiveStringRedisTemplate(); + // initFizzPropertySource(); + + Map sources = FizzEnvironmentPostProcessor.getSources(); + MapPropertySource fizzPropertySource = new MapPropertySource(FizzConfigConfiguration.PROPERTY_SOURCE + "AfterBeanFactory", sources); + environment.getPropertySources().addFirst(fizzPropertySource); + initBeanProperty2beanMap(beanFactory); } } - private void initReactiveStringRedisTemplate() { + /* private void initReactiveStringRedisTemplate() { RedisReactiveProperties redisReactiveProperties = new RedisReactiveProperties() { }; @@ -91,9 +101,9 @@ public class FizzBeanFactoryPostProcessor implements BeanFactoryPostProcessor, E } reactiveStringRedisTemplate = ReactiveRedisHelper.getStringRedisTemplate(redisReactiveProperties); - } + } */ - private void initFizzPropertySource() { + /* private void initFizzPropertySource() { MutablePropertySources propertySources = environment.getPropertySources(); Map sources = new HashMap<>(); MapPropertySource fizzPropertySource = new MapPropertySource(FizzConfigConfiguration.PROPERTY_SOURCE, sources); @@ -190,7 +200,7 @@ public class FizzBeanFactoryPostProcessor implements BeanFactoryPostProcessor, E if (result.code == Result.FAIL) { throw new RuntimeException(result.msg, result.t); } - } + } */ private void initBeanProperty2beanMap(ConfigurableListableBeanFactory beanFactory) { ClassLoader beanClassLoader = beanFactory.getBeanClassLoader(); diff --git a/fizz-core/src/main/java/we/beans/factory/config/FizzBeanPostProcessor.java b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanPostProcessor.java similarity index 97% rename from fizz-core/src/main/java/we/beans/factory/config/FizzBeanPostProcessor.java rename to fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanPostProcessor.java index 52b3b3f..fb2d1f6 100644 --- a/fizz-core/src/main/java/we/beans/factory/config/FizzBeanPostProcessor.java +++ b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzBeanPostProcessor.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.beans.factory.config; +package com.fizzgate.beans.factory.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzEnvironmentPostProcessor.java b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzEnvironmentPostProcessor.java new file mode 100644 index 0000000..c0b9583 --- /dev/null +++ b/fizz-core/src/main/java/com/fizzgate/beans/factory/config/FizzEnvironmentPostProcessor.java @@ -0,0 +1,209 @@ +package com.fizzgate.beans.factory.config; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.config.FizzConfigConfiguration; +import com.fizzgate.config.RedisReactiveProperties; +import com.fizzgate.context.event.FizzRefreshEvent; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactiveRedisHelper; +import com.fizzgate.util.Result; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.context.event.ApplicationPreparedEvent; +import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.logging.DeferredLog; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.event.SmartApplicationListener; +import org.springframework.core.Ordered; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.data.redis.core.ReactiveStringRedisTemplate; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author hongqiaowei + */ + +public class FizzEnvironmentPostProcessor implements EnvironmentPostProcessor, SmartApplicationListener, Ordered { + + private static final DeferredLog LOGGER = new DeferredLog(); + + private static Logger LOG = null; + + private static final Map sources = new HashMap<>(); + + + private ConfigurableEnvironment environment; + + private ReactiveStringRedisTemplate reactiveStringRedisTemplate; + + + protected static Map getSources() { + return sources; + } + + public int getOrder() { + return Ordered.LOWEST_PRECEDENCE; + } + + @Override + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { + String fizzConfigEnable = environment.getProperty("fizz.config.enable", Consts.S.TRUE); + if (fizzConfigEnable.equals(Consts.S.TRUE)) { + String host = environment.getProperty("aggregate.redis.host"); + String clusterNodes = environment.getProperty("aggregate.redis.clusterNodes"); + if (StringUtils.isNotBlank(host) || StringUtils.isNotBlank(clusterNodes)) { + this.environment = environment; + initReactiveStringRedisTemplate(); + initFizzPropertySource(); + } + } + } + + private void initReactiveStringRedisTemplate() { + RedisReactiveProperties redisReactiveProperties = new RedisReactiveProperties() { + }; + + String host = environment.getProperty("aggregate.redis.host"); + if (StringUtils.isBlank(host)) { + redisReactiveProperties.setType(RedisReactiveProperties.CLUSTER); + redisReactiveProperties.setClusterNodes(environment.getProperty("aggregate.redis.clusterNodes")); + } else { + redisReactiveProperties.setHost(host); + redisReactiveProperties.setPort(Integer.parseInt(environment.getProperty("aggregate.redis.port"))); + redisReactiveProperties.setDatabase(Integer.parseInt(environment.getProperty("aggregate.redis.database"))); + } + + String password = environment.getProperty("aggregate.redis.password"); + if (StringUtils.isNotBlank(password)) { + redisReactiveProperties.setPassword(password); + } + + reactiveStringRedisTemplate = ReactiveRedisHelper.getStringRedisTemplate(redisReactiveProperties); + } + + private void initFizzPropertySource() { + MutablePropertySources propertySources = environment.getPropertySources(); + MapPropertySource fizzPropertySource = new MapPropertySource(FizzConfigConfiguration.PROPERTY_SOURCE + "AfterEnv", sources); + propertySources.addFirst(fizzPropertySource); + + Result result = Result.succ(); + Flux> fizzConfigs = reactiveStringRedisTemplate.opsForHash().entries("fizz_config"); + fizzConfigs.collectList() + .defaultIfEmpty(Collections.emptyList()) + .flatMap( + es -> { + if (es.isEmpty()) { + LOGGER.info("no fizz configs"); + } else { + String value = null; + try { + for (Map.Entry e : es) { + String key = (String) e.getKey(); + value = (String) e.getValue(); + Map config = JacksonUtils.readValue(value, new TypeReference>(){}); + sources.put(key, config.get(key)); + } + } catch (Throwable t) { + result.code = Result.FAIL; + result.msg = "init fizz configs error, json: " + value; + result.t = t; + } + } + return Mono.empty(); + } + ) + .onErrorReturn( + throwable -> { + result.code = Result.FAIL; + result.msg = "init fizz configs error"; + result.t = throwable; + return true; + }, + result + ) + .block(); + + if (result.code == Result.FAIL) { + throw new RuntimeException(result.msg, result.t); + } + if (!sources.isEmpty()) { + LOGGER.info("fizz configs: " + JacksonUtils.writeValueAsString(sources)); + } + + String channel = "fizz_config_channel"; + reactiveStringRedisTemplate.listenToChannel(channel) + .doOnError( + t -> { + result.code = Result.FAIL; + result.msg = "lsn " + channel + " channel error"; + result.t = t; + LOGGER.error("lsn channel " + channel + " error", t); + } + ) + .doOnSubscribe( + s -> { + LOGGER.info("success to lsn on " + channel); + } + ) + .doOnNext( + msg -> { + if (LOG == null) { + LOG = LoggerFactory.getLogger(FizzEnvironmentPostProcessor.class); + } + String message = msg.getMessage(); + try { + Map changedPropertyValueMap = new HashMap<>(); + List> changes = JacksonUtils.readValue(message, new TypeReference>>(){}); + for (Map change : changes) { + int isDeleted = (int) change.remove("isDeleted"); + Map.Entry propertyValue = change.entrySet().iterator().next(); + String property = propertyValue.getKey(); + Object v = null; + if (isDeleted == 1) { + sources.remove(property); + } else { + v = propertyValue.getValue(); + sources.put(property, v); + } + changedPropertyValueMap.put(property, v); + } + LOG.info("new fizz configs: " + JacksonUtils.writeValueAsString(sources)); + ApplicationContext applicationContext = FizzBeanFactoryPostProcessor.getApplicationContext(); + FizzRefreshEvent refreshEvent = new FizzRefreshEvent(applicationContext, FizzRefreshEvent.ENV_CHANGE, changedPropertyValueMap); + applicationContext.publishEvent(refreshEvent); + } catch (Throwable t) { + LOG.error("update fizz config " + message + " error", t); + } + } + ) + .subscribe(); + + if (result.code == Result.FAIL) { + throw new RuntimeException(result.msg, result.t); + } + } + + @Override + public boolean supportsEventType(Class eventType) { + return ApplicationPreparedEvent.class.isAssignableFrom(eventType); + } + + @Override + public void onApplicationEvent(ApplicationEvent event) { + if (event instanceof ApplicationPreparedEvent) { + LOGGER.replayTo(FizzEnvironmentPostProcessor.class); + } + } +} \ No newline at end of file diff --git a/fizz-core/src/main/java/we/config/AggregateRedisConfig.java b/fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfig.java similarity index 97% rename from fizz-core/src/main/java/we/config/AggregateRedisConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfig.java index d459e90..3be6a8f 100644 --- a/fizz-core/src/main/java/we/config/AggregateRedisConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -32,8 +32,11 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSeriali import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.session.data.redis.config.annotation.SpringSessionRedisConnectionFactory; -import we.log.LogSendAppender; -import we.log.RedisLogSendServiceImpl; + +import com.fizzgate.config.RedisReactiveConfig; +import com.fizzgate.config.RedisReactiveProperties; +import com.fizzgate.log.LogSendAppender; +import com.fizzgate.log.RedisLogSendServiceImpl; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/config/AggregateRedisConfigProperties.java b/fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfigProperties.java similarity index 90% rename from fizz-core/src/main/java/we/config/AggregateRedisConfigProperties.java rename to fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfigProperties.java index 6d50624..851c668 100644 --- a/fizz-core/src/main/java/we/config/AggregateRedisConfigProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/config/AggregateRedisConfigProperties.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; -import we.context.config.annotation.FizzRefreshScope; + +import com.fizzgate.context.config.annotation.FizzRefreshScope; /** * {@link AggregateRedisConfig} properties diff --git a/fizz-core/src/main/java/we/config/ApolloConfig.java b/fizz-core/src/main/java/com/fizzgate/config/ApolloConfig.java similarity index 97% rename from fizz-core/src/main/java/we/config/ApolloConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/ApolloConfig.java index 8491704..359d745 100644 --- a/fizz-core/src/main/java/we/config/ApolloConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/ApolloConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/fizz-core/src/main/java/we/config/AppConfigProperties.java b/fizz-core/src/main/java/com/fizzgate/config/AppConfigProperties.java similarity index 97% rename from fizz-core/src/main/java/we/config/AppConfigProperties.java rename to fizz-core/src/main/java/com/fizzgate/config/AppConfigProperties.java index 774cc2e..6e4fa5a 100644 --- a/fizz-core/src/main/java/we/config/AppConfigProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/config/AppConfigProperties.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/config/FizzConfigConfiguration.java b/fizz-core/src/main/java/com/fizzgate/config/FizzConfigConfiguration.java similarity index 95% rename from fizz-core/src/main/java/we/config/FizzConfigConfiguration.java rename to fizz-core/src/main/java/com/fizzgate/config/FizzConfigConfiguration.java index 631b9d9..3ed2085 100644 --- a/fizz-core/src/main/java/we/config/FizzConfigConfiguration.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FizzConfigConfiguration.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import we.beans.factory.config.FizzBeanFactoryPostProcessor; -import we.context.event.FizzRefreshEventListener; -import we.context.scope.refresh.FizzRefreshScope; + +import com.fizzgate.beans.factory.config.FizzBeanFactoryPostProcessor; +import com.fizzgate.context.event.FizzRefreshEventListener; +import com.fizzgate.context.scope.refresh.FizzRefreshScope; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/main/java/we/config/FizzGatewayNodeStatSchedConfig.java b/fizz-core/src/main/java/com/fizzgate/config/FizzGatewayNodeStatSchedConfig.java similarity index 93% rename from fizz-core/src/main/java/we/config/FizzGatewayNodeStatSchedConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/FizzGatewayNodeStatSchedConfig.java index 9a4f199..197eb25 100644 --- a/fizz-core/src/main/java/we/config/FizzGatewayNodeStatSchedConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FizzGatewayNodeStatSchedConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,12 +27,14 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.util.CollectionUtils; -import we.stats.FlowStat; -import we.stats.ResourceTimeWindowStat; -import we.stats.TimeWindowStat; -import we.util.JacksonUtils; -import we.util.NetworkUtils; -import we.util.ResourceIdUtils; + +import com.fizzgate.config.SchedConfig; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.NetworkUtils; +import com.fizzgate.util.ResourceIdUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/config/FizzMangerConfig.java b/fizz-core/src/main/java/com/fizzgate/config/FizzMangerConfig.java similarity index 96% rename from fizz-core/src/main/java/we/config/FizzMangerConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/FizzMangerConfig.java index 3df38a6..7aa7eaf 100644 --- a/fizz-core/src/main/java/we/config/FizzMangerConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FizzMangerConfig.java @@ -15,15 +15,17 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.Result; + import reactor.core.publisher.Mono; -import we.util.Consts; -import we.util.Result; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/config/FlowControlConfig.java b/fizz-core/src/main/java/com/fizzgate/config/FlowControlConfig.java similarity index 90% rename from fizz-core/src/main/java/we/config/FlowControlConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/FlowControlConfig.java index 84fd2b0..d30bf1f 100644 --- a/fizz-core/src/main/java/we/config/FlowControlConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FlowControlConfig.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import we.stats.FlowStat; -import we.stats.circuitbreaker.CircuitBreakManager; + +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java b/fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfig.java similarity index 97% rename from fizz-core/src/main/java/we/config/FlowStatSchedConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfig.java index ebe3bca..c2e8106 100644 --- a/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,12 +23,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; -import we.stats.FlowStat; -import we.stats.ResourceTimeWindowStat; -import we.stats.TimeWindowStat; -import we.stats.ratelimit.ResourceRateLimitConfig; -import we.stats.ratelimit.ResourceRateLimitConfigService; -import we.util.*; + +import com.fizzgate.config.SchedConfig; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.*; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/fizz-core/src/main/java/we/config/FlowStatSchedConfigProperties.java b/fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfigProperties.java similarity index 94% rename from fizz-core/src/main/java/we/config/FlowStatSchedConfigProperties.java rename to fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfigProperties.java index d4f2fcb..be5e5a3 100644 --- a/fizz-core/src/main/java/we/config/FlowStatSchedConfigProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/config/FlowStatSchedConfigProperties.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 we.config; +package com.fizzgate.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/com/fizzgate/config/LogConfig.java b/fizz-core/src/main/java/com/fizzgate/config/LogConfig.java new file mode 100644 index 0000000..bc8dc2e --- /dev/null +++ b/fizz-core/src/main/java/com/fizzgate/config/LogConfig.java @@ -0,0 +1,2 @@ +package com.fizzgate.config; + diff --git a/fizz-core/src/main/java/we/config/ManualApiConfig.java b/fizz-core/src/main/java/com/fizzgate/config/ManualApiConfig.java similarity index 96% rename from fizz-core/src/main/java/we/config/ManualApiConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/ManualApiConfig.java index 7f456ee..282409e 100644 --- a/fizz-core/src/main/java/we/config/ManualApiConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/ManualApiConfig.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.plugin.auth.*; + +import com.fizzgate.plugin.auth.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/config/ProxyWebClientConfig.java b/fizz-core/src/main/java/com/fizzgate/config/ProxyWebClientConfig.java similarity index 95% rename from fizz-core/src/main/java/we/config/ProxyWebClientConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/ProxyWebClientConfig.java index e9a24ad..6dbe3f3 100644 --- a/fizz-core/src/main/java/we/config/ProxyWebClientConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/ProxyWebClientConfig.java @@ -15,13 +15,15 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.reactive.function.client.WebClient; +import com.fizzgate.config.WebClientConfig; + /** * @author hongqiaowei */ diff --git a/fizz-core/src/main/java/we/config/RefreshLocalCacheConfig.java b/fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfig.java similarity index 92% rename from fizz-core/src/main/java/we/config/RefreshLocalCacheConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfig.java index ba78c4a..3148837 100644 --- a/fizz-core/src/main/java/we/config/RefreshLocalCacheConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfig.java @@ -14,22 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Scheduled; -import we.fizz.ConfigLoader; -import we.plugin.auth.ApiConfig2appsService; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.AppService; -import we.plugin.auth.GatewayGroupService; -import we.proxy.RpcInstanceService; -import we.service_registry.RegistryCenterService; -import we.stats.degrade.DegradeRuleService; -import we.stats.ratelimit.ResourceRateLimitConfigService; -import we.util.Result; + +import com.fizzgate.fizz.ConfigLoader; +import com.fizzgate.plugin.auth.ApiConfig2appsService; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.AppService; +import com.fizzgate.plugin.auth.GatewayGroupService; +import com.fizzgate.proxy.RpcInstanceService; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.stats.degrade.DegradeRuleService; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.Result; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/config/RefreshLocalCacheConfigProperties.java b/fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfigProperties.java similarity index 96% rename from fizz-core/src/main/java/we/config/RefreshLocalCacheConfigProperties.java rename to fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfigProperties.java index e28ddae..f3cda2f 100644 --- a/fizz-core/src/main/java/we/config/RefreshLocalCacheConfigProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/config/RefreshLocalCacheConfigProperties.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 we.config; +package com.fizzgate.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/com/fizzgate/config/SystemConfig.java similarity index 93% rename from fizz-core/src/main/java/we/config/SystemConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/SystemConfig.java index 83ee4c5..38d81d5 100644 --- a/fizz-core/src/main/java/we/config/SystemConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/SystemConfig.java @@ -15,19 +15,19 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import we.context.config.annotation.FizzRefreshScope; -import we.util.Consts; -import we.util.UUIDUtil; -import we.util.WebUtils; + +import com.fizzgate.context.config.annotation.FizzRefreshScope; +import com.fizzgate.util.Consts; +import com.fizzgate.util.UUIDUtil; +import com.fizzgate.util.WebUtils; import javax.annotation.PostConstruct; import java.util.*; @@ -44,7 +44,7 @@ public class SystemConfig { private static final Logger log = LoggerFactory.getLogger(SystemConfig.class); - public static final String DEFAULT_GATEWAY_PREFIX = "/proxy"; + public static final String DEFAULT_GATEWAY_PREFIX = "/"; public static final String DEFAULT_GATEWAY_TEST_PREFIX = "/_proxytest"; public static final String DEFAULT_GATEWAY_TEST = "_proxytest"; public static final String DEFAULT_GATEWAY_TEST_PREFIX0 = "/_proxytest/"; @@ -132,6 +132,20 @@ public class SystemConfig { @Value("${fizz.fast-fail-when-registry-center-down:false}") private boolean fastFailWhenRegistryCenterDown; + @Value("${fizz.web-client.x-forwarded-for.enable:true}") + private boolean fizzWebClientXForwardedForEnable; + + @Value("${fizz.web-client.x-forwarded-for.append-gateway-ip:true}") + private boolean fizzWebClientXForwardedForAppendGatewayIp; + + public boolean isFizzWebClientXForwardedForAppendGatewayIp() { + return fizzWebClientXForwardedForAppendGatewayIp; + } + + public boolean isFizzWebClientXForwardedForEnable() { + return fizzWebClientXForwardedForEnable; + } + public boolean isFastFailWhenRegistryCenterDown() { return fastFailWhenRegistryCenterDown; } @@ -203,7 +217,7 @@ public class SystemConfig { return proxySetHeaders; } - @Value("${gateway.prefix:/proxy}") + @Value("${gateway.prefix:/}") public void setGatewayPrefix(String gp) { gatewayPrefix = gp; WebUtils.setGatewayPrefix(gatewayPrefix); diff --git a/fizz-core/src/main/java/we/config/WebServerConfig.java b/fizz-core/src/main/java/com/fizzgate/config/WebServerConfig.java similarity index 99% rename from fizz-core/src/main/java/we/config/WebServerConfig.java rename to fizz-core/src/main/java/com/fizzgate/config/WebServerConfig.java index 7cb9750..98a5856 100644 --- a/fizz-core/src/main/java/we/config/WebServerConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/config/WebServerConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fizz-core/src/main/java/we/config/WebServerConfigProperties.java b/fizz-core/src/main/java/com/fizzgate/config/WebServerConfigProperties.java similarity index 98% rename from fizz-core/src/main/java/we/config/WebServerConfigProperties.java rename to fizz-core/src/main/java/com/fizzgate/config/WebServerConfigProperties.java index 3286434..824c6b5 100644 --- a/fizz-core/src/main/java/we/config/WebServerConfigProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/config/WebServerConfigProperties.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.config; +package com.fizzgate.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/context/config/annotation/FizzRefreshScope.java b/fizz-core/src/main/java/com/fizzgate/context/config/annotation/FizzRefreshScope.java similarity index 91% rename from fizz-core/src/main/java/we/context/config/annotation/FizzRefreshScope.java rename to fizz-core/src/main/java/com/fizzgate/context/config/annotation/FizzRefreshScope.java index 9d924c2..e4344ab 100644 --- a/fizz-core/src/main/java/we/context/config/annotation/FizzRefreshScope.java +++ b/fizz-core/src/main/java/com/fizzgate/context/config/annotation/FizzRefreshScope.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.context.config.annotation; +package com.fizzgate.context.config.annotation; import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.ScopedProxyMode; -import we.config.FizzConfigConfiguration; + +import com.fizzgate.config.FizzConfigConfiguration; import java.lang.annotation.*; diff --git a/fizz-core/src/main/java/we/context/event/FizzApplicationListener.java b/fizz-core/src/main/java/com/fizzgate/context/event/FizzApplicationListener.java similarity index 97% rename from fizz-core/src/main/java/we/context/event/FizzApplicationListener.java rename to fizz-core/src/main/java/com/fizzgate/context/event/FizzApplicationListener.java index aa7fec9..9a03a9e 100644 --- a/fizz-core/src/main/java/we/context/event/FizzApplicationListener.java +++ b/fizz-core/src/main/java/com/fizzgate/context/event/FizzApplicationListener.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.context.event; +package com.fizzgate.context.event; import org.springframework.context.ApplicationEvent; import org.springframework.context.event.SmartApplicationListener; diff --git a/fizz-core/src/main/java/we/context/event/FizzRefreshEvent.java b/fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEvent.java similarity index 94% rename from fizz-core/src/main/java/we/context/event/FizzRefreshEvent.java rename to fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEvent.java index 12c7995..b37443a 100644 --- a/fizz-core/src/main/java/we/context/event/FizzRefreshEvent.java +++ b/fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEvent.java @@ -15,10 +15,11 @@ * along with this program. If not, see . */ -package we.context.event; +package com.fizzgate.context.event; import org.springframework.context.ApplicationEvent; -import we.util.JacksonUtils; + +import com.fizzgate.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/context/event/FizzRefreshEventListener.java b/fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEventListener.java similarity index 94% rename from fizz-core/src/main/java/we/context/event/FizzRefreshEventListener.java rename to fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEventListener.java index fdd82af..faf199e 100644 --- a/fizz-core/src/main/java/we/context/event/FizzRefreshEventListener.java +++ b/fizz-core/src/main/java/com/fizzgate/context/event/FizzRefreshEventListener.java @@ -15,16 +15,17 @@ * along with this program. If not, see . */ -package we.context.event; +package com.fizzgate.context.event; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationEvent; import org.springframework.context.event.SmartApplicationListener; -import we.beans.factory.config.FizzBeanFactoryPostProcessor; -import we.context.scope.refresh.FizzRefreshScope; -import we.util.JacksonUtils; + +import com.fizzgate.beans.factory.config.FizzBeanFactoryPostProcessor; +import com.fizzgate.context.scope.refresh.FizzRefreshScope; +import com.fizzgate.util.JacksonUtils; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScope.java b/fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScope.java similarity index 97% rename from fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScope.java rename to fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScope.java index 323dfd5..974396a 100644 --- a/fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScope.java +++ b/fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScope.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.context.scope.refresh; +package com.fizzgate.context.scope.refresh; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; @@ -28,7 +28,8 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.Ordered; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; -import we.config.FizzConfigConfiguration; + +import com.fizzgate.config.FizzConfigConfiguration; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java b/fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java similarity index 96% rename from fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java rename to fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java index 47b0d23..2e70fb3 100644 --- a/fizz-core/src/main/java/we/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java +++ b/fizz-core/src/main/java/com/fizzgate/context/scope/refresh/FizzRefreshScopeRefreshedEvent.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.context.scope.refresh; +package com.fizzgate.context.scope.refresh; import org.springframework.context.ApplicationEvent; diff --git a/fizz-core/src/main/java/we/controller/CacheCheckController.java b/fizz-core/src/main/java/com/fizzgate/controller/CacheCheckController.java similarity index 91% rename from fizz-core/src/main/java/we/controller/CacheCheckController.java rename to fizz-core/src/main/java/com/fizzgate/controller/CacheCheckController.java index 7d62fa6..1f90547 100644 --- a/fizz-core/src/main/java/we/controller/CacheCheckController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/CacheCheckController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; import org.openjdk.jol.info.GraphLayout; import org.springframework.beans.factory.annotation.Autowired; @@ -23,20 +23,22 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.global_resource.GlobalResourceService; +import com.fizzgate.plugin.auth.ApiConfig2appsService; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.AppService; +import com.fizzgate.plugin.auth.GatewayGroupService; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceStat; +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ResourceIdUtils; + import reactor.core.publisher.Mono; -import we.global_resource.GlobalResourceService; -import we.plugin.auth.ApiConfig2appsService; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.AppService; -import we.plugin.auth.GatewayGroupService; -import we.stats.FlowStat; -import we.stats.ResourceStat; -import we.stats.circuitbreaker.CircuitBreakManager; -import we.stats.ratelimit.ResourceRateLimitConfig; -import we.stats.ratelimit.ResourceRateLimitConfigService; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ResourceIdUtils; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/fizz-core/src/main/java/we/controller/CallbackController.java b/fizz-core/src/main/java/com/fizzgate/controller/CallbackController.java similarity index 93% rename from fizz-core/src/main/java/we/controller/CallbackController.java rename to fizz-core/src/main/java/com/fizzgate/controller/CallbackController.java index 12c1f05..24566ab 100644 --- a/fizz-core/src/main/java/we/controller/CallbackController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/CallbackController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,13 +26,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.proxy.CallbackReplayReq; +import com.fizzgate.proxy.CallbackService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Result; +import com.fizzgate.util.ThreadContext; + import reactor.core.publisher.Mono; -import we.proxy.CallbackReplayReq; -import we.proxy.CallbackService; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.Result; -import we.util.ThreadContext; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/controller/ConfigController.java b/fizz-core/src/main/java/com/fizzgate/controller/ConfigController.java similarity index 94% rename from fizz-core/src/main/java/we/controller/ConfigController.java rename to fizz-core/src/main/java/com/fizzgate/controller/ConfigController.java index 953d82c..807e2e1 100644 --- a/fizz-core/src/main/java/we/controller/ConfigController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/ConfigController.java @@ -15,15 +15,17 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; import org.apache.commons.io.FileUtils; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.fizz.ConfigLoader; +import com.fizzgate.util.ScriptUtils; + import reactor.core.publisher.Mono; -import we.fizz.ConfigLoader; -import we.util.ScriptUtils; import javax.annotation.Resource; import java.io.File; diff --git a/fizz-core/src/main/java/we/controller/FlowControlController.java b/fizz-core/src/main/java/com/fizzgate/controller/FlowControlController.java similarity index 91% rename from fizz-core/src/main/java/we/controller/FlowControlController.java rename to fizz-core/src/main/java/com/fizzgate/controller/FlowControlController.java index 18f7877..e4bafef 100644 --- a/fizz-core/src/main/java/we/controller/FlowControlController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/FlowControlController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,15 +27,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ResourceIdUtils; + import reactor.core.publisher.Mono; -import we.stats.FlowStat; -import we.stats.ResourceTimeWindowStat; -import we.stats.TimeWindowStat; -import we.stats.ratelimit.ResourceRateLimitConfig; -import we.util.Consts; -import we.util.DateTimeUtils; -import we.util.JacksonUtils; -import we.util.ResourceIdUtils; import java.math.BigDecimal; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/controller/HealthCheckController.java b/fizz-core/src/main/java/com/fizzgate/controller/HealthCheckController.java similarity index 92% rename from fizz-core/src/main/java/we/controller/HealthCheckController.java rename to fizz-core/src/main/java/com/fizzgate/controller/HealthCheckController.java index 3682d91..f66529d 100644 --- a/fizz-core/src/main/java/we/controller/HealthCheckController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/HealthCheckController.java @@ -15,15 +15,17 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; + import reactor.core.publisher.Mono; -import we.util.Consts; -import we.util.DateTimeUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/controller/ManagerConfigController.java b/fizz-core/src/main/java/com/fizzgate/controller/ManagerConfigController.java similarity index 93% rename from fizz-core/src/main/java/we/controller/ManagerConfigController.java rename to fizz-core/src/main/java/com/fizzgate/controller/ManagerConfigController.java index 13b9d44..263dbff 100644 --- a/fizz-core/src/main/java/we/controller/ManagerConfigController.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/ManagerConfigController.java @@ -15,8 +15,25 @@ * along with this program. If not, see . */ -package we.controller; +package com.fizzgate.controller; +import com.fizzgate.controller.req.BaseManagerConfigReq; +import com.fizzgate.controller.req.GetApiConfigDetailReq; +import com.fizzgate.controller.req.GetApiConfigReq; +import com.fizzgate.controller.req.GetConfigReq; +import com.fizzgate.controller.req.GetConfigStrReq; +import com.fizzgate.controller.resp.ApiConfigInfo; +import com.fizzgate.controller.resp.ConfigResp; +import com.fizzgate.controller.resp.ConfigStrResp; +import com.fizzgate.controller.resp.GetApiConfigDetailResp; +import com.fizzgate.controller.resp.GetApiConfigResp; +import com.fizzgate.fizz.ConfigLoader; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.ApiConfig2appsService; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.GatewayGroup; +import com.fizzgate.plugin.auth.GatewayGroupService; import com.google.common.collect.Sets; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -28,23 +45,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; -import we.controller.req.BaseManagerConfigReq; -import we.controller.req.GetApiConfigDetailReq; -import we.controller.req.GetApiConfigReq; -import we.controller.req.GetConfigReq; -import we.controller.req.GetConfigStrReq; -import we.controller.resp.ApiConfigInfo; -import we.controller.resp.ConfigResp; -import we.controller.resp.ConfigStrResp; -import we.controller.resp.GetApiConfigDetailResp; -import we.controller.resp.GetApiConfigResp; -import we.fizz.ConfigLoader; -import we.plugin.PluginConfig; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.ApiConfig2appsService; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.GatewayGroup; -import we.plugin.auth.GatewayGroupService; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/fizz-core/src/main/java/we/controller/req/BaseManagerConfigReq.java b/fizz-core/src/main/java/com/fizzgate/controller/req/BaseManagerConfigReq.java similarity index 98% rename from fizz-core/src/main/java/we/controller/req/BaseManagerConfigReq.java rename to fizz-core/src/main/java/com/fizzgate/controller/req/BaseManagerConfigReq.java index e491ab5..dd9ed0d 100644 --- a/fizz-core/src/main/java/we/controller/req/BaseManagerConfigReq.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/req/BaseManagerConfigReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller.req; +package com.fizzgate.controller.req; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/fizz-core/src/main/java/we/controller/req/GetApiConfigDetailReq.java b/fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigDetailReq.java similarity index 94% rename from fizz-core/src/main/java/we/controller/req/GetApiConfigDetailReq.java rename to fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigDetailReq.java index b78df71..ff54630 100644 --- a/fizz-core/src/main/java/we/controller/req/GetApiConfigDetailReq.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigDetailReq.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 we.controller.req; +package com.fizzgate.controller.req; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/fizz-core/src/main/java/we/controller/req/GetApiConfigReq.java b/fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigReq.java similarity index 94% rename from fizz-core/src/main/java/we/controller/req/GetApiConfigReq.java rename to fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigReq.java index 0609433..fafcf39 100644 --- a/fizz-core/src/main/java/we/controller/req/GetApiConfigReq.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/req/GetApiConfigReq.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 we.controller.req; +package com.fizzgate.controller.req; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/fizz-core/src/main/java/we/controller/req/GetConfigReq.java b/fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigReq.java similarity index 98% rename from fizz-core/src/main/java/we/controller/req/GetConfigReq.java rename to fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigReq.java index cc364c6..71cc2d6 100644 --- a/fizz-core/src/main/java/we/controller/req/GetConfigReq.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller.req; +package com.fizzgate.controller.req; import org.springframework.util.DigestUtils; diff --git a/fizz-core/src/main/java/we/controller/req/GetConfigStrReq.java b/fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigStrReq.java similarity index 98% rename from fizz-core/src/main/java/we/controller/req/GetConfigStrReq.java rename to fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigStrReq.java index a25d795..64f2624 100644 --- a/fizz-core/src/main/java/we/controller/req/GetConfigStrReq.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/req/GetConfigStrReq.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller.req; +package com.fizzgate.controller.req; import org.springframework.util.DigestUtils; diff --git a/fizz-core/src/main/java/we/controller/resp/ApiConfigInfo.java b/fizz-core/src/main/java/com/fizzgate/controller/resp/ApiConfigInfo.java similarity index 93% rename from fizz-core/src/main/java/we/controller/resp/ApiConfigInfo.java rename to fizz-core/src/main/java/com/fizzgate/controller/resp/ApiConfigInfo.java index 294de37..8012862 100644 --- a/fizz-core/src/main/java/we/controller/resp/ApiConfigInfo.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/resp/ApiConfigInfo.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 we.controller.resp; +package com.fizzgate.controller.resp; import lombok.Data; diff --git a/fizz-core/src/main/java/we/controller/resp/ConfigResp.java b/fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigResp.java similarity index 95% rename from fizz-core/src/main/java/we/controller/resp/ConfigResp.java rename to fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigResp.java index d494175..c69ed7d 100644 --- a/fizz-core/src/main/java/we/controller/resp/ConfigResp.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigResp.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package we.controller.resp; +package com.fizzgate.controller.resp; import java.io.Serializable; import java.util.List; import java.util.Objects; -import we.fizz.ConfigLoader; +import com.fizzgate.fizz.ConfigLoader; /** * 聚合配置响应实体类 diff --git a/fizz-core/src/main/java/we/controller/resp/ConfigStrResp.java b/fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigStrResp.java similarity index 97% rename from fizz-core/src/main/java/we/controller/resp/ConfigStrResp.java rename to fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigStrResp.java index f06e6fa..d4c54c3 100644 --- a/fizz-core/src/main/java/we/controller/resp/ConfigStrResp.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/resp/ConfigStrResp.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.controller.resp; +package com.fizzgate.controller.resp; import java.io.Serializable; import java.util.Objects; diff --git a/fizz-core/src/main/java/we/controller/resp/GetApiConfigDetailResp.java b/fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigDetailResp.java similarity index 94% rename from fizz-core/src/main/java/we/controller/resp/GetApiConfigDetailResp.java rename to fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigDetailResp.java index 4067430..e8e3de7 100644 --- a/fizz-core/src/main/java/we/controller/resp/GetApiConfigDetailResp.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigDetailResp.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 we.controller.resp; +package com.fizzgate.controller.resp; import lombok.Data; diff --git a/fizz-core/src/main/java/we/controller/resp/GetApiConfigResp.java b/fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigResp.java similarity index 93% rename from fizz-core/src/main/java/we/controller/resp/GetApiConfigResp.java rename to fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigResp.java index 534d85a..e109c13 100644 --- a/fizz-core/src/main/java/we/controller/resp/GetApiConfigResp.java +++ b/fizz-core/src/main/java/com/fizzgate/controller/resp/GetApiConfigResp.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 we.controller.resp; +package com.fizzgate.controller.resp; import lombok.Data; diff --git a/fizz-core/src/main/java/we/dedicated_line/ApiDoc.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/ApiDoc.java similarity index 93% rename from fizz-core/src/main/java/we/dedicated_line/ApiDoc.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/ApiDoc.java index 9630bc5..368a083 100644 --- a/fizz-core/src/main/java/we/dedicated_line/ApiDoc.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/ApiDoc.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package we.dedicated_line; - -import we.util.JacksonUtils; +package com.fizzgate.dedicated_line; import java.util.Collections; import java.util.List; +import com.fizzgate.util.JacksonUtils; + /** * @author hongqiaowei */ diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLine.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLine.java similarity index 97% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLine.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLine.java index e2ee57e..7cef3f9 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLine.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLine.java @@ -15,12 +15,13 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import cn.hutool.core.codec.Base64; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fizzgate.util.JacksonUtils; + import org.springframework.util.CollectionUtils; -import we.util.JacksonUtils; import java.util.*; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineController.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineController.java similarity index 97% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineController.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineController.java index 77fff23..8313658 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineController.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,11 +30,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.reactive.function.BodyExtractors; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.FizzMangerConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.proxy.FizzWebClient; +import com.fizzgate.util.*; + import reactor.core.publisher.Mono; -import we.config.FizzMangerConfig; -import we.config.SystemConfig; -import we.proxy.FizzWebClient; -import we.util.*; import javax.annotation.Resource; import java.time.LocalDateTime; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineHttpHandler.java similarity index 99% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineHttpHandler.java index 8c27b49..bdde287 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineHttpHandler.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import org.slf4j.Logger; @@ -39,11 +39,13 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange; import org.springframework.web.server.adapter.ForwardedHeaderTransformer; import org.springframework.web.server.i18n.LocaleContextResolver; import org.springframework.web.server.session.WebSessionManager; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.proxy.FizzWebClient; +import com.fizzgate.util.*; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.proxy.FizzWebClient; -import we.util.*; import java.net.URI; import java.util.Arrays; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfo.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfo.java similarity index 95% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfo.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfo.java index e86af31..14d5906 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfo.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfo.java @@ -15,14 +15,15 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import cn.hutool.core.codec.Base64; -import we.util.JacksonUtils; import java.util.Collections; import java.util.List; +import com.fizzgate.util.JacksonUtils; + /** * @author hongqiaowei */ diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfoService.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfoService.java similarity index 96% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfoService.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfoService.java index b3822d1..67bc47c 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineInfoService.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineInfoService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,12 +23,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Result; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.config.SystemConfig; -import we.util.JacksonUtils; -import we.util.Result; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineService.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineService.java similarity index 96% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineService.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineService.java index a88728b..21df63c 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineService.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,14 +24,16 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Result; +import com.fizzgate.util.UrlTransformUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.config.SystemConfig; -import we.plugin.auth.ApiConfig; -import we.util.JacksonUtils; -import we.util.Result; -import we.util.UrlTransformUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineServiceRegistration.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineServiceRegistration.java similarity index 96% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineServiceRegistration.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineServiceRegistration.java index 19e4283..453c32a 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineServiceRegistration.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineServiceRegistration.java @@ -15,9 +15,14 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.service_registry.FizzServiceRegistration; +import com.fizzgate.service_registry.eureka.FizzEurekaHelper; +import com.fizzgate.service_registry.nacos.FizzNacosHelper; + import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +38,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; -import we.config.SystemConfig; -import we.service_registry.FizzServiceRegistration; -import we.service_registry.eureka.FizzEurekaHelper; -import we.service_registry.nacos.FizzNacosHelper; import javax.annotation.PreDestroy; import java.util.Properties; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineUtils.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineUtils.java similarity index 94% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineUtils.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineUtils.java index 0af579d..aec78ae 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineUtils.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineUtils.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; -import we.util.Consts; -import we.util.ThreadContext; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ThreadContext; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServer.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServer.java similarity index 97% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServer.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServer.java index 6698a53..f6f8d47 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServer.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServer.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.web.server.adapter.HttpWebHandlerAdapter; import org.springframework.web.server.session.DefaultWebSessionManager; -import we.config.SystemConfig; + +import com.fizzgate.config.SystemConfig; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServerInitializedEvent.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServerInitializedEvent.java similarity index 97% rename from fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServerInitializedEvent.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServerInitializedEvent.java index 8cb00fd..9590595 100644 --- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineWebServerInitializedEvent.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/DedicatedLineWebServerInitializedEvent.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.springframework.boot.web.reactive.context.ReactiveWebServerApplicationContext; import org.springframework.boot.web.server.WebServer; diff --git a/fizz-core/src/main/java/we/dedicated_line/MethodAndPath.java b/fizz-core/src/main/java/com/fizzgate/dedicated_line/MethodAndPath.java similarity index 91% rename from fizz-core/src/main/java/we/dedicated_line/MethodAndPath.java rename to fizz-core/src/main/java/com/fizzgate/dedicated_line/MethodAndPath.java index a236bd0..269d239 100644 --- a/fizz-core/src/main/java/we/dedicated_line/MethodAndPath.java +++ b/fizz-core/src/main/java/com/fizzgate/dedicated_line/MethodAndPath.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.springframework.http.HttpMethod; -import we.plugin.auth.ApiConfig; -import we.util.JacksonUtils; + +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/exception/ExecuteScriptException.java b/fizz-core/src/main/java/com/fizzgate/exception/ExecuteScriptException.java similarity index 96% rename from fizz-core/src/main/java/we/exception/ExecuteScriptException.java rename to fizz-core/src/main/java/com/fizzgate/exception/ExecuteScriptException.java index 98bffd9..ffd88f8 100644 --- a/fizz-core/src/main/java/we/exception/ExecuteScriptException.java +++ b/fizz-core/src/main/java/com/fizzgate/exception/ExecuteScriptException.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.exception; +package com.fizzgate.exception; -import we.fizz.StepContext; +import com.fizzgate.fizz.StepContext; /** * @author Francis diff --git a/fizz-core/src/main/java/we/exception/ExternalService4xxException.java b/fizz-core/src/main/java/com/fizzgate/exception/ExternalService4xxException.java similarity index 97% rename from fizz-core/src/main/java/we/exception/ExternalService4xxException.java rename to fizz-core/src/main/java/com/fizzgate/exception/ExternalService4xxException.java index fa6400e..b73803f 100644 --- a/fizz-core/src/main/java/we/exception/ExternalService4xxException.java +++ b/fizz-core/src/main/java/com/fizzgate/exception/ExternalService4xxException.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 we.exception; +package com.fizzgate.exception; /** * diff --git a/fizz-core/src/main/java/we/exception/RedirectException.java b/fizz-core/src/main/java/com/fizzgate/exception/RedirectException.java similarity index 97% rename from fizz-core/src/main/java/we/exception/RedirectException.java rename to fizz-core/src/main/java/com/fizzgate/exception/RedirectException.java index cd52dab..27a2f65 100644 --- a/fizz-core/src/main/java/we/exception/RedirectException.java +++ b/fizz-core/src/main/java/com/fizzgate/exception/RedirectException.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.exception; +package com.fizzgate.exception; /** * @author Francis diff --git a/fizz-core/src/main/java/we/exception/StopAndResponseException.java b/fizz-core/src/main/java/com/fizzgate/exception/StopAndResponseException.java similarity index 97% rename from fizz-core/src/main/java/we/exception/StopAndResponseException.java rename to fizz-core/src/main/java/com/fizzgate/exception/StopAndResponseException.java index 16cf94d..2ff078f 100644 --- a/fizz-core/src/main/java/we/exception/StopAndResponseException.java +++ b/fizz-core/src/main/java/com/fizzgate/exception/StopAndResponseException.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.exception; +package com.fizzgate.exception; /** * @author Francis diff --git a/fizz-core/src/main/java/we/filter/AggregateFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/AggregateFilter.java similarity index 89% rename from fizz-core/src/main/java/we/filter/AggregateFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/AggregateFilter.java index 804ce5a..96a73fc 100644 --- a/fizz-core/src/main/java/we/filter/AggregateFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/AggregateFilter.java @@ -15,16 +15,31 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.fizz.AggregateResource; +import com.fizzgate.fizz.AggregateResult; +import com.fizzgate.fizz.ConfigLoader; +import com.fizzgate.fizz.Pipeline; +import com.fizzgate.fizz.input.Input; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.MapUtil; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.WebUtils; + +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; import org.springframework.core.io.buffer.DataBufferUtils; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -38,18 +53,6 @@ import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; -import we.config.SystemConfig; -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.plugin.auth.ApiConfig; -import we.util.Consts; -import we.util.MapUtil; -import we.util.NettyDataBufferUtils; -import we.util.WebUtils; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; @@ -67,6 +70,8 @@ import java.util.Set; public class AggregateFilter implements WebFilter { private static final Logger LOGGER = LoggerFactory.getLogger(AggregateFilter.class); + + private static final String X_FORWARDED_FOR = "X-FORWARDED-FOR"; @Resource private ConfigLoader configLoader; @@ -128,7 +133,11 @@ public class AggregateFilter implements WebFilter { Pipeline pipeline = aggregateResource.getPipeline(); Input input = aggregateResource.getInput(); - Map headers = MapUtil.headerToHashMap(request.getHeaders()); + HttpHeaders hds = request.getHeaders(); + Map headers = MapUtil.headerToHashMap(hds); + if (CollectionUtils.isEmpty(hds.get(X_FORWARDED_FOR)) && systemConfig.isFizzWebClientXForwardedForEnable()) { + headers.put(X_FORWARDED_FOR, WebUtils.getOriginIp(exchange)); + } Map fizzHeaders = (Map) exchange.getAttributes().get(WebUtils.APPEND_HEADERS); if (fizzHeaders != null && !fizzHeaders.isEmpty()) { Set> entrys = fizzHeaders.entrySet(); diff --git a/fizz-core/src/main/java/we/filter/AggregateFilterProperties.java b/fizz-core/src/main/java/com/fizzgate/filter/AggregateFilterProperties.java similarity index 90% rename from fizz-core/src/main/java/we/filter/AggregateFilterProperties.java rename to fizz-core/src/main/java/com/fizzgate/filter/AggregateFilterProperties.java index 6a5d45a..1063af5 100644 --- a/fizz-core/src/main/java/we/filter/AggregateFilterProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/AggregateFilterProperties.java @@ -14,13 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; -import we.context.config.annotation.FizzRefreshScope; + +import com.fizzgate.context.config.annotation.FizzRefreshScope; /** * {@link AggregateFilter} properties diff --git a/fizz-core/src/main/java/we/filter/CallbackFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilter.java similarity index 94% rename from fizz-core/src/main/java/we/filter/CallbackFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/CallbackFilter.java index d6adebb..212f9ed 100644 --- a/fizz-core/src/main/java/we/filter/CallbackFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilter.java @@ -15,9 +15,23 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import com.alibaba.fastjson.JSON; +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.CallbackConfig; +import com.fizzgate.plugin.auth.GatewayGroupService; +import com.fizzgate.plugin.auth.Receiver; +import com.fizzgate.proxy.CallbackService; +import com.fizzgate.proxy.DiscoveryClientUriSelector; +import com.fizzgate.proxy.ServiceInstance; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,19 +48,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.CallbackConfig; -import we.plugin.auth.GatewayGroupService; -import we.plugin.auth.Receiver; -import we.proxy.CallbackService; -import we.proxy.DiscoveryClientUriSelector; -import we.proxy.ServiceInstance; -import we.service_registry.RegistryCenterService; -import we.util.Consts; -import we.util.NettyDataBufferUtils; -import we.util.ThreadContext; -import we.util.WebUtils; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; diff --git a/fizz-core/src/main/java/we/filter/CallbackFilterProperties.java b/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilterProperties.java similarity index 94% rename from fizz-core/src/main/java/we/filter/CallbackFilterProperties.java rename to fizz-core/src/main/java/com/fizzgate/filter/CallbackFilterProperties.java index 7ead8ec..9c6516b 100644 --- a/fizz-core/src/main/java/we/filter/CallbackFilterProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/CallbackFilterProperties.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 we.filter; +package com.fizzgate.filter; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/filter/CorsFilterConfig.java b/fizz-core/src/main/java/com/fizzgate/filter/CorsFilterConfig.java similarity index 97% rename from fizz-core/src/main/java/we/filter/CorsFilterConfig.java rename to fizz-core/src/main/java/com/fizzgate/filter/CorsFilterConfig.java index da49763..2485313 100644 --- a/fizz-core/src/main/java/we/filter/CorsFilterConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/CorsFilterConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -27,7 +27,7 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.reactive.CorsWebFilter; import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; -import we.config.SystemConfig; +import com.fizzgate.config.SystemConfig; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java b/fizz-core/src/main/java/com/fizzgate/filter/FilterExceptionHandlerConfig.java similarity index 93% rename from fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java rename to fizz-core/src/main/java/com/fizzgate/filter/FilterExceptionHandlerConfig.java index 98e25c1..c71bf75 100644 --- a/fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FilterExceptionHandlerConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -30,18 +30,20 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; + +import com.fizzgate.Fizz; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.exception.RedirectException; +import com.fizzgate.exception.StopAndResponseException; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.legacy.RespEntity; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.Fizz; -import we.config.SystemConfig; -import we.exception.ExecuteScriptException; -import we.exception.RedirectException; -import we.exception.StopAndResponseException; -import we.fizz.exception.FizzRuntimeException; -import we.legacy.RespEntity; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ThreadContext; -import we.util.WebUtils; import java.net.URI; diff --git a/fizz-core/src/main/java/we/filter/FilterResult.java b/fizz-core/src/main/java/com/fizzgate/filter/FilterResult.java similarity index 98% rename from fizz-core/src/main/java/we/filter/FilterResult.java rename to fizz-core/src/main/java/com/fizzgate/filter/FilterResult.java index 98f6df4..83e4d12 100644 --- a/fizz-core/src/main/java/we/filter/FilterResult.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FilterResult.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import java.util.Map; diff --git a/fizz-core/src/main/java/we/filter/FizzLogFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/FizzLogFilter.java similarity index 92% rename from fizz-core/src/main/java/we/filter/FizzLogFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/FizzLogFilter.java index c128da9..9878ce4 100644 --- a/fizz-core/src/main/java/we/filter/FizzLogFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FizzLogFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,10 +24,12 @@ import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import reactor.core.publisher.Mono; -import we.util.Consts; -import we.util.ThreadContext; -import we.util.WebUtils; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + +import reactor.core.publisher.Mono; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/filter/FizzWebFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/FizzWebFilter.java similarity index 95% rename from fizz-core/src/main/java/we/filter/FizzWebFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/FizzWebFilter.java index 2f3b21a..5114b04 100644 --- a/fizz-core/src/main/java/we/filter/FizzWebFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FizzWebFilter.java @@ -15,13 +15,15 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; + +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.util.WebUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/filter/FlowControlFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilter.java similarity index 93% rename from fizz-core/src/main/java/we/filter/FlowControlFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilter.java index e66a6d4..6446d11 100644 --- a/fizz-core/src/main/java/we/filter/FlowControlFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -29,22 +29,24 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.monitor.FizzMonitorService; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.AppService; +import com.fizzgate.stats.BlockType; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.IncrRequestResult; +import com.fizzgate.stats.ResourceConfig; +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; +import com.fizzgate.stats.circuitbreaker.CircuitBreaker; +import com.fizzgate.stats.degrade.DegradeRule; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.*; + import reactor.core.publisher.Mono; import reactor.core.publisher.SignalType; -import we.config.SystemConfig; -import we.monitor.FizzMonitorService; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.AppService; -import we.stats.BlockType; -import we.stats.FlowStat; -import we.stats.IncrRequestResult; -import we.stats.ResourceConfig; -import we.stats.circuitbreaker.CircuitBreakManager; -import we.stats.circuitbreaker.CircuitBreaker; -import we.stats.degrade.DegradeRule; -import we.stats.ratelimit.ResourceRateLimitConfig; -import we.stats.ratelimit.ResourceRateLimitConfigService; -import we.util.*; import javax.annotation.Resource; import java.util.ArrayList; @@ -123,11 +125,22 @@ public class FlowControlFilter extends FizzWebFilter { String service = null; if (!favReq) { - int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); - if (secFS == -1) { - return WebUtils.responseError(exchange, HttpStatus.INTERNAL_SERVER_ERROR.value(), "request path should like /optional-prefix/service-name/real-biz-path"); + + String gatewayPrefix = systemConfig.getGatewayPrefix(); + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); + if (secFS == -1) { + service = path.substring(1); + } else { + service = path.substring(1, secFS); + } + } else { + int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); + if (secFS == -1) { + return WebUtils.responseError(exchange, HttpStatus.INTERNAL_SERVER_ERROR.value(), "request path should like /gateway-prefix/service-name/real-biz-path"); + } + service = path.substring(1, secFS); } - service = path.substring(1, secFS); if (service.equals(admin) || service.equals(actuator)) { adminReq = true; diff --git a/fizz-core/src/main/java/we/filter/FlowControlFilterProperties.java b/fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilterProperties.java similarity index 95% rename from fizz-core/src/main/java/we/filter/FlowControlFilterProperties.java rename to fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilterProperties.java index 7ae08c4..9f22371 100644 --- a/fizz-core/src/main/java/we/filter/FlowControlFilterProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/FlowControlFilterProperties.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 we.filter; +package com.fizzgate.filter; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/filter/PreprocessFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/PreprocessFilter.java similarity index 91% rename from fizz-core/src/main/java/we/filter/PreprocessFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/PreprocessFilter.java index 68dc612..0a30972 100644 --- a/fizz-core/src/main/java/we/filter/PreprocessFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/PreprocessFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,20 +25,22 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; + +import com.fizzgate.plugin.FixedPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.AuthPluginFilter; +import com.fizzgate.plugin.auth.GatewayGroup; +import com.fizzgate.plugin.auth.GatewayGroupService; +import com.fizzgate.plugin.stat.StatPluginFilter; +import com.fizzgate.proxy.Route; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.Result; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.FixedPluginFilter; -import we.plugin.FizzPluginFilterChain; -import we.plugin.PluginConfig; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.AuthPluginFilter; -import we.plugin.auth.GatewayGroup; -import we.plugin.auth.GatewayGroupService; -import we.plugin.stat.StatPluginFilter; -import we.proxy.Route; -import we.util.ReactorUtils; -import we.util.Result; -import we.util.ThreadContext; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.*; diff --git a/fizz-core/src/main/java/we/filter/RouteFilter.java b/fizz-core/src/main/java/com/fizzgate/filter/RouteFilter.java similarity index 96% rename from fizz-core/src/main/java/we/filter/RouteFilter.java rename to fizz-core/src/main/java/com/fizzgate/filter/RouteFilter.java index 747e15b..65d9863 100644 --- a/fizz-core/src/main/java/we/filter/RouteFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/filter/RouteFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.filter; +package com.fizzgate.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,15 +32,17 @@ import org.springframework.web.reactive.function.BodyExtractors; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.proxy.FizzWebClient; +import com.fizzgate.proxy.Route; +import com.fizzgate.proxy.dubbo.ApacheDubboGenericService; +import com.fizzgate.proxy.dubbo.DubboInterfaceDeclaration; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.util.*; + import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.plugin.auth.ApiConfig; -import we.proxy.FizzWebClient; -import we.proxy.Route; -import we.proxy.dubbo.ApacheDubboGenericService; -import we.proxy.dubbo.DubboInterfaceDeclaration; -import we.service_registry.RegistryCenterService; -import we.util.*; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; @@ -106,6 +108,7 @@ public class RouteFilter extends FizzWebFilter { if (route != null && route.type != ApiConfig.Type.DUBBO) { hdrs = WebUtils.mergeAppendHeaders(exchange); + WebUtils.setXForwardedFor(exchange, hdrs); } if (route == null) { diff --git a/fizz-core/src/main/java/we/fizz/AggregateResource.java b/fizz-core/src/main/java/com/fizzgate/fizz/AggregateResource.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/AggregateResource.java rename to fizz-core/src/main/java/com/fizzgate/fizz/AggregateResource.java index 2d0dccb..bd5f4a4 100644 --- a/fizz-core/src/main/java/we/fizz/AggregateResource.java +++ b/fizz-core/src/main/java/com/fizzgate/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 we.fizz; +package com.fizzgate.fizz; -import we.fizz.input.Input; +import com.fizzgate.fizz.input.Input; /** * diff --git a/fizz-core/src/main/java/we/fizz/AggregateResult.java b/fizz-core/src/main/java/com/fizzgate/fizz/AggregateResult.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/AggregateResult.java rename to fizz-core/src/main/java/com/fizzgate/fizz/AggregateResult.java index 489021b..199735a 100644 --- a/fizz-core/src/main/java/we/fizz/AggregateResult.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/AggregateResult.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import org.springframework.util.MultiValueMap; diff --git a/fizz-core/src/main/java/we/fizz/AggregateService.java b/fizz-core/src/main/java/com/fizzgate/fizz/AggregateService.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/AggregateService.java rename to fizz-core/src/main/java/com/fizzgate/fizz/AggregateService.java index 626cf55..763e88c 100644 --- a/fizz-core/src/main/java/we/fizz/AggregateService.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/AggregateService.java @@ -15,9 +15,16 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import com.alibaba.fastjson.JSON; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.fizz.input.Input; +import com.fizzgate.util.Consts; +import com.fizzgate.util.MapUtil; +import com.fizzgate.util.Utils; +import com.fizzgate.util.WebUtils; + import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,12 +37,6 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; -import we.config.SystemConfig; -import we.fizz.input.Input; -import we.util.Consts; -import we.util.MapUtil; -import we.util.Utils; -import we.util.WebUtils; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; diff --git a/fizz-core/src/main/java/we/fizz/ConfigLoader.java b/fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoader.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/ConfigLoader.java rename to fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoader.java index acb572a..54565a1 100644 --- a/fizz-core/src/main/java/we/fizz/ConfigLoader.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoader.java @@ -15,10 +15,18 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.fizzgate.config.AppConfigProperties; +import com.fizzgate.fizz.input.ClientInputConfig; +import com.fizzgate.fizz.input.Input; +import com.fizzgate.fizz.input.InputFactory; +import com.fizzgate.fizz.input.InputType; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ReactorUtils; + import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; @@ -32,13 +40,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AppConfigProperties; -import we.fizz.input.ClientInputConfig; -import we.fizz.input.Input; -import we.fizz.input.InputFactory; -import we.fizz.input.InputType; -import we.util.Consts; -import we.util.ReactorUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; @@ -50,9 +51,9 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static we.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE; -import static we.util.Consts.S.FORWARD_SLASH; -import static we.util.Consts.S.FORWARD_SLASH_STR; +import static com.fizzgate.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_TEMPLATE; +import static com.fizzgate.util.Consts.S.FORWARD_SLASH; +import static com.fizzgate.util.Consts.S.FORWARD_SLASH_STR; /** * diff --git a/fizz-core/src/main/java/we/fizz/ConfigLoaderProperties.java b/fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoaderProperties.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/ConfigLoaderProperties.java rename to fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoaderProperties.java index 08babc4..3e6cd7f 100644 --- a/fizz-core/src/main/java/we/fizz/ConfigLoaderProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoaderProperties.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 we.fizz; +package com.fizzgate.fizz; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/fizz/Pipeline.java b/fizz-core/src/main/java/com/fizzgate/fizz/Pipeline.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/Pipeline.java rename to fizz-core/src/main/java/com/fizzgate/fizz/Pipeline.java index 9a504ee..db5e4c9 100644 --- a/fizz-core/src/main/java/we/fizz/Pipeline.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/Pipeline.java @@ -15,9 +15,29 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import com.alibaba.fastjson.JSON; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.exception.RedirectException; +import com.fizzgate.exception.StopAndResponseException; +import com.fizzgate.fizz.component.ComponentExecutor; +import com.fizzgate.fizz.component.ComponentResult; +import com.fizzgate.fizz.component.IComponent; +import com.fizzgate.fizz.component.StepContextPosition; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.field.FieldConfig; +import com.fizzgate.fizz.field.ValueTypeEnum; +import com.fizzgate.fizz.input.*; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.JsonSchemaUtils; +import com.fizzgate.util.MapUtil; +import com.fizzgate.xml.JsonToXml; +import com.fizzgate.xml.XmlToJson; +import com.fizzgate.xml.XmlToJson.Builder; + import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; import org.slf4j.Logger; @@ -30,27 +50,8 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.constants.CommonConstants; -import we.exception.ExecuteScriptException; -import we.exception.RedirectException; -import we.exception.StopAndResponseException; -import we.fizz.component.ComponentHelper; -import we.fizz.component.ComponentResult; -import we.fizz.component.IComponent; -import we.fizz.component.StepContextPosition; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.field.FieldConfig; -import we.fizz.field.ValueTypeEnum; -import we.fizz.input.*; -import we.schema.util.I18nUtils; -import we.schema.util.PropertiesSupportUtils; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.JsonSchemaUtils; -import we.util.MapUtil; -import we.xml.JsonToXml; -import we.xml.XmlToJson; -import we.xml.XmlToJson.Builder; +import com.fizzgate.schema.util.I18nUtils; +import com.fizzgate.schema.util.PropertiesSupportUtils; import javax.script.ScriptException; import java.util.*; @@ -164,7 +165,7 @@ public class Pipeline { List components = step.getComponents(); if (components != null && components.size() > 0) { StepContextPosition stepCtxPos = new StepContextPosition(step.getName()); - return ComponentHelper.run(components, stepContext, stepCtxPos, (ctx, pos) -> { + return ComponentExecutor.exec(components, stepContext, stepCtxPos, (ctx, pos) -> { step.beforeRun(stepContext, null); return createStep(step); }).flatMap(sr -> { diff --git a/fizz-core/src/main/java/we/fizz/Step.java b/fizz-core/src/main/java/com/fizzgate/fizz/Step.java similarity index 89% rename from fizz-core/src/main/java/we/fizz/Step.java rename to fizz-core/src/main/java/com/fizzgate/fizz/Step.java index 1cb8305..a691aaa 100644 --- a/fizz-core/src/main/java/we/fizz/Step.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/Step.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import java.lang.ref.SoftReference; import java.util.ArrayList; @@ -26,16 +26,17 @@ import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.springframework.context.ConfigurableApplicationContext; +import com.fizzgate.fizz.component.ComponentExecutor; +import com.fizzgate.fizz.component.ComponentResult; +import com.fizzgate.fizz.component.IComponent; +import com.fizzgate.fizz.component.StepContextPosition; +import com.fizzgate.fizz.input.Input; +import com.fizzgate.fizz.input.InputConfig; +import com.fizzgate.fizz.input.InputContext; +import com.fizzgate.fizz.input.InputFactory; +import com.fizzgate.fizz.input.InputType; + import reactor.core.publisher.Mono; -import we.fizz.component.ComponentHelper; -import we.fizz.component.ComponentResult; -import we.fizz.component.IComponent; -import we.fizz.component.StepContextPosition; -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; /** * @@ -88,7 +89,7 @@ public class Step { step.addRequestConfig((String) requestConfig.get("name"), inputConfig); } } - step.setComponents(ComponentHelper.buildComponents((List>) config.get("components"))); + step.setComponents(ComponentExecutor.buildComponents((List>) config.get("components"))); return step; } } @@ -128,7 +129,7 @@ public class Step { List components = input.getConfig().getComponents(); if (components != null && components.size() > 0) { StepContextPosition stepCtxPos = new StepContextPosition(name, requestName); - Mono result = ComponentHelper.run(components, stepContext, stepCtxPos, (ctx, pos) -> { + Mono result = ComponentExecutor.exec(components, stepContext, stepCtxPos, (ctx, pos) -> { if (input.needRun(ctx)) { return input.run(); } diff --git a/fizz-core/src/main/java/we/fizz/StepContext.java b/fizz-core/src/main/java/com/fizzgate/fizz/StepContext.java similarity index 99% rename from fizz-core/src/main/java/we/fizz/StepContext.java rename to fizz-core/src/main/java/com/fizzgate/fizz/StepContext.java index 974cf92..3acce25 100644 --- a/fizz-core/src/main/java/we/fizz/StepContext.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/StepContext.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import java.util.ArrayList; import java.util.HashMap; @@ -27,8 +27,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.codec.multipart.FilePart; import com.alibaba.fastjson.JSON; - -import we.constants.CommonConstants; +import com.fizzgate.constants.CommonConstants; /** * diff --git a/fizz-core/src/main/java/we/fizz/StepResponse.java b/fizz-core/src/main/java/com/fizzgate/fizz/StepResponse.java similarity index 99% rename from fizz-core/src/main/java/we/fizz/StepResponse.java rename to fizz-core/src/main/java/com/fizzgate/fizz/StepResponse.java index 31caf1c..ba32083 100644 --- a/fizz-core/src/main/java/we/fizz/StepResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/StepResponse.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz; +package com.fizzgate.fizz; import java.util.HashMap; import java.util.List; diff --git a/fizz-core/src/main/java/we/fizz/component/ComponentHelper.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentExecutor.java similarity index 90% rename from fizz-core/src/main/java/we/fizz/component/ComponentHelper.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentExecutor.java index 360647d..c6ff6e0 100644 --- a/fizz-core/src/main/java/we/fizz/component/ComponentHelper.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentExecutor.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 we.fizz.component; +package com.fizzgate.fizz.component; import java.util.ArrayList; import java.util.List; @@ -24,11 +24,11 @@ import java.util.function.BiFunction; import org.noear.snack.ONode; import com.alibaba.fastjson.JSON; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.component.circle.Circle; +import com.fizzgate.fizz.component.condition.Condition; import reactor.core.publisher.Mono; -import we.fizz.StepContext; -import we.fizz.component.circle.Circle; -import we.fizz.component.condition.Condition; /** * Condition component @@ -36,7 +36,7 @@ import we.fizz.component.condition.Condition; * @author Francis Dong * */ -public class ComponentHelper { +public class ComponentExecutor { /** * Converts step context to ONode @@ -80,7 +80,7 @@ public class ComponentHelper { * @param stepContext * @param f */ - public static Mono run(List components, StepContext stepContext, + public static Mono exec(List components, StepContext stepContext, StepContextPosition stepCtxPos, BiFunction f) { if (components != null && components.size() > 0) { // conditions before circle component diff --git a/fizz-core/src/main/java/we/fizz/component/ComponentResult.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentResult.java similarity index 64% rename from fizz-core/src/main/java/we/fizz/component/ComponentResult.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentResult.java index 9970380..ae853f2 100644 --- a/fizz-core/src/main/java/we/fizz/component/ComponentResult.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentResult.java @@ -1,4 +1,4 @@ -package we.fizz.component; +package com.fizzgate.fizz.component; public class ComponentResult { diff --git a/fizz-core/src/main/java/we/fizz/component/ComponentTypeEnum.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentTypeEnum.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/component/ComponentTypeEnum.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentTypeEnum.java index 5f47e20..fd33de9 100644 --- a/fizz-core/src/main/java/we/fizz/component/ComponentTypeEnum.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/ComponentTypeEnum.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.component; +package com.fizzgate.fizz.component; /** * Component Type diff --git a/fizz-core/src/main/java/we/fizz/component/IComponent.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/IComponent.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/component/IComponent.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/IComponent.java index 65e40cb..39901c8 100644 --- a/fizz-core/src/main/java/we/fizz/component/IComponent.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/IComponent.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 we.fizz.component; +package com.fizzgate.fizz.component; /** * Component interface diff --git a/fizz-core/src/main/java/we/fizz/component/OperatorEnum.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/OperatorEnum.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/component/OperatorEnum.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/OperatorEnum.java index 73a2eee..3c4b81e 100644 --- a/fizz-core/src/main/java/we/fizz/component/OperatorEnum.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/OperatorEnum.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.component; +package com.fizzgate.fizz.component; /** * Operator diff --git a/fizz-core/src/main/java/we/fizz/component/StepContextPosition.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/StepContextPosition.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/component/StepContextPosition.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/StepContextPosition.java index 9afe709..879111c 100644 --- a/fizz-core/src/main/java/we/fizz/component/StepContextPosition.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/StepContextPosition.java @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.fizz.component; +package com.fizzgate.fizz.component; import lombok.Data; diff --git a/fizz-core/src/main/java/we/fizz/component/circle/Circle.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/circle/Circle.java similarity index 93% rename from fizz-core/src/main/java/we/fizz/component/circle/Circle.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/circle/Circle.java index c99027c..8382d56 100644 --- a/fizz-core/src/main/java/we/fizz/component/circle/Circle.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/circle/Circle.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.component.circle; +package com.fizzgate.fizz.component.circle; import java.util.Collection; import java.util.Collections; @@ -24,19 +24,20 @@ import java.util.function.BiFunction; import org.noear.snack.ONode; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.component.ComponentExecutor; +import com.fizzgate.fizz.component.ComponentResult; +import com.fizzgate.fizz.component.ComponentTypeEnum; +import com.fizzgate.fizz.component.IComponent; +import com.fizzgate.fizz.component.StepContextPosition; +import com.fizzgate.fizz.component.condition.Condition; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.field.ValueTypeEnum; +import com.fizzgate.fizz.input.PathMapping; + import lombok.Data; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.fizz.StepContext; -import we.fizz.component.ComponentHelper; -import we.fizz.component.ComponentResult; -import we.fizz.component.ComponentTypeEnum; -import we.fizz.component.IComponent; -import we.fizz.component.StepContextPosition; -import we.fizz.component.condition.Condition; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.field.ValueTypeEnum; -import we.fizz.input.PathMapping; /** * Circle component @@ -264,7 +265,7 @@ public class Circle implements IComponent { @SuppressWarnings({ "unchecked", "rawtypes" }) public Mono exec(StepContext stepContext, StepContextPosition stepCtxPos, BiFunction f) { - ONode ctxNode1 = ComponentHelper.toONode(stepContext); + ONode ctxNode1 = ComponentExecutor.toONode(stepContext); CircleItem nextItem = this.next(ctxNode1); if (nextItem != null) { return Mono.just(new CircleItemResult(ctxNode1, nextItem, null)).expand(circleItemResult -> { @@ -293,7 +294,7 @@ public class Circle implements IComponent { } else { stepContext.addStepCircleResult(stepCtxPos.getStepName()); } - ONode ctxNode2 = ComponentHelper.toONode(stepContext); + ONode ctxNode2 = ComponentExecutor.toONode(stepContext); if (this.breakCircle(cItem.getIndex(), ctxNode2, stepContext, stepCtxPos)) { return Mono.empty(); } diff --git a/fizz-core/src/main/java/we/fizz/component/circle/CircleItem.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/circle/CircleItem.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/component/circle/CircleItem.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/circle/CircleItem.java index 34b6cc0..a1d25c4 100644 --- a/fizz-core/src/main/java/we/fizz/component/circle/CircleItem.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/circle/CircleItem.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 we.fizz.component.circle; +package com.fizzgate.fizz.component.circle; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/fizz-core/src/main/java/we/fizz/component/condition/Condition.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/condition/Condition.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/component/condition/Condition.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/condition/Condition.java index 2134bb3..e09ceb1 100644 --- a/fizz-core/src/main/java/we/fizz/component/condition/Condition.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/condition/Condition.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.component.condition; +package com.fizzgate.fizz.component.condition; import java.util.Collection; import java.util.Map; @@ -28,18 +28,18 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import com.alibaba.fastjson.JSON; +import com.fizzgate.fizz.component.ComponentTypeEnum; +import com.fizzgate.fizz.component.IComponent; +import com.fizzgate.fizz.component.OperatorEnum; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.field.RefDataTypeEnum; +import com.fizzgate.fizz.field.ValueTypeEnum; +import com.fizzgate.fizz.input.PathMapping; +import com.fizzgate.fizz.input.extension.request.RequestInput; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import we.fizz.component.ComponentTypeEnum; -import we.fizz.component.IComponent; -import we.fizz.component.OperatorEnum; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.field.RefDataTypeEnum; -import we.fizz.field.ValueTypeEnum; -import we.fizz.input.PathMapping; -import we.fizz.input.extension.request.RequestInput; /** * Condition component diff --git a/fizz-core/src/main/java/we/fizz/component/condition/ConditionValue.java b/fizz-core/src/main/java/com/fizzgate/fizz/component/condition/ConditionValue.java similarity index 88% rename from fizz-core/src/main/java/we/fizz/component/condition/ConditionValue.java rename to fizz-core/src/main/java/com/fizzgate/fizz/component/condition/ConditionValue.java index f89c49b..5414547 100644 --- a/fizz-core/src/main/java/we/fizz/component/condition/ConditionValue.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/component/condition/ConditionValue.java @@ -15,14 +15,15 @@ * along with this program. If not, see . */ -package we.fizz.component.condition; +package com.fizzgate.fizz.component.condition; + +import com.fizzgate.fizz.field.FixedDataTypeEnum; +import com.fizzgate.fizz.field.RefDataTypeEnum; +import com.fizzgate.fizz.field.ValueTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import we.fizz.field.FixedDataTypeEnum; -import we.fizz.field.RefDataTypeEnum; -import we.fizz.field.ValueTypeEnum; /** * Condition value diff --git a/fizz-core/src/main/java/we/fizz/exception/FizzException.java b/fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzException.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/exception/FizzException.java rename to fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzException.java index c933ba3..6125f11 100644 --- a/fizz-core/src/main/java/we/fizz/exception/FizzException.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzException.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.exception; +package com.fizzgate.fizz.exception; public class FizzException extends Exception { public FizzException(Throwable exception) { diff --git a/fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java b/fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzRuntimeException.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java rename to fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzRuntimeException.java index 5b72d73..c3e5138 100644 --- a/fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/exception/FizzRuntimeException.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.fizz.exception; +package com.fizzgate.fizz.exception; -import we.fizz.StepContext; +import com.fizzgate.fizz.StepContext; public class FizzRuntimeException extends RuntimeException { diff --git a/fizz-core/src/main/java/we/fizz/field/FieldConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/field/FieldConfig.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/field/FieldConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/field/FieldConfig.java index 047a565..b1b736d 100644 --- a/fizz-core/src/main/java/we/fizz/field/FieldConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/field/FieldConfig.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 we.fizz.field; +package com.fizzgate.fizz.field; import java.util.Map; diff --git a/fizz-core/src/main/java/we/fizz/field/FixedDataTypeEnum.java b/fizz-core/src/main/java/com/fizzgate/fizz/field/FixedDataTypeEnum.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/field/FixedDataTypeEnum.java rename to fizz-core/src/main/java/com/fizzgate/fizz/field/FixedDataTypeEnum.java index 9aa6950..4a3b10e 100644 --- a/fizz-core/src/main/java/we/fizz/field/FixedDataTypeEnum.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/field/FixedDataTypeEnum.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.field; +package com.fizzgate.fizz.field; /** * Data type of fixed value diff --git a/fizz-core/src/main/java/we/fizz/field/RefDataTypeEnum.java b/fizz-core/src/main/java/com/fizzgate/fizz/field/RefDataTypeEnum.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/field/RefDataTypeEnum.java rename to fizz-core/src/main/java/com/fizzgate/fizz/field/RefDataTypeEnum.java index 3ef1c53..ca926a3 100644 --- a/fizz-core/src/main/java/we/fizz/field/RefDataTypeEnum.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/field/RefDataTypeEnum.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.field; +package com.fizzgate.fizz.field; /** * Data type of reference value diff --git a/fizz-core/src/main/java/we/fizz/field/ValueTypeEnum.java b/fizz-core/src/main/java/com/fizzgate/fizz/field/ValueTypeEnum.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/field/ValueTypeEnum.java rename to fizz-core/src/main/java/com/fizzgate/fizz/field/ValueTypeEnum.java index 9500bb4..fab8b64 100644 --- a/fizz-core/src/main/java/we/fizz/field/ValueTypeEnum.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/field/ValueTypeEnum.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.field; +package com.fizzgate.fizz.field; /** * Value Type diff --git a/fizz-core/src/main/java/we/fizz/function/CodecFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/function/CodecFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java index ca57020..23ad4b1 100644 --- a/fizz-core/src/main/java/we/fizz/function/CodecFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import java.io.UnsupportedEncodingException; import java.security.Key; @@ -31,7 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.util.DigestUtils; +import com.fizzgate.util.DigestUtils; /** * Codec Functions diff --git a/fizz-core/src/main/java/we/fizz/function/CommonFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/CommonFunc.java similarity index 79% rename from fizz-core/src/main/java/we/fizz/function/CommonFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/CommonFunc.java index 6c36314..9b59ffc 100644 --- a/fizz-core/src/main/java/we/fizz/function/CommonFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/CommonFunc.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import java.lang.reflect.Array; import java.util.Collection; @@ -62,6 +62,9 @@ public class CommonFunc implements IFunc { FuncExecutor.register(NAME_SPACE_PREFIX + "common.isNotBlank", this); FuncExecutor.register(NAME_SPACE_PREFIX + "common.isEmpty", this); FuncExecutor.register(NAME_SPACE_PREFIX + "common.isNotEmpty", this); + FuncExecutor.register(NAME_SPACE_PREFIX + "common.and", this); + FuncExecutor.register(NAME_SPACE_PREFIX + "common.or", this); + FuncExecutor.register(NAME_SPACE_PREFIX + "common.not", this); } /** @@ -132,4 +135,43 @@ public class CommonFunc implements IFunc { return !isEmpty(obj); } + /** + * Return true if all args are true
+ * + * @param objs + * @return + */ + public boolean and(Boolean... objs) { + if (objs != null && objs.length > 0) { + for (int i = 0; i < objs.length; i++) { + if (objs[i] == null || !objs[i]) { + return false; + } + } + return true; + } + return false; + } + + /** + * Return true if any arg is true
+ * + * @param objs + * @return + */ + public boolean or(Boolean... objs) { + if (objs != null && objs.length > 0) { + for (int i = 0; i < objs.length; i++) { + if (objs[i] != null && objs[i]) { + return true; + } + } + } + return false; + } + + public boolean not(Boolean obj) { + return !(obj == null ? false : obj); + } + } diff --git a/fizz-core/src/main/java/we/fizz/function/DateFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/DateFunc.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/function/DateFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/DateFunc.java index 09ede0e..86b4266 100644 --- a/fizz-core/src/main/java/we/fizz/function/DateFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/DateFunc.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.exception.FizzRuntimeException; /** * Date Functions diff --git a/fizz-core/src/main/java/we/fizz/function/FuncExecutor.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/FuncExecutor.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/function/FuncExecutor.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/FuncExecutor.java index 0fdbcba..4292196 100644 --- a/fizz-core/src/main/java/we/fizz/function/FuncExecutor.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/FuncExecutor.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 we.fizz.function; +package com.fizzgate.fizz.function; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; @@ -34,12 +34,13 @@ import org.reflections.Reflections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.Input; +import com.fizzgate.fizz.input.PathMapping; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.Input; -import we.fizz.input.PathMapping; /** * Function Register @@ -77,7 +78,7 @@ public class FuncExecutor { public static void init() { try { - Reflections reflections = new Reflections("we.fizz.function"); + Reflections reflections = new Reflections("com.fizzgate.fizz.function"); Set> types = reflections.getSubTypesOf(IFunc.class); for (Class fnType : types) { Method method = fnType.getMethod("getInstance"); diff --git a/fizz-core/src/main/java/we/fizz/function/IFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/IFunc.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/function/IFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/IFunc.java index 2b7882e..3af99d4 100644 --- a/fizz-core/src/main/java/we/fizz/function/IFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/IFunc.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 we.fizz.function; +package com.fizzgate.fizz.function; /** * Function interface diff --git a/fizz-core/src/main/java/we/fizz/function/ListFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/ListFunc.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/function/ListFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/ListFunc.java index fa035ee..7c41a49 100644 --- a/fizz-core/src/main/java/we/fizz/function/ListFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/ListFunc.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import java.util.ArrayList; import java.util.HashMap; @@ -25,7 +25,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.exception.FizzRuntimeException; /** * List Functions diff --git a/fizz-core/src/main/java/we/fizz/function/MathFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/MathFunc.java similarity index 99% rename from fizz-core/src/main/java/we/fizz/function/MathFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/MathFunc.java index ff26870..39c5752 100644 --- a/fizz-core/src/main/java/we/fizz/function/MathFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/MathFunc.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 we.fizz.function; +package com.fizzgate.fizz.function; import java.math.BigDecimal; diff --git a/fizz-core/src/main/java/we/fizz/function/StringFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/StringFunc.java similarity index 99% rename from fizz-core/src/main/java/we/fizz/function/StringFunc.java rename to fizz-core/src/main/java/com/fizzgate/fizz/function/StringFunc.java index ed90889..cbd9293 100644 --- a/fizz-core/src/main/java/we/fizz/function/StringFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/StringFunc.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 we.fizz.function; +package com.fizzgate.fizz.function; import java.util.UUID; @@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.exception.FizzRuntimeException; /** * String Functions diff --git a/fizz-core/src/main/java/we/fizz/input/ClientInputConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/ClientInputConfig.java similarity index 99% rename from fizz-core/src/main/java/we/fizz/input/ClientInputConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/ClientInputConfig.java index 9a47ed8..8bdffda 100644 --- a/fizz-core/src/main/java/we/fizz/input/ClientInputConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/ClientInputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/main/java/we/fizz/input/IInput.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/IInput.java similarity index 91% rename from fizz-core/src/main/java/we/fizz/input/IInput.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/IInput.java index f9fa67f..434f7a3 100644 --- a/fizz-core/src/main/java/we/fizz/input/IInput.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/IInput.java @@ -15,13 +15,15 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import org.springframework.context.ConfigurableApplicationContext; + +import com.fizzgate.fizz.Step; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; + import reactor.core.publisher.Mono; -import we.fizz.Step; -import we.fizz.StepContext; -import we.fizz.StepResponse; import java.lang.ref.SoftReference; import java.lang.reflect.Field; diff --git a/fizz-core/src/main/java/we/fizz/input/Input.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/Input.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/input/Input.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/Input.java index f8e3952..70cc810 100644 --- a/fizz-core/src/main/java/we/fizz/input/Input.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/Input.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 we.fizz.input; +package com.fizzgate.fizz.input; import java.lang.ref.SoftReference; import java.lang.reflect.Field; @@ -23,10 +23,12 @@ import java.util.Map; import org.reflections.Reflections; import org.springframework.context.ConfigurableApplicationContext; + +import com.fizzgate.fizz.Step; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; + import reactor.core.publisher.Mono; -import we.fizz.Step; -import we.fizz.StepContext; -import we.fizz.StepResponse; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/InputConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputConfig.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/input/InputConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/InputConfig.java index 3e40741..dc45fed 100644 --- a/fizz-core/src/main/java/we/fizz/input/InputConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputConfig.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.HashMap; import java.util.List; import java.util.Map; -import we.fizz.component.IComponent; +import com.fizzgate.fizz.component.IComponent; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/InputContext.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputContext.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/input/InputContext.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/InputContext.java index 58bfb0a..95759ac 100644 --- a/fizz-core/src/main/java/we/fizz/input/InputContext.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputContext.java @@ -16,13 +16,13 @@ */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.HashMap; import java.util.Map; -import we.fizz.StepContext; -import we.fizz.StepResponse; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/InputFactory.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputFactory.java similarity index 90% rename from fizz-core/src/main/java/we/fizz/input/InputFactory.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/InputFactory.java index fa657c7..8ce98ad 100644 --- a/fizz-core/src/main/java/we/fizz/input/InputFactory.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputFactory.java @@ -15,12 +15,9 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; -import we.fizz.component.ComponentHelper; import org.reflections.Reflections; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.extension.request.RequestInput; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -33,6 +30,10 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fizzgate.fizz.component.ComponentExecutor; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.extension.request.RequestInput; + /** * * @author linwaiwai @@ -67,7 +68,7 @@ public class InputFactory { } inputConfig.setType(typeEnum); inputConfig.setDataMapping((Map) config.get("dataMapping")); - inputConfig.setComponents(ComponentHelper.buildComponents((List>) config.get("components"))); + inputConfig.setComponents(ComponentExecutor.buildComponents((List>) config.get("components"))); inputConfig.parse(); return inputConfig; } else { @@ -96,7 +97,7 @@ public class InputFactory { } public static void loadInputClasses() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { - Reflections reflections = new Reflections("we.fizz.input"); + Reflections reflections = new Reflections("com.fizzgate.fizz.input"); Set> subTypes = reflections.getSubTypesOf(Input.class); for (ClassinputType : subTypes){ Method initializeMethod = inputType.getMethod("initialize", Class.class); diff --git a/fizz-core/src/main/java/we/fizz/input/InputType.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputType.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/input/InputType.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/InputType.java index 5c7f36b..e39e0fe 100644 --- a/fizz-core/src/main/java/we/fizz/input/InputType.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/InputType.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/main/java/we/fizz/input/PathMapping.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/PathMapping.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/input/PathMapping.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/PathMapping.java index d2b9fd2..f88f4a4 100644 --- a/fizz-core/src/main/java/we/fizz/input/PathMapping.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/PathMapping.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.*; import java.util.Map.Entry; @@ -24,13 +24,13 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.noear.snack.ONode; -import we.constants.CommonConstants; -import we.fizz.StepContext; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.function.FuncExecutor; -import we.fizz.function.IFunc; -import we.global_resource.GlobalResourceService; -import we.util.MapUtil; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.function.FuncExecutor; +import com.fizzgate.fizz.function.IFunc; +import com.fizzgate.global_resource.GlobalResourceService; +import com.fizzgate.util.MapUtil; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/RPCInput.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/RPCInput.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/input/RPCInput.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/RPCInput.java index 1116154..d676d16 100644 --- a/fizz-core/src/main/java/we/fizz/input/RPCInput.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/RPCInput.java @@ -15,18 +15,20 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.CollectionUtils; + +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; + import reactor.core.publisher.Mono; -import we.exception.ExecuteScriptException; -import we.fizz.StepContext; -import we.util.Consts; -import we.util.JacksonUtils; import javax.script.ScriptException; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/fizz/input/RPCResponse.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/RPCResponse.java similarity index 97% rename from fizz-core/src/main/java/we/fizz/input/RPCResponse.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/RPCResponse.java index f015d61..5c5f502 100644 --- a/fizz-core/src/main/java/we/fizz/input/RPCResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/RPCResponse.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import org.springframework.util.MultiValueMap; diff --git a/fizz-core/src/main/java/we/fizz/input/ScriptHelper.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/ScriptHelper.java similarity index 93% rename from fizz-core/src/main/java/we/fizz/input/ScriptHelper.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/ScriptHelper.java index 0bd11dd..c247e05 100644 --- a/fizz-core/src/main/java/we/fizz/input/ScriptHelper.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/ScriptHelper.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import java.util.Collection; import java.util.HashMap; @@ -29,16 +29,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSON; -import org.springframework.util.StringUtils; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.exception.RedirectException; +import com.fizzgate.exception.StopAndResponseException; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Script; +import com.fizzgate.util.ScriptUtils; -import we.constants.CommonConstants; -import we.exception.ExecuteScriptException; -import we.exception.RedirectException; -import we.exception.StopAndResponseException; -import we.fizz.StepContext; -import we.util.JacksonUtils; -import we.util.Script; -import we.util.ScriptUtils; +import org.springframework.util.StringUtils; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInput.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInput.java index d245a68..8b772cc 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInput.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInput.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.dubbo; +package com.fizzgate.fizz.input.extension.dubbo; import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; @@ -23,19 +23,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.CollectionUtils; + +import com.fizzgate.FizzAppContext; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.*; +import com.fizzgate.proxy.dubbo.ApacheDubboGenericService; +import com.fizzgate.proxy.dubbo.DubboInterfaceDeclaration; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; + import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import we.FizzAppContext; -import we.config.SystemConfig; -import we.constants.CommonConstants; -import we.exception.ExecuteScriptException; -import we.fizz.StepContext; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.*; -import we.proxy.dubbo.ApacheDubboGenericService; -import we.proxy.dubbo.DubboInterfaceDeclaration; -import we.util.Consts; -import we.util.JacksonUtils; import javax.script.ScriptException; import java.time.Duration; diff --git a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInputConfig.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInputConfig.java index 0f3e068..d3a3b7b 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboInputConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboInputConfig.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.fizz.input.extension.dubbo; +package com.fizzgate.fizz.input.extension.dubbo; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.InputConfig; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.InputConfig; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboRPCResponse.java similarity index 89% rename from fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboRPCResponse.java index 3b4e14e..a1f5a1a 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/dubbo/DubboRPCResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/dubbo/DubboRPCResponse.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.dubbo; +package com.fizzgate.fizz.input.extension.dubbo; -import we.fizz.input.RPCResponse; +import com.fizzgate.fizz.input.RPCResponse; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GRPCResponse.java similarity index 91% rename from fizz-core/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GRPCResponse.java index 27e4ca5..a58d703 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GRPCResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GRPCResponse.java @@ -15,10 +15,11 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.grpc; +package com.fizzgate.fizz.input.extension.grpc; import org.springframework.http.HttpStatus; -import we.fizz.input.RPCResponse; + +import com.fizzgate.fizz.input.RPCResponse; /** * diff --git a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInput.java similarity index 94% rename from fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInput.java index be45866..9af9e11 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInput.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInput.java @@ -15,27 +15,28 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.grpc; +package com.fizzgate.fizz.input.extension.grpc; import com.alibaba.fastjson.JSON; +import com.fizzgate.FizzAppContext; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.*; +import com.fizzgate.proxy.grpc.GrpcGenericService; +import com.fizzgate.proxy.grpc.GrpcInstanceService; +import com.fizzgate.proxy.grpc.GrpcInterfaceDeclaration; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; + import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.CollectionUtils; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import we.FizzAppContext; -import we.config.SystemConfig; -import we.constants.CommonConstants; -import we.exception.ExecuteScriptException; -import we.fizz.StepContext; -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.*; -import we.proxy.grpc.GrpcGenericService; -import we.proxy.grpc.GrpcInstanceService; -import we.proxy.grpc.GrpcInterfaceDeclaration; -import we.util.Consts; -import we.util.JacksonUtils; import javax.script.ScriptException; import java.time.Duration; diff --git a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInputConfig.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInputConfig.java index d4e9e5b..fda7382 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/grpc/GrpcInputConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/grpc/GrpcInputConfig.java @@ -15,15 +15,15 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.grpc; - -import we.fizz.exception.FizzRuntimeException; -import we.fizz.input.InputConfig; +package com.fizzgate.fizz.input.extension.grpc; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.fizz.input.InputConfig; + /** * * @author linwaiwai diff --git a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInput.java similarity index 96% rename from fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInput.java index e898fcf..bd6adc7 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInput.java @@ -15,9 +15,26 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.request; +package com.fizzgate.fizz.input.extension.request; import com.alibaba.fastjson.JSON; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.exception.ExecuteScriptException; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; +import com.fizzgate.fizz.input.*; +import com.fizzgate.proxy.FizzWebClient; +import com.fizzgate.proxy.http.HttpInstanceService; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.MapUtil; +import com.fizzgate.util.TypeUtils; +import com.fizzgate.xml.JsonToXml; +import com.fizzgate.xml.XmlToJson; +import com.fizzgate.xml.XmlToJson.Builder; + import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.ThreadContext; import org.noear.snack.ONode; @@ -32,22 +49,6 @@ import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.constants.CommonConstants; -import we.exception.ExecuteScriptException; -import we.fizz.StepContext; -import we.fizz.StepResponse; -import we.fizz.input.*; -import we.proxy.FizzWebClient; -import we.proxy.http.HttpInstanceService; -import we.service_registry.RegistryCenterService; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.MapUtil; -import we.util.TypeUtils; -import we.xml.JsonToXml; -import we.xml.XmlToJson; -import we.xml.XmlToJson.Builder; import javax.script.ScriptException; import java.util.ArrayList; diff --git a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInputConfig.java similarity index 98% rename from fizz-core/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInputConfig.java index b4b81a0..e51d918 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestInputConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestInputConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.request; +package com.fizzgate.fizz.input.extension.request; import java.net.MalformedURLException; import java.net.URL; @@ -25,7 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.util.MultiValueMap; import org.springframework.web.util.UriComponentsBuilder; -import we.fizz.input.InputConfig; +import com.fizzgate.fizz.input.InputConfig; diff --git a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestRPCResponse.java similarity index 91% rename from fizz-core/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java rename to fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestRPCResponse.java index f762a20..8518f2c 100644 --- a/fizz-core/src/main/java/we/fizz/input/extension/request/RequestRPCResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/input/extension/request/RequestRPCResponse.java @@ -15,10 +15,11 @@ * along with this program. If not, see . */ -package we.fizz.input.extension.request; +package com.fizzgate.fizz.input.extension.request; import org.springframework.http.HttpStatus; -import we.fizz.input.RPCResponse; + +import com.fizzgate.fizz.input.RPCResponse; /** * diff --git a/fizz-core/src/main/java/we/global_resource/GlobalResource.java b/fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResource.java similarity index 98% rename from fizz-core/src/main/java/we/global_resource/GlobalResource.java rename to fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResource.java index f4a44d4..4bfe371 100644 --- a/fizz-core/src/main/java/we/global_resource/GlobalResource.java +++ b/fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResource.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package we.global_resource; +package com.fizzgate.global_resource; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import we.util.JacksonUtils; +import com.fizzgate.util.JacksonUtils; import java.math.BigDecimal; import java.util.List; diff --git a/fizz-core/src/main/java/we/global_resource/GlobalResourceService.java b/fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResourceService.java similarity index 96% rename from fizz-core/src/main/java/we/global_resource/GlobalResourceService.java rename to fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResourceService.java index 6aab182..c9751c6 100644 --- a/fizz-core/src/main/java/we/global_resource/GlobalResourceService.java +++ b/fizz-core/src/main/java/com/fizzgate/global_resource/GlobalResourceService.java @@ -15,19 +15,21 @@ * along with this program. If not, see . */ -package we.global_resource; +package com.fizzgate.global_resource; import org.noear.snack.ONode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.fizz.input.PathMapping; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Result; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.fizz.input.PathMapping; -import we.util.JacksonUtils; -import we.util.Result; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/legacy/RespEntity.java b/fizz-core/src/main/java/com/fizzgate/legacy/RespEntity.java similarity index 95% rename from fizz-core/src/main/java/we/legacy/RespEntity.java rename to fizz-core/src/main/java/com/fizzgate/legacy/RespEntity.java index ece10e0..6632b16 100644 --- a/fizz-core/src/main/java/we/legacy/RespEntity.java +++ b/fizz-core/src/main/java/com/fizzgate/legacy/RespEntity.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package we.legacy; +package com.fizzgate.legacy; import org.springframework.lang.Nullable; -import we.util.Consts; -import we.util.ThreadContext; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ThreadContext; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/listener/AggregateChannelListener.java b/fizz-core/src/main/java/com/fizzgate/listener/AggregateChannelListener.java similarity index 97% rename from fizz-core/src/main/java/we/listener/AggregateChannelListener.java rename to fizz-core/src/main/java/com/fizzgate/listener/AggregateChannelListener.java index 9527e2a..59386fd 100644 --- a/fizz-core/src/main/java/we/listener/AggregateChannelListener.java +++ b/fizz-core/src/main/java/com/fizzgate/listener/AggregateChannelListener.java @@ -15,10 +15,11 @@ * along with this program. If not, see . */ -package we.listener; +package com.fizzgate.listener; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; +import com.fizzgate.fizz.ConfigLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,12 +32,11 @@ import org.springframework.util.StringUtils; import reactor.core.Disposable; import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; -import we.fizz.ConfigLoader; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import static we.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_MESSAGE_LISTENER_CONTAINER; +import static com.fizzgate.config.AggregateRedisConfig.AGGREGATE_REACTIVE_REDIS_MESSAGE_LISTENER_CONTAINER; import java.net.InetAddress; import java.util.List; diff --git a/fizz-core/src/main/java/we/log/LogProperties.java b/fizz-core/src/main/java/com/fizzgate/log/LogProperties.java similarity index 76% rename from fizz-core/src/main/java/we/log/LogProperties.java rename to fizz-core/src/main/java/com/fizzgate/log/LogProperties.java index b9aa883..6f35a9d 100644 --- a/fizz-core/src/main/java/we/log/LogProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/log/LogProperties.java @@ -1,4 +1,4 @@ -package we.log; +package com.fizzgate.log; import lombok.Data; diff --git a/fizz-core/src/main/java/we/log/LogSend.java b/fizz-core/src/main/java/com/fizzgate/log/LogSend.java similarity index 98% rename from fizz-core/src/main/java/we/log/LogSend.java rename to fizz-core/src/main/java/com/fizzgate/log/LogSend.java index d274583..9f7ebf1 100644 --- a/fizz-core/src/main/java/we/log/LogSend.java +++ b/fizz-core/src/main/java/com/fizzgate/log/LogSend.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 we.log; +package com.fizzgate.log; /** * log send data entity diff --git a/fizz-core/src/main/java/we/log/LogSendAppender.java b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppender.java similarity index 92% rename from fizz-core/src/main/java/we/log/LogSendAppender.java rename to fizz-core/src/main/java/com/fizzgate/log/LogSendAppender.java index f2b1b5a..8d9b6f8 100644 --- a/fizz-core/src/main/java/we/log/LogSendAppender.java +++ b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppender.java @@ -1,4 +1,4 @@ -package we.log; +package com.fizzgate.log; import java.util.concurrent.atomic.AtomicInteger; diff --git a/fizz-core/src/main/java/we/log/LogSendAppenderWithLog4j2.java b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLog4j2.java similarity index 96% rename from fizz-core/src/main/java/we/log/LogSendAppenderWithLog4j2.java rename to fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLog4j2.java index 5a1f4fe..fd7ee87 100644 --- a/fizz-core/src/main/java/we/log/LogSendAppenderWithLog4j2.java +++ b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLog4j2.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 we.log; +package com.fizzgate.log; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.*; @@ -25,14 +25,15 @@ import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.layout.PatternLayout; -import we.FizzAppContext; -import we.util.Consts; -import we.util.NetworkUtils; + +import com.fizzgate.FizzAppContext; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NetworkUtils; + +import static com.fizzgate.log.LogSendAppender.*; import java.io.Serializable; -import static we.log.LogSendAppender.*; - /** * log send appender with log4j2 * diff --git a/fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLogback.java b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLogback.java new file mode 100644 index 0000000..e8c2405 --- /dev/null +++ b/fizz-core/src/main/java/com/fizzgate/log/LogSendAppenderWithLogback.java @@ -0,0 +1,2 @@ +package com.fizzgate.log; + diff --git a/fizz-core/src/main/java/we/log/LogSendService.java b/fizz-core/src/main/java/com/fizzgate/log/LogSendService.java similarity index 97% rename from fizz-core/src/main/java/we/log/LogSendService.java rename to fizz-core/src/main/java/com/fizzgate/log/LogSendService.java index b1b4bd6..231160f 100644 --- a/fizz-core/src/main/java/we/log/LogSendService.java +++ b/fizz-core/src/main/java/com/fizzgate/log/LogSendService.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 we.log; +package com.fizzgate.log; /** * log send service interface, used by {@link LogSendAppenderWithLog4j2} to send log to fizz-manager diff --git a/fizz-core/src/main/java/we/log/RedisLogSendServiceImpl.java b/fizz-core/src/main/java/com/fizzgate/log/RedisLogSendServiceImpl.java similarity index 93% rename from fizz-core/src/main/java/we/log/RedisLogSendServiceImpl.java rename to fizz-core/src/main/java/com/fizzgate/log/RedisLogSendServiceImpl.java index 10d5148..5eca332 100644 --- a/fizz-core/src/main/java/we/log/RedisLogSendServiceImpl.java +++ b/fizz-core/src/main/java/com/fizzgate/log/RedisLogSendServiceImpl.java @@ -14,12 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.log; +package com.fizzgate.log; import com.alibaba.fastjson.JSON; +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.AggregateRedisConfigProperties; + import org.springframework.data.redis.core.ReactiveStringRedisTemplate; -import we.config.AggregateRedisConfig; -import we.config.AggregateRedisConfigProperties; /** * {@link LogSendService} impl class, using redis channel to send log diff --git a/fizz-core/src/main/java/we/monitor/FizzMonitorService.java b/fizz-core/src/main/java/com/fizzgate/monitor/FizzMonitorService.java similarity index 96% rename from fizz-core/src/main/java/we/monitor/FizzMonitorService.java rename to fizz-core/src/main/java/com/fizzgate/monitor/FizzMonitorService.java index 38a76cf..5959007 100644 --- a/fizz-core/src/main/java/we/monitor/FizzMonitorService.java +++ b/fizz-core/src/main/java/com/fizzgate/monitor/FizzMonitorService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.monitor; +package com.fizzgate.monitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,12 +23,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import we.config.AggregateRedisConfig; -import we.config.SchedConfig; -import we.util.Consts; -import we.util.DateTimeUtils; -import we.util.JacksonUtils; -import we.util.ThreadContext; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SchedConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ThreadContext; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/plugin/FixedPluginFilter.java b/fizz-core/src/main/java/com/fizzgate/plugin/FixedPluginFilter.java similarity index 97% rename from fizz-core/src/main/java/we/plugin/FixedPluginFilter.java rename to fizz-core/src/main/java/com/fizzgate/plugin/FixedPluginFilter.java index fd51e70..33151c6 100644 --- a/fizz-core/src/main/java/we/plugin/FixedPluginFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/FixedPluginFilter.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package we.plugin; +package com.fizzgate.plugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.FizzAppContext; -import we.util.ThreadContext; +import com.fizzgate.FizzAppContext; +import com.fizzgate.util.ThreadContext; import java.util.*; diff --git a/fizz-core/src/main/java/we/plugin/FizzPluginFilter.java b/fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilter.java similarity index 97% rename from fizz-core/src/main/java/we/plugin/FizzPluginFilter.java rename to fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilter.java index afb4dfe..d5ed062 100644 --- a/fizz-core/src/main/java/we/plugin/FizzPluginFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin; +package com.fizzgate.plugin; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; diff --git a/fizz-core/src/main/java/we/plugin/FizzPluginFilterChain.java b/fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilterChain.java similarity index 95% rename from fizz-core/src/main/java/we/plugin/FizzPluginFilterChain.java rename to fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilterChain.java index 07289f3..ff50658 100644 --- a/fizz-core/src/main/java/we/plugin/FizzPluginFilterChain.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/FizzPluginFilterChain.java @@ -15,16 +15,18 @@ * along with this program. If not, see . */ -package we.plugin; +package com.fizzgate.plugin; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; + +import com.fizzgate.Fizz; +import com.fizzgate.FizzAppContext; +import com.fizzgate.proxy.Route; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.Fizz; -import we.FizzAppContext; -import we.proxy.Route; -import we.util.ReactorUtils; -import we.util.WebUtils; import java.util.Iterator; import java.util.List; diff --git a/fizz-core/src/main/java/we/plugin/PluginConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/PluginConfig.java similarity index 96% rename from fizz-core/src/main/java/we/plugin/PluginConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/PluginConfig.java index 334c0aa..5997ae3 100644 --- a/fizz-core/src/main/java/we/plugin/PluginConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/PluginConfig.java @@ -15,10 +15,11 @@ * along with this program. If not, see . */ -package we.plugin; +package com.fizzgate.plugin; import org.apache.commons.lang3.StringUtils; -import we.util.JacksonUtils; + +import com.fizzgate.util.JacksonUtils; import java.util.Collections; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/plugin/PluginFilter.java b/fizz-core/src/main/java/com/fizzgate/plugin/PluginFilter.java similarity index 94% rename from fizz-core/src/main/java/we/plugin/PluginFilter.java rename to fizz-core/src/main/java/com/fizzgate/plugin/PluginFilter.java index 039aa35..de70d66 100644 --- a/fizz-core/src/main/java/we/plugin/PluginFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/PluginFilter.java @@ -15,18 +15,20 @@ * along with this program. If not, see . */ -package we.plugin; +package com.fizzgate.plugin; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.filter.FilterResult; +import com.fizzgate.util.Consts; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.filter.FilterResult; -import we.util.Consts; -import we.util.WebUtils; import java.util.Map; diff --git a/fizz-core/src/main/java/we/plugin/auth/AbstractCustomAuth.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AbstractCustomAuth.java similarity index 93% rename from fizz-core/src/main/java/we/plugin/auth/AbstractCustomAuth.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/AbstractCustomAuth.java index ca1b21e..f1f4dea 100644 --- a/fizz-core/src/main/java/we/plugin/auth/AbstractCustomAuth.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AbstractCustomAuth.java @@ -15,12 +15,14 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.util.Result; +import com.fizzgate.util.Utils; + import reactor.core.publisher.Mono; -import we.util.Result; -import we.util.Utils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig.java similarity index 96% rename from fizz-core/src/main/java/we/plugin/auth/ApiConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig.java index 9cebb86..58acc2f 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig.java @@ -15,19 +15,20 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.proxy.Route; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.UrlTransformUtils; + import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpMethod; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; -import we.plugin.PluginConfig; -import we.proxy.Route; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.UrlTransformUtils; import javax.annotation.Nullable; import java.util.*; @@ -113,7 +114,7 @@ public class ApiConfig { public String rpcGroup; - public long timeout = 0; + public long timeout = 20_000; public int retryCount = 0; diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfig2apps.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2apps.java similarity index 93% rename from fizz-core/src/main/java/we/plugin/auth/ApiConfig2apps.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2apps.java index 870c06b..b398bed 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfig2apps.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2apps.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package we.plugin.auth; - -import we.util.JacksonUtils; +package com.fizzgate.plugin.auth; import java.util.List; +import com.fizzgate.util.JacksonUtils; + /** * @author hongqiaowei */ diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfig2appsService.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2appsService.java similarity index 96% rename from fizz-core/src/main/java/we/plugin/auth/ApiConfig2appsService.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2appsService.java index b0eccfc..c7e8b2f 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfig2appsService.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfig2appsService.java @@ -15,18 +15,20 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.ThreadContext; + import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ReactorUtils; -import we.util.ThreadContext; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigService.java similarity index 99% rename from fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigService.java index 532d971..bb377a6 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -31,12 +31,14 @@ import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.util.*; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.config.SystemConfig; -import we.plugin.FizzPluginFilter; -import we.util.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfigServiceProperties.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigServiceProperties.java similarity index 94% rename from fizz-core/src/main/java/we/plugin/auth/ApiConfigServiceProperties.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigServiceProperties.java index 334030a..2a203da 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ApiConfigServiceProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ApiConfigServiceProperties.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 we.plugin.auth; +package com.fizzgate.plugin.auth; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fizz-core/src/main/java/we/plugin/auth/App.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/App.java similarity index 92% rename from fizz-core/src/main/java/we/plugin/auth/App.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/App.java index 38795db..d206d7f 100644 --- a/fizz-core/src/main/java/we/plugin/auth/App.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/App.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.commons.lang3.StringUtils; -import we.util.Consts; -import we.util.JacksonUtils; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; import java.util.*; @@ -84,16 +85,14 @@ public class App { String subnet = ip.substring(0, i).trim(); String addrSeg = ip.substring(i + 1).trim(); if ("*".equals(addrSeg)) { - this.ips.put(subnet, Collections.singletonList(new String[]{"1", "255"})); + // this.ips.put(subnet, Collections.singletonList(new String[]{"1", "255"})); + List segs = this.ips.computeIfAbsent(subnet, k -> new ArrayList<>()); + segs.add(new String[]{"1", "255"}); } else if (addrSeg.indexOf('-') > 0) { String[] a = StringUtils.split(addrSeg, '-'); String beg = a[0].trim(); String end = a[1].trim(); - List lst = this.ips.get(subnet); - if (lst == null) { - lst = new ArrayList<>(); - this.ips.put(subnet, lst); - } + List lst = this.ips.computeIfAbsent(subnet, k -> new ArrayList<>()); lst.add(new String[]{beg, end}); } else { this.ips.put(ip, null); diff --git a/fizz-core/src/main/java/we/plugin/auth/AppService.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AppService.java similarity index 93% rename from fizz-core/src/main/java/we/plugin/auth/AppService.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/AppService.java index 00026de..772e83a 100644 --- a/fizz-core/src/main/java/we/plugin/auth/AppService.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AppService.java @@ -15,19 +15,21 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactorUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ReactorUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; @@ -90,9 +92,10 @@ public class AppService { updateAppMap(app, appMapTmp); return Flux.just(e); } catch (Throwable t) { - throwable[0] = t; - log.info(json, t); - return Flux.error(t); + // throwable[0] = t; + log.warn(json, t); + // return Flux.error(t); + return Flux.just(e); } }).blockLast())).flatMap( e -> { @@ -107,7 +110,8 @@ public class AppService { } ).block(); if (error != ReactorUtils.EMPTY_THROWABLE) { - throw error; + // throw error; + log.error(Consts.S.EMPTY, error); } appMap = appMapTmp; diff --git a/fizz-core/src/main/java/we/plugin/auth/AuthPluginFilter.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AuthPluginFilter.java similarity index 94% rename from fizz-core/src/main/java/we/plugin/auth/AuthPluginFilter.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/AuthPluginFilter.java index 86e954e..87312ca 100644 --- a/fizz-core/src/main/java/we/plugin/auth/AuthPluginFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/AuthPluginFilter.java @@ -15,17 +15,19 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.PluginFilter; +import com.fizzgate.util.Consts; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.PluginFilter; -import we.util.Consts; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.Collections; diff --git a/fizz-core/src/main/java/we/plugin/auth/CallbackConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/CallbackConfig.java similarity index 94% rename from fizz-core/src/main/java/we/plugin/auth/CallbackConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/CallbackConfig.java index ef66efe..13d2bde 100644 --- a/fizz-core/src/main/java/we/plugin/auth/CallbackConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/CallbackConfig.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package we.plugin.auth; - -import we.util.JacksonUtils; +package com.fizzgate.plugin.auth; import java.util.Collections; import java.util.List; import java.util.Map; +import com.fizzgate.util.JacksonUtils; + /** * @author hongqiaowei */ diff --git a/fizz-core/src/main/java/we/plugin/auth/CustomAuth.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/CustomAuth.java similarity index 97% rename from fizz-core/src/main/java/we/plugin/auth/CustomAuth.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/CustomAuth.java index f4e4352..13111a5 100644 --- a/fizz-core/src/main/java/we/plugin/auth/CustomAuth.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/CustomAuth.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; diff --git a/fizz-core/src/main/java/we/plugin/auth/GatewayGroup.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup.java similarity index 94% rename from fizz-core/src/main/java/we/plugin/auth/GatewayGroup.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup.java index c8b933f..95887c4 100644 --- a/fizz-core/src/main/java/we/plugin/auth/GatewayGroup.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.plugin.PluginConfig; -import we.util.JacksonUtils; + +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.util.JacksonUtils; import java.util.*; diff --git a/fizz-core/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup2apiConfig.java similarity index 96% rename from fizz-core/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup2apiConfig.java index f2695f9..3aebaf3 100644 --- a/fizz-core/src/main/java/we/plugin/auth/GatewayGroup2apiConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroup2apiConfig.java @@ -15,12 +15,13 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.util.JacksonUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.util.JacksonUtils; import java.util.HashMap; import java.util.HashSet; diff --git a/fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroupService.java similarity index 97% rename from fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroupService.java index f4dca04..606020c 100644 --- a/fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/GatewayGroupService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; @@ -23,13 +23,15 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.NetworkUtils; +import com.fizzgate.util.ReactorUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.NetworkUtils; -import we.util.ReactorUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/plugin/auth/Receiver.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/Receiver.java similarity index 92% rename from fizz-core/src/main/java/we/plugin/auth/Receiver.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/Receiver.java index 43e165a..34fb80a 100644 --- a/fizz-core/src/main/java/we/plugin/auth/Receiver.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/Receiver.java @@ -15,12 +15,13 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; + import org.apache.commons.lang3.StringUtils; -import we.util.Consts; -import we.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ServiceConfig.java similarity index 98% rename from fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/auth/ServiceConfig.java index 0a4038e..292522e 100644 --- a/fizz-core/src/main/java/we/plugin/auth/ServiceConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/auth/ServiceConfig.java @@ -15,14 +15,15 @@ * along with this program. If not, see . */ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.UrlTransformUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpMethod; -import we.util.ThreadContext; -import we.util.UrlTransformUtils; import java.util.*; diff --git a/fizz-core/src/main/java/we/plugin/requestbody/RequestBodyPlugin.java b/fizz-core/src/main/java/com/fizzgate/plugin/requestbody/RequestBodyPlugin.java similarity index 90% rename from fizz-core/src/main/java/we/plugin/requestbody/RequestBodyPlugin.java rename to fizz-core/src/main/java/com/fizzgate/plugin/requestbody/RequestBodyPlugin.java index 3a01e87..542b034 100644 --- a/fizz-core/src/main/java/we/plugin/requestbody/RequestBodyPlugin.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/requestbody/RequestBodyPlugin.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.requestbody; +package com.fizzgate.plugin.requestbody; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; @@ -24,14 +24,16 @@ import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; +import com.fizzgate.spring.web.server.ext.FizzServerWebExchangeDecorator; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.FizzPluginFilter; -import we.plugin.FizzPluginFilterChain; -import we.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; -import we.spring.web.server.ext.FizzServerWebExchangeDecorator; -import we.util.Consts; -import we.util.NettyDataBufferUtils; -import we.util.WebUtils; import java.util.Map; diff --git a/fizz-core/src/main/java/we/plugin/stat/AccessStat.java b/fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStat.java similarity index 93% rename from fizz-core/src/main/java/we/plugin/stat/AccessStat.java rename to fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStat.java index 8f55f60..010d5a4 100644 --- a/fizz-core/src/main/java/we/plugin/stat/AccessStat.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStat.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.plugin.stat; +package com.fizzgate.plugin.stat; -import we.util.JacksonUtils; +import com.fizzgate.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/plugin/stat/AccessStatSchedConfig.java b/fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStatSchedConfig.java similarity index 93% rename from fizz-core/src/main/java/we/plugin/stat/AccessStatSchedConfig.java rename to fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStatSchedConfig.java index 20b4945..ed1610a 100644 --- a/fizz-core/src/main/java/we/plugin/stat/AccessStatSchedConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/stat/AccessStatSchedConfig.java @@ -15,18 +15,19 @@ * along with this program. If not, see . */ -package we.plugin.stat; +package com.fizzgate.plugin.stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; -import we.config.AggregateRedisConfig; -import we.config.SchedConfig; -import we.util.Consts; -import we.util.DateTimeUtils; -import we.util.StringUtils; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SchedConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; +import com.fizzgate.util.StringUtils; import javax.annotation.Resource; import java.util.Map; diff --git a/fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java b/fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilter.java similarity index 95% rename from fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java rename to fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilter.java index d668efa..e5ed774 100644 --- a/fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilter.java @@ -15,18 +15,20 @@ * along with this program. If not, see . */ -package we.plugin.stat; +package com.fizzgate.plugin.stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.PluginFilter; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.PluginFilter; -import we.util.Consts; -import we.util.DateTimeUtils; -import we.util.ThreadContext; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/plugin/stat/StatPluginFilterProperties.java b/fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilterProperties.java similarity index 89% rename from fizz-core/src/main/java/we/plugin/stat/StatPluginFilterProperties.java rename to fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilterProperties.java index 3697196..0731169 100644 --- a/fizz-core/src/main/java/we/plugin/stat/StatPluginFilterProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/plugin/stat/StatPluginFilterProperties.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.plugin.stat; +package com.fizzgate.plugin.stat; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; -import we.context.config.annotation.FizzRefreshScope; + +import com.fizzgate.context.config.annotation.FizzRefreshScope; /** * {@link StatPluginFilter} properties diff --git a/fizz-core/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java b/fizz-core/src/main/java/com/fizzgate/proxy/AbstractDiscoveryClientUriSelector.java similarity index 92% rename from fizz-core/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java rename to fizz-core/src/main/java/com/fizzgate/proxy/AbstractDiscoveryClientUriSelector.java index 4e2718f..c7c644f 100644 --- a/fizz-core/src/main/java/we/proxy/AbstractDiscoveryClientUriSelector.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/AbstractDiscoveryClientUriSelector.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; -import we.util.Consts; -import we.util.ThreadContext; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ThreadContext; /** * Abstract implementation of {@code DiscoveryClientUriSelector} diff --git a/fizz-core/src/main/java/we/proxy/CallBackendConfig.java b/fizz-core/src/main/java/com/fizzgate/proxy/CallBackendConfig.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/CallBackendConfig.java rename to fizz-core/src/main/java/com/fizzgate/proxy/CallBackendConfig.java index f7e60b2..fc48574 100644 --- a/fizz-core/src/main/java/we/proxy/CallBackendConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/CallBackendConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/proxy/CallbackReplayReq.java b/fizz-core/src/main/java/com/fizzgate/proxy/CallbackReplayReq.java similarity index 96% rename from fizz-core/src/main/java/we/proxy/CallbackReplayReq.java rename to fizz-core/src/main/java/com/fizzgate/proxy/CallbackReplayReq.java index 14eb047..671be93 100644 --- a/fizz-core/src/main/java/we/proxy/CallbackReplayReq.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/CallbackReplayReq.java @@ -15,16 +15,17 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Utils; + import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import we.util.JacksonUtils; -import we.util.Utils; import java.util.List; import java.util.Map; diff --git a/fizz-core/src/main/java/we/proxy/CallbackService.java b/fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java similarity index 96% rename from fizz-core/src/main/java/we/proxy/CallbackService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java index baf1756..dd14621 100644 --- a/fizz-core/src/main/java/we/proxy/CallbackService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,18 +28,20 @@ import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.BodyExtractors; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.constants.CommonConstants; +import com.fizzgate.fizz.AggregateResult; +import com.fizzgate.fizz.AggregateService; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.CallbackConfig; +import com.fizzgate.plugin.auth.Receiver; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.util.*; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.constants.CommonConstants; -import we.fizz.AggregateResult; -import we.fizz.AggregateService; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.CallbackConfig; -import we.plugin.auth.Receiver; -import we.service_registry.RegistryCenterService; -import we.util.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/proxy/DisableDiscoveryUriSelector.java b/fizz-core/src/main/java/com/fizzgate/proxy/DisableDiscoveryUriSelector.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/DisableDiscoveryUriSelector.java rename to fizz-core/src/main/java/com/fizzgate/proxy/DisableDiscoveryUriSelector.java index 5c8fdf4..23c527d 100644 --- a/fizz-core/src/main/java/we/proxy/DisableDiscoveryUriSelector.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/DisableDiscoveryUriSelector.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Service; diff --git a/fizz-core/src/main/java/we/proxy/DiscoveryClientUriSelector.java b/fizz-core/src/main/java/com/fizzgate/proxy/DiscoveryClientUriSelector.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/DiscoveryClientUriSelector.java rename to fizz-core/src/main/java/com/fizzgate/proxy/DiscoveryClientUriSelector.java index 025290b..ab9e97a 100644 --- a/fizz-core/src/main/java/we/proxy/DiscoveryClientUriSelector.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/DiscoveryClientUriSelector.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; /** * A {@code DiscoveryClientUriSelector} is used to select the uri for the next request diff --git a/fizz-core/src/main/java/we/proxy/EurekaUriSelector.java b/fizz-core/src/main/java/com/fizzgate/proxy/EurekaUriSelector.java similarity index 99% rename from fizz-core/src/main/java/we/proxy/EurekaUriSelector.java rename to fizz-core/src/main/java/com/fizzgate/proxy/EurekaUriSelector.java index 287fa74..b90af42 100644 --- a/fizz-core/src/main/java/we/proxy/EurekaUriSelector.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/EurekaUriSelector.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.EurekaClient; diff --git a/fizz-core/src/main/java/we/proxy/FailAggregateResult.java b/fizz-core/src/main/java/com/fizzgate/proxy/FailAggregateResult.java similarity index 92% rename from fizz-core/src/main/java/we/proxy/FailAggregateResult.java rename to fizz-core/src/main/java/com/fizzgate/proxy/FailAggregateResult.java index 0185a30..d77f0b6 100644 --- a/fizz-core/src/main/java/we/proxy/FailAggregateResult.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/FailAggregateResult.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; -import we.fizz.AggregateResult; +import com.fizzgate.fizz.AggregateResult; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/proxy/FizzFailClientResponse.java b/fizz-core/src/main/java/com/fizzgate/proxy/FizzFailClientResponse.java similarity index 99% rename from fizz-core/src/main/java/we/proxy/FizzFailClientResponse.java rename to fizz-core/src/main/java/com/fizzgate/proxy/FizzFailClientResponse.java index 3b9090d..bf9fa82 100644 --- a/fizz-core/src/main/java/we/proxy/FizzFailClientResponse.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/FizzFailClientResponse.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpStatus; diff --git a/fizz-core/src/main/java/we/proxy/FizzWebClient.java b/fizz-core/src/main/java/com/fizzgate/proxy/FizzWebClient.java similarity index 88% rename from fizz-core/src/main/java/we/proxy/FizzWebClient.java rename to fizz-core/src/main/java/com/fizzgate/proxy/FizzWebClient.java index e9183ac..a29fc01 100644 --- a/fizz-core/src/main/java/we/proxy/FizzWebClient.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/FizzWebClient.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -26,21 +26,25 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.web.reactive.function.BodyInserter; import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; + +import com.fizzgate.config.ProxyWebClientConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.exception.ExternalService4xxException; +import com.fizzgate.fizz.exception.FizzRuntimeException; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NetworkUtils; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import we.config.ProxyWebClientConfig; -import we.config.SystemConfig; -import we.exception.ExternalService4xxException; -import we.fizz.exception.FizzRuntimeException; -import we.service_registry.RegistryCenterService; -import we.util.Consts; -import we.util.ThreadContext; -import we.util.WebUtils; import javax.annotation.Resource; import java.time.Duration; @@ -48,6 +52,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import static com.google.common.net.HttpHeaders.X_FORWARDED_FOR; + /** * @author hongqiaowei */ @@ -236,6 +242,17 @@ public class FizzWebClient { ); } setHostHeader(uri, hdrs); + if (systemConfig.isFizzWebClientXForwardedForEnable()) { + List values = hdrs.get(X_FORWARDED_FOR); + /* if (CollectionUtils.isEmpty(values)) { + hdrs.add(X_FORWARDED_FOR, WebUtils.getOriginIp(null)); + } */ + if (systemConfig.isFizzWebClientXForwardedForAppendGatewayIp()) { + hdrs.add(X_FORWARDED_FOR, NetworkUtils.getServerIp()); + } + } else { + hdrs.remove(X_FORWARDED_FOR); + } } ); diff --git a/fizz-core/src/main/java/we/proxy/NacosUriSelector.java b/fizz-core/src/main/java/com/fizzgate/proxy/NacosUriSelector.java similarity index 99% rename from fizz-core/src/main/java/we/proxy/NacosUriSelector.java rename to fizz-core/src/main/java/com/fizzgate/proxy/NacosUriSelector.java index 8d16250..b69621a 100644 --- a/fizz-core/src/main/java/we/proxy/NacosUriSelector.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/NacosUriSelector.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosServiceManager; diff --git a/fizz-core/src/main/java/we/proxy/Route.java b/fizz-core/src/main/java/com/fizzgate/proxy/Route.java similarity index 96% rename from fizz-core/src/main/java/we/proxy/Route.java rename to fizz-core/src/main/java/com/fizzgate/proxy/Route.java index 52773b5..bcbbedf 100644 --- a/fizz-core/src/main/java/we/proxy/Route.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/Route.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import we.plugin.PluginConfig; -import we.util.Consts; -import we.util.JacksonUtils; + +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; import java.util.List; diff --git a/fizz-core/src/main/java/we/proxy/RpcInstanceService.java b/fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceService.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/RpcInstanceService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceService.java index a43a82b..c59e19d 100644 --- a/fizz-core/src/main/java/we/proxy/RpcInstanceService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceService.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 we.proxy; +package com.fizzgate.proxy; /** * RPC instance service interface diff --git a/fizz-core/src/main/java/we/proxy/RpcInstanceServiceImpl.java b/fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceServiceImpl.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/RpcInstanceServiceImpl.java rename to fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceServiceImpl.java index c048789..1d14462 100644 --- a/fizz-core/src/main/java/we/proxy/RpcInstanceServiceImpl.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/RpcInstanceServiceImpl.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 we.proxy; +package com.fizzgate.proxy; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; @@ -22,12 +22,14 @@ import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactorUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ReactorUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/proxy/ServiceInstance.java b/fizz-core/src/main/java/com/fizzgate/proxy/ServiceInstance.java similarity index 94% rename from fizz-core/src/main/java/we/proxy/ServiceInstance.java rename to fizz-core/src/main/java/com/fizzgate/proxy/ServiceInstance.java index 278dd13..2c2e59b 100644 --- a/fizz-core/src/main/java/we/proxy/ServiceInstance.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/ServiceInstance.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; -import we.util.JacksonUtils; +import com.fizzgate.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/proxy/ServiceTypePath.java b/fizz-core/src/main/java/com/fizzgate/proxy/ServiceTypePath.java similarity index 93% rename from fizz-core/src/main/java/we/proxy/ServiceTypePath.java rename to fizz-core/src/main/java/com/fizzgate/proxy/ServiceTypePath.java index 9f4af80..31cdc4a 100644 --- a/fizz-core/src/main/java/we/proxy/ServiceTypePath.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/ServiceTypePath.java @@ -15,12 +15,13 @@ * along with this program. If not, see . */ -package we.proxy; +package com.fizzgate.proxy; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; + import org.apache.commons.lang3.StringUtils; -import we.util.Consts; -import we.util.JacksonUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericService.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericService.java index 15ffd62..d2a45db 100644 --- a/fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.dubbo; +package com.fizzgate.proxy.dubbo; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -29,8 +29,9 @@ import org.apache.dubbo.rpc.service.GenericService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import com.fizzgate.fizz.exception.FizzException; + import reactor.core.publisher.Mono; -import we.fizz.exception.FizzException; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericServiceProperties.java b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericServiceProperties.java similarity index 89% rename from fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericServiceProperties.java rename to fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericServiceProperties.java index 027b41c..3324e92 100644 --- a/fizz-core/src/main/java/we/proxy/dubbo/ApacheDubboGenericServiceProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/ApacheDubboGenericServiceProperties.java @@ -14,13 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.proxy.dubbo; +package com.fizzgate.proxy.dubbo; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; -import we.context.config.annotation.FizzRefreshScope; + +import com.fizzgate.context.config.annotation.FizzRefreshScope; /** * {@link ApacheDubboGenericService} properties diff --git a/fizz-core/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboInterfaceDeclaration.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java rename to fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboInterfaceDeclaration.java index abaaf86..4e611af 100644 --- a/fizz-core/src/main/java/we/proxy/dubbo/DubboInterfaceDeclaration.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboInterfaceDeclaration.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.dubbo; +package com.fizzgate.proxy.dubbo; /** * diff --git a/fizz-core/src/main/java/we/proxy/dubbo/DubboUtils.java b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboUtils.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/dubbo/DubboUtils.java rename to fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboUtils.java index 840b7dc..84a25a2 100644 --- a/fizz-core/src/main/java/we/proxy/dubbo/DubboUtils.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/dubbo/DubboUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.dubbo; +package com.fizzgate.proxy.dubbo; import java.util.LinkedList; import java.util.List; diff --git a/fizz-core/src/main/java/we/proxy/grpc/GrpcGenericService.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcGenericService.java similarity index 88% rename from fizz-core/src/main/java/we/proxy/grpc/GrpcGenericService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcGenericService.java index 09dde95..3711f85 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/GrpcGenericService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcGenericService.java @@ -15,8 +15,13 @@ * along with this program. If not, see . */ -package we.proxy.grpc; +package com.fizzgate.proxy.grpc; +import com.fizzgate.fizz.exception.FizzException; +import com.fizzgate.proxy.grpc.client.CallResults; +import com.fizzgate.proxy.grpc.client.GrpcProxyClient; +import com.fizzgate.proxy.grpc.client.core.GrpcMethodDefinition; +import com.fizzgate.proxy.grpc.client.utils.ChannelFactory; import com.google.common.net.HostAndPort; import com.google.common.util.concurrent.ListenableFuture; import io.grpc.CallOptions; @@ -25,21 +30,15 @@ import org.apache.dubbo.rpc.service.GenericException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; -import we.fizz.exception.FizzException; + +import static com.fizzgate.proxy.grpc.client.utils.GrpcReflectionUtils.parseToMethodDefinition; import static io.grpc.CallOptions.DEFAULT; import static java.util.Collections.singletonList; -import we.proxy.grpc.client.CallResults; -import we.proxy.grpc.client.GrpcProxyClient; -import we.proxy.grpc.client.core.GrpcMethodDefinition; -import we.proxy.grpc.client.utils.ChannelFactory; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import static we.proxy.grpc.client.utils.GrpcReflectionUtils.parseToMethodDefinition; - @Service public class GrpcGenericService { diff --git a/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceService.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceService.java similarity index 96% rename from fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceService.java index 285377b..db562b4 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceService.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 we.proxy.grpc; +package com.fizzgate.proxy.grpc; /** * gRPC instance service interface diff --git a/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceServiceImpl.java similarity index 93% rename from fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceServiceImpl.java index a49ace0..021ddff 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/GrpcInstanceServiceImpl.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInstanceServiceImpl.java @@ -14,10 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.proxy.grpc; +package com.fizzgate.proxy.grpc; import org.springframework.stereotype.Service; -import we.proxy.RpcInstanceService; + +import com.fizzgate.proxy.RpcInstanceService; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInterfaceDeclaration.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInterfaceDeclaration.java index 1a23f77..b7b89c7 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/GrpcInterfaceDeclaration.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/GrpcInterfaceDeclaration.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.grpc; +package com.fizzgate.proxy.grpc; public class GrpcInterfaceDeclaration { private String method; diff --git a/fizz-core/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/ListenableFutureAdapter.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/ListenableFutureAdapter.java index 6701fde..df57762 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/ListenableFutureAdapter.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/ListenableFutureAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.grpc; +package com.fizzgate.proxy.grpc; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/CallParams.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallParams.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/grpc/client/CallParams.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallParams.java index 0b4bcc8..9cfad52 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/CallParams.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallParams.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package we.proxy.grpc.client; +package com.fizzgate.proxy.grpc.client; import java.util.List; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/CallResults.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallResults.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/grpc/client/CallResults.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallResults.java index e168939..debb106 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/CallResults.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/CallResults.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package we.proxy.grpc.client; +package com.fizzgate.proxy.grpc.client; import static java.util.stream.Collectors.toList; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/GrpcClient.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcClient.java similarity index 92% rename from fizz-core/src/main/java/we/proxy/grpc/client/GrpcClient.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcClient.java index 2b7aa7e..fb04b10 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/GrpcClient.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcClient.java @@ -21,8 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package we.proxy.grpc.client; +package com.fizzgate.proxy.grpc.client; +import static com.fizzgate.proxy.grpc.client.utils.GrpcReflectionUtils.fetchFullMethodName; +import static com.fizzgate.proxy.grpc.client.utils.GrpcReflectionUtils.fetchMethodType; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; @@ -31,8 +33,6 @@ import static io.grpc.stub.ClientCalls.asyncServerStreamingCall; import static io.grpc.stub.ClientCalls.asyncUnaryCall; //import static org.apache.commons.collections4.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; -import static we.proxy.grpc.client.utils.GrpcReflectionUtils.fetchFullMethodName; -import static we.proxy.grpc.client.utils.GrpcReflectionUtils.fetchMethodType; import java.util.List; @@ -41,6 +41,9 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fizzgate.proxy.grpc.client.core.CompositeStreamObserver; +import com.fizzgate.proxy.grpc.client.core.DoneObserver; +import com.fizzgate.proxy.grpc.client.core.DynamicMessageMarshaller; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.DynamicMessage; @@ -49,9 +52,6 @@ import io.grpc.ClientCall; import io.grpc.MethodDescriptor.MethodType; import io.grpc.stub.StreamObserver; -import we.proxy.grpc.client.core.CompositeStreamObserver; -import we.proxy.grpc.client.core.DoneObserver; -import we.proxy.grpc.client.core.DynamicMessageMarshaller; /** * @author zhangjikai diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcProxyClient.java similarity index 92% rename from fizz-core/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcProxyClient.java index 3b39a1c..8d768db 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/GrpcProxyClient.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/GrpcProxyClient.java @@ -21,11 +21,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package we.proxy.grpc.client; +package com.fizzgate.proxy.grpc.client; import java.util.List; import java.util.concurrent.ExecutionException; +import com.fizzgate.proxy.grpc.client.core.GrpcMethodDefinition; +import com.fizzgate.proxy.grpc.client.core.ServiceResolver; +import com.fizzgate.proxy.grpc.client.utils.GrpcReflectionUtils; +import com.fizzgate.proxy.grpc.client.utils.MessageWriter; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.DescriptorProtos.FileDescriptorSet; import com.google.protobuf.Descriptors.MethodDescriptor; @@ -37,10 +41,6 @@ import io.grpc.Channel; import io.grpc.stub.StreamObserver; import org.springframework.stereotype.Service; -import we.proxy.grpc.client.core.GrpcMethodDefinition; -import we.proxy.grpc.client.core.ServiceResolver; -import we.proxy.grpc.client.utils.GrpcReflectionUtils; -import we.proxy.grpc.client.utils.MessageWriter; @Service /** * @author zhangjikai diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/CompositeStreamObserver.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/CompositeStreamObserver.java index 8b5cb47..19f01cd 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/CompositeStreamObserver.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/CompositeStreamObserver.java @@ -27,7 +27,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/DoneObserver.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DoneObserver.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/DoneObserver.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DoneObserver.java index 2c1f066..42aacf1 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/DoneObserver.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DoneObserver.java @@ -27,7 +27,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DynamicMessageMarshaller.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DynamicMessageMarshaller.java index fec1d90..907efba 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/DynamicMessageMarshaller.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/DynamicMessageMarshaller.java @@ -27,7 +27,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import java.io.IOException; import java.io.InputStream; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/GrpcMethodDefinition.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/GrpcMethodDefinition.java index bb62b63..a2838fa 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/GrpcMethodDefinition.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/GrpcMethodDefinition.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServerReflectionClient.java similarity index 99% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServerReflectionClient.java index 74d700a..c0f1afc 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/ServerReflectionClient.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServerReflectionClient.java @@ -27,7 +27,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import java.util.HashMap; import java.util.HashSet; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServiceResolver.java similarity index 99% rename from fizz-core/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServiceResolver.java index 94a7525..00feac4 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/core/ServiceResolver.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/core/ServiceResolver.java @@ -27,7 +27,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package we.proxy.grpc.client.core; +package com.fizzgate.proxy.grpc.client.core; import java.util.ArrayList; import java.util.HashMap; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/ChannelFactory.java similarity index 98% rename from fizz-core/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/ChannelFactory.java index 3eaca96..da1c377 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/utils/ChannelFactory.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/ChannelFactory.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.grpc.client.utils; +package com.fizzgate.proxy.grpc.client.utils; import static io.grpc.Metadata.ASCII_STRING_MARSHALLER; import static java.util.Collections.emptyMap; diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/GrpcReflectionUtils.java similarity index 97% rename from fizz-core/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/GrpcReflectionUtils.java index 0320ca3..b5180c1 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/utils/GrpcReflectionUtils.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/GrpcReflectionUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.proxy.grpc.client.utils; +package com.fizzgate.proxy.grpc.client.utils; import static com.google.common.base.Preconditions.checkArgument; import static io.grpc.MethodDescriptor.generateFullMethodName; @@ -33,6 +33,8 @@ import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fizzgate.proxy.grpc.client.core.GrpcMethodDefinition; +import com.fizzgate.proxy.grpc.client.core.ServerReflectionClient; import com.google.common.util.concurrent.ListenableFuture; import com.google.protobuf.DescriptorProtos.FileDescriptorSet; import com.google.protobuf.Descriptors.Descriptor; @@ -46,8 +48,6 @@ import com.google.protobuf.util.JsonFormat.TypeRegistry; import io.grpc.Channel; import io.grpc.MethodDescriptor.MethodType; import io.grpc.Status; -import we.proxy.grpc.client.core.GrpcMethodDefinition; -import we.proxy.grpc.client.core.ServerReflectionClient; /** * @author zhangjikai diff --git a/fizz-core/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/MessageWriter.java similarity index 95% rename from fizz-core/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java rename to fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/MessageWriter.java index a69d641..72d7a11 100644 --- a/fizz-core/src/main/java/we/proxy/grpc/client/utils/MessageWriter.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/grpc/client/utils/MessageWriter.java @@ -15,20 +15,20 @@ * along with this program. If not, see . */ -package we.proxy.grpc.client.utils; +package com.fizzgate.proxy.grpc.client.utils; import static com.google.protobuf.util.JsonFormat.TypeRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fizzgate.proxy.grpc.client.CallResults; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Message; import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat.Printer; import io.grpc.stub.StreamObserver; -import we.proxy.grpc.client.CallResults; /** * @author zhangjikai diff --git a/fizz-core/src/main/java/we/proxy/http/HttpInstanceService.java b/fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceService.java similarity index 96% rename from fizz-core/src/main/java/we/proxy/http/HttpInstanceService.java rename to fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceService.java index 22a95f4..f276eec 100644 --- a/fizz-core/src/main/java/we/proxy/http/HttpInstanceService.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceService.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 we.proxy.http; +package com.fizzgate.proxy.http; /** * HTTP instance service interface diff --git a/fizz-core/src/main/java/we/proxy/http/HttpInstanceServiceImpl.java b/fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceServiceImpl.java similarity index 93% rename from fizz-core/src/main/java/we/proxy/http/HttpInstanceServiceImpl.java rename to fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceServiceImpl.java index a05e79b..59bbbd6 100644 --- a/fizz-core/src/main/java/we/proxy/http/HttpInstanceServiceImpl.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/http/HttpInstanceServiceImpl.java @@ -14,10 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.proxy.http; +package com.fizzgate.proxy.http; import org.springframework.stereotype.Service; -import we.proxy.RpcInstanceService; + +import com.fizzgate.proxy.RpcInstanceService; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/proxy/package-info.java b/fizz-core/src/main/java/com/fizzgate/proxy/package-info.java similarity index 95% rename from fizz-core/src/main/java/we/proxy/package-info.java rename to fizz-core/src/main/java/com/fizzgate/proxy/package-info.java index 88bcdd4..b9132a3 100644 --- a/fizz-core/src/main/java/we/proxy/package-info.java +++ b/fizz-core/src/main/java/com/fizzgate/proxy/package-info.java @@ -18,7 +18,7 @@ * @author lancer * * 设想的包结构： - * we.fizz + * com.fizzgate.fizz * .config * .filter * .util @@ -27,4 +27,4 @@ * .route 路由逻辑 * .legacy */ -package we.proxy; +package com.fizzgate.proxy; diff --git a/fizz-core/src/main/java/we/service_registry/FizzServiceRegistration.java b/fizz-core/src/main/java/com/fizzgate/service_registry/FizzServiceRegistration.java similarity index 93% rename from fizz-core/src/main/java/we/service_registry/FizzServiceRegistration.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/FizzServiceRegistration.java index df74ac9..b0129d6 100644 --- a/fizz-core/src/main/java/we/service_registry/FizzServiceRegistration.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/FizzServiceRegistration.java @@ -15,17 +15,18 @@ * along with this program. If not, see . */ -package we.service_registry; +package com.fizzgate.service_registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.context.ApplicationContext; -import we.service_registry.eureka.FizzEurekaHelper; -import we.service_registry.nacos.FizzNacosHelper; -import we.util.PropertiesUtils; -import we.util.YmlUtils; + +import com.fizzgate.service_registry.eureka.FizzEurekaHelper; +import com.fizzgate.service_registry.nacos.FizzNacosHelper; +import com.fizzgate.util.PropertiesUtils; +import com.fizzgate.util.YmlUtils; import java.util.List; import java.util.Properties; diff --git a/fizz-core/src/main/java/we/service_registry/RegistryCenter.java b/fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenter.java similarity index 97% rename from fizz-core/src/main/java/we/service_registry/RegistryCenter.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenter.java index f2be1d5..0f402b1 100644 --- a/fizz-core/src/main/java/we/service_registry/RegistryCenter.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenter.java @@ -15,13 +15,14 @@ * along with this program. If not, see . */ -package we.service_registry; +package com.fizzgate.service_registry; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.util.JacksonUtils; + import org.springframework.context.ApplicationContext; -import we.util.JacksonUtils; import java.util.Objects; diff --git a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java b/fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenterService.java similarity index 98% rename from fizz-core/src/main/java/we/service_registry/RegistryCenterService.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenterService.java index 0a52e07..6eb7a1b 100644 --- a/fizz-core/src/main/java/we/service_registry/RegistryCenterService.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/RegistryCenterService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.service_registry; +package com.fizzgate.service_registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,11 +24,13 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.util.*; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.config.SystemConfig; -import we.util.*; import javax.annotation.Resource; import java.util.Collections; diff --git a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaHelper.java b/fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaHelper.java similarity index 98% rename from fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaHelper.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaHelper.java index 269a54d..e27245f 100644 --- a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaHelper.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaHelper.java @@ -15,8 +15,10 @@ * along with this program. If not, see . */ -package we.service_registry.eureka; +package com.fizzgate.service_registry.eureka; +import com.fizzgate.util.Consts; +import com.fizzgate.util.PropertiesUtils; import com.netflix.appinfo.ApplicationInfoManager; import com.netflix.appinfo.HealthCheckHandler; import com.netflix.appinfo.InstanceInfo; @@ -32,8 +34,6 @@ import org.springframework.cloud.netflix.eureka.InstanceInfoFactory; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry; import org.springframework.context.ApplicationContext; -import we.util.Consts; -import we.util.PropertiesUtils; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java b/fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaServiceRegistration.java similarity index 97% rename from fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaServiceRegistration.java index a8f2f74..d605242 100644 --- a/fizz-core/src/main/java/we/service_registry/eureka/FizzEurekaServiceRegistration.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/eureka/FizzEurekaServiceRegistration.java @@ -15,8 +15,11 @@ * along with this program. If not, see . */ -package we.service_registry.eureka; +package com.fizzgate.service_registry.eureka; +import com.fizzgate.service_registry.FizzServiceRegistration; +import com.fizzgate.util.Consts; +import com.fizzgate.util.Utils; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.DiscoveryClient; import com.netflix.discovery.EurekaClientConfig; @@ -27,9 +30,6 @@ import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry; import org.springframework.util.CollectionUtils; -import we.service_registry.FizzServiceRegistration; -import we.util.Consts; -import we.util.Utils; import java.util.*; diff --git a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosHelper.java similarity index 96% rename from fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosHelper.java index 8f70636..224d14b 100644 --- a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosHelper.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosHelper.java @@ -15,20 +15,21 @@ * along with this program. If not, see . */ -package we.service_registry.nacos; +package com.fizzgate.service_registry.nacos; import com.alibaba.cloud.nacos.NacosServiceManager; import com.alibaba.cloud.nacos.registry.NacosRegistration; import com.alibaba.cloud.nacos.registry.NacosServiceRegistry; import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.naming.NamingService; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.PropertiesUtils; +import com.fizzgate.util.ReflectionUtils; + import org.apache.commons.lang3.StringUtils; import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.PropertiesUtils; -import we.util.ReflectionUtils; import java.util.Properties; diff --git a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosProperties.java b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosProperties.java similarity index 99% rename from fizz-core/src/main/java/we/service_registry/nacos/FizzNacosProperties.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosProperties.java index ede338e..7924ae2 100644 --- a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosProperties.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosProperties.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.service_registry.nacos; +package com.fizzgate.service_registry.nacos; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.nacos.api.naming.PreservedMetadataKeys; diff --git a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosServiceRegistration.java b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosServiceRegistration.java similarity index 97% rename from fizz-core/src/main/java/we/service_registry/nacos/FizzNacosServiceRegistration.java rename to fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosServiceRegistration.java index 01a3bbc..1ad32ff 100644 --- a/fizz-core/src/main/java/we/service_registry/nacos/FizzNacosServiceRegistration.java +++ b/fizz-core/src/main/java/com/fizzgate/service_registry/nacos/FizzNacosServiceRegistration.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.service_registry.nacos; +package com.fizzgate.service_registry.nacos; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.registry.NacosRegistration; @@ -35,11 +35,12 @@ import com.alibaba.nacos.common.remote.client.Connection; import com.alibaba.nacos.common.remote.client.RpcClientStatus; import com.alibaba.nacos.common.remote.client.grpc.GrpcClient; import com.alibaba.nacos.common.utils.ThreadUtils; +import com.fizzgate.service_registry.FizzServiceRegistration; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.Utils; + import org.springframework.util.StringUtils; -import we.service_registry.FizzServiceRegistration; -import we.util.Consts; -import we.util.ReflectionUtils; -import we.util.Utils; import java.util.Collections; import java.util.List; diff --git a/fizz-core/src/main/java/we/stats/BlockType.java b/fizz-core/src/main/java/com/fizzgate/stats/BlockType.java similarity index 97% rename from fizz-core/src/main/java/we/stats/BlockType.java rename to fizz-core/src/main/java/com/fizzgate/stats/BlockType.java index 55005f1..4c02280 100644 --- a/fizz-core/src/main/java/we/stats/BlockType.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/BlockType.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; /** * diff --git a/fizz-core/src/main/java/we/stats/FlowStat.java b/fizz-core/src/main/java/com/fizzgate/stats/FlowStat.java similarity index 99% rename from fizz-core/src/main/java/we/stats/FlowStat.java rename to fizz-core/src/main/java/com/fizzgate/stats/FlowStat.java index 6cb6996..16417ec 100644 --- a/fizz-core/src/main/java/we/stats/FlowStat.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/FlowStat.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; import java.util.*; import java.util.Map.Entry; @@ -32,10 +32,11 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.web.server.ServerWebExchange; -import we.stats.circuitbreaker.CircuitBreakManager; -import we.stats.circuitbreaker.CircuitBreaker; -import we.util.ResourceIdUtils; -import we.util.WebUtils; + +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; +import com.fizzgate.stats.circuitbreaker.CircuitBreaker; +import com.fizzgate.util.ResourceIdUtils; +import com.fizzgate.util.WebUtils; /** * Flow Statistic diff --git a/fizz-core/src/main/java/we/stats/IncrRequestResult.java b/fizz-core/src/main/java/com/fizzgate/stats/IncrRequestResult.java similarity index 98% rename from fizz-core/src/main/java/we/stats/IncrRequestResult.java rename to fizz-core/src/main/java/com/fizzgate/stats/IncrRequestResult.java index 2025200..e932c90 100644 --- a/fizz-core/src/main/java/we/stats/IncrRequestResult.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/IncrRequestResult.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; /** * diff --git a/fizz-core/src/main/java/we/stats/ResourceConfig.java b/fizz-core/src/main/java/com/fizzgate/stats/ResourceConfig.java similarity index 98% rename from fizz-core/src/main/java/we/stats/ResourceConfig.java rename to fizz-core/src/main/java/com/fizzgate/stats/ResourceConfig.java index c5b95be..8c2b22f 100644 --- a/fizz-core/src/main/java/we/stats/ResourceConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/ResourceConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/fizz-core/src/main/java/we/stats/ResourceStat.java b/fizz-core/src/main/java/com/fizzgate/stats/ResourceStat.java similarity index 99% rename from fizz-core/src/main/java/we/stats/ResourceStat.java rename to fizz-core/src/main/java/com/fizzgate/stats/ResourceStat.java index 55ce2b7..f9049ec 100644 --- a/fizz-core/src/main/java/we/stats/ResourceStat.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/ResourceStat.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; import java.math.BigDecimal; import java.util.concurrent.ConcurrentHashMap; @@ -27,7 +27,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import we.stats.circuitbreaker.CircuitBreaker; + +import com.fizzgate.stats.circuitbreaker.CircuitBreaker; /** * diff --git a/fizz-core/src/main/java/we/stats/ResourceTimeWindowStat.java b/fizz-core/src/main/java/com/fizzgate/stats/ResourceTimeWindowStat.java similarity index 97% rename from fizz-core/src/main/java/we/stats/ResourceTimeWindowStat.java rename to fizz-core/src/main/java/com/fizzgate/stats/ResourceTimeWindowStat.java index 8cdcbb4..52f5bf8 100644 --- a/fizz-core/src/main/java/we/stats/ResourceTimeWindowStat.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/ResourceTimeWindowStat.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 we.stats; +package com.fizzgate.stats; import java.util.ArrayList; import java.util.List; diff --git a/fizz-core/src/main/java/we/stats/TimeSlot.java b/fizz-core/src/main/java/com/fizzgate/stats/TimeSlot.java similarity index 98% rename from fizz-core/src/main/java/we/stats/TimeSlot.java rename to fizz-core/src/main/java/com/fizzgate/stats/TimeSlot.java index fc3c53f..4ec5a29 100644 --- a/fizz-core/src/main/java/we/stats/TimeSlot.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/TimeSlot.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.stats; - -import we.stats.circuitbreaker.CircuitBreaker; +package com.fizzgate.stats; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import com.fizzgate.stats.circuitbreaker.CircuitBreaker; + /** * * @author Francis Dong diff --git a/fizz-core/src/main/java/we/stats/TimeWindowStat.java b/fizz-core/src/main/java/com/fizzgate/stats/TimeWindowStat.java similarity index 99% rename from fizz-core/src/main/java/we/stats/TimeWindowStat.java rename to fizz-core/src/main/java/com/fizzgate/stats/TimeWindowStat.java index 11efe46..d71a0b6 100644 --- a/fizz-core/src/main/java/we/stats/TimeWindowStat.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/TimeWindowStat.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 we.stats; +package com.fizzgate.stats; import java.math.BigDecimal; diff --git a/fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreakManager.java b/fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManager.java similarity index 98% rename from fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreakManager.java rename to fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManager.java index 0ed2501..1cab5ad 100644 --- a/fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreakManager.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManager.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats.circuitbreaker; +package com.fizzgate.stats.circuitbreaker; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; @@ -23,11 +23,13 @@ import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.util.*; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.stats.FlowStat; -import we.util.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreaker.java b/fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreaker.java similarity index 98% rename from fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreaker.java rename to fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreaker.java index 7e6a637..839a8a2 100644 --- a/fizz-core/src/main/java/we/stats/circuitbreaker/CircuitBreaker.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/circuitbreaker/CircuitBreaker.java @@ -15,20 +15,21 @@ * along with this program. If not, see . */ -package we.stats.circuitbreaker; +package com.fizzgate.stats.circuitbreaker; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceStat; +import com.fizzgate.stats.TimeSlot; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ResourceIdUtils; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.server.ServerWebExchange; -import we.stats.FlowStat; -import we.stats.ResourceStat; -import we.stats.TimeSlot; -import we.stats.TimeWindowStat; -import we.util.JacksonUtils; -import we.util.ResourceIdUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/fizz-core/src/main/java/we/stats/degrade/DegradeRule.java b/fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRule.java similarity index 92% rename from fizz-core/src/main/java/we/stats/degrade/DegradeRule.java rename to fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRule.java index 97851ff..97781a5 100644 --- a/fizz-core/src/main/java/we/stats/degrade/DegradeRule.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRule.java @@ -14,14 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.stats.degrade; +package com.fizzgate.stats.degrade; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; -import org.apache.commons.lang3.StringUtils; -import we.util.JacksonUtils; +import com.fizzgate.util.JacksonUtils; -import static we.util.ResourceIdUtils.SERVICE_DEFAULT; +import lombok.Data; + +import static com.fizzgate.util.ResourceIdUtils.SERVICE_DEFAULT; + +import org.apache.commons.lang3.StringUtils; /** * Degrade rule entity diff --git a/fizz-core/src/main/java/we/stats/degrade/DegradeRuleService.java b/fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRuleService.java similarity index 97% rename from fizz-core/src/main/java/we/stats/degrade/DegradeRuleService.java rename to fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRuleService.java index e451193..ff0da8c 100644 --- a/fizz-core/src/main/java/we/stats/degrade/DegradeRuleService.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/degrade/DegradeRuleService.java @@ -14,19 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.stats.degrade; +package com.fizzgate.stats.degrade; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.Result; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.stats.circuitbreaker.CircuitBreakManager; -import we.util.JacksonUtils; -import we.util.Result; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java b/fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfig.java similarity index 92% rename from fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java rename to fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfig.java index 2634d0e..9eaf39b 100644 --- a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfig.java @@ -15,15 +15,16 @@ * along with this program. If not, see . */ -package we.stats.ratelimit; +package com.fizzgate.stats.ratelimit; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.commons.lang3.StringUtils; -import we.util.JacksonUtils; +import com.fizzgate.util.JacksonUtils; -import static we.util.ResourceIdUtils.APP_DEFAULT; -import static we.util.ResourceIdUtils.NODE; -import static we.util.ResourceIdUtils.SERVICE_DEFAULT; +import static com.fizzgate.util.ResourceIdUtils.APP_DEFAULT; +import static com.fizzgate.util.ResourceIdUtils.NODE; +import static com.fizzgate.util.ResourceIdUtils.SERVICE_DEFAULT; + +import org.apache.commons.lang3.StringUtils; /** * @author hongqiaowei diff --git a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java b/fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigService.java similarity index 98% rename from fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java rename to fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigService.java index 21b47ba..32a8a4e 100644 --- a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfigService.java +++ b/fizz-core/src/main/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigService.java @@ -15,19 +15,21 @@ * along with this program. If not, see . */ -package we.stats.ratelimit; +package com.fizzgate.stats.ratelimit; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.stereotype.Service; + +import com.fizzgate.config.AggregateRedisConfig; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactorUtils; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.config.AggregateRedisConfig; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ReactorUtils; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/fizz-core/src/main/java/we/util/ResourceIdUtils.java b/fizz-core/src/main/java/com/fizzgate/util/ResourceIdUtils.java similarity index 92% rename from fizz-core/src/main/java/we/util/ResourceIdUtils.java rename to fizz-core/src/main/java/com/fizzgate/util/ResourceIdUtils.java index d9f476c..5223971 100644 --- a/fizz-core/src/main/java/we/util/ResourceIdUtils.java +++ b/fizz-core/src/main/java/com/fizzgate/util/ResourceIdUtils.java @@ -14,11 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; + +import com.fizzgate.util.Consts; +import com.fizzgate.util.Utils; /** * Resource ID utility - * Extracted from {@link we.stats.ratelimit.ResourceRateLimitConfig} + * Extracted from {@link com.fizzgate.stats.ratelimit.ResourceRateLimitConfig} * * @author zhongjie */ diff --git a/fizz-core/src/main/java/we/util/WebUtils.java b/fizz-core/src/main/java/com/fizzgate/util/WebUtils.java similarity index 85% rename from fizz-core/src/main/java/we/util/WebUtils.java rename to fizz-core/src/main/java/com/fizzgate/util/WebUtils.java index 72a6631..852005d 100644 --- a/fizz-core/src/main/java/we/util/WebUtils.java +++ b/fizz-core/src/main/java/com/fizzgate/util/WebUtils.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -28,15 +28,24 @@ import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.lang.Nullable; +import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.filter.FilterResult; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.AuthPluginFilter; +import com.fizzgate.proxy.Route; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.Result; +import com.fizzgate.util.ThreadContext; +import com.fizzgate.util.Utils; + import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.filter.FilterResult; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.AuthPluginFilter; -import we.proxy.Route; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -59,7 +68,7 @@ public abstract class WebUtils { private static final String clientService = "cs@"; - private static final String xForwardedFor = "X-FORWARDED-FOR"; + private static final String xForwardedFor = "X-Forwarded-For"; private static final String unknown = "unknown"; @@ -216,15 +225,40 @@ public abstract class WebUtils { if (svc == null) { String p = exchange.getRequest().getPath().value(); int secFS = p.indexOf(Consts.S.FORWARD_SLASH, 1); - if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { - svc = p.substring(1, secFS); + if (secFS == -1) { + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + svc = p.substring(1); + } else { + String prefix = p.substring(1); + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + throw Utils.runtimeExceptionWithoutStack("no service in request path"); + } else { + throw Utils.runtimeExceptionWithoutStack("request prefix is wrong and no service in request path"); + } + } } else { String prefix = p.substring(0, secFS); - if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { - int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); - svc = p.substring(secFS + 1, trdFS); + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); + if (trdFS == -1) { + svc = p.substring(secFS + 1); + } else { + svc = p.substring(secFS + 1, trdFS); + } + } else { + svc = p.substring(1, secFS); + } } else { - throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); + if (trdFS == -1) { + trdFS = p.length(); + } + svc = p.substring(secFS + 1, trdFS); + } else { + throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + } } } exchange.getAttributes().put(clientService, svc); @@ -340,15 +374,41 @@ public abstract class WebUtils { // p = exchange.getRequest().getPath().value(); p = exchange.getRequest().getURI().getPath(); int secFS = p.indexOf(Consts.S.FORWARD_SLASH, 1); - if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { - p = p.substring(secFS); + if (secFS == -1) { + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + p = Consts.S.FORWARD_SLASH_STR; + } else { + String prefix = p.substring(1); + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + throw Utils.runtimeExceptionWithoutStack("no service and request path"); + } else { + throw Utils.runtimeExceptionWithoutStack("request prefix is wrong, no service and request path"); + } + } } else { String prefix = p.substring(0, secFS); - if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { - int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); - p = p.substring(trdFS); + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); + if (trdFS == -1) { + p = Consts.S.FORWARD_SLASH_STR; + } else { + p = p.substring(trdFS); + } + } else { + p = p.substring(secFS); + } } else { - throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + int trdFS = p.indexOf(Consts.S.FORWARD_SLASH, secFS + 1); + if (trdFS == -1) { + p = Consts.S.FORWARD_SLASH_STR; + } else { + p = p.substring(trdFS); + } + } else { + throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + } } } exchange.getAttributes().put(clientRequestPath, p); @@ -367,16 +427,33 @@ public abstract class WebUtils { public static String getClientReqPathPrefix(ServerWebExchange exchange) { String prefix = exchange.getAttribute(clientRequestPathPrefix); if (prefix == null) { - if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { - prefix = Consts.S.FORWARD_SLASH_STR; - } else { - String path = exchange.getRequest().getPath().value(); - int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); - prefix = path.substring(0, secFS); - if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { - prefix = prefix + Consts.S.FORWARD_SLASH; + String path = exchange.getRequest().getPath().value(); + int secFS = path.indexOf(Consts.S.FORWARD_SLASH, 1); + if (secFS == -1) { + prefix = path.substring(1); + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + prefix = Consts.S.FORWARD_SLASH_STR; } else { - throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + prefix = prefix + Consts.S.FORWARD_SLASH; + } else { + throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + } + } + } else { + prefix = path.substring(0, secFS); + if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { + if (SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + prefix = prefix + Consts.S.FORWARD_SLASH; + } else { + prefix = Consts.S.FORWARD_SLASH_STR; + } + } else { + if (gatewayPrefix.equals(prefix) || SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX.equals(prefix)) { + prefix = prefix + Consts.S.FORWARD_SLASH; + } else { + throw Utils.runtimeExceptionWithoutStack("wrong prefix " + prefix); + } } } exchange.getAttributes().put(clientRequestPathPrefix, prefix); @@ -459,9 +536,9 @@ public abstract class WebUtils { public static HttpHeaders mergeAppendHeaders(ServerWebExchange exchange) { ServerHttpRequest req = exchange.getRequest(); Map appendHeaders = getAppendHeaders(exchange); - if (appendHeaders.isEmpty()) { + /* if (appendHeaders.isEmpty()) { return req.getHeaders(); - } + } */ HttpHeaders hdrs = new HttpHeaders(); req.getHeaders().forEach( (h, vs) -> { @@ -895,4 +972,12 @@ public abstract class WebUtils { content = StringUtils.isBlank(content) ? Consts.S.EMPTY : content; return buildDirectResponseAndBindContext(exchange, httpStatus, headers, content); } + + public static void setXForwardedFor(ServerWebExchange exchange, HttpHeaders headers) { + List values = headers.get(xForwardedFor); + if (CollectionUtils.isEmpty(values)) { + String originIp = getOriginIp(exchange); + headers.add(xForwardedFor, originIp); + } + } } diff --git a/fizz-core/src/main/java/we/config/LogConfig.java b/fizz-core/src/main/java/we/config/LogConfig.java deleted file mode 100644 index ed11943..0000000 --- a/fizz-core/src/main/java/we/config/LogConfig.java +++ /dev/null @@ -1,104 +0,0 @@ -//package we.config; -// -//import ch.qos.logback.classic.LoggerContext; -//import ch.qos.logback.classic.PatternLayout; -//import ch.qos.logback.classic.spi.ILoggingEvent; -//import ch.qos.logback.core.Appender; -//import org.apache.commons.lang3.StringUtils; -//import org.apache.logging.log4j.core.appender.AbstractAppender; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.boot.autoconfigure.AutoConfigureAfter; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -//import org.springframework.boot.context.event.ApplicationReadyEvent; -//import org.springframework.boot.context.event.ApplicationStartingEvent; -//import org.springframework.boot.context.event.SpringApplicationEvent; -//import org.springframework.boot.context.properties.ConfigurationProperties; -//import org.springframework.context.ApplicationEvent; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.event.EventListener; -//import we.log.LogProperties; -//import we.log.LogSendAppenderWithLogback; -// -//@Configuration -//public class LogConfig { -// -// @Bean -// @ConfigurationProperties("fizz.logging") -// public LogProperties logProperties() { -// return new LogProperties(); -// } -// -// @Configuration -// @ConditionalOnClass(AbstractAppender.class) -// @AutoConfigureAfter(AggregateRedisConfig.class) -// public static class CustomLog4j2Config { -// } -// -// @Configuration -// @ConditionalOnClass(LoggerContext.class) -// @AutoConfigureAfter(AggregateRedisConfig.class) -// public static class CustomLogbackConfig { -// @Bean -// public Object initLogSendAppenderWithLogback(LogProperties logProperties) { -// return new LoggingConfigurationApplicationListener(logProperties); -// } -// } -// -// public static class LoggingConfigurationApplicationListener { -// private static final Logger logger = LoggerFactory.getLogger(LoggingConfigurationApplicationListener.class); -// private static final String APPENDER_NAME = "fizzLogSendAppender"; -// private static final String LAYOUT = "%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %level %logger{36} - %msg%n"; -// private LogProperties logProperties; -// -// public LoggingConfigurationApplicationListener() { -// } -// -// public LoggingConfigurationApplicationListener(LogProperties logProperties) { -// this.logProperties = logProperties; -// } -// -// @EventListener -// public void contextRefreshed(SpringApplicationEvent event) { -// onApplicationEvent(event); -// } -// -// @EventListener -// public void applicationStarting(ApplicationStartingEvent event) { -// onApplicationEvent(event); -// } -// -// @EventListener -// public void applicationReady(ApplicationReadyEvent event) { -// onApplicationEvent(event); -// } -// -// public void onApplicationEvent(ApplicationEvent event) { -// LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); -// final ch.qos.logback.classic.Logger root = context.getLogger(Logger.ROOT_LOGGER_NAME); -// String layoutConfig = StringUtils.isBlank(logProperties.getLayout()) ? LAYOUT : logProperties.getLayout(); -// -// final LogSendAppenderWithLogback newAppender = new LogSendAppenderWithLogback(); -// newAppender.setName(APPENDER_NAME); -// newAppender.setContext(context); -// PatternLayout layout = new PatternLayout(); -// layout.setPattern(layoutConfig); -// newAppender.setLayout(layout); -// -// Appender appender = root.getAppender(APPENDER_NAME); -// if (appender == null) { -// newAppender.start(); -// root.addAppender(newAppender); -// logger.info("Added fizz log send appender:{}", APPENDER_NAME); -// } else { -// newAppender.start(); -// root.detachAppender(APPENDER_NAME); -// root.addAppender(newAppender); -// logger.info("Refresh fizz log send appender:{}", APPENDER_NAME); -// } -// } -// } -// -// -//} diff --git a/fizz-core/src/main/java/we/log/LogSendAppenderWithLogback.java b/fizz-core/src/main/java/we/log/LogSendAppenderWithLogback.java deleted file mode 100644 index 9dde1b2..0000000 --- a/fizz-core/src/main/java/we/log/LogSendAppenderWithLogback.java +++ /dev/null @@ -1,94 +0,0 @@ -//package we.log; -// -//import ch.qos.logback.classic.spi.ILoggingEvent; -//import ch.qos.logback.core.AppenderBase; -//import ch.qos.logback.core.Layout; -//import ch.qos.logback.core.LogbackException; -//import lombok.Getter; -//import lombok.Setter; -//import we.FizzAppContext; -//import we.flume.clients.log4j2appender.LogService; -//import we.util.NetworkUtils; -// -//import static we.log.LogSendAppender.*; -// -///** -// * log send appender with logback -// * -// * @author huahuang -// */ -//public class LogSendAppenderWithLogback extends AppenderBase { -// -// //负责将日志事件转换为字符串，需Getter和Setter方法 -// @Getter -// @Setter -// private Layout layout; -// -// @Override -// protected void append(ILoggingEvent event) { -// try { -// if (logEnabled != null && !logEnabled) { -// return; -// } -// -// if (logEnabled == null && FizzAppContext.appContext == null && logSendService == null) { -// // local cache -// logSends[logSendIndex.getAndIncrement() % logSends.length] = new LogSend( -// this.getBizId(event.getArgumentArray()), NetworkUtils.getServerIp(), event.getLevel().levelInt, -// event.getTimeStamp(), this.getLayout().doLayout(event)); -// return; -// } -// -// if (logEnabled == null && logSendService == null) { -// // no legal logSendService, discard the local cache -// logEnabled = Boolean.FALSE; -// logSends = null; -// return; -// } -// -// if (logEnabled == null) { -// logEnabled = Boolean.TRUE; -// -// LogSend[] logSends; -// synchronized (LogSendAppender.class) { -// logSends = LogSendAppender.logSends; -// LogSendAppender.logSends = null; -// } -// -// // logSendService is ready, send the local cache -// if (logSends != null) { -// int size = Math.min(logSendIndex.get(), logSends.length); -// for (int i = 0; i < size; i++) { -// logSendService.send(logSends[i]); -// } -// } -// } -// -// LogSend logSend = new LogSend(this.getBizId(event.getArgumentArray()), NetworkUtils.getServerIp(), -// event.getLevel().levelInt, event.getTimeStamp(), this.getLayout().doLayout(event)); -// logSendService.send(logSend); -// } catch (Exception ex) { -// throw new LogbackException(event.getFormattedMessage(), ex); -// } -// } -// -// private String getBizId(Object[] parameters) { -// Object bizId = LogService.getBizId(); -// if (parameters != null) { -// for (int i = parameters.length - 1; i > -1; --i) { -// Object p = parameters[i]; -// if (p == LogService.BIZ_ID) { -// if (i != parameters.length - 1) { -// bizId = parameters[i + 1]; -// } -// break; -// } -// } -// } -// if (bizId == null) { -// return ""; -// } -// return bizId.toString(); -// } -// -//} diff --git a/fizz-core/src/test/java/we/LogKafkaTests.java b/fizz-core/src/test/java/com/fizzgate/LogKafkaTests.java similarity index 98% rename from fizz-core/src/test/java/we/LogKafkaTests.java rename to fizz-core/src/test/java/com/fizzgate/LogKafkaTests.java index 89b9f36..32a51e4 100644 --- a/fizz-core/src/test/java/we/LogKafkaTests.java +++ b/fizz-core/src/test/java/com/fizzgate/LogKafkaTests.java @@ -1,4 +1,4 @@ -package we; +package com.fizzgate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.ThreadContext; diff --git a/fizz-core/src/test/java/we/RedisClusterTests.java b/fizz-core/src/test/java/com/fizzgate/RedisClusterTests.java similarity index 95% rename from fizz-core/src/test/java/we/RedisClusterTests.java rename to fizz-core/src/test/java/com/fizzgate/RedisClusterTests.java index 6e73fec..cd7957d 100644 --- a/fizz-core/src/test/java/we/RedisClusterTests.java +++ b/fizz-core/src/test/java/com/fizzgate/RedisClusterTests.java @@ -1,12 +1,13 @@ -package we; +package com.fizzgate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.ReactiveStringRedisTemplate; -import we.config.RedisReactiveConfig; -import we.config.RedisReactiveProperties; + +import com.fizzgate.config.RedisReactiveConfig; +import com.fizzgate.config.RedisReactiveProperties; public class RedisClusterTests { diff --git a/fizz-core/src/test/java/we/dedicated_line/DedicatedLineServiceTests.java b/fizz-core/src/test/java/com/fizzgate/dedicated_line/DedicatedLineServiceTests.java similarity index 80% rename from fizz-core/src/test/java/we/dedicated_line/DedicatedLineServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/dedicated_line/DedicatedLineServiceTests.java index 5b6d95e..c2ab7c1 100644 --- a/fizz-core/src/test/java/we/dedicated_line/DedicatedLineServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/dedicated_line/DedicatedLineServiceTests.java @@ -1,4 +1,4 @@ -package we.dedicated_line; +package com.fizzgate.dedicated_line; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -7,11 +7,13 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.Fizz; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.util.ReflectionUtils; + +import com.fizzgate.Fizz; +import com.fizzgate.dedicated_line.DedicatedLineService; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.util.ReflectionUtils; import javax.annotation.Resource; diff --git a/fizz-core/src/test/java/we/filter/FlowControlFilterTests.java b/fizz-core/src/test/java/com/fizzgate/filter/FlowControlFilterTests.java similarity index 90% rename from fizz-core/src/test/java/we/filter/FlowControlFilterTests.java rename to fizz-core/src/test/java/com/fizzgate/filter/FlowControlFilterTests.java index cae1d66..098be23 100644 --- a/fizz-core/src/test/java/we/filter/FlowControlFilterTests.java +++ b/fizz-core/src/test/java/com/fizzgate/filter/FlowControlFilterTests.java @@ -1,4 +1,4 @@ -package we.filter; +package com.fizzgate.filter; import org.junit.jupiter.api.Test; import org.springframework.http.HttpHeaders; @@ -8,16 +8,20 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebHandler; + +import com.fizzgate.controller.FlowControlController; +import com.fizzgate.filter.FlowControlFilter; +import com.fizzgate.filter.FlowControlFilterProperties; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.ResourceIdUtils; + import reactor.core.publisher.Mono; -import we.controller.FlowControlController; -import we.stats.FlowStat; -import we.stats.ResourceTimeWindowStat; -import we.stats.TimeWindowStat; -import we.stats.ratelimit.ResourceRateLimitConfig; -import we.stats.ratelimit.ResourceRateLimitConfigService; -import we.util.JacksonUtils; -import we.util.ReflectionUtils; -import we.util.ResourceIdUtils; import java.util.HashMap; import java.util.List; diff --git a/fizz-core/src/test/java/we/fizz/InputValidateTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/InputValidateTests.java similarity index 93% rename from fizz-core/src/test/java/we/fizz/InputValidateTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/InputValidateTests.java index 283440f..40d923a 100644 --- a/fizz-core/src/test/java/we/fizz/InputValidateTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/InputValidateTests.java @@ -1,10 +1,13 @@ -package we.fizz; +package com.fizzgate.fizz; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; -import we.fizz.input.ClientInputConfig; -import we.fizz.input.Input; -import we.schema.util.I18nUtils; + +import com.fizzgate.fizz.Pipeline; +import com.fizzgate.fizz.input.ClientInputConfig; +import com.fizzgate.fizz.input.Input; + +import com.fizzgate.schema.util.I18nUtils; import java.util.HashMap; import java.util.Locale; diff --git a/fizz-core/src/test/java/we/fizz/component/CircleTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/component/CircleTests.java similarity index 88% rename from fizz-core/src/test/java/we/fizz/component/CircleTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/component/CircleTests.java index 59f9174..2e93bfd 100644 --- a/fizz-core/src/test/java/we/fizz/component/CircleTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/component/CircleTests.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 we.fizz.component; +package com.fizzgate.fizz.component; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,20 +25,17 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; -import we.fizz.StepContext; -import we.fizz.component.circle.Circle; -import we.fizz.component.circle.CircleItem; -import we.fizz.component.condition.Condition; -import we.fizz.component.condition.ConditionValue; -import we.fizz.field.FixedDataTypeEnum; -import we.fizz.field.RefDataTypeEnum; -import we.fizz.field.ValueTypeEnum; -/** - * - * @author Francis Dong - * - */ -import we.fizz.input.PathMapping; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.component.OperatorEnum; +import com.fizzgate.fizz.component.StepContextPosition; +import com.fizzgate.fizz.component.circle.Circle; +import com.fizzgate.fizz.component.circle.CircleItem; +import com.fizzgate.fizz.component.condition.Condition; +import com.fizzgate.fizz.component.condition.ConditionValue; +import com.fizzgate.fizz.field.FixedDataTypeEnum; +import com.fizzgate.fizz.field.RefDataTypeEnum; +import com.fizzgate.fizz.field.ValueTypeEnum; +import com.fizzgate.fizz.input.PathMapping; class CircleTests { @Test diff --git a/fizz-core/src/test/java/we/fizz/component/ConditionTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/component/ConditionTests.java similarity index 97% rename from fizz-core/src/test/java/we/fizz/component/ConditionTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/component/ConditionTests.java index 7216dcd..b28df21 100644 --- a/fizz-core/src/test/java/we/fizz/component/ConditionTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/component/ConditionTests.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 we.fizz.component; +package com.fizzgate.fizz.component; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -32,12 +32,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; -import we.fizz.component.condition.Condition; -import we.fizz.component.condition.ConditionValue; -import we.fizz.field.FixedDataTypeEnum; -import we.fizz.field.RefDataTypeEnum; -import we.fizz.field.ValueTypeEnum; -import we.fizz.input.PathMapping; +import com.fizzgate.fizz.component.OperatorEnum; +import com.fizzgate.fizz.component.condition.Condition; +import com.fizzgate.fizz.component.condition.ConditionValue; +import com.fizzgate.fizz.field.FixedDataTypeEnum; +import com.fizzgate.fizz.field.RefDataTypeEnum; +import com.fizzgate.fizz.field.ValueTypeEnum; +import com.fizzgate.fizz.input.PathMapping; /** * diff --git a/fizz-core/src/test/java/we/fizz/function/CodecFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java similarity index 96% rename from fizz-core/src/test/java/we/fizz/function/CodecFuncTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java index 8db0258..750abc9 100644 --- a/fizz-core/src/test/java/we/fizz/function/CodecFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.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 we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,8 +24,9 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; -import we.fizz.input.PathMapping; -import we.util.DigestUtils; +import com.fizzgate.fizz.function.FuncExecutor; +import com.fizzgate.fizz.input.PathMapping; +import com.fizzgate.util.DigestUtils; /** * diff --git a/fizz-core/src/test/java/com/fizzgate/fizz/function/CommonFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/CommonFuncTests.java new file mode 100644 index 0000000..a195e6a --- /dev/null +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/CommonFuncTests.java @@ -0,0 +1,521 @@ +/* + * Copyright (C) 2021 the original author or authors. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.fizzgate.fizz.function; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.noear.snack.ONode; + +import com.fizzgate.fizz.function.FuncExecutor; +import com.fizzgate.fizz.input.PathMapping; + +/** + * + * @author Francis Dong + * + */ +class CommonFuncTests { + + @Test + void contextLoads() { + } + + private Map createRecord(String key, Object value) { + Map m = new HashMap<>(); + m.put(key, value); + return m; + } + + private ONode getCtxNode() { + ONode ctxNode = ONode.load(new HashMap()); + + Map m = new HashMap<>(); + m.put("a", "1"); + m.put("b", "1"); + m.put("d", ""); + m.put("true", true); + m.put("false", false); + m.put("blank", ""); + m.put("null", null); + m.put("stringtrue", "true"); + m.put("stringfalse", "false"); + m.put("string1", "1"); + m.put("string0", "0"); + m.put("stringabc", "abc"); + m.put("int1", "1"); + m.put("int0", "0"); + m.put("int2", "2"); + + List list = new ArrayList<>(); + list.add(createRecord("a", "a1")); + list.add(createRecord("a", "a2")); + list.add(createRecord("a", "a3")); + + List list2 = new ArrayList<>(); + + PathMapping.setByPath(ctxNode, "data.m", m, true); + PathMapping.setByPath(ctxNode, "data.m2", new HashMap<>(), true); + PathMapping.setByPath(ctxNode, "data.list", list, true); + PathMapping.setByPath(ctxNode, "data.list2", list2, true); + return ctxNode; + } + + @Test + void testIif() { + String funcExpression = "fn.common.iif(true, \"abc\", \"xyz\")"; + Object result = FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals("abc", result.toString()); + } + + + @Test + void testIif2() { + String funcExpression = "fn.common.iif(false, \"abc\", \"xyz\")"; + Object result = FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals("xyz", result.toString()); + } + + @Test + void testIif3() { + String funcExpression = "fn.common.iif(false, \"abc\", 123)"; + Long result = (Long)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(123, result.intValue()); + } + + @Test + void testIif4() { + String funcExpression = "fn.common.iif(false, \"abc\", 123.4)"; + Double result = (Double)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(123.4, result); + } + + @Test + void testIif5() { + String funcExpression = "fn.common.iif(false, \"abc\", true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals() { + String funcExpression = "fn.common.equals(\"abc\", true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(false, result); + } + + @Test + void testEquals2() { + String funcExpression = "fn.common.equals(\"abc\", \"abc\")"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals3() { + String funcExpression = "fn.common.equals(123, 123)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals4() { + String funcExpression = "fn.common.equals(123, 123.0)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(false, result); + } + + @Test + void testEquals5() { + String funcExpression = "fn.common.equals(true, true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals6() { + String funcExpression = "fn.common.equals(123.2, 123.2)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals7() { + String funcExpression = "fn.common.equals(null, 123.2)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(false, result); + } + + @Test + void testEquals8() { + String funcExpression = "fn.common.equals(null, null)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(true, result); + } + + @Test + void testEquals9() { + String funcExpression = "fn.common.equals(123, null)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); + assertEquals(false, result); + } + + @Test + void testIsNull() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isNull({data.m.c})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } + + @Test + void testIsNotNull() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isNotNull({data.m.a})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } + + @Test + void testIsBlank() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isBlank({data.m.c})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } + + @Test + void testIsNotBlank() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isNotBlank({data.m.a})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } + + @Test + void testIsEmpty() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isEmpty({data.list2})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isEmpty({data.m2})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isEmpty({data.m.x})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isEmpty({data.m.d})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } + + @Test + void testIsNotEmpty() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.isNotEmpty({data.list})"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isNotEmpty({data.m})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isNotEmpty({data.m.a})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.isNotEmpty({data.m.y})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + } + + @Test + void testAnd() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.and(true, true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and(true, true, true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and(true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.true}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.true}, {data.m.true}, {data.m.notexist})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.true}, {data.m.true}, {data.m.null})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.true}, {data.m.true}, {data.m.blank})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.false}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.false}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.false})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.true}, {data.m.notexist})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.notexist})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and()"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.blank})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.null})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.int1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and({data.m.int0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.string1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and({data.m.string0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.stringabc})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.stringtrue})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.and({data.m.stringfalse})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.and({data.m.int2})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + } + + @Test + void testOr() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.or(true, true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or(true, true, true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or(false, true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or(true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or(false)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or(true, false, true)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.true}, {data.m.true}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.true}, {data.m.true}, {data.m.false})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.true}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.notexist}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.null}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.blank}, {data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.false}, {data.m.false})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.false}, {data.m.false})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.false})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.null})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.blank})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.notexist})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or()"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.true})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.int1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.int0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.string1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.string0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.stringabc})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.stringtrue})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.or({data.m.stringfalse})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.or({data.m.int2})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + } + + @Test + void testNot() { + ONode ctx = getCtxNode(); + String funcExpression = "fn.common.not(true)"; + Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.not(false)"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.blank})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.null})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.notexist})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.string1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.not({data.m.string0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.stringabc})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.stringtrue})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.not({data.m.stringfalse})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.int1})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(false, result); + + funcExpression = "fn.common.not({data.m.int0})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + + funcExpression = "fn.common.not({data.m.int2})"; + result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); + assertEquals(true, result); + } +} \ No newline at end of file diff --git a/fizz-core/src/test/java/we/fizz/function/DateFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/DateFuncTests.java similarity index 97% rename from fizz-core/src/test/java/we/fizz/function/DateFuncTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/DateFuncTests.java index e552e7a..075b75b 100644 --- a/fizz-core/src/test/java/we/fizz/function/DateFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/DateFuncTests.java @@ -14,12 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import com.fizzgate.fizz.function.FuncExecutor; + /** * * @author Francis Dong diff --git a/fizz-core/src/test/java/we/fizz/function/FuncExecutorTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/FuncExecutorTests.java similarity index 94% rename from fizz-core/src/test/java/we/fizz/function/FuncExecutorTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/FuncExecutorTests.java index d9ab62b..2972aed 100644 --- a/fizz-core/src/test/java/we/fizz/function/FuncExecutorTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/FuncExecutorTests.java @@ -14,12 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import com.fizzgate.fizz.function.CodecFunc; +import com.fizzgate.fizz.function.FuncExecutor; + /** * * @author Francis Dong diff --git a/fizz-core/src/test/java/we/fizz/function/ListFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/ListFuncTests.java similarity index 98% rename from fizz-core/src/test/java/we/fizz/function/ListFuncTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/ListFuncTests.java index f816e4e..81957fa 100644 --- a/fizz-core/src/test/java/we/fizz/function/ListFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/ListFuncTests.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 we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test; import org.noear.snack.ONode; import com.alibaba.fastjson.JSON; - -import we.fizz.input.PathMapping; +import com.fizzgate.fizz.function.FuncExecutor; +import com.fizzgate.fizz.input.PathMapping; /** * diff --git a/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/MathFuncTests.java similarity index 98% rename from fizz-core/src/test/java/we/fizz/function/MathFuncTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/MathFuncTests.java index c34f80f..8f2f07d 100644 --- a/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/MathFuncTests.java @@ -14,12 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import com.fizzgate.fizz.function.FuncExecutor; + /** * * @author Francis Dong diff --git a/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/StringFuncTests.java similarity index 98% rename from fizz-core/src/test/java/we/fizz/function/StringFuncTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/function/StringFuncTests.java index 83a97bc..bf03b75 100644 --- a/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/StringFuncTests.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 we.fizz.function; +package com.fizzgate.fizz.function; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,7 +24,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; -import we.fizz.input.PathMapping; +import com.fizzgate.fizz.function.FuncExecutor; +import com.fizzgate.fizz.input.PathMapping; /** * diff --git a/fizz-core/src/test/java/com/fizzgate/fizz/group/DevTestGroup.java b/fizz-core/src/test/java/com/fizzgate/fizz/group/DevTestGroup.java new file mode 100644 index 0000000..ed1136a --- /dev/null +++ b/fizz-core/src/test/java/com/fizzgate/fizz/group/DevTestGroup.java @@ -0,0 +1,4 @@ +package com.fizzgate.fizz.group; + +public class DevTestGroup { +} diff --git a/fizz-core/src/test/java/com/fizzgate/fizz/group/FastTestGroup.java b/fizz-core/src/test/java/com/fizzgate/fizz/group/FastTestGroup.java new file mode 100644 index 0000000..3ce12ef --- /dev/null +++ b/fizz-core/src/test/java/com/fizzgate/fizz/group/FastTestGroup.java @@ -0,0 +1,4 @@ +package com.fizzgate.fizz.group; + +public class FastTestGroup { +} diff --git a/fizz-core/src/test/java/com/fizzgate/fizz/group/SlowTestGroup.java b/fizz-core/src/test/java/com/fizzgate/fizz/group/SlowTestGroup.java new file mode 100644 index 0000000..06d07d8 --- /dev/null +++ b/fizz-core/src/test/java/com/fizzgate/fizz/group/SlowTestGroup.java @@ -0,0 +1,4 @@ +package com.fizzgate.fizz.group; + +public class SlowTestGroup { +} diff --git a/fizz-core/src/test/java/we/fizz/input/DubboInputMockTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputMockTests.java similarity index 86% rename from fizz-core/src/test/java/we/fizz/input/DubboInputMockTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputMockTests.java index e050fda..8d01626 100644 --- a/fizz-core/src/test/java/we/fizz/input/DubboInputMockTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputMockTests.java @@ -1,4 +1,4 @@ -package we.fizz.input; +package com.fizzgate.fizz.input; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.rpc.service.GenericService; @@ -7,15 +7,17 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.context.ConfigurableApplicationContext; -import we.fizz.group.FastTestGroup; -import we.fizz.Step; -import we.fizz.StepContext; -import we.fizz.StepResponse; -import we.fizz.input.extension.dubbo.DubboInput; -import we.fizz.input.extension.dubbo.DubboInputConfig; -import we.proxy.dubbo.ApacheDubboGenericService; -import we.proxy.dubbo.DubboInterfaceDeclaration; +import com.fizzgate.fizz.Step; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; +import com.fizzgate.fizz.group.FastTestGroup; +import com.fizzgate.fizz.input.InputContext; +import com.fizzgate.fizz.input.InputFactory; +import com.fizzgate.fizz.input.extension.dubbo.DubboInput; +import com.fizzgate.fizz.input.extension.dubbo.DubboInputConfig; +import com.fizzgate.proxy.dubbo.ApacheDubboGenericService; +import com.fizzgate.proxy.dubbo.DubboInterfaceDeclaration; import java.lang.ref.SoftReference; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/fizz/input/DubboInputTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputTests.java similarity index 86% rename from fizz-core/src/test/java/we/fizz/input/DubboInputTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputTests.java index 251d62b..740c6bf 100644 --- a/fizz-core/src/test/java/we/fizz/input/DubboInputTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/DubboInputTests.java @@ -1,15 +1,16 @@ -package we.fizz.input; +package com.fizzgate.fizz.input; import org.junit.experimental.categories.Category; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import reactor.core.publisher.Mono; -import we.fizz.group.DevTestGroup; -import we.fizz.input.extension.dubbo.DubboInput; -import we.fizz.input.extension.dubbo.DubboInputConfig; +import com.fizzgate.fizz.group.DevTestGroup; +import com.fizzgate.fizz.input.extension.dubbo.DubboInput; +import com.fizzgate.fizz.input.extension.dubbo.DubboInputConfig; + +import reactor.core.publisher.Mono; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/test/java/we/fizz/input/GrpcInputMockTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/GrpcInputMockTests.java similarity index 86% rename from fizz-core/src/test/java/we/fizz/input/GrpcInputMockTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/GrpcInputMockTests.java index 2a20480..30f89a9 100644 --- a/fizz-core/src/test/java/we/fizz/input/GrpcInputMockTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/GrpcInputMockTests.java @@ -1,5 +1,17 @@ -package we.fizz.input; +package com.fizzgate.fizz.input; +import com.fizzgate.fizz.Step; +import com.fizzgate.fizz.StepContext; +import com.fizzgate.fizz.StepResponse; +import com.fizzgate.fizz.group.FastTestGroup; +import com.fizzgate.fizz.input.InputContext; +import com.fizzgate.fizz.input.InputFactory; +import com.fizzgate.fizz.input.extension.grpc.GrpcInput; +import com.fizzgate.fizz.input.extension.grpc.GrpcInputConfig; +import com.fizzgate.proxy.grpc.GrpcGenericService; +import com.fizzgate.proxy.grpc.GrpcInterfaceDeclaration; +import com.fizzgate.proxy.grpc.client.GrpcProxyClient; +import com.fizzgate.proxy.grpc.client.utils.ChannelFactory; import com.google.common.util.concurrent.ListenableFuture; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -7,16 +19,6 @@ import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.util.ReflectionTestUtils; -import we.fizz.group.FastTestGroup; -import we.fizz.Step; -import we.fizz.StepContext; -import we.fizz.StepResponse; -import we.fizz.input.extension.grpc.GrpcInput; -import we.fizz.input.extension.grpc.GrpcInputConfig; -import we.proxy.grpc.GrpcGenericService; -import we.proxy.grpc.GrpcInterfaceDeclaration; -import we.proxy.grpc.client.GrpcProxyClient; -import we.proxy.grpc.client.utils.ChannelFactory; import java.lang.ref.SoftReference; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/fizz/input/PathMappingTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/PathMappingTests.java similarity index 98% rename from fizz-core/src/test/java/we/fizz/input/PathMappingTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/PathMappingTests.java index 1ca3303..0c96983 100644 --- a/fizz-core/src/test/java/we/fizz/input/PathMappingTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/PathMappingTests.java @@ -1,4 +1,4 @@ -package we.fizz.input; +package com.fizzgate.fizz.input; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -14,9 +14,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.noear.snack.ONode; +import com.fizzgate.fizz.input.PathMapping; +import com.fizzgate.global_resource.GlobalResourceService; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import we.global_resource.GlobalResourceService; class PathMappingTests { diff --git a/fizz-core/src/test/java/we/fizz/input/RequestInputTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/RequestInputTests.java similarity index 96% rename from fizz-core/src/test/java/we/fizz/input/RequestInputTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/RequestInputTests.java index 76fbbcc..d60aaa4 100644 --- a/fizz-core/src/test/java/we/fizz/input/RequestInputTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/RequestInputTests.java @@ -15,14 +15,15 @@ * along with this program. If not, see . */ -package we.fizz.input; +package com.fizzgate.fizz.input; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; import org.junit.jupiter.api.Test; -import we.fizz.input.extension.request.RequestInput; + +import com.fizzgate.fizz.input.extension.request.RequestInput; /** * diff --git a/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java similarity index 91% rename from fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java index bfafaa5..37548f6 100644 --- a/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceMockTests.java @@ -1,4 +1,4 @@ -package we.fizz.input.proxy.dubbo; +package com.fizzgate.fizz.input.proxy.dubbo; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.rpc.service.GenericService; @@ -8,9 +8,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import we.fizz.group.FastTestGroup; -import we.proxy.dubbo.ApacheDubboGenericService; -import we.proxy.dubbo.DubboInterfaceDeclaration; + +import com.fizzgate.fizz.group.FastTestGroup; +import com.fizzgate.proxy.dubbo.ApacheDubboGenericService; +import com.fizzgate.proxy.dubbo.DubboInterfaceDeclaration; import java.util.HashMap; import java.util.concurrent.CompletableFuture; diff --git a/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java similarity index 93% rename from fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java index 76ca08f..3de5d90 100644 --- a/fizz-core/src/test/java/we/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/input/proxy/dubbo/ApacheDubboGenericServiceTests.java @@ -1,4 +1,4 @@ -package we.fizz.input.proxy.dubbo; +package com.fizzgate.fizz.input.proxy.dubbo; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.rpc.service.GenericService; @@ -7,8 +7,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import we.proxy.dubbo.ApacheDubboGenericService; -import we.proxy.dubbo.DubboInterfaceDeclaration; + +import com.fizzgate.proxy.dubbo.ApacheDubboGenericService; +import com.fizzgate.proxy.dubbo.DubboInterfaceDeclaration; import java.util.HashMap; import java.util.concurrent.CompletableFuture; diff --git a/fizz-core/src/test/java/we/global_resource/GlobalResourceTests.java b/fizz-core/src/test/java/com/fizzgate/global_resource/GlobalResourceTests.java similarity index 84% rename from fizz-core/src/test/java/we/global_resource/GlobalResourceTests.java rename to fizz-core/src/test/java/com/fizzgate/global_resource/GlobalResourceTests.java index ae3b207..0e98ed1 100644 --- a/fizz-core/src/test/java/we/global_resource/GlobalResourceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/global_resource/GlobalResourceTests.java @@ -1,6 +1,16 @@ -package we.global_resource; +package com.fizzgate.global_resource; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fizzgate.Fizz; +import com.fizzgate.FizzAppContext; +import com.fizzgate.global_resource.GlobalResource; +import com.fizzgate.global_resource.GlobalResourceService; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReflectionUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.GenericApplicationContext; @@ -8,13 +18,6 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.Fizz; -import we.FizzAppContext; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.util.JacksonUtils; -import we.util.ReflectionUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/plugin/PluginTests.java b/fizz-core/src/test/java/com/fizzgate/plugin/PluginTests.java similarity index 93% rename from fizz-core/src/test/java/we/plugin/PluginTests.java rename to fizz-core/src/test/java/com/fizzgate/plugin/PluginTests.java index 3cd58a6..379ff11 100644 --- a/fizz-core/src/test/java/we/plugin/PluginTests.java +++ b/fizz-core/src/test/java/com/fizzgate/plugin/PluginTests.java @@ -1,4 +1,4 @@ -package we.plugin; +package com.fizzgate.plugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,17 +13,24 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; import org.springframework.web.server.WebHandler; + +import com.fizzgate.Fizz; +import com.fizzgate.FizzAppContext; +import com.fizzgate.config.SystemConfig; +import com.fizzgate.filter.PreprocessFilter; +import com.fizzgate.plugin.FixedPluginFilter; +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.plugin.PluginFilter; +import com.fizzgate.plugin.auth.*; +import com.fizzgate.plugin.stat.StatPluginFilter; +import com.fizzgate.plugin.stat.StatPluginFilterProperties; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.Fizz; -import we.FizzAppContext; -import we.config.SystemConfig; -import we.filter.PreprocessFilter; -import we.plugin.auth.*; -import we.plugin.stat.StatPluginFilter; -import we.plugin.stat.StatPluginFilterProperties; -import we.util.ReactorUtils; -import we.util.ReflectionUtils; -import we.util.WebUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/fizz-core/src/test/java/we/plugin/auth/ApiConfig2appsServiceTests.java b/fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfig2appsServiceTests.java similarity index 88% rename from fizz-core/src/test/java/we/plugin/auth/ApiConfig2appsServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfig2appsServiceTests.java index b20d25c..95dd1ab 100644 --- a/fizz-core/src/test/java/we/plugin/auth/ApiConfig2appsServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfig2appsServiceTests.java @@ -1,4 +1,4 @@ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -6,10 +6,12 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.util.ReflectionUtils; + +import com.fizzgate.plugin.auth.ApiConfig2appsService; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.util.ReflectionUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/plugin/auth/ApiConfigServiceTests.java b/fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfigServiceTests.java similarity index 86% rename from fizz-core/src/test/java/we/plugin/auth/ApiConfigServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfigServiceTests.java index 3fc3c09..0c0a01a 100644 --- a/fizz-core/src/test/java/we/plugin/auth/ApiConfigServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/plugin/auth/ApiConfigServiceTests.java @@ -1,4 +1,4 @@ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -7,11 +7,14 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.FizzAppContext; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.util.ReflectionUtils; + +import com.fizzgate.FizzAppContext; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.ApiConfigServiceProperties; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.util.ReflectionUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/plugin/auth/AppTests.java b/fizz-core/src/test/java/com/fizzgate/plugin/auth/AppTests.java similarity index 96% rename from fizz-core/src/test/java/we/plugin/auth/AppTests.java rename to fizz-core/src/test/java/com/fizzgate/plugin/auth/AppTests.java index 6f07a41..89c7788 100644 --- a/fizz-core/src/test/java/we/plugin/auth/AppTests.java +++ b/fizz-core/src/test/java/com/fizzgate/plugin/auth/AppTests.java @@ -1,7 +1,9 @@ -package we.plugin.auth; +package com.fizzgate.plugin.auth; import org.junit.jupiter.api.Test; +import com.fizzgate.plugin.auth.App; + import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/fizz-core/src/test/java/we/proxy/CallbackServiceTests.java b/fizz-core/src/test/java/com/fizzgate/proxy/CallbackServiceTests.java similarity index 90% rename from fizz-core/src/test/java/we/proxy/CallbackServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/proxy/CallbackServiceTests.java index 0246408..b0e16e4 100644 --- a/fizz-core/src/test/java/we/proxy/CallbackServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/proxy/CallbackServiceTests.java @@ -1,4 +1,4 @@ -package we.proxy; +package com.fizzgate.proxy; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,13 +11,17 @@ import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.web.server.MockServerWebExchange; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ExchangeStrategies; + +import com.fizzgate.fizz.AggregateService; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.auth.CallbackConfig; +import com.fizzgate.plugin.auth.Receiver; +import com.fizzgate.proxy.CallbackService; +import com.fizzgate.proxy.FizzWebClient; +import com.fizzgate.util.ReflectionUtils; + import reactor.core.publisher.Mono; -import we.fizz.AggregateService; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.ApiConfigService; -import we.plugin.auth.CallbackConfig; -import we.plugin.auth.Receiver; -import we.util.ReflectionUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/fizz-core/src/test/java/we/proxy/FizzWebClientTests.java b/fizz-core/src/test/java/com/fizzgate/proxy/FizzWebClientTests.java similarity index 94% rename from fizz-core/src/test/java/we/proxy/FizzWebClientTests.java rename to fizz-core/src/test/java/com/fizzgate/proxy/FizzWebClientTests.java index baf80cb..873bcd5 100644 --- a/fizz-core/src/test/java/we/proxy/FizzWebClientTests.java +++ b/fizz-core/src/test/java/com/fizzgate/proxy/FizzWebClientTests.java @@ -1,7 +1,9 @@ -package we.proxy; +package com.fizzgate.proxy; import org.junit.jupiter.api.Test; +import com.fizzgate.proxy.FizzWebClient; + import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/fizz-core/src/test/java/we/redis/RedisProperties.java b/fizz-core/src/test/java/com/fizzgate/redis/RedisProperties.java similarity index 97% rename from fizz-core/src/test/java/we/redis/RedisProperties.java rename to fizz-core/src/test/java/com/fizzgate/redis/RedisProperties.java index a6b449f..3bb6875 100644 --- a/fizz-core/src/test/java/we/redis/RedisProperties.java +++ b/fizz-core/src/test/java/com/fizzgate/redis/RedisProperties.java @@ -1,4 +1,4 @@ -package we.redis; +package com.fizzgate.redis; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.TestConfiguration; diff --git a/fizz-core/src/test/java/we/redis/RedisServerConfiguration.java b/fizz-core/src/test/java/com/fizzgate/redis/RedisServerConfiguration.java similarity index 96% rename from fizz-core/src/test/java/we/redis/RedisServerConfiguration.java rename to fizz-core/src/test/java/com/fizzgate/redis/RedisServerConfiguration.java index 7736ed6..3c6f871 100644 --- a/fizz-core/src/test/java/we/redis/RedisServerConfiguration.java +++ b/fizz-core/src/test/java/com/fizzgate/redis/RedisServerConfiguration.java @@ -1,4 +1,4 @@ -package we.redis; +package com.fizzgate.redis; import org.springframework.boot.test.context.TestConfiguration; import redis.embedded.RedisServer; diff --git a/fizz-core/src/test/java/we/redis/RedisTemplateConfiguration.java b/fizz-core/src/test/java/com/fizzgate/redis/RedisTemplateConfiguration.java similarity index 98% rename from fizz-core/src/test/java/we/redis/RedisTemplateConfiguration.java rename to fizz-core/src/test/java/com/fizzgate/redis/RedisTemplateConfiguration.java index 997f0e1..e3ff8b7 100644 --- a/fizz-core/src/test/java/we/redis/RedisTemplateConfiguration.java +++ b/fizz-core/src/test/java/com/fizzgate/redis/RedisTemplateConfiguration.java @@ -1,4 +1,4 @@ -package we.redis; +package com.fizzgate.redis; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/fizz-core/src/test/java/we/service_registry/RegistryCenterServiceTests.java b/fizz-core/src/test/java/com/fizzgate/service_registry/RegistryCenterServiceTests.java similarity index 87% rename from fizz-core/src/test/java/we/service_registry/RegistryCenterServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/service_registry/RegistryCenterServiceTests.java index 6d21dd1..2c1996d 100644 --- a/fizz-core/src/test/java/we/service_registry/RegistryCenterServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/service_registry/RegistryCenterServiceTests.java @@ -1,7 +1,19 @@ -package we.service_registry; +package com.fizzgate.service_registry; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; + +import com.fizzgate.Fizz; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.service_registry.FizzServiceRegistration; +import com.fizzgate.service_registry.RegistryCenter; +import com.fizzgate.service_registry.RegistryCenterService; +import com.fizzgate.service_registry.eureka.FizzEurekaServiceRegistration; +import com.fizzgate.util.PropertiesUtils; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.YmlUtils; import com.netflix.appinfo.InstanceInfo; import com.netflix.discovery.DiscoveryClient; import org.junit.jupiter.api.BeforeEach; @@ -11,14 +23,6 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.Fizz; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.service_registry.eureka.FizzEurekaServiceRegistration; -import we.util.PropertiesUtils; -import we.util.ReflectionUtils; -import we.util.YmlUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/stats/FlowStatTests.java b/fizz-core/src/test/java/com/fizzgate/stats/FlowStatTests.java similarity index 98% rename from fizz-core/src/test/java/we/stats/FlowStatTests.java rename to fizz-core/src/test/java/com/fizzgate/stats/FlowStatTests.java index 238541b..0b797cc 100644 --- a/fizz-core/src/test/java/we/stats/FlowStatTests.java +++ b/fizz-core/src/test/java/com/fizzgate/stats/FlowStatTests.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats; +package com.fizzgate.stats; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,7 +30,15 @@ import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; -import we.util.JacksonUtils; + +import com.fizzgate.stats.BlockType; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.IncrRequestResult; +import com.fizzgate.stats.ResourceConfig; +import com.fizzgate.stats.ResourceStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.stats.TimeWindowStat; +import com.fizzgate.util.JacksonUtils; /** * diff --git a/fizz-core/src/test/java/we/stats/circuitbreaker/CircuitBreakManagerTests.java b/fizz-core/src/test/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManagerTests.java similarity index 89% rename from fizz-core/src/test/java/we/stats/circuitbreaker/CircuitBreakManagerTests.java rename to fizz-core/src/test/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManagerTests.java index 4758b66..812a562 100644 --- a/fizz-core/src/test/java/we/stats/circuitbreaker/CircuitBreakManagerTests.java +++ b/fizz-core/src/test/java/com/fizzgate/stats/circuitbreaker/CircuitBreakManagerTests.java @@ -1,6 +1,19 @@ -package we.stats.circuitbreaker; +package com.fizzgate.stats.circuitbreaker; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fizzgate.Fizz; +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceStat; +import com.fizzgate.stats.TimeSlot; +import com.fizzgate.stats.circuitbreaker.CircuitBreakManager; +import com.fizzgate.stats.circuitbreaker.CircuitBreaker; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.ResourceIdUtils; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,16 +24,6 @@ import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.web.server.MockServerWebExchange; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.Fizz; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.stats.FlowStat; -import we.stats.ResourceStat; -import we.stats.TimeSlot; -import we.util.JacksonUtils; -import we.util.ReflectionUtils; -import we.util.ResourceIdUtils; import javax.annotation.Resource; import java.util.HashMap; diff --git a/fizz-core/src/test/java/we/stats/ratelimit/RateLimitTests.java b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/RateLimitTests.java similarity index 96% rename from fizz-core/src/test/java/we/stats/ratelimit/RateLimitTests.java rename to fizz-core/src/test/java/com/fizzgate/stats/ratelimit/RateLimitTests.java index e6b01d8..ef40d03 100644 --- a/fizz-core/src/test/java/we/stats/ratelimit/RateLimitTests.java +++ b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/RateLimitTests.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.stats.ratelimit; +package com.fizzgate.stats.ratelimit; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.channel.ChannelOption; @@ -27,14 +27,16 @@ import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.http.client.reactive.ReactorResourceFactory; import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.reactive.function.client.WebClient; + +import com.fizzgate.stats.FlowStat; +import com.fizzgate.stats.ResourceTimeWindowStat; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DateTimeUtils; + import reactor.core.publisher.Mono; import reactor.netty.http.client.HttpClient; import reactor.netty.resources.ConnectionProvider; import reactor.netty.resources.LoopResources; -import we.stats.FlowStat; -import we.stats.ResourceTimeWindowStat; -import we.util.Consts; -import we.util.DateTimeUtils; import java.time.Duration; import java.util.List; diff --git a/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigServiceTests.java similarity index 88% rename from fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java rename to fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigServiceTests.java index 099b095..a04cd56 100644 --- a/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java +++ b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigServiceTests.java @@ -1,4 +1,4 @@ -package we.stats.ratelimit; +package com.fizzgate.stats.ratelimit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -6,10 +6,13 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import we.redis.RedisProperties; -import we.redis.RedisServerConfiguration; -import we.redis.RedisTemplateConfiguration; -import we.util.ResourceIdUtils; + +import com.fizzgate.redis.RedisProperties; +import com.fizzgate.redis.RedisServerConfiguration; +import com.fizzgate.redis.RedisTemplateConfiguration; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService; +import com.fizzgate.util.ResourceIdUtils; import javax.annotation.Resource; diff --git a/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigTests.java similarity index 92% rename from fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java rename to fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigTests.java index e8c0e1e..99b2931 100644 --- a/fizz-core/src/test/java/we/stats/ratelimit/ResourceRateLimitConfigTests.java +++ b/fizz-core/src/test/java/com/fizzgate/stats/ratelimit/ResourceRateLimitConfigTests.java @@ -1,8 +1,10 @@ -package we.stats.ratelimit; +package com.fizzgate.stats.ratelimit; import org.junit.jupiter.api.Test; -import we.util.JacksonUtils; -import we.util.ResourceIdUtils; + +import com.fizzgate.stats.ratelimit.ResourceRateLimitConfig; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ResourceIdUtils; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/fizz-core/src/test/java/we/util/MapUtilTests.java b/fizz-core/src/test/java/com/fizzgate/util/MapUtilTests.java similarity index 98% rename from fizz-core/src/test/java/we/util/MapUtilTests.java rename to fizz-core/src/test/java/com/fizzgate/util/MapUtilTests.java index a03ca50..aae9c04 100644 --- a/fizz-core/src/test/java/we/util/MapUtilTests.java +++ b/fizz-core/src/test/java/com/fizzgate/util/MapUtilTests.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.util; +package com.fizzgate.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,6 +26,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import com.fizzgate.util.MapUtil; + /** * * @author Francis Dong diff --git a/fizz-core/src/test/java/com/fizzgate/util/WebUtilsTests.java b/fizz-core/src/test/java/com/fizzgate/util/WebUtilsTests.java new file mode 100644 index 0000000..438ce0f --- /dev/null +++ b/fizz-core/src/test/java/com/fizzgate/util/WebUtilsTests.java @@ -0,0 +1,151 @@ +package com.fizzgate.util; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fizzgate.util.WebUtils; + +import org.junit.jupiter.api.Test; +import org.springframework.mock.http.server.reactive.MockServerHttpRequest; +import org.springframework.mock.web.server.MockServerWebExchange; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author hongqiaowei + */ + +public class WebUtilsTests { + + @Test + void getClientReqPathPrefixTest() throws JsonProcessingException { + WebUtils.setGatewayPrefix("/_proxytestx"); + MockServerHttpRequest mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytest/xservice/ybiz?a=b").build(); + MockServerWebExchange mockExchange = MockServerWebExchange.from(mockRequest); + String clientService = WebUtils.getClientService(mockExchange); + assertEquals("xservice", clientService); + String clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + String clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/_proxytest/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytestx/test/ybiz").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("test", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/_proxytestx/", clientReqPathPrefix); + + WebUtils.setGatewayPrefix("/prox"); + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/prox/test/ybiz").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("test", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/prox/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytest/xservice/ybiz?a=b").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("xservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/_proxytest/", clientReqPathPrefix); + + WebUtils.setGatewayPrefix(""); + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice/ybiz1").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz1", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice/").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytest/xservice/ybiz?a=b").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("xservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/_proxytest/", clientReqPathPrefix); + + WebUtils.setGatewayPrefix("/"); + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice/ybiz1").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz1", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice/").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("aservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/", clientReqPathPrefix); + + mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytest/xservice/ybiz?a=b").build(); + mockExchange = MockServerWebExchange.from(mockRequest); + clientService = WebUtils.getClientService(mockExchange); + assertEquals("xservice", clientService); + clientReqPath = WebUtils.getClientReqPath(mockExchange); + assertEquals("/ybiz", clientReqPath); + clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); + assertEquals("/_proxytest/", clientReqPathPrefix); + } + + @Test + void toQueryStringTest() { + MultiValueMap mvm = new LinkedMultiValueMap<>(); + List v0 = Stream.of("", "v0").collect(Collectors.toList()); + v0.add(null); + mvm.put("k0", v0); + List v1 = Stream.of("v1").collect(Collectors.toList()); + mvm.put("k1", v1); + String s = WebUtils.toQueryString(mvm); + assertEquals("k0=&k0=v0&k0&k1=v1", s); + } +} diff --git a/fizz-core/src/test/java/we/util/YmlUtilsTest.java b/fizz-core/src/test/java/com/fizzgate/util/YmlUtilsTest.java similarity index 91% rename from fizz-core/src/test/java/we/util/YmlUtilsTest.java rename to fizz-core/src/test/java/com/fizzgate/util/YmlUtilsTest.java index ecb6b9a..8deb04b 100644 --- a/fizz-core/src/test/java/we/util/YmlUtilsTest.java +++ b/fizz-core/src/test/java/com/fizzgate/util/YmlUtilsTest.java @@ -1,10 +1,13 @@ -package we.util; +package com.fizzgate.util; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Test; import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; +import com.fizzgate.util.PropertiesUtils; +import com.fizzgate.util.YmlUtils; + import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java b/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java deleted file mode 100644 index 0c1a423..0000000 --- a/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright (C) 2021 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package we.fizz.function; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.Test; -import org.noear.snack.ONode; - -import we.fizz.input.PathMapping; - -/** - * - * @author Francis Dong - * - */ -class CommonFuncTests { - - @Test - void contextLoads() { - } - - private Map createRecord(String key, Object value) { - Map m = new HashMap<>(); - m.put(key, value); - return m; - } - - private ONode getCtxNode() { - ONode ctxNode = ONode.load(new HashMap()); - - Map m = new HashMap<>(); - m.put("a", "1"); - m.put("b", "1"); - m.put("d", ""); - - List list = new ArrayList<>(); - list.add(createRecord("a", "a1")); - list.add(createRecord("a", "a2")); - list.add(createRecord("a", "a3")); - - List list2 = new ArrayList<>(); - - PathMapping.setByPath(ctxNode, "data.m", m, true); - PathMapping.setByPath(ctxNode, "data.m2", new HashMap<>(), true); - PathMapping.setByPath(ctxNode, "data.list", list, true); - PathMapping.setByPath(ctxNode, "data.list2", list2, true); - return ctxNode; - } - - @Test - void testIif() { - String funcExpression = "fn.common.iif(true, \"abc\", \"xyz\")"; - Object result = FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals("abc", result.toString()); - } - - - @Test - void testIif2() { - String funcExpression = "fn.common.iif(false, \"abc\", \"xyz\")"; - Object result = FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals("xyz", result.toString()); - } - - @Test - void testIif3() { - String funcExpression = "fn.common.iif(false, \"abc\", 123)"; - Long result = (Long)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(123, result.intValue()); - } - - @Test - void testIif4() { - String funcExpression = "fn.common.iif(false, \"abc\", 123.4)"; - Double result = (Double)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(123.4, result); - } - - @Test - void testIif5() { - String funcExpression = "fn.common.iif(false, \"abc\", true)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals() { - String funcExpression = "fn.common.equals(\"abc\", true)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(false, result); - } - - @Test - void testEquals2() { - String funcExpression = "fn.common.equals(\"abc\", \"abc\")"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals3() { - String funcExpression = "fn.common.equals(123, 123)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals4() { - String funcExpression = "fn.common.equals(123, 123.0)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(false, result); - } - - @Test - void testEquals5() { - String funcExpression = "fn.common.equals(true, true)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals6() { - String funcExpression = "fn.common.equals(123.2, 123.2)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals7() { - String funcExpression = "fn.common.equals(null, 123.2)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(false, result); - } - - @Test - void testEquals8() { - String funcExpression = "fn.common.equals(null, null)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(true, result); - } - - @Test - void testEquals9() { - String funcExpression = "fn.common.equals(123, null)"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression); - assertEquals(false, result); - } - - @Test - void testIsNull() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isNull({data.m.c})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - } - - @Test - void testIsNotNull() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isNotNull({data.m.a})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - } - - @Test - void testIsBlank() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isBlank({data.m.c})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - } - - @Test - void testIsNotBlank() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isNotBlank({data.m.a})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - } - - @Test - void testIsEmpty() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isEmpty({data.list2})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isEmpty({data.m2})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isEmpty({data.m.x})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isEmpty({data.m.d})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - } - - @Test - void testIsNotEmpty() { - ONode ctx = getCtxNode(); - String funcExpression = "fn.common.isNotEmpty({data.list})"; - Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isNotEmpty({data.m})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isNotEmpty({data.m.a})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(true, result); - - funcExpression = "fn.common.isNotEmpty({data.m.y})"; - result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression); - assertEquals(false, result); - } - -} \ No newline at end of file diff --git a/fizz-core/src/test/java/we/fizz/group/DevTestGroup.java b/fizz-core/src/test/java/we/fizz/group/DevTestGroup.java deleted file mode 100644 index c9c9468..0000000 --- a/fizz-core/src/test/java/we/fizz/group/DevTestGroup.java +++ /dev/null @@ -1,4 +0,0 @@ -package we.fizz.group; - -public class DevTestGroup { -} diff --git a/fizz-core/src/test/java/we/fizz/group/FastTestGroup.java b/fizz-core/src/test/java/we/fizz/group/FastTestGroup.java deleted file mode 100644 index 8d9abd1..0000000 --- a/fizz-core/src/test/java/we/fizz/group/FastTestGroup.java +++ /dev/null @@ -1,4 +0,0 @@ -package we.fizz.group; - -public class FastTestGroup { -} diff --git a/fizz-core/src/test/java/we/fizz/group/SlowTestGroup.java b/fizz-core/src/test/java/we/fizz/group/SlowTestGroup.java deleted file mode 100644 index a99bbc6..0000000 --- a/fizz-core/src/test/java/we/fizz/group/SlowTestGroup.java +++ /dev/null @@ -1,4 +0,0 @@ -package we.fizz.group; - -public class SlowTestGroup { -} diff --git a/fizz-core/src/test/java/we/util/WebUtilsTests.java b/fizz-core/src/test/java/we/util/WebUtilsTests.java deleted file mode 100644 index edbe0c7..0000000 --- a/fizz-core/src/test/java/we/util/WebUtilsTests.java +++ /dev/null @@ -1,63 +0,0 @@ -package we.util; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.jupiter.api.Test; -import org.springframework.mock.http.server.reactive.MockServerHttpRequest; -import org.springframework.mock.web.server.MockServerWebExchange; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author hongqiaowei - */ - -public class WebUtilsTests { - - @Test - void getClientReqPathPrefixTest() throws JsonProcessingException { - WebUtils.setGatewayPrefix("/_proxytestx"); - MockServerHttpRequest mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/_proxytest/xservice/ybiz?a=b").build(); - MockServerWebExchange mockExchange = MockServerWebExchange.from(mockRequest); - String clientService = WebUtils.getClientService(mockExchange); - assertEquals("xservice", clientService); - String clientReqPath = WebUtils.getClientReqPath(mockExchange); - assertEquals("/ybiz", clientReqPath); - String clientReqPathPrefix = WebUtils.getClientReqPathPrefix(mockExchange); - assertEquals("/_proxytest/", clientReqPathPrefix); - - WebUtils.setGatewayPrefix("/prox"); - mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/prox/test/ybiz").build(); - mockExchange = MockServerWebExchange.from(mockRequest); - clientService = WebUtils.getClientService(mockExchange); - assertEquals("test", clientService); - clientReqPath = WebUtils.getClientReqPath(mockExchange); - assertEquals("/ybiz", clientReqPath); - - WebUtils.setGatewayPrefix(""); - mockRequest = MockServerHttpRequest.get("http://127.0.0.1:8600/aservice/ybiz1").build(); - mockExchange = MockServerWebExchange.from(mockRequest); - clientService = WebUtils.getClientService(mockExchange); - assertEquals("aservice", clientService); - clientReqPath = WebUtils.getClientReqPath(mockExchange); - assertEquals("/ybiz1", clientReqPath); - } - - @Test - void toQueryStringTest() { - MultiValueMap mvm = new LinkedMultiValueMap<>(); - List v0 = Stream.of("", "v0").collect(Collectors.toList()); - v0.add(null); - mvm.put("k0", v0); - List v1 = Stream.of("v1").collect(Collectors.toList()); - mvm.put("k1", v1); - String s = WebUtils.toQueryString(mvm); - assertEquals("k0=&k0=v0&k0&k1=v1", s); - } -} diff --git a/fizz-core/src/test/resources/log4j2-test.xml b/fizz-core/src/test/resources/log4j2-test.xml index 4148b77..9f303d8 100644 --- a/fizz-core/src/test/resources/log4j2-test.xml +++ b/fizz-core/src/test/resources/log4j2-test.xml @@ -16,6 +16,6 @@ - + diff --git a/fizz-plugin/plugin-core.md b/fizz-plugin/plugin-core.md index 880b301..e0f5e5c 100755 --- a/fizz-plugin/plugin-core.md +++ b/fizz-plugin/plugin-core.md @@ -17,7 +17,7 @@ title: plugin core > @FizzConfig 参数说明： > -> contentParser ：配置内容解析器。选填，默认是 json 解析器 JsonParser 。也可以自定义解析器，只需实现 we.plugin.core.filter.config.ContentParser 接口 +> contentParser ：配置内容解析器。选填，默认是 json 解析器 JsonParser 。也可以自定义解析器，只需实现 com.fizzgate.plugin.core.filter.config.ContentParser 接口 注意：默认解析器 JsonParser 的 parseRouterCfg 方法只对第一层的 json string 做了增强，但这也足够用了。如（注意 varJson 是个 json 字符串，并不是 json 对象）： ```groovy @@ -63,7 +63,7 @@ void parseRouterCfg() { ``` **3、编写插件逻辑** -继承 we.plugin.core.filter.AbstractFizzPlugin ，并实现 pluginName 和 doFilter 方法 +继承 com.fizzgate.plugin.core.filter.AbstractFizzPlugin ，并实现 pluginName 和 doFilter 方法 > pluginName 方法：获取插件名称。无参，返回插件名称，要与网关后台配置的插件名称一致 > @@ -83,7 +83,7 @@ void parseRouterCfg() { 示例： ```java -package we.fizz.plugin.example.plugin; +package com.fizzgate.fizz.plugin.example.plugin; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -91,15 +91,15 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -import we.plugin.core.filter.AbstractFizzPlugin; -import we.plugin.core.filter.config.FizzConfig; -import we.plugin.auth.ApiConfig; -import we.util.WebUtils; +import com.fizzgate.plugin.core.filter.AbstractFizzPlugin; +import com.fizzgate.plugin.core.filter.config.FizzConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.util.WebUtils; import java.util.Map; -import static we.fizz.plugin.example.plugin.ExamplePlugin.PluginConfig; -import static we.fizz.plugin.example.plugin.ExamplePlugin.RouterConfig; +import static com.fizzgate.fizz.plugin.example.plugin.ExamplePlugin.PluginConfig; +import static com.fizzgate.fizz.plugin.example.plugin.ExamplePlugin.RouterConfig; @Slf4j @Component diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index 4f62a6d..1c192eb 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.7.0 + 2.7.1 ../pom.xml 4.0.0 diff --git a/fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilter.java similarity index 94% rename from fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilter.java index 97e7f77..5d60077 100644 --- a/fizz-plugin/src/main/java/we/plugin/basicAuth/BasicAuthPluginFilter.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.basicAuth; +package com.fizzgate.plugin.basicAuth; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -25,13 +25,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.FizzPluginFilter; -import we.plugin.FizzPluginFilterChain; -import we.plugin.PluginConfig; -import we.util.JacksonUtils; -import we.util.ReactorUtils; -import we.util.WebUtils; import java.util.Base64; import java.util.HashMap; diff --git a/fizz-plugin/src/main/java/we/plugin/basicAuth/GlobalConfig.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/GlobalConfig.java similarity index 96% rename from fizz-plugin/src/main/java/we/plugin/basicAuth/GlobalConfig.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/GlobalConfig.java index 30da4a0..7ca77e6 100644 --- a/fizz-plugin/src/main/java/we/plugin/basicAuth/GlobalConfig.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/basicAuth/GlobalConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.basicAuth; +package com.fizzgate.plugin.basicAuth; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/core/config/WeFizzPluginAutoConfiguration.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/config/WeFizzPluginAutoConfiguration.java similarity index 63% rename from fizz-plugin/src/main/java/we/plugin/core/config/WeFizzPluginAutoConfiguration.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/config/WeFizzPluginAutoConfiguration.java index f9a2585..aea0fdf 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/config/WeFizzPluginAutoConfiguration.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/config/WeFizzPluginAutoConfiguration.java @@ -1,17 +1,18 @@ -package we.plugin.core.config; +package com.fizzgate.plugin.core.config; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import we.plugin.core.filter.config.parser.JsonParser; -import we.plugin.core.spring.FizzPluginAliasProcessor; + +import com.fizzgate.plugin.core.filter.config.parser.JsonParser; +import com.fizzgate.plugin.core.spring.FizzPluginAliasProcessor; /** * @author huanghua */ @Configuration -@ComponentScan({"we.config", "we.fizz", "we.plugin", "we.filter", "we.proxy", "we.stats"/*, "we.plugin.core"*/}) +@ComponentScan({"we.config", "we.fizz", "we.plugin", "we.filter", "we.proxy", "we.stats", "com.fizzgate.config", "com.fizzgate.fizz", "com.fizzgate.plugin", "com.fizzgate.filter", "com.fizzgate.proxy", "com.fizzgate.stats"/*, "com.fizzgate.plugin.core"*/}) public class WeFizzPluginAutoConfiguration { @Bean diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/AbstractFizzPlugin.java similarity index 92% rename from fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/AbstractFizzPlugin.java index 80fb5b5..c55a17f 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/AbstractFizzPlugin.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/AbstractFizzPlugin.java @@ -1,19 +1,21 @@ -package we.plugin.core.filter; +package com.fizzgate.plugin.core.filter; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.Fizz; +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.PluginConfig; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.auth.ApiConfigService; +import com.fizzgate.plugin.core.filter.config.ContentParser; +import com.fizzgate.plugin.core.filter.config.FizzConfig; +import com.fizzgate.plugin.core.filter.config.parser.JsonParser; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.Fizz; -import we.plugin.FizzPluginFilter; -import we.plugin.PluginConfig; -import we.plugin.auth.ApiConfig; -import we.plugin.auth.ApiConfigService; -import we.plugin.core.filter.config.ContentParser; -import we.plugin.core.filter.config.FizzConfig; -import we.plugin.core.filter.config.parser.JsonParser; -import we.util.WebUtils; import javax.annotation.Resource; import java.lang.reflect.ParameterizedType; diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/config/ConfigUtils.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ConfigUtils.java similarity index 96% rename from fizz-plugin/src/main/java/we/plugin/core/filter/config/ConfigUtils.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ConfigUtils.java index 6b44215..1444998 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/config/ConfigUtils.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ConfigUtils.java @@ -1,4 +1,4 @@ -package we.plugin.core.filter.config; +package com.fizzgate.plugin.core.filter.config; import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/config/ContentParser.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ContentParser.java similarity index 87% rename from fizz-plugin/src/main/java/we/plugin/core/filter/config/ContentParser.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ContentParser.java index f99c4af..b44316e 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/config/ContentParser.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/ContentParser.java @@ -1,4 +1,4 @@ -package we.plugin.core.filter.config; +package com.fizzgate.plugin.core.filter.config; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/config/FizzConfig.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/FizzConfig.java similarity index 75% rename from fizz-plugin/src/main/java/we/plugin/core/filter/config/FizzConfig.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/FizzConfig.java index 557fc20..bdd4576 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/config/FizzConfig.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/FizzConfig.java @@ -1,9 +1,9 @@ -package we.plugin.core.filter.config; - -import we.plugin.core.filter.config.parser.JsonParser; +package com.fizzgate.plugin.core.filter.config; import java.lang.annotation.*; +import com.fizzgate.plugin.core.filter.config.parser.JsonParser; + import static java.lang.annotation.ElementType.TYPE; /** diff --git a/fizz-plugin/src/main/java/we/plugin/core/filter/config/parser/JsonParser.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/parser/JsonParser.java similarity index 96% rename from fizz-plugin/src/main/java/we/plugin/core/filter/config/parser/JsonParser.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/parser/JsonParser.java index 71c587d..7ff49dc 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/filter/config/parser/JsonParser.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/filter/config/parser/JsonParser.java @@ -1,14 +1,14 @@ -package we.plugin.core.filter.config.parser; +package com.fizzgate.plugin.core.filter.config.parser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fizzgate.plugin.core.filter.config.ContentParser; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; -import we.plugin.core.filter.config.ContentParser; import javax.annotation.Resource; import java.lang.reflect.Field; diff --git a/fizz-plugin/src/main/java/we/plugin/core/spring/FizzPluginAliasProcessor.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/spring/FizzPluginAliasProcessor.java similarity index 95% rename from fizz-plugin/src/main/java/we/plugin/core/spring/FizzPluginAliasProcessor.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/core/spring/FizzPluginAliasProcessor.java index 5756e0f..fbf2fbe 100644 --- a/fizz-plugin/src/main/java/we/plugin/core/spring/FizzPluginAliasProcessor.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/core/spring/FizzPluginAliasProcessor.java @@ -1,4 +1,4 @@ -package we.plugin.core.spring; +package com.fizzgate.plugin.core.spring; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.config.BeanDefinition; @@ -7,7 +7,8 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.CollectionUtils; -import we.plugin.core.filter.AbstractFizzPlugin; + +import com.fizzgate.plugin.core.filter.AbstractFizzPlugin; import javax.annotation.PostConstruct; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java similarity index 92% rename from fizz-plugin/src/main/java/we/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java index b0ee3cf..1160c9d 100644 --- a/fizz-plugin/src/main/java/we/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/auth/DedicatedLineApiAuthPluginFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.dedicatedline.auth; +package com.fizzgate.plugin.dedicatedline.auth; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; @@ -26,13 +26,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.dedicated_line.DedicatedLineService; +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.util.Consts; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.dedicated_line.DedicatedLineService; -import we.plugin.FizzPluginFilter; -import we.plugin.FizzPluginFilterChain; -import we.util.Consts; -import we.util.ReactorUtils; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java similarity index 91% rename from fizz-plugin/src/main/java/we/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java index 79a6d5b..76fa380 100644 --- a/fizz-plugin/src/main/java/we/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/codec/DedicatedLineCodecPluginFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.dedicatedline.codec; +package com.fizzgate.plugin.dedicatedline.codec; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; @@ -33,16 +33,18 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.dedicated_line.DedicatedLineService; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.requestbody.RequestBodyPlugin; +import com.fizzgate.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; +import com.fizzgate.spring.http.server.reactive.ext.FizzServerHttpResponseDecorator; +import com.fizzgate.util.Consts; +import com.fizzgate.util.NettyDataBufferUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.dedicated_line.DedicatedLineService; -import we.plugin.FizzPluginFilterChain; -import we.plugin.requestbody.RequestBodyPlugin; -import we.spring.http.server.reactive.ext.FizzServerHttpRequestDecorator; -import we.spring.http.server.reactive.ext.FizzServerHttpResponseDecorator; -import we.util.Consts; -import we.util.NettyDataBufferUtils; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java similarity index 92% rename from fizz-plugin/src/main/java/we/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java index b8307a4..82f3827 100644 --- a/fizz-plugin/src/main/java/we/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/dedicatedline/pairing/DedicatedLinePairingPluginFilter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.dedicatedline.pairing; +package com.fizzgate.plugin.dedicatedline.pairing; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.ThreadContext; @@ -26,15 +26,17 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.config.SystemConfig; +import com.fizzgate.dedicated_line.DedicatedLineService; +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.util.Consts; +import com.fizzgate.util.DigestUtils; +import com.fizzgate.util.ReactorUtils; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.config.SystemConfig; -import we.dedicated_line.DedicatedLineService; -import we.plugin.FizzPluginFilter; -import we.plugin.FizzPluginFilterChain; -import we.util.Consts; -import we.util.DigestUtils; -import we.util.ReactorUtils; -import we.util.WebUtils; import javax.annotation.Resource; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/grayrelease/GrayReleasePlugin.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/grayrelease/GrayReleasePlugin.java similarity index 98% rename from fizz-plugin/src/main/java/we/plugin/grayrelease/GrayReleasePlugin.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/grayrelease/GrayReleasePlugin.java index e1857bb..cf628ce 100644 --- a/fizz-plugin/src/main/java/we/plugin/grayrelease/GrayReleasePlugin.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/grayrelease/GrayReleasePlugin.java @@ -15,12 +15,19 @@ * along with this program. If not, see . */ -package we.plugin.grayrelease; +package com.fizzgate.plugin.grayrelease; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.requestbody.RequestBodyPlugin; +import com.fizzgate.proxy.Route; +import com.fizzgate.spring.web.server.ext.FizzServerWebExchangeDecorator; +import com.fizzgate.util.*; + import inet.ipaddr.AddressStringException; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressSeqRange; @@ -37,12 +44,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -import we.plugin.FizzPluginFilterChain; -import we.plugin.auth.ApiConfig; -import we.plugin.requestbody.RequestBodyPlugin; -import we.proxy.Route; -import we.spring.web.server.ext.FizzServerWebExchangeDecorator; -import we.util.*; import java.nio.charset.StandardCharsets; import java.util.*; diff --git a/fizz-plugin/src/main/java/we/plugin/jwt/GlobalConfig.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/GlobalConfig.java similarity index 97% rename from fizz-plugin/src/main/java/we/plugin/jwt/GlobalConfig.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/GlobalConfig.java index 3976363..0eaa450 100644 --- a/fizz-plugin/src/main/java/we/plugin/jwt/GlobalConfig.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/GlobalConfig.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package we.plugin.jwt; +package com.fizzgate.plugin.jwt; /** * diff --git a/fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/JwtAuthPluginFilter.java similarity index 97% rename from fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/JwtAuthPluginFilter.java index 13ad9c7..19eeb8b 100644 --- a/fizz-plugin/src/main/java/we/plugin/jwt/JwtAuthPluginFilter.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/jwt/JwtAuthPluginFilter.java @@ -15,13 +15,18 @@ * along with this program. If not, see . */ -package we.plugin.jwt; +package com.fizzgate.plugin.jwt; 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 com.fizzgate.plugin.PluginFilter; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.PemUtils; +import com.fizzgate.util.WebUtils; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import org.springframework.http.HttpStatus; 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.PemUtils; -import we.util.WebUtils; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; diff --git a/fizz-plugin/src/main/java/we/plugin/myplugin/MyPlugin.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPlugin.java similarity index 81% rename from fizz-plugin/src/main/java/we/plugin/myplugin/MyPlugin.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPlugin.java index 753d65c..a0761ef 100644 --- a/fizz-plugin/src/main/java/we/plugin/myplugin/MyPlugin.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPlugin.java @@ -1,10 +1,12 @@ -package we.plugin.myplugin; +package com.fizzgate.plugin.myplugin; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.FizzPluginFilter; +import com.fizzgate.plugin.FizzPluginFilterChain; + import reactor.core.publisher.Mono; -import we.plugin.FizzPluginFilter; -import we.plugin.FizzPluginFilterChain; import java.util.Map; diff --git a/fizz-plugin/src/main/java/we/plugin/myplugin/MyPluginPlus.java b/fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPluginPlus.java similarity index 89% rename from fizz-plugin/src/main/java/we/plugin/myplugin/MyPluginPlus.java rename to fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPluginPlus.java index 3f6976e..3a64be1 100644 --- a/fizz-plugin/src/main/java/we/plugin/myplugin/MyPluginPlus.java +++ b/fizz-plugin/src/main/java/com/fizzgate/plugin/myplugin/MyPluginPlus.java @@ -1,15 +1,17 @@ -package we.plugin.myplugin; +package com.fizzgate.plugin.myplugin; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; + +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.core.filter.AbstractFizzPlugin; +import com.fizzgate.plugin.core.filter.config.FizzConfig; +import com.fizzgate.util.WebUtils; + import reactor.core.publisher.Mono; -import we.plugin.auth.ApiConfig; -import we.plugin.core.filter.AbstractFizzPlugin; -import we.plugin.core.filter.config.FizzConfig; -import we.util.WebUtils; import java.util.Map; diff --git a/fizz-plugin/src/main/resources/META-INF/spring.factories b/fizz-plugin/src/main/resources/META-INF/spring.factories index 4421ac1..807628e 100644 --- a/fizz-plugin/src/main/resources/META-INF/spring.factories +++ b/fizz-plugin/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - we.plugin.core.config.WeFizzPluginAutoConfiguration \ No newline at end of file + com.fizzgate.plugin.core.config.WeFizzPluginAutoConfiguration \ No newline at end of file diff --git a/fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java b/fizz-plugin/src/test/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilterTests.java similarity index 95% rename from fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java rename to fizz-plugin/src/test/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilterTests.java index 82b5b2e..3e973ba 100644 --- a/fizz-plugin/src/test/java/we/plugin/basicAuth/BasicAuthPluginFilterTests.java +++ b/fizz-plugin/src/test/java/com/fizzgate/plugin/basicAuth/BasicAuthPluginFilterTests.java @@ -15,10 +15,13 @@ * along with this program. If not, see . */ -package we.plugin.basicAuth; +package com.fizzgate.plugin.basicAuth; import org.junit.jupiter.api.Test; +import com.fizzgate.plugin.basicAuth.BasicAuthPluginFilter; +import com.fizzgate.plugin.basicAuth.GlobalConfig; + import java.util.Base64; import java.util.HashMap; import java.util.Map; diff --git a/fizz-plugin/src/test/java/we/plugin/core/filter/config/parser/JsonParserTest.java b/fizz-plugin/src/test/java/com/fizzgate/plugin/core/filter/config/parser/JsonParserTest.java similarity index 93% rename from fizz-plugin/src/test/java/we/plugin/core/filter/config/parser/JsonParserTest.java rename to fizz-plugin/src/test/java/com/fizzgate/plugin/core/filter/config/parser/JsonParserTest.java index 271f275..87bb4bf 100644 --- a/fizz-plugin/src/test/java/we/plugin/core/filter/config/parser/JsonParserTest.java +++ b/fizz-plugin/src/test/java/com/fizzgate/plugin/core/filter/config/parser/JsonParserTest.java @@ -1,11 +1,12 @@ -package we.plugin.core.filter.config.parser; +package com.fizzgate.plugin.core.filter.config.parser; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fizzgate.plugin.core.filter.config.FizzConfig; +import com.fizzgate.plugin.core.filter.config.parser.JsonParser; import com.google.common.collect.Maps; import lombok.Data; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import we.plugin.core.filter.config.FizzConfig; import java.lang.reflect.Field; import java.util.Map; diff --git a/fizz-plugin/src/test/java/we/plugin/grayrelease/GrayReleasePluginTests.java b/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java similarity index 94% rename from fizz-plugin/src/test/java/we/plugin/grayrelease/GrayReleasePluginTests.java rename to fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java index ee0fe0b..655c993 100644 --- a/fizz-plugin/src/test/java/we/plugin/grayrelease/GrayReleasePluginTests.java +++ b/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java @@ -1,6 +1,18 @@ -package we.plugin.grayrelease; +package com.fizzgate.plugin.grayrelease; import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.filter.AggregateFilter; +import com.fizzgate.filter.FilterResult; +import com.fizzgate.fizz.ConfigLoader; +import com.fizzgate.plugin.FizzPluginFilterChain; +import com.fizzgate.plugin.auth.ApiConfig; +import com.fizzgate.plugin.grayrelease.GrayReleasePlugin; +import com.fizzgate.proxy.Route; +import com.fizzgate.util.Consts; +import com.fizzgate.util.JacksonUtils; +import com.fizzgate.util.ReflectionUtils; +import com.fizzgate.util.WebUtils; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.http.HttpHeaders; @@ -9,16 +21,6 @@ import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Mono; -import we.filter.AggregateFilter; -import we.filter.FilterResult; -import we.fizz.ConfigLoader; -import we.plugin.FizzPluginFilterChain; -import we.plugin.auth.ApiConfig; -import we.proxy.Route; -import we.util.Consts; -import we.util.JacksonUtils; -import we.util.ReflectionUtils; -import we.util.WebUtils; import java.util.HashMap; import java.util.Map; @@ -71,7 +73,7 @@ public class GrayReleasePluginTests { .build(); client.post() - .uri("/proxy/aservice/apath/xxx") + .uri("/aservice/apath/xxx") .contentType(MediaType.APPLICATION_JSON) .bodyValue("{\"user\":\"henry\",\"tools\":{\"gun\":\"ak\"}}") .exchange() @@ -124,18 +126,18 @@ public class GrayReleasePluginTests { .build(); client.get() - .uri("/proxy/aservice/apath/xxx") + .uri("/aservice/apath/xxx") .exchange(); Assertions.assertEquals("/a/b/c?name1=value1&name2=value2", changedRoute[0].getBackendPathQuery()); Assertions.assertEquals("http://1.2.3.4:8080", changedRoute[0].nextHttpHostPort); client.get() - .uri("/proxy/aservice/apath/xxx") + .uri("/aservice/apath/xxx") .exchange(); Assertions.assertEquals("http://1.2.3.5:8080", changedRoute[0].nextHttpHostPort); client.get() - .uri("/proxy/aservice/apath/xxx") + .uri("/aservice/apath/xxx") .exchange(); Assertions.assertEquals("http://1.2.3.4:8080", changedRoute[0].nextHttpHostPort); } diff --git a/fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java b/fizz-plugin/src/test/java/com/fizzgate/plugin/jwtAuth/JwtAuthPluginFilterTests.java similarity index 97% rename from fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java rename to fizz-plugin/src/test/java/com/fizzgate/plugin/jwtAuth/JwtAuthPluginFilterTests.java index 8e45a28..f59bf55 100644 --- a/fizz-plugin/src/test/java/we/plugin/jwtAuth/JwtAuthPluginFilterTests.java +++ b/fizz-plugin/src/test/java/com/fizzgate/plugin/jwtAuth/JwtAuthPluginFilterTests.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package we.plugin.jwtAuth; +package com.fizzgate.plugin.jwtAuth; import com.auth0.jwt.interfaces.DecodedJWT; +import com.fizzgate.plugin.jwt.JwtAuthPluginFilter; + import org.junit.jupiter.api.Test; -import we.plugin.jwt.JwtAuthPluginFilter; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 38d1735..6cae080 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.7.0 + 2.7.1 ../pom.xml 4.0.0 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 index d6a8789..dcba522 100644 --- a/fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/fizz-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,53 +1,57 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -we.config.AggregateRedisConfig,\ -we.config.ApolloConfig,\ -we.config.AppConfigProperties,\ -we.config.FlowControlConfig,\ -we.config.FlowStatSchedConfig,\ -we.config.ProxyWebClientConfig,\ -we.config.RefreshLocalCacheConfig,\ -we.config.SystemConfig,\ -we.config.WebServerConfig,\ -we.config.FizzGatewayNodeStatSchedConfig,\ -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.ApiConfig2appsService,\ -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.http.HttpInstanceServiceImpl,\ -we.proxy.CallbackService,\ -we.proxy.DisableDiscoveryUriSelector,\ -we.proxy.EurekaUriSelector,\ -we.proxy.FizzWebClient,\ -we.proxy.NacosUriSelector,\ -we.proxy.RpcInstanceServiceImpl,\ -we.stats.ratelimit.ResourceRateLimitConfigService,\ -we.global_resource.GlobalResourceService,\ -we.dedicated_line.DedicatedLineWebServer +com.fizzgate.config.AggregateRedisConfig,\ +com.fizzgate.config.ApolloConfig,\ +com.fizzgate.config.AppConfigProperties,\ +com.fizzgate.config.FlowControlConfig,\ +com.fizzgate.config.FlowStatSchedConfig,\ +com.fizzgate.config.ProxyWebClientConfig,\ +com.fizzgate.config.RefreshLocalCacheConfig,\ +com.fizzgate.config.SystemConfig,\ +com.fizzgate.config.WebServerConfig,\ +com.fizzgate.config.FizzGatewayNodeStatSchedConfig,\ +com.fizzgate.controller.HealthCheckController,\ +com.fizzgate.controller.CacheCheckController,\ +com.fizzgate.controller.CallbackController,\ +com.fizzgate.controller.ConfigController,\ +com.fizzgate.controller.FlowControlController,\ +com.fizzgate.controller.ManagerConfigController,\ +com.fizzgate.filter.AggregateFilter,\ +com.fizzgate.filter.CallbackFilter,\ +com.fizzgate.filter.CorsFilterConfig,\ +com.fizzgate.filter.FilterExceptionHandlerConfig,\ +com.fizzgate.filter.FizzLogFilter,\ +com.fizzgate.filter.FlowControlFilter,\ +com.fizzgate.filter.PreprocessFilter,\ +com.fizzgate.filter.RouteFilter,\ +com.fizzgate.fizz.AggregateService,\ +com.fizzgate.fizz.ConfigLoader,\ +com.fizzgate.listener.AggregateChannelListener,\ +com.fizzgate.plugin.auth.ApiConfigService,\ +com.fizzgate.plugin.auth.ApiConfig2appsService,\ +com.fizzgate.plugin.auth.AppService,\ +com.fizzgate.plugin.auth.AuthPluginFilter,\ +com.fizzgate.plugin.auth.GatewayGroupService,\ +com.fizzgate.plugin.basicAuth.BasicAuthPluginFilter,\ +com.fizzgate.plugin.jwt.JwtAuthPluginFilter,\ +com.fizzgate.plugin.stat.StatPluginFilter,\ +com.fizzgate.proxy.dubbo.ApacheDubboGenericService,\ +com.fizzgate.proxy.grpc.client.GrpcProxyClient,\ +com.fizzgate.proxy.grpc.GrpcGenericService,\ +com.fizzgate.proxy.grpc.GrpcInstanceServiceImpl,\ +com.fizzgate.proxy.http.HttpInstanceServiceImpl,\ +com.fizzgate.proxy.CallbackService,\ +com.fizzgate.proxy.DisableDiscoveryUriSelector,\ +com.fizzgate.proxy.EurekaUriSelector,\ +com.fizzgate.proxy.FizzWebClient,\ +com.fizzgate.proxy.NacosUriSelector,\ +com.fizzgate.proxy.RpcInstanceServiceImpl,\ +com.fizzgate.stats.ratelimit.ResourceRateLimitConfigService,\ +com.fizzgate.global_resource.GlobalResourceService,\ +com.fizzgate.dedicated_line.DedicatedLineWebServer # Application Listeners -org.springframework.context.ApplicationListener=we.context.event.FizzApplicationListener +org.springframework.context.ApplicationListener=\ +com.fizzgate.context.event.FizzApplicationListener,\ +com.fizzgate.beans.factory.config.FizzEnvironmentPostProcessor + +org.springframework.boot.env.EnvironmentPostProcessor=com.fizzgate.beans.factory.config.FizzEnvironmentPostProcessor diff --git a/pom.xml b/pom.xml index 5fb9140..6d349b1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ Dysprosium-SR25 5.3.7.RELEASE 2.2.7.RELEASE - 4.1.82.Final - 4.4.15 + 4.1.89.Final + 4.4.16 2.17.2 1.7.36 2.7.7 @@ -22,9 +22,9 @@ 0.8.2 0.9.11 2.11.1 - 2.0.54.Final + 2.0.58.Final 2.2.9.RELEASE - 1.31 + 1.33 Moore-SR13 @@ -38,7 +38,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.7.0 + 2.7.1 pom fizz-common @@ -79,7 +79,7 @@ ognl ognl - 3.3.3 + 3.3.4 @@ -344,7 +344,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.26 diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar deleted file mode 100644 index dd823eb..0000000 Binary files a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar and /dev/null differ diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar new file mode 100644 index 0000000..b37291a Binary files /dev/null and b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar differ diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom similarity index 98% rename from repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom rename to repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom index 2932438..399230b 100644 --- a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom +++ b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom @@ -4,7 +4,7 @@ 4.0.0 com.networknt json-schema-validator-i18n-support - 1.0.39_5 + 1.0.39_6 POM was created from install:install-file JsonSchemaValidator diff --git a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml b/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml index f30f588..614a6a4 100644 --- a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml +++ b/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml @@ -3,9 +3,9 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_5 + 1.0.39_6 - 1.0.39_5 + 1.0.39_6 20210430081305