From 2bd6bd4cc8639794b91d0de0a6159c97ff365f86 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 28 Nov 2023 17:56:27 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/resources/application-prod.yml | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 01330c8..d5cbbf0 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -15,24 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
- # 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_mall_qianayi
- password: db_mall_qianayi123!@#123
+ username: blnka
+ password: blnka!@#123
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://121.37.162.173:3306/db_mall_qianayi?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/db_blnka?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
- database: 8
+ database: 1
# Redis服务器地址
host: 127.0.0.1
# Redis服务器连接端口
- port: 6379
+ port: 6279
# Redis 密码
- password: d32ncxe@i3#!dV
+ password: blnka!@#123
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -48,8 +44,8 @@
rabbitmq:
host: 127.0.0.1
port: 5672
- username: hibit
- password: hibit123
+ username: blnka
+ password: blnka123
publisher-confirm-type: correlated
pay:
@@ -65,14 +61,14 @@
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
- xcx_appid: wx16d0b75302b360d4
- xcx_secret: a2887cd622ed981d2e04d724d29d7454
+ xcx_appid: wxad2fdb2fcad10fb2
+ xcx_secret: 9bb58d655bff419feec3a6d948ca8b8d
debug: false
- wecharPaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/wxpayCallback
- wecharRechargePaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/rechargeCallBack
- certLocalPath: /home/qianayiCert/apiclient_cert.p12
- wecharpayMchid: 1638095860
- wecharpaySecret: QIANAYIZONGZI1234567899876543212
+ wecharPaynotifyUrl: http://api.blnka.cn/api/xcxPay/wxpayCallback
+ wecharRechargePaynotifyUrl: http://api.blnka.cn/api/xcxPay/rechargeCallBack
+ certLocalPath: /home/blnkaCert/apiclient_cert.p12
+ wecharpayMchid: 1658958205
+ wecharpaySecret: daL341aN5orDt13puXadsAf2rpuXdq4r
gaodeKey: 95ede7157929f5f6b6c758971be924b1
serviceName: yiyuanshucai
--
Gitblit v1.9.1