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 | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/oying-system/src/main/resources/config/application-prod.yml b/oying-system/src/main/resources/config/application-prod.yml
index 67e895d..8fbe4d2 100644
--- a/oying-system/src/main/resources/config/application-prod.yml
+++ b/oying-system/src/main/resources/config/application-prod.yml
@@ -4,9 +4,9 @@
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:oying}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
- username: ${DB_USER:root}
- password: ${DB_PWD:123456}
+ url: jdbc:mysql://${DB_HOST:192.168.0.5}:${DB_PORT:3306}/${DB_NAME:oying}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+ username: ${DB_USER:oydbroot}
+ password: ${DB_PWD:Ly123456@(^)9}
# 初始连接数，建议设置为与最小空闲连接数相同
initial-size: 20
# 最小空闲连接数，保持足够的空闲连接以应对请求
@@ -98,8 +98,8 @@
# 续期时间范围，默认 1小时，这里单位毫秒
renew: 3600000
-#是否允许生成代码，生产环境设置为false
-generator:
+#生产环境设置为false
+oying:
enabled: false
#如果生产环境要开启swagger，需要配置请求地址
@@ -127,6 +127,7 @@
# 文件大小 /M
maxSize: 100
avatarMaxSize: 5
+
# 短信验证码key 时间
sms:
key: oying-sms-key-
@@ -134,12 +135,14 @@
#微信配置
wx:
- # 测试环境
- enabled: false
# AppID
app-id: wx2273296a5569cbad
# AppSecret
app-secret: 4526d72d885be322b17d0694cd6d03f1
+ # riderAppId
+ rider-app-id: wxec131a77cbf47c7f
+ # riderAppSecret
+ rider-app-secret: 7fa3a13f1a894dfaba6fec4df4043135
# 跳转小程序类型 developer为开发版；trial为体验版；formal为正式版；默认为正式版
mini-program-state: trial
# access_token的KEY
@@ -158,31 +161,43 @@
# 汇旺财
swift-pass:
- # 密钥1
- key: qqqqqqqqqqqqqqqqqqqq
+ # 密钥
+ key-3: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
+ # 密钥2
+ key-2: 0UNWjptc1diO2tVa2KASElS4qePosXKl
# 私钥
- mch-private-key: qqqqqqqqqqqq
+ mch-private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2YNuGqSAFcIVOc9mnmIbnVfQoyyMBoyGqTD3beiy/UsXZrGF4OIrPEevwXnwHktURupjHAKvt92PL4L9wTz7cknaQkF0NH5saOdY3sL88xH7F3qSgIwHPvkRileFeEHx+pKnXBms8yiliDqPk0MV3iRRoXKhRnojrWAYJhyz+1iJ13qWXCWcpr9hf77Uu/r1N7wsJKN4Z75M2qQC6LgRTaHoBroLGVtld4PM30ee6o9RR8yiFVx4FDVukinGR15nTsrNh+sUx3piVXqYrq23UPjUWVtJlf9cEvfNVXCMsa71LGEzUl0zxDfeyXRQhel3E27p2oovEYvhl5s+pZhtXAgMBAAECggEBAKXZLKinccwgh8lRBrQmuz7x5ieWms3pWDryPCozTy/pCKyq2rQlzu0BIiqi8W09tG773eTSEodDOkhzqANsvQB+XD2YWlYN0NEnmUtpem67TYGItvI9A2+0WaHBJIGSwnO0MBKu7qQIP1vBbn8s7vWF/b3tzM70ORSzJkJR37QY435+ZG9rKMKyL/tuGW7E5AgrHmyl2aK9me3vgUrZct2e9l5XLrn9oU1niEmbDbFARhphXDCEPIvFiu7WtFDBmp/jEOc4u/y/sYMjS1RWpO9iOyTZDO8Mi9iofXugmoot4Tn0lBckeR6YVRb/I3EcVADoMfk1iaN1aWv1u+Ska8ECgYEA3ZFYMvo5y7SztrEbyLpWGsp6aM4a5ght8p52/rFhSHD5CGS7Uywhp4LxxIjLTRBNa/UkBzOq1Xt1+PVDNHf0E1yYZqEv9OXWC0yiCsnwO6b7o9hc3VnnX4jw7FkS0+pjfgCK4/A9hFj9xUI+qX3L3+pOCseioUeYofqTc2bn7ncCgYEA0rhvvNO30EisLACdOIem8XgbL4LjKJ47FnYS/TEZ9cDhJW5G2pAxgyFsqhN/GuTVg8uSQ7a6PlcBxzTuOwdZg05RcCAdmsXUdGjVbKk2i4CBp0K1j4QYfr8Wt18x0RLfzIQDrZQajWssVGjo8sfMn8qmjbRNbMmokRTflGIkEiECgYEAxChaYn9fzbYEaRixlWtKsdtSthjKfZ8239ZlWSVnEEBcaY7svTzT6r6mFq5Y9rgZIxvbsriOZQQxtKBGyFvubXnLvwizMWiNsGE/ELgphFZYcH0r8hgXHGBbk5NkdNMNFE+cpyJZBCPZP9tfKKUjavC/+RE3LPv66GS0SDXx3g8CgYAYOIT3cmqFcWUA5c0si0MgLEsLqgLMT2vBSC8klTlDqzj14XgZdUuLpBLmdbk9cSIttP+J8v3zXnLg3++mL1EVq7HmrnpYqPajrs0hYU3YuRuuCxfteCSMpRBKYZHLU10QF/iIQibPLIt65FgqV9boYxXD4f6oS4Gps3mDh8hXoQKBgBKojPBWgp4/WBMfh8nUzFzTiW7ACyG2jAxGtu0dtqfwx2LkesUKGhD1JGlxdDQ6jSv9tbhAgbZjTAULSo03626ZaiSDF+nCwFsobd3wRiij8LiL9amW5t6XBeX6bS5SCh45GbgnNBtzBqUI19/CGH09YXNpCYnADsY4fab4wNpR
# 公钥
- plat-public-key: qqqqq
- # 门店编号1
- mch-id: 1111
+ plat-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmDbhqkgBXCFTnPZp5iG51X0KMsjAaMhqkw923osv1LF2axheDiKzxHr8F58B5LVEbqYxwCr7fdjy+C/cE8+3JJ2kJBdDR+bGjnWN7C/PMR+xd6koCMBz75EYpXhXhB8fqSp1wZrPMopYg6j5NDFd4kUaFyoUZ6I61gGCYcs/tYidd6llwlnKa/YX++1Lv69Te8LCSjeGe+TNqkAui4EU2h6Aa6CxlbZXeDzN9HnuqPUUfMohVceBQ1bpIpxkdeZ07KzYfrFMd6YlV6mK6tt1D41FlbSZX/XBL3zVVwjLGu9SxhM1JdM8Q33sl0UIXpdxNu6dqKLxGL4ZebPqWYbVwIDAQAB
+ # 门店编号
+ mch-id-3: 1030238093
+ # 门店编号2
+ mch-id-2: 1030240931
# 签名方式
sign-type: MD5
# 原生JS
is-raw: 1
# 是否小程序支付
is-minipg: 1
- # AppID
- app-id: wx2273296a5569cbad
# 请求url
req-url: https://pay.hstypay.com/v2/pay/gateway
# 支付通知地址
- notify-url: https://localhost/oying/api/swiftPass/alipayCallback
+ notify-url: https://o-ying.cn/oying/api/swiftPass/alipayCallback
# 退款通知地址
- refund-url: https://localhost/oying/api/swiftPass/returnNotify
+ refund-url: https://o-ying.cn/oying/api/swiftPass/returnNotify
obs:
- access_key_id: RZ1UIOZDZ58DD4NWPD6Q
- access_key_secret: QpE58YEFtgoIwUoGNlN5JlNY7t6qVu7vMkix8gAI
- bucket: oying
+ access_key_id: HPUATJYFVPO6DABSVEKA
+ access_key_secret: 8TQG5wnLID3MsUPsJjmZ31LtKlgyvFFUDvXnI9nm
+ bucket: o-ying
endpoint: https://obs.cn-southwest-2.myhuaweicloud.com
+
+winner-look:
+ url-send-msg: https://118.178.116.15:8443/winnerrxd/api/trigger/SendMsg
+ 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