From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/resources/application-dev.yml | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ade8eee..6da9eb5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,10 +15,14 @@
datasource:
# 数据源-1，名称为 base
base:
- username: ct_test
- password: 123456
+# username: ct_test
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ username: db_yyg
+ password: yyg123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
# username: db_mall
# password: mall!@#123
# driver-class-name: com.mysql.cj.jdbc.Driver
@@ -65,7 +69,16 @@
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
- xcx_appid: wx5cc58f796224af61
- xcx_secret: cab68768a444f9e25bb3d1bc208fb546
- debug: true
- wecharPaynotifyUrl: http://120.27.238.55:8801/api/xcxPay/wxpayCallback
+ xcx_appid: wx0b515f652282158e
+ xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570
+ debug: false
+ wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
+ wecharRechargePaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/rechargeCallBack
+ certLocalPath: /home/yyscCert/apiclient_cert.p12
+ wecharpayMchid: 1631084809
+ wecharpaySecret: YYSC13875978057YYSC13875978057SH
+ gaodeKey: 95ede7157929f5f6b6c758971be924b1
+ serviceName: yiyuanshucai
+
+system:
+ job: false
\ No newline at end of file
--
Gitblit v1.9.1