fix: 增加工具箱获取超时时间 (#3328)

Refs **https://github.com/1Panel-dev/1Panel/issues/3307**

README.md

@@ -44,10 +44,7 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
 - [在线文档](https://1panel.cn/docs/)
 - [教学视频](https://space.bilibili.com/510493147/channel/collectiondetail?sid=1199760)
 - [社区论坛](https://bbs.fit2cloud.com/c/1p/7)
-
-**加入微信交流群**
-
-<img src="https://1panel.cn/img/wechat-group.jpg" width="156" height="156"/>
+- [如何加入微信交流群?](https://bbs.fit2cloud.com/t/topic/2147)
 
 ## 安全说明
 

SECURITY.md

@@ -16,6 +16,6 @@ All security bugs should be reported to the contact as below:
 - wanghe@fit2cloud.com
 - zhengkun@fit2cloud.com
 - support@fit2cloud.com
-- 400-052-0755
+- +86 400-052-0755
 
 Thanks for your support!

backend/app/api/v1/app.go

@@ -19,8 +19,7 @@ import (
 // @Router /apps/search [post]
 func (b *BaseApi) SearchApp(c *gin.Context) {
 	var req request.AppSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	list, err := appService.PageApp(req)
@@ -45,8 +44,13 @@ func (b *BaseApi) SyncApp(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
+
 	if !res.CanUpdate {
-		helper.SuccessWithMsg(c, i18n.GetMsgByKey("AppStoreIsUpToDate"))
+		if res.IsSyncing {
+			helper.SuccessWithMsg(c, i18n.GetMsgByKey("AppStoreIsSyncing"))
+		} else {
+			helper.SuccessWithMsg(c, i18n.GetMsgByKey("AppStoreIsUpToDate"))
+		}
 		return
 	}
 	go func() {
@@ -154,8 +158,7 @@ func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"name","input_value":"name","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"info":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"安装应用 [appKey]-[name]","formatEN":"Install app [appKey]-[name]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
 	var req request.AppInstallCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	tx, ctx := helper.GetTxAndContext()

backend/app/api/v1/app_install.go

@@ -1,14 +1,11 @@
 package v1
 
 import (
-	"reflect"
-
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -22,11 +19,17 @@ import (
 // @Router /apps/installed/search [post]
 func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 	var req request.AppInstalledSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {
+	if req.All {
+		list, err := appInstallService.SearchForWebsite(req)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			return
+		}
+		helper.SuccessWithData(c, list)
+	} else {
 		total, list, err := appInstallService.Page(req)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -36,13 +39,6 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 			Items: list,
 			Total: total,
 		})
-	} else {
-		list, err := appInstallService.SearchForWebsite(req)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
-		helper.SuccessWithData(c, list)
 	}
 }
 
@@ -72,12 +68,7 @@ func (b *BaseApi) ListAppInstalled(c *gin.Context) {
 // @Router /apps/installed/check [post]
 func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 	var req request.AppInstalledInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	checkData, err := appInstallService.CheckExist(req)
@@ -98,8 +89,7 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 // @Router /apps/installed/loadport [post]
 func (b *BaseApi) LoadPort(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	port, err := appInstallService.LoadPort(req)
@@ -120,8 +110,7 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 // @Router /apps/installed/conninfo/:key [get]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	conn, err := appInstallService.LoadConnInfo(req)
@@ -181,8 +170,7 @@ func (b *BaseApi) SyncInstalled(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["installId","operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"name","output_value":"appName"},{"input_column":"id","input_value":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"[operate] 应用 [appKey][appName]","formatEN":"[operate] App [appKey][appName]"}
 func (b *BaseApi) OperateInstalled(c *gin.Context) {
 	var req request.AppInstalledOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := appInstallService.Operate(req); err != nil {
@@ -243,12 +231,7 @@ func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["key","name","port"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用端口修改 [key]-[name] => [port]","formatEN":"Application port update [key]-[name] => [port]"}
 func (b *BaseApi) ChangeAppPort(c *gin.Context) {
 	var req request.PortUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := appInstallService.ChangeAppPort(req); err != nil {
@@ -268,8 +251,7 @@ func (b *BaseApi) ChangeAppPort(c *gin.Context) {
 // @Router /apps/installed/conf [post]
 func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	content, err := appInstallService.GetDefaultConfigByKey(req.Type, req.Name)
@@ -314,8 +296,7 @@ func (b *BaseApi) GetParams(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用参数修改 [installId]","formatEN":"Application param update [installId]"}
 func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 	var req request.AppInstalledUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := appInstallService.Update(req); err != nil {
@@ -336,8 +317,7 @@ func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"忽略应用 [installId] 版本升级","formatEN":"Application param update [installId]"}
 func (b *BaseApi) IgnoreUpgrade(c *gin.Context) {
 	var req request.AppInstalledIgnoreUpgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := appInstallService.IgnoreUpgrade(req); err != nil {

backend/app/api/v1/auth.go

@@ -25,10 +25,10 @@ type BaseApi struct{}
 // @Router /auth/login [post]
 func (b *BaseApi) Login(c *gin.Context) {
 	var req dto.Login
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if req.AuthMethod != "jwt" && !req.IgnoreCaptcha {
 		if err := captcha.VerifyCode(req.CaptchaID, req.Captcha); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -60,14 +60,10 @@ func (b *BaseApi) Login(c *gin.Context) {
 // @Header 200 {string} EntranceCode "安全入口"
 func (b *BaseApi) MFALogin(c *gin.Context) {
 	var req dto.MFALogin
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	entranceItem := c.Request.Header.Get("EntranceCode")
 	var entrance []byte
 	if len(entranceItem) != 0 {

backend/app/api/v1/backup.go

@@ -8,7 +8,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -23,12 +22,7 @@ import (
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建备份账号 [type]","formatEN":"create backup account [type]"}
 func (b *BaseApi) CreateBackup(c *gin.Context) {
 	var req dto.BackupOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if len(req.Credential) != 0 {
@@ -65,12 +59,7 @@ func (b *BaseApi) CreateBackup(c *gin.Context) {
 // @Router /settings/backup/search [post]
 func (b *BaseApi) ListBuckets(c *gin.Context) {
 	var req dto.ForBuckets
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if len(req.Credential) != 0 {
@@ -125,12 +114,7 @@ func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"backup_accounts","output_column":"type","output_value":"types"}],"formatZH":"删除备份账号 [types]","formatEN":"delete backup account [types]"}
 func (b *BaseApi) DeleteBackup(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -151,8 +135,7 @@ func (b *BaseApi) DeleteBackup(c *gin.Context) {
 // @Router /settings/backup/record/search [post]
 func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 	var req dto.RecordSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -179,12 +162,7 @@ func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["source","fileName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载备份记录 [source][fileName]","formatEN":"download backup records [source][fileName]"}
 func (b *BaseApi) DownloadRecord(c *gin.Context) {
 	var req dto.DownloadRecord
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -207,12 +185,7 @@ func (b *BaseApi) DownloadRecord(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"backup_records","output_column":"file_name","output_value":"files"}],"formatZH":"删除备份记录 [files]","formatEN":"delete backup records [files]"}
 func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
 	var req dto.BatchDeleteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -234,14 +207,10 @@ func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [types]","formatEN":"update backup account [types]"}
 func (b *BaseApi) UpdateBackup(c *gin.Context) {
 	var req dto.BackupOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if len(req.Credential) != 0 {
 		credential, err := base64.StdEncoding.DecodeString(req.Credential)
 		if err != nil {
@@ -292,14 +261,10 @@ func (b *BaseApi) ListBackup(c *gin.Context) {
 // @Router /settings/backup/search/files [post]
 func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 	var req dto.BackupSearchFile
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := backupService.ListFiles(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -320,12 +285,7 @@ func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["type","name","detailName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"备份 [type] 数据 [name][detailName]","formatEN":"backup [type] data [name][detailName]"}
 func (b *BaseApi) Backup(c *gin.Context) {
 	var req dto.CommonBackup
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -365,12 +325,7 @@ func (b *BaseApi) Backup(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) Recover(c *gin.Context) {
 	var req dto.CommonRecover
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -418,12 +373,7 @@ func (b *BaseApi) Recover(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 	var req dto.CommonRecover
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/command.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,14 +18,10 @@ import (
 // @x-panel-log {"bodyKeys":["name","command"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建快捷命令 [name][command]","formatEN":"create quick command [name][command]"}
 func (b *BaseApi) CreateCommand(c *gin.Context) {
 	var req dto.CommandOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := commandService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -43,9 +38,8 @@ func (b *BaseApi) CreateCommand(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Router /hosts/command/search [post]
 func (b *BaseApi) SearchCommand(c *gin.Context) {
-	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	var req dto.SearchCommandWithPage
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -61,6 +55,23 @@ func (b *BaseApi) SearchCommand(c *gin.Context) {
 	})
 }
 
+// @Tags Command
+// @Summary Tree commands
+// @Description 获取快速命令树
+// @Accept json
+// @Success 200 {Array} dto.CommandTree
+// @Security ApiKeyAuth
+// @Router /hosts/command/tree [get]
+func (b *BaseApi) SearchCommandTree(c *gin.Context) {
+	list, err := commandService.SearchForTree()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
+}
+
 // @Tags Command
 // @Summary List commands
 // @Description 获取快速命令列表
@@ -88,12 +99,7 @@ func (b *BaseApi) ListCommand(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"commands","output_column":"name","output_value":"names"}],"formatZH":"删除快捷命令 [names]","formatEN":"delete quick command [names]"}
 func (b *BaseApi) DeleteCommand(c *gin.Context) {
 	var req dto.BatchDeleteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -115,17 +121,13 @@ func (b *BaseApi) DeleteCommand(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新快捷命令 [name]","formatEN":"update quick command [name]"}
 func (b *BaseApi) UpdateCommand(c *gin.Context) {
 	var req dto.CommandOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
 	upMap := make(map[string]interface{})
 	upMap["name"] = req.Name
+	upMap["group_id"] = req.GroupID
 	upMap["command"] = req.Command
 	if err := commandService.Update(req.ID, upMap); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/compose_template.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,14 +18,10 @@ import (
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose 模版 [name]","formatEN":"create compose template [name]"}
 func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 	var req dto.ComposeTemplateCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := composeTemplateService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -45,8 +40,7 @@ func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 // @Router /containers/template/search [post]
 func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -90,12 +84,7 @@ func (b *BaseApi) ListComposeTemplate(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"compose_templates","output_column":"name","output_value":"names"}],"formatZH":"删除 compose 模版 [names]","formatEN":"delete compose template [names]"}
 func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
 	var req dto.BatchDeleteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -117,12 +106,7 @@ func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"compose_templates","output_column":"name","output_value":"name"}],"formatZH":"更新 compose 模版 [name]","formatEN":"update compose template information [name]"}
 func (b *BaseApi) UpdateComposeTemplate(c *gin.Context) {
 	var req dto.ComposeTemplateUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/container.go

@@ -20,12 +20,7 @@ import (
 // @Router /containers/search [post]
 func (b *BaseApi) SearchContainer(c *gin.Context) {
 	var req dto.PageContainer
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -67,12 +62,7 @@ func (b *BaseApi) ListContainer(c *gin.Context) {
 // @Router /containers/compose/search [post]
 func (b *BaseApi) SearchCompose(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -98,12 +88,7 @@ func (b *BaseApi) SearchCompose(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测 compose [name] 格式","formatEN":"check compose [name]"}
 func (b *BaseApi) TestCompose(c *gin.Context) {
 	var req dto.ComposeCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -126,12 +111,7 @@ func (b *BaseApi) TestCompose(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose [name]","formatEN":"create compose [name]"}
 func (b *BaseApi) CreateCompose(c *gin.Context) {
 	var req dto.ComposeCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -154,12 +134,7 @@ func (b *BaseApi) CreateCompose(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"compose [operation] [name]","formatEN":"compose [operation] [name]"}
 func (b *BaseApi) OperatorCompose(c *gin.Context) {
 	var req dto.ComposeOperation
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -181,14 +156,10 @@ func (b *BaseApi) OperatorCompose(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器 [name][image]","formatEN":"update container [name][image]"}
 func (b *BaseApi) ContainerUpdate(c *gin.Context) {
 	var req dto.ContainerOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := containerService.ContainerUpdate(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -206,14 +177,10 @@ func (b *BaseApi) ContainerUpdate(c *gin.Context) {
 // @Router /containers/info [post]
 func (b *BaseApi) ContainerInfo(c *gin.Context) {
 	var req dto.OperationWithName
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := containerService.ContainerInfo(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -242,12 +209,12 @@ func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Router /containers/list/stats [get]
 func (b *BaseApi) ContainerListStats(c *gin.Context) {
-	datas, err := containerService.ContainerListStats()
+	data, err := containerService.ContainerListStats()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithData(c, datas)
+	helper.SuccessWithData(c, data)
 }
 
 // @Tags Container
@@ -261,14 +228,10 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器 [name][image]","formatEN":"create container [name][image]"}
 func (b *BaseApi) ContainerCreate(c *gin.Context) {
 	var req dto.ContainerOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := containerService.ContainerCreate(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -287,14 +250,10 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
 func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 	var req dto.ContainerUpgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := containerService.ContainerUpgrade(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -313,14 +272,10 @@ func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["pruneType"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [pruneType]","formatEN":"clean container [pruneType]"}
 func (b *BaseApi) ContainerPrune(c *gin.Context) {
 	var req dto.ContainerPrune
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	report, err := containerService.Prune(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -340,14 +295,10 @@ func (b *BaseApi) ContainerPrune(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [name] 日志","formatEN":"clean container [name] logs"}
 func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 	var req dto.OperationWithName
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := containerService.ContainerLogClean(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -365,14 +316,36 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 // @Router /containers/load/log [post]
 func (b *BaseApi) LoadContainerLog(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	content := containerService.LoadContainerLogs(req)
 	helper.SuccessWithData(c, content)
 }
 
+// @Tags Container
+// @Summary Rename Container
+// @Description 容器重命名
+// @Accept json
+// @Param request body dto.ContainerRename true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /containers/rename [post]
+// @x-panel-log {"bodyKeys":["name","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器重命名 [name] => [newName]","formatEN":"rename container [name] => [newName]"}
+func (b *BaseApi) ContainerRename(c *gin.Context) {
+	var req dto.ContainerRename
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := containerService.ContainerRename(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Container
 // @Summary Operate Container
 // @Description 容器操作
@@ -381,17 +354,13 @@ func (b *BaseApi) LoadContainerLog(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/operate [post]
-// @x-panel-log {"bodyKeys":["name","operation","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [name] 执行 [operation] [newName]","formatEN":"container [operation] [name] [newName]"}
+// @x-panel-log {"bodyKeys":["names","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [names] 执行 [operation]","formatEN":"container [operation] [names]"}
 func (b *BaseApi) ContainerOperation(c *gin.Context) {
 	var req dto.ContainerOperation
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := containerService.ContainerOperation(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -431,12 +400,7 @@ func (b *BaseApi) ContainerStats(c *gin.Context) {
 // @Router /containers/inspect [post]
 func (b *BaseApi) Inspect(c *gin.Context) {
 	var req dto.InspectReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -470,7 +434,7 @@ func (b *BaseApi) ContainerLogs(c *gin.Context) {
 	follow := c.Query("follow") == "true"
 	tail := c.Query("tail")
 
-	if err := containerService.ContainerLogs(wsConn, container, since, tail, follow); err != nil {
+	if err := containerService.ContainerLogs(wsConn, "container", container, since, tail, follow); err != nil {
 		_ = wsConn.WriteMessage(1, []byte(err.Error()))
 		return
 	}
@@ -487,12 +451,7 @@ func (b *BaseApi) ContainerLogs(c *gin.Context) {
 // @Router /containers/network/search [post]
 func (b *BaseApi) SearchNetwork(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -535,12 +494,7 @@ func (b *BaseApi) ListNetwork(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器网络 [names]","formatEN":"delete container network [names]"}
 func (b *BaseApi) DeleteNetwork(c *gin.Context) {
 	var req dto.BatchDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -562,12 +516,7 @@ func (b *BaseApi) DeleteNetwork(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器网络 name","formatEN":"create container network [name]"}
 func (b *BaseApi) CreateNetwork(c *gin.Context) {
 	var req dto.NetworkCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -589,12 +538,7 @@ func (b *BaseApi) CreateNetwork(c *gin.Context) {
 // @Router /containers/volume/search [post]
 func (b *BaseApi) SearchVolume(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -637,12 +581,7 @@ func (b *BaseApi) ListVolume(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器存储卷 [names]","formatEN":"delete container volume [names]"}
 func (b *BaseApi) DeleteVolume(c *gin.Context) {
 	var req dto.BatchDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -664,12 +603,7 @@ func (b *BaseApi) DeleteVolume(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器存储卷 [name]","formatEN":"create container volume [name]"}
 func (b *BaseApi) CreateVolume(c *gin.Context) {
 	var req dto.VolumeCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -691,12 +625,7 @@ func (b *BaseApi) CreateVolume(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 compose [name]","formatEN":"update compose information [name]"}
 func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 	var req dto.ComposeUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -729,7 +658,7 @@ func (b *BaseApi) ComposeLogs(c *gin.Context) {
 	follow := c.Query("follow") == "true"
 	tail := c.Query("tail")
 
-	if err := containerService.ComposeLogs(wsConn, compose, since, tail, follow); err != nil {
+	if err := containerService.ContainerLogs(wsConn, "compose", compose, since, tail, follow); err != nil {
 		_ = wsConn.WriteMessage(1, []byte(err.Error()))
 		return
 	}

backend/app/api/v1/cronjob.go

@@ -6,7 +6,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/gin-gonic/gin"
 )
@@ -22,14 +21,10 @@ import (
 // @x-panel-log {"bodyKeys":["type","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建计划任务 [type][name]","formatEN":"create cronjob [type][name]"}
 func (b *BaseApi) CreateCronjob(c *gin.Context) {
 	var req dto.CronjobCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := cronjobService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -47,8 +42,7 @@ func (b *BaseApi) CreateCronjob(c *gin.Context) {
 // @Router /cronjobs/search [post]
 func (b *BaseApi) SearchCronjob(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -74,10 +68,10 @@ func (b *BaseApi) SearchCronjob(c *gin.Context) {
 // @Router /cronjobs/search/records [post]
 func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 	var req dto.SearchRecord
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	loc, _ := time.LoadLocation(common.LoadTimeZone())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
@@ -104,8 +98,7 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 // @Router /cronjob/record/log [post]
 func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	content, err := cronjobService.LoadRecordLog(req)
@@ -127,8 +120,7 @@ func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"清空计划任务记录 [name]","formatEN":"clean cronjob [name] records"}
 func (b *BaseApi) CleanRecord(c *gin.Context) {
 	var req dto.CronjobClean
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -151,12 +143,7 @@ func (b *BaseApi) CleanRecord(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"cronjobs","output_column":"name","output_value":"names"}],"formatZH":"删除计划任务 [names]","formatEN":"delete cronjob [names]"}
 func (b *BaseApi) DeleteCronjob(c *gin.Context) {
 	var req dto.CronjobBatchDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -178,12 +165,7 @@ func (b *BaseApi) DeleteCronjob(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"更新计划任务 [name]","formatEN":"update cronjob [name]"}
 func (b *BaseApi) UpdateCronjob(c *gin.Context) {
 	var req dto.CronjobUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -205,12 +187,7 @@ func (b *BaseApi) UpdateCronjob(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"修改计划任务 [name] 状态为 [status]","formatEN":"change the status of cronjob [name] to [status]."}
 func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
 	var req dto.CronjobUpdateStatus
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -232,12 +209,7 @@ func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["recordID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"recordID","isList":false,"db":"job_records","output_column":"file","output_value":"file"}],"formatZH":"下载计划任务记录 [file]","formatEN":"download the cronjob record [file]"}
 func (b *BaseApi) TargetDownload(c *gin.Context) {
 	var req dto.CronjobDownload
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -261,12 +233,7 @@ func (b *BaseApi) TargetDownload(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"手动执行计划任务 [name]","formatEN":"manually execute the cronjob [name]"}
 func (b *BaseApi) HandleOnce(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/dashboard.go

@@ -56,6 +56,28 @@ func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error netOption in path"))
 		return
 	}
+
 	data := dashboardService.LoadCurrentInfo(ioOption, netOption)
 	helper.SuccessWithData(c, data)
 }
+
+// @Tags Dashboard
+// @Summary System restart
+// @Description 重启服务器/面板
+// @Accept json
+// @Param operation path string true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /dashboard/system/restart/:operation [post]
+func (b *BaseApi) SystemRestart(c *gin.Context) {
+	operation, ok := c.Params.Get("operation")
+	if !ok {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error operation in path"))
+		return
+	}
+	if err := dashboardService.Restart(operation); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/database.go

@@ -1,10 +1,11 @@
 package v1
 
 import (
+	"encoding/base64"
+
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,14 +20,18 @@ import (
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建远程数据库 [name][type]","formatEN":"create database [name][type]"}
 func (b *BaseApi) CreateDatabase(c *gin.Context) {
 	var req dto.DatabaseCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
+	if req.SSL {
+		key, _ := base64.StdEncoding.DecodeString(req.ClientKey)
+		req.ClientKey = string(key)
+		cert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
+		req.ClientCert = string(cert)
+		ca, _ := base64.StdEncoding.DecodeString(req.RootCert)
+		req.RootCert = string(ca)
 	}
+
 	if err := databaseService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -45,14 +50,18 @@ func (b *BaseApi) CreateDatabase(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测远程数据库 [name][type] 连接性","formatEN":"check if database [name][type] is connectable"}
 func (b *BaseApi) CheckDatabase(c *gin.Context) {
 	var req dto.DatabaseCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
+	if req.SSL {
+		clientKey, _ := base64.StdEncoding.DecodeString(req.ClientKey)
+		req.ClientKey = string(clientKey)
+		clientCert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
+		req.ClientCert = string(clientCert)
+		rootCert, _ := base64.StdEncoding.DecodeString(req.RootCert)
+		req.RootCert = string(rootCert)
 	}
+
 	helper.SuccessWithData(c, databaseService.CheckDatabase(req))
 }
 
@@ -66,8 +75,7 @@ func (b *BaseApi) CheckDatabase(c *gin.Context) {
 // @Router /databases/db/search [post]
 func (b *BaseApi) SearchDatabase(c *gin.Context) {
 	var req dto.DatabaseSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -135,12 +143,7 @@ func (b *BaseApi) GetDatabase(c *gin.Context) {
 // @Router /db/remote/del/check [post]
 func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -163,12 +166,7 @@ func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"databases","output_column":"name","output_value":"names"}],"formatZH":"删除远程数据库 [names]","formatEN":"delete database [names]"}
 func (b *BaseApi) DeleteDatabase(c *gin.Context) {
 	var req dto.DatabaseDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -190,13 +188,16 @@ func (b *BaseApi) DeleteDatabase(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新远程数据库 [name]","formatEN":"update database [name]"}
 func (b *BaseApi) UpdateDatabase(c *gin.Context) {
 	var req dto.DatabaseUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
+	if req.SSL {
+		cKey, _ := base64.StdEncoding.DecodeString(req.ClientKey)
+		req.ClientKey = string(cKey)
+		cCert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
+		req.ClientCert = string(cCert)
+		ca, _ := base64.StdEncoding.DecodeString(req.RootCert)
+		req.RootCert = string(ca)
 	}
 
 	if err := databaseService.Update(req); err != nil {

backend/app/api/v1/database_mysql.go

@@ -7,7 +7,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -22,14 +21,10 @@ import (
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mysql 数据库 [name]","formatEN":"create mysql database [name]"}
 func (b *BaseApi) CreateMysql(c *gin.Context) {
 	var req dto.MysqlDBCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if len(req.Password) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
@@ -57,14 +52,10 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"mysql 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the mysql database [name] is modified => [description]"}
 func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
 	var req dto.UpdateDescription
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := mysqlService.UpdateDescription(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -83,14 +74,10 @@ func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 	var req dto.ChangeDBInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if len(req.Value) != 0 {
 		value, err := base64.StdEncoding.DecodeString(req.Value)
 		if err != nil {
@@ -118,14 +105,10 @@ func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 访问权限","formatEN":"Update database [name] access"}
 func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 	var req dto.ChangeDBInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := mysqlService.ChangeAccess(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -144,8 +127,7 @@ func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"调整 mysql 数据库性能参数","formatEN":"adjust mysql database performance parameters"}
 func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
 	var req dto.MysqlVariablesUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -167,12 +149,7 @@ func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mysql 数据库配置信息","formatEN":"update the mysql database configuration information"}
 func (b *BaseApi) UpdateMysqlConfByFile(c *gin.Context) {
 	var req dto.MysqlConfUpdateByFile
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -194,8 +171,7 @@ func (b *BaseApi) UpdateMysqlConfByFile(c *gin.Context) {
 // @Router /databases/search [post]
 func (b *BaseApi) SearchMysql(c *gin.Context) {
 	var req dto.MysqlDBSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -238,14 +214,10 @@ func (b *BaseApi) ListDBName(c *gin.Context) {
 // @Router /databases/load [post]
 func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 	var req dto.MysqlLoadDB
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := mysqlService.LoadFromRemote(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -264,12 +236,7 @@ func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 // @Router /databases/del/check [post]
 func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 	var req dto.MysqlDBDeleteCheck
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -292,12 +259,7 @@ func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"删除 mysql 数据库 [name]","formatEN":"delete mysql database [name]"}
 func (b *BaseApi) DeleteMysql(c *gin.Context) {
 	var req dto.MysqlDBDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -321,10 +283,10 @@ func (b *BaseApi) DeleteMysql(c *gin.Context) {
 // @Router /databases/baseinfo [post]
 func (b *BaseApi) LoadBaseinfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := mysqlService.LoadBaseInfo(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -344,10 +306,10 @@ func (b *BaseApi) LoadBaseinfo(c *gin.Context) {
 // @Router /databases/load/file [post]
 func (b *BaseApi) LoadDatabaseFile(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	content, err := mysqlService.LoadDatabaseFile(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -366,10 +328,10 @@ func (b *BaseApi) LoadDatabaseFile(c *gin.Context) {
 // @Router /databases/remote [post]
 func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	isRemote, err := mysqlService.LoadRemoteAccess(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -389,10 +351,10 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 // @Router /databases/status [post]
 func (b *BaseApi) LoadStatus(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := mysqlService.LoadStatus(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -412,10 +374,10 @@ func (b *BaseApi) LoadStatus(c *gin.Context) {
 // @Router /databases/variables [post]
 func (b *BaseApi) LoadVariables(c *gin.Context) {
 	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := mysqlService.LoadVariables(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/database_redis.go

@@ -9,7 +9,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/compose"
 	"github.com/gin-gonic/gin"
 )
@@ -73,14 +72,10 @@ func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 redis 数据库配置信息","formatEN":"update the redis database configuration information"}
 func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
 	var req dto.RedisConfUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
+
 	if err := redisService.UpdateConf(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -99,14 +94,10 @@ func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 redis 数据库密码","formatEN":"change the password of the redis database"}
 func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
 	var req dto.ChangeRedisPass
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if len(req.Value) != 0 {
 		value, err := base64.StdEncoding.DecodeString(req.Value)
 		if err != nil {
@@ -134,14 +125,10 @@ func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"redis 数据库持久化配置更新","formatEN":"redis database persistence configuration update"}
 func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
 	var req dto.RedisConfPersistenceUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := redisService.UpdatePersistenceConf(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -159,8 +146,7 @@ func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
 // @Router /databases/redis/backup/search [post]
 func (b *BaseApi) RedisBackupList(c *gin.Context) {
 	var req dto.PageInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -187,10 +173,10 @@ func (b *BaseApi) RedisBackupList(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 redis 数据库配置信息","formatEN":"update the redis database configuration information"}
 func (b *BaseApi) UpdateRedisConfByFile(c *gin.Context) {
 	var req dto.RedisConfUpdateByFile
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	redisInfo, err := redisService.LoadConf()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/device.go

@@ -0,0 +1,236 @@
+package v1
+
+import (
+	"encoding/base64"
+
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Device
+// @Summary Load device base info
+// @Description 获取设备基础信息
+// @Success 200 {object} dto.DeviceBaseInfo
+// @Security ApiKeyAuth
+// @Router /toolbox/device/base [post]
+func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
+	data, err := deviceService.LoadBaseInfo()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Device
+// @Summary list time zone options
+// @Description 获取系统可用时区选项
+// @Accept json
+// @Success 200 {Array} string
+// @Security ApiKeyAuth
+// @Router /toolbox/device/zone/options [get]
+func (b *BaseApi) LoadTimeOption(c *gin.Context) {
+	list, err := deviceService.LoadTimeZone()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags Device
+// @Summary load conf
+// @Description 获取系统配置文件
+// @Accept json
+// @Param request body dto.OperationWithName true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/conf [post]
+func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
+	var req dto.OperationWithName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	list, err := deviceService.LoadConf(req.Name)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags Device
+// @Summary Update device conf by file
+// @Description 通过文件修改配置
+// @Accept json
+// @Param request body dto.UpdateByNameAndFile true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/update/byconf [post]
+func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
+	var req dto.UpdateByNameAndFile
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := deviceService.UpdateByConf(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Device
+// @Summary Update device
+// @Description 修改系统参数
+// @Accept json
+// @Param request body dto.SettingUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/update/conf [post]
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机参数 [key] => [value]","formatEN":"update device conf [key] => [value]"}
+func (b *BaseApi) UpdateDeviceConf(c *gin.Context) {
+	var req dto.SettingUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := deviceService.Update(req.Key, req.Value); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Device
+// @Summary Update device hosts
+// @Description 修改系统 hosts
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/update/host [post]
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机 Host [key] => [value]","formatEN":"update device host [key] => [value]"}
+func (b *BaseApi) UpdateDeviceHost(c *gin.Context) {
+	var req []dto.HostHelper
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+
+	if err := deviceService.UpdateHosts(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Device
+// @Summary Update device passwd
+// @Description 修改系统密码
+// @Accept json
+// @Param request body dto.ChangePasswd true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/update/passwd [post]
+func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
+	var req dto.ChangePasswd
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if len(req.Passwd) != 0 {
+		password, err := base64.StdEncoding.DecodeString(req.Passwd)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.Passwd = string(password)
+	}
+	if err := deviceService.UpdatePasswd(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Device
+// @Summary Update device swap
+// @Description 修改系统 Swap
+// @Accept json
+// @Param request body dto.SwapHelper true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/update/swap [post]
+// @x-panel-log {"bodyKeys":["operate","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机 swap [path]","formatEN":"[operate] device swap [path]"}
+func (b *BaseApi) UpdateDeviceSwap(c *gin.Context) {
+	var req dto.SwapHelper
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := deviceService.UpdateSwap(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Device
+// @Summary Check device DNS conf
+// @Description 检查系统 DNS 配置可用性
+// @Accept json
+// @Param request body dto.SettingUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/device/check/dns [post]
+func (b *BaseApi) CheckDNS(c *gin.Context) {
+	var req dto.SettingUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := deviceService.CheckDNS(req.Key, req.Value)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Device
+// @Summary Scan system
+// @Description 扫描系统垃圾文件
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/scan [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
+func (b *BaseApi) ScanSystem(c *gin.Context) {
+	helper.SuccessWithData(c, deviceService.Scan())
+}
+
+// @Tags Device
+// @Summary Clean system
+// @Description 清理系统垃圾文件
+// @Accept json
+// @Param request body []dto.Clean true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/clean [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
+func (b *BaseApi) SystemClean(c *gin.Context) {
+	var req []dto.Clean
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+
+	deviceService.Clean(req)
+
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/docker.go

@@ -6,7 +6,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -65,8 +64,7 @@ func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置 [key]=>[value]","formatEN":"Updated the docker daemon.json configuration [key]=>[value]"}
 func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 	var req dto.SettingUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -85,12 +83,11 @@ func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /containers/daemonjson/update [post]
+// @Router /containers/logoption/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 日志配置","formatEN":"Updated the docker daemon.json log option"}
 func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	var req dto.LogOption
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 
@@ -102,6 +99,29 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Container Docker
+// @Summary Update docker daemon.json ipv6 option
+// @Description 修改 docker ipv6 配置
+// @Accept json
+// @Param request body dto.LogOption true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /containers/ipv6option/update [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json ipv6 配置","formatEN":"Updated the docker daemon.json ipv6 option"}
+func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
+	var req dto.Ipv6Option
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+
+	if err := dockerService.UpdateIpv6Option(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Container Docker
 // @Summary Update docker daemon.json by upload file
 // @Description 上传替换 docker 配置文件
@@ -113,12 +133,7 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置","formatEN":"Updated the docker daemon.json configuration"}
 func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 	var req dto.DaemonJsonUpdateByFile
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -141,12 +156,7 @@ func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"docker 服务 [operation]","formatEN":"[operation] docker service"}
 func (b *BaseApi) OperateDocker(c *gin.Context) {
 	var req dto.DockerOperation
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/entry.go

@@ -33,6 +33,9 @@ var (
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
 
+	deviceService   = service.NewIDeviceService()
+	fail2banService = service.NewIFail2BanService()
+
 	settingService = service.NewISettingService()
 	backupService  = service.NewIBackupService()
 
@@ -53,4 +56,9 @@ var (
 	processService = service.NewIProcessService()
 
 	hostToolService = service.NewIHostToolService()
+
+	recycleBinService = service.NewIRecycleBinService()
+	favoriteService   = service.NewIFavoriteService()
+
+	websiteCAService = service.NewIWebsiteCAService()
 )

backend/app/api/v1/fail2ban.go

@@ -0,0 +1,153 @@
+package v1
+
+import (
+	"os"
+
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Fail2ban
+// @Summary Load fail2ban base info
+// @Description 获取 Fail2ban 基础信息
+// @Success 200 {object} dto.Fail2BanBaseInfo
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/base [get]
+func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
+	data, err := fail2banService.LoadBaseInfo()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Fail2ban
+// @Summary Page fail2ban ip list
+// @Description 获取 Fail2ban ip
+// @Accept json
+// @Param request body dto.Fail2BanSearch true "request"
+// @Success 200 {Array} string
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/search [post]
+func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
+	var req dto.Fail2BanSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	list, err := fail2banService.Search(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags Fail2ban
+// @Summary Operate fail2ban
+// @Description 修改 Fail2ban 状态
+// @Accept json
+// @Param request body dto.Operate true "request"
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/operate [post]
+// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Fail2ban","formatEN":"[operation] Fail2ban"}
+func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
+	var req dto.Operate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := fail2banService.Operate(req.Operation); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Fail2ban
+// @Summary Operate sshd of fail2ban
+// @Description 配置 sshd
+// @Accept json
+// @Param request body dto.Operate true "request"
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/operate/sshd [post]
+func (b *BaseApi) OperateSSHD(c *gin.Context) {
+	var req dto.Fail2BanSet
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := fail2banService.OperateSSHD(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Fail2ban
+// @Summary Update fail2ban conf
+// @Description 修改 Fail2ban 配置
+// @Accept json
+// @Param request body dto.Fail2BanUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/update [post]
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 Fail2ban 配置 [key] => [value]","formatEN":"update fail2ban conf [key] => [value]"}
+func (b *BaseApi) UpdateFail2BanConf(c *gin.Context) {
+	var req dto.Fail2BanUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := fail2banService.UpdateConf(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Fail2ban
+// @Summary Load fail2ban conf
+// @Description 获取 fail2ban 配置文件
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/load/conf [get]
+func (b *BaseApi) LoadFail2BanConf(c *gin.Context) {
+	path := "/etc/fail2ban/jail.local"
+	file, err := os.ReadFile(path)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, string(file))
+}
+
+// @Tags Fail2ban
+// @Summary Update fail2ban conf by file
+// @Description 通过文件修改 fail2ban 配置
+// @Accept json
+// @Param request body dto.UpdateByFile true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /toolbox/fail2ban/update/byconf [post]
+func (b *BaseApi) UpdateFail2BanConfByFile(c *gin.Context) {
+	var req dto.UpdateByFile
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+	if err := fail2banService.UpdateConfByFile(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/favorite.go

@@ -0,0 +1,76 @@
+package v1
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags File
+// @Summary List favorites
+// @Description 获取收藏列表
+// @Accept json
+// @Param request body dto.PageInfo true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/favorite/search [post]
+func (b *BaseApi) SearchFavorite(c *gin.Context) {
+	var req dto.PageInfo
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, list, err := favoriteService.Page(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Total: total,
+		Items: list,
+	})
+}
+
+// @Tags File
+// @Summary Create favorite
+// @Description 创建收藏
+// @Accept json
+// @Param request body request.FavoriteCreate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/favorite [post]
+// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"收藏文件/文件夹 [path]","formatEN":"收藏文件/文件夹 [path]"}
+func (b *BaseApi) CreateFavorite(c *gin.Context) {
+	var req request.FavoriteCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	favorite, err := favoriteService.Create(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, favorite)
+}
+
+// @Tags File
+// @Summary Delete favorite
+// @Description 删除收藏
+// @Accept json
+// @Param request body request.FavoriteDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/favorite/del [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"favorites","output_column":"path","output_value":"path"}],"formatZH":"删除收藏 [path]","formatEN":"delete avorite [path]"}
+func (b *BaseApi) DeleteFavorite(c *gin.Context) {
+	var req request.FavoriteDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := favoriteService.Delete(req.ID); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}

backend/app/api/v1/file.go

@@ -35,8 +35,7 @@ import (
 // @Router /files/search [post]
 func (b *BaseApi) ListFiles(c *gin.Context) {
 	var req request.FileOption
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	files, err := fileService.GetFileList(req)
@@ -57,12 +56,7 @@ func (b *BaseApi) ListFiles(c *gin.Context) {
 // @Router /files/upload/search [post]
 func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 	var req request.SearchUploadWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	total, files, err := fileService.SearchUploadWithPage(req)
@@ -86,8 +80,7 @@ func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 // @Router /files/tree [post]
 func (b *BaseApi) GetFileTree(c *gin.Context) {
 	var req request.FileOption
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	tree, err := fileService.GetFileTree(req)
@@ -109,8 +102,7 @@ func (b *BaseApi) GetFileTree(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建文件/文件夹 [path]","formatEN":"Create dir or file [path]"}
 func (b *BaseApi) CreateFile(c *gin.Context) {
 	var req request.FileCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.Create(req)
@@ -132,8 +124,7 @@ func (b *BaseApi) CreateFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除文件/文件夹 [path]","formatEN":"Delete dir or file [path]"}
 func (b *BaseApi) DeleteFile(c *gin.Context) {
 	var req request.FileDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.Delete(req)
@@ -155,8 +146,7 @@ func (b *BaseApi) DeleteFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["paths"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量删除文件/文件夹 [paths]","formatEN":"Batch delete dir or file [paths]"}
 func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
 	var req request.FileBatchDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.BatchDelete(req)
@@ -178,8 +168,7 @@ func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path","mode"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改权限 [paths] => [mode]","formatEN":"Change mode [paths] => [mode]"}
 func (b *BaseApi) ChangeFileMode(c *gin.Context) {
 	var req request.FileCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.ChangeMode(req)
@@ -201,8 +190,7 @@ func (b *BaseApi) ChangeFileMode(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改用户/组 [paths] => [user]/[group]","formatEN":"Change owner [paths] => [user]/[group]"}
 func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
 	var req request.FileRoleUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := fileService.ChangeOwner(req); err != nil {
@@ -223,8 +211,7 @@ func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"压缩文件 [name]","formatEN":"Compress file [name]"}
 func (b *BaseApi) CompressFile(c *gin.Context) {
 	var req request.FileCompress
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.Compress(req)
@@ -246,8 +233,7 @@ func (b *BaseApi) CompressFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"解压 [path]","formatEN":"Decompress file [path]"}
 func (b *BaseApi) DeCompressFile(c *gin.Context) {
 	var req request.FileDeCompress
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := fileService.DeCompress(req)
@@ -262,15 +248,14 @@ func (b *BaseApi) DeCompressFile(c *gin.Context) {
 // @Summary Load file content
 // @Description 获取文件内容
 // @Accept json
-// @Param request body request.FileOption true "request"
+// @Param request body request.FileContentReq true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
 // @Router /files/content [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件内容 [path]","formatEN":"Load file content [path]"}
 func (b *BaseApi) GetContent(c *gin.Context) {
-	var req request.FileOption
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	var req request.FileContentReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	info, err := fileService.GetContent(req)
@@ -292,8 +277,7 @@ func (b *BaseApi) GetContent(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新文件内容 [path]","formatEN":"Update file content [path]"}
 func (b *BaseApi) SaveContent(c *gin.Context) {
 	var req request.FileEdit
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := fileService.SaveContent(req); err != nil {
@@ -356,24 +340,16 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /files/check [post]
-// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测文件 [path] 是否存在","formatEN":"Check whether file [path] exists"}
 func (b *BaseApi) CheckFile(c *gin.Context) {
 	var req request.FilePathCheck
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if _, err := os.Stat(req.Path); err != nil {
+		helper.SuccessWithData(c, false)
 		return
 	}
-
-	if _, err := os.Stat(req.Path); err != nil && os.IsNotExist(err) {
-		helper.SuccessWithData(c, true)
-		return
-	}
-
-	helper.SuccessWithData(c, false)
+	helper.SuccessWithData(c, true)
 }
 
 // @Tags File
@@ -387,8 +363,7 @@ func (b *BaseApi) CheckFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["oldName","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重命名 [oldName] => [newName]","formatEN":"Rename [oldName] => [newName]"}
 func (b *BaseApi) ChangeFileName(c *gin.Context) {
 	var req request.FileRename
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := fileService.ChangeName(req); err != nil {
@@ -409,8 +384,7 @@ func (b *BaseApi) ChangeFileName(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["url","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载 url => [path]/[name]","formatEN":"Download url => [path]/[name]"}
 func (b *BaseApi) WgetFile(c *gin.Context) {
 	var req request.FileWget
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	key, err := fileService.Wget(req)
@@ -434,8 +408,7 @@ func (b *BaseApi) WgetFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["oldPaths","newPath"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移动文件 [oldPaths] => [newPath]","formatEN":"Move [oldPaths] => [newPath]"}
 func (b *BaseApi) MoveFile(c *gin.Context) {
 	var req request.FileMove
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := fileService.MvFile(req); err != nil {
@@ -477,8 +450,7 @@ func (b *BaseApi) Download(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载文件 [name]","formatEN":"Download file [name]"}
 func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 	var req request.FileChunkDownload
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	fileOp := files.NewFileOp()
@@ -555,8 +527,7 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件夹大小 [path]","formatEN":"Load file size [path]"}
 func (b *BaseApi) Size(c *gin.Context) {
 	var req request.DirSizeReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := fileService.DirSize(req)
@@ -568,12 +539,13 @@ func (b *BaseApi) Size(c *gin.Context) {
 }
 
 func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int) error {
-	if _, err := os.Stat(path.Dir(dstDir)); err != nil && os.IsNotExist(err) {
-		if err = os.MkdirAll(path.Dir(dstDir), os.ModePerm); err != nil {
+	op := files.NewFileOp()
+	dstDir = strings.TrimSpace(dstDir)
+	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
+		if err = op.CreateDir(dstDir, os.ModePerm); err != nil {
 			return err
 		}
 	}
-
 	targetFile, err := os.Create(filepath.Join(dstDir, fileName))
 	if err != nil {
 		return err
@@ -710,3 +682,43 @@ func (b *BaseApi) Keys(c *gin.Context) {
 	res.Keys = keys
 	helper.SuccessWithData(c, res)
 }
+
+// @Tags File
+// @Summary Read file by Line
+// @Description 按行读取日志文件
+// @Param request body request.FileReadByLineReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/log/read [post]
+func (b *BaseApi) ReadFileByLine(c *gin.Context) {
+	var req request.FileReadByLineReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := fileService.ReadLogByLine(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags File
+// @Summary Batch change file mode and owner
+// @Description 批量修改文件权限和用户/组
+// @Accept json
+// @Param request body request.FileRoleReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/batch/role [post]
+// @x-panel-log {"bodyKeys":["paths","mode","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量修改文件权限和用户/组 [paths] => [mode]/[user]/[group]","formatEN":"Batch change file mode and owner [paths] => [mode]/[user]/[group]"}
+func (b *BaseApi) BatchChangeModeAndOwner(c *gin.Context) {
+	var req request.FileRoleReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := fileService.BatchChangeModeAndOwner(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	}
+	helper.SuccessWithOutData(c)
+}

backend/app/api/v1/firewall.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -28,18 +27,13 @@ func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 // @Summary Page firewall rules
 // @Description 获取防火墙规则列表分页
 // @Accept json
-// @Param request body dto.SearchWithPage true "request"
+// @Param request body dto.RuleSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
 // @Router /hosts/firewall/search [post]
 func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 	var req dto.RuleSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -66,12 +60,7 @@ func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] 防火墙","formatEN":"[operation] firewall"}
 func (b *BaseApi) OperateFirewall(c *gin.Context) {
 	var req dto.FirewallOperation
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -94,14 +83,10 @@ func (b *BaseApi) OperateFirewall(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["port","strategy"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加端口规则 [strategy] [port]","formatEN":"create port rules [strategy][port]"}
 func (b *BaseApi) OperatePortRule(c *gin.Context) {
 	var req dto.PortRuleOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.OperatePortRule(req, true); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -120,14 +105,10 @@ func (b *BaseApi) OperatePortRule(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["strategy","address"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加 ip 规则 [strategy] [address]","formatEN":"create address rules [strategy][address]"}
 func (b *BaseApi) OperateIPRule(c *gin.Context) {
 	var req dto.AddrRuleOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.OperateAddressRule(req, true); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -145,14 +126,10 @@ func (b *BaseApi) OperateIPRule(c *gin.Context) {
 // @Router /hosts/firewall/batch [post]
 func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 	var req dto.BatchRuleOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.BatchOperateRule(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -170,14 +147,10 @@ func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 // @Router /hosts/firewall/update/description [post]
 func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 	var req dto.UpdateFirewallDescription
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.UpdateDescription(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -195,14 +168,10 @@ func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 // @Router /hosts/firewall/update/port [post]
 func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 	var req dto.PortRuleUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.UpdatePortRule(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -220,14 +189,10 @@ func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 // @Router /hosts/firewall/update/addr [post]
 func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
 	var req dto.AddrRuleUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := firewallService.UpdateAddrRule(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/group.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,14 +18,10 @@ import (
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建组 [name][type]","formatEN":"create group [name][type]"}
 func (b *BaseApi) CreateGroup(c *gin.Context) {
 	var req dto.GroupCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := groupService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -45,12 +40,7 @@ func (b *BaseApi) CreateGroup(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"name","output_value":"name"},{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"type","output_value":"type"}],"formatZH":"删除组 [type][name]","formatEN":"delete group [type][name]"}
 func (b *BaseApi) DeleteGroup(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -72,14 +62,10 @@ func (b *BaseApi) DeleteGroup(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新组 [name][type]","formatEN":"update group [name][type]"}
 func (b *BaseApi) UpdateGroup(c *gin.Context) {
 	var req dto.GroupUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := groupService.Update(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -97,12 +83,7 @@ func (b *BaseApi) UpdateGroup(c *gin.Context) {
 // @Router /groups/search [post]
 func (b *BaseApi) ListGroup(c *gin.Context) {
 	var req dto.GroupSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/helper/helper.go

@@ -115,7 +115,7 @@ func GetTxAndContext() (tx *gorm.DB, ctx context.Context) {
 }
 
 func CheckBindAndValidate(req interface{}, c *gin.Context) error {
-	if err := c.ShouldBindJSON(&req); err != nil {
+	if err := c.ShouldBindJSON(req); err != nil {
 		ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return err
 	}
@@ -125,3 +125,11 @@ func CheckBindAndValidate(req interface{}, c *gin.Context) error {
 	}
 	return nil
 }
+
+func CheckBind(req interface{}, c *gin.Context) error {
+	if err := c.ShouldBindJSON(&req); err != nil {
+		ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return err
+	}
+	return nil
+}

backend/app/api/v1/host.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
 	"github.com/gin-gonic/gin"
 )
@@ -20,12 +19,7 @@ import (
 // @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建主机 [name][addr]","formatEN":"create host [name][addr]"}
 func (b *BaseApi) CreateHost(c *gin.Context) {
 	var req dto.HostOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -47,12 +41,7 @@ func (b *BaseApi) CreateHost(c *gin.Context) {
 // @Router /hosts/test/byinfo [post]
 func (b *BaseApi) TestByInfo(c *gin.Context) {
 	var req dto.HostConnTest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -89,8 +78,7 @@ func (b *BaseApi) TestByID(c *gin.Context) {
 // @Router /hosts/tree [post]
 func (b *BaseApi) HostTree(c *gin.Context) {
 	var req dto.SearchForTree
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 
@@ -113,8 +101,7 @@ func (b *BaseApi) HostTree(c *gin.Context) {
 // @Router /hosts/search [post]
 func (b *BaseApi) SearchHost(c *gin.Context) {
 	var req dto.SearchHostWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -141,12 +128,7 @@ func (b *BaseApi) SearchHost(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"hosts","output_column":"addr","output_value":"addrs"}],"formatZH":"删除主机 [addrs]","formatEN":"delete host [addrs]"}
 func (b *BaseApi) DeleteHost(c *gin.Context) {
 	var req dto.BatchDeleteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -168,14 +150,10 @@ func (b *BaseApi) DeleteHost(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新主机信息 [name][addr]","formatEN":"update host [name][addr]"}
 func (b *BaseApi) UpdateHost(c *gin.Context) {
 	var req dto.HostOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	var err error
 	if len(req.Password) != 0 && req.AuthMode == "password" {
 		req.Password, err = hostService.EncryptHost(req.Password)
@@ -238,12 +216,7 @@ func (b *BaseApi) UpdateHost(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id","group"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"hosts","output_column":"addr","output_value":"addr"}],"formatZH":"切换主机[addr]分组 => [group]","formatEN":"change host [addr] group => [group]"}
 func (b *BaseApi) UpdateHostGroup(c *gin.Context) {
 	var req dto.ChangeHostGroup
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/host_tool.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -18,12 +17,7 @@ import (
 // @Router /host/tool [post]
 func (b *BaseApi) GetToolStatus(c *gin.Context) {
 	var req request.HostToolReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -46,12 +40,7 @@ func (b *BaseApi) GetToolStatus(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 [type] 配置","formatEN":"create [type] config"}
 func (b *BaseApi) InitToolConfig(c *gin.Context) {
 	var req request.HostToolCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -73,15 +62,9 @@ func (b *BaseApi) InitToolConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
 func (b *BaseApi) OperateTool(c *gin.Context) {
 	var req request.HostToolReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
 	err := hostToolService.OperateTool(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -101,12 +84,7 @@ func (b *BaseApi) OperateTool(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机工具配置文件 ","formatEN":"[operate] tool config"}
 func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 	var req request.HostToolConfig
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -128,12 +106,7 @@ func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 // @Router /host/tool/log [post]
 func (b *BaseApi) GetToolLog(c *gin.Context) {
 	var req request.HostToolLogReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -156,12 +129,7 @@ func (b *BaseApi) GetToolLog(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 守护进程 ","formatEN":"[operate] process"}
 func (b *BaseApi) OperateProcess(c *gin.Context) {
 	var req request.SupervisorProcessConfig
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -200,8 +168,7 @@ func (b *BaseApi) GetProcess(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
 func (b *BaseApi) GetProcessFile(c *gin.Context) {
 	var req request.SupervisorProcessFileReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	content, err := hostToolService.OperateSupervisorProcessFile(req)

backend/app/api/v1/image.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,12 +18,7 @@ import (
 // @Router /containers/image/search [post]
 func (b *BaseApi) SearchImage(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -67,12 +61,7 @@ func (b *BaseApi) ListImage(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"构建镜像 [name]","formatEN":"build image [name]"}
 func (b *BaseApi) ImageBuild(c *gin.Context) {
 	var req dto.ImageBuild
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -96,12 +85,7 @@ func (b *BaseApi) ImageBuild(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["repoID","imageName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"镜像拉取 [reponame][imageName]","formatEN":"image pull [reponame][imageName]"}
 func (b *BaseApi) ImagePull(c *gin.Context) {
 	var req dto.ImagePull
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -125,12 +109,7 @@ func (b *BaseApi) ImagePull(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["repoID","tagName","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"[tagName] 推送到 [reponame][name]","formatEN":"push [tagName] to [reponame][name]"}
 func (b *BaseApi) ImagePush(c *gin.Context) {
 	var req dto.ImagePush
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -154,12 +133,7 @@ func (b *BaseApi) ImagePush(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移除镜像 [names]","formatEN":"remove image [names]"}
 func (b *BaseApi) ImageRemove(c *gin.Context) {
 	var req dto.BatchDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -182,12 +156,7 @@ func (b *BaseApi) ImageRemove(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["tagName","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"保留 [tagName] 为 [path]/[name]","formatEN":"save [tagName] as [path]/[name]"}
 func (b *BaseApi) ImageSave(c *gin.Context) {
 	var req dto.ImageSave
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -210,12 +179,7 @@ func (b *BaseApi) ImageSave(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["repoID","targetName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"tag 镜像 [reponame][targetName]","formatEN":"tag image [reponame][targetName]"}
 func (b *BaseApi) ImageTag(c *gin.Context) {
 	var req dto.ImageTag
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -238,12 +202,7 @@ func (b *BaseApi) ImageTag(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [path] 加载镜像","formatEN":"load image from [path]"}
 func (b *BaseApi) ImageLoad(c *gin.Context) {
 	var req dto.ImageLoad
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/image_repo.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,12 +18,7 @@ import (
 // @Router /containers/repo/search [post]
 func (b *BaseApi) SearchRepo(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -68,14 +62,10 @@ func (b *BaseApi) ListRepo(c *gin.Context) {
 // @Router /containers/repo/status [get]
 func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := imageRepoService.Login(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -95,14 +85,10 @@ func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建镜像仓库 [name]","formatEN":"create image repo [name]"}
 func (b *BaseApi) CreateRepo(c *gin.Context) {
 	var req dto.ImageRepoCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := imageRepoService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -122,12 +108,7 @@ func (b *BaseApi) CreateRepo(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"image_repos","output_column":"name","output_value":"names"}],"formatZH":"删除镜像仓库 [names]","formatEN":"delete image repo [names]"}
 func (b *BaseApi) DeleteRepo(c *gin.Context) {
 	var req dto.ImageRepoDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -150,12 +131,7 @@ func (b *BaseApi) DeleteRepo(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"image_repos","output_column":"name","output_value":"name"}],"formatZH":"更新镜像仓库 [name]","formatEN":"update image repo information [name]"}
 func (b *BaseApi) UpdateRepo(c *gin.Context) {
 	var req dto.ImageRepoUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/logs.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -18,8 +17,7 @@ import (
 // @Router /logs/login [post]
 func (b *BaseApi) GetLoginLogs(c *gin.Context) {
 	var req dto.SearchLgLogWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -45,8 +43,7 @@ func (b *BaseApi) GetLoginLogs(c *gin.Context) {
 // @Router /logs/operation [post]
 func (b *BaseApi) GetOperationLogs(c *gin.Context) {
 	var req dto.SearchOpLogWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -73,12 +70,7 @@ func (b *BaseApi) GetOperationLogs(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["logType"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空 [logType] 日志信息","formatEN":"Clean the [logType] log information"}
 func (b *BaseApi) CleanLogs(c *gin.Context) {
 	var req dto.CleanLog
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -114,10 +106,10 @@ func (b *BaseApi) GetSystemFiles(c *gin.Context) {
 // @Router /logs/system [post]
 func (b *BaseApi) GetSystemLogs(c *gin.Context) {
 	var req dto.OperationWithName
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := logService.LoadSystemLog(req.Name)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/monitor.go

@@ -17,14 +17,10 @@ import (
 
 func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	var req dto.MonitorSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	loc, _ := time.LoadLocation(common.LoadTimeZone())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)

backend/app/api/v1/nginx.go

@@ -32,8 +32,7 @@ func (b *BaseApi) GetNginx(c *gin.Context) {
 // @Router /openResty/scope [post]
 func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 	var req request.NginxScopeReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -56,8 +55,7 @@ func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新 nginx 配置 [domain]","formatEN":"Update nginx conf [domain]"}
 func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
 	var req request.NginxConfigUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := nginxService.UpdateConfigByScope(req); err != nil {
@@ -93,8 +91,7 @@ func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 nginx 配置","formatEN":"Update nginx conf"}
 func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
 	var req request.NginxConfigFileUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/process.go

@@ -28,8 +28,7 @@ func (b *BaseApi) ProcessWs(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["PID"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"结束进程 [PID]","formatEN":"结束进程 [PID]"}
 func (b *BaseApi) StopProcess(c *gin.Context) {
 	var req request.ProcessReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := processService.StopProcess(req); err != nil {

backend/app/api/v1/recycle_bin.go

@@ -0,0 +1,86 @@
+package v1
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags File
+// @Summary List RecycleBin files
+// @Description 获取回收站文件列表
+// @Accept json
+// @Param request body dto.PageInfo true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/recycle/search [post]
+func (b *BaseApi) SearchRecycleBinFile(c *gin.Context) {
+	var req dto.PageInfo
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, list, err := recycleBinService.Page(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags File
+// @Summary Reduce RecycleBin files
+// @Description 还原回收站文件
+// @Accept json
+// @Param request body request.RecycleBinReduce true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/recycle/reduce [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"还原回收站文件 [name]","formatEN":"Reduce RecycleBin file [name]"}
+func (b *BaseApi) ReduceRecycleBinFile(c *gin.Context) {
+	var req request.RecycleBinReduce
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := recycleBinService.Reduce(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags File
+// @Summary Clear RecycleBin files
+// @Description 清空回收站文件
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/recycle/clear [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空回收站","formatEN":"清空回收站"}
+func (b *BaseApi) ClearRecycleBinFile(c *gin.Context) {
+	if err := recycleBinService.Clear(); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags File
+// @Summary Get RecycleBin status
+// @Description 获取回收站状态
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/recycle/status [get]
+func (b *BaseApi) GetRecycleStatus(c *gin.Context) {
+	settingInfo, err := settingService.GetSettingInfo()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, settingInfo.FileRecycleBin)
+}

backend/app/api/v1/runtime.go

@@ -46,11 +46,12 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := runtimeService.Create(req); err != nil {
+	ssl, err := runtimeService.Create(req)
+	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.SuccessWithData(c, ssl)
 }
 
 // @Tags Website

backend/app/api/v1/setting.go

@@ -49,12 +49,7 @@ func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统配置 [key] => [value]","formatEN":"update system setting [key] => [value]"}
 func (b *BaseApi) UpdateSetting(c *gin.Context) {
 	var req dto.SettingUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -76,12 +71,7 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统密码","formatEN":"update system password"}
 func (b *BaseApi) UpdatePassword(c *gin.Context) {
 	var req dto.PasswordUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -103,12 +93,7 @@ func (b *BaseApi) UpdatePassword(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ssl"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统 ssl => [ssl]","formatEN":"update system ssl => [ssl]"}
 func (b *BaseApi) UpdateSSL(c *gin.Context) {
 	var req dto.SSLUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -150,6 +135,44 @@ func (b *BaseApi) DownloadSSL(c *gin.Context) {
 	c.File(pathItem)
 }
 
+// @Tags System Setting
+// @Summary Load system address
+// @Description 获取系统地址信息
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/interface [get]
+func (b *BaseApi) LoadInterfaceAddr(c *gin.Context) {
+	data, err := settingService.LoadInterfaceAddr()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags System Setting
+// @Summary Update system bind info
+// @Description 更新系统监听信息
+// @Accept json
+// @Param request body dto.BindInfo true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/bind/update [post]
+// @x-panel-log {"bodyKeys":["ipv6", "bindAddress"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统监听信息 => ipv6: [ipv6], 监听 IP: [bindAddress]","formatEN":"update system bind info => ipv6: [ipv6], 监听 IP: [bindAddress]"}
+func (b *BaseApi) UpdateBindInfo(c *gin.Context) {
+	var req dto.BindInfo
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := settingService.UpdateBindInfo(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags System Setting
 // @Summary Update system port
 // @Description 更新系统端口
@@ -161,12 +184,7 @@ func (b *BaseApi) DownloadSSL(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["serverPort"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统端口 => [serverPort]","formatEN":"update system port => [serverPort]"}
 func (b *BaseApi) UpdatePort(c *gin.Context) {
 	var req dto.PortUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -188,12 +206,7 @@ func (b *BaseApi) UpdatePort(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重置过期密码","formatEN":"reset an expired Password"}
 func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
 	var req dto.PasswordUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -204,43 +217,6 @@ func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags System Setting
-// @Summary Load time zone options
-// @Description 加载系统可用时区
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/time/option [get]
-func (b *BaseApi) LoadTimeZone(c *gin.Context) {
-	zones, err := settingService.LoadTimeZone()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, zones)
-}
-
-// @Tags System Setting
-// @Summary Sync system time
-// @Description 系统时间同步
-// @Accept json
-// @Param request body dto.SyncTime true "request"
-// @Success 200 {string} ntime
-// @Security ApiKeyAuth
-// @Router /settings/time/sync [post]
-// @x-panel-log {"bodyKeys":["ntpSite"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"系统时间同步[ntpSite]","formatEN":"sync system time [ntpSite]"}
-func (b *BaseApi) SyncTime(c *gin.Context) {
-	var req dto.SyncTime
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := settingService.SyncTime(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags System Setting
 // @Summary Load local backup dir
 // @Description 获取安装根目录
@@ -275,37 +251,6 @@ func (b *BaseApi) CleanMonitor(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags System Setting
-// @Summary Scan system
-// @Description 扫描系统垃圾文件
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/scan [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
-func (b *BaseApi) ScanSystem(c *gin.Context) {
-	helper.SuccessWithData(c, settingService.SystemScan())
-}
-
-// @Tags System Setting
-// @Summary System clean
-// @Description 清理系统垃圾文件
-// @Accept json
-// @Param request body []dto.Clean true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/clean [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
-func (b *BaseApi) SystemClean(c *gin.Context) {
-	var req []dto.Clean
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	settingService.SystemClean(req)
-
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags System Setting
 // @Summary Load mfa info
 // @Description 获取 mfa 信息
@@ -316,8 +261,7 @@ func (b *BaseApi) SystemClean(c *gin.Context) {
 // @Router /settings/mfa [post]
 func (b *BaseApi) LoadMFA(c *gin.Context) {
 	var req dto.MfaRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -341,10 +285,10 @@ func (b *BaseApi) LoadMFA(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"mfa 绑定","formatEN":"bind mfa"}
 func (b *BaseApi) MFABind(c *gin.Context) {
 	var req dto.MfaCredential
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	success := mfa.ValidCode(req.Code, req.Interval, req.Secret)
 	if !success {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, errors.New("code is not valid"))

backend/app/api/v1/snapshot.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -19,14 +18,10 @@ import (
 // @x-panel-log {"bodyKeys":["from", "description"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建系统快照 [description] 到 [from]","formatEN":"Create system backup [description] to [from]"}
 func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 	var req dto.SnapshotCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := snapshotService.SnapshotCreate(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -45,14 +40,10 @@ func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["from", "names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [from] 同步系统快照 [names]","formatEN":"Sync system snapshots [names] from [from]"}
 func (b *BaseApi) ImportSnapshot(c *gin.Context) {
 	var req dto.SnapshotImport
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := snapshotService.SnapshotImport(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -70,14 +61,10 @@ func (b *BaseApi) ImportSnapshot(c *gin.Context) {
 // @Router /settings/snapshot/status [post]
 func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
 	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	data, err := snapshotService.LoadSnapShotStatus(req.ID)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -97,14 +84,10 @@ func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"快照 [name] 描述信息修改 [description]","formatEN":"The description of the snapshot [name] is modified => [description]"}
 func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
 	var req dto.UpdateDescription
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := snapshotService.UpdateDescription(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -122,10 +105,10 @@ func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
 // @Router /settings/snapshot/search [post]
 func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 	var req dto.SearchWithPage
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	total, accounts, err := snapshotService.SearchWithPage(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -148,12 +131,7 @@ func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 恢复","formatEN":"Recover from system backup [name]"}
 func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
 	var req dto.SnapshotRecover
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -175,12 +153,7 @@ func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 回滚","formatEN":"Rollback from system backup [name]"}
 func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
 	var req dto.SnapshotRecover
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -202,12 +175,7 @@ func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"删除系统快照 [name]","formatEN":"Delete system backup [name]"}
 func (b *BaseApi) DeleteSnapshot(c *gin.Context) {
 	var req dto.BatchDeleteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/ssh.go

@@ -4,7 +4,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -33,12 +32,7 @@ func (b *BaseApi) GetSSHInfo(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] SSH ","formatEN":"[operation] SSH"}
 func (b *BaseApi) OperateSSH(c *gin.Context) {
 	var req dto.Operate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -53,23 +47,18 @@ func (b *BaseApi) OperateSSH(c *gin.Context) {
 // @Summary Update host SSH setting
 // @Description 更新 SSH 配置
 // @Accept json
-// @Param request body dto.SettingUpdate true "request"
+// @Param request body dto.SSHUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /host/ssh/update [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [value]","formatEN":"update SSH setting [key] => [value]"}
 func (b *BaseApi) UpdateSSH(c *gin.Context) {
-	var req dto.SettingUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	var req dto.SSHUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	if err := sshService.Update(req.Key, req.Value); err != nil {
+	if err := sshService.Update(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
@@ -87,12 +76,7 @@ func (b *BaseApi) UpdateSSH(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件","formatEN":"update SSH conf"}
 func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
 	var req dto.SSHConf
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -114,12 +98,7 @@ func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 SSH 密钥 ","formatEN":"generate SSH secret"}
 func (b *BaseApi) GenerateSSH(c *gin.Context) {
 	var req dto.GenerateSSH
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -140,12 +119,7 @@ func (b *BaseApi) GenerateSSH(c *gin.Context) {
 // @Router /host/ssh/secret [post]
 func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 	var req dto.GenerateLoad
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -167,12 +141,7 @@ func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 // @Router /host/ssh/log/analysis [post]
 func (b *BaseApi) AnalysisLog(c *gin.Context) {
 	var req dto.SearchForAnalysis
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
@@ -194,12 +163,7 @@ func (b *BaseApi) AnalysisLog(c *gin.Context) {
 // @Router /host/ssh/log [post]
 func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 	var req dto.SearchSSHLog
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 

backend/app/api/v1/upgrade.go

@@ -32,10 +32,10 @@ func (b *BaseApi) GetUpgradeInfo(c *gin.Context) {
 // @Router /settings/upgrade [get]
 func (b *BaseApi) GetNotesByVersion(c *gin.Context) {
 	var req dto.Upgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	notes, err := upgradeService.LoadNotes(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -55,10 +55,10 @@ func (b *BaseApi) GetNotesByVersion(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["version"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新系统 => [version]","formatEN":"upgrade service => [version]"}
 func (b *BaseApi) Upgrade(c *gin.Context) {
 	var req dto.Upgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if err := upgradeService.Upgrade(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/website.go

@@ -18,8 +18,7 @@ import (
 // @Router /websites/search [post]
 func (b *BaseApi) PageWebsite(c *gin.Context) {
 	var req request.WebsiteSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	total, websites, err := websiteService.PageWebsite(req)
@@ -74,11 +73,9 @@ func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [primaryDomain]","formatEN":"Create website [primaryDomain]"}
 func (b *BaseApi) CreateWebsite(c *gin.Context) {
 	var req request.WebsiteCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-
 	err := websiteService.CreateWebsite(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -98,8 +95,7 @@ func (b *BaseApi) CreateWebsite(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[operate] 网站 [domain]","formatEN":"[operate] website [domain]"}
 func (b *BaseApi) OpWebsite(c *gin.Context) {
 	var req request.WebsiteOp
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := websiteService.OpWebsite(req)
@@ -121,11 +117,9 @@ func (b *BaseApi) OpWebsite(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除网站 [domain]","formatEN":"Delete website [domain]"}
 func (b *BaseApi) DeleteWebsite(c *gin.Context) {
 	var req request.WebsiteDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-
 	err := websiteService.DeleteWebsite(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -145,8 +139,7 @@ func (b *BaseApi) DeleteWebsite(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站 [primaryDomain]","formatEN":"Update website [primaryDomain]"}
 func (b *BaseApi) UpdateWebsite(c *gin.Context) {
 	var req request.WebsiteUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateWebsite(req); err != nil {
@@ -202,74 +195,6 @@ func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
 	helper.SuccessWithData(c, fileInfo)
 }
 
-// @Tags Website Domain
-// @Summary Search website domains by websiteId
-// @Description 通过网站 id 查询域名
-// @Accept json
-// @Param websiteId path integer true "request"
-// @Success 200 {array} model.WebsiteDomain
-// @Security ApiKeyAuth
-// @Router /websites/domains/:websiteId [get]
-func (b *BaseApi) GetWebDomains(c *gin.Context) {
-	websiteId, err := helper.GetIntParamByKey(c, "websiteId")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
-		return
-	}
-	list, err := websiteService.GetWebsiteDomain(websiteId)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Website Domain
-// @Summary Delete website domain
-// @Description 删除网站域名
-// @Accept json
-// @Param request body request.WebsiteDomainDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/domains/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_domains","output_column":"domain","output_value":"domain"}],"formatZH":"删除域名 [domain]","formatEN":"Delete domain [domain]"}
-func (b *BaseApi) DeleteWebDomain(c *gin.Context) {
-	var req request.WebsiteDomainDelete
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	if err := websiteService.DeleteWebsiteDomain(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Website Domain
-// @Summary Create website domain
-// @Description 创建网站域名
-// @Accept json
-// @Param request body request.WebsiteDomainCreate true "request"
-// @Success 200 {object} model.WebsiteDomain
-// @Security ApiKeyAuth
-// @Router /websites/domains [post]
-// @x-panel-log {"bodyKeys":["domain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建域名 [domain]","formatEN":"Create domain [domain]"}
-func (b *BaseApi) CreateWebDomain(c *gin.Context) {
-	var req request.WebsiteDomainCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	domain, err := websiteService.CreateWebsiteDomain(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, domain)
-}
-
 // @Tags Website Nginx
 // @Summary Load nginx conf
 // @Description 获取 nginx 配置
@@ -280,8 +205,7 @@ func (b *BaseApi) CreateWebDomain(c *gin.Context) {
 // @Router /websites/config [post]
 func (b *BaseApi) GetNginxConfig(c *gin.Context) {
 	var req request.NginxScopeReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	config, err := websiteService.GetNginxConfigByScope(req)
@@ -303,8 +227,7 @@ func (b *BaseApi) GetNginxConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"nginx 配置修改 [domain]","formatEN":"Nginx conf update [domain]"}
 func (b *BaseApi) UpdateNginxConfig(c *gin.Context) {
 	var req request.NginxConfigUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateNginxConfigByScope(req); err != nil {
@@ -347,8 +270,7 @@ func (b *BaseApi) GetHTTPSConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] https 配置","formatEN":"Update website https [domain] conf"}
 func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
 	var req request.WebsiteHTTPSOp
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	tx, ctx := helper.GetTxAndContext()
@@ -372,8 +294,7 @@ func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
 // @Router /websites/check [post]
 func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
 	var req request.WebsiteInstallCheckReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	data, err := websiteService.PreInstallCheck(req)
@@ -394,8 +315,7 @@ func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
 // @Router /websites/waf/config [post]
 func (b *BaseApi) GetWebsiteWafConfig(c *gin.Context) {
 	var req request.WebsiteWafReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	data, err := websiteService.GetWafConfig(req)
@@ -417,8 +337,7 @@ func (b *BaseApi) GetWebsiteWafConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"WAF 配置修改 [domain]","formatEN":"WAF conf update [domain]"}
 func (b *BaseApi) UpdateWebsiteWafConfig(c *gin.Context) {
 	var req request.WebsiteWafUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateWafConfig(req); err != nil {
@@ -439,8 +358,7 @@ func (b *BaseApi) UpdateWebsiteWafConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"WAF 配置文件修改 [domain]","formatEN":"WAF conf file update [domain]"}
 func (b *BaseApi) UpdateWebsiteWafFile(c *gin.Context) {
 	var req request.WebsiteWafFileUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateWafFile(req); err != nil {
@@ -461,8 +379,7 @@ func (b *BaseApi) UpdateWebsiteWafFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain] Nginx 配置修改","formatEN":"[domain] Nginx conf update"}
 func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
 	var req request.WebsiteNginxUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateNginxConfigFile(req); err != nil {
@@ -483,8 +400,7 @@ func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain][operate] 日志","formatEN":"[domain][operate] logs"}
 func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
 	var req request.WebsiteLogReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.OpWebsiteLog(req)
@@ -506,8 +422,7 @@ func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改默认 server => [domain]","formatEN":"Change default server => [domain]"}
 func (b *BaseApi) ChangeDefaultServer(c *gin.Context) {
 	var req request.WebsiteDefaultUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.ChangeDefaultServer(req.ID); err != nil {
@@ -550,8 +465,7 @@ func (b *BaseApi) GetWebsitePHPConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain] PHP 配置修改","formatEN":"[domain] PHP conf update"}
 func (b *BaseApi) UpdateWebsitePHPConfig(c *gin.Context) {
 	var req request.WebsitePHPConfigUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdatePHPConfig(req); err != nil {
@@ -572,8 +486,7 @@ func (b *BaseApi) UpdateWebsitePHPConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 配置修改 [domain]","formatEN":"Nginx conf update [domain]"}
 func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
 	var req request.WebsitePHPFileUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdatePHPConfigFile(req); err != nil {
@@ -594,8 +507,7 @@ func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 版本变更 [domain]","formatEN":"php version update [domain]"}
 func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
 	var req request.WebsitePHPVersionReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.ChangePHPVersion(req); err != nil {
@@ -615,8 +527,7 @@ func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
 // @Router /websites/rewrite [post]
 func (b *BaseApi) GetRewriteConfig(c *gin.Context) {
 	var req request.NginxRewriteReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.GetRewriteConfig(req)
@@ -638,8 +549,7 @@ func (b *BaseApi) GetRewriteConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"伪静态配置修改 [domain]","formatEN":"Nginx conf rewrite update [domain]"}
 func (b *BaseApi) UpdateRewriteConfig(c *gin.Context) {
 	var req request.NginxRewriteUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateRewriteConfig(req); err != nil {
@@ -660,8 +570,7 @@ func (b *BaseApi) UpdateRewriteConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] 目录","formatEN":"Update  domain [domain] dir"}
 func (b *BaseApi) UpdateSiteDir(c *gin.Context) {
 	var req request.WebsiteUpdateDir
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateSiteDir(req); err != nil {
@@ -682,8 +591,7 @@ func (b *BaseApi) UpdateSiteDir(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] 目录权限","formatEN":"Update  domain [domain] dir permission"}
 func (b *BaseApi) UpdateSiteDirPermission(c *gin.Context) {
 	var req request.WebsiteUpdateDirPermission
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateSitePermission(req); err != nil {
@@ -703,8 +611,7 @@ func (b *BaseApi) UpdateSiteDirPermission(c *gin.Context) {
 // @Router /websites/proxies [post]
 func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 	var req request.WebsiteProxyReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.GetProxies(req.ID)
@@ -726,8 +633,7 @@ func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 ","formatEN":"Update domain [domain] proxy config"}
 func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 	var req request.WebsiteProxyConfig
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := websiteService.OperateProxy(req)
@@ -749,8 +655,7 @@ func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新反向代理文件 [domain]","formatEN":"Nginx conf proxy file update [domain]"}
 func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
 	var req request.NginxProxyUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateProxyFile(req); err != nil {
@@ -770,8 +675,7 @@ func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
 // @Router /websites/auths [post]
 func (b *BaseApi) GetAuthConfig(c *gin.Context) {
 	var req request.NginxAuthReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.GetAuthBasics(req)
@@ -792,8 +696,7 @@ func (b *BaseApi) GetAuthConfig(c *gin.Context) {
 // @Router /websites/auths/update [post]
 func (b *BaseApi) UpdateAuthConfig(c *gin.Context) {
 	var req request.NginxAuthUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateAuthBasic(req); err != nil {
@@ -813,8 +716,7 @@ func (b *BaseApi) UpdateAuthConfig(c *gin.Context) {
 // @Router /websites/leech [post]
 func (b *BaseApi) GetAntiLeech(c *gin.Context) {
 	var req request.NginxCommonReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.GetAntiLeech(req.WebsiteID)
@@ -835,8 +737,7 @@ func (b *BaseApi) GetAntiLeech(c *gin.Context) {
 // @Router /websites/leech/update [post]
 func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 	var req request.NginxAntiLeechUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateAntiLeech(req); err != nil {
@@ -857,8 +758,7 @@ func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 重定向理配置 ","formatEN":"Update domain [domain] redirect config"}
 func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
 	var req request.NginxRedirectReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	err := websiteService.OperateRedirect(req)
@@ -879,8 +779,7 @@ func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
 // @Router /websites/redirect [post]
 func (b *BaseApi) GetRedirectConfig(c *gin.Context) {
 	var req request.WebsiteRedirectReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.GetRedirect(req.WebsiteID)
@@ -902,8 +801,7 @@ func (b *BaseApi) GetRedirectConfig(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新重定向文件 [domain]","formatEN":"Nginx conf redirect file update [domain]"}
 func (b *BaseApi) UpdateRedirectConfigFile(c *gin.Context) {
 	var req request.NginxRedirectUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteService.UpdateRedirectFile(req); err != nil {
@@ -923,8 +821,7 @@ func (b *BaseApi) UpdateRedirectConfigFile(c *gin.Context) {
 // @Router /websites/dir [post]
 func (b *BaseApi) GetDirConfig(c *gin.Context) {
 	var req request.WebsiteCommonReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteService.LoadWebsiteDirConfig(req)

backend/app/api/v1/website_acme_account.go

@@ -18,8 +18,7 @@ import (
 // @Router /websites/acme/search [post]
 func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 	var req dto.PageInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	total, accounts, err := websiteAcmeAccountService.Page(req)
@@ -44,8 +43,7 @@ func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["email"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 acme [email]","formatEN":"Create website acme [email]"}
 func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
 	var req request.WebsiteAcmeAccountCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteAcmeAccountService.Create(req)
@@ -67,8 +65,7 @@ func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_acme_accounts","output_column":"email","output_value":"email"}],"formatZH":"删除网站 acme [email]","formatEN":"Delete website acme [email]"}
 func (b *BaseApi) DeleteWebsiteAcmeAccount(c *gin.Context) {
 	var req request.WebsiteResourceReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteAcmeAccountService.Delete(req.ID); err != nil {

backend/app/api/v1/website_ca.go

@@ -0,0 +1,144 @@
+package v1
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Website CA
+// @Summary Page website ca
+// @Description 获取网站 ca 列表分页
+// @Accept json
+// @Param request body request.WebsiteCASearch true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Router /websites/ca/search [post]
+func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
+	var req request.WebsiteCASearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, cas, err := websiteCAService.Page(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Total: total,
+		Items: cas,
+	})
+}
+
+// @Tags Website CA
+// @Summary Create website ca
+// @Description 创建网站 ca
+// @Accept json
+// @Param request body request.WebsiteCACreate true "request"
+// @Success 200 {object} request.WebsiteCACreate
+// @Security ApiKeyAuth
+// @Router /websites/ca [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ca [name]","formatEN":"Create website ca [name]"}
+func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
+	var req request.WebsiteCACreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := websiteCAService.Create(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Website CA
+// @Summary Get website ca
+// @Description 获取网站 ca
+// @Accept json
+// @Param id path int true "id"
+// @Success 200 {object} response.WebsiteCADTO
+// @Security ApiKeyAuth
+// @Router /websites/ca/{id} [get]
+func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		return
+	}
+	res, err := websiteCAService.GetCA(id)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Website CA
+// @Summary Delete website ca
+// @Description 删除网站 ca
+// @Accept json
+// @Param request body request.WebsiteCommonReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/ca/del [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"删除网站 ca [name]","formatEN":"Delete website ca [name]"}
+func (b *BaseApi) DeleteWebsiteCA(c *gin.Context) {
+	var req request.WebsiteCommonReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteCAService.Delete(req.ID); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags Website CA
+// @Summary Obtain SSL
+// @Description 自签 SSL 证书
+// @Accept json
+// @Param request body request.WebsiteCAObtain true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/ca/obtain [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
+func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) {
+	var req request.WebsiteCAObtain
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if _, err := websiteCAService.ObtainSSL(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags Website CA
+// @Summary Obtain SSL
+// @Description 续签 SSL 证书
+// @Accept json
+// @Param request body request.WebsiteCAObtain true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/ca/obtain [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
+func (b *BaseApi) RenewWebsiteCA(c *gin.Context) {
+	var req request.WebsiteCARenew
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if _, err := websiteCAService.ObtainSSL(request.WebsiteCAObtain{
+		SSLID: req.SSLID,
+		Renew: true,
+		Unit:  "year",
+		Time:  1,
+	}); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}

backend/app/api/v1/website_dns_account.go

@@ -18,8 +18,7 @@ import (
 // @Router /websites/dns/search [post]
 func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 	var req dto.PageInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	total, accounts, err := websiteDnsAccountService.Page(req)
@@ -44,8 +43,7 @@ func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 dns [name]","formatEN":"Create website dns [name]"}
 func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
 	var req request.WebsiteDnsAccountCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if _, err := websiteDnsAccountService.Create(req); err != nil {
@@ -66,8 +64,7 @@ func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站 dns [name]","formatEN":"Update website dns [name]"}
 func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
 	var req request.WebsiteDnsAccountUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if _, err := websiteDnsAccountService.Update(req); err != nil {
@@ -88,11 +85,9 @@ func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_dns_accounts","output_column":"name","output_value":"name"}],"formatZH":"删除网站 dns [name]","formatEN":"Delete website dns [name]"}
 func (b *BaseApi) DeleteWebsiteDnsAccount(c *gin.Context) {
 	var req request.WebsiteResourceReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-
 	if err := websiteDnsAccountService.Delete(req.ID); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/website_domain.go

@@ -0,0 +1,73 @@
+package v1
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Website Domain
+// @Summary Delete website domain
+// @Description 删除网站域名
+// @Accept json
+// @Param request body request.WebsiteDomainDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/domains/del [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_domains","output_column":"domain","output_value":"domain"}],"formatZH":"删除域名 [domain]","formatEN":"Delete domain [domain]"}
+func (b *BaseApi) DeleteWebDomain(c *gin.Context) {
+	var req request.WebsiteDomainDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteService.DeleteWebsiteDomain(req.ID); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Website Domain
+// @Summary Create website domain
+// @Description 创建网站域名
+// @Accept json
+// @Param request body request.WebsiteDomainCreate true "request"
+// @Success 200 {object} model.WebsiteDomain
+// @Security ApiKeyAuth
+// @Router /websites/domains [post]
+// @x-panel-log {"bodyKeys":["domain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建域名 [domain]","formatEN":"Create domain [domain]"}
+func (b *BaseApi) CreateWebDomain(c *gin.Context) {
+	var req request.WebsiteDomainCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	domain, err := websiteService.CreateWebsiteDomain(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, domain)
+}
+
+// @Tags Website Domain
+// @Summary Search website domains by websiteId
+// @Description 通过网站 id 查询域名
+// @Accept json
+// @Param websiteId path integer true "request"
+// @Success 200 {array} model.WebsiteDomain
+// @Security ApiKeyAuth
+// @Router /websites/domains/:websiteId [get]
+func (b *BaseApi) GetWebDomains(c *gin.Context) {
+	websiteId, err := helper.GetIntParamByKey(c, "websiteId")
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		return
+	}
+	list, err := websiteService.GetWebsiteDomain(websiteId)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, list)
+}

backend/app/api/v1/website_ssl.go

@@ -1,7 +1,10 @@
 package v1
 
 import (
+	"net/http"
+	"net/url"
 	"reflect"
+	"strconv"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -20,8 +23,7 @@ import (
 // @Router /websites/ssl/search [post]
 func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 	if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {
@@ -55,8 +57,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ssl [primaryDomain]","formatEN":"Create website ssl [primaryDomain]"}
 func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteSSLService.Create(req)
@@ -68,25 +69,24 @@ func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 }
 
 // @Tags Website SSL
-// @Summary Reset website ssl
-// @Description 重置网站 ssl
+// @Summary Apply  ssl
+// @Description 申请证书
 // @Accept json
-// @Param request body request.WebsiteSSLRenew true "request"
+// @Param request body request.WebsiteSSLApply true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /websites/ssl/renew [post]
-// @x-panel-log {"bodyKeys":["SSLId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"SSLId","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"重置 ssl [domain]","formatEN":"Renew ssl [domain]"}
-func (b *BaseApi) RenewWebsiteSSL(c *gin.Context) {
-	var req request.WebsiteSSLRenew
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+// @Router /websites/ssl/obtain [post]
+// @x-panel-log {"bodyKeys":["ID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ID","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"申请证书  [domain]","formatEN":"apply ssl [domain]"}
+func (b *BaseApi) ApplyWebsiteSSL(c *gin.Context) {
+	var req request.WebsiteSSLApply
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := websiteSSLService.Renew(req.SSLID); err != nil {
+	if err := websiteSSLService.ObtainSSL(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.SuccessWithOutData(c)
 }
 
 // @Tags Website SSL
@@ -99,8 +99,7 @@ func (b *BaseApi) RenewWebsiteSSL(c *gin.Context) {
 // @Router /websites/ssl/resolve [post]
 func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 	var req request.WebsiteDNSReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	res, err := websiteSSLService.GetDNSResolve(req)
@@ -115,18 +114,17 @@ func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 // @Summary Delete website ssl
 // @Description 删除网站 ssl
 // @Accept json
-// @Param request body request.WebsiteResourceReq true "request"
+// @Param request body request.WebsiteBatchDelReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /websites/ssl/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除 ssl [domain]","formatEN":"Delete ssl [domain]"}
+// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除 ssl [domain]","formatEN":"Delete ssl [domain]"}
 func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
-	var req request.WebsiteResourceReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	var req request.WebsiteBatchDelReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := websiteSSLService.Delete(req.ID); err != nil {
+	if err := websiteSSLService.Delete(req.IDs); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
@@ -188,8 +186,7 @@ func (b *BaseApi) GetWebsiteSSLById(c *gin.Context) {
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新证书设置 [domain]","formatEN":"Update ssl config [domain]"}
 func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 	if err := websiteSSLService.Update(req); err != nil {
@@ -198,3 +195,53 @@ func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, nil)
 }
+
+// @Tags Website SSL
+// @Summary Upload ssl
+// @Description 上传 ssl
+// @Accept json
+// @Param request body request.WebsiteSSLUpload true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/ssl/upload [post]
+// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传 ssl [type]","formatEN":"Upload ssl [type]"}
+func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
+	var req request.WebsiteSSLUpload
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteSSLService.Upload(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Website SSL
+// @Summary Download SSL  file
+// @Description 下载证书文件
+// @Accept json
+// @Param request body request.WebsiteResourceReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router  /websites/ssl/download [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"下载证书文件 [domain]","formatEN":"download ssl file [domain]"}
+func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
+	var req request.WebsiteResourceReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	file, err := websiteSSLService.DownloadFile(req.ID)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	info, err := file.Stat()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
+	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
+	http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
+}

backend/app/dto/app.go

@@ -13,12 +13,18 @@ type AppDatabase struct {
 
 type AuthParam struct {
 	RootPassword string `json:"PANEL_DB_ROOT_PASSWORD"`
+	RootUser     string `json:"PANEL_DB_ROOT_USER"`
 }
 
 type RedisAuthParam struct {
 	RootPassword string `json:"PANEL_REDIS_ROOT_PASSWORD"`
 }
 
+type MinioAuthParam struct {
+	RootPassword string `json:"PANEL_MINIO_ROOT_PASSWORD"`
+	RootUser     string `json:"PANEL_MINIO_ROOT_USER"`
+}
+
 type ContainerExec struct {
 	ContainerName string      `json:"containerName"`
 	DbParam       AppDatabase `json:"dbParam"`

backend/app/dto/auth.go

@@ -12,29 +12,29 @@ type UserLoginInfo struct {
 }
 
 type MfaRequest struct {
-	Title    string `json:"title"`
-	Interval int    `json:"interval"`
+	Title    string `json:"title" validate:"required"`
+	Interval int    `json:"interval" validate:"required"`
 }
 
 type MfaCredential struct {
-	Secret   string `json:"secret"`
-	Code     string `json:"code"`
-	Interval string `json:"interval"`
+	Secret   string `json:"secret" validate:"required"`
+	Code     string `json:"code" validate:"required"`
+	Interval string `json:"interval" validate:"required"`
 }
 
 type Login struct {
-	Name          string `json:"name"`
-	Password      string `json:"password"`
+	Name          string `json:"name" validate:"required"`
+	Password      string `json:"password" validate:"required"`
 	IgnoreCaptcha bool   `json:"ignoreCaptcha"`
 	Captcha       string `json:"captcha"`
 	CaptchaID     string `json:"captchaID"`
-	AuthMethod    string `json:"authMethod"`
-	Language      string `json:"language"`
+	AuthMethod    string `json:"authMethod" validate:"required,oneof=jwt session"`
+	Language      string `json:"language" validate:"required,oneof=zh en tw"`
 }
 
 type MFALogin struct {
-	Name       string `json:"name"`
-	Password   string `json:"password"`
-	Code       string `json:"code"`
+	Name       string `json:"name" validate:"required"`
+	Password   string `json:"password" validate:"required"`
+	Code       string `json:"code" validate:"required"`
 	AuthMethod string `json:"authMethod"`
 }

backend/app/dto/backup.go

@@ -31,7 +31,7 @@ type CommonBackup struct {
 	DetailName string `json:"detailName"`
 }
 type CommonRecover struct {
-	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive"`
+	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive WebDAV"`
 	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website"`
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
@@ -41,7 +41,7 @@ type CommonRecover struct {
 type RecordSearch struct {
 	PageInfo
 	Type       string `json:"type" validate:"required"`
-	Name       string `json:"name" validate:"required"`
+	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 }
 
@@ -52,10 +52,11 @@ type BackupRecords struct {
 	BackupType string    `json:"backupType"`
 	FileDir    string    `json:"fileDir"`
 	FileName   string    `json:"fileName"`
+	Size       int64     `json:"size"`
 }
 
 type DownloadRecord struct {
-	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive"`
+	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive WebDAV"`
 	FileDir  string `json:"fileDir" validate:"required"`
 	FileName string `json:"fileName" validate:"required"`
 }

backend/app/dto/command.go

@@ -1,13 +1,29 @@
 package dto
 
+type SearchCommandWithPage struct {
+	SearchWithPage
+	GroupID uint   `json:"groupID"`
+	Info    string `json:"info"`
+}
+
 type CommandOperate struct {
-	ID      uint   `json:"id"`
-	Name    string `json:"name" validate:"required"`
-	Command string `json:"command" validate:"required"`
+	ID          uint   `json:"id"`
+	GroupID     uint   `json:"groupID"`
+	GroupBelong string `json:"groupBelong"`
+	Name        string `json:"name" validate:"required"`
+	Command     string `json:"command" validate:"required"`
 }
 
 type CommandInfo struct {
-	ID      uint   `json:"id"`
-	Name    string `json:"name"`
-	Command string `json:"command"`
+	ID          uint   `json:"id"`
+	GroupID     uint   `json:"groupID"`
+	Name        string `json:"name"`
+	Command     string `json:"command"`
+	GroupBelong string `json:"groupBelong"`
+}
+
+type CommandTree struct {
+	ID       uint          `json:"id"`
+	Label    string        `json:"label"`
+	Children []CommandInfo `json:"children"`
 }

backend/app/dto/common_req.go

@@ -41,7 +41,16 @@ type DeleteByName struct {
 	Name string `json:"name" validate:"required"`
 }
 
+type UpdateByFile struct {
+	File string `json:"file"`
+}
+
+type UpdateByNameAndFile struct {
+	Name string `json:"name"`
+	File string `json:"file"`
+}
+
 type OperationWithNameAndType struct {
-	Name string `json:"name" validate:"required"`
+	Name string `json:"name"`
 	Type string `json:"type" validate:"required"`
 }

backend/app/dto/container.go

@@ -5,14 +5,15 @@ import "time"
 type PageContainer struct {
 	PageInfo
 	Name    string `json:"name"`
+	State   string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"`
 	OrderBy string `json:"orderBy"`
 	Order   string `json:"order"`
 	Filters string `json:"filters"`
 }
 
 type InspectReq struct {
-	ID   string `json:"id"`
-	Type string `json:"type"`
+	ID   string `json:"id" validate:"required"`
+	Type string `json:"type" validate:"required"`
 }
 
 type ContainerInfo struct {
@@ -39,8 +40,8 @@ type ResourceLimit struct {
 type ContainerOperate struct {
 	ContainerID     string         `json:"containerID"`
 	ForcePull       bool           `json:"forcePull"`
-	Name            string         `json:"name"`
-	Image           string         `json:"image"`
+	Name            string         `json:"name" validate:"required"`
+	Image           string         `json:"image" validate:"required"`
 	Network         string         `json:"network"`
 	PublishAllPorts bool           `json:"publishAllPorts"`
 	ExposedPorts    []PortHelper   `json:"exposedPorts"`
@@ -51,6 +52,7 @@ type ContainerOperate struct {
 	CPUShares       int64          `json:"cpuShares"`
 	NanoCPUs        float64        `json:"nanoCPUs"`
 	Memory          float64        `json:"memory"`
+	Privileged      bool           `json:"privileged"`
 	AutoRemove      bool           `json:"autoRemove"`
 	Volumes         []VolumeHelper `json:"volumes"`
 	Labels          []string       `json:"labels"`
@@ -103,9 +105,13 @@ type PortHelper struct {
 }
 
 type ContainerOperation struct {
-	Name      string `json:"name" validate:"required"`
-	Operation string `json:"operation" validate:"required,oneof=start stop restart kill pause unpause rename remove"`
-	NewName   string `json:"newName"`
+	Names     []string `json:"names" validate:"required"`
+	Operation string   `json:"operation" validate:"required,oneof=start stop restart kill pause unpause remove"`
+}
+
+type ContainerRename struct {
+	Name    string `json:"name" validate:"required"`
+	NewName string `json:"newName" validate:"required"`
 }
 
 type ContainerPrune struct {
@@ -130,13 +136,21 @@ type Network struct {
 	Attachable bool      `json:"attachable"`
 }
 type NetworkCreate struct {
-	Name    string   `json:"name"`
-	Driver  string   `json:"driver"`
-	Options []string `json:"options"`
-	Subnet  string   `json:"subnet"`
-	Gateway string   `json:"gateway"`
-	IPRange string   `json:"ipRange"`
-	Labels  []string `json:"labels"`
+	Name       string          `json:"name" validate:"required"`
+	Driver     string          `json:"driver" validate:"required"`
+	Options    []string        `json:"options"`
+	Ipv4       bool            `json:"ipv4"`
+	Subnet     string          `json:"subnet"`
+	Gateway    string          `json:"gateway"`
+	IPRange    string          `json:"ipRange"`
+	AuxAddress []SettingUpdate `json:"auxAddress"`
+
+	Ipv6         bool            `json:"ipv6"`
+	SubnetV6     string          `json:"subnetV6"`
+	GatewayV6    string          `json:"gatewayV6"`
+	IPRangeV6    string          `json:"ipRangeV6"`
+	AuxAddressV6 []SettingUpdate `json:"auxAddressV6"`
+	Labels       []string        `json:"labels"`
 }
 
 type Volume struct {
@@ -147,13 +161,14 @@ type Volume struct {
 	CreatedAt  time.Time `json:"createdAt"`
 }
 type VolumeCreate struct {
-	Name    string   `json:"name"`
-	Driver  string   `json:"driver"`
+	Name    string   `json:"name" validate:"required"`
+	Driver  string   `json:"driver" validate:"required"`
 	Options []string `json:"options"`
 	Labels  []string `json:"labels"`
 }
 
 type BatchDelete struct {
+	Force bool     `json:"force"`
 	Names []string `json:"names" validate:"required"`
 }
 

backend/app/dto/cronjob.go

@@ -65,7 +65,7 @@ type CronjobClean struct {
 
 type CronjobBatchDelete struct {
 	CleanData bool   `json:"cleanData"`
-	IDs       []uint `json:"ids"`
+	IDs       []uint `json:"ids" validate:"required"`
 }
 
 type CronjobInfo struct {

backend/app/dto/dashboard.go

@@ -43,7 +43,12 @@ type DashboardCurrent struct {
 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryAvailable   uint64  `json:"memoryAvailable"`
 	MemoryUsed        uint64  `json:"memoryUsed"`
-	MemoryUsedPercent float64 `json:"MemoryUsedPercent"`
+	MemoryUsedPercent float64 `json:"memoryUsedPercent"`
+
+	SwapMemoryTotal       uint64  `json:"swapMemoryTotal"`
+	SwapMemoryAvailable   uint64  `json:"swapMemoryAvailable"`
+	SwapMemoryUsed        uint64  `json:"swapMemoryUsed"`
+	SwapMemoryUsedPercent float64 `json:"swapMemoryUsedPercent"`
 
 	IOReadBytes  uint64 `json:"ioReadBytes"`
 	IOWriteBytes uint64 `json:"ioWriteBytes"`

backend/app/dto/database.go

@@ -170,7 +170,7 @@ type RedisConfPersistenceUpdate struct {
 	Save        string `json:"save"`
 }
 type RedisConfUpdateByFile struct {
-	File       string `json:"file"`
+	File       string `json:"file" validate:"required"`
 	RestartNow bool   `json:"restartNow"`
 }
 
@@ -227,17 +227,24 @@ type DatabaseSearch struct {
 }
 
 type DatabaseInfo struct {
-	ID          uint      `json:"id"`
-	CreatedAt   time.Time `json:"createdAt"`
-	Name        string    `json:"name" validate:"max=256"`
-	From        string    `json:"from"`
-	Type        string    `json:"type"`
-	Version     string    `json:"version"`
-	Address     string    `json:"address"`
-	Port        uint      `json:"port"`
-	Username    string    `json:"username"`
-	Password    string    `json:"password"`
-	Description string    `json:"description"`
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+	Name      string    `json:"name" validate:"max=256"`
+	From      string    `json:"from"`
+	Type      string    `json:"type"`
+	Version   string    `json:"version"`
+	Address   string    `json:"address"`
+	Port      uint      `json:"port"`
+	Username  string    `json:"username"`
+	Password  string    `json:"password"`
+
+	SSL        bool   `json:"ssl"`
+	RootCert   string `json:"rootCert"`
+	ClientKey  string `json:"clientKey"`
+	ClientCert string `json:"clientCert"`
+	SkipVerify bool   `json:"skipVerify"`
+
+	Description string `json:"description"`
 }
 
 type DatabaseOption struct {
@@ -250,25 +257,39 @@ type DatabaseOption struct {
 }
 
 type DatabaseCreate struct {
-	Name        string `json:"name" validate:"required,max=256"`
-	Type        string `json:"type" validate:"required"`
-	From        string `json:"from" validate:"required,oneof=local remote"`
-	Version     string `json:"version" validate:"required"`
-	Address     string `json:"address"`
-	Port        uint   `json:"port"`
-	Username    string `json:"username" validate:"required"`
-	Password    string `json:"password" validate:"required"`
+	Name     string `json:"name" validate:"required,max=256"`
+	Type     string `json:"type" validate:"required"`
+	From     string `json:"from" validate:"required,oneof=local remote"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password" validate:"required"`
+
+	SSL        bool   `json:"ssl"`
+	RootCert   string `json:"rootCert"`
+	ClientKey  string `json:"clientKey"`
+	ClientCert string `json:"clientCert"`
+	SkipVerify bool   `json:"skipVerify"`
+
 	Description string `json:"description"`
 }
 
 type DatabaseUpdate struct {
-	ID          uint   `json:"id"`
-	Type        string `json:"type" validate:"required"`
-	Version     string `json:"version" validate:"required"`
-	Address     string `json:"address"`
-	Port        uint   `json:"port"`
-	Username    string `json:"username" validate:"required"`
-	Password    string `json:"password" validate:"required"`
+	ID       uint   `json:"id"`
+	Type     string `json:"type" validate:"required"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password" validate:"required"`
+
+	SSL        bool   `json:"ssl"`
+	RootCert   string `json:"rootCert"`
+	ClientKey  string `json:"clientKey"`
+	ClientCert string `json:"clientCert"`
+	SkipVerify bool   `json:"skipVerify"`
+
 	Description string `json:"description"`
 }
 

backend/app/dto/device.go

@@ -0,0 +1,41 @@
+package dto
+
+type DeviceBaseInfo struct {
+	DNS       []string     `json:"dns"`
+	Hosts     []HostHelper `json:"hosts"`
+	Hostname  string       `json:"hostname"`
+	TimeZone  string       `json:"timeZone"`
+	LocalTime string       `json:"localTime"`
+	Ntp       string       `json:"ntp"`
+	User      string       `json:"user"`
+
+	SwapMemoryTotal     uint64 `json:"swapMemoryTotal"`
+	SwapMemoryAvailable uint64 `json:"swapMemoryAvailable"`
+	SwapMemoryUsed      uint64 `json:"swapMemoryUsed"`
+	MaxSize             uint64 `json:"maxSize"`
+
+	SwapDetails []SwapHelper `json:"swapDetails"`
+}
+
+type HostHelper struct {
+	IP   string `json:"ip"`
+	Host string `json:"host"`
+}
+
+type SwapHelper struct {
+	Path string `json:"path" validate:"required"`
+	Size uint64 `json:"size"`
+	Used string `json:"used"`
+
+	IsNew bool `json:"isNew"`
+}
+
+type TimeZoneOptions struct {
+	From  string   `json:"from"`
+	Zones []string `json:"zones"`
+}
+
+type ChangePasswd struct {
+	User   string `json:"user"`
+	Passwd string `json:"passwd"`
+}

backend/app/dto/docker.go

@@ -14,6 +14,11 @@ type DaemonJsonConf struct {
 	IPTables     bool     `json:"iptables"`
 	CgroupDriver string   `json:"cgroupDriver"`
 
+	Ipv6         bool   `json:"ipv6"`
+	FixedCidrV6  string `json:"fixedCidrV6"`
+	Ip6Tables    bool   `json:"ip6Tables"`
+	Experimental bool   `json:"experimental"`
+
 	LogMaxSize string `json:"logMaxSize"`
 	LogMaxFile string `json:"logMaxFile"`
 }
@@ -23,6 +28,12 @@ type LogOption struct {
 	LogMaxFile string `json:"logMaxFile"`
 }
 
+type Ipv6Option struct {
+	FixedCidrV6  string `json:"fixedCidrV6"`
+	Ip6Tables    bool   `json:"ip6Tables" validate:"required"`
+	Experimental bool   `json:"experimental"`
+}
+
 type DockerOperation struct {
 	Operation string `json:"operation" validate:"required,oneof=start restart stop"`
 }

backend/app/dto/fail2ban.go

@@ -0,0 +1,29 @@
+package dto
+
+type Fail2BanBaseInfo struct {
+	IsEnable bool   `json:"isEnable"`
+	IsActive bool   `json:"isActive"`
+	IsExist  bool   `json:"isExist"`
+	Version  string `json:"version"`
+
+	Port      int    `json:"port"`
+	MaxRetry  int    `json:"maxRetry"`
+	BanTime   string `json:"banTime"`
+	FindTime  string `json:"findTime"`
+	BanAction string `json:"banAction"`
+	LogPath   string `json:"logPath"`
+}
+
+type Fail2BanSearch struct {
+	Status string `json:"status" validate:"required,oneof=banned ignore"`
+}
+
+type Fail2BanUpdate struct {
+	Key   string `json:"key" validate:"required,oneof=port bantime findtime maxretry banaction logpath port"`
+	Value string `json:"value"`
+}
+
+type Fail2BanSet struct {
+	IPs     []string `json:"ips"`
+	Operate string   `json:"operate"  validate:"required,oneof=banned ignore"`
+}

backend/app/dto/request/app.go

@@ -31,6 +31,7 @@ type AppContainerConfig struct {
 	AllowPort     bool    `json:"allowPort"`
 	EditCompose   bool    `json:"editCompose"`
 	DockerCompose string  `json:"dockerCompose"`
+	HostMode      bool    `json:"hostMode"`
 }
 
 type AppInstalledSearch struct {
@@ -40,6 +41,7 @@ type AppInstalledSearch struct {
 	Tags   []string `json:"tags"`
 	Update bool     `json:"update"`
 	Unused bool     `json:"unused"`
+	All    bool     `json:"all"`
 }
 
 type AppInstalledInfo struct {

backend/app/dto/request/favorite.go

@@ -0,0 +1,9 @@
+package request
+
+type FavoriteCreate struct {
+	Path string `json:"path" validate:"required"`
+}
+
+type FavoriteDelete struct {
+	ID uint `json:"id" validate:"required"`
+}

backend/app/dto/request/file.go

@@ -9,6 +9,10 @@ type FileOption struct {
 	files.FileOption
 }
 
+type FileContentReq struct {
+	Path string `json:"path" validate:"required"`
+}
+
 type SearchUploadWithPage struct {
 	dto.PageInfo
 	Path string `json:"path" validate:"required"`
@@ -25,9 +29,18 @@ type FileCreate struct {
 	Sub       bool   `json:"sub"`
 }
 
+type FileRoleReq struct {
+	Paths []string `json:"paths" validate:"required"`
+	Mode  int64    `json:"mode" validate:"required"`
+	User  string   `json:"user" validate:"required"`
+	Group string   `json:"group" validate:"required"`
+	Sub   bool     `json:"sub"`
+}
+
 type FileDelete struct {
-	Path  string `json:"path" validate:"required"`
-	IsDir bool   `json:"isDir"`
+	Path        string `json:"path" validate:"required"`
+	IsDir       bool   `json:"isDir"`
+	ForceDelete bool   `json:"forceDelete"`
 }
 
 type FileBatchDelete struct {
@@ -64,22 +77,25 @@ type FilePathCheck struct {
 }
 
 type FileWget struct {
-	Url  string `json:"url" validate:"required"`
-	Path string `json:"path" validate:"required"`
-	Name string `json:"name" validate:"required"`
+	Url               string `json:"url" validate:"required"`
+	Path              string `json:"path" validate:"required"`
+	Name              string `json:"name" validate:"required"`
+	IgnoreCertificate bool   `json:"ignoreCertificate"`
 }
 
 type FileMove struct {
 	Type     string   `json:"type" validate:"required"`
 	OldPaths []string `json:"oldPaths" validate:"required"`
 	NewPath  string   `json:"newPath" validate:"required"`
+	Name     string   `json:"name"`
+	Cover    bool     `json:"cover"`
 }
 
 type FileDownload struct {
 	Paths    []string `json:"paths" validate:"required"`
 	Type     string   `json:"type" validate:"required"`
 	Name     string   `json:"name" validate:"required"`
-	Compress bool     `json:"compress" validate:"required"`
+	Compress bool     `json:"compress"`
 }
 
 type FileChunkDownload struct {
@@ -99,5 +115,18 @@ type FileRoleUpdate struct {
 	Path  string `json:"path" validate:"required"`
 	User  string `json:"user" validate:"required"`
 	Group string `json:"group" validate:"required"`
-	Sub   bool   `json:"sub" validate:"required"`
+	Sub   bool   `json:"sub"`
+}
+
+type FileReadByLineReq struct {
+	Page     int    `json:"page" validate:"required"`
+	PageSize int    `json:"pageSize" validate:"required"`
+	Type     string `json:"type" validate:"required"`
+	ID       uint   `json:"ID"`
+	Name     string `json:"name"`
+}
+
+type FileExistReq struct {
+	Name string `json:"name" validate:"required"`
+	Dir  string `json:"dir" validate:"required"`
 }

backend/app/dto/request/nginx.go

@@ -4,7 +4,7 @@ import "github.com/1Panel-dev/1Panel/backend/app/dto"
 
 type NginxConfigFileUpdate struct {
 	Content string `json:"content" validate:"required"`
-	Backup  bool   `json:"backup" validate:"required"`
+	Backup  bool   `json:"backup"`
 }
 
 type NginxScopeReq struct {
@@ -14,8 +14,8 @@ type NginxScopeReq struct {
 
 type NginxConfigUpdate struct {
 	Scope     dto.NginxKey `json:"scope"`
-	Operate   string       `json:"operate" validate:"required;oneof=add update delete"`
-	WebsiteID uint         `json:"websiteId" validate:"required"`
+	Operate   string       `json:"operate" validate:"required,oneof=add update delete"`
+	WebsiteID uint         `json:"websiteId"`
 	Params    interface{}  `json:"params"`
 }
 
@@ -39,8 +39,8 @@ type NginxProxyUpdate struct {
 type NginxAuthUpdate struct {
 	WebsiteID uint   `json:"websiteID" validate:"required"`
 	Operate   string `json:"operate" validate:"required"`
-	Username  string `json:"username"  validate:"required"`
-	Password  string `json:"password" validate:"required"`
+	Username  string `json:"username"`
+	Password  string `json:"password"`
 	Remark    string `json:"remark"`
 }
 
@@ -56,7 +56,7 @@ type NginxAntiLeechUpdate struct {
 	WebsiteID   uint     `json:"websiteID" validate:"required"`
 	Extends     string   `json:"extends" validate:"required"`
 	Return      string   `json:"return" validate:"required"`
-	Enable      bool     `json:"enable"  validate:"required"`
+	Enable      bool     `json:"enable" `
 	ServerNames []string `json:"serverNames"`
 	Cache       bool     `json:"cache"`
 	CacheTime   int      `json:"cacheTime"`
@@ -70,8 +70,8 @@ type NginxRedirectReq struct {
 	Name         string   `json:"name" validate:"required"`
 	WebsiteID    uint     `json:"websiteID" validate:"required"`
 	Domains      []string `json:"domains"`
-	KeepPath     bool     `json:"keepPath" validate:"required"`
-	Enable       bool     `json:"enable" validate:"required"`
+	KeepPath     bool     `json:"keepPath"`
+	Enable       bool     `json:"enable"`
 	Type         string   `json:"type" validate:"required"`
 	Redirect     string   `json:"redirect" validate:"required"`
 	Path         string   `json:"path"`

backend/app/dto/request/recycle_bin.go

@@ -0,0 +1,11 @@
+package request
+
+type RecycleBinCreate struct {
+	SourcePath string `json:"sourcePath" validate:"required"`
+}
+
+type RecycleBinReduce struct {
+	From  string `json:"from" validate:"required"`
+	RName string `json:"rName" validate:"required"`
+	Name  string `json:"name"`
+}

backend/app/dto/request/runtime.go

@@ -23,9 +23,15 @@ type RuntimeCreate struct {
 }
 
 type NodeConfig struct {
-	Install bool `json:"install"`
-	Clean   bool `json:"clean"`
-	Port    int  `json:"port"`
+	Install      bool          `json:"install"`
+	Clean        bool          `json:"clean"`
+	Port         int           `json:"port"`
+	ExposedPorts []ExposedPort `json:"exposedPorts"`
+}
+
+type ExposedPort struct {
+	HostPort      int `json:"hostPort"`
+	ContainerPort int `json:"containerPort"`
 }
 
 type RuntimeDelete struct {

backend/app/dto/request/website.go

@@ -45,7 +45,7 @@ type NewAppInstall struct {
 }
 
 type WebsiteInstallCheckReq struct {
-	InstallIds []uint `json:"InstallIds" validate:"required"`
+	InstallIds []uint `json:"InstallIds"`
 }
 
 type WebsiteUpdate struct {
@@ -78,13 +78,13 @@ type WebsiteWafReq struct {
 type WebsiteRedirectUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
-	Enable    bool   `json:"enable" validate:"required"`
+	Enable    bool   `json:"enable"`
 }
 
 type WebsiteWafUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
-	Enable    bool   `json:"enable" validate:"required"`
+	Enable    bool   `json:"enable"`
 }
 
 type WebsiteRecover struct {
@@ -111,9 +111,8 @@ type WebsiteGroupUpdate struct {
 }
 
 type WebsiteDomainCreate struct {
-	WebsiteID uint   `json:"websiteId" validate:"required"`
-	Port      int    `json:"port" validate:"required"`
-	Domain    string `json:"domain" validate:"required"`
+	WebsiteID uint   `json:"websiteID" validate:"required"`
+	Domains   string `json:"domains" validate:"required"`
 }
 
 type WebsiteDomainDelete struct {
@@ -122,7 +121,7 @@ type WebsiteDomainDelete struct {
 
 type WebsiteHTTPSOp struct {
 	WebsiteID       uint     `json:"websiteId" validate:"required"`
-	Enable          bool     `json:"enable" validate:"required"`
+	Enable          bool     `json:"enable"`
 	WebsiteSSLID    uint     `json:"websiteSSLId"`
 	Type            string   `json:"type"  validate:"oneof=existed auto manual"`
 	PrivateKey      string   `json:"privateKey"`
@@ -149,7 +148,7 @@ type WebsiteLogReq struct {
 }
 
 type WebsiteDefaultUpdate struct {
-	ID uint `json:"id" validate:"required"`
+	ID uint `json:"id"`
 }
 
 type WebsitePHPConfigUpdate struct {
@@ -169,7 +168,7 @@ type WebsitePHPFileUpdate struct {
 type WebsitePHPVersionReq struct {
 	WebsiteID    uint `json:"websiteID" validate:"required"`
 	RuntimeID    uint `json:"runtimeID" validate:"required"`
-	RetainConfig bool `json:"retainConfig" validate:"required"`
+	RetainConfig bool `json:"retainConfig" `
 }
 
 type WebsiteUpdateDir struct {
@@ -186,10 +185,10 @@ type WebsiteUpdateDirPermission struct {
 type WebsiteProxyConfig struct {
 	ID        uint              `json:"id" validate:"required"`
 	Operate   string            `json:"operate" validate:"required"`
-	Enable    bool              `json:"enable"  validate:"required"`
-	Cache     bool              `json:"cache"  validate:"required"`
-	CacheTime int               `json:"cacheTime"  validate:"required"`
-	CacheUnit string            `json:"cacheUnit" validate:"required"`
+	Enable    bool              `json:"enable" `
+	Cache     bool              `json:"cache" `
+	CacheTime int               `json:"cacheTime"  `
+	CacheUnit string            `json:"cacheUnit"`
 	Name      string            `json:"name" validate:"required"`
 	Modifier  string            `json:"modifier" validate:"required"`
 	Match     string            `json:"match" validate:"required"`
@@ -211,7 +210,7 @@ type WebsiteRedirectReq struct {
 type WebsiteWafFileUpdate struct {
 	WebsiteID uint   `json:"websiteID" validate:"required"`
 	Content   string `json:"content" validate:"required"`
-	Type      string `json:"type" validate:"required,oneof=cc ip_white ip_block url_white url_block cookie_block args_check post_check ua_check file_ext_block"`
+	Type      string `json:"type" validate:"required,oneof=cc ip_white ip_block url_white url_block cookie_block args_check post_check ua_check file_ext_block user_agent"`
 }
 
 type WebsiteCommonReq struct {

backend/app/dto/request/website_ssl.go

@@ -13,7 +13,13 @@ type WebsiteSSLCreate struct {
 	Provider      string `json:"provider" validate:"required"`
 	AcmeAccountID uint   `json:"acmeAccountId" validate:"required"`
 	DnsAccountID  uint   `json:"dnsAccountId"`
-	AutoRenew     bool   `json:"autoRenew" validate:"required"`
+	AutoRenew     bool   `json:"autoRenew"`
+	KeyType       string `json:"keyType"`
+	Apply         bool   `json:"apply"`
+	PushDir       bool   `json:"pushDir"`
+	Dir           string `json:"dir"`
+	ID            uint   `json:"id"`
+	Description   string `json:"description"`
 }
 
 type WebsiteDNSReq struct {
@@ -25,8 +31,16 @@ type WebsiteSSLRenew struct {
 	SSLID uint `json:"SSLId" validate:"required"`
 }
 
+type WebsiteSSLApply struct {
+	ID uint `json:"ID" validate:"required"`
+}
+
 type WebsiteAcmeAccountCreate struct {
-	Email string `json:"email" validate:"required"`
+	Email      string `json:"email" validate:"required"`
+	Type       string `json:"type" validate:"required,oneof=letsencrypt zerossl buypass google"`
+	KeyType    string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
+	EabKid     string `json:"eabKid"`
+	EabHmacKey string `json:"eabHmacKey"`
 }
 
 type WebsiteDnsAccountCreate struct {
@@ -46,7 +60,55 @@ type WebsiteResourceReq struct {
 	ID uint `json:"id" validate:"required"`
 }
 
+type WebsiteBatchDelReq struct {
+	IDs []uint `json:"ids" validate:"required"`
+}
+
 type WebsiteSSLUpdate struct {
-	ID        uint `json:"id" validate:"required"`
-	AutoRenew bool `json:"autoRenew" validate:"required"`
+	ID          uint   `json:"id" validate:"required"`
+	AutoRenew   bool   `json:"autoRenew"`
+	Description string `json:"description"`
+}
+
+type WebsiteSSLUpload struct {
+	PrivateKey      string `json:"privateKey"`
+	Certificate     string `json:"certificate"`
+	PrivateKeyPath  string `json:"privateKeyPath"`
+	CertificatePath string `json:"certificatePath"`
+	Type            string `json:"type" validate:"required,oneof=paste local"`
+	SSLID           uint   `json:"sslID"`
+	Description     string `json:"description"`
+}
+
+type WebsiteCASearch struct {
+	dto.PageInfo
+}
+
+type WebsiteCACreate struct {
+	CommonName       string `json:"commonName" validate:"required"`
+	Country          string `json:"country" validate:"required"`
+	Organization     string `json:"organization" validate:"required"`
+	OrganizationUint string `json:"organizationUint"`
+	Name             string `json:"name" validate:"required"`
+	KeyType          string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
+	Province         string `json:"province" `
+	City             string `json:"city"`
+}
+
+type WebsiteCAObtain struct {
+	ID          uint   `json:"id" validate:"required"`
+	Domains     string `json:"domains" validate:"required"`
+	KeyType     string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
+	Time        int    `json:"time" validate:"required"`
+	Unit        string `json:"unit" validate:"required"`
+	PushDir     bool   `json:"pushDir"`
+	Dir         string `json:"dir"`
+	AutoRenew   bool   `json:"autoRenew"`
+	Renew       bool   `json:"renew"`
+	SSLID       uint   `json:"sslID"`
+	Description string `json:"description"`
+}
+
+type WebsiteCARenew struct {
+	SSLID uint `json:"SSLID" validate:"required"`
 }

backend/app/dto/response/app.go

@@ -15,6 +15,7 @@ type AppRes struct {
 
 type AppUpdateRes struct {
 	CanUpdate            bool         `json:"canUpdate"`
+	IsSyncing            bool         `json:"isSyncing"`
 	AppStoreLastModified int          `json:"appStoreLastModified"`
 	AppList              *dto.AppList `json:"appList"`
 }
@@ -47,9 +48,10 @@ type AppInstalledCheck struct {
 
 type AppDetailDTO struct {
 	model.AppDetail
-	Enable bool        `json:"enable"`
-	Params interface{} `json:"params"`
-	Image  string      `json:"image"`
+	Enable   bool        `json:"enable"`
+	Params   interface{} `json:"params"`
+	Image    string      `json:"image"`
+	HostMode bool        `json:"hostMode"`
 }
 
 type IgnoredApp struct {

backend/app/dto/response/favorite.go

@@ -0,0 +1,7 @@
+package response
+
+import "github.com/1Panel-dev/1Panel/backend/app/model"
+
+type FavoriteDTO struct {
+	model.Favorite
+}

backend/app/dto/response/file.go

@@ -32,3 +32,13 @@ type FileProcessKeys struct {
 type FileWgetRes struct {
 	Key string `json:"key"`
 }
+
+type FileLineContent struct {
+	Content string `json:"content"`
+	End     bool   `json:"end"`
+	Path    string `json:"path"`
+}
+
+type FileExist struct {
+	Exist bool `json:"exist"`
+}

backend/app/dto/response/recycle_bin.go

@@ -0,0 +1,14 @@
+package response
+
+import "time"
+
+type RecycleBinDTO struct {
+	Name       string    `json:"name"`
+	Size       int       `json:"size"`
+	Type       string    `json:"type"`
+	DeleteTime time.Time `json:"deleteTime"`
+	RName      string    `json:"rName"`
+	SourcePath string    `json:"sourcePath"`
+	IsDir      bool      `json:"isDir"`
+	From       string    `json:"from"`
+}

backend/app/dto/response/runtime.go

@@ -1,28 +1,30 @@
 package response
 
 import (
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"time"
 )
 
 type RuntimeDTO struct {
-	ID          uint                   `json:"id"`
-	Name        string                 `json:"name"`
-	Resource    string                 `json:"resource"`
-	AppDetailID uint                   `json:"appDetailID"`
-	AppID       uint                   `json:"appID"`
-	Source      string                 `json:"source"`
-	Status      string                 `json:"status"`
-	Type        string                 `json:"type"`
-	Image       string                 `json:"image"`
-	Params      map[string]interface{} `json:"params"`
-	Message     string                 `json:"message"`
-	Version     string                 `json:"version"`
-	CreatedAt   time.Time              `json:"createdAt"`
-	CodeDir     string                 `json:"codeDir"`
-	AppParams   []AppParam             `json:"appParams"`
-	Port        int                    `json:"port"`
-	Path        string                 `json:"path"`
+	ID           uint                   `json:"id"`
+	Name         string                 `json:"name"`
+	Resource     string                 `json:"resource"`
+	AppDetailID  uint                   `json:"appDetailID"`
+	AppID        uint                   `json:"appID"`
+	Source       string                 `json:"source"`
+	Status       string                 `json:"status"`
+	Type         string                 `json:"type"`
+	Image        string                 `json:"image"`
+	Params       map[string]interface{} `json:"params"`
+	Message      string                 `json:"message"`
+	Version      string                 `json:"version"`
+	CreatedAt    time.Time              `json:"createdAt"`
+	CodeDir      string                 `json:"codeDir"`
+	AppParams    []AppParam             `json:"appParams"`
+	Port         int                    `json:"port"`
+	Path         string                 `json:"path"`
+	ExposedPorts []request.ExposedPort  `json:"exposedPorts"`
 }
 
 type PackageScripts struct {

backend/app/dto/response/website_ssl.go

@@ -4,6 +4,7 @@ import "github.com/1Panel-dev/1Panel/backend/app/model"
 
 type WebsiteSSLDTO struct {
 	model.WebsiteSSL
+	LogPath string `json:"logPath"`
 }
 
 type WebsiteDNSRes struct {
@@ -21,3 +22,13 @@ type WebsiteDnsAccountDTO struct {
 	model.WebsiteDnsAccount
 	Authorization map[string]string `json:"authorization"`
 }
+
+type WebsiteCADTO struct {
+	model.WebsiteCA
+	CommonName       string `json:"commonName" `
+	Country          string `json:"country"`
+	Organization     string `json:"organization"`
+	OrganizationUint string `json:"organizationUint"`
+	Province         string `json:"province" `
+	City             string `json:"city"`
+}

backend/app/dto/setting.go

@@ -3,10 +3,11 @@ package dto
 import "time"
 
 type SettingInfo struct {
-	UserName      string `json:"userName"`
-	Email         string `json:"email"`
-	SystemIP      string `json:"systemIP"`
-	SystemVersion string `json:"systemVersion"`
+	UserName       string `json:"userName"`
+	Email          string `json:"email"`
+	SystemIP       string `json:"systemIP"`
+	SystemVersion  string `json:"systemVersion"`
+	DockerSockPath string `json:"dockerSockPath"`
 
 	SessionTimeout string `json:"sessionTimeout"`
 	LocalTime      string `json:"localTime"`
@@ -14,6 +15,8 @@ type SettingInfo struct {
 	NtpSite        string `json:"ntpSite"`
 
 	Port           string `json:"port"`
+	Ipv6           string `json:"ipv6"`
+	BindAddress    string `json:"bindAddress"`
 	PanelName      string `json:"panelName"`
 	Theme          string `json:"theme"`
 	Language       string `json:"language"`
@@ -46,6 +49,9 @@ type SettingInfo struct {
 
 	AppStoreVersion      string `json:"appStoreVersion"`
 	AppStoreLastModified string `json:"appStoreLastModified"`
+	AppStoreSyncStatus   string `json:"appStoreSyncStatus"`
+
+	FileRecycleBin string `json:"fileRecycleBin"`
 }
 
 type SettingUpdate struct {
@@ -54,7 +60,7 @@ type SettingUpdate struct {
 }
 
 type SSLUpdate struct {
-	SSLType string `json:"sslType"`
+	SSLType string `json:"sslType" validate:"required,oneof=self select import-paste import-local"`
 	Domain  string `json:"domain"`
 	SSL     string `json:"ssl" validate:"required,oneof=enable disable"`
 	Cert    string `json:"cert"`
@@ -94,7 +100,7 @@ type SnapshotStatus struct {
 
 type SnapshotCreate struct {
 	ID          uint   `json:"id"`
-	From        string `json:"from" validate:"required,oneof=OSS S3 SFTP MINIO COS KODO OneDrive"`
+	From        string `json:"from" validate:"required,oneof=OSS S3 SFTP MINIO COS KODO OneDrive WebDAV"`
 	Description string `json:"description" validate:"max=256"`
 }
 type SnapshotRecover struct {
@@ -133,11 +139,16 @@ type UpgradeInfo struct {
 }
 
 type SyncTime struct {
-	NtpSite string `json:"ntpSite"`
+	NtpSite string `json:"ntpSite" validate:"required"`
+}
+
+type BindInfo struct {
+	Ipv6        string `json:"ipv6" validate:"required,oneof=enable disable"`
+	BindAddress string `json:"bindAddress" validate:"required"`
 }
 
 type Upgrade struct {
-	Version string `json:"version"`
+	Version string `json:"version" validate:"required"`
 }
 
 type CleanData struct {

backend/app/dto/ssh.go

@@ -2,7 +2,14 @@ package dto
 
 import "time"
 
+type SSHUpdate struct {
+	Key      string `json:"key" validate:"required"`
+	OldValue string `json:"oldValue"`
+	NewValue string `json:"newValue"`
+}
+
 type SSHInfo struct {
+	AutoStart              bool   `json:"autoStart"`
 	Status                 string `json:"status"`
 	Message                string `json:"message"`
 	Port                   string `json:"port"`

backend/app/model/app.go

@@ -1,5 +1,11 @@
 package model
 
+import (
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"path/filepath"
+	"strings"
+)
+
 type App struct {
 	BaseModel
 	Name               string `json:"name" gorm:"type:varchar(64);not null"`
@@ -24,3 +30,14 @@ type App struct {
 	TagsKey []string    `json:"tags" yaml:"tags" gorm:"-"`
 	AppTags []AppTag    `json:"-" gorm:"-:migration"`
 }
+
+func (i *App) IsLocalApp() bool {
+	return i.Resource == constant.ResourceLocal
+}
+func (i *App) GetAppResourcePath() string {
+	if i.IsLocalApp() {
+		//这里要去掉本地应用的local前缀
+		return filepath.Join(constant.LocalAppResourceDir, strings.TrimPrefix(i.Key, "local"))
+	}
+	return filepath.Join(constant.RemoteAppResourceDir, i.Key)
+}

backend/app/model/app_install.go

@@ -27,18 +27,18 @@ type AppInstall struct {
 }
 
 func (i *AppInstall) GetPath() string {
-	return path.Join(i.getAppPath(), i.Name)
+	return path.Join(i.GetAppPath(), i.Name)
 }
 
 func (i *AppInstall) GetComposePath() string {
-	return path.Join(i.getAppPath(), i.Name, "docker-compose.yml")
+	return path.Join(i.GetAppPath(), i.Name, "docker-compose.yml")
 }
 
 func (i *AppInstall) GetEnvPath() string {
-	return path.Join(i.getAppPath(), i.Name, ".env")
+	return path.Join(i.GetAppPath(), i.Name, ".env")
 }
 
-func (i *AppInstall) getAppPath() string {
+func (i *AppInstall) GetAppPath() string {
 	if i.App.Resource == constant.AppResourceLocal {
 		return path.Join(constant.LocalAppInstallDir, strings.TrimPrefix(i.App.Key, constant.AppResourceLocal))
 	} else {

backend/app/model/command.go

@@ -3,5 +3,6 @@ package model
 type Command struct {
 	BaseModel
 	Name    string `gorm:"type:varchar(64);unique;not null" json:"name"`
+	GroupID uint   `gorm:"type:decimal" json:"groupID"`
 	Command string `gorm:"type:varchar(256);not null" json:"command"`
 }

backend/app/model/database.go

@@ -11,5 +11,12 @@ type Database struct {
 	Port         uint   `json:"port" gorm:"type:decimal;not null"`
 	Username     string `json:"username" gorm:"type:varchar(64)"`
 	Password     string `json:"password" gorm:"type:varchar(64)"`
-	Description  string `json:"description" gorm:"type:varchar(256);"`
+
+	SSL        bool   `json:"ssl"`
+	RootCert   string `json:"rootCert" gorm:"type:longText"`
+	ClientKey  string `json:"clientKey" gorm:"type:longText"`
+	ClientCert string `json:"clientCert" gorm:"type:longText"`
+	SkipVerify bool   `json:"skipVerify"`
+
+	Description string `json:"description" gorm:"type:varchar(256);"`
 }

backend/app/model/favorite.go

@@ -0,0 +1,10 @@
+package model
+
+type Favorite struct {
+	BaseModel
+	Name  string `gorm:"type:varchar(256);not null;" json:"name" `
+	Path  string `gorm:"type:varchar(256);not null;unique" json:"path"`
+	Type  string `gorm:"type:varchar(64);" json:"type"`
+	IsDir bool   `json:"isDir"`
+	IsTxt bool   `json:"isTxt"`
+}

backend/app/model/website_acme_account.go

@@ -2,9 +2,13 @@ package model
 
 type WebsiteAcmeAccount struct {
 	BaseModel
-	Email      string `gorm:"type:varchar(256);not null" json:"email"`
-	URL        string `gorm:"type:varchar(256);not null" json:"url"`
-	PrivateKey string `gorm:"type:longtext;not null" json:"-"`
+	Email      string `gorm:"not null" json:"email"`
+	URL        string `gorm:"not null" json:"url"`
+	PrivateKey string `gorm:"not null" json:"-"`
+	Type       string `gorm:"not null;default:letsencrypt" json:"type"`
+	EabKid     string `gorm:"default:null;" json:"eabKid"`
+	EabHmacKey string `gorm:"default:null" json:"eabHmacKey"`
+	KeyType    string `gorm:"not null;default:2048" json:"keyType"`
 }
 
 func (w WebsiteAcmeAccount) TableName() string {

backend/app/model/website_ca.go

@@ -0,0 +1,9 @@
+package model
+
+type WebsiteCA struct {
+	BaseModel
+	CSR        string `gorm:"not null;" json:"csr"`
+	Name       string `gorm:"not null;" json:"name"`
+	PrivateKey string `gorm:"not null" json:"privateKey"`
+	KeyType    string `gorm:"not null;default:2048" json:"keyType"`
+}

backend/app/model/website_ssl.go

@@ -1,6 +1,11 @@
 package model
 
-import "time"
+import (
+	"fmt"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"path"
+	"time"
+)
 
 type WebsiteSSL struct {
 	BaseModel
@@ -14,14 +19,26 @@ type WebsiteSSL struct {
 	Organization  string    `gorm:"type:varchar(64);not null" json:"organization"`
 	DnsAccountID  uint      `gorm:"type:integer;not null" json:"dnsAccountId"`
 	AcmeAccountID uint      `gorm:"type:integer;not null" json:"acmeAccountId"`
+	CaID          uint      `gorm:"type:integer;not null;default:0" json:"caId"`
 	AutoRenew     bool      `gorm:"type:varchar(64);not null" json:"autoRenew"`
 	ExpireDate    time.Time `json:"expireDate"`
 	StartDate     time.Time `json:"startDate"`
+	Status        string    `gorm:"not null;default:ready" json:"status"`
+	Message       string    `json:"message"`
+	KeyType       string    `gorm:"not null;default:2048" json:"keyType"`
+	PushDir       bool      `gorm:"not null;default:0" json:"pushDir"`
+	Dir           string    `json:"dir"`
+	Description   string    `json:"description"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
+	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`
 	Websites    []Website          `json:"websites" gorm:"-:migration"`
 }
 
 func (w WebsiteSSL) TableName() string {
 	return "website_ssls"
 }
+
+func (w WebsiteSSL) GetLogPath() string {
+	return path.Join(constant.SSLLogDir, fmt.Sprintf("%s-ssl-%d.log", w.PrimaryDomain, w.ID))
+}

backend/app/repo/favorite.go

@@ -0,0 +1,66 @@
+package repo
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/model"
+	"github.com/1Panel-dev/1Panel/backend/global"
+	"gorm.io/gorm"
+)
+
+type FavoriteRepo struct{}
+
+type IFavoriteRepo interface {
+	Page(page, size int, opts ...DBOption) (int64, []model.Favorite, error)
+	Create(group *model.Favorite) error
+	Delete(opts ...DBOption) error
+	GetFirst(opts ...DBOption) (model.Favorite, error)
+	All() ([]model.Favorite, error)
+	WithByPath(path string) DBOption
+}
+
+func NewIFavoriteRepo() IFavoriteRepo {
+	return &FavoriteRepo{}
+}
+
+func (f *FavoriteRepo) WithByPath(path string) DBOption {
+	return func(db *gorm.DB) *gorm.DB {
+		return db.Where("path = ?", path)
+	}
+}
+
+func (f *FavoriteRepo) Page(page, size int, opts ...DBOption) (int64, []model.Favorite, error) {
+	var (
+		favorites []model.Favorite
+		count     int64
+	)
+	count = int64(0)
+	db := getDb(opts...).Model(&model.Favorite{})
+	db = db.Count(&count)
+	err := db.Limit(size).Offset(size * (page - 1)).Find(&favorites).Error
+	return count, favorites, err
+}
+
+func (f *FavoriteRepo) Create(favorite *model.Favorite) error {
+	return global.DB.Create(favorite).Error
+}
+
+func (f *FavoriteRepo) GetFirst(opts ...DBOption) (model.Favorite, error) {
+	var favorite model.Favorite
+	db := getDb(opts...).Model(&model.Favorite{})
+	if err := db.First(&favorite).Error; err != nil {
+		return favorite, err
+	}
+	return favorite, nil
+}
+
+func (f *FavoriteRepo) Delete(opts ...DBOption) error {
+	db := getDb(opts...).Model(&model.Favorite{})
+	return db.Delete(&model.Favorite{}).Error
+}
+
+func (f *FavoriteRepo) All() ([]model.Favorite, error) {
+	var favorites []model.Favorite
+	if err := getDb().Find(&favorites).Error; err != nil {
+		return nil, err
+	}
+	return favorites, nil
+}

backend/app/repo/group.go

@@ -15,7 +15,7 @@ type IGroupRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	CancelDefault(groupType string) error
-	WithByIsDefault(isDefault bool) DBOption
+	WithByHostDefault() DBOption
 }
 
 func NewIGroupRepo() IGroupRepo {
@@ -50,9 +50,9 @@ func (u *GroupRepo) Update(id uint, vars map[string]interface{}) error {
 	return global.DB.Model(&model.Group{}).Where("id = ?", id).Updates(vars).Error
 }
 
-func (u *GroupRepo) WithByIsDefault(isDefault bool) DBOption {
+func (u *GroupRepo) WithByHostDefault() DBOption {
 	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("is_default = ?", isDefault)
+		return g.Where("is_default = ? AND type = ?", 1, "host")
 	}
 }
 

backend/app/repo/website.go

@@ -95,7 +95,7 @@ func (w *WebsiteRepo) Page(page, size int, opts ...DBOption) (int64, []model.Web
 
 func (w *WebsiteRepo) List(opts ...DBOption) ([]model.Website, error) {
 	var websites []model.Website
-	err := getDb(opts...).Model(&model.Website{}).Preload("WebsiteSSL").Find(&websites).Error
+	err := getDb(opts...).Model(&model.Website{}).Preload("Domains").Preload("WebsiteSSL").Find(&websites).Error
 	return websites, err
 }
 

backend/app/repo/website_ca.go

@@ -0,0 +1,54 @@
+package repo
+
+import (
+	"context"
+	"github.com/1Panel-dev/1Panel/backend/app/model"
+)
+
+type WebsiteCARepo struct {
+}
+
+func NewIWebsiteCARepo() IWebsiteCARepo {
+	return &WebsiteCARepo{}
+}
+
+type IWebsiteCARepo interface {
+	Page(page, size int, opts ...DBOption) (int64, []model.WebsiteCA, error)
+	GetFirst(opts ...DBOption) (model.WebsiteCA, error)
+	List(opts ...DBOption) ([]model.WebsiteCA, error)
+	Create(ctx context.Context, ca *model.WebsiteCA) error
+	DeleteBy(opts ...DBOption) error
+}
+
+func (w WebsiteCARepo) Page(page, size int, opts ...DBOption) (int64, []model.WebsiteCA, error) {
+	var caList []model.WebsiteCA
+	db := getDb(opts...).Model(&model.WebsiteCA{})
+	count := int64(0)
+	db = db.Count(&count)
+	err := db.Limit(size).Offset(size * (page - 1)).Find(&caList).Error
+	return count, caList, err
+}
+
+func (w WebsiteCARepo) GetFirst(opts ...DBOption) (model.WebsiteCA, error) {
+	var ca model.WebsiteCA
+	db := getDb(opts...).Model(&model.WebsiteCA{})
+	if err := db.First(&ca).Error; err != nil {
+		return ca, err
+	}
+	return ca, nil
+}
+
+func (w WebsiteCARepo) List(opts ...DBOption) ([]model.WebsiteCA, error) {
+	var caList []model.WebsiteCA
+	db := getDb(opts...).Model(&model.WebsiteCA{})
+	err := db.Find(&caList).Error
+	return caList, err
+}
+
+func (w WebsiteCARepo) Create(ctx context.Context, ca *model.WebsiteCA) error {
+	return getTx(ctx).Create(ca).Error
+}
+
+func (w WebsiteCARepo) DeleteBy(opts ...DBOption) error {
+	return getDb(opts...).Delete(&model.WebsiteCA{}).Error
+}

backend/app/repo/website_ssl.go

@@ -14,11 +14,12 @@ type ISSLRepo interface {
 	WithByAlias(alias string) DBOption
 	WithByAcmeAccountId(acmeAccountId uint) DBOption
 	WithByDnsAccountId(dnsAccountId uint) DBOption
+	WithByCAID(caID uint) DBOption
 	Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error)
-	GetFirst(opts ...DBOption) (model.WebsiteSSL, error)
+	GetFirst(opts ...DBOption) (*model.WebsiteSSL, error)
 	List(opts ...DBOption) ([]model.WebsiteSSL, error)
 	Create(ctx context.Context, ssl *model.WebsiteSSL) error
-	Save(ssl model.WebsiteSSL) error
+	Save(ssl *model.WebsiteSSL) error
 	DeleteBy(opts ...DBOption) error
 }
 
@@ -43,19 +44,25 @@ func (w WebsiteSSLRepo) WithByDnsAccountId(dnsAccountId uint) DBOption {
 	}
 }
 
+func (w WebsiteSSLRepo) WithByCAID(caID uint) DBOption {
+	return func(db *gorm.DB) *gorm.DB {
+		return db.Where("ca_id = ?", caID)
+	}
+}
+
 func (w WebsiteSSLRepo) Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error) {
 	var sslList []model.WebsiteSSL
 	db := getDb(opts...).Model(&model.WebsiteSSL{})
 	count := int64(0)
 	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Preload("AcmeAccount").Preload("Websites").Find(&sslList).Error
+	err := db.Limit(size).Offset(size * (page - 1)).Preload("AcmeAccount").Preload("DnsAccount").Preload("Websites").Find(&sslList).Error
 	return count, sslList, err
 }
 
-func (w WebsiteSSLRepo) GetFirst(opts ...DBOption) (model.WebsiteSSL, error) {
-	var website model.WebsiteSSL
+func (w WebsiteSSLRepo) GetFirst(opts ...DBOption) (*model.WebsiteSSL, error) {
+	var website *model.WebsiteSSL
 	db := getDb(opts...).Model(&model.WebsiteSSL{})
-	if err := db.Preload("AcmeAccount").First(&website).Error; err != nil {
+	if err := db.Preload("AcmeAccount").Preload("DnsAccount").First(&website).Error; err != nil {
 		return website, err
 	}
 	return website, nil
@@ -64,7 +71,7 @@ func (w WebsiteSSLRepo) GetFirst(opts ...DBOption) (model.WebsiteSSL, error) {
 func (w WebsiteSSLRepo) List(opts ...DBOption) ([]model.WebsiteSSL, error) {
 	var websites []model.WebsiteSSL
 	db := getDb(opts...).Model(&model.WebsiteSSL{})
-	if err := db.Preload("AcmeAccount").Find(&websites).Error; err != nil {
+	if err := db.Preload("AcmeAccount").Preload("DnsAccount").Find(&websites).Error; err != nil {
 		return websites, err
 	}
 	return websites, nil
@@ -74,7 +81,7 @@ func (w WebsiteSSLRepo) Create(ctx context.Context, ssl *model.WebsiteSSL) error
 	return getTx(ctx).Create(ssl).Error
 }
 
-func (w WebsiteSSLRepo) Save(ssl model.WebsiteSSL) error {
+func (w WebsiteSSLRepo) Save(ssl *model.WebsiteSSL) error {
 	return getDb().Save(&ssl).Error
 }
 

backend/app/service/app.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path"
+	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -61,7 +61,7 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
 	if req.Recommend {
 		opts = append(opts, appRepo.GetRecommend())
 	}
-	if req.Resource != "" {
+	if req.Resource != "" && req.Resource != "all" {
 		opts = append(opts, appRepo.WithResource(req.Resource))
 	}
 	if len(req.Tags) != 0 {
@@ -173,7 +173,8 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 			return appDetailDTO, err
 		}
 		fileOp := files.NewFileOp()
-		versionPath := path.Join(constant.AppResourceDir, app.Resource, app.Key, detail.Version)
+
+		versionPath := filepath.Join(app.GetAppResourcePath(), detail.Version)
 		if !fileOp.Stat(versionPath) || detail.Update {
 			if err = downloadApp(app, detail, nil); err != nil {
 				return appDetailDTO, err
@@ -181,8 +182,8 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 		}
 		switch app.Type {
 		case constant.RuntimePHP:
-			buildPath := path.Join(versionPath, "build")
-			paramsPath := path.Join(buildPath, "config.json")
+			buildPath := filepath.Join(versionPath, "build")
+			paramsPath := filepath.Join(buildPath, "config.json")
 			if !fileOp.Stat(paramsPath) {
 				return appDetailDTO, buserr.New(constant.ErrFileNotExist)
 			}
@@ -195,7 +196,7 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 				return appDetailDTO, err
 			}
 			appDetailDTO.Params = paramMap
-			composePath := path.Join(buildPath, "docker-compose.yml")
+			composePath := filepath.Join(buildPath, "docker-compose.yml")
 			if !fileOp.Stat(composePath) {
 				return appDetailDTO, buserr.New(constant.ErrFileNotExist)
 			}
@@ -222,6 +223,27 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 		appDetailDTO.Params = paramMap
 	}
 
+	if appDetailDTO.DockerCompose == "" {
+		filename := filepath.Base(appDetailDTO.DownloadUrl)
+		dockerComposeUrl := fmt.Sprintf("%s%s", strings.TrimSuffix(appDetailDTO.DownloadUrl, filename), "docker-compose.yml")
+		composeRes, err := http.Get(dockerComposeUrl)
+		if err != nil {
+			return appDetailDTO, buserr.WithDetail("ErrGetCompose", err.Error(), err)
+		}
+		bodyContent, err := io.ReadAll(composeRes.Body)
+		if err != nil {
+			return appDetailDTO, buserr.WithDetail("ErrGetCompose", err.Error(), err)
+		}
+		if composeRes.StatusCode > 200 {
+			return appDetailDTO, buserr.WithDetail("ErrGetCompose", string(bodyContent), err)
+		}
+		detail.DockerCompose = string(bodyContent)
+		_ = appDetailRepo.Update(context.Background(), detail)
+		appDetailDTO.DockerCompose = string(bodyContent)
+	}
+
+	appDetailDTO.HostMode = isHostModel(appDetailDTO.DockerCompose)
+
 	app, err := appRepo.GetFirst(commonRepo.WithByID(detail.AppId))
 	if err != nil {
 		return appDetailDTO, err
@@ -243,6 +265,7 @@ func (a AppService) GetAppDetailByID(id uint) (*response.AppDetailDTO, error) {
 		return nil, err
 	}
 	res.Params = paramMap
+	res.HostMode = isHostModel(appDetail.DockerCompose)
 	return res, nil
 }
 
@@ -467,7 +490,7 @@ func (a AppService) SyncAppListFromLocal() {
 	}
 	for _, dirEntry := range dirEntries {
 		if dirEntry.IsDir() {
-			appDir := path.Join(localAppDir, dirEntry.Name())
+			appDir := filepath.Join(localAppDir, dirEntry.Name())
 			appDirEntries, err := os.ReadDir(appDir)
 			if err != nil {
 				global.LOG.Errorf(i18n.GetMsgWithMap("ErrAppDirNull", map[string]interface{}{"name": dirEntry.Name(), "err": err.Error()}))
@@ -485,7 +508,7 @@ func (a AppService) SyncAppListFromLocal() {
 						Version: appDirEntry.Name(),
 						Status:  constant.AppNormal,
 					}
-					versionDir := path.Join(appDir, appDirEntry.Name())
+					versionDir := filepath.Join(appDir, appDirEntry.Name())
 					if err = handleLocalAppDetail(versionDir, &appDetail); err != nil {
 						global.LOG.Errorf(i18n.GetMsgWithMap("LocalAppVersionErr", map[string]interface{}{"name": app.Name, "version": appDetail.Version, "err": err.Error()}))
 						continue
@@ -693,6 +716,11 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
 	if err != nil {
 		return nil, err
 	}
+	if setting.AppStoreSyncStatus == constant.Syncing {
+		res.IsSyncing = true
+		return res, nil
+	}
+
 	appStoreLastModified, _ := strconv.Atoi(setting.AppStoreLastModified)
 	res.AppStoreLastModified = appStoreLastModified
 	if setting.AppStoreLastModified == "" || lastModified != appStoreLastModified {
@@ -715,11 +743,11 @@ func getAppFromRepo(downloadPath string) error {
 	downloadUrl := downloadPath
 	global.LOG.Infof("[AppStore] download file from %s", downloadUrl)
 	fileOp := files.NewFileOp()
-	packagePath := path.Join(constant.ResourceDir, path.Base(downloadUrl))
+	packagePath := filepath.Join(constant.ResourceDir, filepath.Base(downloadUrl))
 	if err := fileOp.DownloadFile(downloadUrl, packagePath); err != nil {
 		return err
 	}
-	if err := fileOp.Decompress(packagePath, constant.ResourceDir, files.Zip); err != nil {
+	if err := fileOp.Decompress(packagePath, constant.ResourceDir, files.SdkZip); err != nil {
 		return err
 	}
 	defer func() {
@@ -733,7 +761,7 @@ func getAppList() (*dto.AppList, error) {
 	if err := getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.CONF.System.AppRepo, global.CONF.System.Mode)); err != nil {
 		return nil, err
 	}
-	listFile := path.Join(constant.ResourceDir, "1panel.json")
+	listFile := filepath.Join(constant.ResourceDir, "1panel.json")
 	content, err := os.ReadFile(listFile)
 	if err != nil {
 		return nil, err
@@ -744,6 +772,12 @@ func getAppList() (*dto.AppList, error) {
 	return list, nil
 }
 
+var InitTypes = map[string]struct{}{
+	"runtime": {},
+	"php":     {},
+	"node":    {},
+}
+
 func (a AppService) SyncAppListFromRemote() (err error) {
 	global.LOG.Infof("Starting synchronization with App Store...")
 	updateRes, err := a.GetAppUpdate()
@@ -751,9 +785,14 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		return err
 	}
 	if !updateRes.CanUpdate {
+		if updateRes.IsSyncing {
+			global.LOG.Infof("AppStore is Syncing!")
+			return
+		}
 		global.LOG.Infof("The App Store is at the latest version")
 		return
 	}
+
 	list := &dto.AppList{}
 	if updateRes.AppList == nil {
 		list, err = getAppList()
@@ -763,16 +802,8 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 	} else {
 		list = updateRes.AppList
 	}
-
-	if err = NewISettingService().Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
-		return err
-	}
-
-	defer func() {
-		if err != nil {
-			_ = NewISettingService().Update("AppStoreLastModified", strconv.Itoa(updateRes.AppStoreLastModified))
-		}
-	}()
+	settingService := NewISettingService()
+	_ = settingService.Update("AppStoreSyncStatus", constant.Syncing)
 
 	var (
 		tags      []*model.Tag
@@ -796,6 +827,8 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 
 	baseRemoteUrl := fmt.Sprintf("%s/%s/1panel", global.CONF.System.AppRepo, global.CONF.System.Mode)
 	appsMap := getApps(oldApps, list.Apps)
+
+	global.LOG.Infof("Starting synchronization of application details...")
 	for _, l := range list.Apps {
 		app := appsMap[l.AppProperty.Key]
 		iconRes, err := http.Get(l.Icon)
@@ -822,16 +855,21 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 			version := v.Name
 			detail := detailsMap[version]
 			versionUrl := fmt.Sprintf("%s/%s/%s", baseRemoteUrl, app.Key, version)
-			dockerComposeUrl := fmt.Sprintf("%s/%s", versionUrl, "docker-compose.yml")
-			composeRes, err := http.Get(dockerComposeUrl)
-			if err != nil {
-				return err
+
+			if _, ok := InitTypes[app.Type]; ok {
+				dockerComposeUrl := fmt.Sprintf("%s/%s", versionUrl, "docker-compose.yml")
+				composeRes, err := http.Get(dockerComposeUrl)
+				if err != nil {
+					return err
+				}
+				bodyContent, err := io.ReadAll(composeRes.Body)
+				if err != nil {
+					return err
+				}
+				detail.DockerCompose = string(bodyContent)
+			} else {
+				detail.DockerCompose = ""
 			}
-			bodyContent, err := io.ReadAll(composeRes.Body)
-			if err != nil {
-				return err
-			}
-			detail.DockerCompose = string(bodyContent)
 
 			paramByte, _ := json.Marshal(v.AppForm)
 			detail.Params = string(paramByte)
@@ -849,6 +887,8 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		appsMap[l.AppProperty.Key] = app
 	}
 
+	global.LOG.Infof("Synchronization of application details Success")
+
 	var (
 		addAppArray    []model.App
 		updateAppArray []model.App
@@ -973,6 +1013,10 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		}
 	}
 	tx.Commit()
+
+	_ = settingService.Update("AppStoreSyncStatus", constant.SyncSuccess)
+	_ = settingService.Update("AppStoreLastModified", strconv.Itoa(list.LastModified))
+
 	global.LOG.Infof("Synchronization with the App Store was successful!")
 	return
 }

backend/app/service/app_install.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path"
 	"reflect"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -261,6 +262,8 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
 		return syncByID(install.ID)
 	case constant.Upgrade:
 		return upgradeInstall(install.ID, req.DetailId, req.Backup)
+	case constant.Reload:
+		return opNginx(install.ContainerName, constant.NginxReload)
 	default:
 		return errors.New("operate not support")
 	}
@@ -505,6 +508,9 @@ func (a *AppInstallService) GetUpdateVersions(installId uint) ([]dto.AppVersion,
 			})
 		}
 	}
+	sort.Slice(versions, func(i, j int) bool {
+		return common.CompareVersion(versions[i].Version, versions[j].Version)
+	})
 	return versions, nil
 }
 
@@ -518,7 +524,7 @@ func (a *AppInstallService) ChangeAppPort(req request.PortUpdate) error {
 		return nil
 	}
 
-	if err := updateInstallInfoInDB(req.Key, "", "port", true, strconv.FormatInt(req.Port, 10)); err != nil {
+	if err := updateInstallInfoInDB(req.Key, req.Name, "port", true, strconv.FormatInt(req.Port, 10)); err != nil {
 		return nil
 	}
 
@@ -675,6 +681,7 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 		config.ContainerName = install.ContainerName
 	}
 	res.AppContainerConfig = config
+	res.HostMode = isHostModel(install.DockerCompose)
 	return &res, nil
 }
 

backend/app/service/app_utils.go

@@ -118,9 +118,13 @@ var DatabaseKeys = map[string]uint{
 	"memcached":  11211,
 }
 
+var ToolKeys = map[string]uint{
+	"minio": 9001,
+}
+
 func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall, params map[string]interface{}) error {
 	var dbConfig dto.AppDatabase
-	if app.Type == "runtime" && DatabaseKeys[app.Key] > 0 {
+	if DatabaseKeys[app.Key] > 0 {
 		database := &model.Database{
 			AppInstallID: appInstall.ID,
 			Name:         appInstall.Name,
@@ -153,14 +157,6 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 		case "mysql", "mariadb", "postgresql", "mongodb":
 			if password, ok := params["PANEL_DB_ROOT_PASSWORD"]; ok {
 				if password != "" {
-					authParam := dto.AuthParam{
-						RootPassword: password.(string),
-					}
-					authByte, err := json.Marshal(authParam)
-					if err != nil {
-						return err
-					}
-					appInstall.Param = string(authByte)
 					database.Password = password.(string)
 					if app.Key == "mysql" || app.Key == "mariadb" {
 						database.Username = "root"
@@ -168,6 +164,16 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 					if rootUser, ok := params["PANEL_DB_ROOT_USER"]; ok {
 						database.Username = rootUser.(string)
 					}
+					authParam := dto.AuthParam{
+						RootPassword: password.(string),
+						RootUser:     database.Username,
+					}
+					authByte, err := json.Marshal(authParam)
+					if err != nil {
+						return err
+					}
+					appInstall.Param = string(authByte)
+
 				}
 			}
 		case "redis":
@@ -189,6 +195,23 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 			return err
 		}
 	}
+	if ToolKeys[app.Key] > 0 {
+		if app.Key == "minio" {
+			authParam := dto.MinioAuthParam{}
+			if password, ok := params["PANEL_MINIO_ROOT_PASSWORD"]; ok {
+				authParam.RootPassword = password.(string)
+			}
+			if rootUser, ok := params["PANEL_MINIO_ROOT_USER"]; ok {
+				authParam.RootUser = rootUser.(string)
+			}
+			authByte, err := json.Marshal(authParam)
+			if err != nil {
+				return err
+			}
+			appInstall.Param = string(authByte)
+		}
+	}
+
 	if app.Type == "website" || app.Type == "tool" {
 		paramByte, err := json.Marshal(params)
 		if err != nil {
@@ -336,7 +359,6 @@ func deleteAppInstall(install model.AppInstall, deleteBackup bool, forceDelete b
 }
 
 func deleteLink(ctx context.Context, install *model.AppInstall, deleteDB bool, forceDelete bool, deleteBackup bool) error {
-
 	resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
 	if len(resources) == 0 {
 		return nil
@@ -383,33 +405,66 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 			}
 		}
 		var upErr error
+
 		defer func() {
 			if upErr != nil {
+				if backup {
+					if err := NewIBackupService().AppRecover(dto.CommonRecover{Name: install.App.Key, DetailName: install.Name, Type: "app", Source: constant.ResourceLocal}); err != nil {
+						global.LOG.Errorf("recover app [%s] [%s] failed %v", install.App.Key, install.Name, err)
+					}
+				}
 				install.Status = constant.UpgradeErr
 				install.Message = upErr.Error()
 				_ = appInstallRepo.Save(context.Background(), &install)
 			}
 		}()
 
+		fileOp := files.NewFileOp()
 		detailDir := path.Join(constant.ResourceDir, "apps", install.App.Resource, install.App.Key, detail.Version)
 		if install.App.Resource == constant.AppResourceRemote {
 			if upErr = downloadApp(install.App, detail, &install); upErr != nil {
 				return
 			}
+			if detail.DockerCompose == "" {
+				composeDetail, err := fileOp.GetContent(path.Join(detailDir, "docker-compose.yml"))
+				if err != nil {
+					upErr = err
+					return
+				}
+				detail.DockerCompose = string(composeDetail)
+				_ = appDetailRepo.Update(context.Background(), detail)
+			}
 			go func() {
 				_, _ = http.Get(detail.DownloadCallBackUrl)
 			}()
 		}
+
 		if install.App.Resource == constant.AppResourceLocal {
 			detailDir = path.Join(constant.ResourceDir, "apps", "local", strings.TrimPrefix(install.App.Key, "local"), detail.Version)
 		}
 
+		images, err := composeV2.GetDockerComposeImages([]byte(detail.DockerCompose))
+		if err != nil {
+			upErr = err
+			return
+		}
+		dockerCli, err := composeV2.NewClient()
+		if err != nil {
+			upErr = err
+			return
+		}
+		for _, image := range images {
+			if err = dockerCli.PullImage(image, true); err != nil {
+				upErr = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
+				return
+			}
+		}
+
 		command := exec.Command("/bin/bash", "-c", fmt.Sprintf("cp -rn %s/* %s || true", detailDir, install.GetPath()))
 		stdout, _ := command.CombinedOutput()
 		if stdout != nil {
 			global.LOG.Infof("upgrade app [%s] [%s] cp file log : %s ", install.App.Key, install.Name, string(stdout))
 		}
-		fileOp := files.NewFileOp()
 		sourceScripts := path.Join(detailDir, "scripts")
 		if fileOp.Stat(sourceScripts) {
 			dstScripts := path.Join(install.GetPath(), "scripts")
@@ -471,24 +526,6 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 		install.Version = detail.Version
 		install.AppDetailId = detailId
 
-		images, err := getImages(install)
-		if err != nil {
-			upErr = err
-			return
-		}
-		dockerCli, err := composeV2.NewClient()
-		if err != nil {
-			upErr = err
-			return
-		}
-
-		for _, image := range images {
-			if err = dockerCli.PullImage(image, true); err != nil {
-				upErr = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
-				return
-			}
-		}
-
 		if out, err := compose.Down(install.GetComposePath()); err != nil {
 			if out != "" {
 				upErr = errors.New(out)
@@ -550,26 +587,6 @@ func getContainerNames(install model.AppInstall) ([]string, error) {
 	return containerNames, nil
 }
 
-func getImages(install model.AppInstall) ([]string, error) {
-	envStr, err := coverEnvJsonToStr(install.Env)
-	if err != nil {
-		return nil, err
-	}
-	project, err := composeV2.GetComposeProject(install.Name, install.GetPath(), []byte(install.DockerCompose), []byte(envStr), true)
-	if err != nil {
-		return nil, err
-	}
-	imagesMap := make(map[string]struct{})
-	for _, service := range project.AllServices() {
-		imagesMap[service.Image] = struct{}{}
-	}
-	var images []string
-	for k := range imagesMap {
-		images = append(images, k)
-	}
-	return images, nil
-}
-
 func coverEnvJsonToStr(envJson string) (string, error) {
 	envMap := make(map[string]interface{})
 	_ = json.Unmarshal([]byte(envJson), &envMap)
@@ -620,8 +637,12 @@ func handleMap(params map[string]interface{}, envParams map[string]string) {
 }
 
 func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.AppInstall) (err error) {
+	if app.IsLocalApp() {
+		//本地应用,不去官网下载
+		return nil
+	}
 	appResourceDir := path.Join(constant.AppResourceDir, app.Resource)
-	appDownloadDir := path.Join(appResourceDir, app.Key)
+	appDownloadDir := app.GetAppResourcePath()
 	appVersionDir := path.Join(appDownloadDir, appDetail.Version)
 	fileOp := files.NewFileOp()
 	if !appDetail.Update && fileOp.Stat(appVersionDir) {
@@ -649,7 +670,7 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 		global.LOG.Errorf("download app[%s] error %v", app.Name, err)
 		return
 	}
-	if err = fileOp.Decompress(filePath, appResourceDir, files.TarGz); err != nil {
+	if err = fileOp.Decompress(filePath, appResourceDir, files.SdkTarGz); err != nil {
 		global.LOG.Errorf("decompress app[%s] error %v", app.Name, err)
 		return
 	}
@@ -887,28 +908,28 @@ func handleLocalAppDetail(versionDir string, appDetail *model.AppDetail) error {
 	fileOp := files.NewFileOp()
 	dockerComposePath := path.Join(versionDir, "docker-compose.yml")
 	if !fileOp.Stat(dockerComposePath) {
-		return errors.New(i18n.GetMsgWithMap("ErrFileNotFound", map[string]interface{}{"name": "docker-compose.yml"}))
+		return buserr.WithName(constant.ErrFileNotFound, "docker-compose.yml")
 	}
 	dockerComposeByte, _ := fileOp.GetContent(dockerComposePath)
 	if dockerComposeByte == nil {
-		return errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "docker-compose.yml"}))
+		return buserr.WithName(constant.ErrFileParseApp, "docker-compose.yml")
 	}
 	appDetail.DockerCompose = string(dockerComposeByte)
 	paramPath := path.Join(versionDir, "data.yml")
 	if !fileOp.Stat(paramPath) {
-		return errors.New(i18n.GetMsgWithMap("ErrFileNotFound", map[string]interface{}{"name": "data.yml"}))
+		return buserr.WithName(constant.ErrFileNotFound, "data.yml")
 	}
 	paramByte, _ := fileOp.GetContent(paramPath)
 	if paramByte == nil {
-		return errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "data.yml"}))
+		return buserr.WithName(constant.ErrFileNotFound, "data.yml")
 	}
 	appParamConfig := dto.LocalAppParam{}
 	if err := yaml.Unmarshal(paramByte, &appParamConfig); err != nil {
-		return errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "data.yml"}))
+		return buserr.WithMap(constant.ErrFileParseApp, map[string]interface{}{"name": "data.yml", "err": err.Error()}, err)
 	}
 	dataJson, err := json.Marshal(appParamConfig.AppParams)
 	if err != nil {
-		return errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "data.yml", "err": err.Error()}))
+		return buserr.WithMap(constant.ErrFileParseApp, map[string]interface{}{"name": "data.yml", "err": err.Error()}, err)
 	}
 	appDetail.Params = string(dataJson)
 	return nil
@@ -918,22 +939,22 @@ func handleLocalApp(appDir string) (app *model.App, err error) {
 	fileOp := files.NewFileOp()
 	configYamlPath := path.Join(appDir, "data.yml")
 	if !fileOp.Stat(configYamlPath) {
-		err = errors.New(i18n.GetMsgWithMap("ErrFileNotFound", map[string]interface{}{"name": "data.yml"}))
+		err = buserr.WithName(constant.ErrFileNotFound, "data.yml")
 		return
 	}
 	iconPath := path.Join(appDir, "logo.png")
 	if !fileOp.Stat(iconPath) {
-		err = errors.New(i18n.GetMsgWithMap("ErrFileNotFound", map[string]interface{}{"name": "logo.png"}))
+		err = buserr.WithName(constant.ErrFileNotFound, "logo.png")
 		return
 	}
 	configYamlByte, err := fileOp.GetContent(configYamlPath)
 	if err != nil {
-		err = errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "data.yml", "err": err.Error()}))
+		err = buserr.WithMap(constant.ErrFileParseApp, map[string]interface{}{"name": "data.yml", "err": err.Error()}, err)
 		return
 	}
 	localAppDefine := dto.LocalAppAppDefine{}
 	if err = yaml.Unmarshal(configYamlByte, &localAppDefine); err != nil {
-		err = errors.New(i18n.GetMsgWithMap("ErrFileParseApp", map[string]interface{}{"name": "data.yml", "err": err.Error()}))
+		err = buserr.WithMap(constant.ErrFileParseApp, map[string]interface{}{"name": "data.yml", "err": err.Error()}, err)
 		return
 	}
 	app = &localAppDefine.AppProperty
@@ -1142,7 +1163,7 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
 	if portExist {
 		allowHost := "127.0.0.1"
 		if req.Advanced && req.AllowPort {
-			allowHost = "0.0.0.0"
+			allowHost = ""
 		}
 		params[constant.HostIP] = allowHost
 	}
@@ -1154,7 +1175,7 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
 	config := request.AppContainerConfig{}
 
 	if hostIp, ok := envs[constant.HostIP]; ok {
-		config.AllowPort = hostIp.(string) == "0.0.0.0"
+		config.AllowPort = hostIp.(string) != "127.0.0.1"
 	} else {
 		config.AllowPort = true
 	}
@@ -1196,3 +1217,19 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
 
 	return config
 }
+
+func isHostModel(dockerCompose string) bool {
+	composeMap := make(map[string]interface{})
+	_ = yaml.Unmarshal([]byte(dockerCompose), &composeMap)
+	services, serviceValid := composeMap["services"].(map[string]interface{})
+	if !serviceValid {
+		return false
+	}
+	for _, service := range services {
+		serviceValue := service.(map[string]interface{})
+		if value, ok := serviceValue["network_mode"]; ok && value == "host" {
+			return true
+		}
+	}
+	return false
+}

backend/app/service/backup.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"bufio"
 	"context"
 	"encoding/base64"
 	"encoding/json"
@@ -68,6 +69,7 @@ func (u *BackupService) List() ([]dto.BackupInfo, error) {
 	dtobas = append(dtobas, u.loadByType("COS", ops))
 	dtobas = append(dtobas, u.loadByType("KODO", ops))
 	dtobas = append(dtobas, u.loadByType("OneDrive", ops))
+	dtobas = append(dtobas, u.loadByType("WebDAV", ops))
 	return dtobas, err
 }
 
@@ -79,15 +81,46 @@ func (u *BackupService) SearchRecordsWithPage(search dto.RecordSearch) (int64, [
 		commonRepo.WithByType(search.Type),
 		backupRepo.WithByDetailName(search.DetailName),
 	)
-	var dtobas []dto.BackupRecords
-	for _, group := range records {
+
+	var datas []dto.BackupRecords
+	clientMap := make(map[string]loadSizeHelper)
+	for i := 0; i < len(records); i++ {
 		var item dto.BackupRecords
-		if err := copier.Copy(&item, &group); err != nil {
+		if err := copier.Copy(&item, &records[i]); err != nil {
 			return 0, nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
 		}
-		dtobas = append(dtobas, item)
+		itemPath := path.Join(records[i].FileDir, records[i].FileName)
+		if records[i].Source == "LOCAL" {
+			fileInfo, _ := os.Stat(itemPath)
+			item.Size = fileInfo.Size()
+			datas = append(datas, item)
+			continue
+		}
+		if _, ok := clientMap[records[i].Source]; !ok {
+			backup, err := backupRepo.Get(commonRepo.WithByType(records[i].Source))
+			if err != nil {
+				global.LOG.Errorf("load backup model %s from db failed, err: %v", records[i].Source, err)
+				return total, datas, err
+			}
+			client, err := u.NewClient(&backup)
+			if err != nil {
+				global.LOG.Errorf("load backup client %s from db failed, err: %v", records[i].Source, err)
+				return total, datas, err
+			}
+			item.Size, _ = client.Size(path.Join(strings.TrimLeft(backup.BackupPath, "/"), itemPath))
+			datas = append(datas, item)
+			clientMap[records[i].Source] = loadSizeHelper{backupPath: strings.TrimLeft(backup.BackupPath, "/"), client: client}
+			continue
+		}
+		item.Size, _ = clientMap[records[i].Source].client.Size(path.Join(clientMap[records[i].Source].backupPath, itemPath))
+		datas = append(datas, item)
 	}
-	return total, dtobas, err
+	return total, datas, err
+}
+
+type loadSizeHelper struct {
+	backupPath string
+	client     cloud_storage.CloudStorageClient
 }
 
 func (u *BackupService) LoadOneDriveInfo() (string, error) {
@@ -116,7 +149,7 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 	}
 	varMap["bucket"] = backup.Bucket
 	switch backup.Type {
-	case constant.Sftp:
+	case constant.Sftp, constant.WebDAV:
 		varMap["username"] = backup.AccessKey
 		varMap["password"] = backup.Credential
 	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
@@ -137,9 +170,7 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 	}
 	srcPath := fmt.Sprintf("%s/%s", info.FileDir, info.FileName)
 	if len(backup.BackupPath) != 0 {
-		itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-		itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-		srcPath = itemPath + srcPath
+		srcPath = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), srcPath)
 	}
 	if exist, _ := backClient.Exist(srcPath); exist {
 		isOK, err := backClient.Download(srcPath, targetPath)
@@ -150,20 +181,25 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 	return targetPath, nil
 }
 
-func (u *BackupService) Create(backupDto dto.BackupOperate) error {
-	backup, _ := backupRepo.Get(commonRepo.WithByType(backupDto.Type))
+func (u *BackupService) Create(req dto.BackupOperate) error {
+	backup, _ := backupRepo.Get(commonRepo.WithByType(req.Type))
 	if backup.ID != 0 {
 		return constant.ErrRecordExist
 	}
-	if err := copier.Copy(&backup, &backupDto); err != nil {
+	if err := copier.Copy(&backup, &req); err != nil {
 		return errors.WithMessage(constant.ErrStructTransform, err.Error())
 	}
 
-	if backupDto.Type == constant.OneDrive {
+	if req.Type == constant.OneDrive {
 		if err := u.loadAccessToken(&backup); err != nil {
 			return err
 		}
 	}
+	if req.Type != "LOCAL" {
+		if _, err := u.checkBackupConn(&backup); err != nil {
+			return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
+		}
+	}
 	if err := backupRepo.Create(&backup); err != nil {
 		return err
 	}
@@ -176,7 +212,7 @@ func (u *BackupService) GetBuckets(backupDto dto.ForBuckets) ([]interface{}, err
 		return nil, err
 	}
 	switch backupDto.Type {
-	case constant.Sftp:
+	case constant.Sftp, constant.WebDAV:
 		varMap["username"] = backupDto.AccessKey
 		varMap["password"] = backupDto.Credential
 	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
@@ -242,10 +278,15 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 	}
 	upMap := make(map[string]interface{})
 	upMap["bucket"] = req.Bucket
+	upMap["access_key"] = req.AccessKey
 	upMap["credential"] = req.Credential
 	upMap["backup_path"] = req.BackupPath
 	upMap["vars"] = req.Vars
+	backup.Bucket = req.Bucket
 	backup.Vars = req.Vars
+	backup.Credential = req.Credential
+	backup.AccessKey = req.AccessKey
+	backup.BackupPath = req.BackupPath
 
 	if req.Type == constant.OneDrive {
 		if err := u.loadAccessToken(&backup); err != nil {
@@ -254,6 +295,13 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 		upMap["credential"] = backup.Credential
 		upMap["vars"] = backup.Vars
 	}
+	if backup.Type != "LOCAL" {
+		isOk, err := u.checkBackupConn(&backup)
+		if err != nil || !isOk {
+			return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
+		}
+	}
+
 	if err := backupRepo.Update(req.ID, upMap); err != nil {
 		return err
 	}
@@ -309,7 +357,7 @@ func (u *BackupService) NewClient(backup *model.BackupAccount) (cloud_storage.Cl
 	}
 	varMap["bucket"] = backup.Bucket
 	switch backup.Type {
-	case constant.Sftp:
+	case constant.Sftp, constant.WebDAV:
 		varMap["username"] = backup.AccessKey
 		varMap["password"] = backup.Credential
 	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
@@ -441,3 +489,30 @@ func copyDir(src, dst string) error {
 
 	return nil
 }
+
+func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, error) {
+	client, err := u.NewClient(backup)
+	if err != nil {
+		return false, err
+	}
+	fileItem := path.Join(global.CONF.System.TmpDir, "test", "1panel")
+	if _, err := os.Stat(path.Dir(fileItem)); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(path.Dir(fileItem), os.ModePerm); err != nil {
+			return false, err
+		}
+	}
+	file, err := os.OpenFile(fileItem, os.O_WRONLY|os.O_CREATE, 0666)
+	if err != nil {
+		return false, err
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(string("1Panel 备份账号测试文件。\n"))
+	_, _ = write.WriteString(string("1Panel 備份賬號測試文件。\n"))
+	_, _ = write.WriteString(string("1Panel Backs up account test files.\n"))
+	_, _ = write.WriteString(string("1Panelアカウントのテストファイルをバックアップします。\n"))
+	write.Flush()
+
+	targetPath := strings.TrimPrefix(path.Join(backup.BackupPath, "test/1panel"), "/")
+	return client.Upload(fileItem, targetPath)
+}

backend/app/service/backup_app.go

@@ -225,7 +225,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 	_ = fileOp.Rename(appDir, backPath)
 	_ = fileOp.CreateDir(appDir, 0755)
 
-	if err := handleUnTar(tmpPath+"/app.tar.gz", fmt.Sprintf("%s/%s", constant.AppInstallDir, install.App.Key)); err != nil {
+	if err := handleUnTar(tmpPath+"/app.tar.gz", install.GetAppPath()); err != nil {
 		global.LOG.Errorf("handle recover from app.tar.gz failed, err: %v", err)
 		_ = fileOp.DeleteDir(appDir)
 		_ = fileOp.Rename(backPath, appDir)

backend/app/service/command.go

@@ -11,7 +11,8 @@ type CommandService struct{}
 
 type ICommandService interface {
 	List() ([]dto.CommandInfo, error)
-	SearchWithPage(search dto.SearchWithPage) (int64, interface{}, error)
+	SearchForTree() ([]dto.CommandTree, error)
+	SearchWithPage(search dto.SearchCommandWithPage) (int64, interface{}, error)
 	Create(commandDto dto.CommandOperate) error
 	Update(id uint, upMap map[string]interface{}) error
 	Delete(ids []uint) error
@@ -37,14 +38,50 @@ func (u *CommandService) List() ([]dto.CommandInfo, error) {
 	return dtoCommands, err
 }
 
-func (u *CommandService) SearchWithPage(search dto.SearchWithPage) (int64, interface{}, error) {
-	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info))
+func (u *CommandService) SearchForTree() ([]dto.CommandTree, error) {
+	cmdList, err := commandRepo.GetList()
+	if err != nil {
+		return nil, err
+	}
+	groups, err := groupRepo.GetList(commonRepo.WithByType("command"))
+	if err != nil {
+		return nil, err
+	}
+	var lists []dto.CommandTree
+	for _, group := range groups {
+		var data dto.CommandTree
+		data.ID = group.ID + 10000
+		data.Label = group.Name
+		for _, cmd := range cmdList {
+			if cmd.GroupID == group.ID {
+				data.Children = append(data.Children, dto.CommandInfo{ID: cmd.ID, Name: cmd.Name, Command: cmd.Command})
+			}
+		}
+		if len(data.Children) != 0 {
+			lists = append(lists, data)
+		}
+	}
+	return lists, err
+}
+
+func (u *CommandService) SearchWithPage(search dto.SearchCommandWithPage) (int64, interface{}, error) {
+	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info), commonRepo.WithByGroupID(search.GroupID))
+	if err != nil {
+		return 0, nil, err
+	}
+	groups, _ := groupRepo.GetList(commonRepo.WithByType("command"))
 	var dtoCommands []dto.CommandInfo
 	for _, command := range commands {
 		var item dto.CommandInfo
 		if err := copier.Copy(&item, &command); err != nil {
 			return 0, nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
 		}
+		for _, group := range groups {
+			if command.GroupID == group.ID {
+				item.GroupBelong = group.Name
+				item.GroupID = group.ID
+			}
+		}
 		dtoCommands = append(dtoCommands, item)
 	}
 	return total, dtoCommands, err

backend/app/service/container.go

@@ -2,17 +2,18 @@ package service
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -26,6 +27,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/gorilla/websocket"
@@ -52,9 +54,10 @@ type IContainerService interface {
 	ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error)
 	ContainerListStats() ([]dto.ContainerListStats, error)
 	LoadResourceLimit() (*dto.ResourceLimit, error)
+	ContainerRename(req dto.ContainerRename) error
 	ContainerLogClean(req dto.OperationWithName) error
 	ContainerOperation(req dto.ContainerOperation) error
-	ContainerLogs(wsConn *websocket.Conn, container, since, tail string, follow bool) error
+	ContainerLogs(wsConn *websocket.Conn, containerType, container, since, tail string, follow bool) error
 	ContainerStats(id string) (*dto.ContainerStats, error)
 	Inspect(req dto.InspectReq) (string, error)
 	DeleteNetwork(req dto.BatchDelete) error
@@ -66,7 +69,6 @@ type IContainerService interface {
 	Prune(req dto.ContainerPrune) (dto.ContainerPruneReport, error)
 
 	LoadContainerLogs(req dto.OperationWithNameAndType) string
-	ComposeLogs(wsConn *websocket.Conn, composePath, since, tail string, follow bool) error
 }
 
 func NewIContainerService() IContainerService {
@@ -102,6 +104,17 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 			}
 		}
 	}
+	if req.State != "all" {
+		length, count := len(list), 0
+		for count < length {
+			if list[count].State != req.State {
+				list = append(list[:count], list[(count+1):]...)
+				length--
+			} else {
+				count++
+			}
+		}
+	}
 	switch req.OrderBy {
 	case "name":
 		sort.Slice(list, func(i, j int) bool {
@@ -148,7 +161,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 			IsFromApp = true
 		}
 
-		ports := simplifyPort(item.Ports)
+		ports := loadContainerPort(item.Ports)
 		backDatas[i] = dto.ContainerInfo{
 			ContainerID:   item.ID,
 			CreateTime:    time.Unix(item.Created, 0).Format("2006-01-02 15:04:05"),
@@ -316,11 +329,6 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
 		return buserr.New(constant.ErrContainerName)
 	}
 
-	config, hostConf, networkConf, err := loadConfigInfo(true, req, nil)
-	if err != nil {
-		return err
-	}
-	global.LOG.Infof("new container info %s has been made, now start to create", req.Name)
 	if !checkImageExist(client, req.Image) || req.ForcePull {
 		if err := pullImages(ctx, client, req.Image); err != nil {
 			if !req.ForcePull {
@@ -329,6 +337,21 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
 			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
 		}
 	}
+	imageInfo, _, err := client.ImageInspectWithRaw(ctx, req.Image)
+	if err != nil {
+		return err
+	}
+	if len(req.Entrypoint) == 0 {
+		req.Entrypoint = imageInfo.Config.Entrypoint
+	}
+	if len(req.Cmd) == 0 {
+		req.Cmd = imageInfo.Config.Cmd
+	}
+	config, hostConf, networkConf, err := loadConfigInfo(true, req, nil)
+	if err != nil {
+		return err
+	}
+	global.LOG.Infof("new container info %s has been made, now start to create", req.Name)
 	container, err := client.ContainerCreate(ctx, config, hostConf, networkConf, &v1.Platform{}, req.Name)
 	if err != nil {
 		_ = client.ContainerRemove(ctx, req.Name, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
@@ -386,6 +409,7 @@ func (u *ContainerService) ContainerInfo(req dto.OperationWithName) (*dto.Contai
 		}
 	}
 	data.AutoRemove = oldContainer.HostConfig.AutoRemove
+	data.Privileged = oldContainer.HostConfig.Privileged
 	data.PublishAllPorts = oldContainer.HostConfig.PublishAllPorts
 	data.RestartPolicy = oldContainer.HostConfig.RestartPolicy.Name
 	if oldContainer.HostConfig.NanoCPUs != 0 {
@@ -419,7 +443,7 @@ func (u *ContainerService) ContainerUpdate(req dto.ContainerOperate) error {
 			if !req.ForcePull {
 				return err
 			}
-			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
+			return fmt.Errorf("pull image %s failed, err: %v", req.Image, err)
 		}
 	}
 
@@ -462,7 +486,7 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
 			if !req.ForcePull {
 				return err
 			}
-			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
+			return fmt.Errorf("pull image %s failed, err: %v", req.Image, err)
 		}
 	}
 	config := oldContainer.Config
@@ -493,6 +517,20 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
 	return nil
 }
 
+func (u *ContainerService) ContainerRename(req dto.ContainerRename) error {
+	ctx := context.Background()
+	client, err := docker.NewDockerClient()
+	if err != nil {
+		return err
+	}
+
+	newContainer, _ := client.ContainerInspect(ctx, req.NewName)
+	if newContainer.ContainerJSONBase != nil {
+		return buserr.New(constant.ErrContainerName)
+	}
+	return client.ContainerRename(ctx, req.Name, req.NewName)
+}
+
 func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error {
 	var err error
 	ctx := context.Background()
@@ -500,28 +538,24 @@ func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error
 	if err != nil {
 		return err
 	}
-	global.LOG.Infof("start container %s operation %s", req.Name, req.Operation)
-	switch req.Operation {
-	case constant.ContainerOpStart:
-		err = client.ContainerStart(ctx, req.Name, types.ContainerStartOptions{})
-	case constant.ContainerOpStop:
-		err = client.ContainerStop(ctx, req.Name, container.StopOptions{})
-	case constant.ContainerOpRestart:
-		err = client.ContainerRestart(ctx, req.Name, container.StopOptions{})
-	case constant.ContainerOpKill:
-		err = client.ContainerKill(ctx, req.Name, "SIGKILL")
-	case constant.ContainerOpPause:
-		err = client.ContainerPause(ctx, req.Name)
-	case constant.ContainerOpUnpause:
-		err = client.ContainerUnpause(ctx, req.Name)
-	case constant.ContainerOpRename:
-		newContainer, _ := client.ContainerInspect(ctx, req.NewName)
-		if newContainer.ContainerJSONBase != nil {
-			return buserr.New(constant.ErrContainerName)
+	for _, item := range req.Names {
+		global.LOG.Infof("start container %s operation %s", item, req.Operation)
+		switch req.Operation {
+		case constant.ContainerOpStart:
+			err = client.ContainerStart(ctx, item, types.ContainerStartOptions{})
+		case constant.ContainerOpStop:
+			err = client.ContainerStop(ctx, item, container.StopOptions{})
+		case constant.ContainerOpRestart:
+			err = client.ContainerRestart(ctx, item, container.StopOptions{})
+		case constant.ContainerOpKill:
+			err = client.ContainerKill(ctx, item, "SIGKILL")
+		case constant.ContainerOpPause:
+			err = client.ContainerPause(ctx, item)
+		case constant.ContainerOpUnpause:
+			err = client.ContainerUnpause(ctx, item)
+		case constant.ContainerOpRemove:
+			err = client.ContainerRemove(ctx, item, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
 		}
-		err = client.ContainerRename(ctx, req.Name, req.NewName)
-	case constant.ContainerOpRemove:
-		err = client.ContainerRemove(ctx, req.Name, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
 	}
 	return err
 }
@@ -560,11 +594,15 @@ func (u *ContainerService) ContainerLogClean(req dto.OperationWithName) error {
 	return nil
 }
 
-func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, container, since, tail string, follow bool) error {
+func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType, container, since, tail string, follow bool) error {
+	defer func() { wsConn.Close() }()
 	if cmd.CheckIllegal(container, since, tail) {
 		return buserr.New(constant.ErrCmdIllegal)
 	}
 	command := fmt.Sprintf("docker logs %s", container)
+	if containerType == "compose" {
+		command = fmt.Sprintf("docker-compose -f %s logs", container)
+	}
 	if tail != "0" {
 		command += " --tail " + tail
 	}
@@ -576,6 +614,14 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, container, sinc
 	}
 	command += " 2>&1"
 	cmd := exec.Command("bash", "-c", command)
+	if !follow {
+		stdout, _ := cmd.CombinedOutput()
+		if err := wsConn.WriteMessage(websocket.TextMessage, stdout); err != nil {
+			global.LOG.Errorf("send message with log to ws failed, err: %v", err)
+		}
+		return nil
+	}
+
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return err
@@ -583,23 +629,40 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, container, sinc
 	if err := cmd.Start(); err != nil {
 		return err
 	}
+	defer func() {
+		_ = cmd.Process.Signal(syscall.SIGTERM)
+		_ = cmd.Wait()
+	}()
+	var exitCh chan struct{}
+	if follow {
+		go func() {
+			_, wsData, _ := wsConn.ReadMessage()
+			if string(wsData) == "close conn" {
+				exitCh <- struct{}{}
+			}
+		}()
+	}
 
 	buffer := make([]byte, 1024)
 	for {
-		n, err := stdout.Read(buffer)
-		if err != nil {
-			if err == io.EOF {
-				break
+		select {
+		case <-exitCh:
+			return nil
+		default:
+			n, err := stdout.Read(buffer)
+			if err != nil {
+				if err == io.EOF {
+					return err
+				}
+				global.LOG.Errorf("read bytes from log failed, err: %v", err)
+				continue
+			}
+			if err = wsConn.WriteMessage(websocket.TextMessage, buffer[:n]); err != nil {
+				global.LOG.Errorf("send message with log to ws failed, err: %v", err)
+				return err
 			}
-			global.LOG.Errorf("read bytes from container log failed, err: %v", err)
-			continue
-		}
-		if err = wsConn.WriteMessage(websocket.TextMessage, buffer[:n]); err != nil {
-			global.LOG.Errorf("send message with container log to ws failed, err: %v", err)
-			break
 		}
 	}
-	return nil
 }
 
 func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error) {
@@ -638,18 +701,15 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
 
 func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) string {
 	filePath := ""
-	switch req.Type {
-	case "image-pull", "image-push", "image-build", "compose-create":
-		filePath = path.Join(global.CONF.System.TmpDir, fmt.Sprintf("docker_logs/%s", req.Name))
-	case "compose-detail":
-		client, err := docker.NewDockerClient()
+	if req.Type == "compose-detail" {
+		cli, err := docker.NewDockerClient()
 		if err != nil {
 			return ""
 		}
 		options := types.ContainerListOptions{All: true}
 		options.Filters = filters.NewArgs()
 		options.Filters.Add("label", fmt.Sprintf("%s=%s", composeProjectLabel, req.Name))
-		containers, err := client.ContainerList(context.Background(), options)
+		containers, err := cli.ContainerList(context.Background(), options)
 		if err != nil {
 			return ""
 		}
@@ -664,9 +724,6 @@ func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) s
 				break
 			}
 		}
-		if req.Type == "compose-create" {
-			filePath = path.Join(path.Dir(filePath), "compose.log")
-		}
 	}
 	if _, err := os.Stat(filePath); err != nil {
 		return ""
@@ -750,7 +807,25 @@ func checkImageExist(client *client.Client, image string) bool {
 }
 
 func pullImages(ctx context.Context, client *client.Client, image string) error {
-	out, err := client.ImagePull(ctx, image, types.ImagePullOptions{})
+	options := types.ImagePullOptions{}
+	repos, _ := imageRepoRepo.List()
+	if len(repos) != 0 {
+		for _, repo := range repos {
+			if strings.HasPrefix(image, repo.DownloadUrl) && repo.Auth {
+				authConfig := registry.AuthConfig{
+					Username: repo.Username,
+					Password: repo.Password,
+				}
+				encodedJSON, err := json.Marshal(authConfig)
+				if err != nil {
+					return err
+				}
+				authStr := base64.URLEncoding.EncodeToString(encodedJSON)
+				options.RegistryAuth = authStr
+			}
+		}
+	}
+	out, err := client.ImagePull(ctx, image, options)
 	if err != nil {
 		return err
 	}
@@ -867,11 +942,16 @@ func loadConfigInfo(isCreate bool, req dto.ContainerOperate, oldContainer *types
 	config.Tty = req.Tty
 
 	if len(req.Network) != 0 {
+		switch req.Network {
+		case "host", "none", "bridge":
+			hostConf.NetworkMode = container.NetworkMode(req.Network)
+		}
 		networkConf.EndpointsConfig = map[string]*network.EndpointSettings{req.Network: {}}
 	} else {
 		networkConf = network.NetworkingConfig{}
 	}
 
+	hostConf.Privileged = req.Privileged
 	hostConf.AutoRemove = req.AutoRemove
 	hostConf.CPUShares = req.CPUShares
 	hostConf.PublishAllPorts = req.PublishAllPorts
@@ -881,6 +961,7 @@ func loadConfigInfo(isCreate bool, req dto.ContainerOperate, oldContainer *types
 	}
 	hostConf.NanoCPUs = int64(req.NanoCPUs * 1000000000)
 	hostConf.Memory = int64(req.Memory * 1024 * 1024)
+	hostConf.MemorySwap = 0
 	hostConf.PortBindings = portMap
 	hostConf.Binds = []string{}
 	config.Volumes = make(map[string]struct{})
@@ -952,6 +1033,22 @@ func loadVolumeBinds(binds []string) []dto.VolumeHelper {
 	return datas
 }
 
+func loadContainerPort(ports []types.Port) []string {
+	var (
+		ipv4Ports []types.Port
+		ipv6Ports []types.Port
+	)
+	for _, port := range ports {
+		if strings.Contains(port.IP, ":") {
+			ipv6Ports = append(ipv6Ports, port)
+		} else {
+			ipv4Ports = append(ipv4Ports, port)
+		}
+	}
+	list1 := simplifyPort(ipv4Ports)
+	list2 := simplifyPort(ipv6Ports)
+	return append(list1, list2...)
+}
 func simplifyPort(ports []types.Port) []string {
 	var datas []string
 	if len(ports) == 0 {
@@ -982,27 +1079,40 @@ func simplifyPort(ports []types.Port) []string {
 				if start.PublicPort != 0 {
 					itemPortStr = fmt.Sprintf("%s:%v->%v/%s", start.IP, start.PublicPort, start.PrivatePort, start.Type)
 				}
+				if len(start.IP) == 0 {
+					itemPortStr = strings.TrimPrefix(itemPortStr, ":")
+				}
 				datas = append(datas, itemPortStr)
 			} else {
 				itemPortStr := fmt.Sprintf("%s:%v-%v/%s", start.IP, start.PrivatePort, ports[i-1].PrivatePort, start.Type)
 				if start.PublicPort != 0 {
 					itemPortStr = fmt.Sprintf("%s:%v-%v->%v-%v/%s", start.IP, start.PublicPort, ports[i-1].PublicPort, start.PrivatePort, ports[i-1].PrivatePort, start.Type)
 				}
+				if len(start.IP) == 0 {
+					itemPortStr = strings.TrimPrefix(itemPortStr, ":")
+				}
 				datas = append(datas, itemPortStr)
 			}
 			start = ports[i]
-		} else if i == len(ports)-1 {
+		}
+		if i == len(ports)-1 {
 			if ports[i].PrivatePort == start.PrivatePort {
 				itemPortStr := fmt.Sprintf("%s:%v/%s", start.IP, start.PrivatePort, start.Type)
 				if start.PublicPort != 0 {
 					itemPortStr = fmt.Sprintf("%s:%v->%v/%s", start.IP, start.PublicPort, start.PrivatePort, start.Type)
 				}
+				if len(start.IP) == 0 {
+					itemPortStr = strings.TrimPrefix(itemPortStr, ":")
+				}
 				datas = append(datas, itemPortStr)
 			} else {
 				itemPortStr := fmt.Sprintf("%s:%v-%v/%s", start.IP, start.PrivatePort, ports[i].PrivatePort, start.Type)
 				if start.PublicPort != 0 {
 					itemPortStr = fmt.Sprintf("%s:%v-%v->%v-%v/%s", start.IP, start.PublicPort, ports[i].PublicPort, start.PrivatePort, ports[i].PrivatePort, start.Type)
 				}
+				if len(start.IP) == 0 {
+					itemPortStr = strings.TrimPrefix(itemPortStr, ":")
+				}
 				datas = append(datas, itemPortStr)
 			}
 		}

backend/app/service/container_compose.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/gorilla/websocket"
 	"io"
 	"os"
 	"os/exec"
@@ -217,7 +216,8 @@ func (u *ContainerService) ComposeUpdate(req dto.ComposeUpdate) error {
 	if cmd.CheckIllegal(req.Name, req.Path) {
 		return buserr.New(constant.ErrCmdIllegal)
 	}
-	if _, err := os.Stat(req.Path); err != nil {
+	oldFile, err := os.ReadFile(req.Path)
+	if err != nil {
 		return fmt.Errorf("load file with path %s failed, %v", req.Path, err)
 	}
 	file, err := os.OpenFile(req.Path, os.O_WRONLY|os.O_TRUNC, 0640)
@@ -231,10 +231,16 @@ func (u *ContainerService) ComposeUpdate(req dto.ComposeUpdate) error {
 
 	global.LOG.Infof("docker-compose.yml %s has been replaced, now start to docker-compose restart", req.Path)
 	if stdout, err := compose.Down(req.Path); err != nil {
-		return errors.New(string(stdout))
+		if err := recreateCompose(string(oldFile), req.Path); err != nil {
+			return fmt.Errorf("update failed when handle compose down, err: %s, recreate failed: %v", string(stdout), err)
+		}
+		return fmt.Errorf("update failed when handle compose down, err: %s", string(stdout))
 	}
 	if stdout, err := compose.Up(req.Path); err != nil {
-		return errors.New(string(stdout))
+		if err := recreateCompose(string(oldFile), req.Path); err != nil {
+			return fmt.Errorf("update failed when handle compose up, err: %s, recreate failed: %v", string(stdout), err)
+		}
+		return fmt.Errorf("update failed when handle compose up, err: %s", string(stdout))
 	}
 
 	return nil
@@ -263,44 +269,18 @@ func (u *ContainerService) loadPath(req *dto.ComposeCreate) error {
 	return nil
 }
 
-func (u *ContainerService) ComposeLogs(wsConn *websocket.Conn, composePath, since, tail string, follow bool) error {
-	if cmd.CheckIllegal(composePath, since, tail) {
-		return buserr.New(constant.ErrCmdIllegal)
-	}
-	command := fmt.Sprintf("docker-compose -f %s logs", composePath)
-	if tail != "0" {
-		command += " --tail " + tail
-	}
-	if since != "all" {
-		command += " --since " + since
-	}
-	if follow {
-		command += " -f"
-	}
-	command += " 2>&1"
-	cmd := exec.Command("bash", "-c", command)
-	stdout, err := cmd.StdoutPipe()
+func recreateCompose(content, path string) error {
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0640)
 	if err != nil {
 		return err
 	}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(content)
+	write.Flush()
 
-	buffer := make([]byte, 1024)
-	for {
-		n, err := stdout.Read(buffer)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			global.LOG.Errorf("read bytes from compose log failed, err: %v", err)
-			continue
-		}
-		if err = wsConn.WriteMessage(websocket.TextMessage, buffer[:n]); err != nil {
-			global.LOG.Errorf("send message with compose log to ws failed, err: %v", err)
-			break
-		}
+	if stdout, err := compose.Up(path); err != nil {
+		return errors.New(string(stdout))
 	}
 	return nil
 }

backend/app/service/container_network.go

@@ -116,29 +116,57 @@ func (u *ContainerService) CreateNetwork(req dto.NetworkCreate) error {
 		return err
 	}
 	var (
-		ipam    network.IPAMConfig
-		hasConf bool
+		ipams    []network.IPAMConfig
+		enableV6 bool
 	)
-	if len(req.Subnet) != 0 {
-		ipam.Subnet = req.Subnet
-		hasConf = true
+	if req.Ipv4 {
+		var itemIpam network.IPAMConfig
+		if len(req.AuxAddress) != 0 {
+			itemIpam.AuxAddress = make(map[string]string)
+		}
+		if len(req.Subnet) != 0 {
+			itemIpam.Subnet = req.Subnet
+		}
+		if len(req.Gateway) != 0 {
+			itemIpam.Gateway = req.Gateway
+		}
+		if len(req.IPRange) != 0 {
+			itemIpam.IPRange = req.IPRange
+		}
+		for _, addr := range req.AuxAddress {
+			itemIpam.AuxAddress[addr.Key] = addr.Value
+		}
+		ipams = append(ipams, itemIpam)
 	}
-	if len(req.Gateway) != 0 {
-		ipam.Gateway = req.Gateway
-		hasConf = true
-	}
-	if len(req.IPRange) != 0 {
-		ipam.IPRange = req.IPRange
-		hasConf = true
+	if req.Ipv6 {
+		enableV6 = true
+		var itemIpam network.IPAMConfig
+		if len(req.AuxAddress) != 0 {
+			itemIpam.AuxAddress = make(map[string]string)
+		}
+		if len(req.SubnetV6) != 0 {
+			itemIpam.Subnet = req.SubnetV6
+		}
+		if len(req.GatewayV6) != 0 {
+			itemIpam.Gateway = req.GatewayV6
+		}
+		if len(req.IPRangeV6) != 0 {
+			itemIpam.IPRange = req.IPRangeV6
+		}
+		for _, addr := range req.AuxAddressV6 {
+			itemIpam.AuxAddress[addr.Key] = addr.Value
+		}
+		ipams = append(ipams, itemIpam)
 	}
 
 	options := types.NetworkCreate{
-		Driver:  req.Driver,
-		Options: stringsToMap(req.Options),
-		Labels:  stringsToMap(req.Labels),
+		EnableIPv6: enableV6,
+		Driver:     req.Driver,
+		Options:    stringsToMap(req.Options),
+		Labels:     stringsToMap(req.Labels),
 	}
-	if hasConf {
-		options.IPAM = &network.IPAM{Config: []network.IPAMConfig{ipam}}
+	if len(ipams) != 0 {
+		options.IPAM = &network.IPAM{Config: ipams}
 	}
 	if _, err := client.NetworkCreate(context.TODO(), req.Name, options); err != nil {
 		return err

backend/app/service/container_volume.go

@@ -9,6 +9,7 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/docker"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
@@ -19,7 +20,7 @@ func (u *ContainerService) PageVolume(req dto.SearchWithPage) (int64, interface{
 	if err != nil {
 		return 0, nil, err
 	}
-	list, err := client.VolumeList(context.TODO(), filters.NewArgs())
+	list, err := client.VolumeList(context.TODO(), volume.ListOptions{})
 	if err != nil {
 		return 0, nil, err
 	}
@@ -51,15 +52,20 @@ func (u *ContainerService) PageVolume(req dto.SearchWithPage) (int64, interface{
 		records = list.Volumes[start:end]
 	}
 
+	nyc, _ := time.LoadLocation(common.LoadTimeZone())
 	for _, item := range records {
 		tag := make([]string, 0)
 		for _, val := range item.Labels {
 			tag = append(tag, val)
 		}
-		if len(item.CreatedAt) > 19 {
-			item.CreatedAt = item.CreatedAt[0:19]
+		var createTime time.Time
+		if strings.Contains(item.CreatedAt, "Z") {
+			createTime, _ = time.ParseInLocation("2006-01-02T15:04:05Z", item.CreatedAt, nyc)
+		} else if strings.Contains(item.CreatedAt, "+") {
+			createTime, _ = time.ParseInLocation("2006-01-02T15:04:05+08:00", item.CreatedAt, nyc)
+		} else {
+			createTime, _ = time.ParseInLocation("2006-01-02T15:04:05", item.CreatedAt, nyc)
 		}
-		createTime, _ := time.Parse("2006-01-02T15:04:05", item.CreatedAt)
 		data = append(data, dto.Volume{
 			CreatedAt:  createTime,
 			Name:       item.Name,
@@ -76,7 +82,7 @@ func (u *ContainerService) ListVolume() ([]dto.Options, error) {
 	if err != nil {
 		return nil, err
 	}
-	list, err := client.VolumeList(context.TODO(), filters.NewArgs())
+	list, err := client.VolumeList(context.TODO(), volume.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -111,9 +117,9 @@ func (u *ContainerService) CreateVolume(req dto.VolumeCreate) error {
 	if err != nil {
 		return err
 	}
-	var array []filters.KeyValuePair
-	array = append(array, filters.Arg("name", req.Name))
-	vos, _ := client.VolumeList(context.TODO(), filters.NewArgs(array...))
+	arg := filters.NewArgs()
+	arg.Add("name", req.Name)
+	vos, _ := client.VolumeList(context.TODO(), volume.ListOptions{Filters: arg})
 	if len(vos.Volumes) != 0 {
 		for _, v := range vos.Volumes {
 			if v.Name == req.Name {

backend/app/service/cornjob.go

@@ -46,7 +46,7 @@ func (u *CronjobService) SearchWithPage(search dto.SearchWithPage) (int64, inter
 		if err := copier.Copy(&item, &cronjob); err != nil {
 			return 0, nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
 		}
-		if item.Type == "app" || item.Type == "website" || item.Type == "database" || item.Type == "directory" || item.Type == "snapshot" {
+		if hasBackup(item.Type) {
 			backup, _ := backupRepo.Get(commonRepo.WithByID(uint(item.TargetDirID)))
 			if len(backup.Type) != 0 {
 				item.TargetDir = backup.Type
@@ -103,7 +103,7 @@ func (u *CronjobService) CleanRecord(req dto.CronjobClean) error {
 	if err != nil {
 		return err
 	}
-	if req.CleanData && (cronjob.Type == "app" || cronjob.Type == "database" || cronjob.Type == "website" || cronjob.Type == "directory" || cronjob.Type == "snapshot") {
+	if req.CleanData && hasBackup(cronjob.Type) {
 		cronjob.RetainCopies = 0
 		backup, err := backupRepo.Get(commonRepo.WithByID(uint(cronjob.TargetDirID)))
 		if err != nil {

backend/app/service/cronjob_helper.go

@@ -64,6 +64,13 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 			if err != nil {
 				global.LOG.Errorf("cut website log file failed, err: %v", err)
 			}
+		case "clean":
+			messageItem := ""
+			messageItem, err = u.handleSystemClean()
+			message = []byte(messageItem)
+			u.HandleRmExpired("LOCAL", "", "", cronjob, nil)
+		case "log":
+			record.File, err = u.handleSystemLog(*cronjob, record.StartTime)
 		}
 
 		if err != nil {
@@ -150,9 +157,7 @@ func (u *CronjobService) handleBackup(cronjob *model.Cronjob, startTime time.Tim
 				return "", err
 			}
 			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
+				itemFileDir = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), itemFileDir)
 			}
 			if _, err = client.Upload(backupDir+"/"+fileName, itemFileDir+"/"+fileName); err != nil {
 				return "", err
@@ -186,9 +191,7 @@ func (u *CronjobService) HandleRmExpired(backType, backupPath, localDir string,
 				fileItem := file
 				if cronjob.KeepLocal {
 					if len(backupPath) != 0 {
-						itemPath := strings.TrimPrefix(backupPath, "/")
-						itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-						fileItem = itemPath + strings.TrimPrefix(file, localDir+"/")
+						fileItem = path.Join(strings.TrimPrefix(backupPath, "/") + strings.TrimPrefix(file, localDir+"/"))
 					} else {
 						fileItem = strings.TrimPrefix(file, localDir+"/")
 					}
@@ -214,6 +217,7 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string) error {
 
 	excludes := strings.Split(exclusionRules, ",")
 	excludeRules := ""
+	excludes = append(excludes, "*.sock")
 	for _, exclude := range excludes {
 		if len(exclude) == 0 {
 			continue
@@ -324,9 +328,7 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, backup model.Back
 				}()
 			}
 			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
+				itemFileDir = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), itemFileDir)
 			}
 			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
 				return paths, err
@@ -467,9 +469,7 @@ func (u *CronjobService) handleApp(cronjob model.Cronjob, backup model.BackupAcc
 				}()
 			}
 			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
+				itemFileDir = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), itemFileDir)
 			}
 			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
 				return paths, err
@@ -543,9 +543,7 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.Backu
 				}()
 			}
 			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
+				itemFileDir = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), itemFileDir)
 			}
 			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
 				return paths, err
@@ -584,3 +582,118 @@ func (u *CronjobService) handleSnapshot(cronjob *model.Cronjob, startTime time.T
 	u.HandleRmExpired(backup.Type, backup.BackupPath, "", cronjob, client)
 	return message, path, nil
 }
+
+func (u *CronjobService) handleSystemClean() (string, error) {
+	return NewIDeviceService().CleanForCronjob()
+}
+
+func (u *CronjobService) handleSystemLog(cronjob model.Cronjob, startTime time.Time) (string, error) {
+	backup, err := backupRepo.Get(commonRepo.WithByID(uint(cronjob.TargetDirID)))
+	if err != nil {
+		return "", err
+	}
+
+	pathItem := path.Join(global.CONF.System.BaseDir, "1panel/tmp/log", startTime.Format("20060102150405"))
+	websites, err := websiteRepo.List()
+	if err != nil {
+		return "", err
+	}
+	if len(websites) != 0 {
+		nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
+		if err != nil {
+			return "", err
+		}
+		webItem := path.Join(nginxInstall.GetPath(), "www/sites")
+		for _, website := range websites {
+			dirItem := path.Join(pathItem, "website", website.Alias)
+			if _, err := os.Stat(dirItem); err != nil && os.IsNotExist(err) {
+				if err = os.MkdirAll(dirItem, os.ModePerm); err != nil {
+					return "", err
+				}
+			}
+			itemDir := path.Join(webItem, website.Alias, "log")
+			logFiles, _ := os.ReadDir(itemDir)
+			if len(logFiles) != 0 {
+				for i := 0; i < len(logFiles); i++ {
+					if !logFiles[i].IsDir() {
+						_ = cpBinary([]string{path.Join(itemDir, logFiles[i].Name())}, dirItem)
+					}
+				}
+			}
+			itemDir2 := path.Join(global.CONF.System.Backup, "log/website", website.Alias)
+			logFiles2, _ := os.ReadDir(itemDir2)
+			if len(logFiles2) != 0 {
+				for i := 0; i < len(logFiles2); i++ {
+					if !logFiles2[i].IsDir() {
+						_ = cpBinary([]string{path.Join(itemDir2, logFiles2[i].Name())}, dirItem)
+					}
+				}
+			}
+		}
+		global.LOG.Debug("backup website log successful!")
+	}
+
+	systemLogDir := path.Join(global.CONF.System.BaseDir, "1panel/log")
+	systemDir := path.Join(pathItem, "system")
+	if _, err := os.Stat(systemDir); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(systemDir, os.ModePerm); err != nil {
+			return "", err
+		}
+	}
+	systemLogFiles, _ := os.ReadDir(systemLogDir)
+	if len(systemLogFiles) != 0 {
+		for i := 0; i < len(systemLogFiles); i++ {
+			if !systemLogFiles[i].IsDir() {
+				_ = cpBinary([]string{path.Join(systemLogDir, systemLogFiles[i].Name())}, systemDir)
+			}
+		}
+	}
+	global.LOG.Debug("backup system log successful!")
+
+	loginLogFiles, _ := os.ReadDir("/var/log")
+	loginDir := path.Join(pathItem, "login")
+	if _, err := os.Stat(loginDir); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(loginDir, os.ModePerm); err != nil {
+			return "", err
+		}
+	}
+	if len(loginLogFiles) != 0 {
+		for i := 0; i < len(loginLogFiles); i++ {
+			if !loginLogFiles[i].IsDir() && (strings.HasPrefix(loginLogFiles[i].Name(), "secure") || strings.HasPrefix(loginLogFiles[i].Name(), "auth.log")) {
+				_ = cpBinary([]string{path.Join("/var/log", loginLogFiles[i].Name())}, loginDir)
+			}
+		}
+	}
+	global.LOG.Debug("backup ssh log successful!")
+
+	fileName := fmt.Sprintf("system_log_%s.tar.gz", startTime.Format("20060102150405"))
+	targetDir := path.Dir(pathItem)
+	if err := handleTar(pathItem, targetDir, fileName, ""); err != nil {
+		return "", err
+	}
+	defer func() {
+		os.RemoveAll(pathItem)
+		os.RemoveAll(path.Join(targetDir, fileName))
+	}()
+
+	client, err := NewIBackupService().NewClient(&backup)
+	if err != nil {
+		return "", err
+	}
+
+	targetPath := "log/" + fileName
+	if len(backup.BackupPath) != 0 {
+		targetPath = strings.TrimPrefix(backup.BackupPath, "/") + "/log/" + fileName
+	}
+
+	if _, err = client.Upload(path.Join(targetDir, fileName), targetPath); err != nil {
+		return "", err
+	}
+
+	u.HandleRmExpired(backup.Type, backup.BackupPath, "", &cronjob, client)
+	return targetPath, nil
+}
+
+func hasBackup(cronjobType string) bool {
+	return cronjobType == "app" || cronjobType == "database" || cronjobType == "website" || cronjobType == "directory" || cronjobType == "snapshot" || cronjobType == "log"
+}

backend/app/service/dashboard.go

@@ -2,10 +2,14 @@ package service
 
 import (
 	"encoding/json"
+	"fmt"
+	"sort"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
@@ -20,11 +24,31 @@ type DashboardService struct{}
 type IDashboardService interface {
 	LoadBaseInfo(ioOption string, netOption string) (*dto.DashboardBase, error)
 	LoadCurrentInfo(ioOption string, netOption string) *dto.DashboardCurrent
+
+	Restart(operation string) error
 }
 
 func NewIDashboardService() IDashboardService {
 	return &DashboardService{}
 }
+
+func (u *DashboardService) Restart(operation string) error {
+	if operation != "1panel" && operation != "system" {
+		return fmt.Errorf("handle restart operation %s failed, err: nonsupport such operation", operation)
+	}
+	itemCmd := fmt.Sprintf("%s 1pctl restart", cmd.SudoHandleCmd())
+	if operation == "system" {
+		itemCmd = fmt.Sprintf("%s reboot", cmd.SudoHandleCmd())
+	}
+	go func() {
+		stdout, err := cmd.Exec(itemCmd)
+		if err != nil {
+			global.LOG.Errorf("handle %s failed, err: %v", itemCmd, stdout)
+		}
+	}()
+	return nil
+}
+
 func (u *DashboardService) LoadBaseInfo(ioOption string, netOption string) (*dto.DashboardBase, error) {
 	var baseInfo dto.DashboardBase
 	hostInfo, err := host.Info()
@@ -101,6 +125,12 @@ func (u *DashboardService) LoadCurrentInfo(ioOption string, netOption string) *d
 	currentInfo.MemoryUsed = memoryInfo.Used
 	currentInfo.MemoryUsedPercent = memoryInfo.UsedPercent
 
+	swapInfo, _ := mem.SwapMemory()
+	currentInfo.SwapMemoryTotal = swapInfo.Total
+	currentInfo.SwapMemoryAvailable = swapInfo.Free
+	currentInfo.SwapMemoryUsed = swapInfo.Used
+	currentInfo.SwapMemoryUsedPercent = swapInfo.UsedPercent
+
 	currentInfo.DiskData = loadDiskInfo()
 
 	if ioOption == "all" {
@@ -151,7 +181,7 @@ type diskInfo struct {
 
 func loadDiskInfo() []dto.DiskInfo {
 	var datas []dto.DiskInfo
-	stdout, err := cmd.Exec("df -hT -P|grep '/'|grep -v tmpfs|grep -v 'snap/core'|grep -v udev")
+	stdout, err := cmd.ExecWithTimeOut("df -hT -P|grep '/'|grep -v tmpfs|grep -v 'snap/core'|grep -v udev", 2*time.Second)
 	if err != nil {
 		return datas
 	}
@@ -185,24 +215,52 @@ func loadDiskInfo() []dto.DiskInfo {
 		mounts = append(mounts, diskInfo{Type: fields[1], Device: fields[0], Mount: fields[6]})
 	}
 
+	var (
+		wg sync.WaitGroup
+		mu sync.Mutex
+	)
+	wg.Add(len(mounts))
 	for i := 0; i < len(mounts); i++ {
-		state, err := disk.Usage(mounts[i].Mount)
-		if err != nil {
-			continue
-		}
-		var itemData dto.DiskInfo
-		itemData.Path = mounts[i].Mount
-		itemData.Type = mounts[i].Type
-		itemData.Device = mounts[i].Device
-		itemData.Total = state.Total
-		itemData.Free = state.Free
-		itemData.Used = state.Used
-		itemData.UsedPercent = state.UsedPercent
-		itemData.InodesTotal = state.InodesTotal
-		itemData.InodesUsed = state.InodesUsed
-		itemData.InodesFree = state.InodesFree
-		itemData.InodesUsedPercent = state.InodesUsedPercent
-		datas = append(datas, itemData)
+		go func(timeoutCh <-chan time.Time, mount diskInfo) {
+			defer wg.Done()
+
+			var itemData dto.DiskInfo
+			itemData.Path = mount.Mount
+			itemData.Type = mount.Type
+			itemData.Device = mount.Device
+			select {
+			case <-timeoutCh:
+				mu.Lock()
+				datas = append(datas, itemData)
+				mu.Unlock()
+				global.LOG.Errorf("load disk info from %s failed, err: timeout", mount.Mount)
+			default:
+				state, err := disk.Usage(mount.Mount)
+				if err != nil {
+					mu.Lock()
+					datas = append(datas, itemData)
+					mu.Unlock()
+					global.LOG.Errorf("load disk info from %s failed, err: %v", mount.Mount, err)
+					return
+				}
+				itemData.Total = state.Total
+				itemData.Free = state.Free
+				itemData.Used = state.Used
+				itemData.UsedPercent = state.UsedPercent
+				itemData.InodesTotal = state.InodesTotal
+				itemData.InodesUsed = state.InodesUsed
+				itemData.InodesFree = state.InodesFree
+				itemData.InodesUsedPercent = state.InodesUsedPercent
+				mu.Lock()
+				datas = append(datas, itemData)
+				mu.Unlock()
+			}
+		}(time.After(5*time.Second), mounts[i])
 	}
+	wg.Wait()
+
+	sort.Slice(datas, func(i, j int) bool {
+		return datas[i].Path < datas[j].Path
+	})
 	return datas
 }

backend/app/service/database.go

@@ -84,7 +84,13 @@ func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
 		Port:     req.Port,
 		Username: req.Username,
 		Password: req.Password,
-		Timeout:  6,
+
+		SSL:        req.SSL,
+		RootCert:   req.RootCert,
+		ClientKey:  req.ClientKey,
+		ClientCert: req.ClientCert,
+		SkipVerify: req.SkipVerify,
+		Timeout:    6,
 	}); err != nil {
 		return false
 	}
@@ -105,7 +111,13 @@ func (u *DatabaseService) Create(req dto.DatabaseCreate) error {
 		Port:     req.Port,
 		Username: req.Username,
 		Password: req.Password,
-		Timeout:  6,
+
+		SSL:        req.SSL,
+		RootCert:   req.RootCert,
+		ClientKey:  req.ClientKey,
+		ClientCert: req.ClientCert,
+		SkipVerify: req.SkipVerify,
+		Timeout:    6,
 	}); err != nil {
 		return err
 	}
@@ -172,7 +184,14 @@ func (u *DatabaseService) Update(req dto.DatabaseUpdate) error {
 		Port:     req.Port,
 		Username: req.Username,
 		Password: req.Password,
-		Timeout:  300,
+
+		SSL:        req.SSL,
+		ClientKey:  req.ClientKey,
+		ClientCert: req.ClientCert,
+		RootCert:   req.RootCert,
+		SkipVerify: req.SkipVerify,
+
+		Timeout: 300,
 	}); err != nil {
 		return err
 	}
@@ -189,6 +208,10 @@ func (u *DatabaseService) Update(req dto.DatabaseUpdate) error {
 	upMap["port"] = req.Port
 	upMap["username"] = req.Username
 	upMap["password"] = pass
-	upMap["description"] = req.Description
+	upMap["ssl"] = req.SSL
+	upMap["client_key"] = req.ClientKey
+	upMap["client_cert"] = req.ClientCert
+	upMap["root_cert"] = req.RootCert
+	upMap["skip_verify"] = req.SkipVerify
 	return databaseRepo.Update(req.ID, upMap)
 }

backend/app/service/database_mysql.go

@@ -641,6 +641,11 @@ func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
 		dbInfo.Port = databaseItem.Port
 		dbInfo.Username = databaseItem.Username
 		dbInfo.Password = databaseItem.Password
+		dbInfo.SSL = databaseItem.SSL
+		dbInfo.ClientKey = databaseItem.ClientKey
+		dbInfo.ClientCert = databaseItem.ClientCert
+		dbInfo.RootCert = databaseItem.RootCert
+		dbInfo.SkipVerify = databaseItem.SkipVerify
 		version = databaseItem.Version
 
 	} else {

backend/app/service/device.go

@@ -0,0 +1,431 @@
+package service
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"net"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/buserr"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/backend/global"
+	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
+	"github.com/1Panel-dev/1Panel/backend/utils/common"
+	"github.com/1Panel-dev/1Panel/backend/utils/ntp"
+	"github.com/shirou/gopsutil/v3/mem"
+)
+
+const defaultDNSPath = "/etc/resolv.conf"
+const defaultHostPath = "/etc/hosts"
+const defaultFstab = "/etc/fstab"
+
+type DeviceService struct{}
+
+type IDeviceService interface {
+	LoadBaseInfo() (dto.DeviceBaseInfo, error)
+	Update(key, value string) error
+	UpdateHosts(req []dto.HostHelper) error
+	UpdatePasswd(req dto.ChangePasswd) error
+	UpdateSwap(req dto.SwapHelper) error
+	UpdateByConf(req dto.UpdateByNameAndFile) error
+	LoadTimeZone() ([]string, error)
+	CheckDNS(key, value string) (bool, error)
+	LoadConf(name string) (string, error)
+
+	Scan() dto.CleanData
+	Clean(req []dto.Clean)
+	CleanForCronjob() (string, error)
+}
+
+func NewIDeviceService() IDeviceService {
+	return &DeviceService{}
+}
+
+func (u *DeviceService) LoadBaseInfo() (dto.DeviceBaseInfo, error) {
+	var baseInfo dto.DeviceBaseInfo
+	baseInfo.LocalTime = time.Now().Format("2006-01-02 15:04:05 MST -0700")
+	baseInfo.TimeZone = common.LoadTimeZoneByCmd()
+	baseInfo.DNS = loadDNS()
+	baseInfo.Hosts = loadHosts()
+	baseInfo.Hostname = loadHostname()
+	baseInfo.User = loadUser()
+	ntp, err := settingRepo.Get(settingRepo.WithByKey("NtpSite"))
+	if err == nil {
+		baseInfo.Ntp = ntp.Value
+	}
+
+	swapInfo, err := mem.SwapMemory()
+	if err != nil {
+		return baseInfo, err
+	}
+	baseInfo.SwapMemoryTotal = swapInfo.Total
+	baseInfo.SwapMemoryAvailable = swapInfo.Free
+	baseInfo.SwapMemoryUsed = swapInfo.Used
+	if baseInfo.SwapMemoryTotal != 0 {
+		baseInfo.SwapDetails = loadSwap()
+	}
+	disks := loadDiskInfo()
+	for _, item := range disks {
+		baseInfo.MaxSize += item.Free
+	}
+
+	return baseInfo, nil
+}
+
+func (u *DeviceService) LoadTimeZone() ([]string, error) {
+	std, err := cmd.Exec("timedatectl list-timezones")
+	if err != nil {
+		return []string{}, err
+	}
+	return strings.Split(std, "\n"), nil
+}
+
+func (u *DeviceService) CheckDNS(key, value string) (bool, error) {
+	content, err := os.ReadFile(defaultDNSPath)
+	if err != nil {
+		return false, err
+	}
+	defer func() { _ = u.UpdateByConf(dto.UpdateByNameAndFile{Name: "DNS", File: string(content)}) }()
+	if key == "form" {
+		if err := u.Update("DNS", value); err != nil {
+			return false, err
+		}
+	} else {
+		if err := u.UpdateByConf(dto.UpdateByNameAndFile{Name: "DNS", File: value}); err != nil {
+			return false, err
+		}
+	}
+
+	conn, err := net.DialTimeout("ip4:icmp", "www.baidu.com", time.Second*2)
+	if err != nil {
+		return false, err
+	}
+	defer conn.Close()
+
+	return true, nil
+}
+
+func (u *DeviceService) Update(key, value string) error {
+	switch key {
+	case "TimeZone":
+		if cmd.CheckIllegal(value) {
+			return buserr.New(constant.ErrCmdIllegal)
+		}
+		if err := ntp.UpdateSystemTimeZone(value); err != nil {
+			return err
+		}
+		go func() {
+			_, err := cmd.Exec("systemctl restart 1panel.service")
+			if err != nil {
+				global.LOG.Errorf("restart system for new time zone failed, err: %v", err)
+			}
+		}()
+	case "DNS":
+		if err := updateDNS(strings.Split(value, ",")); err != nil {
+			return err
+		}
+	case "Hostname":
+		if cmd.CheckIllegal(value) {
+			return buserr.New(constant.ErrCmdIllegal)
+		}
+		std, err := cmd.Execf("%s hostnamectl set-hostname %s", cmd.SudoHandleCmd(), value)
+		if err != nil {
+			return errors.New(std)
+		}
+	case "Ntp", "LocalTime":
+		if cmd.CheckIllegal(value) {
+			return buserr.New(constant.ErrCmdIllegal)
+		}
+		ntpValue := value
+		if key == "LocalTime" {
+			ntpItem, err := settingRepo.Get(settingRepo.WithByKey("NtpSite"))
+			if err != nil {
+				return err
+			}
+			ntpValue = ntpItem.Value
+		} else {
+			if err := settingRepo.Update("NtpSite", ntpValue); err != nil {
+				return err
+			}
+		}
+		ntime, err := ntp.GetRemoteTime(ntpValue)
+		if err != nil {
+			return err
+		}
+		ts := ntime.Format("2006-01-02 15:04:05")
+		if err := ntp.UpdateSystemTime(ts); err != nil {
+			return err
+		}
+	default:
+		return fmt.Errorf("not support such key %s", key)
+	}
+	return nil
+}
+
+func (u *DeviceService) UpdateHosts(req []dto.HostHelper) error {
+	conf, err := os.ReadFile(defaultHostPath)
+	if err != nil {
+		return fmt.Errorf("read namesever conf of %s failed, err: %v", defaultHostPath, err)
+	}
+	lines := strings.Split(string(conf), "\n")
+	newFile := ""
+	for _, line := range lines {
+		if len(line) == 0 {
+			continue
+		}
+		parts := strings.Fields(line)
+		if len(parts) < 2 {
+			newFile += line + "\n"
+			continue
+		}
+		for index, item := range req {
+			if item.IP == parts[0] && item.Host == strings.Join(parts[1:], " ") {
+				newFile += line + "\n"
+				req = append(req[:index], req[index+1:]...)
+				break
+			}
+		}
+	}
+	for _, item := range req {
+		newFile += fmt.Sprintf("%s   %s \n", item.IP, item.Host)
+	}
+	file, err := os.OpenFile(defaultHostPath, os.O_WRONLY|os.O_TRUNC, 0640)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(newFile)
+	write.Flush()
+	return nil
+}
+
+func (u *DeviceService) UpdatePasswd(req dto.ChangePasswd) error {
+	if cmd.CheckIllegal(req.User, req.Passwd) {
+		return buserr.New(constant.ErrCmdIllegal)
+	}
+	std, err := cmd.Execf("%s echo '%s:%s' | %s chpasswd", cmd.SudoHandleCmd(), req.User, req.Passwd, cmd.SudoHandleCmd())
+	if err != nil {
+		if strings.Contains(err.Error(), "does not exist") {
+			return buserr.New(constant.ErrNotExistUser)
+		}
+		return errors.New(std)
+	}
+	return nil
+}
+
+func (u *DeviceService) UpdateSwap(req dto.SwapHelper) error {
+	if cmd.CheckIllegal(req.Path) {
+		return buserr.New(constant.ErrCmdIllegal)
+	}
+	if !req.IsNew {
+		std, err := cmd.Execf("%s swapoff %s", cmd.SudoHandleCmd(), req.Path)
+		if err != nil {
+			return fmt.Errorf("handle swapoff %s failed, err: %s", req.Path, std)
+		}
+	}
+	if req.Size == 0 {
+		if req.Path == path.Join(global.CONF.System.BaseDir, ".1panel_swap") {
+			_ = os.Remove(path.Join(global.CONF.System.BaseDir, ".1panel_swap"))
+		}
+		return operateSwapWithFile(true, req)
+	}
+	std1, err := cmd.Execf("%s dd if=/dev/zero of=%s bs=1024 count=%d", cmd.SudoHandleCmd(), req.Path, req.Size)
+	if err != nil {
+		return fmt.Errorf("handle dd path %s failed, err: %s", req.Path, std1)
+	}
+	std2, err := cmd.Execf("%s mkswap -f %s", cmd.SudoHandleCmd(), req.Path)
+	if err != nil {
+		return fmt.Errorf("handle dd path %s failed, err: %s", req.Path, std2)
+	}
+	std3, err := cmd.Execf("%s swapon %s", cmd.SudoHandleCmd(), req.Path)
+	if err != nil {
+		_, _ = cmd.Execf("%s swapoff %s", cmd.SudoHandleCmd(), req.Path)
+		return fmt.Errorf("handle dd path %s failed, err: %s", req.Path, std3)
+	}
+	return operateSwapWithFile(false, req)
+}
+
+func (u *DeviceService) LoadConf(name string) (string, error) {
+	pathItem := ""
+	switch name {
+	case "DNS":
+		pathItem = defaultDNSPath
+	case "Hosts":
+		pathItem = defaultHostPath
+	default:
+		return "", fmt.Errorf("not support such name %s", name)
+	}
+	if _, err := os.Stat(pathItem); err != nil {
+		return "", err
+	}
+	content, err := os.ReadFile(pathItem)
+	if err != nil {
+		return "", err
+	}
+	return string(content), nil
+}
+
+func (u *DeviceService) UpdateByConf(req dto.UpdateByNameAndFile) error {
+	if req.Name != "DNS" && req.Name != "Hosts" {
+		return fmt.Errorf("not support such name %s", req.Name)
+	}
+	path := defaultDNSPath
+	if req.Name == "Hosts" {
+		path = defaultHostPath
+	}
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0640)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(req.File)
+	write.Flush()
+	return nil
+}
+
+func loadDNS() []string {
+	var list []string
+	dnsConf, err := os.ReadFile(defaultDNSPath)
+	if err == nil {
+		lines := strings.Split(string(dnsConf), "\n")
+		for _, line := range lines {
+			if strings.HasPrefix(line, "nameserver ") {
+				list = append(list, strings.TrimPrefix(line, "nameserver "))
+			}
+		}
+	}
+	return list
+}
+
+func updateDNS(list []string) error {
+	conf, err := os.ReadFile(defaultDNSPath)
+	if err != nil {
+		return fmt.Errorf("read nameserver conf of %s failed, err: %v", defaultDNSPath, err)
+	}
+	lines := strings.Split(string(conf), "\n")
+	newFile := ""
+	for _, line := range lines {
+		if len(line) == 0 {
+			continue
+		}
+		parts := strings.Fields(line)
+		if len(parts) < 2 || parts[0] != "nameserver" {
+			newFile += line + "\n"
+			continue
+		}
+		itemNs := strings.Join(parts[1:], " ")
+		for index, item := range list {
+			if item == itemNs {
+				newFile += line + "\n"
+				list = append(list[:index], list[index+1:]...)
+				break
+			}
+		}
+	}
+	for _, item := range list {
+		if len(item) != 0 {
+			newFile += fmt.Sprintf("nameserver %s \n", item)
+		}
+	}
+	file, err := os.OpenFile(defaultDNSPath, os.O_WRONLY|os.O_TRUNC, 0640)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(newFile)
+	write.Flush()
+	return nil
+}
+
+func loadHosts() []dto.HostHelper {
+	var list []dto.HostHelper
+	hostConf, err := os.ReadFile(defaultHostPath)
+	if err == nil {
+		lines := strings.Split(string(hostConf), "\n")
+		for _, line := range lines {
+			parts := strings.Fields(line)
+			if len(parts) < 2 {
+				continue
+			}
+			list = append(list, dto.HostHelper{IP: parts[0], Host: strings.Join(parts[1:], " ")})
+		}
+	}
+	return list
+}
+
+func loadHostname() string {
+	std, err := cmd.Exec("hostname")
+	if err != nil {
+		return ""
+	}
+	return strings.ReplaceAll(std, "\n", "")
+}
+
+func loadUser() string {
+	std, err := cmd.Exec("whoami")
+	if err != nil {
+		return ""
+	}
+	return strings.ReplaceAll(std, "\n", "")
+}
+
+func loadSwap() []dto.SwapHelper {
+	var data []dto.SwapHelper
+	std, err := cmd.Execf("%s swapon --summary", cmd.SudoHandleCmd())
+	if err != nil {
+		return data
+	}
+	lines := strings.Split(std, "\n")
+	for index, line := range lines {
+		if index == 0 {
+			continue
+		}
+		parts := strings.Fields(line)
+		if len(parts) < 5 {
+			continue
+		}
+		sizeItem, _ := strconv.Atoi(parts[2])
+		data = append(data, dto.SwapHelper{Path: parts[0], Size: uint64(sizeItem), Used: parts[3]})
+	}
+	return data
+}
+
+func operateSwapWithFile(delete bool, req dto.SwapHelper) error {
+	conf, err := os.ReadFile(defaultFstab)
+	if err != nil {
+		return fmt.Errorf("read file %s failed, err: %v", defaultFstab, err)
+	}
+	lines := strings.Split(string(conf), "\n")
+	newFile := ""
+	for _, line := range lines {
+		if len(line) == 0 {
+			continue
+		}
+		parts := strings.Fields(line)
+		if len(parts) == 6 && parts[0] == req.Path {
+			continue
+		}
+		newFile += line + "\n"
+	}
+	if !delete {
+		newFile += fmt.Sprintf("%s    swap    swap    defaults    0    0\n", req.Path)
+	}
+	file, err := os.OpenFile(defaultFstab, os.O_WRONLY|os.O_TRUNC, 0640)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(newFile)
+	write.Flush()
+	return nil
+}