From b1d1a3a93ecfea3ee4f026ca1719813c3536ec5c Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 14 May 2025 15:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=B7=B2=E8=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/bootstrap-prod.yml | 4 ++--
.../src/main/resources/bootstrap-test.yml | 4 ++--
.../com/m2pool/common/core/utils/ip/IpUtils.java | 8 ++++----
.../com/m2pool/gateway/filter/ApiKeyFilter.java | 2 +-
.../src/main/resources/bootstrap-prod.yml | 8 ++++----
.../src/main/resources/bootstrap-test.yml | 8 ++++----
m2pool-modules/m2pool-chat/pom.xml | 6 +++---
.../chat/controller/ChatMessageController.java | 3 +--
.../src/main/resources/bootstrap-prod.yml | 10 +++++-----
.../src/main/resources/bootstrap-test.yml | 8 ++++----
.../src/main/resources/bootstrap-prod.yml | 6 +++---
.../src/main/resources/bootstrap-test.yml | 6 +++---
m2pool-modules/m2pool-oapi/pom.xml | 6 +++---
.../m2pool-oapi/src/main/resources/bootstrap.yml | 16 ++++++++--------
m2pool-modules/m2pool-pool/pom.xml | 6 +++---
.../java/com/m2pool/pool/enums/NodeConfig.java | 6 +++---
.../src/main/resources/bootstrap-prod.yml | 8 ++++----
.../src/main/resources/bootstrap-test.yml | 8 ++++----
.../src/main/resources/bootstrap-prod.yml | 4 ++--
.../src/main/resources/bootstrap-test.yml | 4 ++--
20 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/m2pool-auth/src/main/resources/bootstrap-prod.yml b/m2pool-auth/src/main/resources/bootstrap-prod.yml
index 2d51f3e..2bd7021 100644
--- a/m2pool-auth/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-auth/src/main/resources/bootstrap-prod.yml
@@ -48,12 +48,12 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-auth/src/main/resources/bootstrap-test.yml b/m2pool-auth/src/main/resources/bootstrap-test.yml
index eea3f71..78c1f44 100644
--- a/m2pool-auth/src/main/resources/bootstrap-test.yml
+++ b/m2pool-auth/src/main/resources/bootstrap-test.yml
@@ -74,12 +74,12 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/ip/IpUtils.java b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/ip/IpUtils.java
index 002837f..c88e2ba 100644
--- a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/ip/IpUtils.java
+++ b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/ip/IpUtils.java
@@ -48,7 +48,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) ? "10.168.2.150" : getMultistageReverseProxyIp(ip);
}
/**
@@ -60,7 +60,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) || "10.168.2.150".equals(ip);
}
/**
@@ -209,7 +209,7 @@ public class IpUtils
catch (UnknownHostException e)
{
}
- return "127.0.0.1";
+ return "10.168.2.150";
}
/**
@@ -263,4 +263,4 @@ public class IpUtils
{
return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
}
-}
\ No newline at end of file
+}
diff --git a/m2pool-gateway/src/main/java/com/m2pool/gateway/filter/ApiKeyFilter.java b/m2pool-gateway/src/main/java/com/m2pool/gateway/filter/ApiKeyFilter.java
index c8492f2..38833c9 100644
--- a/m2pool-gateway/src/main/java/com/m2pool/gateway/filter/ApiKeyFilter.java
+++ b/m2pool-gateway/src/main/java/com/m2pool/gateway/filter/ApiKeyFilter.java
@@ -180,7 +180,7 @@ public class ApiKeyFilter implements GlobalFilter,Ordered
private final static String UNKNOWN = "unknown";
// 本地 IP
private final static String LOCALHOST_IP = "0:0:0:0:0:0:0:1";
- private final static String LOCALHOST_IP1 = "127.0.0.1";
+ private final static String LOCALHOST_IP1 = "10.168.2.150";
private static String getIP(ServerHttpRequest request){
// 根据 HttpHeaders 获取 请求 IP地址
diff --git a/m2pool-gateway/src/main/resources/bootstrap-prod.yml b/m2pool-gateway/src/main/resources/bootstrap-prod.yml
index 1711f83..557addf 100644
--- a/m2pool-gateway/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-gateway/src/main/resources/bootstrap-prod.yml
@@ -13,12 +13,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -31,12 +31,12 @@ spring:
eager: true
transport:
# 控制台地址
- dashboard: 127.0.0.1:8718
+ dashboard: 10.168.2.150:8718
# nacos配置持久化
datasource:
ds1:
nacos:
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
dataId: sentinel-m2pool-gateway
groupId: m2_prod_group
data-type: json
diff --git a/m2pool-gateway/src/main/resources/bootstrap-test.yml b/m2pool-gateway/src/main/resources/bootstrap-test.yml
index f1eafec..f6b083b 100644
--- a/m2pool-gateway/src/main/resources/bootstrap-test.yml
+++ b/m2pool-gateway/src/main/resources/bootstrap-test.yml
@@ -12,12 +12,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -30,12 +30,12 @@ spring:
eager: true
transport:
# 控制台地址
- dashboard: 127.0.0.1:8718
+ dashboard: 10.168.2.150:8718
# nacos配置持久化
datasource:
ds1:
nacos:
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
dataId: sentinel-m2pool-gateway
groupId: m2_test_group
data-type: json
diff --git a/m2pool-modules/m2pool-chat/pom.xml b/m2pool-modules/m2pool-chat/pom.xml
index a91ff1c..339d9e0 100644
--- a/m2pool-modules/m2pool-chat/pom.xml
+++ b/m2pool-modules/m2pool-chat/pom.xml
@@ -169,7 +169,7 @@
dev
dev
- 127.0.0.1:8808
+ 10.168.2.150:8808
@@ -181,7 +181,7 @@
test
test
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
@@ -192,7 +192,7 @@
prod
prod
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/controller/ChatMessageController.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/controller/ChatMessageController.java
index f5117e8..0601b23 100644
--- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/controller/ChatMessageController.java
+++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/controller/ChatMessageController.java
@@ -52,8 +52,7 @@ public class ChatMessageController {
@PostMapping("/read/message")
@ApiOperation(value = "聊天室消息改已读")
- @RequiresLogin
public R readMessage(@RequestBody MessagePageVo pageVo) {
return chatMessageService.readMessage(pageVo.getRoomId(),pageVo.getUserType());
}
-}
\ No newline at end of file
+}
diff --git a/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-prod.yml b/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-prod.yml
index 8893591..27afa72 100644
--- a/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-prod.yml
@@ -50,14 +50,14 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
- # server-addr: 127.0.0.1:8808
+ # server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
- # server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
+ # server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -76,4 +76,4 @@ websocket:
send-time-limit: 5000 # 发送超时时间 5秒
send-buffer-size-limit: 65536 # 发送缓冲区大小 64K
time-to-first-message: 5000 # 首次消息超时时间 5秒
- max-connections: 100 # 最大连接数
\ No newline at end of file
+ max-connections: 100 # 最大连接数
diff --git a/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-test.yml b/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-test.yml
index 3712cc8..d94d316 100644
--- a/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-test.yml
+++ b/m2pool-modules/m2pool-chat/src/main/resources/bootstrap-test.yml
@@ -19,14 +19,14 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
- # server-addr: 127.0.0.1:8808
+ # server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
- # server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
+ # server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-modules/m2pool-file/src/main/resources/bootstrap-prod.yml b/m2pool-modules/m2pool-file/src/main/resources/bootstrap-prod.yml
index a328680..8c5b2ab 100644
--- a/m2pool-modules/m2pool-file/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-modules/m2pool-file/src/main/resources/bootstrap-prod.yml
@@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -27,4 +27,4 @@ file:
domain: https://www.m2pool.com
path: /var/www/html/web
img: /img
- filepath: /home/ubuntu/prod
\ No newline at end of file
+ filepath: /home/ubuntu/prod
diff --git a/m2pool-modules/m2pool-file/src/main/resources/bootstrap-test.yml b/m2pool-modules/m2pool-file/src/main/resources/bootstrap-test.yml
index ed9a36f..036d9e2 100644
--- a/m2pool-modules/m2pool-file/src/main/resources/bootstrap-test.yml
+++ b/m2pool-modules/m2pool-file/src/main/resources/bootstrap-test.yml
@@ -11,12 +11,12 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -27,4 +27,4 @@ file:
path: /var/www/html/web_test
# img: /img
filepath: /home/ubuntu/web
- prefix: /statics
\ No newline at end of file
+ prefix: /statics
diff --git a/m2pool-modules/m2pool-oapi/pom.xml b/m2pool-modules/m2pool-oapi/pom.xml
index 55a37b2..2a9e7c4 100644
--- a/m2pool-modules/m2pool-oapi/pom.xml
+++ b/m2pool-modules/m2pool-oapi/pom.xml
@@ -107,7 +107,7 @@
dev
dev
- 127.0.0.1:8808
+ 10.168.2.150:8808
@@ -119,7 +119,7 @@
test
test
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
@@ -130,7 +130,7 @@
prod
prod
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
diff --git a/m2pool-modules/m2pool-oapi/src/main/resources/bootstrap.yml b/m2pool-modules/m2pool-oapi/src/main/resources/bootstrap.yml
index f2754f8..bb565e9 100644
--- a/m2pool-modules/m2pool-oapi/src/main/resources/bootstrap.yml
+++ b/m2pool-modules/m2pool-oapi/src/main/resources/bootstrap.yml
@@ -50,14 +50,14 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
- # server-addr: 127.0.0.1:8808
+ # server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
- # server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
+ # server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
@@ -129,14 +129,14 @@ myenv:
# nacos:
# discovery:
# # 服务注册地址
-# server-addr: 127.0.0.1:8808
+# server-addr: 10.168.2.150:8808
# namespace: m2_test
# group: m2_test_group
-# # server-addr: 127.0.0.1:8808
+# # server-addr: 10.168.2.150:8808
# config:
# # 配置中心地址
-# server-addr: 127.0.0.1:8808
-# # server-addr: 127.0.0.1:8808
+# server-addr: 10.168.2.150:8808
+# # server-addr: 10.168.2.150:8808
# # 配置文件格式
# file-extension: yml
# # 共享配置
diff --git a/m2pool-modules/m2pool-pool/pom.xml b/m2pool-modules/m2pool-pool/pom.xml
index e7dd67d..3231c21 100644
--- a/m2pool-modules/m2pool-pool/pom.xml
+++ b/m2pool-modules/m2pool-pool/pom.xml
@@ -164,7 +164,7 @@
dev
dev
- 127.0.0.1:8808
+ 10.168.2.150:8808
@@ -176,7 +176,7 @@
test
test
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
@@ -187,7 +187,7 @@
prod
prod
- 127.0.0.1:8808
+ 10.168.2.150:8808
false
diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/enums/NodeConfig.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/enums/NodeConfig.java
index 87b5030..92706cf 100644
--- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/enums/NodeConfig.java
+++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/enums/NodeConfig.java
@@ -12,9 +12,9 @@ public enum NodeConfig {
DGBS("dgbs", "13.214.176.64", "14022", "test", "test"),
DGBQ("dgbq", "13.214.176.64", "14022", "test", "test"),
DGBO("dgbo", "13.214.176.64", "14022", "test", "test"),
- DGB_QUBIT_A10("dgb_qubit_a10", "127.0.0.1", "3306", "user", "pwd"),
- DGB_SKEIN_A10("dgb_skein_a10", "127.0.0.1", "3306", "user", "pwd"),
- DGB_ODO_B20("dgb_odo_b20", "127.0.0.1", "3306", "user", "pwd"),
+ DGB_QUBIT_A10("dgb_qubit_a10", "10.168.2.150", "3306", "user", "pwd"),
+ DGB_SKEIN_A10("dgb_skein_a10", "10.168.2.150", "3306", "user", "pwd"),
+ DGB_ODO_B20("dgb_odo_b20", "10.168.2.150", "3306", "user", "pwd"),
NEXA("nexa", "18.139.85.190", "7227", "test", "test"),
RXD("rxd", "13.214.176.64", "7332", "test", "test"),
ALPH("alph", "18.141.161.129", "12973", "test", "test"),
diff --git a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-prod.yml b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-prod.yml
index 87c53ca..d96eacc 100644
--- a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-prod.yml
@@ -47,14 +47,14 @@ spring:
nacos:
discovery:
# 服务注册地址 172.16.2.5
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
-# server-addr: 127.0.0.1:8808
+# server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
-# server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
+# server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml
index a3f55ac..abbb3c9 100644
--- a/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml
+++ b/m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml
@@ -47,14 +47,14 @@ spring:
nacos:
discovery:
# 服务注册地址 172.16.2.5
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
-# server-addr: 127.0.0.1:8808
+# server-addr: 10.168.2.150:8808
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
-# server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
+# server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-modules/m2pool-system/src/main/resources/bootstrap-prod.yml b/m2pool-modules/m2pool-system/src/main/resources/bootstrap-prod.yml
index 5dc7215..cfbd4d7 100644
--- a/m2pool-modules/m2pool-system/src/main/resources/bootstrap-prod.yml
+++ b/m2pool-modules/m2pool-system/src/main/resources/bootstrap-prod.yml
@@ -11,12 +11,12 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_prod
group: m2_prod_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/m2pool-modules/m2pool-system/src/main/resources/bootstrap-test.yml b/m2pool-modules/m2pool-system/src/main/resources/bootstrap-test.yml
index 501b98f..aa5c922 100644
--- a/m2pool-modules/m2pool-system/src/main/resources/bootstrap-test.yml
+++ b/m2pool-modules/m2pool-system/src/main/resources/bootstrap-test.yml
@@ -9,12 +9,12 @@ spring:
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
namespace: m2_test
group: m2_test_group
config:
# 配置中心地址
- server-addr: 127.0.0.1:8808
+ server-addr: 10.168.2.150:8808
# 配置文件格式
file-extension: yml
# 共享配置