From 97b423c06dccceee56b820912171257bef4d2b0a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 11 May 2024 17:34:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-test.yml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 39a5c96..35a7d54 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -14,9 +14,9 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- url: jdbc:mysql://127.0.0.1:3308/jczz_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://172.16.50.240:3306/jczz_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: root
+ password: 1qaz@WSX3edc
#第三方登陆
social:
@@ -58,10 +58,10 @@
binlog:
# 源数据库
datasource:
- host: 127.0.0.1
- port: 3308
+ host: 172.16.50.240
+ port: 3306
username: root
- password: root
+ password: 1qaz@WSX3edc
db: jczz_test
table: jczz_house,jczz_household,jczz_place,jczz_place_ext,blade_attach_data
enabled: false
@@ -71,10 +71,9 @@
url: jdbc:mysql://106.225.193.35:3306/srjw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: HCyj@2022
-
#es
elasticsearch:
enabled: false
host: 127.0.0.1
- sync: true
+ sync: false
indexName: test
--
Gitblit v1.9.3