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-prod.yml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 6e1a607..c7de87e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -15,10 +15,14 @@
datasource:
# 数据源-1，名称为 base
base:
- username: db_mall
- password: mall!@#123
+ # username: db_mall
+ # password: mall!@#123
+ # driver-class-name: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://127.0.0.1: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://127.0.0.1:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
@@ -28,7 +32,7 @@
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: zhongji-mall=-0
+ password: d32ncxe@i3#!dV
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -44,8 +48,8 @@
rabbitmq:
host: 127.0.0.1
port: 5672
- username: zj_mall
- password: zj_mall123
+ username: hibit
+ password: hibit123
publisher-confirm-type: correlated
pay:
@@ -65,6 +69,12 @@
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