Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts: # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
This commit is contained in:
@@ -274,6 +274,9 @@ yudao:
|
||||
enable: true
|
||||
ignore-urls:
|
||||
- /jmreport/* # 积木报表,无法携带租户编号
|
||||
ignore-visit-urls:
|
||||
- /admin-api/system/user/profile/**
|
||||
- /admin-api/system/auth/**
|
||||
ignore-tables:
|
||||
ignore-caches:
|
||||
- user_role_ids
|
||||
@@ -296,6 +299,7 @@ yudao:
|
||||
pay-expire-time: 2h # 支付的过期时间
|
||||
receive-expire-time: 14d # 收货的过期时间
|
||||
comment-expire-time: 7d # 评论的过期时间
|
||||
status-sync-to-wxa-enable: true # 是否同步订单状态到微信小程序
|
||||
express:
|
||||
client: kd_100
|
||||
kd-niao:
|
||||
|
Reference in New Issue
Block a user