From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng
---
src/main/resources/application-dev.yml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2d0cf1a..8a4fe76 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,24 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
- username: db_mall_hongloumeng
- password: hongloumeng123!@#123
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://47.111.90.145:3306/db_mall_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true
-# username: db_mall
-# password: mall!@#123
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://47.111.90.145:3306/db_mall?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3406/db_hongloumeng?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
- database: 8
+ database: 3
# Redis服务器地址
- host: 121.37.162.173
+ host: 120.27.238.55
# Redis服务器连接端口
- port: 6379
+ port: 6479
# Redis 密码
- password: d32ncxe@i3#!dV
+ password: d3y6dsdl;f.327
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -46,10 +42,10 @@
# 连接超时时间（毫秒）
timeout: 5000
rabbitmq:
- host: 47.111.90.145
+ host: 120.27.238.55
port: 5672
- username: zj_mall
- password: zj_mall123
+ username: ct_rabbit
+ password: 123456
publisher-confirm-type: correlated
pay:
@@ -62,3 +58,9 @@
# 回调地址
noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
domain: https://openapi.alipaydev.com/gateway.do
+ wx:
+ appId: wx051693799db39540
+ mchId: 1641389321
+ mchKey: wqri51aCfiG31o4IcdX3dW12qnX3u4hp
+ keyPath: classpath:cert/apiclient_cert.p12
+ noticeUrl: http://120.27.238.55:8185/api/pay/wxPayCallBack
\ No newline at end of file
--
Gitblit v1.9.1