修改配置文件
This commit is contained in:
parent
5828199ba0
commit
83922a1c11
|
|
@ -189,22 +189,6 @@ public class TempOrdersTask {
|
||||||
ThreadUtil.execAsync(() -> {
|
ThreadUtil.execAsync(() -> {
|
||||||
courseService.incrWeekPayCount(order.getCourseId());
|
courseService.incrWeekPayCount(order.getCourseId());
|
||||||
});
|
});
|
||||||
//Map<String, Object> map = inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney());
|
|
||||||
// Object oneUserId = map.get("oneUserId");
|
|
||||||
// if (oneUserId != null) {
|
|
||||||
// order.setOneUserId(Long.parseLong(String.valueOf(oneUserId)));
|
|
||||||
// order.setOneMoney(new BigDecimal(String.valueOf(map.get("oneMoney"))));
|
|
||||||
// }
|
|
||||||
// Object twoUserId = map.get("twoUserId");
|
|
||||||
// if (twoUserId != null) {
|
|
||||||
// order.setTwoUserId(Long.parseLong(String.valueOf(twoUserId)));
|
|
||||||
// order.setTwoMoney(new BigDecimal(String.valueOf(map.get("twoMoney"))));
|
|
||||||
// }
|
|
||||||
// Object sysUserId = map.get("sysUserId");
|
|
||||||
// if (sysUserId != null) {
|
|
||||||
// order.setSysUserId(Long.parseLong(String.valueOf(sysUserId)));
|
|
||||||
// order.setQdMoney(new BigDecimal(String.valueOf(map.get("qdMoney"))));
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
|
|
|
||||||
|
|
@ -99,66 +99,66 @@ spring:
|
||||||
max-lifetime: ${max-lifetime}
|
max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
connection-timeout: ${connection-timeout}
|
||||||
|
|
||||||
duanju-slave:
|
# duanju-slave:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
duanju-slave-0:
|
# duanju-slave-0:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
duanju-slave-1:
|
# duanju-slave-1:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
duanju-slave-2:
|
# duanju-slave-2:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
duanju-slave-3:
|
# duanju-slave-3:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
duanju-slave-4:
|
# duanju-slave-4:
|
||||||
driver-class-name: ${driver-class-name}
|
# driver-class-name: ${driver-class-name}
|
||||||
jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
# jdbc-url: jdbc:mysql://47.122.30.120:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
|
||||||
username: root
|
# username: root
|
||||||
password: VideoUser1@
|
# password: VideoUser1@
|
||||||
minimum-idle: ${minimum-idle}
|
# minimum-idle: ${minimum-idle}
|
||||||
maximum-pool-size: ${maximum-pool-size}
|
# maximum-pool-size: ${maximum-pool-size}
|
||||||
idle-timeout: ${idle-timeout}
|
# idle-timeout: ${idle-timeout}
|
||||||
max-lifetime: ${max-lifetime}
|
# max-lifetime: ${max-lifetime}
|
||||||
connection-timeout: ${connection-timeout}
|
# connection-timeout: ${connection-timeout}
|
||||||
# 数据源配置end
|
# 数据源配置end
|
||||||
|
|
||||||
# 读写分离配置begin
|
# 读写分离配置begin
|
||||||
|
|
@ -167,30 +167,30 @@ spring:
|
||||||
duanju:
|
duanju:
|
||||||
masterDataSourceName: duanju
|
masterDataSourceName: duanju
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju
|
- duanju
|
||||||
- duanju-slave
|
# - duanju-slave
|
||||||
duanju-0:
|
duanju-0:
|
||||||
masterDataSourceName: duanju-0
|
masterDataSourceName: duanju-0
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju-0
|
- duanju-0
|
||||||
- duanju-slave-0
|
# - duanju-slave-0
|
||||||
duanju-1:
|
duanju-1:
|
||||||
masterDataSourceName: duanju-1
|
masterDataSourceName: duanju-1
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju-1
|
- duanju-1
|
||||||
- duanju-slave-1
|
# - duanju-slave-1
|
||||||
duanju-2:
|
duanju-2:
|
||||||
masterDataSourceName: duanju-2
|
masterDataSourceName: duanju-2
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju-2
|
- duanju-2
|
||||||
- duanju-slave-2
|
# - duanju-slave-2
|
||||||
duanju-3:
|
duanju-3:
|
||||||
masterDataSourceName: duanju-3
|
masterDataSourceName: duanju-3
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju-3
|
- duanju-3
|
||||||
- duanju-slave-3
|
# - duanju-slave-3
|
||||||
duanju-4:
|
duanju-4:
|
||||||
masterDataSourceName: duanju-4
|
masterDataSourceName: duanju-4
|
||||||
slaveDataSourceNames:
|
slaveDataSourceNames:
|
||||||
# - duanju-4
|
- duanju-4
|
||||||
- duanju-slave-4
|
# - duanju-slave-4
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,3 @@
|
||||||
#logging:
|
|
||||||
# file:
|
|
||||||
# name: logs/duanju.log
|
|
||||||
# 日志配置
|
|
||||||
logging:
|
|
||||||
config: classpath:logback.xml
|
|
||||||
|
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
tomcat:
|
tomcat:
|
||||||
|
|
@ -17,45 +10,6 @@ server:
|
||||||
servlet:
|
servlet:
|
||||||
context-path: /czg
|
context-path: /czg
|
||||||
|
|
||||||
management:
|
|
||||||
health:
|
|
||||||
db:
|
|
||||||
enabled: false #关闭数据库健康检查isV
|
|
||||||
#mybatis
|
|
||||||
pagehelper:
|
|
||||||
offsetAsPageNum: true
|
|
||||||
rowBoundsWithCount: true
|
|
||||||
helperDialect: mysql
|
|
||||||
reasonable: true
|
|
||||||
supportMethodsArguments: true
|
|
||||||
params:
|
|
||||||
count: countSql
|
|
||||||
|
|
||||||
sqx:
|
|
||||||
redis:
|
|
||||||
open: false
|
|
||||||
shiro:
|
|
||||||
redis: false
|
|
||||||
# APP模块,是通过jwt认证的,如果要使用APP模块,则需要修改【加密秘钥】
|
|
||||||
jwt:
|
|
||||||
# 加密秘钥
|
|
||||||
secret: f4e2e52034348f86b67cde581c0f9eb5
|
|
||||||
# token有效时长,7天,单位秒
|
|
||||||
expire: 604800
|
|
||||||
header: token
|
|
||||||
uni:
|
|
||||||
adSecret: 122e4ff1edc66dcf8761f7f7ffc81e0f8773cbfafb58aed29c72fbd092c77315
|
|
||||||
|
|
||||||
|
|
||||||
limit:
|
|
||||||
urlRate: 10 # 同一用户单url每秒限制次数
|
|
||||||
ipJumpLimit: 4 # 同一ip每分钟跳动次数
|
|
||||||
|
|
||||||
# 指定sharding-jdbc雪花算法的工作机器ID
|
|
||||||
snowflake:
|
|
||||||
datacenterId: 1
|
|
||||||
machineId: 3
|
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
main:
|
main:
|
||||||
allow-circular-references: true
|
allow-circular-references: true
|
||||||
|
|
@ -172,3 +126,46 @@ spring:
|
||||||
- qrtz_cron_triggers
|
- qrtz_cron_triggers
|
||||||
- qrtz_calendars
|
- qrtz_calendars
|
||||||
- qrtz_blob_triggers
|
- qrtz_blob_triggers
|
||||||
|
|
||||||
|
# 日志配置
|
||||||
|
logging:
|
||||||
|
config: classpath:logback.xml
|
||||||
|
|
||||||
|
limit:
|
||||||
|
urlRate: 10 # 同一用户单url每秒限制次数
|
||||||
|
ipJumpLimit: 4 # 同一ip每分钟跳动次数
|
||||||
|
|
||||||
|
# 指定sharding-jdbc雪花算法的工作机器ID
|
||||||
|
snowflake:
|
||||||
|
datacenterId: 1
|
||||||
|
machineId: 3
|
||||||
|
|
||||||
|
|
||||||
|
management:
|
||||||
|
health:
|
||||||
|
db:
|
||||||
|
enabled: false #关闭数据库健康检查isV
|
||||||
|
#mybatis
|
||||||
|
pagehelper:
|
||||||
|
offsetAsPageNum: true
|
||||||
|
rowBoundsWithCount: true
|
||||||
|
helperDialect: mysql
|
||||||
|
reasonable: true
|
||||||
|
supportMethodsArguments: true
|
||||||
|
params:
|
||||||
|
count: countSql
|
||||||
|
|
||||||
|
sqx:
|
||||||
|
redis:
|
||||||
|
open: false
|
||||||
|
shiro:
|
||||||
|
redis: false
|
||||||
|
# APP模块,是通过jwt认证的,如果要使用APP模块,则需要修改【加密秘钥】
|
||||||
|
jwt:
|
||||||
|
# 加密秘钥
|
||||||
|
secret: f4e2e52034348f86b67cde581c0f9eb5
|
||||||
|
# token有效时长,7天,单位秒
|
||||||
|
expire: 604800
|
||||||
|
header: token
|
||||||
|
uni:
|
||||||
|
adSecret: 122e4ff1edc66dcf8761f7f7ffc81e0f8773cbfafb58aed29c72fbd092c77315
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue