diff --git a/backend/app/dto/database.go b/backend/app/dto/database.go index 4b57f31c9..85b2965e2 100644 --- a/backend/app/dto/database.go +++ b/backend/app/dto/database.go @@ -303,7 +303,7 @@ type DatabaseUpdate struct { Address string `json:"address"` Port uint `json:"port"` Username string `json:"username" validate:"required"` - Password string `json:"password" validate:"required"` + Password string `json:"password"` SSL bool `json:"ssl"` RootCert string `json:"rootCert"` diff --git a/backend/app/service/setting.go b/backend/app/service/setting.go index 4f88f54fc..914b18459 100644 --- a/backend/app/service/setting.go +++ b/backend/app/service/setting.go @@ -347,12 +347,18 @@ func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) { if err != nil { return nil, err } - data, err := loadInfoFromCert() - if err != nil { - return nil, err - } + var data *dto.SSLInfo switch sslType.Value { + case "self": + data, err = loadInfoFromCert() + if err != nil { + return nil, err + } case "import": + data, err = loadInfoFromCert() + if err != nil { + return nil, err + } if _, err := os.Stat(path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt")); err != nil { return nil, fmt.Errorf("load server.crt file failed, err: %v", err) } @@ -370,6 +376,12 @@ func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) { return nil, err } id, _ := strconv.Atoi(sslID.Value) + ssl, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(uint(id))) + if err != nil { + return nil, err + } + data.Timeout = ssl.ExpireDate.Format("2006-01-02 15:04:05") + data.Domain = ssl.Domains data.SSLID = uint(id) } return data, nil diff --git a/backend/app/service/website.go b/backend/app/service/website.go index cc458273f..1744f3320 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -332,7 +332,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error) } if len(create.FtpUser) != 0 && len(create.FtpPassword) != 0 { - itemID, err := NewIFtpService().Create(dto.FtpCreate{User: create.FtpUser, Password: create.FtpPassword, Path: path.Join(global.CONF.System.BaseDir, "1panel/apps/openresty/openresty/www/sites", create.Alias, "index")}) + itemID, err := NewIFtpService().Create(dto.FtpCreate{User: create.FtpUser, Password: create.FtpPassword, Path: path.Join(global.CONF.System.BaseDir, "1panel/apps/openresty/openresty/www/sites", website.Alias, "index")}) if err != nil { global.LOG.Errorf("create ftp for website failed, err: %v", err) } diff --git a/backend/utils/redis/redis.go b/backend/utils/redis/redis.go index f4b28771e..c30053f6a 100644 --- a/backend/utils/redis/redis.go +++ b/backend/utils/redis/redis.go @@ -3,6 +3,7 @@ package redis import ( "fmt" + "github.com/1Panel-dev/1Panel/backend/global" "github.com/go-redis/redis" ) @@ -20,6 +21,7 @@ func NewRedisClient(conn DBInfo) (*redis.Client, error) { }) if _, err := client.Ping().Result(); err != nil { + global.LOG.Errorf("check redis conn failed, err: %v", err) return client, err } return client, nil diff --git a/backend/utils/toolbox/pure-ftpd.go b/backend/utils/toolbox/pure-ftpd.go index e4a1038dd..a0848dc58 100644 --- a/backend/utils/toolbox/pure-ftpd.go +++ b/backend/utils/toolbox/pure-ftpd.go @@ -122,7 +122,7 @@ func (f *Ftp) SetPath(username, path string) error { if err != nil { return errors.New(std) } - std2, err := cmd.Execf("chown %s %s", f.DefaultUser, path) + std2, err := cmd.Execf("chown -R %s:%s %s", f.DefaultUser, f.DefaultGroup, path) if err != nil { return errors.New(std2) } diff --git a/frontend/src/routers/modules/host.ts b/frontend/src/routers/modules/host.ts index 923ff513a..cce29f457 100644 --- a/frontend/src/routers/modules/host.ts +++ b/frontend/src/routers/modules/host.ts @@ -31,7 +31,7 @@ const hostRouter = { }, { path: '/hosts/monitor/setting', - name: 'MonitorSetting', + name: 'HostMonitorSetting', component: () => import('@/views/host/monitor/setting/index.vue'), hidden: true, meta: {