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-dev.yml | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fa413bc..4ee41b7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,6 +2,8 @@
spring:
redis:
##redis 单机环境配置
+ ##将docker脚本部署的redis服务映射为宿主机ip
+ ##生产环境推荐使用阿里云高可用redis服务并设置密码
host: 127.0.0.1
port: 6379
password:
@@ -12,26 +14,9 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- # MySql
- url: jdbc:mysql://220.176.210.217:3307/jczz_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ 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
username: root
- password: 1qaz@WSX3edc
- # PostgreSQL
- #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
- #username: postgres
- #password: 123456
- # Oracle
- #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
- #username: BLADEX_BOOT
- #password: BLADEX_BOOT
- # SqlServer
- #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex_boot
- #username: bladex_boot
- #password: bladex_boot
- # DaMeng
- #url: jdbc:dm://127.0.0.1:5236/BLADEX_BOOT?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
- #username: BLADEX_BOOT
- #password: BLADEX_BOOT
+ password: root
#第三方登陆
social:
@@ -44,8 +29,10 @@
lock:
##是否启用分布式锁
enabled: false
- ##redis服务地址
+ ##将docker脚本部署的redis服务映射为宿主机ip
+ ##生产环境推荐使用阿里云高可用redis服务并设置密码
address: redis://127.0.0.1:6379
+ password: 123456
#本地文件上传
file:
remote-mode: true
@@ -69,13 +56,14 @@
# binlog listener
binlog:
- datasource: # 订阅binlog数据库连接信息，ip，端口，用户密码（用户必须要有权限）
+ # 源数据库
+ datasource:
host: 127.0.0.1
- port: 3306
+ port: 3308
username: root
- password: 1qaz@WSX3edc
- db: jczz # 监听数据库
- table: jczz_house,jczz_household,jczz_place
+ password: root
+ db: jczz_test
+ table: jczz_house,jczz_household,jczz_place,jczz_place_ext,blade_attach_data
enabled: false
# 目标数据库
from:
@@ -87,6 +75,6 @@
#es
elasticsearch:
enabled: false
- host: localhost
- sync: true
- indexName: jczz
+ host: 127.0.0.1
+ sync: false
+ indexName: test
--
Gitblit v1.9.3