lizixuan
/
m2pool_web_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lizixuan:31e0f400d9d4366b7cd59025dac688f708ada4c0
Branches Tags
lizixuan:main
...
compare: lizixuan:e3e7993134b1859b9fd4bc03ae87d2fd0d452ba8
Branches Tags
lizixuan:main

2 Commits
31e0f400d9 ... e3e7993134

Author SHA1 Message Date
yyb e3e7993134 Merge branch 'main' of http://47.129.22.53:22345/lizixuan/m2pool_web_backend 2025-05-14 15:08:16 +08:00
yyb b1d1a3a93e 消息已讀 2025-05-14 15:08:09 +08:00
20 changed files with 65 additions and 65 deletions
Show Stats Expand all files Collapse all files

4
m2pool-auth/src/main/resources/bootstrap-prod.yml
View File

@ -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
# 共享配置

4
m2pool-auth/src/main/resources/bootstrap-test.yml
View File

@ -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
# 共享配置

8
m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/ip/IpUtils.java
View File

@ -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);
}
}
}

2
m2pool-gateway/src/main/java/com/m2pool/gateway/filter/ApiKeyFilter.java
View File

@ -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地址

8
m2pool-gateway/src/main/resources/bootstrap-prod.yml
View File

@ -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

8
m2pool-gateway/src/main/resources/bootstrap-test.yml
View File

@ -13,12 +13,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
# 共享配置
@ -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_test_group
data-type: json

6
m2pool-modules/m2pool-chat/pom.xml
View File

@ -169,7 +169,7 @@
<id>dev</id>
<properties>
<spring.profile>dev</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<!-- 是否默认激活 -->
@ -181,7 +181,7 @@
<id>test</id>
<properties>
<spring.profile>test</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@ -192,7 +192,7 @@
<id>prod</id>
<properties>
<spring.profile>prod</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>

2
m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/controller/ChatMessageController.java
View File

@ -55,4 +55,4 @@ public class ChatMessageController {
public R<String> readMessage(@RequestBody MessagePageVo pageVo) {
return chatMessageService.readMessage(pageVo.getRoomId(),pageVo.getUserType());
}
}
}

10
m2pool-modules/m2pool-chat/src/main/resources/bootstrap-prod.yml
View File

@ -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 # 最大连接数
max-connections: 100 # 最大连接数

8
m2pool-modules/m2pool-chat/src/main/resources/bootstrap-test.yml
View File

@ -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
# 共享配置

6
m2pool-modules/m2pool-file/src/main/resources/bootstrap-prod.yml
View File

@ -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
filepath: /home/ubuntu/prod

6
m2pool-modules/m2pool-file/src/main/resources/bootstrap-test.yml
View File

@ -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
prefix: /statics

6
m2pool-modules/m2pool-oapi/pom.xml
View File

@ -107,7 +107,7 @@
<id>dev</id>
<properties>
<spring.profile>dev</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<!-- 是否默认激活 -->
@ -119,7 +119,7 @@
<id>test</id>
<properties>
<spring.profile>test</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@ -130,7 +130,7 @@
<id>prod</id>
<properties>
<spring.profile>prod</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>

16
m2pool-modules/m2pool-oapi/src/main/resources/bootstrap.yml
View File

@ -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
# # 共享配置

6
m2pool-modules/m2pool-pool/pom.xml
View File

@ -164,7 +164,7 @@
<id>dev</id>
<properties>
<spring.profile>dev</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<!-- 是否默认激活 -->
@ -176,7 +176,7 @@
<id>test</id>
<properties>
<spring.profile>test</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@ -187,7 +187,7 @@
<id>prod</id>
<properties>
<spring.profile>prod</spring.profile>
<nacos.server.address>127.0.0.1:8808</nacos.server.address>
<nacos.server.address>10.168.2.150:8808</nacos.server.address>
</properties>
<activation>
<activeByDefault>false</activeByDefault>

6
m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/enums/NodeConfig.java
View File

@ -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"),

8
m2pool-modules/m2pool-pool/src/main/resources/bootstrap-prod.yml
View File

@ -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
# 共享配置

8
m2pool-modules/m2pool-pool/src/main/resources/bootstrap-test.yml
View File

@ -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
# 共享配置

4
m2pool-modules/m2pool-system/src/main/resources/bootstrap-prod.yml
View File

@ -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
# 共享配置

4
m2pool-modules/m2pool-system/src/main/resources/bootstrap-test.yml
View File

@ -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
# 共享配置