diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 6da188bf..359e2603 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -14,9 +14,30 @@ boe-server-all BOE 项目所有功能启动工程,用于开发 - 1.8 + 1.8 + 2021.0.5 + 2021.0.5.0 + 2.2.0 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + + com.xboe xboe-api diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties index 3b9f7f30..32fc56ed 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ b/servers/boe-server-all/src/main/resources/application-dev.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 + ## datasource config spring.jpa.show-sql = true spring.jpa.hibernate.ddl-auto=update diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 8398954c..45bdeb6d 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -5,7 +5,7 @@ spring.redis.password=qwert!W577 spring.redis.port=6379 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## datasource config spring.jpa.hibernate.ddl-auto=update diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index a85c2499..cc7a573b 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -28,7 +28,7 @@ server.tomcat.max-keep-alive-requests=200 server.tomcat.accept-count=200 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## redis spring.redis.database=2 diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index d8dacc6e..a2b306e0 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -5,7 +5,7 @@ spring.redis.password=qwert!W577 spring.redis.port=6379 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## datasource config spring.jpa.hibernate.ddl-auto=none