From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Fri, 17 Oct 2025 17:20:15 +0800 Subject: [PATCH] Merge branch 'refs/heads/master' into xin --- oying-system/src/main/resources/config/application-prod.yml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oying-system/src/main/resources/config/application-prod.yml b/oying-system/src/main/resources/config/application-prod.yml index 6bfc2f9..8fbe4d2 100644 --- a/oying-system/src/main/resources/config/application-prod.yml +++ b/oying-system/src/main/resources/config/application-prod.yml @@ -98,8 +98,8 @@ # 续期时间范围，默认 1小时，这里单位毫秒 renew: 3600000 -#是否允许生成代码，生产环境设置为false -generator: +#生产环境设置为false +oying: enabled: false #如果生产环境要开启swagger，需要配置请求地址 @@ -135,8 +135,6 @@ #微信配置 wx: - # 测试环境 - enabled: false # AppID app-id: wx2273296a5569cbad # AppSecret @@ -189,8 +187,6 @@ refund-url: https://o-ying.cn/oying/api/swiftPass/returnNotify obs: - # 测试环境 - enabled: false access_key_id: HPUATJYFVPO6DABSVEKA access_key_secret: 8TQG5wnLID3MsUPsJjmZ31LtKlgyvFFUDvXnI9nm bucket: o-ying @@ -201,3 +197,7 @@ url-send-msg-batch: https://118.178.116.15:8443/winnerrxd/api/trigger/SendBatchMsg user-code: CQLYSXYJ user-pass: lych1205! + +# 支付类型 +pay: + type: HWC2 -- Gitblit v1.9.3