From a7501803a3ca43310e57a5dd912e5047919c2e43 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:26:55 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 oying-system/src/main/resources/config/application-dev.yml |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/oying-system/src/main/resources/config/application-dev.yml b/oying-system/src/main/resources/config/application-dev.yml
index ce0a962..cd03254 100644
--- a/oying-system/src/main/resources/config/application-dev.yml
+++ b/oying-system/src/main/resources/config/application-dev.yml
@@ -89,6 +89,8 @@
   online-key: "online_token:"
   # 验证码
   code-key: "captcha_code:"
+  # 自定义redis key
+  generate-order-sn: oying:generate:sn
   # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
   detect: 1800000
   # 续期时间范围，默认1小时，单位毫秒
@@ -111,15 +113,15 @@
     path: /opt/oying/file/
     avatar: /opt/oying/avatar/
   windows:
-    path: C:\oying\file\
-    avatar: C:\oying\avatar\
+    path: d:\data\oying\file\
+    avatar: d:\data\oying\avatar\
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
 
   # 短信验证码key 时间
 sms:
-  key: lyhd-sms-key-
+  key: oying-sms-key-
   time: 300
 
 #微信配置
@@ -130,6 +132,10 @@
   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
@@ -148,25 +154,39 @@
 
 # 汇旺财
 swift-pass:
-  # 密钥1
-  key-1: qqqqqqqqqqqqqqqqqqqq
+  # 密钥
+  key: vJB6683s4NtQtXBgHTvE1hWOUtcre7nj
+  # 密钥2
+  key-2: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
   # 私钥
-  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-1: 1111
+  plat-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmDbhqkgBXCFTnPZp5iG51X0KMsjAaMhqkw923osv1LF2axheDiKzxHr8F58B5LVEbqYxwCr7fdjy+C/cE8+3JJ2kJBdDR+bGjnWN7C/PMR+xd6koCMBz75EYpXhXhB8fqSp1wZrPMopYg6j5NDFd4kUaFyoUZ6I61gGCYcs/tYidd6llwlnKa/YX++1Lv69Te8LCSjeGe+TNqkAui4EU2h6Aa6CxlbZXeDzN9HnuqPUUfMohVceBQ1bpIpxkdeZ07KzYfrFMd6YlV6mK6tt1D41FlbSZX/XBL3zVVwjLGu9SxhM1JdM8Q33sl0UIXpdxNu6dqKLxGL4ZebPqWYbVwIDAQAB
+  # 门店编号
+  mch-id: 1030238092
+  # 门店编号2
+  mch-id-2: 1030238093
   # 签名方式
   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/lyhd/api/swiftPass/alipayCallback
+  notify-url: http://1.95.124.88:8088/api/swiftPass/alipayCallback
   # 退款通知地址
-  refund-url: https://localhost/lyhd/api/swiftPass/returnNotify
+  refund-url: http://1.95.124.88:8088/api/swiftPass/returnNotify
+
+obs:
+  access_key_id: RZ1UIOZDZ58DD4NWPD6Q
+  access_key_secret: QpE58YEFtgoIwUoGNlN5JlNY7t6qVu7vMkix8gAI
+  bucket: oying
+  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!

--
Gitblit v1.9.3