From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/resources/application.yml | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index 6d2c181..cf84684 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -15,7 +15,8 @@
spring:
profiles:
- active: local
+# active: dev
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -45,22 +46,14 @@
map:
key: e0370a9a4d10739045fb0b8f4742a67e #高德key
-#eureka:
-# client:
-# service-url: #注册中心地址
-# defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
-# register-with-eureka: true #在注册中心进行注册
-# fetch-registry: true #从Eureka中获取注册信息。
-
-
---
spring:
datasource:
- url: jdbc:mysql://192.168.110.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
username: root
-# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
- password: 123456
+ password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+# password: 123456
db-name: super_save_driving #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -77,12 +70,34 @@
- dataSourceGuns
- dataSourceBiz
----
+---
filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
+---
+#支付回调地址
+#正式环境
+callbackPath: https://chaoshengdaijia.com:8443
+#测试环境
+#callbackPath: http://121.37.15.157:8010
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
\ No newline at end of file
+
+---
+
+# mallbook 调起接口参数配置
+mallbook:
+ # pay_url:mallbook接口地址 测试环境： https://uat.mallbook.cn/api 生产环境：https://cloudpay.mallbook.cn/api
+ pay_url: https://cloudpay.mallbook.cn/api
+ # merchant_no 业务系统商户平台编号，需替换为mallbook工作人员提供的商户编号
+ merchant_no: MBH23056
+ # version 接口版本号
+ version: 1.0.0
+ # channel_type 渠道类型 HF：汇付
+ channel_type: HF
+ # merchant_private_key 商户平台私钥，需要替换成商户平台自己生成的私钥
+ merchant_private_key: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALHmyTrxPYcAwABnX+3VW9vxUftm57zBpnbfOT4vizMnKdpfCkIgtdbfdnSCtt637yWM2fxnZfItnhTeQA2lL8f4SXgZt/bVXfmAWi4IxQ+HJy0Qs8nNy2nnjICPBPcpWzHwUxQ/THHqU0a7b9B91J5DFcbQb25BHeRpHwkBw6A/AgMBAAECgYAmcWq2s/7Jt53F+JDAQkTRaHqAyyH0phwkv+QMzhVUfngK2lLLK2pf/nYIg16lDjY9dQx+AJIFHVp1w/kveayzOz3BIqPoznyIVYPolRGZCWPo+2vdp0CIdBh7zahST5g5Gem4cU47wO5hPYs1kXKPG4mUPtaIAMHFxhyLvIagAQJBAOS63AIZrRrldeNCVVNXbpAT52JuWLCgravM9coOh6scmG6UQwxxcott8hneHr9fazk2LHbHMxlG8F+dQPA0+D8CQQDHHJN7Dnske8oJ+1sq4uhQP3HMsmNIgth+ZcaZpiPcxnNKYVGhzAwTVV2ruFJle5ajebo6zfWuqJhtZGRNh1gBAkA/lRoXk1+lfGfa9tOVSVa4wm+t0xLgdqoQefdRZdyc2mQdSSWiTd8Tl0qXmkFd3X6G9uJBWnp/6lJjoektXOwtAkBsZTQsw99qJzIAaSRinpDWTxPG2j6OlR0DAqkxsG7JnAfbsEteh9TzGYAbIgdJVBTX/kbSCJn9ca85rnOkeVABAkAUbDfU3Z702z20NtwAxc1IkrtQ1lKuqSpj9/LuR1/6KRkYQsUWnUiOO9hu5YDWIcflFrnCenF8j8OnvGghltxT
+ # mall_book_public_key mallbook测试环境公钥 不需要替换
+ mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
+
--
Gitblit v1.7.1