From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/resources/application.yml | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index e5042e1..db49129 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
application:
name: driver-server
profiles:
- active: dev
-# active: produce
+# active: dev
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -51,19 +51,12 @@
base-package: com.supersavedriving.driver.modular
-#spring:
-# datasource:
-# url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: Root2020!
-# db-name: guns #用来搜集数据库的所有表
-# filters: wall,mergeStat
-
spring:
datasource:
url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: 123456
+ password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+# password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -84,8 +77,8 @@
wx:
grantType: authorization_code #填authorization_code
- appid: wx36c966d381cd5d62 #应用唯一标识，在微信开放平台提交应用审核通过后获得
- appSecret: cf4b21c7175356f41fa3c426f26c20e4 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appid: wx8a9af3889395d0e1 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 95a34f114973298cce4297a20bb59bc3 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
appletsAppid: 1 #小程序APPid
appletsAppSecret: 1 #
mchId: 1636941942 #微信支付分配的商户号
@@ -108,14 +101,14 @@
---
-filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
#支付回调地址
#正式环境
-callbackPath: https://okyueche.com:443/user
+#callbackPath: https://okyueche.com:443/user
#测试环境
-#callbackPath: http://47.108.254.217:80/user
+callbackPath: http://121.37.15.157:80/driver
---
@@ -123,4 +116,11 @@
spring:
data:
mongodb:
- uri: mongodb://127.0.0.1:27017/admin
+ uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+# uri: mongodb://127.0.0.1:27017/admin
+
+---
+
+rongyun:
+ app_key: k51hidwqkx92b
+ app_secret: t0jxbPrHHar
\ No newline at end of file
--
Gitblit v1.7.1