From 407729ff6fc2181a417121e02f61aee7ce78fdda Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 16:34:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/resources/application-dev.yml | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 079091e..3c5c0db 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,24 +15,25 @@
datasource:
# 数据源-1，名称为 base
base:
-# username: db_sdm
-# password: sdm123!@#
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://47.111.90.145:3306/db_sdm?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-
- username: ct_test
- password: 123456
+ username: db_bnbweb
+ password: bnbweb123!@#
+ # 154.91.195.148
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/db_sdm?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://154.91.195.148:3306/db_bnbweb?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+# username: ct_test
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://120.27.238.55:3306/db_bnbweb?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
- database: 10
+ # Redis数据库索引（默认为 0）
+ database: 11
# Redis服务器地址
- host: 120.27.238.55
+ host: 154.91.195.148
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: xcong123
+ password: dapp!@#123
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -46,19 +47,15 @@
# 连接超时时间（毫秒）
timeout: 5000
rabbitmq:
- host: 120.27.238.55
+ host: 154.91.195.148
port: 5672
- username: ct_rabbit
- password: 123456
-# host: 47.111.90.145
-# port: 5672
-# username: zj_mall
-# password: zj_mall123
-
+ username: xc_rabbit
+ password: xuncong123
publisher-confirm-type: correlated
system:
online-transfer: false
chain-listener: false
reset-job: false
+ quartz-job: false
debug: true
\ No newline at end of file
--
Gitblit v1.9.1