Merge branch 'sharding' into test
# Conflicts: # src/main/java/com/sqx/SqxApplication.java # src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java # src/main/resources/mapper/course/CourseDao.xml
This commit is contained in:
@@ -20,7 +20,7 @@ spring:
|
||||
allow-bean-definition-overriding: true
|
||||
# 环境 dev|test|prod
|
||||
profiles:
|
||||
active: dev
|
||||
active: local
|
||||
# jackson时间格式化
|
||||
jackson:
|
||||
time-zone: GMT+8
|
||||
@@ -45,10 +45,14 @@ spring:
|
||||
min-idle: 5 # 连接池中的最小空闲连接
|
||||
mvc:
|
||||
throw-exception-if-no-handler-found: true
|
||||
pathmatch:
|
||||
matching-strategy: ant_path_matcher
|
||||
# pathmatch:
|
||||
# matching-strategy: ant_path_matcher
|
||||
|
||||
|
||||
management:
|
||||
health:
|
||||
db:
|
||||
enabled: false #关闭数据库健康检查isV
|
||||
#mybatis
|
||||
mybatis-plus:
|
||||
mapper-locations: classpath*:/mapper/**/*.xml
|
||||
|
||||
Reference in New Issue
Block a user