Browse Source

更新jeecg-boot-starter3依赖

kezhijie 1 year ago
parent
commit
bcdbec0091

File diff suppressed because it is too large
+ 0 - 258
jeecg-server-cloud/jeecg-cloud-nacos/docs/spring boot 3.X.sql


+ 10 - 6
jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml

@@ -7,14 +7,18 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: localhost:8848
-      #        username: @config.username@
-      #        password: @config.password@
+        server-addr: @config.server-addr@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
-  #        username: @config.username@
-  #        password: @config.password@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
   config:
     import:
       - optional:nacos:jeecg.yaml
-      - optional:nacos:jeecg-dev.yaml
+      - optional:nacos:jeecg-@profile.name@.yaml

+ 10 - 6
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml

@@ -7,14 +7,18 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: localhost:8848
-#        username: @config.username@
-#        password: @config.password@
+        server-addr: @config.server-addr@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
-#        username: @config.username@
-#        password: @config.password@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
   config:
     import:
       - optional:nacos:jeecg.yaml
-      - optional:nacos:jeecg-dev.yaml
+      - optional:nacos:jeecg-@profile.name@.yaml

+ 3 - 3
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://172.16.10.227:3306/jeecg-boot2?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://localhost:3306/jeecg-boo?useUnicode=true&characterEncoding=UTF-8
 username=root
-password=Whdsj@redis0523
-database_name=jeecg-boot2
+password=root
+database_name=jeecg-boot
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

+ 1 - 1
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: @config.server-addr@
         metadata:
           user.name: ${spring.security.user.name}
           user.password: ${spring.security.user.password}

+ 2 - 2
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/application.yml

@@ -5,9 +5,9 @@ server:
   #数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://172.16.10.227:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://jeecg-boot-mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: ${MYSQL-USER:root}
-    password: ${MYSQL-PWD:root@2023}
+    password: ${MYSQL-PWD:root}
     driver-class-name: com.mysql.jdbc.Driver
     type: com.zaxxer.hikari.HikariDataSource
     hikari: