diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml
index e31916c..770a652 100644
--- a/fizz-bootstrap/pom.xml
+++ b/fizz-bootstrap/pom.xml
@@ -4,18 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.springframework.boot
- spring-boot-starter-parent
- 2.2.13.RELEASE
-
+ fizz-gateway-community
+ com.fizzgate
+ 2.6.6-beta1
+ ../pom.xml
- com.fizzgate
fizz-bootstrap
- 2.6.6-beta1
- 1.8
+
-
+
com.fizzgate
@@ -65,7 +63,7 @@
${project.version}
-->
-
+
@@ -145,6 +143,8 @@
application.yml
bootstrap.yml
log4j2-spring.xml
+ log4j2-kafka.json
+ log4j2.component.properties
true
diff --git a/fizz-bootstrap/src/main/resources/application.yml b/fizz-bootstrap/src/main/resources/application.yml
index 7ca2e1a..90fee28 100644
--- a/fizz-bootstrap/src/main/resources/application.yml
+++ b/fizz-bootstrap/src/main/resources/application.yml
@@ -51,6 +51,7 @@ spring:
# Must use the same Redis as fizz-manager
aggregate:
redis:
+# standalone redis config
# need replace
host: 1.1.1.1 #please input the redis host (default:localhost)
# need replace
@@ -59,6 +60,12 @@ aggregate:
password: 123456 #please input the redis password (default:123456)
# need replace
database: 10 #please input the redis database (default:9)
+
+# redis cluster config
+# type: cluster # type can be standalone or cluster, standalone is default
+# password: 123456
+# clusterNodes: 172.1.1.181:7001,172.1.1.181:7002,172.1.1.181:7003,172.1.1.182:7001,172.1.1.182:7002,172.1.1.182:7003
+
proxy-webclient:
name: proxy
trust-insecure-SSL: false
diff --git a/fizz-common/src/main/java/we/util/NetworkUtils.java b/fizz-common/src/main/java/we/util/NetworkUtils.java
index dfd0184..9e9d96b 100644
--- a/fizz-common/src/main/java/we/util/NetworkUtils.java
+++ b/fizz-common/src/main/java/we/util/NetworkUtils.java
@@ -29,7 +29,6 @@ import java.security.SecureRandom;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedHashSet;
-import java.util.Optional;
import java.util.Set;
/**
@@ -38,7 +37,7 @@ import java.util.Set;
public class NetworkUtils {
- private static final Logger log = LoggerFactory.getLogger(NetworkUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(NetworkUtils.class);
private static final int maxServerId = 1023;
@@ -50,13 +49,13 @@ public class NetworkUtils {
private static final String SERVER_IP = "SERVER_IP";
- private static final String LOCAL_IP = "127.0.0.1";
+ private static final String LOCAL_IP = "127.0.0.1";
private NetworkUtils() {
}
/**
- * @return user settings, or the first non local IP of IP address list.
+ * @return user settings, or the first non-local IP of IP address list.
*/
public static String getServerIp() {
if (serverIp == null) {
@@ -98,7 +97,7 @@ public class NetworkUtils {
} else {
serverIps.add(ip);
}
- log.info("server ip: {}", serverIps);
+ LOGGER.info("server ip: {}", serverIps);
} catch (SocketException | UnknownHostException e) {
throw new RuntimeException(e);
}
@@ -123,10 +122,10 @@ public class NetworkUtils {
serverId = b.toString().hashCode();
} catch (Exception e) {
serverId = (new SecureRandom().nextInt());
- log.error(null, e);
+ LOGGER.error(null, e);
}
serverId = serverId & maxServerId;
- log.info("server id: {}", serverId);
+ LOGGER.info("server id: {}", serverId);
}
return serverId;
}
diff --git a/pom.xml b/pom.xml
index df99396..1877aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
fizz-common
fizz-core
fizz-plugin
-
+ fizz-bootstrap
fizz-spring-boot-starter