From 798ab07db6464f24e353dcdf8397506ab246c91d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 09:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e7d5b87..83f91a8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@
spring:
redis:
##redis 单机环境配置
- host: 127.0.0.1
- port: 6379
+ host: 192.168.90.24
+ port: 6381
password:
database: 0
ssl: false
@@ -16,25 +16,17 @@
# url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
# username: root
# password: ZHba@0112
+# rabbitmq:
+# host: 192.168.0.191
+# port: 5672
+# username: admin
+# password: admin
datasource:
# MySql
- url: jdbc:mysql://localhost:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.90.24:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: 123456
-
- # 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://223.82.109.183:1433;DatabaseName=zhbaw
- #username: sa
- #password: zhbaw@2021
+ password: NCzhba@2022
#图片批量上传zip
@@ -45,19 +37,22 @@
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://192.168.90.24:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 117.40.91.118
ftpPort: 21
ftpUserName: zhbain
ftpPassword: zhbain@123
+ ftpUserNameIn: baftpout
+ ftpPasswordIn: baftpout
ftpPath: yly/anbao/
+ ftpPathIn: /
localPath: /home/zhongsong/anbao/
ip: http://47.49.36.190:9000
jsonUrl: /home/zhongsong/anbao/
username: root
- password: ZHba@0112
-# qfqkBaseApiUrl: http://223.82.109.183:2082/api
- qfqkBaseApiUrl: http://localhost:83
+ password: NCzhba@2022
+# qfqkBaseApiUrl: http://61.131.136.25:2082/api
+ qfqkBaseApiUrl: http://192.168.90.24:83
#第三方登陆
social:
@@ -71,7 +66,7 @@
##是否启用分布式锁
enabled: false
##redis服务地址
- address: redis://127.0.0.1:6379
+ address: redis://192.168.90.24:6381
#本地文件上传
file:
remote-mode: true
--
Gitblit v1.9.3