From 0a94e5f7a9b1ae802ddaff65c1891d5f8eb20be4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 30 Sep 2021 17:01:03 +0800
Subject: [PATCH] ftp 连接配置修改
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 2 +-
src/main/resources/application-prod.yml | 41 ++++++++++++++++++++++++++++++++++-------
src/main/resources/application-test.yml | 9 +++++----
3 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index 223818f..680c8f8 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -35,7 +35,7 @@
import org.springblade.core.boot.ctrl.BladeController;
/**
- * 控制器
+ * 保安公司主要管理员
*
* @author BladeX
* @since 2021-07-06
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fab7885..e1c8e8d 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -2,21 +2,49 @@
spring:
redis:
##redis 单机环境配置
- ##将docker脚本部署的redis服务映射为宿主机ip
- ##生产环境推荐使用阿里云高可用redis服务并设置密码
host: 127.0.0.1
port: 6379
password:
+
database: 0
ssl: false
##redis 集群环境配置
#cluster:
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
+
+
datasource:
- url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ # MySql
+ url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: root
+ password: zhba0728
+
+#ftp 设置
+ftp:
+ sqlConnect: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ ftpHost: 192.168.0.199
+ ftpPort: 21
+ # ftpUserName: anonymous
+ ftpUserName: arsn
+ ftpPassword: 123456
+ ftpPath: anbao/
+ localPath: D:\anbao\
+ minioPath: D:\ftptp\
+ jsonUrl: D:\anbao\
+
+ # 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://47.49.21.216:1433;DatabaseName=zhba
+ #username: root
+ #password: jfpt123
#第三方登陆
social:
@@ -29,12 +57,11 @@
lock:
##是否启用分布式锁
enabled: false
- ##将docker脚本部署的redis服务映射为宿主机ip
- ##生产环境推荐使用阿里云高可用redis服务并设置密码
+ ##redis服务地址
address: redis://127.0.0.1:6379
- password: 123456
#本地文件上传
file:
remote-mode: true
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index bd60e6b..9712df6 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -22,11 +22,12 @@
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 192.168.0.110
+ sqlConnect: jdbc:mysql://223.82.109.183:2083/zhba-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ ftpHost: 192.168.0.199
ftpPort: 21
- ftpUserName: anonymous
- ftpPassword:
+# ftpUserName: anonymous
+ ftpUserName: arsn
+ ftpPassword: 123456
ftpPath: anbao/
localPath: D:\anbao\
minioPath: D:\ftptp\
--
Gitblit v1.9.3