diff --git a/pom.xml b/pom.xml
index 0bdfed4..62d7568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
4.0.4
3.2.0
2.2.1.RELEASE
+ 8.3.0
@@ -74,6 +75,12 @@
${mybatis-plus.version}
+
+ com.mysql
+ mysql-connector-j
+ ${mysql.version}
+
+
org.springframework.cloud
spring-cloud-starter-loadbalancer
diff --git a/tacit-admin/src/main/resources/bootstrap.yml b/tacit-admin/src/main/resources/bootstrap.yml
index 29358cc..eb7e6dd 100644
--- a/tacit-admin/src/main/resources/bootstrap.yml
+++ b/tacit-admin/src/main/resources/bootstrap.yml
@@ -6,15 +6,13 @@ spring:
cloud:
nacos:
discovery:
- enabled: true
- server-addr: http://117.72.94.232:9091
- username: nacos
- password: nacos
- namespace: ldj
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}
config:
- enabled: true
- server-addr: http://117.72.94.232:9091
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
file-extension: yaml
- username: nacos
- password: nacos
- namespace: ldj
\ No newline at end of file
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}
\ No newline at end of file
diff --git a/tacit-app-api/pom.xml b/tacit-app-api/pom.xml
index 26af427..bca7f57 100644
--- a/tacit-app-api/pom.xml
+++ b/tacit-app-api/pom.xml
@@ -53,7 +53,7 @@
com.mysql
mysql-connector-j
- runtime
+ ${mysql.version}
@@ -94,7 +94,7 @@
com.tacit
common-redis
- 1.0.0-SNAPSHOT
+ ${project.parent.version}
compile
diff --git a/tacit-app-api/src/main/resources/bootstrap.yml b/tacit-app-api/src/main/resources/bootstrap.yml
index 653bf3b..59221dd 100644
--- a/tacit-app-api/src/main/resources/bootstrap.yml
+++ b/tacit-app-api/src/main/resources/bootstrap.yml
@@ -6,16 +6,13 @@ spring:
cloud:
nacos:
discovery:
- enabled: true
- server-addr: http://117.72.94.232:9091
- username: nacos
- password: nacos
- namespace: ldj
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}
config:
- enabled: true
- server-addr: http://117.72.94.232:9091
- # server-addr: localhost:8848
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
file-extension: yaml
- username: nacos
- password: nacos
- namespace: ldj
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}
diff --git a/tacit-gateway/src/main/resources/bootstrap.yml b/tacit-gateway/src/main/resources/bootstrap.yml
index ca152f3..ce0d220 100644
--- a/tacit-gateway/src/main/resources/bootstrap.yml
+++ b/tacit-gateway/src/main/resources/bootstrap.yml
@@ -8,17 +8,14 @@ spring:
cloud:
nacos:
discovery:
- enabled: true
- server-addr: http://117.72.94.232:9091
- username: nacos
- password: nacos
- namespace: ldj
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}
config:
- enabled: true
- server-addr: http://117.72.94.232:9091
-# server-addr: localhost:8848
+ server-addr: ${nacos.server-addr:117.72.94.232:9091}
file-extension: yaml
- username: nacos
- password: nacos
- namespace: ldj
+ username: ${nacos.username:nacos}
+ password: ${nacos.password:nacos}
+ namespace: ${nacos.namespace:33140c53-3f57-4bd2-b9c8-f507581b6ca2}