From 19428a49b4c07b14097615d48a7a72dbf941c4e7 Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 15:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/smart_message

---
 src/main/resources/application.yml |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f9d880..ba93892 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -65,6 +65,15 @@
   keysecret: BrY0BM4pvDXhVKOMLsXzgzlhVe1keQ
   bucketname: hmy-flower
 
+#https://www.volcengine.com/docs/6349/107356
+tos-oss:
+  endpoint: tos-cn-beijing.volces.com
+  region: cn-beijing
+  keyid: AKLTNTFmOTFkMDg3ZDRmNGZkMmFkOTBmMTcyZmM4N2MyMmY
+  keysecret: TW1FelpUY3lOalkxWWpjMk5HWTNOV0ZtWVdWa1lURTNNRE13WVdJMVkySQ==
+  bucketname: smart-manager-new
+#  bucketname: zhixinguanjia
+
 wx:
   miniapp:
     appid: wx1441324401626290    #小程序appId 花店端
@@ -85,6 +94,7 @@
   supplier:
     appid: wx3203fd935a6ffe09    #小程序appId
     secret: 9121c703fb0c416b21a8c289dd73ae9b     #secret
+
 
 sms:
   verificationCode: SMS_301300012   #验证码通用模版
@@ -111,4 +121,12 @@
   publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoXlmlW2TI0DmYm/eZqGxHSPEdzULsrCTFPW2B4VrMk5gj8afPS/nq/cXEOIjsCrTP0dJsdbDqk+YlVRGEHCxgkl6nZGgRtZmzHJxwWw+YEMejI/fP0Sr8nKSEa/+otcX6LO7ktl4vVcvAU0Q9RVEGLpz62djkkwrJMMds6wSRsJI1GDwT+5Ra4s06+lVN4ISU0IUx6E2m2NaZBimMiB+buy7ZPXg6eDE5B2oXOQ5qdL2E18Q7hm7XI+DYAQslLXGr2pjLGLRZ01/b4XyIPzZmusNF+vNp4qKji38a23MjO33ONWqBj/JlWkPW5Vl1AiL5vg6HuqEEfHdBq9mVuZBEwIDAQAB
   gatewayUrl: https://openapi.alipay.com/gateway.do
   sandboxGatewayUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
-  notifyUrl: http://azcbit.natappfree.cc/jshERP-boot/alipay/notify
\ No newline at end of file
+  notifyUrl: http://ta5p5m.natappfree.cc/flower/v2/alipay/notify
+
+wechat-app:
+  merchantId: 1711247186
+  merchantKey: 6m8HhGNmk2S4sNPkwNJpawrCGUrnWNyV
+  appid: wx7f9c8a2e924a4815    #小程序appId
+  secret: 208d5eb98918856a6ac95ee01deba3ad    #secret
+  notifyUrl: http://ta5p5m.natappfree.cc/flower/v2/alipay/notify
+  tradeType: APP
\ No newline at end of file

--
Gitblit v1.9.3