fix: Fix terminal connection initialization exception (#9987)

#9871

.github/workflows/build-publish-to-oss.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '22.19.0'
+          node-version: '20.2'
       - name: Build Web
         run: |
           cd frontend && npm install && npm run build:pro

.github/workflows/build-publish-to-r2.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '22.19.0'
+          node-version: '20.2'
       - name: Build Web
         run: |
           cd frontend && npm install && npm run build:pro

.goreleaser.yaml

@@ -32,7 +32,6 @@ builds:
       - arm
       - ppc64le
       - s390x
-      - riscv64
     hooks:
       post:
         - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
@@ -58,7 +57,6 @@ builds:
       - arm
       - ppc64le
       - s390x
-      - riscv64
     hooks:
       post:
         - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}

agent/app/api/v2/ai.go

@@ -60,7 +60,7 @@ func (b *BaseApi) RecreateOllamaModel(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/ollama/close [post]
+// @Router /ai/ollama/model/close [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"关闭 Ollama 模型连接 [name]","formatEN":"close conn for Ollama model [name]"}
 func (b *BaseApi) CloseOllamaModel(c *gin.Context) {
 	var req dto.OllamaModelName

agent/app/api/v2/app_install.go

@@ -109,7 +109,7 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 // @Success 200 {object} response.DatabaseConn
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /apps/installed/conninfo [POST]
+// @Router /apps/installed/conninfo/:key [get]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

agent/app/api/v2/backup.go

@@ -74,7 +74,7 @@ func (b *BaseApi) RefreshToken(c *gin.Context) {
 // @Success 200 {array} object
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /backups/buckets [post]
+// @Router /buckets [post]
 func (b *BaseApi) ListBuckets(c *gin.Context) {
 	var req dto.ForBuckets
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -133,28 +133,6 @@ func (b *BaseApi) UpdateBackup(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Backup Account
-// @Summary Upload file for recover
-// @Accept json
-// @Param request body dto.UploadForRecover true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /backups/upload [post]
-// @x-panel-log {"bodyKeys":["filePath"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传备份文件 [filePath]","formatEN":"upload backup file [filePath]"}
-func (b *BaseApi) UploadForRecover(c *gin.Context) {
-	var req dto.UploadForRecover
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := backupService.UploadForRecover(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Backup Account
 // @Summary Load backup account options
 // @Accept json
@@ -295,7 +273,7 @@ func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
 // @Success 200 {string} filePath
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /backups/record/download [post]
+// @Router /backup/record/download [post]
 // @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
@@ -318,7 +296,7 @@ func (b *BaseApi) DownloadRecord(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /backups/record/description/update [post]
+// @Router /backup/record/description/update [post]
 func (b *BaseApi) UpdateRecordDescription(c *gin.Context) {
 	var req dto.UpdateDescription
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -339,7 +317,7 @@ func (b *BaseApi) UpdateRecordDescription(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /backups/record/del [post]
+// @Router /record/del [post]
 // @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

agent/app/api/v2/clam.go

@@ -104,7 +104,7 @@ func (b *BaseApi) SearchClam(c *gin.Context) {
 // @Success 200 {object} dto.ClamBaseInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /toolbox/clam/base [post]
+// @Router /toolbox/clam/base [get]
 func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
 	info, err := clamService.LoadBaseInfo()
 	if err != nil {
@@ -152,7 +152,7 @@ func (b *BaseApi) CleanClamRecord(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := clamService.CleanRecord(req.ID); err != nil {
+	if err := clamService.CleanRecord(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -174,7 +174,7 @@ func (b *BaseApi) SearchClamRecord(c *gin.Context) {
 		return
 	}
 
-	total, list, err := clamService.SearchRecords(req)
+	total, list, err := clamService.LoadRecords(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -186,6 +186,29 @@ func (b *BaseApi) SearchClamRecord(c *gin.Context) {
 	})
 }
 
+// @Tags Clam
+// @Summary Load clam record detail
+// @Accept json
+// @Param request body dto.ClamLogReq true "request"
+// @Success 200 {string} content
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/record/log [post]
+func (b *BaseApi) LoadClamRecordLog(c *gin.Context) {
+	var req dto.ClamLogReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	content, err := clamService.LoadRecordLog(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, content)
+}
+
 // @Tags Clam
 // @Summary Load clam file
 // @Accept json
@@ -266,7 +289,7 @@ func (b *BaseApi) HandleClamScan(c *gin.Context) {
 		return
 	}
 
-	if err := clamService.HandleOnce(req.ID); err != nil {
+	if err := clamService.HandleOnce(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}

agent/app/api/v2/container.go

@@ -57,7 +57,7 @@ func (b *BaseApi) LoadContainerUsers(c *gin.Context) {
 // @Summary List containers
 // @Accept json
 // @Produce json
-// @Success 200 {array} dto.ContainerOptions
+// @Success 200 {array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/list [post]
@@ -65,23 +65,6 @@ func (b *BaseApi) ListContainer(c *gin.Context) {
 	helper.SuccessWithData(c, containerService.List())
 }
 
-// @Tags Container
-// @Summary List containers by image
-// @Accept json
-// @Produce json
-// @Success 200 {array} dto.ContainerOptions
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/list/byimage [post]
-func (b *BaseApi) ListContainerByImage(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, containerService.ListByImage(req.Name))
-}
-
 // @Tags Container
 // @Summary Load containers status
 // @Accept json
@@ -697,7 +680,7 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 // @Param tail query string false "显示行号"
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /containers/search/log [get]
+// @Router /containers/search/log [post]
 func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
 	c.Header("Content-Type", "text/event-stream")
 	c.Header("Cache-Control", "no-cache")

agent/app/api/v2/cronjob.go

@@ -226,28 +226,6 @@ func (b *BaseApi) CleanRecord(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Cronjob
-// @Summary Handle stop job
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /cronjobs/stop [post]
-func (b *BaseApi) StopCronJob(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := cronjobService.HandleStop(req.ID); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}
-
 // @Tags Cronjob
 // @Summary Delete cronjob
 // @Accept json
@@ -336,6 +314,30 @@ func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
 	helper.Success(c)
 }
 
+// @Tags Cronjob
+// @Summary Download cronjob records
+// @Accept json
+// @Param request body dto.CronjobDownload true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/download [post]
+// @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 := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	filePath, err := cronjobService.Download(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	c.File(filePath)
+}
+
 // @Tags Cronjob
 // @Summary Handle cronjob once
 // @Accept json

agent/app/api/v2/dashboard.go

@@ -83,38 +83,6 @@ func (b *BaseApi) UpdateAppLauncher(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Dashboard
-// @Summary Load quick jump options
-// @Success 200 {Array} dto.QuickJump
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/quick/option [get]
-func (b *BaseApi) LoadQuickOption(c *gin.Context) {
-	helper.SuccessWithData(c, dashboardService.LoadQuickOptions())
-}
-
-// @Tags Dashboard
-// @Summary Update quick jump
-// @Accept json
-// @Param request body dto.ChangeQuicks true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/quick/change [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"切换快速跳转","formatEN":"change quick jump"}
-func (b *BaseApi) UpdateQuickJump(c *gin.Context) {
-	var req dto.ChangeQuicks
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := dashboardService.ChangeQuick(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Dashboard
 // @Summary Load dashboard base info
 // @Accept json

agent/app/api/v2/database.go

@@ -160,7 +160,7 @@ func (b *BaseApi) GetDatabase(c *gin.Context) {
 // @Success 200 {array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /databases/db/del/check [post]
+// @Router /db/remote/del/check [post]
 func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

agent/app/api/v2/disk.go

@@ -1,99 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Disk Management
-// @Summary Get complete disk information
-// @Description Get information about all disks including partitioned and unpartitioned disks
-// @Produce json
-// @Success 200 {object} response.CompleteDiskInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/disks [get]
-func (b *BaseApi) GetCompleteDiskInfo(c *gin.Context) {
-	diskInfo, err := diskService.GetCompleteDiskInfo()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, diskInfo)
-}
-
-// @Tags Disk Management
-// @Summary Partition disk
-// @Description Create partition and format disk with specified filesystem
-// @Accept json
-// @Param request body request.DiskPartitionRequest true "partition request"
-// @Success 200 {string} string "Partition created successfully"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/disks/partition [post]
-// @x-panel-log {"bodyKeys":["device", "filesystem", "mountPoint"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"对磁盘 [device] 进行分区，文件系统 [filesystem]，挂载点 [mountPoint]","formatEN":"Partition disk [device] with filesystem [filesystem], mount point [mountPoint]"}
-func (b *BaseApi) PartitionDisk(c *gin.Context) {
-	var req request.DiskPartitionRequest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	result, err := diskService.PartitionDisk(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Disk Management
-// @Summary Mount disk
-// @Description Mount partition to specified mount point
-// @Accept json
-// @Param request body request.DiskMountRequest true "mount request"
-// @Success 200 {string} string "Disk mounted successfully"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/disks/mount [post]
-// @x-panel-log {"bodyKeys":["device", "mountPoint"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"挂载磁盘 [device] 到 [mountPoint]","formatEN":"Mount disk [device] to [mountPoint]"}
-func (b *BaseApi) MountDisk(c *gin.Context) {
-	var req request.DiskMountRequest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	err := diskService.MountDisk(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}
-
-// @Tags Disk Management
-// @Summary Unmount disk
-// @Description Unmount partition from mount point
-// @Accept json
-// @Param request body request.DiskUnmountRequest true "unmount request"
-// @Success 200 {string} string "Disk unmounted successfully"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/disks/unmount [post]
-// @x-panel-log {"bodyKeys":["device", "mountPoint"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"卸载磁盘 [device] 从 [mountPoint]","formatEN":"Unmount disk [device] from [mountPoint]"}
-func (b *BaseApi) UnmountDisk(c *gin.Context) {
-	var req request.DiskUnmountRequest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	err := diskService.UnmountDisk(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}

agent/app/api/v2/entry.go

@@ -17,9 +17,8 @@ var (
 	appInstallService       = service.NewIAppInstalledService()
 	appIgnoreUpgradeService = service.NewIAppIgnoreUpgradeService()
 
-	aiToolService      = service.NewIAIToolService()
-	mcpServerService   = service.NewIMcpServerService()
-	tensorrtLLMService = service.NewITensorRTLLMService()
+	aiToolService    = service.NewIAIToolService()
+	mcpServerService = service.NewIMcpServerService()
 
 	containerService       = service.NewIContainerService()
 	composeTemplateService = service.NewIComposeTemplateService()
@@ -39,7 +38,6 @@ var (
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
 	monitorService  = service.NewIMonitorService()
-	systemService   = service.NewISystemService()
 
 	deviceService   = service.NewIDeviceService()
 	fail2banService = service.NewIFail2BanService()
@@ -73,6 +71,4 @@ var (
 	taskService      = service.NewITaskService()
 	groupService     = service.NewIGroupService()
 	alertService     = service.NewIAlertService()
-
-	diskService = service.NewIDiskService()
 )

agent/app/api/v2/file.go

@@ -880,7 +880,7 @@ func (b *BaseApi) GetPathByType(c *gin.Context) {
 // @Success 200 {object} dto.DiskInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /files/mount [post]
+// @Router /mount [post]
 func (b *BaseApi) GetHostMount(c *gin.Context) {
 	disks := fileService.GetHostMount()
 	helper.SuccessWithData(c, disks)
@@ -892,7 +892,7 @@ func (b *BaseApi) GetHostMount(c *gin.Context) {
 // @Success 200 {object} response.UserGroupResponse
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /files/user/group [post]
+// @Router /user/group [post]
 func (b *BaseApi) GetUsersAndGroups(c *gin.Context) {
 	res, err := fileService.GetUsersAndGroups()
 	if err != nil {
@@ -901,44 +901,3 @@ func (b *BaseApi) GetUsersAndGroups(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, res)
 }
-
-// @Tags File
-// @Summary Convert file
-// @Accept json
-// @Param request body request.FileConvert true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/convert [post]
-func (b *BaseApi) ConvertFile(c *gin.Context) {
-	var req request.FileConvertRequest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	fileService.Convert(req)
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags File
-// @Summary Convert file
-// @Accept json
-// @Param request body dto.PageInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/convert/log [post]
-func (b *BaseApi) ConvertLog(c *gin.Context) {
-	var req dto.PageInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, logs, err := fileService.ConvertLog(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: logs,
-		Total: total,
-	})
-}

agent/app/api/v2/firewall.go

@@ -63,7 +63,7 @@ func (b *BaseApi) OperateFirewall(c *gin.Context) {
 		return
 	}
 
-	if err := firewallService.OperateFirewall(req); err != nil {
+	if err := firewallService.OperateFirewall(req.Operation); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}

agent/app/api/v2/group.go

@@ -13,7 +13,7 @@ import (
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /groups [post]
+// @Router /agent/groups [post]
 // @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
@@ -35,7 +35,7 @@ func (b *BaseApi) CreateGroup(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /groups/del [post]
+// @Router /agent/groups/del [post]
 // @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
@@ -57,7 +57,7 @@ func (b *BaseApi) DeleteGroup(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /groups/update [post]
+// @Router /agent/groups/update [post]
 // @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
@@ -79,7 +79,7 @@ func (b *BaseApi) UpdateGroup(c *gin.Context) {
 // @Success 200 {array} dto.OperateByType
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /groups/search [post]
+// @Router /agent/groups/search [post]
 func (b *BaseApi) ListGroup(c *gin.Context) {
 	var req dto.OperateByType
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

agent/app/api/v2/helper/helper.go

@@ -116,11 +116,7 @@ func CheckBind(req interface{}, c *gin.Context) error {
 	return nil
 }
 
-func GetParamInt32(paramName string, c *gin.Context) (int32, error) {
-	idParam, ok := c.Params.Get(paramName)
-	if !ok {
-		return 0, errors.New("error id in path")
-	}
-	intNum, _ := strconv.Atoi(idParam)
-	return int32(intNum), nil
+func ErrResponse(ctx *gin.Context, code int) {
+	ctx.JSON(code, nil)
+	ctx.Abort()
 }

agent/app/api/v2/host_tool.go

@@ -35,7 +35,7 @@ func (b *BaseApi) GetToolStatus(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/tool/init [post]
+// @Router /hosts/tool/create [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 [type] 配置","formatEN":"create [type] config"}
 func (b *BaseApi) InitToolConfig(c *gin.Context) {
 	var req request.HostToolCreate
@@ -95,6 +95,28 @@ func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 	helper.SuccessWithData(c, config)
 }
 
+// @Tags Host tool
+// @Summary Get tool logs
+// @Accept json
+// @Param request body request.HostToolLogReq true "request"
+// @Success 200 {string} logContent
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/tool/log [post]
+func (b *BaseApi) GetToolLog(c *gin.Context) {
+	var req request.HostToolLogReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	logContent, err := hostToolService.GetToolLog(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, logContent)
+}
+
 // @Tags Host tool
 // @Summary Create Supervisor process
 // @Accept json

agent/app/api/v2/image.go

@@ -9,14 +9,14 @@ import (
 // @Tags Container Image
 // @Summary Page images
 // @Accept json
-// @Param request body dto.PageImage true "request"
+// @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/image/search [post]
 func (b *BaseApi) SearchImage(c *gin.Context) {
-	var req dto.PageImage
+	var req dto.SearchWithPage
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

agent/app/api/v2/image_repo.go

@@ -58,7 +58,7 @@ func (b *BaseApi) ListRepo(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /containers/repo/status [post]
+// @Router /containers/repo/status [get]
 func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

agent/app/api/v2/mcp_server.go

@@ -13,7 +13,7 @@ import (
 // @Success 200 {object} response.McpServersRes
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/search [post]
+// @Router /mcp/search [post]
 func (b *BaseApi) PageMcpServers(c *gin.Context) {
 	var req request.McpServerSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -30,7 +30,7 @@ func (b *BaseApi) PageMcpServers(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/server [post]
+// @Router /mcp/server [post]
 func (b *BaseApi) CreateMcpServer(c *gin.Context) {
 	var req request.McpServerCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -51,7 +51,7 @@ func (b *BaseApi) CreateMcpServer(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/server/update [post]
+// @Router /mcp/server/update [post]
 func (b *BaseApi) UpdateMcpServer(c *gin.Context) {
 	var req request.McpServerUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -72,7 +72,7 @@ func (b *BaseApi) UpdateMcpServer(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/server/del [post]
+// @Router /mcp/server/del [post]
 func (b *BaseApi) DeleteMcpServer(c *gin.Context) {
 	var req request.McpServerDelete
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -93,7 +93,7 @@ func (b *BaseApi) DeleteMcpServer(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/server/op [post]
+// @Router /mcp/server/op [post]
 func (b *BaseApi) OperateMcpServer(c *gin.Context) {
 	var req request.McpServerOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -114,7 +114,7 @@ func (b *BaseApi) OperateMcpServer(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/domain/bind [post]
+// @Router /mcp/domain/bind [post]
 func (b *BaseApi) BindMcpDomain(c *gin.Context) {
 	var req request.McpBindDomain
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -135,7 +135,7 @@ func (b *BaseApi) BindMcpDomain(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/domain/update [post]
+// @Router /mcp/domain/update [post]
 func (b *BaseApi) UpdateMcpBindDomain(c *gin.Context) {
 	var req request.McpBindDomainUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -155,7 +155,7 @@ func (b *BaseApi) UpdateMcpBindDomain(c *gin.Context) {
 // @Success 200 {object} response.McpBindDomainRes
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /ai/mcp/domain/get [get]
+// @Router /mcp/domain/get [get]
 func (b *BaseApi) GetMcpBindDomain(c *gin.Context) {
 	res, err := mcpServerService.GetBindDomain()
 	if err != nil {

agent/app/api/v2/monitor.go

@@ -6,8 +6,8 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
-	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v4/net"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/net"
 )
 
 // @Tags Monitor

agent/app/api/v2/nginx.go

@@ -129,7 +129,7 @@ func (b *BaseApi) BuildNginx(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /openresty/modules/update [post]
+// @Router /openresty/module/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 OpenResty 模块","formatEN":"Update OpenResty module"}
 func (b *BaseApi) UpdateNginxModule(c *gin.Context) {
 	var req request.NginxModuleUpdate

agent/app/api/v2/process.go

@@ -36,24 +36,3 @@ func (b *BaseApi) StopProcess(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Process
-// @Summary Get Process Info By PID
-// @Param pid path int true "PID"
-// @Success 200 {object} websocket.PsProcessData
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /process/{pid} [get]
-func (b *BaseApi) GetProcessInfoByPID(c *gin.Context) {
-	pid, err := helper.GetParamInt32("pid", c)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	data, err := processService.GetProcessInfoByPID(pid)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}

agent/app/api/v2/runtime.go

@@ -81,7 +81,7 @@ func (b *BaseApi) DeleteRuntime(c *gin.Context) {
 // @Success 200 {array} dto.AppResource
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /runtimes/installed/delete/check/:id [get]
+// @Router /installed/delete/check/:id [get]
 func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
 	runTimeId, err := helper.GetIntParamByKey(c, "id")
 	if err != nil {
@@ -459,7 +459,7 @@ func (b *BaseApi) GetSupervisorProcess(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /runtimes/supervisor/process [post]
+// @Router /runtimes/supervisor/process/operate [post]
 func (b *BaseApi) OperateSupervisorProcess(c *gin.Context) {
 	var req request.PHPSupervisorProcessConfig
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -480,7 +480,7 @@ func (b *BaseApi) OperateSupervisorProcess(c *gin.Context) {
 // @Success 200 {string} content
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /runtimes/supervisor/process/file [post]
+// @Router /runtimes/supervisor/process/file/operate [post]
 func (b *BaseApi) OperateSupervisorProcessFile(c *gin.Context) {
 	var req request.PHPSupervisorProcessFileReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -497,7 +497,7 @@ func (b *BaseApi) OperateSupervisorProcessFile(c *gin.Context) {
 // @Tags Runtime
 // @Summary Update PHP container config
 // @Accept json
-// @Param request body request.PHPContainerConfig true "request"
+// @Param request body request.PHPContainerUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -518,7 +518,7 @@ func (b *BaseApi) UpdatePHPContainer(c *gin.Context) {
 // @Summary Get PHP container config
 // @Accept json
 // @Param id path integer true "request"
-// @Success 200 {object} request.PHPContainerConfig
+// @Success 200 {object} response.PHPContainerConfig
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /runtimes/php/container/:id [get]
@@ -539,7 +539,7 @@ func (b *BaseApi) GetPHPContainerConfig(c *gin.Context) {
 // @Tags Runtime
 // @Summary Update runtime remark
 // @Accept json
-// @Param request body request.RuntimeRemark true "request"
+// @Param request body request.RuntimeRemarkUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -555,25 +555,3 @@ func (b *BaseApi) UpdateRuntimeRemark(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Runtime
-// @Summary Get PHP runtime status
-// @Accept json
-// @Param id path integer true "request"
-// @Success 200 {object} map[string]interface{}
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /runtimes/php/fpm/status/:id [get]
-func (b *BaseApi) GetFPMStatus(c *gin.Context) {
-	id, err := helper.GetParamID(c)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	data, err := runtimeService.GetFPMStatus(id)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}

agent/app/api/v2/setting.go

@@ -2,10 +2,12 @@ package v2
 
 import (
 	"encoding/json"
+	"os"
+	"os/user"
+	"path"
 
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/utils/ssh"
 	"github.com/gin-gonic/gin"
@@ -69,16 +71,6 @@ func (b *BaseApi) LoadBaseDir(c *gin.Context) {
 	helper.SuccessWithData(c, global.Dir.DataDir)
 }
 
-// @Tags System Setting
-// @Summary Load local conn
-// @Success 200 {object} dto.SSHConnData
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/ssh/conn [get]
-func (b *BaseApi) LoadLocalConn(c *gin.Context) {
-	helper.SuccessWithData(c, settingService.GetLocalConn())
-}
-
 func (b *BaseApi) CheckLocalConn(c *gin.Context) {
 	_, err := loadLocalConn()
 	helper.SuccessWithData(c, err == nil)
@@ -95,7 +87,6 @@ func (b *BaseApi) CheckLocalConnByInfo(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-
 	helper.SuccessWithData(c, settingService.TestConnByInfo(req))
 }
 
@@ -105,38 +96,51 @@ func (b *BaseApi) CheckLocalConnByInfo(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /settings/ssh [post]
-func (b *BaseApi) SaveLocalConn(c *gin.Context) {
+func (b *BaseApi) SaveLocalConnInfo(c *gin.Context) {
 	var req dto.SSHConnData
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-
-	if err := settingService.SaveConnInfo(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
+	helper.SuccessWithData(c, settingService.SaveConnInfo(req))
 }
 
 func loadLocalConn() (*ssh.SSHClient, error) {
-	connInfoInDB := settingService.GetSettingByKey("LocalSSHConn")
+	itemPath := ""
+	currentInfo, _ := user.Current()
+	if len(currentInfo.HomeDir) == 0 {
+		itemPath = "/root/.ssh/id_ed25519_1panel"
+	} else {
+		itemPath = path.Join(currentInfo.HomeDir, ".ssh/id_ed25519_1panel")
+	}
+	if _, err := os.Stat(itemPath); err != nil {
+		_ = sshService.CreateRootCert(dto.CreateRootCert{EncryptionMode: "ed25519", Name: "id_ed25519_1panel", Description: "1Panel Terminal"})
+	}
+
+	privateKey, _ := os.ReadFile(itemPath)
+	connWithKey := ssh.ConnInfo{
+		Addr:       "127.0.0.1",
+		User:       "root",
+		Port:       22,
+		AuthMode:   "key",
+		PrivateKey: privateKey,
+	}
+	client, err := ssh.NewClient(connWithKey)
+	if err == nil {
+		return client, nil
+	}
+
+	connInfoInDB, err := settingService.GetSSHInfo()
+	if err != nil {
+		return nil, err
+	}
 	if len(connInfoInDB) == 0 {
 		return nil, errors.New("no such ssh conn info in db!")
 	}
-	var connInDB model.LocalConnInfo
+	var connInDB ssh.ConnInfo
 	if err := json.Unmarshal([]byte(connInfoInDB), &connInDB); err != nil {
 		return nil, err
 	}
-	sshInfo := ssh.ConnInfo{
-		Addr:       connInDB.Addr,
-		Port:       int(connInDB.Port),
-		User:       connInDB.User,
-		AuthMode:   connInDB.AuthMode,
-		Password:   connInDB.Password,
-		PrivateKey: []byte(connInDB.PrivateKey),
-		PassPhrase: []byte(connInDB.PassPhrase),
-	}
-	return ssh.NewClient(sshInfo)
+	return ssh.NewClient(connInDB)
 }
 
 // @Tags System Setting

agent/app/api/v2/snapshot.go

@@ -36,7 +36,7 @@ func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 		return
 	}
 
-	if err := snapshotService.SnapshotCreate(nil, req, 0, 3); err != nil {
+	if err := snapshotService.SnapshotCreate(nil, req, 0, 0, 0); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -50,7 +50,7 @@ func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /settings/snapshot/recreate [post]
+// @Router /settings/snapshot/recrete [post]
 // @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":"recrete the snapshot [name]"}
 func (b *BaseApi) RecreateSnapshot(c *gin.Context) {
 	var req dto.OperateByID

agent/app/api/v2/ssh.go

@@ -68,23 +68,21 @@ func (b *BaseApi) UpdateSSH(c *gin.Context) {
 }
 
 // @Tags SSH
-// @Summary Generate host SSH secret
+// @Summary Update host SSH setting by file
 // @Accept json
-// @Param request body dto.RootCertOperate true "request"
+// @Param request body dto.SSHConf true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/ssh/cert [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 SSH 密钥 ","formatEN":"generate SSH secret"}
-func (b *BaseApi) CreateRootCert(c *gin.Context) {
-	var req dto.RootCertOperate
+// @Router /hosts/conffile/update [post]
+// @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 := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := loadCertAfterDecrypt(&req); err != nil {
-		helper.BadRequest(c, err)
-	}
-	if err := sshService.CreateRootCert(req); err != nil {
+
+	if err := sshService.UpdateByFile(req.File); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -92,23 +90,45 @@ func (b *BaseApi) CreateRootCert(c *gin.Context) {
 }
 
 // @Tags SSH
-// @Summary Update host SSH secret
+// @Summary Generate host SSH secret
 // @Accept json
-// @Param request body dto.RootCertOperate true "request"
+// @Param request body dto.CreateRootCert true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/ssh/cert/update [post]
+// @Router /hosts/ssh/cert [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 SSH 密钥 ","formatEN":"generate SSH secret"}
-func (b *BaseApi) EditRootCert(c *gin.Context) {
-	var req dto.RootCertOperate
+func (b *BaseApi) CreateRootCert(c *gin.Context) {
+	var req dto.CreateRootCert
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := loadCertAfterDecrypt(&req); err != nil {
-		helper.BadRequest(c, err)
+	if len(req.PassPhrase) != 0 {
+		passPhrase, err := base64.StdEncoding.DecodeString(req.PassPhrase)
+		if err != nil {
+			helper.BadRequest(c, err)
+			return
+		}
+		req.PassPhrase = string(passPhrase)
 	}
-	if err := sshService.EditRootCert(req); err != nil {
+	if len(req.PrivateKey) != 0 {
+		privateKey, err := base64.StdEncoding.DecodeString(req.PrivateKey)
+		if err != nil {
+			helper.BadRequest(c, err)
+			return
+		}
+		req.PrivateKey = string(privateKey)
+	}
+	if len(req.PublicKey) != 0 {
+		publicKey, err := base64.StdEncoding.DecodeString(req.PublicKey)
+		if err != nil {
+			helper.BadRequest(c, err)
+			return
+		}
+		req.PublicKey = string(publicKey)
+	}
+
+	if err := sshService.CreateRootCert(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -181,7 +201,7 @@ func (b *BaseApi) DeleteRootCert(c *gin.Context) {
 // @Summary Load host SSH logs
 // @Accept json
 // @Param request body dto.SearchSSHLog true "request"
-// @Success 200 {object} dto.PageResult
+// @Success 200 {object} dto.SSHLog
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/ssh/log [post]
@@ -191,54 +211,7 @@ func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 		return
 	}
 
-	total, data, err := sshService.LoadLog(c, req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Total: total,
-		Items: data,
-	})
-}
-
-// @Tags SSH
-// @Summary Export host SSH logs
-// @Accept json
-// @Param request body dto.SearchSSHLog true "request"
-// @Success 200 {string} path
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/ssh/log/export [post]
-func (b *BaseApi) ExportSSHLogs(c *gin.Context) {
-	var req dto.SearchSSHLog
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	tmpFile, err := sshService.ExportLog(c, req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, tmpFile)
-}
-
-// @Tags SSH
-// @Summary Load host SSH conf
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {string} conf
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/ssh/file [post]
-func (b *BaseApi) LoadSSHFile(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := sshService.LoadSSHFile(req.Name)
+	data, err := sshService.LoadLog(c, req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -247,48 +220,16 @@ func (b *BaseApi) LoadSSHFile(c *gin.Context) {
 }
 
 // @Tags SSH
-// @Summary Update host SSH setting by file
-// @Accept json
-// @Param request body dto.SSHConf true "request"
-// @Success 200
+// @Summary Load host SSH conf
+// @Success 200 {string} conf
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/ssh/file/update [post]
-// @x-panel-log {"bodyKeys":["key"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件 [key]","formatEN":"update SSH conf [key]"}
-func (b *BaseApi) UpdateSSHByFile(c *gin.Context) {
-	var req dto.SettingUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := sshService.UpdateByFile(req); err != nil {
+// @Router /hosts/ssh/conf [get]
+func (b *BaseApi) LoadSSHConf(c *gin.Context) {
+	data, err := sshService.LoadSSHConf()
+	if err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.Success(c)
-}
-
-func loadCertAfterDecrypt(req *dto.RootCertOperate) error {
-	if len(req.PassPhrase) != 0 {
-		passPhrase, err := base64.StdEncoding.DecodeString(req.PassPhrase)
-		if err != nil {
-			return err
-		}
-		req.PassPhrase = string(passPhrase)
-	}
-	if len(req.PrivateKey) != 0 {
-		privateKey, err := base64.StdEncoding.DecodeString(req.PrivateKey)
-		if err != nil {
-			return err
-		}
-		req.PrivateKey = string(privateKey)
-	}
-	if len(req.PublicKey) != 0 {
-		publicKey, err := base64.StdEncoding.DecodeString(req.PublicKey)
-		if err != nil {
-			return err
-		}
-		req.PublicKey = string(publicKey)
-	}
-	return nil
+	helper.SuccessWithData(c, data)
 }

agent/app/api/v2/system.go

@@ -1,26 +0,0 @@
-package v2
-
-import (
-	"errors"
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Host
-// @Summary Check if a system component exists
-// @Accept json
-// @Param name query string true "Component name to check (e.g., rsync, docker)"
-// @Success 200 {object} response.ComponentInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/components/{name} [get]
-func (b *BaseApi) CheckComponentExistence(c *gin.Context) {
-	name := c.Param("name")
-	if name == "" {
-		helper.BadRequest(c, errors.New("empty component name"))
-		return
-	}
-
-	info := systemService.IsComponentExist(name)
-	helper.SuccessWithData(c, info)
-}

agent/app/api/v2/tensorrt_llm.go

@@ -1,68 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
-	"github.com/gin-gonic/gin"
-)
-
-func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
-	var req request.TensorRTLLMSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	list := tensorrtLLMService.Page(req)
-	helper.SuccessWithData(c, list)
-}
-
-func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
-	var req request.TensorRTLLMCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := tensorrtLLMService.Create(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
-	var req request.TensorRTLLMUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := tensorrtLLMService.Update(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
-	var req request.TensorRTLLMDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := tensorrtLLMService.Delete(req.ID)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-func (b *BaseApi) OperateTensorRTLLM(c *gin.Context) {
-	var req request.TensorRTLLMOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := tensorrtLLMService.Operate(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/api/v2/terminal.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
@@ -85,16 +86,15 @@ func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
 		return
 	}
 	source := c.Query("source")
+	var containerID string
 	var initCmd []string
 	switch source {
 	case "redis", "redis-cluster":
-		initCmd, err = loadRedisInitCmd(c, source)
+		containerID, initCmd, err = loadRedisInitCmd(c, source)
 	case "ollama":
-		initCmd, err = loadOllamaInitCmd(c)
+		containerID, initCmd, err = loadOllamaInitCmd(c)
 	case "container":
-		initCmd, err = loadContainerInitCmd(c)
-	case "database":
-		initCmd, err = loadDatabaseInitCmd(c)
+		containerID, initCmd, err = loadContainerInitCmd(c)
 	default:
 		if wshandleError(wsConn, fmt.Errorf("not support such source %s", source)) {
 			return
@@ -103,10 +103,12 @@ func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
 	if wshandleError(wsConn, err) {
 		return
 	}
+	pidMap := loadMapFromDockerTop(containerID)
 	slave, err := terminal.NewCommand("docker", initCmd...)
 	if wshandleError(wsConn, err) {
 		return
 	}
+	defer killBash(containerID, strings.ReplaceAll(strings.Join(initCmd, " "), fmt.Sprintf("exec -it %s ", containerID), ""), pidMap)
 	defer slave.Close()
 
 	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
@@ -125,18 +127,18 @@ func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
 	_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
 }
 
-func loadRedisInitCmd(c *gin.Context, redisType string) ([]string, error) {
+func loadRedisInitCmd(c *gin.Context, redisType string) (string, []string, error) {
 	name := c.Query("name")
 	from := c.Query("from")
 	commands := []string{"exec", "-it"}
 	database, err := databaseService.Get(name)
 	if err != nil {
-		return nil, fmt.Errorf("no such database in db, err: %v", err)
+		return "", nil, fmt.Errorf("no such database in db, err: %v", err)
 	}
 	if from == "local" {
 		redisInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: name, Type: redisType})
 		if err != nil {
-			return nil, fmt.Errorf("no such app in db, err: %v", err)
+			return "", nil, fmt.Errorf("no such app in db, err: %v", err)
 		}
 		name = redisInfo.ContainerName
 		commands = append(commands, []string{name, "redis-cli"}...)
@@ -150,61 +152,38 @@ func loadRedisInitCmd(c *gin.Context, redisType string) ([]string, error) {
 			commands = append(commands, []string{"-a", database.Password, "--no-auth-warning"}...)
 		}
 	}
-	return commands, nil
+	return name, commands, nil
 }
 
-func loadOllamaInitCmd(c *gin.Context) ([]string, error) {
+func loadOllamaInitCmd(c *gin.Context) (string, []string, error) {
 	name := c.Query("name")
 	if cmd.CheckIllegal(name) {
-		return nil, fmt.Errorf("ollama model %s contains illegal characters", name)
+		return "", nil, fmt.Errorf("ollama model %s contains illegal characters", name)
 	}
 	ollamaInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: "", Type: "ollama"})
 	if err != nil {
-		return nil, fmt.Errorf("no such app in db, err: %v", err)
+		return "", nil, fmt.Errorf("no such app in db, err: %v", err)
 	}
 	containerName := ollamaInfo.ContainerName
-	return []string{"exec", "-it", containerName, "ollama", "run", name}, nil
+	return containerName, []string{"exec", "-it", containerName, "ollama", "run", name}, nil
 }
 
-func loadContainerInitCmd(c *gin.Context) ([]string, error) {
+func loadContainerInitCmd(c *gin.Context) (string, []string, error) {
 	containerID := c.Query("containerid")
 	command := c.Query("command")
 	user := c.Query("user")
 	if cmd.CheckIllegal(user, containerID, command) {
-		return nil, fmt.Errorf("the command contains illegal characters. command: %s, user: %s, containerID: %s", command, user, containerID)
+		return "", nil, fmt.Errorf("the command contains illegal characters. command: %s, user: %s, containerID: %s", command, user, containerID)
 	}
 	if len(command) == 0 || len(containerID) == 0 {
-		return nil, fmt.Errorf("error param of command: %s or containerID: %s", command, containerID)
+		return "", nil, fmt.Errorf("error param of command: %s or containerID: %s", command, containerID)
 	}
 	commands := []string{"exec", "-it", containerID, command}
 	if len(user) != 0 {
 		commands = []string{"exec", "-it", "-u", user, containerID, command}
 	}
 
-	return commands, nil
-}
-
-func loadDatabaseInitCmd(c *gin.Context) ([]string, error) {
-	database := c.Query("database")
-	databaseType := c.Query("databaseType")
-	if len(database) == 0 || len(databaseType) == 0 {
-		return nil, fmt.Errorf("error param of database: %s or database type: %s", database, databaseType)
-	}
-	databaseConn, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Type: databaseType, Name: database})
-	if err != nil {
-		return nil, fmt.Errorf("no such database in db, err: %v", err)
-	}
-	commands := []string{"exec", "-it", databaseConn.ContainerName}
-	switch databaseType {
-	case "mysql", "mysql-cluster":
-		commands = append(commands, []string{"mysql", "-uroot", "-p" + databaseConn.Password}...)
-	case "mariadb":
-		commands = append(commands, []string{"mariadb", "-uroot", "-p" + databaseConn.Password}...)
-	case "postgresql", "postgresql-cluster":
-		commands = []string{"exec", "-e", fmt.Sprintf("PGPASSWORD=%s", databaseConn.Password), "-it", databaseConn.ContainerName, "psql", "-t", "-U", databaseConn.Username}
-	}
-
-	return commands, nil
+	return containerID, commands, nil
 }
 
 func wshandleError(ws *websocket.Conn, err error) bool {
@@ -227,6 +206,42 @@ func wshandleError(ws *websocket.Conn, err error) bool {
 	return false
 }
 
+func loadMapFromDockerTop(containerID string) map[string]string {
+	pidMap := make(map[string]string)
+	sudo := cmd.SudoHandleCmd()
+
+	stdout, err := cmd.RunDefaultWithStdoutBashCf("%s docker top %s -eo pid,command ", sudo, containerID)
+	if err != nil {
+		return pidMap
+	}
+	lines := strings.Split(stdout, "\n")
+	for _, line := range lines {
+		parts := strings.Fields(line)
+		if len(parts) < 2 {
+			continue
+		}
+		pidMap[parts[0]] = strings.Join(parts[1:], " ")
+	}
+	return pidMap
+}
+
+func killBash(containerID, comm string, pidMap map[string]string) {
+	sudo := cmd.SudoHandleCmd()
+	newPidMap := loadMapFromDockerTop(containerID)
+	for pid, command := range newPidMap {
+		isOld := false
+		for pid2 := range pidMap {
+			if pid == pid2 {
+				isOld = true
+				break
+			}
+		}
+		if !isOld && command == comm {
+			_, _ = cmd.RunDefaultWithStdoutBashCf("%s kill -9 %s", sudo, pid)
+		}
+	}
+}
+
 var upGrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024 * 1024 * 10,

agent/app/api/v2/website.go

@@ -527,7 +527,7 @@ func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /websites/proxies/file [post]
+// @Router /websites/proxy/file [post]
 // @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
@@ -840,7 +840,7 @@ func (b *BaseApi) CreateLoadBalance(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /websites/lbs/del [post]
+// @Router /websites/lbs/delete [post]
 func (b *BaseApi) DeleteLoadBalance(c *gin.Context) {
 	var req request.WebsiteLBDelete
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -953,7 +953,7 @@ func (b *BaseApi) GetProxyCache(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /websites/realip/config [post]
+// @Router /websites/realip [post]
 // @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] 网站真实IP配置 ","formatEN":"Modify the real IP configuration of [domain] website"}
 func (b *BaseApi) SetRealIPConfig(c *gin.Context) {
 	var req request.WebsiteRealIP
@@ -1121,85 +1121,3 @@ func (b *BaseApi) OperateCrossSiteAccess(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Website
-// @Summary Exec Composer
-// @Accept json
-// @Param request body request.ExecComposerReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/exec/composer [post]
-func (b *BaseApi) ExecComposer(c *gin.Context) {
-	var req request.ExecComposerReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.ExecComposer(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Batch operate websites
-// @Accept json
-// @Param request body request.BatchOpWebsite true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/batch/operate [post]
-func (b *BaseApi) BatchOpWebsites(c *gin.Context) {
-	var req request.BatchWebsiteOp
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.BatchOpWebsite(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Get CORS Config
-// @Accept json
-// @Param id path int true "id"
-// @Success 200 {object} request.CorsConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/cors/{id} [get]
-func (b *BaseApi) GetCORSConfig(c *gin.Context) {
-	id, err := helper.GetParamID(c)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	res, err := websiteService.GetCors(id)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags Website
-// @Summary Update CORS Config
-// @Accept json
-// @Param request body request.CorsConfigReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/cors/update [post]
-func (b *BaseApi) UpdateCORSConfig(c *gin.Context) {
-	var req request.CorsConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.UpdateCors(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/api/v2/website_ssl.go

@@ -1,9 +1,6 @@
 package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-	"io"
-	"mime/multipart"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -219,79 +216,6 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Website SSL
-// @Summary Upload SSL file
-// @Accept multipart/form-data
-// @Param type formData string true "type"
-// @Param description formData string false "description"
-// @Param sslID formData string false "sslID"
-// @Param privateKeyFile formData file true "privateKeyFile"
-// @Param certificateFile formData file true "certificateFile"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/ssl/upload/file [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传 ssl 文件 [type]","formatEN":"Upload ssl file [type]"}
-func (b *BaseApi) UploadSSLFile(c *gin.Context) {
-	var req request.WebsiteSSLFileUpload
-
-	req.Type = c.PostForm("type")
-	req.Description = c.PostForm("description")
-	sslID := c.PostForm("sslID")
-	if sslID != "" {
-		req.SSLID, _ = strconv.ParseUint(sslID, 10, 64)
-	}
-
-	privateKeyFile, err := c.FormFile("privateKeyFile")
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	certificateFile, err := c.FormFile("certificateFile")
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	privateKeyContent, err := readUploadedFile(privateKeyFile)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	certificateContent, err := readUploadedFile(certificateFile)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	uploadReq := request.WebsiteSSLUpload{
-		Type:        "paste",
-		PrivateKey:  string(privateKeyContent),
-		Certificate: string(certificateContent),
-		Description: req.Description,
-		SSLID:       uint(req.SSLID),
-	}
-
-	if err := websiteSSLService.Upload(uploadReq); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-func readUploadedFile(fileHeader *multipart.FileHeader) ([]byte, error) {
-	file, err := fileHeader.Open()
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	return io.ReadAll(file)
-}
-
 // @Tags Website SSL
 // @Summary Download SSL  file
 // @Accept json
@@ -321,15 +245,3 @@ func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
 	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
 	http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
 }
-
-func (b *BaseApi) ImportMasterSSL(c *gin.Context) {
-	var req model.WebsiteSSL
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteSSLService.ImportMasterSSL(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/dto/alert.go

@@ -36,43 +36,40 @@ type AlertSearch struct {
 }
 
 type AlertDTO struct {
-	ID             uint      `json:"id"`
-	Type           string    `json:"type"`
-	Cycle          uint      `json:"cycle"`
-	Count          uint      `json:"count"`
-	Method         string    `json:"method"`
-	Title          string    `json:"title"`
-	Project        string    `json:"project"`
-	Status         string    `json:"status"`
-	SendCount      uint      `json:"sendCount"`
-	AdvancedParams string    `json:"advancedParams"`
-	CreatedAt      time.Time `json:"createdAt"`
-	UpdatedAt      time.Time `json:"updatedAt"`
+	ID        uint      `json:"id"`
+	Type      string    `json:"type"`
+	Cycle     uint      `json:"cycle"`
+	Count     uint      `json:"count"`
+	Method    string    `json:"method"`
+	Title     string    `json:"title"`
+	Project   string    `json:"project"`
+	Status    string    `json:"status"`
+	SendCount uint      `json:"sendCount"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
 }
 
 type AlertCreate struct {
-	Type           string `json:"type" validate:"required"`
-	Cycle          uint   `json:"cycle"`
-	Count          uint   `json:"count"`
-	Method         string `json:"method" validate:"required"`
-	Title          string `json:"title"`
-	Project        string `json:"project"`
-	Status         string `json:"status"`
-	SendCount      uint   `json:"sendCount"`
-	AdvancedParams string `json:"advancedParams"`
+	Type      string `json:"type" validate:"required"`
+	Cycle     uint   `json:"cycle"`
+	Count     uint   `json:"count"`
+	Method    string `json:"method" validate:"required"`
+	Title     string `json:"title"`
+	Project   string `json:"project"`
+	Status    string `json:"status"`
+	SendCount uint   `json:"sendCount"`
 }
 
 type AlertUpdate struct {
-	ID             uint   `json:"id" validate:"required"`
-	Type           string `json:"type"`
-	Cycle          uint   `json:"cycle"`
-	Count          uint   `json:"count"`
-	Method         string `json:"method"`
-	Title          string `json:"title"`
-	Project        string `json:"project"`
-	Status         string `json:"status"`
-	SendCount      uint   `json:"sendCount"`
-	AdvancedParams string `json:"advancedParams"`
+	ID        uint   `json:"id" validate:"required"`
+	Type      string `json:"type"`
+	Cycle     uint   `json:"cycle"`
+	Count     uint   `json:"count"`
+	Method    string `json:"method"`
+	Title     string `json:"title"`
+	Project   string `json:"project"`
+	Status    string `json:"status"`
+	SendCount uint   `json:"sendCount"`
 }
 
 type DeleteRequest struct {
@@ -292,7 +289,6 @@ type AlertConfigTest struct {
 	Host        string `json:"host"`
 	Port        int    `json:"port"`
 	Sender      string `json:"sender"`
-	UserName    string `json:"userName"`
 	Password    string `json:"password"`
 	DisplayName string `json:"displayName"`
 	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"
@@ -324,7 +320,6 @@ type AlertEmailConfig struct {
 	Host        string `json:"host"`
 	Port        int    `json:"port"`
 	Sender      string `json:"sender"`
-	UserName    string `json:"userName"`
 	Password    string `json:"password"`
 	DisplayName string `json:"displayName"`
 	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"

agent/app/dto/app.go

@@ -128,7 +128,6 @@ type Locale struct {
 	Zh     string `json:"zh"`
 	Ko     string `json:"ko"`
 	Tr     string `json:"tr"`
-	Es     string `json:"es-es" yaml:"es-es"`
 }
 
 type AppForm struct {

agent/app/dto/backup.go

@@ -53,11 +53,6 @@ type BackupOption struct {
 	IsPublic bool   `json:"isPublic"`
 }
 
-type UploadForRecover struct {
-	FilePath  string `json:"filePath"`
-	TargetDir string `json:"targetDir"`
-}
-
 type CommonBackup struct {
 	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mysql-cluster postgresql-cluster redis-cluster"`
 	Name       string `json:"name"`
@@ -99,9 +94,6 @@ type BackupRecords struct {
 	DownloadAccountID uint      `json:"downloadAccountID"`
 	FileDir           string    `json:"fileDir"`
 	FileName          string    `json:"fileName"`
-	TaskID            string    `json:"taskID"`
-	Status            string    `json:"status"`
-	Message           string    `json:"message"`
 	Description       string    `json:"description"`
 }
 

agent/app/dto/clam.go

@@ -30,10 +30,8 @@ type ClamInfo struct {
 	Path             string `json:"path"`
 	InfectedStrategy string `json:"infectedStrategy"`
 	InfectedDir      string `json:"infectedDir"`
-	LastRecordStatus string `json:"lastRecordStatus"`
-	LastRecordTime   string `json:"lastRecordTime"`
+	LastHandleDate   string `json:"lastHandleDate"`
 	Spec             string `json:"spec"`
-	Timeout          uint   `json:"timeout"`
 	Description      string `json:"description"`
 	AlertCount       uint   `json:"alertCount"`
 	AlertMethod      string `json:"alertMethod"`
@@ -43,7 +41,6 @@ type ClamLogSearch struct {
 	PageInfo
 
 	ClamID    uint      `json:"clamID"`
-	Status    string    `json:"status"`
 	StartTime time.Time `json:"startTime"`
 	EndTime   time.Time `json:"endTime"`
 }
@@ -59,16 +56,13 @@ type ClamFileReq struct {
 	Name string `json:"name" validate:"required"`
 }
 
-type ClamRecord struct {
-	ID            uint      `json:"id"`
-	TaskID        string    `json:"taskID"`
-	StartTime     time.Time `json:"startTime"`
-	ScanTime      string    `json:"scanTime"`
-	InfectedFiles string    `json:"infectedFiles"`
-	TotalError    string    `json:"totalError"`
-
-	Status  string `json:"status"`
-	Message string `json:"message"`
+type ClamLog struct {
+	Name          string `json:"name"`
+	ScanDate      string `json:"scanDate"`
+	ScanTime      string `json:"scanTime"`
+	InfectedFiles string `json:"infectedFiles"`
+	TotalError    string `json:"totalError"`
+	Status        string `json:"status"`
 }
 
 type ClamCreate struct {
@@ -78,7 +72,6 @@ type ClamCreate struct {
 	InfectedStrategy string `json:"infectedStrategy"`
 	InfectedDir      string `json:"infectedDir"`
 	Spec             string `json:"spec"`
-	Timeout          uint   `json:"timeout"`
 	Description      string `json:"description"`
 	AlertCount       uint   `json:"alertCount"`
 	AlertTitle       string `json:"alertTitle"`
@@ -93,7 +86,6 @@ type ClamUpdate struct {
 	InfectedStrategy string `json:"infectedStrategy"`
 	InfectedDir      string `json:"infectedDir"`
 	Spec             string `json:"spec"`
-	Timeout          uint   `json:"timeout"`
 	Description      string `json:"description"`
 	AlertCount       uint   `json:"alertCount"`
 	AlertTitle       string `json:"alertTitle"`
@@ -106,6 +98,7 @@ type ClamUpdateStatus struct {
 }
 
 type ClamDelete struct {
+	RemoveRecord   bool   `json:"removeRecord"`
 	RemoveInfected bool   `json:"removeInfected"`
 	Ids            []uint `json:"ids" validate:"required"`
 }

agent/app/dto/container.go

@@ -71,6 +71,7 @@ type ResourceLimit struct {
 
 type ContainerOperate struct {
 	TaskID          string         `json:"taskID"`
+	ContainerID     string         `json:"containerID"`
 	ForcePull       bool           `json:"forcePull"`
 	Name            string         `json:"name" validate:"required"`
 	Image           string         `json:"image" validate:"required"`
@@ -106,10 +107,10 @@ type ContainerCreateByCommand struct {
 }
 
 type ContainerUpgrade struct {
-	TaskID    string   `json:"taskID"`
-	Names     []string `json:"names" validate:"required"`
-	Image     string   `json:"image" validate:"required"`
-	ForcePull bool     `json:"forcePull"`
+	TaskID    string `json:"taskID"`
+	Name      string `json:"name" validate:"required"`
+	Image     string `json:"image" validate:"required"`
+	ForcePull bool   `json:"forcePull"`
 }
 
 type ContainerListStats struct {
@@ -143,7 +144,6 @@ type VolumeHelper struct {
 	SourceDir    string `json:"sourceDir"`
 	ContainerDir string `json:"containerDir"`
 	Mode         string `json:"mode"`
-	Shared       string `json:"shared"`
 }
 type PortHelper struct {
 	HostIP        string `json:"hostIP"`
@@ -209,12 +209,11 @@ type NetworkCreate struct {
 }
 
 type Volume struct {
-	Name       string         `json:"name"`
-	Labels     []VolumeOption `json:"labels"`
-	Driver     string         `json:"driver"`
-	Mountpoint string         `json:"mountpoint"`
-	CreatedAt  time.Time      `json:"createdAt"`
-	Options    []VolumeOption `json:"options"`
+	Name       string    `json:"name"`
+	Labels     []string  `json:"labels"`
+	Driver     string    `json:"driver"`
+	Mountpoint string    `json:"mountpoint"`
+	CreatedAt  time.Time `json:"createdAt"`
 }
 type VolumeCreate struct {
 	Name    string   `json:"name" validate:"required"`
@@ -222,10 +221,7 @@ type VolumeCreate struct {
 	Options []string `json:"options"`
 	Labels  []string `json:"labels"`
 }
-type VolumeOption struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-}
+
 type BatchDelete struct {
 	TaskID string   `json:"taskID"`
 	Force  bool     `json:"force"`
@@ -233,16 +229,15 @@ type BatchDelete struct {
 }
 
 type ComposeInfo struct {
-	Name           string             `json:"name"`
-	CreatedAt      string             `json:"createdAt"`
-	CreatedBy      string             `json:"createdBy"`
-	ContainerCount int                `json:"containerCount"`
-	RunningCount   int                `json:"runningCount"`
-	ConfigFile     string             `json:"configFile"`
-	Workdir        string             `json:"workdir"`
-	Path           string             `json:"path"`
-	Containers     []ComposeContainer `json:"containers"`
-	Env            []string           `json:"env"`
+	Name            string             `json:"name"`
+	CreatedAt       string             `json:"createdAt"`
+	CreatedBy       string             `json:"createdBy"`
+	ContainerNumber int                `json:"containerNumber"`
+	ConfigFile      string             `json:"configFile"`
+	Workdir         string             `json:"workdir"`
+	Path            string             `json:"path"`
+	Containers      []ComposeContainer `json:"containers"`
+	Env             []string           `json:"env"`
 }
 type ComposeContainer struct {
 	ContainerID string `json:"containerID"`
@@ -262,9 +257,8 @@ type ComposeCreate struct {
 type ComposeOperation struct {
 	Name      string `json:"name" validate:"required"`
 	Path      string `json:"path"`
-	Operation string `json:"operation" validate:"required,oneof=up start restart stop down delete"`
+	Operation string `json:"operation" validate:"required,oneof=up start stop down delete"`
 	WithFile  bool   `json:"withFile"`
-	Force     bool   `josn:"force"`
 }
 type ComposeUpdate struct {
 	Name    string   `json:"name" validate:"required"`

agent/app/dto/cronjob.go

@@ -65,6 +65,11 @@ type CronjobUpdateStatus struct {
 	Status string `json:"status" validate:"required"`
 }
 
+type CronjobDownload struct {
+	RecordID        uint `json:"recordID" validate:"required"`
+	BackupAccountID uint `json:"backupAccountID" validate:"required"`
+}
+
 type CronjobClean struct {
 	IsDelete        bool `json:"isDelete"`
 	CleanData       bool `json:"cleanData"`

agent/app/dto/dashboard.go

@@ -23,25 +23,9 @@ type DashboardBase struct {
 	CPULogicalCores int    `json:"cpuLogicalCores"`
 	CPUModelName    string `json:"cpuModelName"`
 
-	QuickJumps  []QuickJump      `json:"quickJump"`
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
 }
 
-type ChangeQuicks struct {
-	Quicks []QuickJump `json:"quicks"`
-}
-
-type QuickJump struct {
-	ID        uint   `json:"id"`
-	Name      string `json:"name"`
-	Alias     string `json:"alias"`
-	Title     string `json:"title"`
-	Detail    string `json:"detail"`
-	Recommend int    `json:"recommend"`
-	IsShow    bool   `json:"isShow"`
-	Router    string `json:"router"`
-}
-
 type OsInfo struct {
 	OS             string `json:"os"`
 	Platform       string `json:"platform"`

agent/app/dto/database.go

@@ -329,8 +329,3 @@ type LoadRedisStatus struct {
 	Name string `json:"name" validate:"required"`
 	Type string `json:"type" validate:"required"`
 }
-
-type DBResource struct {
-	Type string `json:"type"`
-	Name string `json:"name"`
-}

agent/app/dto/device.go

@@ -27,8 +27,7 @@ type SwapHelper struct {
 	Size uint64 `json:"size"`
 	Used string `json:"used"`
 
-	IsNew  bool   `json:"isNew"`
-	TaskID string `json:"taskID"`
+	IsNew bool `json:"isNew"`
 }
 
 type TimeZoneOptions struct {

agent/app/dto/disk.go

@@ -1,25 +0,0 @@
-package dto
-
-type LsblkDevice struct {
-	Name       string        `json:"name"`
-	Size       string        `json:"size"`
-	Type       string        `json:"type"`
-	MountPoint *string       `json:"mountpoint"`
-	FsType     *string       `json:"fstype"`
-	Model      *string       `json:"model"`
-	Serial     string        `json:"serial"`
-	Tran       string        `json:"tran"`
-	Rota       bool          `json:"rota"`
-	Children   []LsblkDevice `json:"children,omitempty"`
-}
-
-type LsblkOutput struct {
-	BlockDevices []LsblkDevice `json:"blockdevices"`
-}
-
-type DiskFormatRequest struct {
-	Device      string `json:"device" `
-	Filesystem  string `json:"filesystem" `
-	Label       string `json:"label,omitempty" `
-	QuickFormat bool   `json:"quickFormat,omitempty"`
-}

agent/app/dto/file.go

@@ -1,8 +0,0 @@
-package dto
-
-type LogFileRes struct {
-	Lines       []string `json:"lines"`
-	IsEndOfFile bool     `json:"isEndOfFile"`
-	TotalPages  int      `json:"totalPages"`
-	TotalLines  int      `json:"totalLines"`
-}

agent/app/dto/firewall.go

@@ -17,8 +17,7 @@ type RuleSearch struct {
 }
 
 type FirewallOperation struct {
-	Operation         string `json:"operation" validate:"required,oneof=start stop restart disablePing enablePing"`
-	WithDockerRestart bool   `json:"withDockerRestart"`
+	Operation string `json:"operation" validate:"required,oneof=start stop restart disablePing enablePing"`
 }
 
 type PortRuleOperate struct {
@@ -37,7 +36,6 @@ type ForwardRuleOperate struct {
 		Operation  string `json:"operation" validate:"required,oneof=add remove"`
 		Num        string `json:"num"`
 		Protocol   string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
-		Interface  string `json:"interface"`
 		Port       string `json:"port" validate:"required"`
 		TargetIP   string `json:"targetIP"`
 		TargetPort string `json:"targetPort" validate:"required"`

agent/app/dto/image.go

@@ -2,19 +2,12 @@ package dto
 
 import "time"
 
-type PageImage struct {
-	PageInfo
-	Name    string `json:"name"`
-	OrderBy string `json:"orderBy" validate:"required,oneof=size tags createdAt isUsed"`
-	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
-}
-
 type ImageInfo struct {
 	ID        string    `json:"id"`
 	CreatedAt time.Time `json:"createdAt"`
 	IsUsed    bool      `json:"isUsed"`
 	Tags      []string  `json:"tags"`
-	Size      int64     `json:"size"`
+	Size      string    `json:"size"`
 }
 
 type ImageLoad struct {
@@ -30,14 +23,14 @@ type ImageBuild struct {
 }
 
 type ImagePull struct {
-	TaskID    string   `json:"taskID"`
-	RepoID    uint     `json:"repoID"`
-	ImageName []string `json:"imageName" validate:"required"`
+	TaskID    string `json:"taskID"`
+	RepoID    uint   `json:"repoID"`
+	ImageName string `json:"imageName" validate:"required"`
 }
 
 type ImageTag struct {
-	SourceID string   `json:"sourceID" validate:"required"`
-	Tags     []string `json:"tags" validate:"required"`
+	SourceID   string `json:"sourceID" validate:"required"`
+	TargetName string `json:"targetName" validate:"required"`
 }
 
 type ImagePush struct {

agent/app/dto/request/app.go

@@ -40,7 +40,6 @@ type AppContainerConfig struct {
 	WebUI         string  `json:"webUI"`
 	Type          string  `json:"type"`
 	SpecifyIP     string  `json:"specifyIP"`
-	RestartPolicy string  `json:"restartPolicy" validate:"omitempty,oneof=always unless-stopped no on-failure"`
 }
 
 type AppInstalledSearch struct {

agent/app/dto/request/disk.go

@@ -1,20 +0,0 @@
-package request
-
-type DiskPartitionRequest struct {
-	Device     string `json:"device" validate:"required"`
-	Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"`
-	Label      string `json:"label"`
-	AutoMount  bool   `json:"autoMount"`
-	MountPoint string `json:"mountPoint" validate:"required"`
-}
-
-type DiskMountRequest struct {
-	Device     string `json:"device" validate:"required"`
-	MountPoint string `json:"mountPoint" validate:"required"`
-	Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"`
-	AutoMount  bool   `json:"autoMount"`
-}
-
-type DiskUnmountRequest struct {
-	MountPoint string `json:"mountPoint" validate:"required"`
-}

agent/app/dto/request/file.go

@@ -148,19 +148,3 @@ type FileExistReq struct {
 	Name string `json:"name" validate:"required"`
 	Dir  string `json:"dir" validate:"required"`
 }
-
-type FileConvert struct {
-	Path         string `json:"path" validate:"required"`
-	Type         string `json:"type" validate:"required"`
-	InputFile    string `json:"inputFile" validate:"required"`
-	Extension    string `json:"extension" validate:"required"`
-	OutputFormat string `json:"outputFormat" validate:"required"`
-	Status       string `json:"status"`
-}
-
-type FileConvertRequest struct {
-	Files        []FileConvert `json:"files" validate:"required"`
-	OutputPath   string        `json:"outputPath" validate:"required"`
-	DeleteSource bool          `json:"deleteSource"`
-	TaskID       string        `json:"taskID"`
-}

agent/app/dto/request/host_tool.go

@@ -34,7 +34,6 @@ type SupervisorProcessConfig struct {
 	Numprocs    string `json:"numprocs"`
 	AutoRestart string `json:"autoRestart"`
 	AutoStart   string `json:"autoStart"`
-	Environment string `json:"environment"`
 }
 
 type SupervisorProcessFileReq struct {

agent/app/dto/request/mcp_server.go

@@ -20,7 +20,6 @@ type McpServerCreate struct {
 	HostIP             string        `json:"hostIP"`
 	StreamableHttpPath string        `json:"streamableHttpPath"`
 	OutputTransport    string        `json:"outputTransport" validate:"required"`
-	Type               string        `json:"type" validate:"required"`
 }
 
 type McpServerUpdate struct {

agent/app/dto/request/nginx.go

@@ -81,8 +81,8 @@ type NginxCommonReq struct {
 
 type NginxAntiLeechUpdate struct {
 	WebsiteID   uint     `json:"websiteID" validate:"required"`
-	Extends     string   `json:"extends"`
-	Return      string   `json:"return"`
+	Extends     string   `json:"extends" validate:"required"`
+	Return      string   `json:"return" validate:"required"`
 	Enable      bool     `json:"enable" `
 	ServerNames []string `json:"serverNames"`
 	Cache       bool     `json:"cache"`

agent/app/dto/request/runtime.go

@@ -100,7 +100,6 @@ type PHPConfigUpdate struct {
 	Scope            string            `json:"scope" validate:"required"`
 	DisableFunctions []string          `json:"disableFunctions"`
 	UploadMaxSize    string            `json:"uploadMaxSize"`
-	MaxExecutionTime string            `json:"maxExecutionTime"`
 }
 
 type PHPFileUpdate struct {

agent/app/dto/request/tensorrt_llm.go

@@ -1,38 +0,0 @@
-package request
-
-import "github.com/1Panel-dev/1Panel/agent/app/dto"
-
-type TensorRTLLMSearch struct {
-	dto.PageInfo
-	Name string `json:"name"`
-}
-
-type TensorRTLLMCreate struct {
-	Name          string `json:"name" validate:"required"`
-	ContainerName string `json:"containerName"  validate:"required"`
-	Version       string `json:"version"  validate:"required"`
-	ModelDir      string `json:"modelDir" validate:"required"`
-	Image         string `json:"image"  validate:"required"`
-	Command       string `json:"command" validate:"required"`
-	DockerConfig
-}
-
-type TensorRTLLMUpdate struct {
-	ID uint `json:"id" validate:"required"`
-	TensorRTLLMCreate
-}
-
-type TensorRTLLMDelete struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type TensorRTLLMOperate struct {
-	ID      uint   `json:"id" validate:"required"`
-	Operate string `json:"operate" validate:"required"`
-}
-
-type DockerConfig struct {
-	ExposedPorts []ExposedPort `json:"exposedPorts"`
-	Environments []Environment `json:"environments"`
-	Volumes      []Volume      `json:"volumes"`
-}

agent/app/dto/request/website.go

@@ -95,7 +95,6 @@ type WebsiteDelete struct {
 	DeleteApp    bool `json:"deleteApp"`
 	DeleteBackup bool `json:"deleteBackup"`
 	ForceDelete  bool `json:"forceDelete"`
-	DeleteDB     bool `json:"deleteDB"`
 }
 
 type WebsiteOp struct {
@@ -103,12 +102,6 @@ type WebsiteOp struct {
 	Operate string `json:"operate"`
 }
 
-type BatchWebsiteOp struct {
-	IDs     []uint `json:"ids" validate:"required"`
-	Operate string `json:"operate" validate:"required"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
 type WebsiteRedirectUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
@@ -159,22 +152,21 @@ type WebsiteDomainDelete struct {
 }
 
 type WebsiteHTTPSOp struct {
-	WebsiteID             uint     `json:"websiteId" validate:"required"`
-	Enable                bool     `json:"enable"`
-	WebsiteSSLID          uint     `json:"websiteSSLId"`
-	Type                  string   `json:"type"  validate:"oneof=existed auto manual"`
-	PrivateKey            string   `json:"privateKey"`
-	Certificate           string   `json:"certificate"`
-	PrivateKeyPath        string   `json:"privateKeyPath"`
-	CertificatePath       string   `json:"certificatePath"`
-	ImportType            string   `json:"importType"`
-	HttpConfig            string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
-	SSLProtocol           []string `json:"SSLProtocol"`
-	Algorithm             string   `json:"algorithm"`
-	Hsts                  bool     `json:"hsts"`
-	HstsIncludeSubDomains bool     `json:"hstsIncludeSubDomains"`
-	HttpsPorts            []int    `json:"httpsPorts"`
-	Http3                 bool     `json:"http3"`
+	WebsiteID       uint     `json:"websiteId" validate:"required"`
+	Enable          bool     `json:"enable"`
+	WebsiteSSLID    uint     `json:"websiteSSLId"`
+	Type            string   `json:"type"  validate:"oneof=existed auto manual"`
+	PrivateKey      string   `json:"privateKey"`
+	Certificate     string   `json:"certificate"`
+	PrivateKeyPath  string   `json:"privateKeyPath"`
+	CertificatePath string   `json:"certificatePath"`
+	ImportType      string   `json:"importType"`
+	HttpConfig      string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
+	SSLProtocol     []string `json:"SSLProtocol"`
+	Algorithm       string   `json:"algorithm"`
+	Hsts            bool     `json:"hsts"`
+	HttpsPorts      []int    `json:"httpsPorts"`
+	Http3           bool     `json:"http3"`
 }
 
 type WebsiteNginxUpdate struct {
@@ -211,39 +203,22 @@ type WebsiteUpdateDirPermission struct {
 }
 
 type WebsiteProxyConfig struct {
-	ID              uint              `json:"id" validate:"required"`
-	Operate         string            `json:"operate" validate:"required"`
-	Enable          bool              `json:"enable" `
-	Cache           bool              `json:"cache" `
-	CacheTime       int               `json:"cacheTime"`
-	CacheUnit       string            `json:"cacheUnit"`
-	ServerCacheTime int               `json:"serverCacheTime"`
-	ServerCacheUnit string            `json:"serverCacheUnit"`
-	Name            string            `json:"name" validate:"required"`
-	Modifier        string            `json:"modifier"`
-	Match           string            `json:"match" validate:"required"`
-	ProxyPass       string            `json:"proxyPass" validate:"required"`
-	ProxyHost       string            `json:"proxyHost" validate:"required"`
-	Content         string            `json:"content"`
-	FilePath        string            `json:"filePath"`
-	Replaces        map[string]string `json:"replaces"`
-	SNI             bool              `json:"sni"`
-	ProxySSLName    string            `json:"proxySSLName"`
-	CorsConfig
-}
-
-type CorsConfig struct {
-	Cors             bool   `json:"cors"`
-	AllowOrigins     string `json:"allowOrigins"`
-	AllowMethods     string `json:"allowMethods"`
-	AllowHeaders     string `json:"allowHeaders"`
-	AllowCredentials bool   `json:"allowCredentials"`
-	Preflight        bool   `json:"preflight"`
-}
-
-type CorsConfigReq struct {
-	WebsiteID uint `json:"websiteID" validate:"required"`
-	CorsConfig
+	ID           uint              `json:"id" validate:"required"`
+	Operate      string            `json:"operate" 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"`
+	Match        string            `json:"match" validate:"required"`
+	ProxyPass    string            `json:"proxyPass" validate:"required"`
+	ProxyHost    string            `json:"proxyHost" validate:"required"`
+	Content      string            `json:"content"`
+	FilePath     string            `json:"filePath"`
+	Replaces     map[string]string `json:"replaces"`
+	SNI          bool              `json:"sni"`
+	ProxySSLName string            `json:"proxySSLName"`
 }
 
 type WebsiteProxyReq struct {
@@ -308,8 +283,8 @@ type WebsiteRealIP struct {
 
 type ChangeDatabase struct {
 	WebsiteID    uint   `json:"websiteID" validate:"required"`
-	DatabaseID   uint   `json:"databaseID" `
-	DatabaseType string `json:"databaseType" `
+	DatabaseID   uint   `json:"databaseID" validate:"required"`
+	DatabaseType string `json:"databaseType" validate:"required"`
 }
 
 type WebsiteProxyDel struct {
@@ -321,13 +296,3 @@ type CrossSiteAccessOp struct {
 	WebsiteID uint   `json:"websiteID" validate:"required"`
 	Operation string `json:"operation" validate:"required,oneof=Enable Disable"`
 }
-
-type ExecComposerReq struct {
-	Command    string `json:"command" validate:"required"`
-	ExtCommand string `json:"extCommand"`
-	Mirror     string `json:"mirror" validate:"required"`
-	Dir        string `json:"dir" validate:"required"`
-	User       string `json:"user" validate:"required"`
-	WebsiteID  uint   `json:"websiteID" validate:"required"`
-	TaskID     string `json:"taskID" validate:"required"`
-}

agent/app/dto/request/website_ssl.go

@@ -6,8 +6,6 @@ type WebsiteSSLSearch struct {
 	dto.PageInfo
 	AcmeAccountID string `json:"acmeAccountID"`
 	Domain        string `json:"domain"`
-	OrderBy       string `json:"orderBy" validate:"required,oneof=expire_date"`
-	Order         string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
 type WebsiteSSLCreate struct {
@@ -29,8 +27,6 @@ type WebsiteSSLCreate struct {
 	Nameserver2   string `json:"nameserver2"`
 	ExecShell     bool   `json:"execShell"`
 	Shell         string `json:"shell"`
-	PushNode      bool   `json:"pushNode"`
-	Nodes         string `json:"nodes"`
 }
 
 type WebsiteDNSReq struct {
@@ -109,8 +105,6 @@ type WebsiteSSLUpdate struct {
 	Nameserver2   string `json:"nameserver2"`
 	ExecShell     bool   `json:"execShell"`
 	Shell         string `json:"shell"`
-	PushNode      bool   `json:"pushNode"`
-	Nodes         string `json:"nodes"`
 }
 
 type WebsiteSSLUpload struct {
@@ -157,9 +151,3 @@ type WebsiteCAObtain struct {
 type WebsiteCARenew struct {
 	SSLID uint `json:"SSLID" validate:"required"`
 }
-
-type WebsiteSSLFileUpload struct {
-	Type        string `json:"type"`
-	Description string `json:"description"`
-	SSLID       uint64 `json:"sslID"`
-}

agent/app/dto/response/app.go

@@ -66,7 +66,6 @@ type AppInstalledCheck struct {
 	InstallPath   string    `json:"installPath"`
 	HttpPort      int       `json:"httpPort"`
 	HttpsPort     int       `json:"httpsPort"`
-	WebsiteDir    string    `json:"websiteDir"`
 }
 
 type AppDetailDTO struct {

agent/app/dto/response/disk.go

@@ -1,37 +0,0 @@
-package response
-
-type DiskInfo struct {
-	DiskBasicInfo
-	Partitions []DiskBasicInfo `json:"partitions"`
-}
-
-type DiskBasicInfo struct {
-	Device      string `json:"device"`
-	Size        string `json:"size"`
-	Model       string `json:"model"`
-	DiskType    string `json:"diskType"`
-	IsRemovable bool   `json:"isRemovable"`
-	IsSystem    bool   `json:"isSystem"`
-	Filesystem  string `json:"filesystem"`
-	Used        string `json:"used"`
-	Avail       string `json:"avail"`
-	UsePercent  int    `json:"usePercent"`
-	MountPoint  string `json:"mountPoint"`
-	IsMounted   bool   `json:"isMounted"`
-	Serial      string `json:"serial"`
-}
-
-type CompleteDiskInfo struct {
-	Disks              []DiskInfo      `json:"disks"`
-	UnpartitionedDisks []DiskBasicInfo `json:"unpartitionedDisks"`
-	SystemDisk         *DiskInfo       `json:"systemDisk"`
-	TotalDisks         int             `json:"totalDisks"`
-	TotalCapacity      int64           `json:"totalCapacity"`
-}
-
-type MountInfo struct {
-	Device     string `json:"device"`
-	MountPoint string `json:"mountPoint"`
-	Filesystem string `json:"filesystem"`
-	Options    string `json:"options"`
-}

agent/app/dto/response/file.go

@@ -44,7 +44,6 @@ type FileLineContent struct {
 	TaskStatus string   `json:"taskStatus"`
 	Lines      []string `json:"lines"`
 	Scope      string   `json:"scope"`
-	TotalLines int      `json:"totalLines"`
 }
 
 type FileExist struct {
@@ -73,11 +72,3 @@ type DepthDirSizeRes struct {
 	Path string `json:"path"`
 	Size int64  `json:"size"`
 }
-
-type FileConvertLog struct {
-	Date    string `json:"date"`
-	Type    string `json:"type"`
-	Log     string `json:"log"`
-	Status  string `json:"status"`
-	Message string `json:"message"`
-}

agent/app/dto/response/host_tool.go

@@ -32,7 +32,6 @@ type SupervisorProcessConfig struct {
 	Status      []ProcessStatus `json:"status"`
 	AutoRestart string          `json:"autoRestart"`
 	AutoStart   string          `json:"autoStart"`
-	Environment string          `json:"environment"`
 }
 
 type ProcessStatus struct {

agent/app/dto/response/runtime.go

@@ -78,8 +78,3 @@ type PHPExtensionRes struct {
 	Extensions        []string           `json:"extensions"`
 	SupportExtensions []SupportExtension `json:"supportExtensions"`
 }
-
-type FpmStatusItem struct {
-	Key   string      `json:"key"`
-	Value interface{} `json:"value"`
-}

agent/app/dto/response/system.go

@@ -1,8 +0,0 @@
-package response
-
-type ComponentInfo struct {
-	Exists  bool   `json:"exists"`
-	Version string `json:"version"`
-	Path    string `json:"path"`
-	Error   string `json:"error"`
-}

agent/app/dto/response/tensorrt_llm.go

@@ -1,25 +0,0 @@
-package response
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-)
-
-type TensorRTLLMsRes struct {
-	Items []TensorRTLLMDTO `json:"items"`
-	Total int64            `json:"total"`
-}
-
-type TensorRTLLMDTO struct {
-	model.TensorRTLLM
-	Version  string `json:"version"`
-	Model    string `json:"model"`
-	Dir      string `json:"dir"`
-	ModelDir string `json:"modelDir"`
-	Image    string `json:"image"`
-	Command  string `json:"command"`
-
-	ExposedPorts []request.ExposedPort `json:"exposedPorts"`
-	Environments []request.Environment `json:"environments"`
-	Volumes      []request.Volume      `json:"volumes"`
-}

agent/app/dto/response/website.go

@@ -59,16 +59,15 @@ type WebsiteNginxConfig struct {
 }
 
 type WebsiteHTTPS struct {
-	Enable                bool             `json:"enable"`
-	HttpConfig            string           `json:"httpConfig"`
-	SSL                   model.WebsiteSSL `json:"SSL"`
-	SSLProtocol           []string         `json:"SSLProtocol"`
-	Algorithm             string           `json:"algorithm"`
-	Hsts                  bool             `json:"hsts"`
-	HstsIncludeSubDomains bool             `json:"hstsIncludeSubDomains"`
-	HttpsPorts            []int            `json:"httpsPorts"`
-	HttpsPort             string           `json:"httpsPort"`
-	Http3                 bool             `json:"http3"`
+	Enable      bool             `json:"enable"`
+	HttpConfig  string           `json:"httpConfig"`
+	SSL         model.WebsiteSSL `json:"SSL"`
+	SSLProtocol []string         `json:"SSLProtocol"`
+	Algorithm   string           `json:"algorithm"`
+	Hsts        bool             `json:"hsts"`
+	HttpsPorts  []int            `json:"httpsPorts"`
+	HttpsPort   string           `json:"httpsPort"`
+	Http3       bool             `json:"http3"`
 }
 
 type WebsiteLog struct {
@@ -82,7 +81,6 @@ type PHPConfig struct {
 	Params           map[string]string `json:"params"`
 	DisableFunctions []string          `json:"disableFunctions"`
 	UploadMaxSize    string            `json:"uploadMaxSize"`
-	MaxExecutionTime string            `json:"maxExecutionTime"`
 }
 
 type NginxRewriteRes struct {

agent/app/dto/setting.go

@@ -69,8 +69,6 @@ type SSHConnData struct {
 	Password   string `json:"password"`
 	PrivateKey string `json:"privateKey"`
 	PassPhrase string `json:"passPhrase"`
-
-	LocalSSHConnShow string `json:"localSSHConnShow"`
 }
 
 type SystemProxy struct {

agent/app/dto/ssh.go

@@ -22,8 +22,7 @@ type SSHInfo struct {
 	CurrentUser            string `json:"currentUser"`
 }
 
-type RootCertOperate struct {
-	ID             uint   `json:"id"`
+type CreateRootCert struct {
 	Name           string `json:"name"`
 	Mode           string `json:"mode"`
 	EncryptionMode string `json:"encryptionMode" validate:"required,oneof=rsa ed25519 ecdsa dsa"`
@@ -55,6 +54,12 @@ type SearchSSHLog struct {
 	Info   string `json:"info"`
 	Status string `json:"Status" validate:"required,oneof=Success Failed All"`
 }
+type SSHLog struct {
+	Logs            []SSHHistory `json:"logs"`
+	TotalCount      int          `json:"totalCount"`
+	SuccessfulCount int          `json:"successfulCount"`
+	FailedCount     int          `json:"failedCount"`
+}
 
 type SSHHistory struct {
 	Date     time.Time `json:"date"`

agent/app/model/alert.go

@@ -3,15 +3,14 @@ package model
 type Alert struct {
 	BaseModel
 
-	Title          string `gorm:"type:varchar(256);not null" json:"title"`
-	Type           string `gorm:"type:varchar(64);not null" json:"type"`
-	Cycle          uint   `gorm:"type:integer;not null" json:"cycle"`
-	Count          uint   `gorm:"type:integer;not null" json:"count"`
-	Project        string `gorm:"type:varchar(64)" json:"project"`
-	Status         string `gorm:"type:varchar(64);not null" json:"status"`
-	Method         string `gorm:"type:varchar(64);not null" json:"method"`
-	SendCount      uint   `gorm:"type:integer" json:"sendCount"`
-	AdvancedParams string `gorm:"type:longText" json:"advancedParam"`
+	Title     string `gorm:"type:varchar(256);not null" json:"title"`
+	Type      string `gorm:"type:varchar(64);not null" json:"type"`
+	Cycle     uint   `gorm:"type:integer;not null" json:"cycle"`
+	Count     uint   `gorm:"type:integer;not null" json:"count"`
+	Project   string `gorm:"type:varchar(64)" json:"project"`
+	Status    string `gorm:"type:varchar(64);not null" json:"status"`
+	Method    string `gorm:"type:varchar(64);not null" json:"method"`
+	SendCount uint   `gorm:"type:integer" json:"sendCount"`
 }
 
 type AlertTask struct {
@@ -44,12 +43,3 @@ type AlertConfig struct {
 	Status string `gorm:"type:varchar(64);not null" json:"status"`
 	Config string `gorm:"type:varchar(256);not null" json:"config"`
 }
-
-type LoginLog struct {
-	BaseModel
-	IP      string `json:"ip"`
-	Address string `json:"address"`
-	Agent   string `json:"agent"`
-	Status  string `json:"status"`
-	Message string `json:"message"`
-}

agent/app/model/app.go

@@ -43,17 +43,11 @@ type App struct {
 func (i *App) IsLocalApp() bool {
 	return i.Resource == constant.ResourceLocal
 }
-func (i *App) IsCustomApp() bool {
-	return i.Resource == constant.AppResourceCustom
-}
-
 func (i *App) GetAppResourcePath() string {
 	if i.IsLocalApp() {
+		//这里要去掉本地应用的local前缀
 		return filepath.Join(global.Dir.LocalAppResourceDir, strings.TrimPrefix(i.Key, "local"))
 	}
-	if i.IsCustomApp() {
-		return filepath.Join(global.Dir.CustomAppResourceDir, i.Key)
-	}
 	return filepath.Join(global.Dir.RemoteAppResourceDir, i.Key)
 }
 

agent/app/model/app_launcher.go

@@ -4,14 +4,3 @@ type AppLauncher struct {
 	BaseModel
 	Key string `json:"key"`
 }
-
-type QuickJump struct {
-	BaseModel
-	Name      string `json:"name"`
-	Alias     string `json:"alias"`
-	Title     string `json:"title"`
-	Detail    string `json:"detail"`
-	Recommend int    `json:"recommend"`
-	IsShow    bool   `json:"isShow"`
-	Router    string `json:"router"`
-}

agent/app/model/backup.go

@@ -27,8 +27,5 @@ type BackupRecord struct {
 	FileDir    string `json:"fileDir"`
 	FileName   string `json:"fileName"`
 
-	TaskID      string `json:"taskID"`
-	Status      string `json:"status"`
-	Message     string `json:"message"`
 	Description string `json:"description"`
 }

agent/app/model/clam.go

@@ -1,33 +1,14 @@
 package model
 
-import "time"
-
 type Clam struct {
 	BaseModel
 
 	Name             string `gorm:"not null" json:"name"`
+	Status           string `json:"status"`
 	Path             string `gorm:"not null" json:"path"`
 	InfectedStrategy string `json:"infectedStrategy"`
 	InfectedDir      string `json:"infectedDir"`
 	Spec             string `json:"spec"`
-	RetryTimes       uint   `json:"retryTimes"`
-	Timeout          uint   `json:"timeout"`
 	EntryID          int    `json:"entryID"`
 	Description      string `json:"description"`
-
-	Status      string `json:"status"`
-	IsExecuting bool   `json:"isExecuting"`
-}
-
-type ClamRecord struct {
-	BaseModel
-
-	ClamID        uint      `json:"clamID"`
-	TaskID        string    `json:"taskID"`
-	StartTime     time.Time `json:"startTime"`
-	ScanTime      string    `json:"scanTime"`
-	InfectedFiles string    `json:"infectedFiles"`
-	TotalError    string    `json:"totalError"`
-	Status        string    `json:"status"`
-	Message       string    `json:"message"`
 }

agent/app/model/cronjob.go

@@ -4,6 +4,8 @@ import (
 	"time"
 )
 
+// BackupAccounts ---> SourceAccountIDs
+// BackupAccounts ---> DownloadAccountID
 type Cronjob struct {
 	BaseModel
 
@@ -38,11 +40,10 @@ type Cronjob struct {
 	IgnoreErr         bool   `json:"ignoreErr"`
 	RetainCopies      uint64 `json:"retainCopies"`
 
-	IsExecuting bool         `json:"isExecuting"`
-	Status      string       `json:"status"`
-	EntryIDs    string       `json:"entryIDs"`
-	Records     []JobRecords `json:"records"`
-	Secret      string       `json:"secret"`
+	Status   string       `json:"status"`
+	EntryIDs string       `json:"entryIDs"`
+	Records  []JobRecords `json:"records"`
+	Secret   string       `json:"secret"`
 }
 
 type JobRecords struct {

agent/app/model/firewall.go

@@ -18,5 +18,4 @@ type Forward struct {
 	Port       string `gorm:"not null" json:"port"`
 	TargetIP   string `gorm:"not null" json:"targetIP"`
 	TargetPort string `gorm:"not null" json:"targetPort"`
-	Interface  string `json:"interface"`
 }

agent/app/model/mcp_server.go

@@ -17,5 +17,4 @@ type McpServer struct {
 	HostIP             string `json:"hostIP"`
 	StreamableHttpPath string `json:"streamableHttpPath"`
 	OutputTransport    string `json:"outputTransport"`
-	Type               string `json:"type"`
 }

agent/app/model/runtime.go

@@ -49,7 +49,3 @@ func (r *Runtime) GetPHPPath() string {
 func (r *Runtime) GetLogPath() string {
 	return path.Join(r.GetPath(), "build.log")
 }
-
-func (r *Runtime) GetSlowLogPath() string {
-	return path.Join(r.GetPath(), "log", "fpm.slow.log")
-}

agent/app/model/setting.go

@@ -15,13 +15,3 @@ type NodeInfo struct {
 	ServerCrt string `json:"serverCrt"`
 	ServerKey string `json:"serverKey"`
 }
-
-type LocalConnInfo struct {
-	Addr       string `json:"addr"`
-	Port       uint   `json:"port"`
-	User       string `json:"user"`
-	AuthMode   string `json:"authMode"`
-	Password   string `json:"password"`
-	PrivateKey string `json:"privateKey"`
-	PassPhrase string `json:"passPhrase"`
-}

agent/app/model/tensorrt_llm.go

@@ -1,13 +0,0 @@
-package model
-
-type TensorRTLLM struct {
-	BaseModel
-	Name          string `json:"name"`
-	DockerCompose string `json:"dockerCompose"`
-	ContainerName string `json:"containerName"`
-	Message       string `json:"message"`
-	//Port          int    `json:"port"`
-	Status string `json:"status"`
-	Env    string `json:"env"`
-	TaskID string `json:"taskID"`
-}

agent/app/model/website_ssl.go

@@ -10,37 +10,32 @@ import (
 
 type WebsiteSSL struct {
 	BaseModel
-	PrimaryDomain  string    `json:"primaryDomain"`
-	PrivateKey     string    `json:"privateKey"`
-	Pem            string    `json:"pem"`
-	Domains        string    `json:"domains"`
-	CertURL        string    `json:"certURL"`
-	Type           string    `json:"type"`
-	Provider       string    `json:"provider"`
-	Organization   string    `json:"organization"`
-	DnsAccountID   uint      `json:"dnsAccountId"`
-	AcmeAccountID  uint      `gorm:"column:acme_account_id" json:"acmeAccountId" `
-	CaID           uint      `json:"caId"`
-	AutoRenew      bool      `json:"autoRenew"`
-	ExpireDate     time.Time `json:"expireDate"`
-	StartDate      time.Time `json:"startDate"`
-	Status         string    `json:"status"`
-	Message        string    `json:"message"`
-	KeyType        string    `json:"keyType"`
-	PushDir        bool      `json:"pushDir"`
-	Dir            string    `json:"dir"`
-	Description    string    `json:"description"`
-	SkipDNS        bool      `json:"skipDNS"`
-	Nameserver1    string    `json:"nameserver1"`
-	Nameserver2    string    `json:"nameserver2"`
-	DisableCNAME   bool      `json:"disableCNAME"`
-	ExecShell      bool      `json:"execShell"`
-	Shell          string    `json:"shell"`
-	MasterSSLID    uint      `json:"masterSslId"`
-	Nodes          string    `json:"nodes"`
-	PushNode       bool      `json:"pushNode"`
-	PrivateKeyPath string    `json:"privateKeyPath"`
-	CertPath       string    `json:"certPath"`
+	PrimaryDomain string    `json:"primaryDomain"`
+	PrivateKey    string    `json:"privateKey"`
+	Pem           string    `json:"pem"`
+	Domains       string    `json:"domains"`
+	CertURL       string    `json:"certURL"`
+	Type          string    `json:"type"`
+	Provider      string    `json:"provider"`
+	Organization  string    `json:"organization"`
+	DnsAccountID  uint      `json:"dnsAccountId"`
+	AcmeAccountID uint      `gorm:"column:acme_account_id" json:"acmeAccountId" `
+	CaID          uint      `json:"caId"`
+	AutoRenew     bool      `json:"autoRenew"`
+	ExpireDate    time.Time `json:"expireDate"`
+	StartDate     time.Time `json:"startDate"`
+	Status        string    `json:"status"`
+	Message       string    `json:"message"`
+	KeyType       string    `json:"keyType"`
+	PushDir       bool      `json:"pushDir"`
+	Dir           string    `json:"dir"`
+	Description   string    `json:"description"`
+	SkipDNS       bool      `json:"skipDNS"`
+	Nameserver1   string    `json:"nameserver1"`
+	Nameserver2   string    `json:"nameserver2"`
+	DisableCNAME  bool      `json:"disableCNAME"`
+	ExecShell     bool      `json:"execShell"`
+	Shell         string    `json:"shell"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
 	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`

agent/app/repo/app.go

@@ -33,8 +33,6 @@ type IAppRepo interface {
 	BatchDelete(ctx context.Context, apps []model.App) error
 	DeleteByIDs(ctx context.Context, ids []uint) error
 	DeleteBy(opts ...DBOption) error
-
-	GetTopRecomment() ([]string, error)
 }
 
 func NewIAppRepo() IAppRepo {
@@ -46,7 +44,7 @@ func (a AppRepo) WithByLikeName(name string) DBOption {
 		if len(name) == 0 {
 			return g
 		}
-		return g.Where("name like ? or  description like ? or short_desc_zh like ? or short_desc_en like ?", "%"+name+"%", "%"+name+"%", "%"+name+"%", "%"+name+"%")
+		return g.Where("name like ? or short_desc_zh like ? or short_desc_en like ?", "%"+name+"%", "%"+name+"%", "%"+name+"%")
 	}
 }
 
@@ -125,21 +123,6 @@ func (a AppRepo) GetBy(opts ...DBOption) ([]model.App, error) {
 	return apps, nil
 }
 
-func (a AppRepo) GetTopRecomment() ([]string, error) {
-	var (
-		apps  []model.App
-		names []string
-	)
-	db := getDb().Model(&model.App{})
-	if err := db.Order("recommend asc").Limit(6).Find(&apps).Error; err != nil {
-		return names, err
-	}
-	for _, item := range apps {
-		names = append(names, item.Key)
-	}
-	return names, nil
-}
-
 func (a AppRepo) BatchCreate(ctx context.Context, apps []model.App) error {
 	return getTx(ctx).Omit(clause.Associations).Create(&apps).Error
 }

agent/app/repo/app_launcher.go

@@ -13,10 +13,6 @@ type ILauncherRepo interface {
 	Create(launcher *model.AppLauncher) error
 	Save(launcher *model.AppLauncher) error
 	Delete(opts ...DBOption) error
-
-	GetQuickJump(opts ...DBOption) (model.QuickJump, error)
-	ListQuickJump(withAll bool) []model.QuickJump
-	UpdateQuicks(quicks []model.QuickJump) error
 }
 
 func NewILauncherRepo() ILauncherRepo {
@@ -61,46 +57,3 @@ func (u *LauncherRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.AppLauncher{}).Error
 }
-
-func (u *LauncherRepo) GetQuickJump(opts ...DBOption) (model.QuickJump, error) {
-	var launcher model.QuickJump
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&launcher).Error
-	return launcher, err
-}
-func (u *LauncherRepo) ListQuickJump(withAll bool) []model.QuickJump {
-	var quicks []model.QuickJump
-	if withAll {
-		_ = global.DB.Find(&quicks).Error
-	} else {
-		_ = global.DB.Where("is_show = ?", true).Find(&quicks).Error
-	}
-	if !withAll && len(quicks) == 0 {
-		return []model.QuickJump{
-			{Name: "Website", Title: "menu.website", Recommend: 10, IsShow: true, Router: "/websites"},
-			{Name: "Database", Title: "menu.database", Recommend: 30, IsShow: true, Router: "/databases"},
-			{Name: "Cronjob", Title: "menu.cronjob", Recommend: 50, IsShow: true, Router: "/cronjobs"},
-			{Name: "AppInstalled", Title: "home.appInstalled", Recommend: 70, IsShow: true, Router: "/apps/installed"},
-		}
-	}
-
-	return quicks
-}
-func (u *LauncherRepo) UpdateQuicks(quicks []model.QuickJump) error {
-	tx := global.DB.Begin()
-	for _, item := range quicks {
-		if err := tx.Model(&model.QuickJump{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
-			"is_show": item.IsShow,
-			"detail":  item.Detail,
-			"alias":   item.Alias,
-		}).Error; err != nil {
-			tx.Rollback()
-			return err
-		}
-	}
-	tx.Commit()
-	return nil
-}

agent/app/repo/clam.go

@@ -1,13 +1,8 @@
 package repo
 
 import (
-	"time"
-
 	"github.com/1Panel-dev/1Panel/agent/app/model"
-	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
 )
 
 type ClamRepo struct{}
@@ -19,14 +14,6 @@ type IClamRepo interface {
 	Delete(opts ...DBOption) error
 	Get(opts ...DBOption) (model.Clam, error)
 	List(opts ...DBOption) ([]model.Clam, error)
-
-	WithByClamID(id uint) DBOption
-	ListRecord(opts ...DBOption) ([]model.ClamRecord, error)
-	RecordFirst(id uint) (model.ClamRecord, error)
-	DeleteRecord(opts ...DBOption) error
-	StartRecords(clamID uint) model.ClamRecord
-	EndRecords(record model.ClamRecord, status, message string)
-	PageRecords(page, size int, opts ...DBOption) (int64, []model.ClamRecord, error)
 }
 
 func NewIClamRepo() IClamRepo {
@@ -80,69 +67,3 @@ func (u *ClamRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Clam{}).Error
 }
-
-func (c *ClamRepo) WithByClamID(id uint) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("clam_id = ?", id)
-	}
-}
-
-func (u *ClamRepo) ListRecord(opts ...DBOption) ([]model.ClamRecord, error) {
-	var record []model.ClamRecord
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&record).Error
-	return record, err
-}
-
-func (u *ClamRepo) RecordFirst(id uint) (model.ClamRecord, error) {
-	var record model.ClamRecord
-	err := global.DB.Where("clam_id = ?", id).Order("created_at desc").First(&record).Error
-	return record, err
-}
-
-func (u *ClamRepo) PageRecords(page, size int, opts ...DBOption) (int64, []model.ClamRecord, error) {
-	var records []model.ClamRecord
-	db := global.DB.Model(&model.ClamRecord{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Order("created_at desc").Limit(size).Offset(size * (page - 1)).Find(&records).Error
-	return count, records, err
-}
-func (u *ClamRepo) StartRecords(clamID uint) model.ClamRecord {
-	var record model.ClamRecord
-	record.StartTime = time.Now()
-	record.ClamID = clamID
-	record.TaskID = uuid.New().String()
-	record.Status = constant.StatusWaiting
-	if err := global.DB.Create(&record).Error; err != nil {
-		global.LOG.Errorf("create record status failed, err: %v", err)
-	}
-	_ = u.Update(clamID, map[string]interface{}{"is_executing": true})
-	return record
-}
-func (u *ClamRepo) EndRecords(record model.ClamRecord, status, message string) {
-	upMap := make(map[string]interface{})
-	upMap["status"] = status
-	upMap["message"] = message
-	upMap["task_id"] = record.TaskID
-	upMap["scan_time"] = record.ScanTime
-	upMap["infected_files"] = record.InfectedFiles
-	upMap["total_error"] = record.TotalError
-	if err := global.DB.Model(&model.ClamRecord{}).Where("id = ?", record.ID).Updates(upMap).Error; err != nil {
-		global.LOG.Errorf("update record status failed, err: %v", err)
-	}
-	_ = u.Update(record.ClamID, map[string]interface{}{"is_executing": false})
-}
-func (u *ClamRepo) DeleteRecord(opts ...DBOption) error {
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	return db.Delete(&model.ClamRecord{}).Error
-}

agent/app/repo/cronjob.go

@@ -29,10 +29,9 @@ type ICronjobRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	DeleteRecord(opts ...DBOption) error
-	StartRecords(cronjobID uint) model.JobRecords
+	StartRecords(cronjobID uint, targetPath, cronjobType string) model.JobRecords
 	UpdateRecords(id uint, vars map[string]interface{}) error
 	EndRecords(record model.JobRecords, status, message, records string)
-	AddFailedRecord(cronjobID uint, message string)
 	PageRecords(page, size int, opts ...DBOption) (int64, []model.JobRecords, error)
 }
 
@@ -144,7 +143,7 @@ func (c *CronjobRepo) WithByRecordDropID(id int) DBOption {
 	}
 }
 
-func (u *CronjobRepo) StartRecords(cronjobID uint) model.JobRecords {
+func (u *CronjobRepo) StartRecords(cronjobID uint, targetPath, cronjobType string) model.JobRecords {
 	var record model.JobRecords
 	record.StartTime = time.Now()
 	record.CronjobID = cronjobID
@@ -153,7 +152,6 @@ func (u *CronjobRepo) StartRecords(cronjobID uint) model.JobRecords {
 	if err := global.DB.Create(&record).Error; err != nil {
 		global.LOG.Errorf("create record status failed, err: %v", err)
 	}
-	_ = u.Update(cronjobID, map[string]interface{}{"is_executing": true})
 	return record
 }
 func (u *CronjobRepo) EndRecords(record model.JobRecords, status, message, records string) {
@@ -167,17 +165,6 @@ func (u *CronjobRepo) EndRecords(record model.JobRecords, status, message, recor
 	if err := global.DB.Model(&model.JobRecords{}).Where("id = ?", record.ID).Updates(errMap).Error; err != nil {
 		global.LOG.Errorf("update record status failed, err: %v", err)
 	}
-	_ = u.Update(record.CronjobID, map[string]interface{}{"is_executing": false})
-}
-func (u *CronjobRepo) AddFailedRecord(cronjobID uint, message string) {
-	var record model.JobRecords
-	record.StartTime = time.Now()
-	record.CronjobID = cronjobID
-	record.Status = constant.StatusFailed
-	record.Message = message
-	if err := global.DB.Create(&record).Error; err != nil {
-		global.LOG.Errorf("create record status failed, err: %v", err)
-	}
 }
 
 func (u *CronjobRepo) Save(id uint, cronjob model.Cronjob) error {

agent/app/repo/host.go

@@ -19,7 +19,7 @@ type IHostRepo interface {
 	GetCert(opts ...DBOption) (model.RootCert, error)
 	PageCert(limit, offset int, opts ...DBOption) (int64, []model.RootCert, error)
 	ListCert(opts ...DBOption) ([]model.RootCert, error)
-	SaveCert(cert *model.RootCert) error
+	CreateCert(cert *model.RootCert) error
 	UpdateCert(id uint, vars map[string]interface{}) error
 	DeleteCert(opts ...DBOption) error
 }
@@ -107,8 +107,8 @@ func (u *HostRepo) ListCert(opts ...DBOption) ([]model.RootCert, error) {
 	return ops, err
 }
 
-func (u *HostRepo) SaveCert(cert *model.RootCert) error {
-	return global.DB.Save(cert).Error
+func (u *HostRepo) CreateCert(cert *model.RootCert) error {
+	return global.DB.Create(cert).Error
 }
 
 func (u *HostRepo) UpdateCert(id uint, vars map[string]interface{}) error {

agent/app/repo/runtime.go

@@ -17,7 +17,6 @@ type IRuntimeRepo interface {
 	WithNotId(id uint) DBOption
 	WithStatus(status string) DBOption
 	WithDetailId(id uint) DBOption
-	WithDetailIdsIn(ids []uint) DBOption
 	WithPort(port int) DBOption
 	WithNormalStatus(status string) DBOption
 	Page(page, size int, opts ...DBOption) (int64, []model.Runtime, error)
@@ -56,12 +55,6 @@ func (r *RuntimeRepo) WithDetailId(id uint) DBOption {
 	}
 }
 
-func (r *RuntimeRepo) WithDetailIdsIn(ids []uint) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("app_detail_id in(?) ", ids)
-	}
-}
-
 func (r *RuntimeRepo) WithNotId(id uint) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("id != ?", id)

agent/app/repo/task.go

@@ -24,7 +24,6 @@ type ITaskRepo interface {
 	DeleteAll() error
 
 	WithByID(id string) DBOption
-	WithByIDNotIn(ids []string) DBOption
 	WithResourceID(id uint) DBOption
 	WithOperate(taskOperate string) DBOption
 	WithByStatus(status string) DBOption
@@ -59,12 +58,6 @@ func (t TaskRepo) WithByID(id string) DBOption {
 	}
 }
 
-func (t TaskRepo) WithByIDNotIn(ids []string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("id not in (?)", ids)
-	}
-}
-
 func (t TaskRepo) WithOperate(taskOperate string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("operate = ?", taskOperate)

agent/app/repo/tensorrt_llm.go

@@ -1,56 +0,0 @@
-package repo
-
-import "github.com/1Panel-dev/1Panel/agent/app/model"
-
-type TensorRTLLMRepo struct {
-}
-
-type ITensorRTLLMRepo interface {
-	Page(page, size int, opts ...DBOption) (int64, []model.TensorRTLLM, error)
-	GetFirst(opts ...DBOption) (*model.TensorRTLLM, error)
-	Create(tensorrtLLM *model.TensorRTLLM) error
-	Save(tensorrtLLM *model.TensorRTLLM) error
-	DeleteBy(opts ...DBOption) error
-	List(opts ...DBOption) ([]model.TensorRTLLM, error)
-}
-
-func NewITensorRTLLMRepo() ITensorRTLLMRepo {
-	return &TensorRTLLMRepo{}
-}
-
-func (t TensorRTLLMRepo) Page(page, size int, opts ...DBOption) (int64, []model.TensorRTLLM, error) {
-	var servers []model.TensorRTLLM
-	db := getDb(opts...).Model(&model.TensorRTLLM{})
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&servers).Error
-	return count, servers, err
-}
-
-func (t TensorRTLLMRepo) GetFirst(opts ...DBOption) (*model.TensorRTLLM, error) {
-	var tensorrtLLM model.TensorRTLLM
-	if err := getDb(opts...).First(&tensorrtLLM).Error; err != nil {
-		return nil, err
-	}
-	return &tensorrtLLM, nil
-}
-
-func (t TensorRTLLMRepo) List(opts ...DBOption) ([]model.TensorRTLLM, error) {
-	var tensorrtLLMs []model.TensorRTLLM
-	if err := getDb(opts...).Find(&tensorrtLLMs).Error; err != nil {
-		return nil, err
-	}
-	return tensorrtLLMs, nil
-}
-
-func (t TensorRTLLMRepo) Create(tensorrtLLM *model.TensorRTLLM) error {
-	return getDb().Create(tensorrtLLM).Error
-}
-
-func (t TensorRTLLMRepo) Save(tensorrtLLM *model.TensorRTLLM) error {
-	return getDb().Save(tensorrtLLM).Error
-}
-
-func (t TensorRTLLMRepo) DeleteBy(opts ...DBOption) error {
-	return getDb(opts...).Delete(&model.TensorRTLLM{}).Error
-}

agent/app/repo/website.go

@@ -19,8 +19,6 @@ type IWebsiteRepo interface {
 	WithRuntimeID(runtimeID uint) DBOption
 	WithParentID(websiteID uint) DBOption
 	WithType(websiteType string) DBOption
-	WithDBType(dbType string) DBOption
-	WithDBID(dbID uint) DBOption
 
 	Page(page, size int, opts ...DBOption) (int64, []model.Website, error)
 	List(opts ...DBOption) ([]model.Website, error)
@@ -102,18 +100,6 @@ func (w *WebsiteRepo) WithType(websiteType string) DBOption {
 	}
 }
 
-func (w *WebsiteRepo) WithDBType(dbType string) DBOption {
-	return func(db *gorm.DB) *gorm.DB {
-		return db.Where("db_type = ?", dbType)
-	}
-}
-
-func (w *WebsiteRepo) WithDBID(dbID uint) DBOption {
-	return func(db *gorm.DB) *gorm.DB {
-		return db.Where("db_id = ?", dbID)
-	}
-}
-
 func (w *WebsiteRepo) Page(page, size int, opts ...DBOption) (int64, []model.Website, error) {
 	var websites []model.Website
 	db := getDb(opts...).Model(&model.Website{})

agent/app/repo/website_ssl.go

@@ -17,7 +17,6 @@ type ISSLRepo interface {
 	WithByDnsAccountId(dnsAccountId uint) DBOption
 	WithByCAID(caID uint) DBOption
 	WithByDomain(domain string) DBOption
-	WithByMasterSSLID(sslID uint) DBOption
 	Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error)
 	GetFirst(opts ...DBOption) (*model.WebsiteSSL, error)
 	List(opts ...DBOption) ([]model.WebsiteSSL, error)
@@ -53,19 +52,12 @@ func (w WebsiteSSLRepo) WithByCAID(caID uint) DBOption {
 		return db.Where("ca_id = ?", caID)
 	}
 }
-
 func (w WebsiteSSLRepo) WithByDomain(domain string) DBOption {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.Where("primary_domain Like ? or domains Like ?", "%"+domain+"%", "%"+domain+"%")
 	}
 }
 
-func (w WebsiteSSLRepo) WithByMasterSSLID(sslID uint) DBOption {
-	return func(db *gorm.DB) *gorm.DB {
-		return db.Where("master_ssl_id = ?", sslID)
-	}
-}
-
 func (w WebsiteSSLRepo) Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error) {
 	var sslList []model.WebsiteSSL
 	db := getDb(opts...).Model(&model.WebsiteSSL{})

agent/app/service/alert.go

@@ -14,7 +14,7 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/utils/copier"
 	"github.com/1Panel-dev/1Panel/agent/utils/email"
 	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
-	"github.com/shirou/gopsutil/v4/disk"
+	"github.com/shirou/gopsutil/v3/disk"
 	"sort"
 	"strings"
 	"sync"
@@ -70,18 +70,17 @@ func (a AlertService) PageAlert(search dto.AlertSearch) (int64, []dto.AlertDTO,
 	for _, item := range alerts {
 
 		result = append(result, dto.AlertDTO{
-			ID:             item.ID,
-			Type:           item.Type,
-			Cycle:          item.Cycle,
-			Count:          item.Count,
-			Method:         item.Method,
-			Title:          item.Title,
-			Project:        item.Project,
-			Status:         item.Status,
-			SendCount:      item.SendCount,
-			AdvancedParams: item.AdvancedParams,
-			CreatedAt:      item.CreatedAt,
-			UpdatedAt:      item.UpdatedAt,
+			ID:        item.ID,
+			Type:      item.Type,
+			Cycle:     item.Cycle,
+			Count:     item.Count,
+			Method:    item.Method,
+			Title:     item.Title,
+			Project:   item.Project,
+			Status:    item.Status,
+			SendCount: item.SendCount,
+			CreatedAt: item.CreatedAt,
+			UpdatedAt: item.UpdatedAt,
 		})
 	}
 
@@ -101,18 +100,17 @@ func (a AlertService) GetAlerts() ([]dto.AlertDTO, error) {
 	for _, item := range alerts {
 
 		result = append(result, dto.AlertDTO{
-			ID:             item.ID,
-			Type:           item.Type,
-			Cycle:          item.Cycle,
-			Count:          item.Count,
-			Method:         item.Method,
-			Title:          item.Title,
-			Project:        item.Project,
-			Status:         item.Status,
-			SendCount:      item.SendCount,
-			AdvancedParams: item.AdvancedParams,
-			CreatedAt:      item.CreatedAt,
-			UpdatedAt:      item.UpdatedAt,
+			ID:        item.ID,
+			Type:      item.Type,
+			Cycle:     item.Cycle,
+			Count:     item.Count,
+			Method:    item.Method,
+			Title:     item.Title,
+			Project:   item.Project,
+			Status:    item.Status,
+			SendCount: item.SendCount,
+			CreatedAt: item.CreatedAt,
+			UpdatedAt: item.UpdatedAt,
 		})
 	}
 
@@ -167,7 +165,6 @@ func (a AlertService) UpdateAlert(req dto.AlertUpdate) error {
 	upMap["project"] = req.Project
 	upMap["status"] = req.Status
 	upMap["send_count"] = req.SendCount
-	upMap["advanced_params"] = req.AdvancedParams
 
 	if err := alertRepo.Update(upMap, repo.WithByID(req.ID)); err != nil {
 		return err
@@ -177,24 +174,7 @@ func (a AlertService) UpdateAlert(req dto.AlertUpdate) error {
 }
 
 func (a AlertService) DeleteAlert(id uint) error {
-	alertInfo, _ := alertRepo.Get(repo.WithByID(id))
-	if alertInfo.ID == 0 {
-		return buserr.New("ErrRecordNotFound")
-	}
-	err := alertRepo.Delete(repo.WithByID(id))
-	if err != nil {
-		return err
-	}
-	alerts, err := a.GetAlerts()
-	if err != nil {
-		return err
-	}
-	if len(alerts) > 0 {
-		NewIAlertTaskHelper().InitTask(alertInfo.Type)
-	} else {
-		NewIAlertTaskHelper().StopTask()
-	}
-	return nil
+	return alertRepo.Delete(repo.WithByID(id))
 }
 
 func (a AlertService) GetAlert(id uint) (dto.AlertDTO, error) {
@@ -479,14 +459,10 @@ func (a AlertService) DeleteAlertConfig(id uint) error {
 }
 
 func (a AlertService) TestAlertConfig(req dto.AlertConfigTest) (bool, error) {
-	username := req.UserName
-	if username == "" {
-		username = req.Sender
-	}
 	cfg := email.SMTPConfig{
 		Host:       req.Host,
 		Port:       req.Port,
-		Username:   username,
+		Username:   req.Sender,
 		Password:   req.Password,
 		From:       fmt.Sprintf("%s <%s>", req.DisplayName, req.Sender),
 		Encryption: req.Encryption,

agent/app/service/alert_sender.go

@@ -1,165 +0,0 @@
-package service
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/constant"
-	"github.com/1Panel-dev/1Panel/agent/global"
-	alertUtil "github.com/1Panel-dev/1Panel/agent/utils/alert"
-	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
-	"strings"
-)
-
-type AlertSender struct {
-	alert     dto.AlertDTO
-	quotaType string
-}
-
-func NewAlertSender(alert dto.AlertDTO, quotaType string) *AlertSender {
-	return &AlertSender{
-		alert:     alert,
-		quotaType: quotaType,
-	}
-}
-
-func (s *AlertSender) Send(quota string, params []dto.Param) {
-	methods := strings.Split(s.alert.Method, ",")
-	for _, method := range methods {
-		method = strings.TrimSpace(method)
-		switch method {
-		case constant.SMS:
-			s.sendSMS(quota, params)
-		case constant.Email:
-			s.sendEmail(quota, params)
-		}
-	}
-}
-
-func (s *AlertSender) ResourceSend(quota string, params []dto.Param) {
-	methods := strings.Split(s.alert.Method, ",")
-	for _, method := range methods {
-		method = strings.TrimSpace(method)
-		switch method {
-		case constant.SMS:
-			s.sendResourceSMS(quota, params)
-		case constant.Email:
-			s.sendResourceEmail(quota, params)
-		}
-	}
-}
-
-func (s *AlertSender) sendSMS(quota string, params []dto.Param) {
-	if !alertUtil.CheckSMSSendLimit(constant.SMS) {
-		return
-	}
-
-	totalCount, isValid := s.canSendAlert(constant.SMS)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:  constant.AlertSuccess,
-		Count:   totalCount + 1,
-		AlertId: s.alert.ID,
-		Type:    s.alert.Type,
-	}
-
-	_ = xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS)
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
-	global.LOG.Infof("%s alert sms push successful", s.alert.Type)
-}
-
-func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
-	totalCount, isValid := s.canSendAlert(constant.Email)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:      constant.AlertSuccess,
-		Count:       totalCount + 1,
-		AlertId:     s.alert.ID,
-		Type:        s.alert.Type,
-		AlertRule:   alertUtil.ProcessAlertRule(s.alert),
-		AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
-	}
-
-	transport := xpack.LoadRequestTransport()
-	_ = alertUtil.CreateEmailAlertLog(create, s.alert, params, transport)
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
-	global.LOG.Infof("%s alert email push successful", s.alert.Type)
-}
-
-func (s *AlertSender) sendResourceSMS(quota string, params []dto.Param) {
-	if !alertUtil.CheckSMSSendLimit(constant.SMS) {
-		return
-	}
-
-	todayCount, isValid := s.canResourceSendAlert(constant.SMS)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:  constant.AlertSuccess,
-		Count:   todayCount + 1,
-		AlertId: s.alert.ID,
-		Type:    s.alert.Type,
-	}
-
-	if err := xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS); err != nil {
-		global.LOG.Errorf("failed to send SMS alert: %v", err)
-		return
-	}
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
-	global.LOG.Infof("%s alert sms push successful", s.alert.Type)
-}
-
-func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
-	todayCount, isValid := s.canResourceSendAlert(constant.Email)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:      constant.AlertSuccess,
-		Count:       todayCount + 1,
-		AlertId:     s.alert.ID,
-		Type:        s.alert.Type,
-		AlertRule:   alertUtil.ProcessAlertRule(s.alert),
-		AlertDetail: alertUtil.ProcessAlertDetail(s.alert, quota, params, constant.Email),
-	}
-
-	transport := xpack.LoadRequestTransport()
-	if err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport); err != nil {
-		global.LOG.Errorf("failed to send Email alert: %v", err)
-		return
-	}
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
-	global.LOG.Infof("%s alert email push successful", s.alert.Type)
-}
-
-func (s *AlertSender) canSendAlert(method string) (uint, bool) {
-	todayCount, totalCount, err := alertRepo.LoadTaskCount(s.alert.Type, s.quotaType, method)
-	if err != nil {
-		global.LOG.Errorf("error getting task count: %v", err)
-		return totalCount, false
-	}
-
-	if todayCount >= 1 || s.alert.SendCount <= totalCount {
-		return totalCount, false
-	}
-	return totalCount, true
-}
-
-func (s *AlertSender) canResourceSendAlert(method string) (uint, bool) {
-	todayCount, _, err := alertRepo.LoadTaskCount(s.alert.Type, s.quotaType, method)
-	if err != nil {
-		global.LOG.Errorf("error getting task count: %v", err)
-		return todayCount, false
-	}
-	if s.alert.SendCount <= todayCount {
-		return todayCount, false
-	}
-	return todayCount, true
-}

agent/app/service/app.go

@@ -56,7 +56,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 	var opts []repo.DBOption
 	opts = append(opts, appRepo.OrderByRecommend())
 	if req.Name != "" {
-		opts = append(opts, appRepo.WithByLikeName(strings.TrimSpace(req.Name)))
+		opts = append(opts, appRepo.WithByLikeName(req.Name))
 	}
 	if req.Type != "" {
 		opts = append(opts, appRepo.WithType(req.Type))
@@ -73,11 +73,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 		if err != nil {
 			return nil, err
 		}
-		kernelArch := info.KernelArch
-		if kernelArch == "aarch64" {
-			kernelArch = "arm64"
-		}
-		opts = append(opts, appRepo.WithArch(kernelArch))
+		opts = append(opts, appRepo.WithArch(info.KernelArch))
 	}
 	if len(req.Tags) != 0 {
 		tags, err := tagRepo.GetByKeys(req.Tags)
@@ -104,7 +100,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 	if err != nil {
 		return nil, err
 	}
-	appDTOs := make([]*response.AppItem, 0)
+	var appDTOs []*response.AppItem
 	info := &dto.SettingInfo{}
 	if req.Type == "php" {
 		info, _ = NewISettingService().GetSettingInfo()
@@ -112,7 +108,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 	lang := strings.ToLower(common.GetLang(ctx))
 	for _, ap := range apps {
 		if req.Type == "php" {
-			if !global.CONF.Base.IsOffLine && (ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(common.GetSystemVersion(info.SystemVersion), fmt.Sprintf("%f", ap.RequiredPanelVersion))) {
+			if ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(common.GetSystemVersion(info.SystemVersion), fmt.Sprintf("%f", ap.RequiredPanelVersion)) {
 				continue
 			}
 		}
@@ -136,21 +132,8 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 			continue
 		}
 		appDTO.Tags = tags
-		if ap.Type == constant.RuntimePHP || ap.Type == constant.RuntimeGo || ap.Type == constant.RuntimeNode || ap.Type == constant.RuntimePython || ap.Type == constant.RuntimeJava || ap.Type == constant.RuntimeDotNet {
-			details, _ := appDetailRepo.GetBy(appDetailRepo.WithAppId(ap.ID))
-			var ids []uint
-			if len(details) == 0 {
-				continue
-			}
-			for _, d := range details {
-				ids = append(ids, d.ID)
-			}
-			runtimes, _ := runtimeRepo.List(runtimeRepo.WithDetailIdsIn(ids))
-			appDTO.Installed = len(runtimes) > 0
-		} else {
-			installs, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(ap.ID))
-			appDTO.Installed = len(installs) > 0
-		}
+		installs, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(ap.ID))
+		appDTO.Installed = len(installs) > 0
 	}
 	res.Items = appDTOs
 	res.Total = total
@@ -372,6 +355,29 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 			}
 		}
 	}
+	if app.Key == "openresty" && (app.Resource == "remote" || app.Resource == "custom") && common.CompareVersion(appDetail.Version, "1.27") {
+		if dir, ok := req.Params["WEBSITE_DIR"]; ok {
+			siteDir := dir.(string)
+			if siteDir == "" || !strings.HasPrefix(siteDir, "/") {
+				siteDir = path.Join(global.Dir.DataDir, dir.(string))
+			}
+			req.Params["WEBSITE_DIR"] = siteDir
+			oldWebStePath, _ := settingRepo.GetValueByKey("WEBSITE_DIR")
+			fileOp := files.NewFileOp()
+			if oldWebStePath != "" && oldWebStePath != siteDir && fileOp.Stat(oldWebStePath) {
+				_ = fileOp.Rename(oldWebStePath, siteDir)
+			}
+			if !fileOp.Stat(siteDir) {
+				_ = fileOp.CreateDir(siteDir, constant.DirPerm)
+				_ = fileOp.CreateDir(path.Join(siteDir, "conf.d"), constant.DirPerm)
+			}
+			err = settingRepo.UpdateOrCreate("WEBSITE_DIR", siteDir)
+			if err != nil {
+				return
+			}
+			go RestartPHPRuntime()
+		}
+	}
 	for key := range req.Params {
 		if !strings.Contains(key, "PANEL_APP_PORT") {
 			continue
@@ -480,20 +486,6 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 			req.Params["DATABASE_NAME"] = database.Name
 		}
 	}
-	if app.Key == "openresty" {
-		req.Params["CONTAINER_PACKAGE_URL"] = "http://archive.ubuntu.com/ubuntu/"
-		req.Params["RESTY_ADD_PACKAGE_BUILDDEPS"] = ""
-		req.Params["RESTY_CONFIG_OPTIONS_MORE"] = ""
-	}
-	if app.Key == "openresty" && (app.Resource == "remote" || app.Resource == "custom") && common.CompareVersion(appDetail.Version, "1.27") {
-		if dir, ok := req.Params["WEBSITE_DIR"]; ok {
-			siteDir := dir.(string)
-			if siteDir == "" || !strings.HasPrefix(siteDir, "/") {
-				siteDir = path.Join(global.Dir.DataDir, dir.(string))
-			}
-			req.Params["WEBSITE_DIR"] = siteDir
-		}
-	}
 	paramByte, err = json.Marshal(req.Params)
 	if err != nil {
 		return
@@ -521,9 +513,6 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 			return err
 		}
 		if app.Key == "openresty" {
-			if err = handleSiteDir(app, appDetail, req, t); err != nil {
-				return err
-			}
 			if err = handleOpenrestyFile(appInstall); err != nil {
 				return err
 			}

agent/app/service/app_install.go

@@ -164,11 +164,6 @@ func (a *AppInstallService) CheckExist(req request.AppInstalledInfo) (*response.
 	res.HttpPort = appInstall.HttpPort
 	res.HttpsPort = appInstall.HttpsPort
 
-	if appInstall.App.Key == "openresty" {
-		websiteDir, _ := settingRepo.GetValueByKey("WEBSITE_DIR")
-		res.WebsiteDir = websiteDir
-	}
-
 	return res, nil
 }
 
@@ -793,7 +788,6 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 	}
 	res.AppContainerConfig = config
 	res.HostMode = isHostModel(install.DockerCompose)
-	res.RestartPolicy = getRestartPolicy(install.DockerCompose)
 	res.WebUI = install.WebUI
 	res.Type = install.App.Type
 	return &res, nil

agent/app/service/app_utils.go

@@ -1,13 +1,11 @@
 package service
 
 import (
-	"bufio"
 	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
-	"maps"
 	"math"
 	"net/http"
 	"os"
@@ -359,7 +357,7 @@ func deleteAppInstall(deleteReq request.AppInstallDelete) error {
 				if err != nil {
 					return err
 				}
-				images, err := composeV2.GetImagesFromDockerCompose(content, []byte(install.DockerCompose))
+				images, err := composeV2.GetDockerComposeImagesV2(content, []byte(install.DockerCompose))
 				if err != nil {
 					return err
 				}
@@ -542,9 +540,6 @@ func handleUpgradeCompose(install model.AppInstall, detail model.AppDetail) (map
 	if oldServiceValue["deploy"] != nil {
 		serviceValue["deploy"] = oldServiceValue["deploy"]
 	}
-	if oldServiceValue["restart"] != nil {
-		serviceValue["restart"] = oldServiceValue["restart"]
-	}
 	servicesMap[install.ServiceName] = serviceValue
 	composeMap["services"] = servicesMap
 	return composeMap, nil
@@ -583,76 +578,6 @@ func getUpgradeCompose(install model.AppInstall, detail model.AppDetail) (string
 	return string(composeByte), nil
 }
 
-func buildNginx(parentTask *task.Task) error {
-	nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
-	if err != nil {
-		return err
-	}
-	fileOp := files.NewFileOp()
-	buildPath := path.Join(nginxInstall.GetPath(), "build")
-	if !fileOp.Stat(buildPath) {
-		return buserr.New("ErrBuildDirNotFound")
-	}
-	moduleConfigPath := path.Join(buildPath, "module.json")
-	moduleContent, err := fileOp.GetContent(moduleConfigPath)
-	if err != nil {
-		return err
-	}
-	var (
-		modules         []dto.NginxModule
-		addModuleParams []string
-		addPackages     []string
-	)
-	if len(moduleContent) > 0 {
-		_ = json.Unmarshal(moduleContent, &modules)
-		bashFile, err := os.OpenFile(path.Join(buildPath, "tmp", "pre.sh"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, constant.DirPerm)
-		if err != nil {
-			return err
-		}
-		defer bashFile.Close()
-		bashFileWriter := bufio.NewWriter(bashFile)
-		for _, module := range modules {
-			if !module.Enable {
-				continue
-			}
-			_, err = bashFileWriter.WriteString(module.Script + "\n")
-			if err != nil {
-				return err
-			}
-			addModuleParams = append(addModuleParams, module.Params)
-			addPackages = append(addPackages, module.Packages...)
-		}
-		err = bashFileWriter.Flush()
-		if err != nil {
-			return err
-		}
-	}
-	envs, err := gotenv.Read(nginxInstall.GetEnvPath())
-	if err != nil {
-		return err
-	}
-	envs["RESTY_CONFIG_OPTIONS_MORE"] = ""
-	envs["RESTY_ADD_PACKAGE_BUILDDEPS"] = ""
-	if len(addModuleParams) > 0 {
-		envs["RESTY_CONFIG_OPTIONS_MORE"] = strings.Join(addModuleParams, " ")
-	}
-	if len(addPackages) > 0 {
-		envs["RESTY_ADD_PACKAGE_BUILDDEPS"] = strings.Join(addPackages, " ")
-	}
-	_ = gotenv.Write(envs, nginxInstall.GetEnvPath())
-	if len(addModuleParams) == 0 && len(addPackages) == 0 {
-		return nil
-	}
-	logStr := fmt.Sprintf("%s %s", i18n.GetMsgByKey("TaskBuild"), i18n.GetMsgByKey("Image"))
-	parentTask.LogStart(logStr)
-	cmdMgr := cmd.NewCommandMgr(cmd.WithTask(*parentTask), cmd.WithTimeout(60*time.Minute))
-	if err = cmdMgr.RunBashCf("docker compose -f %s build", nginxInstall.GetComposePath()); err != nil {
-		return err
-	}
-	parentTask.LogSuccess(logStr)
-	return nil
-}
-
 func upgradeInstall(req request.AppInstallUpgrade) error {
 	install, err := appInstallRepo.GetFirst(repo.WithByID(req.InstallID))
 	if err != nil {
@@ -677,29 +602,29 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 		backupFile string
 	)
 	backUpApp := func(t *task.Task) error {
-		backupService := NewIBackupService()
-		backupRecordService := NewIBackupRecordService()
-		fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5))
-		backupRecord, err := backupService.AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name, FileName: fileName})
-		if err == nil {
-			backups, _ := backupRecordService.ListAppRecords(install.App.Key, install.Name, "upgrade_backup")
-			if len(backups) > 3 {
-				backupsToDelete := backups[:len(backups)-3]
-				var deleteIDs []uint
-				for _, backup := range backupsToDelete {
-					deleteIDs = append(deleteIDs, backup.ID)
+		if req.Backup {
+			backupService := NewIBackupService()
+			backupRecordService := NewIBackupRecordService()
+			fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5))
+			backupRecord, err := backupService.AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name, FileName: fileName})
+			if err == nil {
+				backups, _ := backupRecordService.ListAppRecords(install.App.Key, install.Name, "upgrade_backup")
+				if len(backups) > 3 {
+					backupsToDelete := backups[:len(backups)-3]
+					var deleteIDs []uint
+					for _, backup := range backupsToDelete {
+						deleteIDs = append(deleteIDs, backup.ID)
+					}
+					_ = backupRecordService.BatchDeleteRecord(deleteIDs)
 				}
-				_ = backupRecordService.BatchDeleteRecord(deleteIDs)
+				backupFile = path.Join(global.Dir.LocalBackupDir, backupRecord.FileDir, backupRecord.FileName)
+			} else {
+				return buserr.WithNameAndErr("ErrAppBackup", install.Name, err)
 			}
-			backupFile = path.Join(global.Dir.LocalBackupDir, backupRecord.FileDir, backupRecord.FileName)
-		} else {
-			return buserr.WithNameAndErr("ErrAppBackup", install.Name, err)
 		}
 		return nil
 	}
-	if req.Backup {
-		upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), backUpApp, nil)
-	}
+	upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), backUpApp, nil)
 
 	upgradeApp := func(t *task.Task) error {
 		fileOp := files.NewFileOp()
@@ -734,7 +659,7 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 			if req.DockerCompose != "" {
 				composeContent = []byte(req.DockerCompose)
 			}
-			images, err := composeV2.GetImagesFromDockerCompose(content, composeContent)
+			images, err := composeV2.GetDockerComposeImagesV2(content, composeContent)
 			if err != nil {
 				return err
 			}
@@ -785,14 +710,6 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 			return err
 		}
 		envParams := make(map[string]string, len(envs))
-		if install.App.Key == constant.AppOpenresty {
-			packageUrl, _ := env.GetEnvValueByKey(install.GetEnvPath(), "CONTAINER_PACKAGE_URL")
-			addPackage, _ := env.GetEnvValueByKey(install.GetEnvPath(), "RESTY_ADD_PACKAGE_BUILDDEPS")
-			options, _ := env.GetEnvValueByKey(install.GetEnvPath(), "RESTY_CONFIG_OPTIONS_MORE")
-			envParams["CONTAINER_PACKAGE_URL"] = packageUrl
-			envParams["RESTY_ADD_PACKAGE_BUILDDEPS"] = addPackage
-			envParams["RESTY_CONFIG_OPTIONS_MORE"] = options
-		}
 		handleMap(envs, envParams)
 		if err = env.Write(envParams, install.GetEnvPath()); err != nil {
 			return err
@@ -806,13 +723,6 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 			return err
 		}
 
-		if install.App.Key == constant.AppOpenresty {
-			if err = buildNginx(t); err != nil {
-				t.Log(err.Error())
-				return err
-			}
-		}
-
 		logStr := fmt.Sprintf("%s %s", i18n.GetMsgByKey("Run"), i18n.GetMsgByKey("App"))
 		t.Log(logStr)
 		if out, err := compose.Up(install.GetComposePath()); err != nil {
@@ -838,7 +748,7 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 		}
 	}
 
-	upgradeTask.AddSubTaskWithOps(task.GetTaskName(install.Name, task.TaskScopeApp, task.TaskUpgrade), upgradeApp, rollBackApp, 0, 1*time.Hour)
+	upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskScopeApp, task.TaskUpgrade), upgradeApp, rollBackApp)
 
 	go func() {
 		err = upgradeTask.Execute()
@@ -946,7 +856,7 @@ func handleMap(params map[string]interface{}, envParams map[string]string) {
 }
 
 func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.AppInstall, logger *log.Logger) (err error) {
-	if app.IsLocalApp() || app.IsCustomApp() {
+	if app.IsLocalApp() {
 		return nil
 	}
 	appResourceDir := path.Join(global.Dir.AppResourceDir, app.Resource)
@@ -963,9 +873,9 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 		_ = fileOp.CreateDir(appVersionDir, constant.DirPerm)
 	}
 	if logger == nil {
-		global.LOG.Infof("download app [%s] from %s", app.Name, appDetail.DownloadUrl)
+		global.LOG.Infof("download app[%s] from %s", app.Name, appDetail.DownloadUrl)
 	} else {
-		logger.Printf("download app [%s] from %s", app.Name, appDetail.DownloadUrl)
+		logger.Printf("download app[%s] from %s", app.Name, appDetail.DownloadUrl)
 	}
 
 	filePath := path.Join(appVersionDir, app.Key+"-"+appDetail.Version+".tar.gz")
@@ -981,9 +891,9 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 
 	if err = files.DownloadFileWithProxy(appDetail.DownloadUrl, filePath); err != nil {
 		if logger == nil {
-			global.LOG.Errorf("download app [%s] error %v", app.Name, err)
+			global.LOG.Errorf("download app[%s] error %v", app.Name, err)
 		} else {
-			logger.Printf("download app [%s] error %v", app.Name, err)
+			logger.Printf("download app[%s] error %v", app.Name, err)
 		}
 		return
 	}
@@ -1045,11 +955,11 @@ func copyData(task *task.Task, app model.App, appDetail model.AppDetail, appInst
 		return
 	}
 	envPath := path.Join(appDir, ".env")
-	envParams := make(map[string]string)
+	envParams := make(map[string]string, len(req.Params))
 	if fileOp.Stat(envPath) {
 		envs, _ := gotenv.Read(envPath)
-		if envParams = maps.Clone(envs); envParams == nil {
-			envParams = make(map[string]string)
+		for k, v := range envs {
+			envParams[k] = v
 		}
 	}
 	handleMap(req.Params, envParams)
@@ -1082,7 +992,7 @@ func runScript(task *task.Task, appInstall *model.AppInstall, operate string) er
 	task.LogStart(logStr)
 
 	cmdMgr := cmd.NewCommandMgr(cmd.WithTimeout(10*time.Minute), cmd.WithWorkDir(workDir))
-	out, err := cmdMgr.RunWithStdoutBashC(scriptPath)
+	out, err := cmdMgr.RunWithStdoutBashCf(scriptPath)
 	if err != nil {
 		if out != "" {
 			err = errors.New(out)
@@ -1163,11 +1073,7 @@ func upApp(task *task.Task, appInstall *model.AppInstall, pullImages bool) error
 					appInstall.Message = errMsg + errOur
 					installErr := errors.New(appInstall.Message)
 					task.LogFailedWithErr(i18n.GetMsgByKey("PullImage"), installErr)
-					if exist, _ := dockerCLi.ImageExists(image); !exist {
-						return installErr
-					} else {
-						task.Log(i18n.GetMsgByKey("UseExistImage"))
-					}
+					return installErr
 				} else {
 					task.Log(i18n.GetMsgByKey("PullImageSuccess"))
 				}
@@ -1752,14 +1658,6 @@ func addDockerComposeCommonParam(composeMap map[string]interface{}, serviceName
 	deploy["resources"] = resource
 	serviceValue["deploy"] = deploy
 
-	if req.RestartPolicy != "" {
-		if req.RestartPolicy == "on-failure" {
-			serviceValue["restart"] = "on-failure:5"
-		} else {
-			serviceValue["restart"] = req.RestartPolicy
-		}
-	}
-
 	ports, ok := serviceValue["ports"].([]interface{})
 	if ok {
 		for i, port := range ports {
@@ -1862,17 +1760,6 @@ func isHostModel(dockerCompose string) bool {
 	return false
 }
 
-func getRestartPolicy(yml string) string {
-	var project docker.ComposeProject
-	if err := yaml.Unmarshal([]byte(yml), &project); err != nil {
-		return ""
-	}
-	for _, service := range project.Services {
-		return service.Restart
-	}
-	return ""
-}
-
 func getMajorVersion(version string) string {
 	parts := strings.Split(version, ".")
 	if len(parts) >= 2 {
@@ -1899,11 +1786,6 @@ func ignoreUpdate(installed model.AppInstall) bool {
 		}
 		return true
 	}
-	if installed.App.Key == "sqlbot" {
-		if common.CompareVersion("1.1.0", installed.Version) {
-			return true
-		}
-	}
 	return false
 }
 
@@ -1943,53 +1825,6 @@ func getAppTags(appID uint, lang string) ([]response.TagDTO, error) {
 	return res, nil
 }
 
-func handleSiteDir(app model.App, appDetail model.AppDetail, req request.AppInstallCreate, t *task.Task) error {
-	if app.Key == "openresty" && (app.Resource == "remote" || app.Resource == "custom") && common.CompareVersion(appDetail.Version, "1.27") {
-		if dir, ok := req.Params["WEBSITE_DIR"]; ok {
-			siteDir := dir.(string)
-			if siteDir == "" || !strings.HasPrefix(siteDir, "/") {
-				siteDir = path.Join(global.Dir.DataDir, dir.(string))
-			}
-			req.Params["WEBSITE_DIR"] = siteDir
-			oldWebStePath, _ := settingRepo.GetValueByKey("WEBSITE_DIR")
-			fileOp := files.NewFileOp()
-			if oldWebStePath != "" && oldWebStePath != siteDir && fileOp.Stat(oldWebStePath) {
-				t.Log(i18n.GetWithName("MoveSiteDir", siteDir))
-				if fileOp.Stat(siteDir) {
-					if fileOp.Stat(path.Join(siteDir, "conf.d")) {
-						_ = fileOp.Rename(path.Join(siteDir, "conf.d"), path.Join(siteDir, "conf.d.bak"))
-					}
-					if fileOp.Stat(path.Join(siteDir, "sites")) {
-						_ = fileOp.Rename(path.Join(siteDir, "sites"), path.Join(siteDir, "sites.bak"))
-					}
-					if err := fileOp.Rename(path.Join(oldWebStePath, "sites"), path.Join(siteDir, "sites")); err != nil {
-						return err
-					}
-					if err := fileOp.Rename(path.Join(oldWebStePath, "conf.d"), path.Join(siteDir, "conf.d")); err != nil {
-						return err
-					}
-				} else {
-					err := fileOp.Rename(oldWebStePath, siteDir)
-					if err != nil {
-						return err
-					}
-				}
-				t.Log(i18n.GetMsgByKey("MoveSiteDirSuccess"))
-			}
-			if !fileOp.Stat(siteDir) {
-				_ = fileOp.CreateDir(siteDir, constant.DirPerm)
-				_ = fileOp.CreateDir(path.Join(siteDir, "conf.d"), constant.DirPerm)
-			}
-			err := settingRepo.UpdateOrCreate("WEBSITE_DIR", siteDir)
-			if err != nil {
-				return err
-			}
-			go RestartPHPRuntime()
-		}
-	}
-	return nil
-}
-
 func handleOpenrestyFile(appInstall *model.AppInstall) error {
 	websites, _ := websiteRepo.List()
 	hasDefaultWebsite := false
@@ -2067,7 +1902,7 @@ func handleSSLConfig(appInstall *model.AppInstall, hasDefaultWebsite bool) error
 	}
 	defaultConfig.FilePath = defaultConfigPath
 	defaultServer := defaultConfig.FindServers()[0]
-	updateDefaultServer(defaultServer, appInstall.HttpPort, appInstall.HttpsPort, !hasDefaultWebsite, true)
+	updateDefaultServer(defaultServer, appInstall.HttpPort, appInstall.HttpsPort, !hasDefaultWebsite)
 	defaultServer.UpdateDirective("include", []string{"/usr/local/openresty/nginx/conf/ssl/root_ssl.conf"})
 	defaultServer.UpdateDirective("http2", []string{"on"})
 	if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil {

agent/app/service/backup.go

@@ -14,11 +14,9 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
-	"github.com/1Panel-dev/1Panel/agent/app/task"
 	"github.com/1Panel-dev/1Panel/agent/buserr"
 	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/i18n"
 	"github.com/1Panel-dev/1Panel/agent/utils/cloud_storage"
 	"github.com/1Panel-dev/1Panel/agent/utils/cloud_storage/client"
 	"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
@@ -39,7 +37,6 @@ type IBackupService interface {
 	Delete(id uint) error
 	RefreshToken(req dto.OperateByID) error
 	GetLocalDir() (string, error)
-	UploadForRecover(req dto.UploadForRecover) error
 
 	MysqlBackup(db dto.CommonBackup) error
 	PostgresqlBackup(db dto.CommonBackup) error
@@ -310,16 +307,6 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {
 	return backupRepo.Save(&backup)
 }
 
-func (u *BackupService) UploadForRecover(req dto.UploadForRecover) error {
-	fileOp := files.NewFileOp()
-	if !fileOp.Stat(req.TargetDir) {
-		if err := fileOp.CreateDir(req.TargetDir, constant.DirPerm); err != nil {
-			return err
-		}
-	}
-	return fileOp.Copy(req.FilePath, req.TargetDir)
-}
-
 func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, error) {
 	client, err := newClient(backup, false)
 	if err != nil {
@@ -406,13 +393,9 @@ type backupClientHelper struct {
 	name        string
 	backupPath  string
 	client      cloud_storage.CloudStorageClient
-
-	isOk      bool
-	hasBackup bool
-	message   string
 }
 
-func NewBackupClientMap(ids []string) map[string]backupClientHelper {
+func NewBackupClientMap(ids []string) (map[string]backupClientHelper, error) {
 	var accounts []model.BackupAccount
 	var idItems []uint
 	for i := 0; i < len(ids); i++ {
@@ -423,63 +406,18 @@ func NewBackupClientMap(ids []string) map[string]backupClientHelper {
 	clientMap := make(map[string]backupClientHelper)
 	for _, item := range accounts {
 		backClient, err := newClient(&item, true)
-		itemHelper := backupClientHelper{
+		if err != nil {
+			return nil, err
+		}
+		clientMap[fmt.Sprintf("%v", item.ID)] = backupClientHelper{
 			client:      backClient,
 			name:        item.Name,
 			backupPath:  item.BackupPath,
 			accountType: item.Type,
 			id:          item.ID,
-			isOk:        err == nil,
 		}
-		if err != nil {
-			itemHelper.message = err.Error()
-		}
-		clientMap[fmt.Sprintf("%v", item.ID)] = itemHelper
 	}
-	return clientMap
-}
-
-func uploadWithMap(taskItem task.Task, accountMap map[string]backupClientHelper, src, dst, accountIDs string, downloadAccountID, retry uint) error {
-	accounts := strings.Split(accountIDs, ",")
-	for _, account := range accounts {
-		if len(account) == 0 {
-			continue
-		}
-		itemBackup, ok := accountMap[account]
-		if !ok {
-			continue
-		}
-		if itemBackup.hasBackup {
-			continue
-		}
-		if !itemBackup.isOk {
-			taskItem.LogFailed(i18n.GetMsgWithDetail("LoadBackupFailed", itemBackup.message))
-			continue
-		}
-		name := itemBackup.name
-		if itemBackup.name == "localhost" {
-			name = i18n.GetMsgByKey("Localhost")
-		}
-		taskItem.LogStart(i18n.GetMsgWithMap("UploadFile", map[string]interface{}{
-			"file":   path.Join(itemBackup.backupPath, dst),
-			"backup": name,
-		}))
-		for i := 0; i < int(retry)+1; i++ {
-			_, err := itemBackup.client.Upload(src, path.Join(itemBackup.backupPath, dst))
-			taskItem.LogWithStatus(i18n.GetMsgByKey("Upload"), err)
-			if err != nil {
-				if account == fmt.Sprintf("%d", downloadAccountID) {
-					return err
-				}
-			} else {
-				break
-			}
-		}
-		itemBackup.hasBackup = true
-		accountMap[account] = itemBackup
-	}
-	os.RemoveAll(src)
-	return nil
+	return clientMap, nil
 }
 
 func newClient(account *model.BackupAccount, isEncrypt bool) (cloud_storage.CloudStorageClient, error) {

agent/app/service/backup_app.go

@@ -45,29 +45,36 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, er
 		fileName = fmt.Sprintf("%s_%s.tar.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
 	}
 
-	record := &model.BackupRecord{
-		Type:              "app",
-		Name:              req.Name,
-		DetailName:        req.DetailName,
-		SourceAccountIDs:  "1",
-		DownloadAccountID: 1,
-		FileDir:           itemDir,
-		FileName:          fileName,
-		TaskID:            req.TaskID,
-		Status:            constant.StatusWaiting,
-		Description:       req.Description,
-	}
-	if err := backupRepo.CreateRecord(record); err != nil {
-		global.LOG.Errorf("save backup record failed, err: %v", err)
-		return nil, err
+	backupApp := func() (*model.BackupRecord, error) {
+		if err = handleAppBackup(&install, nil, backupDir, fileName, "", req.Secret, req.TaskID); err != nil {
+			global.LOG.Errorf("backup app %s failed, err: %v", req.DetailName, err)
+			return nil, err
+		}
+		record := &model.BackupRecord{
+			Type:              "app",
+			Name:              req.Name,
+			DetailName:        req.DetailName,
+			SourceAccountIDs:  "1",
+			DownloadAccountID: 1,
+			FileDir:           itemDir,
+			FileName:          fileName,
+			Description:       req.Description,
+		}
+		if err := backupRepo.CreateRecord(record); err != nil {
+			global.LOG.Errorf("save backup record failed, err: %v", err)
+			return nil, err
+		}
+		return record, nil
 	}
 
-	if err = handleAppBackup(&install, nil, record.ID, backupDir, fileName, "", req.Secret, req.TaskID); err != nil {
-		global.LOG.Errorf("backup app %s failed, err: %v", req.DetailName, err)
-		return nil, err
+	if req.TaskID != "" {
+		go func() {
+			_, _ = backupApp()
+		}()
+	} else {
+		return backupApp()
 	}
-
-	return record, nil
+	return nil, nil
 }
 
 func (u *BackupService) AppRecover(req dto.CommonRecover) error {
@@ -87,9 +94,11 @@ func (u *BackupService) AppRecover(req dto.CommonRecover) error {
 	if _, err := compose.Down(install.GetComposePath()); err != nil {
 		return err
 	}
-	if err := handleAppRecover(&install, nil, req.File, false, req.Secret, req.TaskID); err != nil {
-		global.LOG.Errorf("recover app %s failed, err: %v", req.DetailName, err)
-	}
+	go func() {
+		if err := handleAppRecover(&install, nil, req.File, false, req.Secret, req.TaskID); err != nil {
+			global.LOG.Errorf("recover app %s failed, err: %v", req.DetailName, err)
+		}
+	}()
 	return nil
 }
 
@@ -102,7 +111,7 @@ func backupDatabaseWithTask(parentTask *task.Task, resourceKey, tmpDir, name str
 		}
 		parentTask.LogStart(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
 		databaseHelper := DatabaseHelper{Database: db.MysqlName, DBType: resourceKey, Name: db.Name}
-		if err := handleMysqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
+		if err := handleMysqlBackup(databaseHelper, parentTask, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
 			return err
 		}
 		parentTask.LogSuccess(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
@@ -113,7 +122,7 @@ func backupDatabaseWithTask(parentTask *task.Task, resourceKey, tmpDir, name str
 		}
 		parentTask.LogStart(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
 		databaseHelper := DatabaseHelper{Database: db.PostgresqlName, DBType: resourceKey, Name: db.Name}
-		if err := handlePostgresqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
+		if err := handlePostgresqlBackup(databaseHelper, parentTask, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
 			return err
 		}
 		parentTask.LogSuccess(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
@@ -121,34 +130,25 @@ func backupDatabaseWithTask(parentTask *task.Task, resourceKey, tmpDir, name str
 	return nil
 }
 
-func handleAppBackup(install *model.AppInstall, parentTask *task.Task, recordID uint, backupDir, fileName, excludes, secret, taskID string) error {
+func handleAppBackup(install *model.AppInstall, parentTask *task.Task, backupDir, fileName, excludes, secret, taskID string) error {
 	var (
 		err        error
 		backupTask *task.Task
 	)
 	backupTask = parentTask
 	if parentTask == nil {
-		backupTask, err = task.NewTaskWithOps(install.Name, task.TaskBackup, task.TaskScopeBackup, taskID, install.ID)
+		backupTask, err = task.NewTaskWithOps(install.Name, task.TaskBackup, task.TaskScopeApp, taskID, install.ID)
 		if err != nil {
 			return err
 		}
 	}
 
 	itemHandler := func() error { return doAppBackup(install, backupTask, backupDir, fileName, excludes, secret) }
+	backupTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), func(t *task.Task) error { return itemHandler() }, nil)
 	if parentTask != nil {
 		return itemHandler()
 	}
-
-	backupTask.AddSubTaskWithOps(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeBackup), func(t *task.Task) error { return itemHandler() }, nil, 3, time.Hour)
-	go func() {
-		if err := backupTask.Execute(); err != nil {
-			backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
-			return
-		}
-		backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusSuccess})
-	}()
-
-	return nil
+	return backupTask.Execute()
 }
 
 func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverFile string, isRollback bool, secret, taskID string) error {
@@ -160,7 +160,7 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 	)
 	recoverTask = parentTask
 	if parentTask == nil {
-		recoverTask, err = task.NewTaskWithOps(install.Name, task.TaskRecover, task.TaskScopeBackup, taskID, install.ID)
+		recoverTask, err = task.NewTaskWithOps(install.Name, task.TaskRecover, task.TaskScopeApp, taskID, install.ID)
 		if err != nil {
 			return err
 		}
@@ -170,7 +170,7 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 		fileOp := files.NewFileOp()
 		if !isRollback {
 			rollbackFile = path.Join(global.Dir.TmpDir, fmt.Sprintf("app/%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)))
-			if err := handleAppBackup(install, recoverTask, 0, path.Dir(rollbackFile), path.Base(rollbackFile), "", "", taskID); err != nil {
+			if err := handleAppBackup(install, recoverTask, path.Dir(rollbackFile), path.Base(rollbackFile), "", "", taskID); err != nil {
 				t.Log(fmt.Sprintf("backup app %s for rollback before recover failed, err: %v", install.Name, err))
 			}
 		}
@@ -308,10 +308,6 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 		return nil
 	}
 
-	if parentTask != nil {
-		return recoverApp(parentTask)
-	}
-
 	rollBackApp := func(t *task.Task) {
 		if isRollback {
 			return
@@ -328,11 +324,12 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 			_ = os.RemoveAll(rollbackFile)
 		}
 	}
-	recoverTask.AddSubTask(task.GetTaskName(install.Name, task.TaskRecover, task.TaskScopeBackup), recoverApp, rollBackApp)
-	go func() {
-		_ = recoverTask.Execute()
-	}()
-	return nil
+
+	recoverTask.AddSubTask(task.GetTaskName(install.Name, task.TaskRecover, task.TaskScopeApp), recoverApp, rollBackApp)
+	if parentTask != nil {
+		return recoverApp(parentTask)
+	}
+	return recoverTask.Execute()
 }
 
 func doAppBackup(install *model.AppInstall, parentTask *task.Task, backupDir, fileName, excludes, secret string) error {
@@ -354,7 +351,6 @@ func doAppBackup(install *model.AppInstall, parentTask *task.Task, backupDir, fi
 	}
 
 	appPath := install.GetPath()
-	parentTask.LogStart(i18n.GetMsgByKey("TaskBackup"))
 	if err := fileOp.TarGzCompressPro(true, appPath, path.Join(tmpDir, "app.tar.gz"), "", excludes); err != nil {
 		return err
 	}

agent/app/service/backup_mysql.go

@@ -30,6 +30,11 @@ func (u *BackupService) MysqlBackup(req dto.CommonBackup) error {
 	targetDir := path.Join(global.Dir.LocalBackupDir, itemDir)
 	fileName := fmt.Sprintf("%s_%s.sql.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
 
+	databaseHelper := DatabaseHelper{Database: req.Name, DBType: req.Type, Name: req.DetailName}
+	if err := handleMysqlBackup(databaseHelper, nil, targetDir, fileName, req.TaskID); err != nil {
+		return err
+	}
+
 	record := &model.BackupRecord{
 		Type:              req.Type,
 		Name:              req.Name,
@@ -38,41 +43,68 @@ func (u *BackupService) MysqlBackup(req dto.CommonBackup) error {
 		DownloadAccountID: 1,
 		FileDir:           itemDir,
 		FileName:          fileName,
-		TaskID:            req.TaskID,
-		Status:            constant.StatusWaiting,
 		Description:       req.Description,
 	}
 	if err := backupRepo.CreateRecord(record); err != nil {
 		global.LOG.Errorf("save backup record failed, err: %v", err)
-		return err
-	}
-
-	databaseHelper := DatabaseHelper{Database: req.Name, DBType: req.Type, Name: req.DetailName}
-	if err := handleMysqlBackup(databaseHelper, nil, record.ID, targetDir, fileName, req.TaskID); err != nil {
-		backupRepo.UpdateRecordByMap(record.ID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
-		return err
 	}
 	return nil
 }
 
 func (u *BackupService) MysqlRecover(req dto.CommonRecover) error {
-	return handleMysqlRecover(req, nil, false, req.TaskID)
-}
-
-func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error {
-	recoveFile, err := loadSqlFile(req.File)
-	if err != nil {
-		return err
-	}
-	req.File = recoveFile
-
 	if err := handleMysqlRecover(req, nil, false, req.TaskID); err != nil {
 		return err
 	}
 	return nil
 }
 
-func handleMysqlBackup(db DatabaseHelper, parentTask *task.Task, recordID uint, targetDir, fileName, taskID string) error {
+func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error {
+	file := req.File
+	fileName := path.Base(req.File)
+	if strings.HasSuffix(fileName, ".tar.gz") {
+		fileNameItem := time.Now().Format(constant.DateTimeSlimLayout)
+		dstDir := fmt.Sprintf("%s/%s", path.Dir(req.File), fileNameItem)
+		fileOp := files.NewFileOp()
+		if !fileOp.Stat(dstDir) {
+			if err := fileOp.CreateDir(dstDir, os.ModePerm); err != nil {
+				return fmt.Errorf("mkdir %s failed, err: %v", dstDir, err)
+			}
+		}
+		if err := fileOp.TarGzExtractPro(req.File, dstDir, ""); err != nil {
+			_ = os.RemoveAll(dstDir)
+			return err
+		}
+		global.LOG.Infof("decompress file %s successful, now start to check test.sql is exist", req.File)
+		hasTestSql := false
+		_ = filepath.Walk(dstDir, func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return nil
+			}
+			if !info.IsDir() && info.Name() == "test.sql" {
+				hasTestSql = true
+				file = path
+				fileName = "test.sql"
+			}
+			return nil
+		})
+		if !hasTestSql {
+			_ = os.RemoveAll(dstDir)
+			return fmt.Errorf("no such file named test.sql in %s", fileName)
+		}
+		defer func() {
+			_ = os.RemoveAll(dstDir)
+		}()
+	}
+
+	req.File = path.Dir(file) + "/" + fileName
+	if err := handleMysqlRecover(req, nil, false, req.TaskID); err != nil {
+		return err
+	}
+	global.LOG.Info("recover from uploads successful!")
+	return nil
+}
+
+func handleMysqlBackup(db DatabaseHelper, parentTask *task.Task, targetDir, fileName, taskID string) error {
 	var (
 		err        error
 		backupTask *task.Task
@@ -84,25 +116,18 @@ func handleMysqlBackup(db DatabaseHelper, parentTask *task.Task, recordID uint,
 	}
 	itemName := fmt.Sprintf("%s[%s] - %s", db.Database, db.DBType, db.Name)
 	if parentTask == nil {
-		backupTask, err = task.NewTaskWithOps(itemName, task.TaskBackup, task.TaskScopeBackup, taskID, dbInfo.ID)
+		backupTask, err = task.NewTaskWithOps(itemName, task.TaskBackup, task.TaskScopeDatabase, taskID, dbInfo.ID)
 		if err != nil {
 			return err
 		}
 	}
 
 	itemHandler := func() error { return doMysqlBackup(db, targetDir, fileName) }
+	backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeDatabase), func(t *task.Task) error { return itemHandler() }, nil)
 	if parentTask != nil {
 		return itemHandler()
 	}
-	backupTask.AddSubTaskWithOps(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeBackup), func(t *task.Task) error { return itemHandler() }, nil, 3, time.Hour)
-	go func() {
-		if err := backupTask.Execute(); err != nil {
-			backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
-			return
-		}
-		backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusSuccess})
-	}()
-	return nil
+	return backupTask.Execute()
 }
 
 func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback bool, taskID string) error {
@@ -117,7 +142,7 @@ func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback
 	}
 	itemName := fmt.Sprintf("%s[%s] - %s", req.Name, req.Type, req.DetailName)
 	if parentTask == nil {
-		itemTask, err = task.NewTaskWithOps(itemName, task.TaskRecover, task.TaskScopeBackup, taskID, dbInfo.ID)
+		itemTask, err = task.NewTaskWithOps(itemName, task.TaskRecover, task.TaskScopeDatabase, taskID, dbInfo.ID)
 		if err != nil {
 			return err
 		}
@@ -147,6 +172,8 @@ func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback
 				Format:    dbInfo.Format,
 				TargetDir: path.Dir(rollbackFile),
 				FileName:  path.Base(rollbackFile),
+
+				Timeout: 300,
 			}); err != nil {
 				return fmt.Errorf("backup mysql db %s for rollback before recover failed, err: %v", req.DetailName, err)
 			}
@@ -159,6 +186,8 @@ func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback
 						Version:    version,
 						Format:     dbInfo.Format,
 						SourceFile: rollbackFile,
+
+						Timeout: 300,
 					}); err != nil {
 						global.LOG.Errorf("rollback mysql db %s from %s failed, err: %v", req.DetailName, rollbackFile, err)
 					} else {
@@ -176,6 +205,8 @@ func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback
 			Version:    version,
 			Format:     dbInfo.Format,
 			SourceFile: req.File,
+
+			Timeout: 300,
 		}); err != nil {
 			global.LOG.Errorf("recover mysql db %s from %s failed, err: %v", req.DetailName, req.File, err)
 			return err
@@ -183,15 +214,12 @@ func handleMysqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback
 		isOk = true
 		return nil
 	}
+	itemTask.AddSubTask(i18n.GetMsgByKey("TaskRecover"), recoverDatabase, nil)
 	if parentTask != nil {
 		return recoverDatabase(parentTask)
 	}
 
-	itemTask.AddSubTaskWithOps(i18n.GetMsgByKey("TaskRecover"), recoverDatabase, nil, 3, time.Hour)
-	go func() {
-		_ = itemTask.Execute()
-	}()
-	return nil
+	return itemTask.Execute()
 }
 
 func doMysqlBackup(db DatabaseHelper, targetDir, fileName string) error {
@@ -210,58 +238,8 @@ func doMysqlBackup(db DatabaseHelper, targetDir, fileName string) error {
 		Format:    dbInfo.Format,
 		TargetDir: targetDir,
 		FileName:  fileName,
+
+		Timeout: 300,
 	}
 	return cli.Backup(backupInfo)
 }
-
-func loadSqlFile(file string) (string, error) {
-	if !strings.HasSuffix(file, ".tar.gz") && !strings.HasSuffix(file, ".zip") {
-		return file, nil
-	}
-	fileName := path.Base(file)
-	fileDir := path.Dir(file)
-	fileNameItem := time.Now().Format(constant.DateTimeSlimLayout)
-	dstDir := fmt.Sprintf("%s/%s", fileDir, fileNameItem)
-	_ = os.Mkdir(dstDir, constant.DirPerm)
-	if strings.HasSuffix(fileName, ".tar.gz") {
-		fileOp := files.NewFileOp()
-		if err := fileOp.TarGzExtractPro(file, dstDir, ""); err != nil {
-			_ = os.RemoveAll(dstDir)
-			return "", err
-		}
-	}
-	if strings.HasSuffix(fileName, ".zip") {
-		archiver, err := files.NewShellArchiver(files.Zip)
-		if err != nil {
-			_ = os.RemoveAll(dstDir)
-			return "", err
-		}
-		if err := archiver.Extract(file, dstDir, ""); err != nil {
-			_ = os.RemoveAll(dstDir)
-			return "", err
-		}
-	}
-	global.LOG.Infof("decompress file %s successful, now start to check test.sql is exist", file)
-	var sqlFiles []string
-	hasTestSql := false
-	_ = filepath.Walk(dstDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return nil
-		}
-		if !info.IsDir() && strings.HasSuffix(info.Name(), ".sql") {
-			sqlFiles = append(sqlFiles, path)
-			if info.Name() == "test.sql" {
-				hasTestSql = true
-			}
-		}
-		return nil
-	})
-	if len(sqlFiles) == 1 {
-		return sqlFiles[0], nil
-	}
-	if !hasTestSql {
-		_ = os.RemoveAll(dstDir)
-		return "", fmt.Errorf("no such file named test.sql in %s", fileName)
-	}
-	return "", nil
-}

agent/app/service/backup_postgresql.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
@@ -29,6 +31,11 @@ func (u *BackupService) PostgresqlBackup(req dto.CommonBackup) error {
 	targetDir := path.Join(global.Dir.LocalBackupDir, itemDir)
 	fileName := fmt.Sprintf("%s_%s.sql.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
 
+	databaseHelper := DatabaseHelper{Database: req.Name, DBType: req.Type, Name: req.DetailName}
+	if err := handlePostgresqlBackup(databaseHelper, nil, targetDir, fileName, req.TaskID); err != nil {
+		return err
+	}
+
 	record := &model.BackupRecord{
 		Type:              req.Type,
 		Name:              req.Name,
@@ -37,18 +44,11 @@ func (u *BackupService) PostgresqlBackup(req dto.CommonBackup) error {
 		DownloadAccountID: 1,
 		FileDir:           itemDir,
 		FileName:          fileName,
-		TaskID:            req.TaskID,
-		Status:            constant.StatusWaiting,
 		Description:       req.Description,
 	}
 	if err := backupRepo.CreateRecord(record); err != nil {
 		global.LOG.Errorf("save backup record failed, err: %v", err)
 	}
-
-	databaseHelper := DatabaseHelper{Database: req.Name, DBType: req.Type, Name: req.DetailName}
-	if err := handlePostgresqlBackup(databaseHelper, nil, record.ID, targetDir, fileName, req.TaskID); err != nil {
-		return err
-	}
 	return nil
 }
 func (u *BackupService) PostgresqlRecover(req dto.CommonRecover) error {
@@ -59,11 +59,44 @@ func (u *BackupService) PostgresqlRecover(req dto.CommonRecover) error {
 }
 
 func (u *BackupService) PostgresqlRecoverByUpload(req dto.CommonRecover) error {
-	recoveFile, err := loadSqlFile(req.File)
-	if err != nil {
-		return err
+	file := req.File
+	fileName := path.Base(req.File)
+	if strings.HasSuffix(fileName, ".tar.gz") {
+		fileNameItem := time.Now().Format(constant.DateTimeSlimLayout)
+		dstDir := fmt.Sprintf("%s/%s", path.Dir(req.File), fileNameItem)
+		fileOp := files.NewFileOp()
+		if !fileOp.Stat(dstDir) {
+			if err := fileOp.CreateDir(dstDir, os.ModePerm); err != nil {
+				return fmt.Errorf("mkdir %s failed, err: %v", dstDir, err)
+			}
+		}
+		if err := fileOp.TarGzExtractPro(req.File, dstDir, ""); err != nil {
+			_ = os.RemoveAll(dstDir)
+			return err
+		}
+		global.LOG.Infof("decompress file %s successful, now start to check test.sql is exist", req.File)
+		hasTestSql := false
+		_ = filepath.Walk(dstDir, func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return nil
+			}
+			if !info.IsDir() && info.Name() == "test.sql" {
+				hasTestSql = true
+				file = path
+				fileName = "test.sql"
+			}
+			return nil
+		})
+		if !hasTestSql {
+			_ = os.RemoveAll(dstDir)
+			return fmt.Errorf("no such file named test.sql in %s", fileName)
+		}
+		defer func() {
+			_ = os.RemoveAll(dstDir)
+		}()
 	}
-	req.File = recoveFile
+
+	req.File = path.Dir(file) + "/" + fileName
 	if err := handlePostgresqlRecover(req, nil, false); err != nil {
 		return err
 	}
@@ -71,7 +104,7 @@ func (u *BackupService) PostgresqlRecoverByUpload(req dto.CommonRecover) error {
 	return nil
 }
 
-func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, recordID uint, targetDir, fileName, taskID string) error {
+func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, targetDir, fileName, taskID string) error {
 	var (
 		err        error
 		backupTask *task.Task
@@ -79,25 +112,18 @@ func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, recordID u
 	backupTask = parentTask
 	itemName := fmt.Sprintf("%s - %s", db.Database, db.Name)
 	if parentTask == nil {
-		backupTask, err = task.NewTaskWithOps(itemName, task.TaskBackup, task.TaskScopeBackup, taskID, db.ID)
+		backupTask, err = task.NewTaskWithOps(itemName, task.TaskBackup, task.TaskScopeDatabase, taskID, db.ID)
 		if err != nil {
 			return err
 		}
 	}
 
 	itemHandler := func() error { return doPostgresqlgBackup(db, targetDir, fileName) }
+	backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeDatabase), func(task *task.Task) error { return itemHandler() }, nil)
 	if parentTask != nil {
 		return itemHandler()
 	}
-	backupTask.AddSubTaskWithOps(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeBackup), func(t *task.Task) error { return itemHandler() }, nil, 3, time.Hour)
-	go func() {
-		if err := backupTask.Execute(); err != nil {
-			backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
-			return
-		}
-		backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusSuccess})
-	}()
-	return nil
+	return backupTask.Execute()
 }
 
 func handlePostgresqlRecover(req dto.CommonRecover, parentTask *task.Task, isRollback bool) error {
@@ -111,7 +137,7 @@ func handlePostgresqlRecover(req dto.CommonRecover, parentTask *task.Task, isRol
 	}
 	itemTask = parentTask
 	if parentTask == nil {
-		itemTask, err = task.NewTaskWithOps(req.Name, task.TaskRecover, task.TaskScopeBackup, req.TaskID, dbInfo.ID)
+		itemTask, err = task.NewTaskWithOps(req.Name, task.TaskRecover, task.TaskScopeDatabase, req.TaskID, dbInfo.ID)
 		if err != nil {
 			return err
 		}
@@ -172,15 +198,12 @@ func handlePostgresqlRecover(req dto.CommonRecover, parentTask *task.Task, isRol
 		isOk = true
 		return nil
 	}
+	itemTask.AddSubTask(i18n.GetMsgByKey("TaskRecover"), recoverDatabase, nil)
 	if parentTask != nil {
 		return recoverDatabase(parentTask)
 	}
 
-	itemTask.AddSubTaskWithOps(i18n.GetMsgByKey("TaskRecover"), recoverDatabase, nil, 3, time.Hour)
-	go func() {
-		_ = itemTask.Execute()
-	}()
-	return nil
+	return itemTask.Execute()
 }
 
 func doPostgresqlgBackup(db DatabaseHelper, targetDir, fileName string) error {

agent/app/service/backup_record.go

@@ -6,12 +6,10 @@ import (
 	"os"
 	"path"
 	"sync"
-	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
-	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/jinzhu/copier"
 )
@@ -240,9 +238,6 @@ func (u *BackupRecordService) LoadRecordSize(req dto.SearchForSize) ([]dto.Recor
 			return nil, err
 		}
 		for _, item := range records {
-			if item.Status == constant.StatusWaiting {
-				continue
-			}
 			list = append(list, backupSizeHelper{ID: item.ID, DownloadID: item.DownloadAccountID, FilePath: path.Join(item.FileDir, item.FileName)})
 		}
 	}
@@ -254,32 +249,20 @@ func (u *BackupRecordService) LoadRecordSize(req dto.SearchForSize) ([]dto.Recor
 			recordIds = append(recordIds, fmt.Sprintf("%v", record.DownloadID))
 		}
 	}
+	clientMap, err := NewBackupClientMap(recordIds)
+	if err != nil {
+		return nil, err
+	}
 
-	clientMap := NewBackupClientMap(recordIds)
 	var datas []dto.RecordFileSize
 	var wg sync.WaitGroup
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
 	for i := 0; i < len(list); i++ {
 		datas = append(datas, dto.RecordFileSize{ID: list[i].ID})
 		if val, ok := clientMap[fmt.Sprintf("%v", list[i].DownloadID)]; ok {
-			if !val.isOk {
-				continue
-			}
 			wg.Add(1)
 			go func(index int) {
-				defer wg.Done()
-				done := make(chan struct{}, 1)
-				go func() {
-					datas[index].Size, _ = val.client.Size(path.Join(val.backupPath, list[i].FilePath))
-					defer close(done)
-				}()
-				select {
-				case <-ctx.Done():
-					return
-				case <-done:
-					return
-				}
+				datas[index].Size, _ = val.client.Size(path.Join(val.backupPath, list[i].FilePath))
+				wg.Done()
 			}(i)
 		}
 	}

agent/app/service/backup_redis.go

@@ -44,24 +44,22 @@ func (u *BackupService) RedisBackup(req dto.CommonBackup) error {
 	}
 	itemDir := fmt.Sprintf("database/redis/%s", redisInfo.Name)
 	backupDir := path.Join(global.Dir.LocalBackupDir, itemDir)
+	if err := handleRedisBackup(redisInfo, nil, backupDir, fileName, req.Secret, req.TaskID); err != nil {
+		return err
+	}
 	record := &model.BackupRecord{
-		Type:              req.Type,
+		Type:              "redis",
 		Name:              req.Name,
 		SourceAccountIDs:  "1",
 		DownloadAccountID: 1,
 		FileDir:           itemDir,
 		FileName:          fileName,
-		TaskID:            req.TaskID,
-		Status:            constant.StatusWaiting,
 		Description:       req.Description,
 	}
 	if err := backupRepo.CreateRecord(record); err != nil {
 		global.LOG.Errorf("save backup record failed, err: %v", err)
 	}
 
-	if err := handleRedisBackup(redisInfo, nil, record.ID, backupDir, fileName, req.Secret, req.TaskID); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -77,14 +75,15 @@ func (u *BackupService) RedisRecover(req dto.CommonRecover) error {
 	return nil
 }
 
-func handleRedisBackup(redisInfo *repo.RootInfo, parentTask *task.Task, recordID uint, backupDir, fileName, secret, taskID string) error {
+func handleRedisBackup(redisInfo *repo.RootInfo, parentTask *task.Task, backupDir, fileName, secret, taskID string) error {
+
 	var (
 		err      error
 		itemTask *task.Task
 	)
 	itemTask = parentTask
 	if parentTask == nil {
-		itemTask, err = task.NewTaskWithOps("Redis", task.TaskBackup, task.TaskScopeBackup, taskID, redisInfo.ID)
+		itemTask, err = task.NewTaskWithOps("Redis", task.TaskBackup, task.TaskScopeDatabase, taskID, redisInfo.ID)
 		if err != nil {
 			return err
 		}
@@ -129,14 +128,6 @@ func handleRedisBackup(redisInfo *repo.RootInfo, parentTask *task.Task, recordID
 		return backupDatabase(parentTask)
 	}
 
-	itemTask.AddSubTaskWithOps(i18n.GetMsgByKey("TaskBackup"), backupDatabase, nil, 3, time.Hour)
-	go func() {
-		if err := itemTask.Execute(); err != nil {
-			backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusFailed, "message": err.Error()})
-			return
-		}
-		backupRepo.UpdateRecordByMap(recordID, map[string]interface{}{"status": constant.StatusSuccess})
-	}()
 	return itemTask.Execute()
 }
 
@@ -147,7 +138,7 @@ func handleRedisRecover(redisInfo *repo.RootInfo, parentTask *task.Task, recover
 	)
 	itemTask = parentTask
 	if parentTask == nil {
-		itemTask, err = task.NewTaskWithOps("Redis", task.TaskRecover, task.TaskScopeBackup, taskID, redisInfo.ID)
+		itemTask, err = task.NewTaskWithOps("Redis", task.TaskRecover, task.TaskScopeDatabase, taskID, redisInfo.ID)
 		if err != nil {
 			return err
 		}
@@ -189,7 +180,7 @@ func handleRedisRecover(redisInfo *repo.RootInfo, parentTask *task.Task, recover
 				}
 			}
 			rollbackFile := path.Join(global.Dir.TmpDir, fmt.Sprintf("database/redis/%s_%s.%s", redisInfo.Name, time.Now().Format(constant.DateTimeSlimLayout), suffix))
-			if err := handleRedisBackup(redisInfo, nil, 0, path.Dir(rollbackFile), path.Base(rollbackFile), secret, ""); err != nil {
+			if err := handleRedisBackup(redisInfo, nil, path.Dir(rollbackFile), path.Base(rollbackFile), secret, ""); err != nil {
 				return fmt.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err)
 			}
 			defer func() {
@@ -239,8 +230,5 @@ func handleRedisRecover(redisInfo *repo.RootInfo, parentTask *task.Task, recover
 		return recoverDatabase(parentTask)
 	}
 
-	go func() {
-		_ = itemTask.Execute()
-	}()
-	return nil
+	return itemTask.Execute()
 }