diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index e0034a9c..7eddf3ba 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -1,8 +1,8 @@ spring.datasource.platform=mysql db.num=1 -db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC -db.user=root -db.password=password +db.url.0=jdbc:mysql://182.140.223.172:8036/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.user=ry-config +db.password=xiaohua123 nacos.naming.empty-service.auto-clean=true nacos.naming.empty-service.clean.initial-delay-ms=50000 diff --git a/pom.xml b/pom.xml index 4d55708a..317a38dd 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.5.1 2020.0.3 2021.1 - 2.0.2 + 1.1.4 2.4.1 2.1.4 3.0.0 @@ -77,28 +77,28 @@ pom import - + de.codecentric spring-boot-admin-starter-client ${spring-boot-admin.version} - + com.github.tobato fastdfs-client ${tobato.version} - + org.mybatis.spring.boot mybatis-spring-boot-starter ${spring-boot.mybatis} - + io.swagger @@ -160,9 +160,9 @@ - - commons-collections - commons-collections + + commons-collections + commons-collections ${commons-collections.version} @@ -172,7 +172,7 @@ fastjson ${fastjson.version} - + org.apache.commons @@ -186,56 +186,56 @@ ruoyi-common-core ${ruoyi.version} - + com.ruoyi ruoyi-common-swagger ${ruoyi.version} - + com.ruoyi ruoyi-common-security ${ruoyi.version} - + com.ruoyi ruoyi-common-datascope ${ruoyi.version} - + com.ruoyi ruoyi-common-datasource ${ruoyi.version} - + com.ruoyi ruoyi-common-log ${ruoyi.version} - + com.ruoyi ruoyi-common-redis ${ruoyi.version} - + com.ruoyi ruoyi-api-system ${ruoyi.version} - + @@ -271,4 +271,4 @@ - \ No newline at end of file +