Commit 23e0e78bcd1a91829a4f23615e6eeda5e7bbdbab
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
5 additions
and
5 deletions
src/main/resources/application-test.yml
| @@ -57,13 +57,13 @@ spring: | @@ -57,13 +57,13 @@ spring: | ||
| 57 | testWhileIdle: true | 57 | testWhileIdle: true |
| 58 | testOnBorrow: true | 58 | testOnBorrow: true |
| 59 | testOnReturn: true | 59 | testOnReturn: true |
| 60 | - password: 123456 | 60 | + password: Erp@test123456 |
| 61 | time-between-eviction-runs-millis: 1000 | 61 | time-between-eviction-runs-millis: 1000 |
| 62 | - url: jdbc:mysql://39.108.227.113:3307/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true | 62 | + url: jdbc:mysql://localhost:3307/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true |
| 63 | username: root | 63 | username: root |
| 64 | redis: | 64 | redis: |
| 65 | database: 0 | 65 | database: 0 |
| 66 | - host: 39.108.227.113 | 66 | + host: localhost |
| 67 | lettuce: | 67 | lettuce: |
| 68 | pool: | 68 | pool: |
| 69 | max-active: 2000 | 69 | max-active: 2000 |
| @@ -72,7 +72,7 @@ spring: | @@ -72,7 +72,7 @@ spring: | ||
| 72 | min-idle: 3 | 72 | min-idle: 3 |
| 73 | time-between-eviction-runs: 100 | 73 | time-between-eviction-runs: 100 |
| 74 | password: '' | 74 | password: '' |
| 75 | - port: 6379 | 75 | + port: 6380 |
| 76 | timeout: 2000 | 76 | timeout: 2000 |
| 77 | mail: | 77 | mail: |
| 78 | # 配置 SMTP 服务器地址 | 78 | # 配置 SMTP 服务器地址 |
src/main/resources/application.yml