From e4743f78e815f22f137dfa68db17acbcd22b4323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=9E=9F?= Date: Wed, 12 Jul 2023 15:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yaml | 21 ++++++++++++++++++ .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/application-dev.yaml | 18 +++++++-------- .../src/main/resources/application-local.yaml | 4 ++-- .../test/resources/application-unit-test.yaml | 2 +- .../src/main/resources/application-dev.yaml | 18 +++++++-------- .../src/main/resources/application-local.yaml | 4 ++-- .../test/resources/application-unit-test.yaml | 2 +- .../src/main/resources/application-dev.yaml | 18 +++++++-------- .../src/main/resources/application-local.yaml | 4 ++-- .../src/main/resources/bootstrap.yaml | 2 +- .../test/resources/application-unit-test.yaml | 2 +- .../src/main/resources/application-dev.yaml | 22 +++++++++---------- .../src/main/resources/application-local.yaml | 4 ++-- .../src/main/resources/bootstrap.yaml | 2 +- .../application-integration-test.yaml | 8 +++---- .../test/resources/application-unit-test.yaml | 2 +- 17 files changed, 78 insertions(+), 57 deletions(-) create mode 100644 fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml diff --git a/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml b/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml new file mode 100644 index 000000000..141177153 --- /dev/null +++ b/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml @@ -0,0 +1,21 @@ +--- #################### 注册中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 101.43.138.73:8848 + discovery: + namespace: dev # 命名空间。这里使用 dev 开发环境 + +--- #################### 配置中心相关配置 #################### + +spring: + cloud: + nacos: + # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 + config: + server-addr: 101.43.138.73:8848 # Nacos 服务器地址 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name + file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml b/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml index 3eed7be68..e7e8ccdea 100644 --- a/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: gateway-server profiles: - active: local + active: dev server: port: 48080 diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml index 3659f656a..0afd4b552 100644 --- a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml index 5491430bd..a0d63f7df 100644 --- a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml @@ -39,7 +39,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -50,7 +50,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml index b77f7cf5b..066e2f3b6 100644 --- a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml index d1d1b96dc..77b051d2f 100644 --- a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml index 867441092..1dcb4e85d 100644 --- a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml @@ -40,7 +40,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -51,7 +51,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/test/resources/application-unit-test.yaml index 087c9807e..22a819453 100644 --- a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml index 097bd270c..175b7f9af 100644 --- a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml index 580e47f6a..83842e88b 100644 --- a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml @@ -40,7 +40,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -51,7 +51,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml index caf41b17b..8038e8a32 100644 --- a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: report-server profiles: - active: local + active: dev server: port: 48084 diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml index 087c9807e..22a819453 100644 --- a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml index b9226ec1a..c88a0b941 100644 --- a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh - slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver - username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject +# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 +# name: FUXIAOAIO-CLOUD +# url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true +# driver-class-name: com.mariadb.jdbc.Driver +# username: root +# password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml index 15ffce97c..4c7d50de1 100644 --- a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml @@ -39,7 +39,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -50,7 +50,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml index 273749c70..b97443e6e 100644 --- a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: system-server profiles: - active: local + active: dev server: port: 48081 diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml index e4f7f2c54..d136837cd 100644 --- a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml @@ -45,15 +45,15 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mariadb.jdbc.Driver username: root password: 123456 slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mariadb.jdbc.Driver username: root password: 123456 diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml index 072c8b842..cf263f401 100644 --- a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa