diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index bbbba044..7855ac92 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -152,6 +152,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
@@ -168,7 +170,7 @@
test
- 9308
+ 11002
test
2
@@ -185,6 +187,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
index 9e6736fb..0b2e2f01 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
@@ -22,6 +22,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-admin-server-fescar-service-group
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index 44390848..5673d38e 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -108,13 +108,15 @@
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
@@ -122,18 +124,20 @@
test
- 9056
+ 11001
test
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
diff --git a/esua-epdc/epdc-auth/src/main/resources/application.yml b/esua-epdc/epdc-auth/src/main/resources/application.yml
index 8cea3a1a..f8f03e8c 100644
--- a/esua-epdc/epdc-auth/src/main/resources/application.yml
+++ b/esua-epdc/epdc-auth/src/main/resources/application.yml
@@ -27,6 +27,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
zipkin:
# 指定了 zipkin 服务器的地址
base-url: @spring.zipkin.base-url@
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 3c9816e9..77dd36d7 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -90,12 +90,13 @@
9094
+ dev
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
lb://epdc-auth-server
@@ -133,6 +134,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
@@ -140,13 +143,14 @@
test
- 9094
+ 11000
+ test
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
lb://epdc-auth-server
@@ -174,6 +178,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
http://localhost:9411
@@ -182,6 +188,7 @@
prod
9104
+ prod
prod
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 6a4882b3..a0e3c6dc 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -8,6 +8,9 @@ server:
spring:
application:
name: epdc-gateway-server
+ #环境 dev|test|prod
+ profiles:
+ active: @spring.profiles.active@
servlet:
multipart:
enabled: true
@@ -166,6 +169,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
zipkin:
# 指定了 zipkin 服务器的地址
base-url: @spring.zipkin.base-url@
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index 7b5691c4..9a3a5ff8 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -152,9 +152,9 @@
9040
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -164,6 +164,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
wx3ef8f2cd12a19fcb
948aa2f21dbaa3943288ea5b119ac6f2
@@ -183,12 +185,12 @@
test
- 9040
+ 11003
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -198,6 +200,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
wx3ef8f2cd12a19fcb
948aa2f21dbaa3943288ea5b119ac6f2
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 7cb97f9f..7f3bd048 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -34,6 +34,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-api-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
index bf6d129e..8ae30b64 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
@@ -129,9 +129,9 @@
9076
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -153,9 +153,9 @@
9076
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index c794bd3c..9d87cd06 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -148,9 +148,9 @@
9066
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -161,6 +161,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
dev
@@ -183,12 +185,12 @@
test
- 9066
+ 11004
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -198,6 +200,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
test
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index 550def1a..a794449f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -28,6 +28,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-events-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index cb5f556b..073c0081 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -124,9 +124,9 @@
9063
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -136,6 +136,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
@@ -147,12 +149,12 @@
test
- 9063
+ 11005
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -162,6 +164,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
index 2ccd0724..8f4eda34 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
@@ -28,6 +28,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-group-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index 0beee4fe..b039fbe8 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -147,9 +147,9 @@
9061
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -170,9 +170,9 @@
9061
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
index 2aa86f1f..f93f6753 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
@@ -118,9 +118,9 @@
9987
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -141,9 +141,9 @@
9987
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 846fb76c..0305ab21 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -147,9 +147,9 @@
9062
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -159,6 +159,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
@@ -167,12 +169,12 @@
test
- 9062
+ 11006
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -182,6 +184,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
index 68027a37..26ead481 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
@@ -26,6 +26,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-message-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-module.iml b/esua-epdc/epdc-module/epdc-module.iml
index 318fbe19..d1f05fac 100644
--- a/esua-epdc/epdc-module/epdc-module.iml
+++ b/esua-epdc/epdc-module/epdc-module.iml
@@ -45,5 +45,7 @@
+
+
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index ca240846..8a46abb5 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -118,9 +118,9 @@
9064
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -130,6 +130,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
@@ -141,12 +143,12 @@
test
- 9064
+ 11007
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -156,6 +158,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
index 32703a61..fbd61c18 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
@@ -28,6 +28,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-news-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 3b5142e3..b6910fc2 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -160,9 +160,9 @@
9065
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -172,6 +172,10 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
+
+
@@ -180,12 +184,12 @@
test
- 9065
+ 11008
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -195,6 +199,10 @@
true
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
+
+
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
index 47956a5c..c65c9a56 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
@@ -31,6 +31,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-oss-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 617d9ce7..7b7ee80d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -123,9 +123,9 @@
9068
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -135,6 +135,8 @@
false
47.104.224.45:8848
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
@@ -146,12 +148,12 @@
test
- 9068
+ 11009
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -161,6 +163,8 @@
true
47.104.224.45:8848
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
47.104.85.99:9876;114.215.125.123:9876
jinshui-organizationGroup
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 324812c3..dce7bde2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -36,6 +36,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
alibaba:
seata:
tx-service-group: epdc-user-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
@@ -15,7 +15,7 @@ config {
nacos {
serverAddr = "@nacos.server-addr@"
- namespace = "public"
+ namespace = "@nacos.namespace@"
cluster = "default"
}
}
diff --git a/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml b/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml
index 907bab99..c5093d10 100644
--- a/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml
+++ b/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml
@@ -124,7 +124,6 @@
-
@@ -185,12 +184,9 @@
-
-
-
@@ -218,6 +214,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -240,5 +247,7 @@
+
+
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml
index e5e2e50e..55e2ddb9 100644
--- a/esua-epdc/epdc-module/epdc-webservice/pom.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml
@@ -167,74 +167,6 @@
9075
prod
- 0
- 10.5.34.164
- 6379
- Elink@833066
-
-
-
-
- epdc
- Elink@833066
-
- false
- 10.5.34.164:8848
-
-
-
- prod_kongcun
-
- 9075
- prod
-
-
- 0
- 172.16.1.238
- 6379
- Elink833066
-
-
-
-
- epdc
- Elink@833066
-
-
- false
- 172.16.1.238:8848
-
-
-
- prod_shibei_aliyun
-
- 9075
- prod
-
-
- 0
- 172.16.0.54
- 6379
- Elink833066
-
-
-
-
- epdc
- Elink@833066
-
-
- false
- 172.16.0.52:8848
-
-
-
-
- prod_jinshui
-
- 9075
- prod
-
0
172.19.0.11
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
index d7381e10..083223a2 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
@@ -141,9 +141,9 @@
9988
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -153,14 +153,8 @@
false
47.104.224.45:8848
-
- wx3ef8f2cd12a19fcb
- 948aa2f21dbaa3943288ea5b119ac6f2
- 111
- 111
-
- wxdd8530c5f4926766
- 5bf4fb813145431b3493a10aa7e041e9
+
+ fa5bf520-09c1-410c-a876-28e98c0534d3
@@ -169,12 +163,12 @@
test
- 9988
+ 11010
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
@@ -184,17 +178,8 @@
true
47.104.224.45:8848
-
- wx3ef8f2cd12a19fcb
- 948aa2f21dbaa3943288ea5b119ac6f2
- 111
- 111
-
-
-
-
- wx5d3e97461d248397
- bfed51b731e53db9affb9e6131e7ae12
+ 219.146.91.110
+ fa5bf520-09c1-410c-a876-28e98c0534d3
@@ -221,15 +206,6 @@
epdc
Elink@833066
-
-
- wx3ef8f2cd12a19fcb
- 948aa2f21dbaa3943288ea5b119ac6f2
- 111
- 111
-
- wx6dcf544cdae7d4ec
- 9e0882274ad3821400370312a56a8470
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml
index 892d86b8..27962c43 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml
@@ -26,6 +26,8 @@ spring:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
feign:
hystrix: