Commit 671c41bf825f21b7abc6dc8c1051cb0f2432c878
1 parent
21fbe91e
fix 修复yml文件误提交
Showing
1 changed file
with
7 additions
and
8 deletions
yudao-admin-server/src/main/resources/application-local.yaml
| @@ -44,17 +44,16 @@ spring: | @@ -44,17 +44,16 @@ spring: | ||
| 44 | datasource: | 44 | datasource: |
| 45 | master: | 45 | master: |
| 46 | name: ruoyi-vue-pro | 46 | name: ruoyi-vue-pro |
| 47 | - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT | 47 | + 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 |
| 48 | + driver-class-name: com.mysql.jdbc.Driver | ||
| 49 | + username: root | ||
| 50 | + password: 123456 | ||
| 51 | + slave: # 模拟从库，可根据自己需要修改 | ||
| 52 | + name: ruoyi-vue-pro | ||
| 53 | + 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 | ||
| 48 | driver-class-name: com.mysql.jdbc.Driver | 54 | driver-class-name: com.mysql.jdbc.Driver |
| 49 | username: root | 55 | username: root |
| 50 | password: 123456 | 56 | password: 123456 |
| 51 | -# slave: # 模拟从库，可根据自己需要修改 | ||
| 52 | -# name: ruoyi-vue-pro | ||
| 53 | -# 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 | ||
| 54 | -# driver-class-name: com.mysql.jdbc.Driver | ||
| 55 | -# username: root | ||
| 56 | -# password: 123456 | ||
| 57 | - | ||
| 58 | 57 | ||
| 59 | activiti: | 58 | activiti: |
| 60 | #1.false:默认值，activiti启动时，对比数据库表中保存的版本，如果不匹配。将抛出异常 | 59 | #1.false:默认值，activiti启动时，对比数据库表中保存的版本，如果不匹配。将抛出异常 |