From eaa20cb58afc80e3612fd6e93d6f27e181a027e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:38:29 +0800
Subject: [PATCH] 提交用户端开发版本

---
 user/guns-admin/src/main/resources/application.yml |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index bca63fa..3cdee0e 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
   application:
     name: user-server
   profiles:
-    active: dev
-#    active: produce
+#    active: dev
+    active: produce
   mvc:
     static-path-pattern: /static/**
     view:
@@ -50,20 +50,13 @@
 
 ---
 
-#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
 
@@ -94,6 +87,7 @@
   webAppSecret: 11
   mchId: 1636941942 #微信支付分配的商户号
   key: Eri2GR2SB3b6iIhaoD7k3KQ8X0wf1Ybh #key为商户平台设置的密钥key:
+  apiv3: AKJ51Z4nhSqYBxmOXgUyCKA1vLP0J5Aj #key为商户平台设置的密钥key:
 
 ---
 
@@ -120,20 +114,21 @@
 
 ---
 
-filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
 #filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
 
 
 
 #支付回调地址
 #正式环境
-callbackPath: https://okyueche.com:443/user
+#callbackPath: http://121.37.15.157:80/user
 #正式测试环境
-#callbackPath: http://39.108.148.228:80/user
+callbackPath: http://121.37.15.157:80/user
 
 ---
 
 spring:
   data:
     mongodb:
-      uri: mongodb://127.0.0.1:27017/admin
\ No newline at end of file
+      uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+#      uri: mongodb://127.0.0.1:27017/admin
\ No newline at end of file

--
Gitblit v1.7.1