From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/application.yml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 693f33e..3094aba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -77,14 +77,25 @@
wechat:
merchantId: 1661512517
customer:
- appid: wx1441324401626290 #小程序appId
- secret: bab595ac75f60eb33567511111a569a7 #secret
+ appid: wx1441324401626290 #小程序appId
+ secret: bab595ac75f60eb33567511111a569a7 #secret
partner:
- appid: wx6d0ecc4e18710458 #小程序appId
- secret: 22afb006e9b94ee97c47bbfded9151eb #secret
+ appid: wx6d0ecc4e18710458 #小程序appId
+ secret: 22afb006e9b94ee97c47bbfded9151eb #secret
supplier:
- appid: wx3203fd935a6ffe09 #小程序appId
- secret: 9121c703fb0c416b21a8c289dd73ae9b #secret
+ appid: wx3203fd935a6ffe09 #小程序appId
+ secret: 9121c703fb0c416b21a8c289dd73ae9b #secret
sms:
- verificationCode: SMS_301300012 #验证码通用模版
\ No newline at end of file
+ verificationCode: SMS_301300012 #验证码通用模版
+
+map:
+ tengxun:
+# apiKey: GSBBZ-CJA3U-NNDVH-GE65N-6FIF6-ZGBCU
+ apiKey: PRFBZ-INBLB-PYEU6-JCKUM-AYD7V-V7BIF
+ # 新政区划接口url
+ administrative_divisions_url : https://apis.map.qq.com/ws/district/v1/list?key=${map.tengxun.apiKey}&&struct_type=1
+ gaode:
+ apiKey: 19b8a6e7325089d484fcee00076746fa
+ # 新政区划接口url
+ administrative_divisions_url: https://restapi.amap.com/v3/config/district?key=${map.gaode.apiKey}&subdistrict=3&subdistrict=3&extensions=base
\ No newline at end of file
--
Gitblit v1.9.3