Jelajahi Sumber

梳理服务配置信息

EightMonth 1 tahun lalu
induk
melakukan
c27c5a9a9b

File diff ditekan karena terlalu besar
+ 5 - 4
db/tables_nacos.sql


+ 1 - 1
db/增量SQL/sas升级脚本.sql

@@ -13,7 +13,7 @@ CREATE TABLE `oauth2_registered_client` (
   `client_settings` varchar(2000) NOT NULL,
   `client_settings` varchar(2000) NOT NULL,
   `token_settings` varchar(2000) NOT NULL,
   `token_settings` varchar(2000) NOT NULL,
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 
 INSERT INTO `oauth2_registered_client`
 INSERT INTO `oauth2_registered_client`
 (`id`,
 (`id`,

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

@@ -12,7 +12,7 @@ spring:
 db:
 db:
   num: 1
   num: 1
   password:
   password:
-    '0': ${MYSQL-PWD:root@2023}
+    '0': ${MYSQL-PWD:root}
   url:
   url:
     '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
     '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
   user:
   user:

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

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