From 7d2b061cd98f4c84b7ea653b766012bb4684e0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 1 Oct 2020 16:51:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0TLS=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{origin_ftp_config.go => ftp_server_config.go} | 2 +- pkg/serverconfigs/ftp_server_ref.go | 6 ++++++ pkg/serverconfigs/origin_config.go | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) rename pkg/serverconfigs/{origin_ftp_config.go => ftp_server_config.go} (88%) create mode 100644 pkg/serverconfigs/ftp_server_ref.go diff --git a/pkg/serverconfigs/origin_ftp_config.go b/pkg/serverconfigs/ftp_server_config.go similarity index 88% rename from pkg/serverconfigs/origin_ftp_config.go rename to pkg/serverconfigs/ftp_server_config.go index b513ab1..e3dde5b 100644 --- a/pkg/serverconfigs/origin_ftp_config.go +++ b/pkg/serverconfigs/ftp_server_config.go @@ -1,7 +1,7 @@ package serverconfigs // FTP源站配置 -type OriginFTPConfig struct { +type FTPServerConfig struct { Username string `yaml:"username" json:"username"` // 用户名 Password string `yaml:"password" json:"password"` // 密码 Dir string `yaml:"dir" json:"dir"` // 目录 diff --git a/pkg/serverconfigs/ftp_server_ref.go b/pkg/serverconfigs/ftp_server_ref.go new file mode 100644 index 0000000..64ada46 --- /dev/null +++ b/pkg/serverconfigs/ftp_server_ref.go @@ -0,0 +1,6 @@ +package serverconfigs + +type FTPServerRef struct { + IsOn bool `yaml:"isOn" json:"isOn"` + FTPServerId int64 `yaml:"ftpServerId" json:"ftpServerId"` +} diff --git a/pkg/serverconfigs/origin_config.go b/pkg/serverconfigs/origin_config.go index 544fc1e..d0559fd 100644 --- a/pkg/serverconfigs/origin_config.go +++ b/pkg/serverconfigs/origin_config.go @@ -41,10 +41,12 @@ type OriginConfig struct { // - http|https 返回2xx-3xx认为成功 HealthCheck *HealthCheckConfig `yaml:"healthCheck" json:"healthCheck"` - Cert *sslconfigs.SSLCertConfig `yaml:"cert" json:"cert"` // 请求源服务器用的证书 + CertRef *sslconfigs.SSLCertRef `yaml:"certRef" json:"certRef"` // 证书的引用 + Cert *sslconfigs.SSLCertConfig `yaml:"cert" json:"cert"` // 请求源服务器用的证书 // ftp - FTP *OriginFTPConfig `yaml:"ftp" json:"ftp"` + FTPServerRef *FTPServerRef `yaml:"ftpServerRef" json:"ftpServerRef"` + FTPServer *FTPServerConfig `yaml:"ftpServer" json:"ftpServer"` connTimeoutDuration time.Duration readTimeoutDuration time.Duration