-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
149 additions
and
426 deletions.
There are no files selected for viewing
21 changes: 11 additions & 10 deletions
21
disjob-admin/ruoyi-disjob/src/main/resources/application-disjob-mysql.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
# database configuration | ||
datasource.disjob: | ||
driver-class-name: com.mysql.cj.jdbc.Driver | ||
jdbc-url: jdbc:mysql://localhost:3306/disjob?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&connectTimeout=2000&socketTimeout=5000&serverTimezone=Asia/Shanghai&failOverReadOnly=false | ||
username: disjob | ||
password: disjob$123456 | ||
minimum-idle: 2 | ||
maximum-pool-size: 20 | ||
connection-timeout: 2000 | ||
pool-name: disjob | ||
# database configuration:前面的`disjob.datasource`为固定前缀,后面的`disjob`为数据源名 | ||
disjob.datasource: | ||
disjob: | ||
driver-class-name: com.mysql.cj.jdbc.Driver | ||
jdbc-url: jdbc:mysql://localhost:3306/disjob?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&connectTimeout=2000&socketTimeout=5000&serverTimezone=Asia/Shanghai&failOverReadOnly=false | ||
username: disjob | ||
password: disjob$123456 | ||
minimum-idle: 2 | ||
maximum-pool-size: 20 | ||
connection-timeout: 2000 | ||
pool-name: disjob |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
247 changes: 0 additions & 247 deletions
247
...mon/src/main/java/cn/ponfee/disjob/common/spring/AbstractMybatisDataSourceConfig.java.bak
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.