From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/resources/application.yml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index d9d3a87..bca63fa 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -37,6 +37,7 @@
configuration:
configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
+ mapper-locations: classpath*:com/supersavedriving/user/modular/system/dao/**/*.xml
@@ -83,12 +84,16 @@
wx:
grantType: authorization_code #填authorization_code
- appid: wx36c966d381cd5d62 #应用唯一标识，在微信开放平台提交应用审核通过后获得
- appSecret: cf4b21c7175356f41fa3c426f26c20e4 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
- appletsAppid: #小程序APPid
- appletsAppSecret: #
- mchId: 1593080081 #微信支付分配的商户号
- key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key：
+ appid: 11 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 11 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: wx8ae6c610563f2fe6 #小程序APPid
+ appletsAppSecret: 8b2c93b0be4f017350050f1e660680fe #
+ officialAccountAppid: 11111
+ officialAccountAppSecret: 1111
+ webAppId: 111
+ webAppSecret: 11
+ mchId: 1636941942 #微信支付分配的商户号
+ key: Eri2GR2SB3b6iIhaoD7k3KQ8X0wf1Ybh #key为商户平台设置的密钥key：
---
@@ -122,10 +127,13 @@
#支付回调地址
#正式环境
-callbackPath: https://okyueche.com:443/driver
+callbackPath: https://okyueche.com:443/user
#正式测试环境
-#callbackPath: http://39.108.148.228:80/driver
+#callbackPath: http://39.108.148.228:80/user
---
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
\ No newline at end of file
+
+spring:
+ data:
+ mongodb:
+ uri: mongodb://127.0.0.1:27017/admin
\ No newline at end of file
--
Gitblit v1.7.1