From 18c2488dc912ec61ffeb35c2e183423bc5ee5e5b Mon Sep 17 00:00:00 2001
From: xiaohuang <1559741705@qq.com>
Date: Mon, 27 May 2024 17:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=83=BD=E5=90=A6=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
muyu-auth/src/main/resources/bootstrap.yml | 4 +-
.../muyu/common/core/utils/ip/IpUtils.java | 6 +-
muyu-gateway/src/main/resources/bootstrap.yml | 8 +-
.../src/main/resources/bootstrap.yml | 4 +-
.../muyu-gen/src/main/resources/bootstrap.yml | 4 +-
.../muyu-job/src/main/resources/bootstrap.yml | 4 +-
.../muyu-networking-common/pom.xml | 37 +++++++
muyu-modules/muyu-networking/pom.xml | 96 +++++++++++++++++++
.../src/main/resources/bootstrap.yml | 4 +-
muyu-modules/pom.xml | 2 +
.../src/main/resources/bootstrap.yml | 4 +-
11 files changed, 154 insertions(+), 19 deletions(-)
create mode 100644 muyu-modules/muyu-networking/muyu-networking-common/pom.xml
create mode 100644 muyu-modules/muyu-networking/pom.xml
diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml
index b309a3d..89a7337 100644
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
index f7ad9bf..d794628 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
@@ -58,7 +58,7 @@ public class IpUtils {
ip = request.getRemoteAddr();
}
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+ return "0:0:0:0:0:0:0:1".equals(ip) ? "175.24.138.82" : getMultistageReverseProxyIp(ip);
}
/**
@@ -70,7 +70,7 @@ public class IpUtils {
*/
public static boolean internalIp (String ip) {
byte[] addr = textToNumericFormatV4(ip);
- return internalIp(addr) || "127.0.0.1".equals(ip);
+ return internalIp(addr) || "175.24.138.82".equals(ip);
}
/**
@@ -197,7 +197,7 @@ public class IpUtils {
return InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
}
- return "127.0.0.1";
+ return "175.24.138.82";
}
/**
diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml
index d7367b4..1bd13a5 100644
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
@@ -28,12 +28,12 @@ spring:
eager: true
transport:
# 控制台地址
- dashboard: 127.0.0.1:8718
+ dashboard: 175.24.138.82:8718
# nacos配置持久化
datasource:
ds1:
nacos:
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
dataId: sentinel-muyu-gateway
groupId: DEFAULT_GROUP
data-type: json
diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
index 0cb85bd..bc87516 100644
--- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
index b628931..121e1b8 100644
--- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
index 618f3e8..c2f6c14 100644
--- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-modules/muyu-networking/muyu-networking-common/pom.xml b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml
new file mode 100644
index 0000000..4c81a22
--- /dev/null
+++ b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml
@@ -0,0 +1,37 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-modules
+ 3.6.3
+ ../../pom.xml
+
+
+ muyu-networking-common
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+
+
+ com.muyu
+ muyu-modules-system
+ 3.6.3
+
+
+
+
+ org.postgresql
+ postgresql
+
+
+
+
diff --git a/muyu-modules/muyu-networking/pom.xml b/muyu-modules/muyu-networking/pom.xml
new file mode 100644
index 0000000..97c85ee
--- /dev/null
+++ b/muyu-modules/muyu-networking/pom.xml
@@ -0,0 +1,96 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-modules
+ 3.6.3
+
+
+ muyu-networking
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+
+
+ com.muyu
+ muyu-common-datasource
+
+
+
+
+
+ com.muyu
+ muyu-common-datascope
+
+
+
+
+
+ com.muyu
+ muyu-common-log
+
+
+
+
+
+ com.muyu
+ muyu-common-swagger
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+
+
diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
index a66fd4c..b02031d 100644
--- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml
index 846198c..cacdf25 100644
--- a/muyu-modules/pom.xml
+++ b/muyu-modules/pom.xml
@@ -13,6 +13,8 @@
muyu-gen
muyu-job
muyu-file
+ muyu-networking
+ muyu-networking/muyu-networking-common
muyu-modules
diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
index 1276c8e..c89a13f 100644
--- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
+++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 175.24.138.82:8848
# 配置文件格式
file-extension: yml
# 共享配置