fix: Fix the issue of generating Swagger documents with actual parameters (#10379)

.github/workflows/add-labels-for-pr.yml

@@ -6,7 +6,6 @@ permissions:
 jobs:
   generic_handler:
     name: Add Labels to PR
-    if: github.repository == '1Panel-dev/1Panel'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

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

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.23'
       - name: Build Release
         uses: goreleaser/goreleaser-action@v6
         with:

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

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: '1.23'
       - name: Build Release
         uses: goreleaser/goreleaser-action@v6
         with:

.github/workflows/sonarcloud-scan.yml

@@ -8,7 +8,6 @@ on:
 jobs:
   sonarcloud:
     name: SonarCloud
-    if: github.repository == '1Panel-dev/1Panel'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/sync2gitee.yml

@@ -2,7 +2,6 @@ name: Synchronize to Gitee
 on: [push]
 jobs:
   repo-sync:
-    if: github.repository == '1Panel-dev/1Panel'
     runs-on: ubuntu-latest
     steps:
       - name: Mirror the Github organization repos to Gitee.

.gitignore

@@ -62,10 +62,4 @@ cmd/server/fileList.txt
 1Panel.code-workspace
 
 core/.golangci.yml
-agent/.golangci.yml
-
-.opencode
-openspec
-CLAUDE.md
-AGENTS.md
-opencode.json
+agent/.golangci.yml

.goreleaser.yaml

@@ -33,6 +33,9 @@ builds:
       - ppc64le
       - s390x
       - riscv64
+    hooks:
+      post:
+        - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
 
   - id: core
     dir: core
@@ -56,6 +59,9 @@ builds:
       - ppc64le
       - s390x
       - riscv64
+    hooks:
+      post:
+        - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
 
 archives:
   - formats: [ 'tar.gz' ]
@@ -64,12 +70,11 @@ archives:
     wrap_in_directory: true
     files:
       - 1pctl
-      - install.sh
       - 1panel-core.service
       - 1panel-agent.service
-      - initscript/*
-      - lang/*
+      - install.sh
       - GeoIP.mmdb
+      - lang/*
 
 checksum:
   name_template: 'checksums.txt'

Makefile

@@ -30,20 +30,20 @@ build_frontend:
 
 build_core_on_linux:
 	cd $(CORE_PATH) \
-	&& CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
+	&& GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
 
 build_agent_on_linux:
 	cd $(AGENT_PATH) \
-    && CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
+    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
 
 build_core_on_darwin:
 	cd $(CORE_PATH) \
-	&&  CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
+	&& GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
 
 build_agent_on_darwin:
 	cd $(AGENT_PATH) \
-    &&  CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
+    && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
 
 build_all: build_frontend build_core_on_linux build_agent_on_linux
 
-build_on_local: clean_assets build_frontend build_core_on_darwin build_agent_on_darwin
+build_on_local: clean_assets build_frontend build_core_on_darwin build_agent_on_darwin upx_bin

agent/app/api/v2/app.go

@@ -1,9 +1,6 @@
 package v2
 
 import (
-	"net/http"
-	"time"
-
 	"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/dto/request"
@@ -29,7 +26,7 @@ func (b *BaseApi) SearchApp(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, list)
+	helper.SuccessWithData(c, list)
 }
 
 // @Tags App
@@ -195,48 +192,3 @@ func (b *BaseApi) GetAppListUpdate(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, res)
 }
-
-// @Tags App
-// @Summary Get app icon by app_id
-// @Accept json
-// @Param appId path integer true "app id"
-// @Success 200 {file} file "app icon"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/icon/:key [get]
-func (b *BaseApi) GetAppIcon(c *gin.Context) {
-	appKey, err := helper.GetStrParamByKey(c, "key")
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	iconBytes, err := appService.GetAppIcon(appKey)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	c.Header("Content-Type", "image/png")
-	c.Header("Cache-Control", "public, max-age=31536000, immutable")
-	c.Header("Last-Modified", time.Now().UTC().Format(http.TimeFormat))
-	c.Data(http.StatusOK, "image/png", iconBytes)
-}
-
-// @Tags App
-// @Summary Search app detail by appkey and version
-// @Accept json
-// @Param appId path integer true "app key"
-// @Param version path string true "app version"
-// @Success 200 {object} response.AppDetailSimpleDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/detail/node/:appKey/:version [get]
-func (b *BaseApi) GetAppDetailForNode(c *gin.Context) {
-	appKey := c.Param("appKey")
-	version := c.Param("version")
-	appDetailDTO, err := appService.GetAppDetailByKey(appKey, version)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, appDetailDTO)
-}

agent/app/api/v2/backup.go

@@ -25,23 +25,6 @@ func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Backup Account
-// @Summary Check backup account
-// @Accept json
-// @Param request body dto.BackupOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /backups/check [post]
-func (b *BaseApi) CheckBackup(c *gin.Context) {
-	var req dto.BackupOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, backupService.CheckConn(req))
-}
-
 // @Tags Backup Account
 // @Summary Create backup account
 // @Accept json

agent/app/api/v2/compose_template.go

@@ -28,28 +28,6 @@ func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Container Compose-template
-// @Summary Bacth compose template
-// @Accept json
-// @Param request body dto.ComposeTemplateBatch true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/template/batch [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量导入编排模版","formatEN":"batch import compose templates"}
-func (b *BaseApi) BatchComposeTemplate(c *gin.Context) {
-	var req dto.ComposeTemplateBatch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := composeTemplateService.Batch(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Container Compose-template
 // @Summary Page compose templates
 // @Accept json

agent/app/api/v2/container.go

@@ -263,27 +263,6 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
-// @Summary Load container stats size
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {object} dto.ContainerItemStats
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/item/stats [post]
-func (b *BaseApi) ContainerItemStats(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := containerService.ContainerItemStats(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Container
 // @Summary Create container
 // @Accept json
@@ -335,7 +314,7 @@ func (b *BaseApi) ContainerCreateByCommand(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/upgrade [post]
-// @x-panel-log {"bodyKeys":["names","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [names][image]","formatEN":"upgrade container image [names][image]"}
+// @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
 func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 	var req dto.ContainerUpgrade
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -393,28 +372,6 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Container
-// @Summary Clean compose log
-// @Accept json
-// @Param request body dto.ComposeLogClean true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/compose/clean/log [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器编排 [name] 日志","formatEN":"clean compose [name] logs"}
-func (b *BaseApi) CleanComposeLog(c *gin.Context) {
-	var req dto.ComposeLogClean
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := containerService.ComposeLogClean(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Container
 // @Summary Rename Container
 // @Accept json
@@ -524,6 +481,7 @@ func (b *BaseApi) Inspect(c *gin.Context) {
 	helper.SuccessWithData(c, result)
 }
 
+// @Router /containers/download/log [post]
 func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
 	var req dto.ContainerLog
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -737,7 +695,6 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 // @Param since query string false "时间筛选"
 // @Param follow query string false "是否追踪"
 // @Param tail query string false "显示行号"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/search/log [get]

agent/app/api/v2/cronjob.go

@@ -211,7 +211,7 @@ func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /cronjobs/records/clean [post]
-// @x-panel-log {"bodyKeys":["cronjobID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"cronjobID","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"清空计划任务记录 [name]","formatEN":"clean cronjob [name] records"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"清空计划任务记录 [name]","formatEN":"clean cronjob [name] records"}
 func (b *BaseApi) CleanRecord(c *gin.Context) {
 	var req dto.CronjobClean
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -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

agent/app/api/v2/dashboard.go

@@ -27,7 +27,7 @@ func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
 // @Tags Dashboard
 // @Summary Load app launcher
 // @Accept json
-// @Success 200 {array} dto.AppLauncher
+// @Success 200 {Array} dto.AppLauncher
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/app/launcher [get]
@@ -37,14 +37,14 @@ func (b *BaseApi) LoadAppLauncher(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, data)
+	helper.SuccessWithData(c, data)
 }
 
 // @Tags Dashboard
 // @Summary Load app launcher options
 // @Accept json
 // @Param request body dto.SearchByFilter true "request"
-// @Success 200 {array} dto.LauncherOption
+// @Success 200 {Array} dto.LauncherOption
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/app/launcher/option [post]
@@ -85,7 +85,7 @@ func (b *BaseApi) UpdateAppLauncher(c *gin.Context) {
 
 // @Tags Dashboard
 // @Summary Load quick jump options
-// @Success 200 {array} dto.QuickJump
+// @Success 200 {Array} dto.QuickJump
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/quick/option [get]
@@ -179,28 +179,6 @@ func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
-// @Tags Dashboard
-// @Summary Load top cpu processes
-// @Success 200 {array} dto.Process
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/current/top/cpu [get]
-func (b *BaseApi) LoadDashboardTopCPU(c *gin.Context) {
-	data := dashboardService.LoadTopCPU()
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Dashboard
-// @Summary Load top memory processes
-// @Success 200 {array} dto.Process
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/current/top/mem [get]
-func (b *BaseApi) LoadDashboardTopMem(c *gin.Context) {
-	data := dashboardService.LoadTopMem()
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Dashboard
 // @Summary System restart
 // @Accept json

agent/app/api/v2/database_mysql.go

@@ -195,26 +195,27 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 }
 
 // @Tags Database Mysql
-// @Summary List mysql database format collation options
+// @Summary List mysql database names
 // @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {array} dto.MysqlFormatCollationOption
+// @Param request body dto.PageInfo true "request"
+// @Success 200 {array} dto.MysqlOption
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /databases/format/options [post]
-func (b *BaseApi) ListDBFormatCollationOptions(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+// @Router /databases/options [get]
+func (b *BaseApi) ListDBName(c *gin.Context) {
+	list, err := mysqlService.ListDBOption()
+	if err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, mysqlService.LoadFormatOption(req))
+
+	helper.SuccessWithData(c, list)
 }
 
 // @Tags Database Mysql
 // @Summary Load mysql database from remote
 // @Accept json
 // @Param request body dto.MysqlLoadDB true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/load [post]

agent/app/api/v2/database_postgresql.go

@@ -167,7 +167,6 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 // @Summary Load postgresql database from remote
 // @Accept json
 // @Param request body dto.PostgresqlLoadDB true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/pg/:database/load [post]

agent/app/api/v2/device.go

@@ -27,7 +27,7 @@ func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 // @Tags Device
 // @Summary list time zone options
 // @Accept json
-// @Success 200 {array} string
+// @Success 200 {Array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/device/zone/options [get]

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()
@@ -38,7 +37,6 @@ var (
 	fileService     = service.NewIFileService()
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
-	iptablesService = service.NewIIptablesService()
 	monitorService  = service.NewIMonitorService()
 	systemService   = service.NewISystemService()
 

agent/app/api/v2/fail2ban.go

@@ -28,7 +28,7 @@ func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
 // @Summary Page fail2ban ip list
 // @Accept json
 // @Param request body dto.Fail2BanSearch true "request"
-// @Success 200 {array} string
+// @Success 200 {Array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/search [post]
@@ -51,7 +51,6 @@ func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
 // @Summary Operate fail2ban
 // @Accept json
 // @Param request body dto.Operate true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/operate [post]
@@ -73,8 +72,7 @@ func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
 // @Tags Fail2ban
 // @Summary Operate sshd of fail2ban
 // @Accept json
-// @Param request body dto.Fail2BanSet true "request"
-// @Success 200
+// @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/operate/sshd [post]

agent/app/api/v2/file.go

@@ -90,7 +90,7 @@ func (b *BaseApi) GetFileTree(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, tree)
+	helper.SuccessWithData(c, tree)
 }
 
 // @Tags File
@@ -265,33 +265,6 @@ func (b *BaseApi) GetContent(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	if info.Size > 2*1024 && info.Size < 5*1024*1024 {
-		helper.SuccessWithDataGzipped(c, info)
-	} else {
-		helper.SuccessWithData(c, info)
-	}
-}
-
-// @Tags File
-// @Summary Preview file content
-// @Accept json
-// @Param request body request.FileContentReq true "request"
-// @Success 200 {object} response.FileInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/preview [post]
-// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"预览文件内容 [path]","formatEN":"Preview file content [path]"}
-func (b *BaseApi) PreviewContent(c *gin.Context) {
-	var req request.FileContentReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	info, err := fileService.GetPreviewContent(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
 	helper.SuccessWithData(c, info)
 }
 
@@ -548,14 +521,9 @@ func (b *BaseApi) Download(c *gin.Context) {
 	file, err := os.Open(filePath)
 	if err != nil {
 		helper.InternalServer(c, err)
-		return
 	}
 	defer file.Close()
-	info, err := file.Stat()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
+	info, _ := file.Stat()
 	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
 	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
 	http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
@@ -873,11 +841,7 @@ func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	if res.TotalLines > 100 {
-		helper.SuccessWithDataGzipped(c, res)
-	} else {
-		helper.SuccessWithData(c, res)
-	}
+	helper.SuccessWithData(c, res)
 }
 
 // @Tags File
@@ -937,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

@@ -8,19 +8,12 @@ import (
 
 // @Tags Firewall
 // @Summary Load firewall base info
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.FirewallBaseInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/base [post]
+// @Router /hosts/firewall/base [get]
 func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := firewallService.LoadBaseInfo(req.Name)
+	data, err := firewallService.LoadBaseInfo()
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -102,14 +95,14 @@ func (b *BaseApi) OperatePortRule(c *gin.Context) {
 
 // OperateForwardRule
 // @Tags Firewall
-// @Summary Operate forward rule
+// @Summary Create group
 // @Accept json
 // @Param request body dto.ForwardRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/firewall/forward [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新端口转发规则","formatEN":"update port forward rules"}
+// @x-panel-log {"bodyKeys":["source_port"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新端口转发规则 [source_port]","formatEN":"update port forward rules [source_port]"}
 func (b *BaseApi) OperateForwardRule(c *gin.Context) {
 	var req dto.ForwardRuleOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -124,7 +117,7 @@ func (b *BaseApi) OperateForwardRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Operate Ip rule
+// @Summary Create group
 // @Accept json
 // @Param request body dto.AddrRuleOperate true "request"
 // @Success 200
@@ -146,7 +139,7 @@ func (b *BaseApi) OperateIPRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Batch operate rule
+// @Summary Create group
 // @Accept json
 // @Param request body dto.BatchRuleOperate true "request"
 // @Success 200
@@ -188,7 +181,7 @@ func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Update port rule
+// @Summary Create group
 // @Accept json
 // @Param request body dto.PortRuleUpdate true "request"
 // @Success 200
@@ -209,7 +202,7 @@ func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Update Ip rule
+// @Summary Create group
 // @Accept json
 // @Param request body dto.AddrRuleUpdate true "request"
 // @Success 200
@@ -228,112 +221,3 @@ func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Firewall
-// @Summary search iptables filter rules
-// @Accept json
-// @Param request body dto.SearchPageWithType true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/search [post]
-func (b *BaseApi) SearchFilterRules(c *gin.Context) {
-	var req dto.SearchPageWithType
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := iptablesService.Search(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
-// @Tags Firewall
-// @Summary Operate iptables filter rule
-// @Accept json
-// @Param request body dto.IptablesRuleOp true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/rule/operate [post]
-// @x-panel-log {"bodyKeys":["operation","chain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] filter规则到 [chain]","formatEN":"[operation] filter rule to [chain]"}
-func (b *BaseApi) OperateFilterRule(c *gin.Context) {
-	var req dto.IptablesRuleOp
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := iptablesService.OperateRule(req, true); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}
-
-// @Tags Firewall
-// @Summary Batch operate iptables filter rules
-// @Accept json
-// @Param request body dto.IptablesBatchOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/rule/batch [post]
-func (b *BaseApi) BatchOperateFilterRule(c *gin.Context) {
-	var req dto.IptablesBatchOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := iptablesService.BatchOperate(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}
-
-// @Tags Firewall
-// @Summary Apply/Unload/Init iptables filter
-// @Accept json
-// @Param request body dto.IptablesOp true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/operate [post]
-// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] iptables filter 防火墙","formatEN":"[operate] iptables filter firewall"}
-func (b *BaseApi) OperateFilterChain(c *gin.Context) {
-	var req dto.IptablesOp
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := iptablesService.Operate(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.Success(c)
-}
-
-// @Tags Firewall
-// @Summary load chain status with name
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/chain/status [post]
-func (b *BaseApi) LoadChainStatus(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, iptablesService.LoadChainStatus(req))
-}

agent/app/api/v2/ftp.go

@@ -54,7 +54,6 @@ func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
 // @Summary Operate FTP
 // @Accept json
 // @Param request body dto.Operate true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/ftp/operate [post]

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

@@ -1,14 +1,10 @@
 package helper
 
 import (
-	"compress/gzip"
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
-	"sync"
 
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"gorm.io/gorm"
@@ -50,42 +46,6 @@ func SuccessWithData(ctx *gin.Context, data interface{}) {
 	ctx.Abort()
 }
 
-var gzipWriterPool = sync.Pool{
-	New: func() interface{} {
-		return gzip.NewWriter(nil)
-	},
-}
-
-func SuccessWithDataGzipped(ctx *gin.Context, data interface{}) {
-	if !strings.Contains(ctx.GetHeader("Accept-Encoding"), "gzip") {
-		SuccessWithData(ctx, data)
-		return
-	}
-	if data == nil {
-		data = gin.H{}
-	}
-	res := dto.Response{
-		Code: http.StatusOK,
-		Data: data,
-	}
-	jsonBytes, err := json.Marshal(res)
-	if err != nil {
-		ErrorWithDetail(ctx, http.StatusInternalServerError, "ErrInternalServer", err)
-		return
-	}
-
-	ctx.Header("Content-Encoding", "gzip")
-	ctx.Header("Content-Type", "application/json; charset=utf-8")
-	ctx.Status(http.StatusOK)
-
-	gz := gzipWriterPool.Get().(*gzip.Writer)
-	gz.Reset(ctx.Writer)
-	_, _ = gz.Write(jsonBytes)
-	_ = gz.Close()
-	gzipWriterPool.Put(gz)
-	ctx.Abort()
-}
-
 func Success(ctx *gin.Context) {
 	res := dto.Response{
 		Code:    http.StatusOK,

agent/app/api/v2/host_tool.go

@@ -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/monitor.go

@@ -28,27 +28,6 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, data)
-}
-
-// @Tags Monitor
-// @Summary Load monitor data
-// @Param request body dto.MonitorGPUSearch true "request"
-// @Success 200 {object} dto.MonitorGPUData
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/monitor/gpu/search [post]
-func (b *BaseApi) LoadGPUMonitor(c *gin.Context) {
-	var req dto.MonitorGPUSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := monitorService.LoadGPUMonitorData(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
 	helper.SuccessWithData(c, data)
 }
 
@@ -126,7 +105,3 @@ func (b *BaseApi) GetIOOptions(c *gin.Context) {
 	sort.Strings(options)
 	helper.SuccessWithData(c, options)
 }
-
-func (b *BaseApi) GetCPUOptions(c *gin.Context) {
-	helper.SuccessWithData(c, monitorService.LoadGPUOptions())
-}

agent/app/api/v2/nginx.go

@@ -161,13 +161,13 @@ func (b *BaseApi) GetNginxModules(c *gin.Context) {
 // @Tags OpenResty
 // @Summary Operate default HTTPs
 // @Accept json
-// @Param request body request.NginxDefaultHTTPSUpdate true "request"
+// @Param request body request.NginxOperateReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /openresty/https [post]
 func (b *BaseApi) OperateDefaultHTTPs(c *gin.Context) {
-	var req request.NginxDefaultHTTPSUpdate
+	var req request.NginxOperateReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

agent/app/api/v2/process.go

@@ -40,7 +40,7 @@ func (b *BaseApi) StopProcess(c *gin.Context) {
 // @Tags Process
 // @Summary Get Process Info By PID
 // @Param pid path int true "PID"
-// @Success 200
+// @Success 200 {object} websocket.PsProcessData
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /process/{pid} [get]

agent/app/api/v2/setting.go

@@ -1,6 +1,7 @@
 package v2
 
 import (
+	"encoding/base64"
 	"encoding/json"
 
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
@@ -76,7 +77,26 @@ func (b *BaseApi) LoadBaseDir(c *gin.Context) {
 // @Security Timestamp
 // @Router /settings/ssh/conn [get]
 func (b *BaseApi) LoadLocalConn(c *gin.Context) {
-	helper.SuccessWithData(c, settingService.GetLocalConn())
+	connInfoInDB := settingService.GetSettingByKey("LocalSSHConn")
+	if len(connInfoInDB) == 0 {
+		helper.Success(c)
+		return
+	}
+	var data dto.SSHConnData
+	if err := json.Unmarshal([]byte(connInfoInDB), &data); err != nil {
+		helper.Success(c)
+		return
+	}
+	if len(data.Password) != 0 {
+		data.Password = base64.StdEncoding.EncodeToString([]byte(data.Password))
+	}
+	if len(data.PrivateKey) != 0 {
+		data.PrivateKey = base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
+	}
+	if len(data.PassPhrase) != 0 {
+		data.PassPhrase = base64.StdEncoding.EncodeToString([]byte(data.PassPhrase))
+	}
+	helper.SuccessWithData(c, data)
 }
 
 func (b *BaseApi) CheckLocalConn(c *gin.Context) {
@@ -84,31 +104,9 @@ func (b *BaseApi) CheckLocalConn(c *gin.Context) {
 	helper.SuccessWithData(c, err == nil)
 }
 
-// @Tags System Setting
-// @Summary Update local is conn
-// @Accept json
-// @Param request body dto.SSHDefaultConn true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/ssh/conn/default [post]
-// @x-panel-log {"bodyKeys":["defaultConn"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"本地终端默认连接 [defaultConn]","formatEN":"update system default conn [defaultConn]"}
-func (b *BaseApi) SetDefaultIsConn(c *gin.Context) {
-	var req dto.SSHDefaultConn
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := settingService.SetDefaultIsConn(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags System Setting
 // @Summary Check local conn info
-// @Success 200 {boolean} isOk
+// @Success 200 {bool} isOk
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /settings/ssh/check/info [post]
@@ -177,24 +175,3 @@ func (b *BaseApi) GetSettingByKey(c *gin.Context) {
 	value := settingService.GetSettingByKey(key)
 	helper.SuccessWithData(c, value)
 }
-
-// @Tags System Setting
-// @Summary Save common description
-// @Accept json
-// @Param request body dto.CommonDescription true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/description/save [post]
-func (b *BaseApi) SaveDescription(c *gin.Context) {
-	var req dto.CommonDescription
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := settingService.SaveDescription(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/api/v2/ssh.go

@@ -53,7 +53,7 @@ func (b *BaseApi) OperateSSH(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/ssh/update [post]
-// @x-panel-log {"bodyKeys":["key","newValue"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [newValue]","formatEN":"update SSH setting [key] => [newValue]"}
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [value]","formatEN":"update SSH setting [key] => [value]"}
 func (b *BaseApi) UpdateSSH(c *gin.Context) {
 	var req dto.SSHUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -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/ssh/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
 	}
@@ -226,69 +246,15 @@ func (b *BaseApi) ExportSSHLogs(c *gin.Context) {
 
 // @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)
+// @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.SuccessWithData(c, data)
 }
-
-// @Tags SSH
-// @Summary Update host SSH setting by file
-// @Accept json
-// @Param request body dto.SSHConf true "request"
-// @Success 200
-// @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 {
-		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
-}

agent/app/api/v2/system.go

@@ -9,7 +9,7 @@ import (
 // @Tags Host
 // @Summary Check if a system component exists
 // @Accept json
-// @Param name path string true "Component name to check (e.g., rsync, docker)"
+// @Param name query string true "Component name to check (e.g., rsync, docker)"
 // @Success 200 {object} response.ComponentInfo
 // @Security ApiKeyAuth
 // @Security Timestamp

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,9 +206,45 @@ 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:  4096,
-	WriteBufferSize: 16384,
+	ReadBufferSize:  1024,
+	WriteBufferSize: 1024 * 1024 * 10,
 	CheckOrigin: func(r *http.Request) bool {
 		return true
 	},

agent/app/api/v2/website.go

@@ -73,7 +73,7 @@ func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites [post]
-// @x-panel-log {"bodyKeys":["alias"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [alias]","formatEN":"Create website [alias]"}
+// @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [primaryDomain]","formatEN":"Create website [primaryDomain]"}
 func (b *BaseApi) CreateWebsite(c *gin.Context) {
 	var req request.WebsiteCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -672,7 +672,7 @@ func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/redirect/update [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":"Update domain [domain] redirect config"}
+// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 重定向理配置 ","formatEN":"Update domain [domain] redirect config"}
 func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
 	var req request.NginxRedirectReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -1141,125 +1141,3 @@ func (b *BaseApi) ExecComposer(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Website
-// @Summary Batch operate websites
-// @Accept json
-// @Param request body request.BatchWebsiteOp 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 Batch set website group
-// @Accept json
-// @Param request body request.BatchWebsiteGroup true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/batch/group [post]
-func (b *BaseApi) BatchSetWebsiteGroup(c *gin.Context) {
-	var req request.BatchWebsiteGroup
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.BatchSetGroup(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)
-}
-
-// @Tags Website
-// @Summary Update Stream Config
-// @Accept json
-// @Param request body request.StreamUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/stream/update [post]
-func (b *BaseApi) UpdateStreamConfig(c *gin.Context) {
-	var req request.StreamUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.UpdateStream(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Batch set HTTPS for websites
-// @Accept json
-// @Param request body request.BatchWebsiteHttps true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/batch/https [post]
-func (b *BaseApi) BatchSetHttps(c *gin.Context) {
-	var req request.BatchWebsiteHttps
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.BatchSetHttps(c, req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/api/v2/website_ssl.go

@@ -1,15 +1,12 @@
 package v2
 
 import (
-	"io"
-	"mime/multipart"
+	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"net/http"
 	"net/url"
 	"reflect"
 	"strconv"
 
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-
 	"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/dto/request"
@@ -35,7 +32,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-		helper.SuccessWithDataGzipped(c, dto.PageResult{
+		helper.SuccessWithData(c, dto.PageResult{
 			Total: total,
 			Items: accounts,
 		})
@@ -45,7 +42,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-		helper.SuccessWithDataGzipped(c, list)
+		helper.SuccessWithData(c, list)
 	}
 }
 
@@ -220,78 +217,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.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.Success(c)
-}
-
-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

agent/app/dto/alert.go

@@ -292,7 +292,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"
@@ -317,21 +316,15 @@ type AlertCommonConfig struct {
 
 type AlertSmsConfig struct {
 	Phone         string `json:"phone"`
-	AlertDailyNum string `json:"alertDailyNum"`
+	AlertDailyNum uint   `json:"alertDailyNum"`
 }
 
 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"
 	Recipient   string `json:"recipient"`
 }
-
-type AgentInfo struct {
-	NodeName string `json:"nodeName"`
-	NodeAddr string `json:"nodeAddr"`
-}

agent/app/dto/app.go

@@ -12,8 +12,6 @@ type AppDatabase struct {
 	DbUser       string `json:"PANEL_DB_USER"`
 	Password     string `json:"PANEL_DB_USER_PASSWORD"`
 	DatabaseName string `json:"DATABASE_NAME"`
-	Format       string `json:"format"`
-	Collation    string `json:"collation"`
 }
 
 type AuthParam struct {
@@ -84,26 +82,25 @@ type ExtraProperties struct {
 }
 
 type AppProperty struct {
-	Name                string   `json:"name"`
-	Type                string   `json:"type"`
-	Tags                []string `json:"tags"`
-	ShortDescZh         string   `json:"shortDescZh" yaml:"shortDescZh"`
-	ShortDescEn         string   `json:"shortDescEn" yaml:"shortDescEn"`
-	Description         Locale   `json:"description"`
-	Key                 string   `json:"key"`
-	Required            []string `json:"Required"`
-	CrossVersionUpdate  bool     `json:"crossVersionUpdate" yaml:"crossVersionUpdate"`
-	Limit               int      `json:"limit" yaml:"limit"`
-	Recommend           int      `json:"recommend" yaml:"recommend"`
-	Website             string   `json:"website"`
-	Github              string   `json:"github"`
-	Document            string   `json:"document"`
-	Architectures       []string `json:"architectures"`
-	MemoryRequired      int      `json:"memoryRequired" yaml:"memoryRequired"`
-	GpuSupport          bool     `json:"gpuSupport" yaml:"gpuSupport"`
-	Version             float64  `json:"version"`
-	Deprecated          float64  `json:"deprecated"`
-	BatchInstallSupport bool     `json:"batchInstallSupport"`
+	Name               string   `json:"name"`
+	Type               string   `json:"type"`
+	Tags               []string `json:"tags"`
+	ShortDescZh        string   `json:"shortDescZh" yaml:"shortDescZh"`
+	ShortDescEn        string   `json:"shortDescEn" yaml:"shortDescEn"`
+	Description        Locale   `json:"description"`
+	Key                string   `json:"key"`
+	Required           []string `json:"Required"`
+	CrossVersionUpdate bool     `json:"crossVersionUpdate"`
+	Limit              int      `json:"limit"`
+	Recommend          int      `json:"recommend"`
+	Website            string   `json:"website"`
+	Github             string   `json:"github"`
+	Document           string   `json:"document"`
+	Architectures      []string `json:"architectures"`
+	MemoryRequired     int      `json:"memoryRequired"`
+	GpuSupport         bool     `json:"gpuSupport"`
+	Version            float64  `json:"version"`
+	Deprecated         float64  `json:"deprecated"`
 }
 
 type AppConfigVersion struct {
@@ -131,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

@@ -33,12 +33,6 @@ type BackupInfo struct {
 	RememberAuth bool `json:"rememberAuth"`
 }
 
-type BackupCheckRes struct {
-	IsOk  bool   `json:"isOk"`
-	Msg   string `json:"msg"`
-	Token string `json:"token"`
-}
-
 type ForBuckets struct {
 	Type       string `json:"type" validate:"required"`
 	AccessKey  string `json:"accessKey"`
@@ -65,13 +59,12 @@ type UploadForRecover struct {
 }
 
 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"`
-	DetailName string   `json:"detailName"`
-	Secret     string   `json:"secret"`
-	TaskID     string   `json:"taskID"`
-	FileName   string   `json:"fileName"`
-	Args       []string `json:"args"`
+	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mysql-cluster postgresql-cluster redis-cluster"`
+	Name       string `json:"name"`
+	DetailName string `json:"detailName"`
+	Secret     string `json:"secret"`
+	TaskID     string `json:"taskID"`
+	FileName   string `json:"fileName"`
 
 	Description string `json:"description"`
 }
@@ -84,7 +77,6 @@ type CommonRecover struct {
 	Secret            string `json:"secret"`
 	TaskID            string `json:"taskID"`
 	BackupRecordID    uint   `json:"backupRecordID"`
-	Timeout           int    `json:"timeout"`
 }
 
 type RecordSearch struct {
@@ -107,9 +99,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

@@ -33,7 +33,6 @@ type ClamInfo struct {
 	LastRecordStatus string `json:"lastRecordStatus"`
 	LastRecordTime   string `json:"lastRecordTime"`
 	Spec             string `json:"spec"`
-	Timeout          uint   `json:"timeout"`
 	Description      string `json:"description"`
 	AlertCount       uint   `json:"alertCount"`
 	AlertMethod      string `json:"alertMethod"`
@@ -78,7 +77,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 +91,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"`

agent/app/dto/compose_template.go

@@ -8,10 +8,6 @@ type ComposeTemplateCreate struct {
 	Content     string `json:"content"`
 }
 
-type ComposeTemplateBatch struct {
-	Templates []ComposeTemplateCreate `json:"templates" validate:"required"`
-}
-
 type ComposeTemplateUpdate struct {
 	ID          uint   `json:"id"`
 	Description string `json:"description"`

agent/app/dto/container.go

@@ -15,9 +15,8 @@ type PageContainer struct {
 }
 
 type InspectReq struct {
-	ID     string `json:"id" validate:"required"`
-	Type   string `json:"type" validate:"required"`
-	Detail string `json:"detail"`
+	ID   string `json:"id" validate:"required"`
+	Type string `json:"type" validate:"required"`
 }
 
 type ContainerInfo struct {
@@ -38,9 +37,6 @@ type ContainerInfo struct {
 	AppName        string   `json:"appName"`
 	AppInstallName string   `json:"appInstallName"`
 	Websites       []string `json:"websites"`
-
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
 }
 
 type ContainerOptions struct {
@@ -49,13 +45,14 @@ type ContainerOptions struct {
 }
 
 type ContainerStatus struct {
-	Created    int `json:"created"`
-	Running    int `json:"running"`
-	Paused     int `json:"paused"`
-	Restarting int `json:"restarting"`
-	Removing   int `json:"removing"`
-	Exited     int `json:"exited"`
-	Dead       int `json:"dead"`
+	All        uint `json:"all"`
+	Created    uint `json:"created"`
+	Running    uint `json:"running"`
+	Paused     uint `json:"paused"`
+	Restarting uint `json:"restarting"`
+	Removing   uint `json:"removing"`
+	Exited     uint `json:"exited"`
+	Dead       uint `json:"dead"`
 
 	ContainerCount       int `json:"containerCount"`
 	ComposeCount         int `json:"composeCount"`
@@ -64,6 +61,8 @@ type ContainerStatus struct {
 	NetworkCount         int `json:"networkCount"`
 	VolumeCount          int `json:"volumeCount"`
 	RepoCount            int `json:"repoCount"`
+
+	ImageSize uint64 `json:"imageSize"`
 }
 type ResourceLimit struct {
 	CPU    int    `json:"cpu"`
@@ -71,16 +70,18 @@ type ResourceLimit struct {
 }
 
 type ContainerOperate struct {
-	TaskID    string `json:"taskID"`
-	ForcePull bool   `json:"forcePull"`
-	Name      string `json:"name" validate:"required"`
-	Image     string `json:"image" validate:"required"`
-
-	Hostname   string             `json:"hostname"`
-	DomainName string             `json:"domainName"`
-	DNS        []string           `json:"dns"`
-	Networks   []ContainerNetwork `json:"networks"`
-
+	TaskID          string         `json:"taskID"`
+	ContainerID     string         `json:"containerID"`
+	ForcePull       bool           `json:"forcePull"`
+	Name            string         `json:"name" validate:"required"`
+	Image           string         `json:"image" validate:"required"`
+	Network         string         `json:"network"`
+	Hostname        string         `json:"hostname"`
+	DomainName      string         `json:"domainName"`
+	MacAddr         string         `json:"macAddr"`
+	DNS             []string       `json:"dns"`
+	Ipv4            string         `json:"ipv4"`
+	Ipv6            string         `json:"ipv6"`
 	PublishAllPorts bool           `json:"publishAllPorts"`
 	ExposedPorts    []PortHelper   `json:"exposedPorts"`
 	Tty             bool           `json:"tty"`
@@ -99,12 +100,6 @@ type ContainerOperate struct {
 	Env             []string       `json:"env"`
 	RestartPolicy   string         `json:"restartPolicy"`
 }
-type ContainerNetwork struct {
-	Network string `json:"network"`
-	Ipv4    string `json:"ipv4"`
-	Ipv6    string `json:"ipv6"`
-	MacAddr string `json:"macAddr"`
-}
 
 type ContainerCreateByCommand struct {
 	TaskID  string `json:"taskID"`
@@ -118,19 +113,6 @@ type ContainerUpgrade struct {
 	ForcePull bool     `json:"forcePull"`
 }
 
-type ContainerItemStats struct {
-	SizeRw     int64 `json:"sizeRw"`
-	SizeRootFs int64 `json:"sizeRootFs"`
-
-	ContainerUsage        int64 `json:"containerUsage"`
-	ContainerReclaimable  int64 `json:"containerReclaimable"`
-	ImageUsage            int64 `json:"imageUsage"`
-	ImageReclaimable      int64 `json:"imageReclaimable"`
-	VolumeUsage           int64 `json:"volumeUsage"`
-	VolumeReclaimable     int64 `json:"volumeReclaimable"`
-	BuildCacheUsage       int64 `json:"buildCacheUsage"`
-	BuildCacheReclaimable int64 `json:"buildCacheReclaimable"`
-}
 type ContainerListStats struct {
 	ContainerID string `json:"containerID"`
 
@@ -162,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"`
@@ -172,7 +153,6 @@ type PortHelper struct {
 }
 
 type ContainerOperation struct {
-	TaskID    string   `json:"taskID"`
 	Names     []string `json:"names" validate:"required"`
 	Operation string   `json:"operation" validate:"required,oneof=up start stop restart kill pause unpause remove"`
 }
@@ -262,42 +242,35 @@ type ComposeInfo struct {
 	Workdir        string             `json:"workdir"`
 	Path           string             `json:"path"`
 	Containers     []ComposeContainer `json:"containers"`
-	Env            string             `json:"env"`
+	Env            []string           `json:"env"`
 }
 type ComposeContainer struct {
-	ContainerID string   `json:"containerID"`
-	Name        string   `json:"name"`
-	CreateTime  string   `json:"createTime"`
-	State       string   `json:"state"`
-	Ports       []string `json:"ports"`
+	ContainerID string `json:"containerID"`
+	Name        string `json:"name"`
+	CreateTime  string `json:"createTime"`
+	State       string `json:"state"`
 }
 type ComposeCreate struct {
-	TaskID   string `json:"taskID"`
-	Name     string `json:"name"`
-	From     string `json:"from" validate:"required,oneof=edit path template"`
-	File     string `json:"file"`
-	Path     string `json:"path"`
-	Template uint   `json:"template"`
-	Env      string `json:"env"`
+	TaskID   string   `json:"taskID"`
+	Name     string   `json:"name"`
+	From     string   `json:"from" validate:"required,oneof=edit path template"`
+	File     string   `json:"file"`
+	Path     string   `json:"path"`
+	Template uint     `json:"template"`
+	Env      []string `json:"env"`
 }
 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"`
 	WithFile  bool   `json:"withFile"`
-	Force     bool   `json:"force"`
+	Force     bool   `josn:"force"`
 }
 type ComposeUpdate struct {
-	Name       string `json:"name" validate:"required"`
-	Path       string `json:"path" validate:"required"`
-	DetailPath string `json:"detailPath"`
-	Content    string `json:"content" validate:"required"`
-	Env        string `json:"env"`
-}
-type ComposeLogClean struct {
-	Name       string `json:"name" validate:"required"`
-	Path       string `json:"path" validate:"required"`
-	DetailPath string `json:"detailPath"`
+	Name    string   `json:"name" validate:"required"`
+	Path    string   `json:"path" validate:"required"`
+	Content string   `json:"content" validate:"required"`
+	Env     []string `json:"env"`
 }
 
 type ContainerLog struct {

agent/app/dto/cronjob.go

@@ -49,17 +49,10 @@ type CronjobOperate struct {
 	Timeout           uint   `json:"timeout" validate:"number,min=1"`
 	IgnoreErr         bool   `json:"ignoreErr"`
 	Secret            string `json:"secret"`
-	Args              string `json:"args"`
 
 	AlertCount  uint   `json:"alertCount"`
 	AlertTitle  string `json:"alertTitle"`
 	AlertMethod string `json:"alertMethod"`
-
-	CleanLogConfig
-}
-
-type CleanLogConfig struct {
-	Scopes []string `json:"scopes"`
 }
 
 type SnapshotRule struct {
@@ -124,7 +117,6 @@ type CronjobInfo struct {
 	LastRecordTime   string `json:"lastRecordTime"`
 	Status           string `json:"status"`
 	Secret           string `json:"secret"`
-	Args             string `json:"args"`
 
 	AlertCount uint `json:"alertCount"`
 }
@@ -164,7 +156,6 @@ type CronjobTrans struct {
 	IgnoreErr    bool                `json:"ignoreErr"`
 	SnapshotRule SnapshotTransHelper `json:"snapshotRule"`
 	Secret       string              `json:"secret"`
-	Args         string              `json:"args"`
 
 	SourceAccounts  []string `json:"sourceAccounts"`
 	DownloadAccount string   `json:"downloadAccount"`

agent/app/dto/dashboard.go

@@ -13,17 +13,15 @@ type DashboardBase struct {
 	Platform             string `json:"platform"`
 	PlatformFamily       string `json:"platformFamily"`
 	PlatformVersion      string `json:"platformVersion"`
-	PrettyDistro         string `json:"prettyDistro"`
 	KernelArch           string `json:"kernelArch"`
 	KernelVersion        string `json:"kernelVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
 	IpV4Addr             string `json:"ipV4Addr"`
 	SystemProxy          string `json:"systemProxy"`
 
-	CPUCores        int     `json:"cpuCores"`
-	CPULogicalCores int     `json:"cpuLogicalCores"`
-	CPUModelName    string  `json:"cpuModelName"`
-	CPUMhz          float64 `json:"cpuMhz"`
+	CPUCores        int    `json:"cpuCores"`
+	CPULogicalCores int    `json:"cpuLogicalCores"`
+	CPUModelName    string `json:"cpuModelName"`
 
 	QuickJumps  []QuickJump      `json:"quickJump"`
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
@@ -36,7 +34,6 @@ type ChangeQuicks struct {
 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"`
@@ -50,7 +47,6 @@ type OsInfo struct {
 	PlatformFamily string `json:"platformFamily"`
 	KernelArch     string `json:"kernelArch"`
 	KernelVersion  string `json:"kernelVersion"`
-	PrettyDistro   string `json:"prettyDistro"`
 
 	DiskSize int64 `json:"diskSize"`
 }
@@ -61,10 +57,9 @@ type NodeCurrent struct {
 	Load15           float64 `json:"load15"`
 	LoadUsagePercent float64 `json:"loadUsagePercent"`
 
-	CPUUsedPercent     float64   `json:"cpuUsedPercent"`
-	CPUUsed            float64   `json:"cpuUsed"`
-	CPUTotal           int       `json:"cpuTotal"`
-	CPUDetailedPercent []float64 `json:"cpuDetailedPercent"`
+	CPUUsedPercent float64 `json:"cpuUsedPercent"`
+	CPUUsed        float64 `json:"cpuUsed"`
+	CPUTotal       int     `json:"cpuTotal"`
 
 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryAvailable   uint64  `json:"memoryAvailable"`
@@ -88,11 +83,10 @@ type DashboardCurrent struct {
 	Load15           float64 `json:"load15"`
 	LoadUsagePercent float64 `json:"loadUsagePercent"`
 
-	CPUPercent         []float64 `json:"cpuPercent"`
-	CPUUsedPercent     float64   `json:"cpuUsedPercent"`
-	CPUUsed            float64   `json:"cpuUsed"`
-	CPUTotal           int       `json:"cpuTotal"`
-	CPUDetailedPercent []float64 `json:"cpuDetailedPercent"`
+	CPUPercent     []float64 `json:"cpuPercent"`
+	CPUUsedPercent float64   `json:"cpuUsedPercent"`
+	CPUUsed        float64   `json:"cpuUsed"`
+	CPUTotal       int       `json:"cpuTotal"`
 
 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryUsed        uint64  `json:"memoryUsed"`
@@ -121,9 +115,6 @@ type DashboardCurrent struct {
 	GPUData []GPUInfo `json:"gpuData"`
 	XPUData []XPUInfo `json:"xpuData"`
 
-	TopCPUItems []Process `json:"topCPUItems"`
-	TopMemItems []Process `json:"topMemItems"`
-
 	ShotTime time.Time `json:"shotTime"`
 }
 

agent/app/dto/database.go

@@ -38,7 +38,6 @@ type MysqlDBInfo struct {
 	From        string    `json:"from"`
 	MysqlName   string    `json:"mysqlName"`
 	Format      string    `json:"format"`
-	Collation   string    `json:"collation"`
 	Username    string    `json:"username"`
 	Password    string    `json:"password"`
 	Permission  string    `json:"permission"`
@@ -58,19 +57,13 @@ type MysqlDBCreate struct {
 	Name        string `json:"name" validate:"required"`
 	From        string `json:"from" validate:"required,oneof=local remote"`
 	Database    string `json:"database" validate:"required"`
-	Format      string `json:"format" validate:"required"`
-	Collation   string `json:"collation"`
+	Format      string `json:"format" validate:"required,oneof=utf8mb4 utf8 gbk big5"`
 	Username    string `json:"username" validate:"required"`
 	Password    string `json:"password" validate:"required"`
 	Permission  string `json:"permission" validate:"required"`
 	Description string `json:"description"`
 }
 
-type MysqlFormatCollationOption struct {
-	Format     string   `json:"format"`
-	Collations []string `json:"collations"`
-}
-
 type BindUser struct {
 	Database   string `json:"database" validate:"required"`
 	DB         string `json:"db" validate:"required"`
@@ -258,7 +251,6 @@ type DatabaseInfo struct {
 	Version   string    `json:"version"`
 	Address   string    `json:"address"`
 	Port      uint      `json:"port"`
-	InitialDB string    `json:"initialDB"`
 	Username  string    `json:"username"`
 	Password  string    `json:"password"`
 
@@ -289,15 +281,14 @@ type DatabaseItem struct {
 }
 
 type DatabaseCreate struct {
-	Name      string `json:"name" validate:"required,max=256"`
-	Type      string `json:"type" validate:"required"`
-	From      string `json:"from" validate:"required,oneof=local remote"`
-	Version   string `json:"version" validate:"required"`
-	Address   string `json:"address"`
-	Port      uint   `json:"port"`
-	InitialDB string `json:"initialDB"`
-	Username  string `json:"username" validate:"required"`
-	Password  string `json:"password"`
+	Name     string `json:"name" validate:"required,max=256"`
+	Type     string `json:"type" validate:"required"`
+	From     string `json:"from" validate:"required,oneof=local remote"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password"`
 
 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`
@@ -310,14 +301,13 @@ type DatabaseCreate struct {
 }
 
 type DatabaseUpdate struct {
-	ID        uint   `json:"id"`
-	Type      string `json:"type" validate:"required"`
-	Version   string `json:"version" validate:"required"`
-	Address   string `json:"address"`
-	Port      uint   `json:"port"`
-	InitialDB string `json:"initialDB"`
-	Username  string `json:"username" validate:"required"`
-	Password  string `json:"password"`
+	ID       uint   `json:"id"`
+	Type     string `json:"type" validate:"required"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password"`
 
 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`

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/firewall.go

@@ -4,8 +4,6 @@ type FirewallBaseInfo struct {
 	Name       string `json:"name"`
 	IsExist    bool   `json:"isExist"`
 	IsActive   bool   `json:"isActive"`
-	IsInit     bool   `json:"isInit"`
-	IsBind     bool   `json:"isBind"`
 	Version    string `json:"version"`
 	PingStatus string `json:"pingStatus"`
 }
@@ -19,14 +17,12 @@ type RuleSearch struct {
 }
 
 type FirewallOperation struct {
-	Operation         string `json:"operation" validate:"required,oneof=start stop restart disableBanPing enableBanPing"`
+	Operation         string `json:"operation" validate:"required,oneof=start stop restart disablePing enablePing"`
 	WithDockerRestart bool   `json:"withDockerRestart"`
 }
 
 type PortRuleOperate struct {
-	ID        uint   `json:"id"`
 	Operation string `json:"operation" validate:"required,oneof=add remove"`
-	Chain     string `json:"chain"`
 	Address   string `json:"address"`
 	Port      string `json:"port" validate:"required"`
 	Protocol  string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
@@ -41,7 +37,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"`
@@ -50,11 +45,8 @@ type ForwardRuleOperate struct {
 
 type UpdateFirewallDescription struct {
 	Type     string `json:"type"`
-	Chain    string `json:"chain"`
-	SrcIP    string `json:"srcIP"`
-	DstIP    string `json:"dstIP"`
-	SrcPort  string `json:"srcPort"`
-	DstPort  string `json:"dstPort"`
+	Address  string `json:"address"`
+	Port     string `json:"port"`
 	Protocol string `json:"protocol"`
 	Strategy string `json:"strategy" validate:"required,oneof=accept drop"`
 
@@ -62,7 +54,6 @@ type UpdateFirewallDescription struct {
 }
 
 type AddrRuleOperate struct {
-	ID        uint   `json:"id"`
 	Operation string `json:"operation" validate:"required,oneof=add remove"`
 	Address   string `json:"address"  validate:"required"`
 	Strategy  string `json:"strategy" validate:"required,oneof=accept drop"`
@@ -84,30 +75,3 @@ type BatchRuleOperate struct {
 	Type  string            `json:"type" validate:"required"`
 	Rules []PortRuleOperate `json:"rules"`
 }
-
-type IptablesOp struct {
-	Name    string `json:"name" validate:"required,oneof=1PANEL_INPUT 1PANEL_OUTPUT 1PANEL_BASIC"`
-	Operate string `json:"operate" validate:"required,oneof=init-base init-forward init-advance bind-base unbind-base bind unbind"`
-}
-
-type IptablesRuleOp struct {
-	Operation   string `json:"operation" validate:"required,oneof=add remove"`
-	ID          uint   `json:"id"`
-	Chain       string `json:"chain" validate:"required,oneof=1PANEL_BASIC 1PANEL_BASIC_BEFORE 1PANEL_INPUT 1PANEL_OUTPUT"`
-	Protocol    string `json:"protocol"`
-	SrcIP       string `json:"srcIP"`
-	SrcPort     uint   `json:"srcPort"`
-	DstIP       string `json:"dstIP"`
-	DstPort     uint   `json:"dstPort"`
-	Strategy    string `json:"strategy" validate:"required,oneof=accept drop reject"`
-	Description string `json:"description"`
-}
-
-type IptablesBatchOperate struct {
-	Rules []IptablesRuleOp `json:"rules"`
-}
-
-type IptablesChainStatus struct {
-	IsBind          bool   `json:"isBind"`
-	DefaultStrategy string `json:"defaultStrategy"`
-}

agent/app/dto/image.go

@@ -15,14 +15,10 @@ type ImageInfo struct {
 	IsUsed    bool      `json:"isUsed"`
 	Tags      []string  `json:"tags"`
 	Size      int64     `json:"size"`
-
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
 }
 
 type ImageLoad struct {
-	TaskID string `json:"taskID"`
-	Path   string `json:"path" validate:"required"`
+	Path string `json:"path" validate:"required"`
 }
 
 type ImageBuild struct {
@@ -31,18 +27,17 @@ type ImageBuild struct {
 	Name       string   `json:"name" validate:"required"`
 	Dockerfile string   `json:"dockerfile" validate:"required"`
 	Tags       []string `json:"tags"`
-	Args       []string `json:"args"`
 }
 
 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 {
@@ -53,7 +48,6 @@ type ImagePush struct {
 }
 
 type ImageSave struct {
-	TaskID  string `json:"taskID"`
 	TagName string `json:"tagName" validate:"required"`
 	Path    string `json:"path" validate:"required"`
 	Name    string `json:"name" validate:"required"`

agent/app/dto/monitor.go

@@ -4,78 +4,25 @@ import "time"
 
 type MonitorSearch struct {
 	Param     string    `json:"param" validate:"required,oneof=all cpu memory load io network"`
-	IO        string    `json:"io"`
-	Network   string    `json:"network"`
+	Info      string    `json:"info"`
 	StartTime time.Time `json:"startTime"`
 	EndTime   time.Time `json:"endTime"`
 }
 
 type MonitorData struct {
-	Param string        `json:"param"`
+	Param string        `json:"param" validate:"required,oneof=cpu memory load io network"`
 	Date  []time.Time   `json:"date"`
 	Value []interface{} `json:"value"`
 }
 
-type Process struct {
-	Name    string  `json:"name"`
-	Pid     int32   `json:"pid"`
-	Percent float64 `json:"percent"`
-	Memory  uint64  `json:"memory"`
-	Cmd     string  `json:"cmd"`
-	User    string  `json:"user"`
-}
-
 type MonitorSetting struct {
 	MonitorStatus    string `json:"monitorStatus"`
 	MonitorStoreDays string `json:"monitorStoreDays"`
 	MonitorInterval  string `json:"monitorInterval"`
 	DefaultNetwork   string `json:"defaultNetwork"`
-	DefaultIO        string `json:"defaultIO"`
 }
 
 type MonitorSettingUpdate struct {
-	Key   string `json:"key" validate:"required,oneof=MonitorStatus MonitorStoreDays MonitorInterval DefaultNetwork DefaultIO"`
+	Key   string `json:"key" validate:"required,oneof=MonitorStatus MonitorStoreDays MonitorInterval DefaultNetwork"`
 	Value string `json:"value"`
 }
-
-type MonitorGPUOptions struct {
-	GPUType   string         `json:"gpuType"`
-	ChartHide []GPUChartHide `json:"chartHide"`
-	Options   []string       `json:"options"`
-}
-type GPUChartHide struct {
-	ProductName string `json:"productName"`
-	Process     bool   `json:"process"`
-	GPU         bool   `json:"gpu"`
-	Memory      bool   `json:"memory"`
-	Power       bool   `json:"power"`
-	Temperature bool   `json:"temperature"`
-	Speed       bool   `json:"speed"`
-}
-type MonitorGPUSearch struct {
-	ProductName string    `json:"productName"`
-	StartTime   time.Time `json:"startTime"`
-	EndTime     time.Time `json:"endTime"`
-}
-type MonitorGPUData struct {
-	Date             []time.Time `json:"date"`
-	GPUValue         []float64   `json:"gpuValue"`
-	TemperatureValue []float64   `json:"temperatureValue"`
-	PowerTotal       []float64   `json:"powerTotal"`
-	PowerUsed        []float64   `json:"powerUsed"`
-	PowerPercent     []float64   `json:"powerPercent"`
-	MemoryTotal      []float64   `json:"memoryTotal"`
-	MemoryUsed       []float64   `json:"memoryUsed"`
-	MemoryPercent    []float64   `json:"memoryPercent"`
-	SpeedValue       []int       `json:"speedValue"`
-
-	ProcessCount []int          `json:"processCount"`
-	GPUProcesses [][]GPUProcess `json:"gpuProcesses"`
-}
-
-type GPUProcess struct {
-	Pid         string `json:"pid"`
-	Type        string `json:"type"`
-	ProcessName string `json:"processName"`
-	UsedMemory  string `json:"usedMemory"`
-}

agent/app/dto/nginx.go

@@ -73,13 +73,12 @@ type NginxUpstream struct {
 }
 
 type NginxUpstreamServer struct {
-	Server          string `json:"server"`
-	Weight          int    `json:"weight"`
-	FailTimeout     int    `json:"failTimeout"`
-	FailTimeoutUnit string `json:"failTimeoutUnit"`
-	MaxFails        int    `json:"maxFails"`
-	MaxConns        int    `json:"maxConns"`
-	Flag            string `json:"flag"`
+	Server      string `json:"server"`
+	Weight      int    `json:"weight"`
+	FailTimeout string `json:"failTimeout"`
+	MaxFails    int    `json:"maxFails"`
+	MaxConns    int    `json:"maxConns"`
+	Flag        string `json:"flag"`
 }
 
 var LBAlgorithms = map[string]struct{}{"ip_hash": {}, "least_conn": {}}

agent/app/dto/request/app.go

@@ -22,16 +22,7 @@ type AppInstallCreate struct {
 	Name        string                 `json:"name" validate:"required"`
 	Services    map[string]string      `json:"services"`
 	TaskID      string                 `json:"taskID"`
-
 	AppContainerConfig
-	NodePushConfig
-}
-
-type NodePushConfig struct {
-	Nodes    []string `json:"nodes"`
-	PushNode bool     `json:"pushNode"`
-	AppKey   string   `json:"appKey"`
-	Version  string   `json:"version"`
 }
 
 type AppContainerConfig struct {

agent/app/dto/request/disk.go

@@ -13,7 +13,6 @@ type DiskMountRequest struct {
 	MountPoint string `json:"mountPoint" validate:"required"`
 	Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"`
 	AutoMount  bool   `json:"autoMount"`
-	NoFail     bool   `json:"noFail"`
 }
 
 type DiskUnmountRequest struct {

agent/app/dto/request/file.go

@@ -13,6 +13,7 @@ type FileContentReq struct {
 	Path     string `json:"path" validate:"required"`
 	IsDetail bool   `json:"isDetail"`
 }
+
 type SearchUploadWithPage struct {
 	dto.PageInfo
 	Path string `json:"path" validate:"required"`
@@ -147,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/nginx.go

@@ -130,8 +130,3 @@ type NginxModuleUpdate struct {
 type NginxOperateReq struct {
 	Operate string `json:"operate" validate:"required,oneof=enable disable"`
 }
-
-type NginxDefaultHTTPSUpdate struct {
-	Operate            string `json:"operate" validate:"required,oneof=enable disable"`
-	SSLRejectHandshake bool   `json:"sslRejectHandshake"`
-}

agent/app/dto/request/runtime.go

@@ -32,7 +32,6 @@ type NodeConfig struct {
 	ExposedPorts []ExposedPort `json:"exposedPorts"`
 	Environments []Environment `json:"environments"`
 	Volumes      []Volume      `json:"volumes"`
-	ExtraHosts   []ExtraHost   `json:"extraHosts"`
 }
 
 type Environment struct {
@@ -50,11 +49,6 @@ type ExposedPort struct {
 	HostIP        string `json:"hostIP"`
 }
 
-type ExtraHost struct {
-	Hostname string `json:"hostname"`
-	IP       string `json:"ip"`
-}
-
 type RuntimeDelete struct {
 	ID          uint `json:"id"`
 	ForceDelete bool `json:"forceDelete"`
@@ -106,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 {
@@ -141,7 +134,6 @@ type PHPContainerConfig struct {
 	ExposedPorts  []ExposedPort `json:"exposedPorts"`
 	Environments  []Environment `json:"environments"`
 	Volumes       []Volume      `json:"volumes"`
-	ExtraHosts    []ExtraHost   `json:"extraHosts"`
 }
 
 type RuntimeRemark struct {

agent/app/dto/request/tensorrt_llm.go

@@ -1,40 +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"`
-	ModelType     string `json:"modelType"`
-	ModelSpeedup  bool   `json:"modelSpeedup"`
-	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

@@ -38,22 +38,6 @@ type WebsiteCreate struct {
 	FtpConfig
 	DataBaseConfig
 	SSLConfig
-	StreamConfig
-}
-
-type StreamConfig struct {
-	StreamPorts string `json:"streamPorts"`
-	Name        string `json:"name"`
-	Algorithm   string `json:"algorithm"`
-	UDP         bool   `json:"udp"`
-
-	Servers []dto.NginxUpstreamServer `json:"servers"`
-}
-
-type StreamUpdate struct {
-	WebsiteID uint `json:"websiteID" validate:"required"`
-
-	StreamConfig
 }
 
 type WebsiteOptionReq struct {
@@ -111,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 {
@@ -119,36 +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 BatchWebsiteGroup struct {
-	IDs     []uint `json:"ids" validate:"required"`
-	GroupID uint   `json:"groupID" validate:"required"`
-}
-
-type BatchWebsiteHttps struct {
-	IDs                   []uint   `json:"ids" validate:"required"`
-	TaskID                string   `json:"taskID" validate:"required"`
-	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"`
-}
-
 type WebsiteRedirectUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
@@ -269,21 +222,6 @@ type WebsiteProxyConfig struct {
 	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
 }
 
 type WebsiteProxyReq struct {
@@ -311,7 +249,6 @@ type WebsiteHtmlReq struct {
 type WebsiteHtmlUpdate struct {
 	Type    string `json:"type" validate:"required"`
 	Content string `json:"content" validate:"required"`
-	Sync    bool   `json:"sync"`
 }
 
 type WebsiteLBCreate struct {

agent/app/dto/request/website_ssl.go

@@ -31,7 +31,6 @@ type WebsiteSSLCreate struct {
 	Shell         string `json:"shell"`
 	PushNode      bool   `json:"pushNode"`
 	Nodes         string `json:"nodes"`
-	IsIp          bool   `json:"isIp"`
 }
 
 type WebsiteDNSReq struct {
@@ -158,9 +157,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

@@ -29,18 +29,22 @@ type AppDTO struct {
 }
 
 type AppItem struct {
-	Name                string   `json:"name"`
-	Key                 string   `json:"key"`
-	ID                  uint     `json:"id"`
-	Description         string   `json:"description"`
-	Status              string   `json:"status"`
-	Installed           bool     `json:"installed"`
-	Limit               int      `json:"limit"`
-	Tags                []string `json:"tags"`
-	GpuSupport          bool     `json:"gpuSupport"`
-	Recommend           int      `json:"recommend"`
-	Type                string   `json:"type"`
-	BatchInstallSupport bool     `json:"batchInstallSupport"`
+	Name        string   `json:"name"`
+	Key         string   `json:"key"`
+	ID          uint     `json:"id"`
+	Description string   `json:"description"`
+	Icon        string   `json:"icon"`
+	Type        string   `json:"type"`
+	Status      string   `json:"status"`
+	Resource    string   `json:"resource"`
+	Installed   bool     `json:"installed"`
+	Versions    []string `json:"versions"`
+	Limit       int      `json:"limit"`
+	Tags        []TagDTO `json:"tags"`
+	Github      string   `json:"github"`
+	Website     string   `json:"website"`
+	GpuSupport  bool     `json:"gpuSupport"`
+	Recommend   int      `json:"recommend"`
 }
 
 type TagDTO struct {
@@ -76,10 +80,6 @@ type AppDetailDTO struct {
 	GpuSupport     bool        `json:"gpuSupport"`
 }
 
-type AppDetailSimpleDTO struct {
-	ID uint `json:"id"`
-}
-
 type IgnoredApp struct {
 	Icon     string `json:"icon"`
 	Name     string `json:"name"`
@@ -128,9 +128,6 @@ type AppInstallDTO struct {
 	Favorite      bool      `json:"favorite"`
 	App           AppDetail `json:"app"`
 	Container     string    `json:"container"`
-	IsEdit        bool      `json:"isEdit"`
-	LinkDB        bool      `json:"linkDB"`
-	ServiceName   string    `json:"serviceName"`
 }
 
 type AppInstallInfo struct {
@@ -142,8 +139,6 @@ type AppInstallInfo struct {
 	HttpPort    int    `json:"HttpPort"`
 	Container   string `json:"container"`
 	ComposePath string `json:"composePath"`
-	AppKey      string `json:"appKey"`
-	AppPorts    []int  `json:"appPorts"`
 
 	Env map[string]interface{} `json:"env"`
 }
@@ -181,7 +176,6 @@ type AppParam struct {
 }
 
 type AppConfig struct {
-	Params     []AppParam `json:"params"`
-	RawCompose string     `json:"rawCompose"`
+	Params []AppParam `json:"params"`
 	request.AppContainerConfig
 }

agent/app/dto/response/disk.go

@@ -24,7 +24,7 @@ type DiskBasicInfo struct {
 type CompleteDiskInfo struct {
 	Disks              []DiskInfo      `json:"disks"`
 	UnpartitionedDisks []DiskBasicInfo `json:"unpartitionedDisks"`
-	SystemDisks        []DiskInfo      `json:"systemDisks"`
+	SystemDisk         *DiskInfo       `json:"systemDisk"`
 	TotalDisks         int             `json:"totalDisks"`
 	TotalCapacity      int64           `json:"totalCapacity"`
 }

agent/app/dto/response/file.go

@@ -73,11 +73,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/nginx.go

@@ -82,6 +82,5 @@ type NginxBuildConfig struct {
 }
 
 type NginxConfigRes struct {
-	Https              bool `json:"https"`
-	SSLRejectHandshake bool `json:"sslRejectHandshake"`
+	Https bool `json:"https"`
 }

agent/app/dto/response/runtime.go

@@ -28,7 +28,6 @@ type RuntimeDTO struct {
 	ExposedPorts    []request.ExposedPort  `json:"exposedPorts"`
 	Environments    []request.Environment  `json:"environments"`
 	Volumes         []request.Volume       `json:"volumes"`
-	ExtraHosts      []request.ExtraHost    `json:"extraHosts"`
 	ContainerStatus string                 `json:"containerStatus"`
 	Container       string                 `json:"container"`
 	Remark          string                 `json:"remark"`

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

@@ -3,7 +3,6 @@ package response
 import (
 	"time"
 
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 )
 
@@ -17,10 +16,6 @@ type WebsiteDTO struct {
 	RuntimeType   string `json:"runtimeType"`
 	SiteDir       string `json:"siteDir"`
 	OpenBaseDir   bool   `json:"openBaseDir"`
-	Algorithm     string `json:"algorithm"`
-	UDP           bool   `json:"udp"`
-
-	Servers []dto.NginxUpstreamServer `json:"servers"`
 }
 
 type WebsiteRes struct {
@@ -64,16 +59,16 @@ 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"`
+	HstsIncludeSubDomains         bool             `json:"hstsIncludeSubDomains"`
+	HttpsPorts  []int            `json:"httpsPorts"`
+	HttpsPort   string           `json:"httpsPort"`
+	Http3       bool             `json:"http3"`
 }
 
 type WebsiteLog struct {
@@ -87,7 +82,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

@@ -10,7 +10,6 @@ type SettingInfo struct {
 	NtpSite   string `json:"ntpSite"`
 
 	DefaultNetwork string `json:"defaultNetwork"`
-	DefaultIO      string `json:"defaultIO"`
 	LastCleanTime  string `json:"lastCleanTime"`
 	LastCleanSize  string `json:"lastCleanSize"`
 	LastCleanData  string `json:"lastCleanData"`
@@ -37,7 +36,6 @@ type SyncTime struct {
 
 type CleanData struct {
 	SystemClean    []CleanTree `json:"systemClean"`
-	BackupClean    []CleanTree `json:"backupClean"`
 	UploadClean    []CleanTree `json:"uploadClean"`
 	DownloadClean  []CleanTree `json:"downloadClean"`
 	SystemLogClean []CleanTree `json:"systemLogClean"`
@@ -63,10 +61,6 @@ type Clean struct {
 	Size     uint64 `json:"size"`
 }
 
-type SSHDefaultConn struct {
-	WithReset   bool   `json:"withReset"`
-	DefaultConn string `json:"defaultConn"`
-}
 type SSHConnData struct {
 	Addr       string `json:"addr" validate:"required"`
 	Port       uint   `json:"port" validate:"required,number,max=65535,min=1"`
@@ -75,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 {
@@ -86,11 +78,3 @@ type SystemProxy struct {
 	User     string `json:"user"`
 	Password string `json:"password"`
 }
-
-type CommonDescription struct {
-	ID          string `json:"id" validate:"required"`
-	Type        string `json:"type" validate:"required"`
-	DetailType  string `json:"detailType"`
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
-}

agent/app/dto/snapshot.go

@@ -52,7 +52,6 @@ type DataTree struct {
 	Label     string `json:"label"`
 	Key       string `json:"key"`
 	Name      string `json:"name"`
-	IsLocal   bool   `json:"isLocal"`
 	Size      uint64 `json:"size"`
 	IsCheck   bool   `json:"isCheck"`
 	IsDisable bool   `json:"isDisable"`

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"`

agent/app/model/app.go

@@ -34,7 +34,6 @@ type App struct {
 	MemoryRequired       int     `json:"memoryRequired"`
 	GpuSupport           bool    `json:"gpuSupport"`
 	RequiredPanelVersion float64 `json:"requiredPanelVersion"`
-	BatchInstallSupport  bool    `json:"batchInstallSupport" yaml:"batchInstallSupport"`
 
 	Details []AppDetail `json:"-" gorm:"-:migration"`
 	TagsKey []string    `json:"tags" yaml:"tags" gorm:"-"`
@@ -44,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

@@ -8,7 +8,6 @@ type AppLauncher struct {
 type QuickJump struct {
 	BaseModel
 	Name      string `json:"name"`
-	Alias     string `json:"alias"`
 	Title     string `json:"title"`
 	Detail    string `json:"detail"`
 	Recommend int    `json:"recommend"`

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

@@ -10,8 +10,6 @@ type Clam struct {
 	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"`
 

agent/app/model/cronjob.go

@@ -37,15 +37,12 @@ type Cronjob struct {
 	Timeout           uint   `json:"timeout"`
 	IgnoreErr         bool   `json:"ignoreErr"`
 	RetainCopies      uint64 `json:"retainCopies"`
-	Args              string `json:"args"`
 
 	IsExecuting bool         `json:"isExecuting"`
 	Status      string       `json:"status"`
 	EntryIDs    string       `json:"entryIDs"`
 	Records     []JobRecords `json:"records"`
 	Secret      string       `json:"secret"`
-
-	Config string `json:"config"`
 }
 
 type JobRecords struct {

agent/app/model/database.go

@@ -9,7 +9,6 @@ type Database struct {
 	From         string `json:"from" gorm:"not null"`
 	Address      string `json:"address" gorm:"not null"`
 	Port         uint   `json:"port" gorm:"not null"`
-	InitialDB    string `json:"initialDB"`
 	Username     string `json:"username"`
 	Password     string `json:"password"`
 

agent/app/model/database_mysql.go

@@ -6,7 +6,6 @@ type DatabaseMysql struct {
 	From        string `json:"from" gorm:"not null;default:local"`
 	MysqlName   string `json:"mysqlName" gorm:"not null"`
 	Format      string `json:"format" gorm:"not null"`
-	Collation   string `json:"collation"`
 	Username    string `json:"username" gorm:"not null"`
 	Password    string `json:"password" gorm:"not null"`
 	Permission  string `json:"permission" gorm:"not null"`

agent/app/model/firewall.go

@@ -3,16 +3,19 @@ package model
 type Firewall struct {
 	BaseModel
 
-	Type    string `json:"type"`
-	Port    string `json:"port"`    // Deprecated
-	Address string `json:"address"` // Deprecated
-
-	Chain       string `json:"chain"`
-	Protocol    string `json:"protocol"`
-	SrcIP       string `json:"srcIP"`
-	SrcPort     string `json:"srcPort"`
-	DstIP       string `json:"dstIP"`
-	DstPort     string `json:"dstPort"`
+	Type        string `gorm:"not null" json:"type"`
+	Port        string `gorm:"not null" json:"port"`
+	Protocol    string `gorm:"not null" json:"protocol"`
+	Address     string `gorm:"not null" json:"address"`
 	Strategy    string `gorm:"not null" json:"strategy"`
-	Description string `json:"description"`
+	Description string `gorm:"not null" json:"description"`
+}
+
+type Forward struct {
+	BaseModel
+
+	Protocol   string `gorm:"not null" json:"protocol"`
+	Port       string `gorm:"not null" json:"port"`
+	TargetIP   string `gorm:"not null" json:"targetIP"`
+	TargetPort string `gorm:"not null" json:"targetPort"`
 }

agent/app/model/monitor.go

@@ -2,18 +2,14 @@ package model
 
 type MonitorBase struct {
 	BaseModel
-	Cpu         float64     `json:"cpu"`
-	TopCPU      string      `json:"topCPU"`
-	TopCPUItems interface{} `gorm:"-" json:"topCPUItems"`
-
-	Memory      float64     `json:"memory"`
-	TopMem      string      `json:"topMem"`
-	TopMemItems interface{} `gorm:"-" json:"topMemItems"`
+	Cpu float64 `json:"cpu"`
 
 	LoadUsage float64 `json:"loadUsage"`
 	CpuLoad1  float64 `json:"cpuLoad1"`
 	CpuLoad5  float64 `json:"cpuLoad5"`
 	CpuLoad15 float64 `json:"cpuLoad15"`
+
+	Memory float64 `json:"memory"`
 }
 
 type MonitorIO struct {
@@ -31,16 +27,3 @@ type MonitorNetwork struct {
 	Up   float64 `json:"up"`
 	Down float64 `json:"down"`
 }
-
-type MonitorGPU struct {
-	BaseModel
-	ProductName   string  `json:"productName"`
-	GPUUtil       float64 `json:"gpuUtil"`
-	Temperature   float64 `json:"temperature"`
-	PowerDraw     float64 `json:"powerDraw"`
-	MaxPowerLimit float64 `json:"maxPowerLimit"`
-	MemUsed       float64 `json:"memUsed"`
-	MemTotal      float64 `json:"memTotal"`
-	FanSpeed      int     `json:"fanSpeed"`
-	Processes     string  `json:"processes"`
-}

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

@@ -7,14 +7,6 @@ type Setting struct {
 	About string `json:"about"`
 }
 
-type CommonDescription struct {
-	ID          string `json:"id"`
-	Type        string `json:"type"`
-	DetailType  string `json:"detailType"`
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
-}
-
 type NodeInfo struct {
 	Scope     string `json:"scope"`
 	BaseDir   string `json:"baseDir"`

agent/app/model/tensorrt_llm.go

@@ -1,14 +0,0 @@
-package model
-
-type TensorRTLLM struct {
-	BaseModel
-	Name          string `json:"name"`
-	DockerCompose string `json:"dockerCompose"`
-	ContainerName string `json:"containerName"`
-	Message       string `json:"message"`
-	Status        string `json:"status"`
-	Env           string `json:"env"`
-	TaskID        string `json:"taskID"`
-	ModelType     string `json:"modelType"`
-	ModelSpeedup  bool   `json:"modelSpeedup"`
-}

agent/app/model/website.go

@@ -37,8 +37,6 @@ type Website struct {
 
 	Favorite bool `json:"favorite"`
 
-	StreamPorts string `json:"streamPorts"`
-
 	Domains    []WebsiteDomain `json:"domains" gorm:"-:migration"`
 	WebsiteSSL WebsiteSSL      `json:"webSiteSSL" gorm:"-:migration"`
 }

agent/app/model/website_ssl.go

@@ -10,38 +10,35 @@ 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"`
-	IsIp           bool      `json:"isIP"`
+	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"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
 	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`

agent/app/repo/app.go

@@ -27,13 +27,14 @@ type IAppRepo interface {
 	GetFirst(opts ...DBOption) (model.App, error)
 	GetBy(opts ...DBOption) ([]model.App, error)
 	BatchCreate(ctx context.Context, apps []model.App) error
+	GetByKey(ctx context.Context, key string) (model.App, error)
 	Create(ctx context.Context, app *model.App) error
 	Save(ctx context.Context, app *model.App) error
 	BatchDelete(ctx context.Context, apps []model.App) error
 	DeleteByIDs(ctx context.Context, ids []uint) error
 	DeleteBy(opts ...DBOption) error
 
-	GetTopRecommend() ([]string, error)
+	GetTopRecomment() ([]string, error)
 }
 
 func NewIAppRepo() IAppRepo {
@@ -124,7 +125,7 @@ func (a AppRepo) GetBy(opts ...DBOption) ([]model.App, error) {
 	return apps, nil
 }
 
-func (a AppRepo) GetTopRecommend() ([]string, error) {
+func (a AppRepo) GetTopRecomment() ([]string, error) {
 	var (
 		apps  []model.App
 		names []string
@@ -143,6 +144,14 @@ func (a AppRepo) BatchCreate(ctx context.Context, apps []model.App) error {
 	return getTx(ctx).Omit(clause.Associations).Create(&apps).Error
 }
 
+func (a AppRepo) GetByKey(ctx context.Context, key string) (model.App, error) {
+	var app model.App
+	if err := getTx(ctx).Where("key = ?", key).First(&app).Error; err != nil {
+		return app, err
+	}
+	return app, nil
+}
+
 func (a AppRepo) Create(ctx context.Context, app *model.App) error {
 	return getTx(ctx).Omit(clause.Associations).Create(app).Error
 }

agent/app/repo/app_launcher.go

@@ -95,7 +95,6 @@ func (u *LauncherRepo) UpdateQuicks(quicks []model.QuickJump) error {
 		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

agent/app/repo/backup.go

@@ -20,7 +20,6 @@ type IBackupRepo interface {
 	WithByPublic(isPublic bool) DBOption
 
 	ListRecord(opts ...DBOption) ([]model.BackupRecord, error)
-	GetRecord(opts ...DBOption) (*model.BackupRecord, error)
 	PageRecord(page, size int, opts ...DBOption) (int64, []model.BackupRecord, error)
 	CreateRecord(record *model.BackupRecord) error
 	DeleteRecord(ctx context.Context, opts ...DBOption) error
@@ -161,7 +160,7 @@ func (u *BackupRepo) WithByCronID(cronjobID uint) DBOption {
 }
 
 func (u *BackupRepo) GetRecord(opts ...DBOption) (*model.BackupRecord, error) {
-	record := &model.BackupRecord{}
+	var record *model.BackupRecord
 	db := global.DB.Model(&model.BackupRecord{})
 	for _, opt := range opts {
 		db = opt(db)

agent/app/repo/common.go

@@ -77,11 +77,6 @@ func WithByType(tp string) DBOption {
 		return g.Where("`type` = ?", tp)
 	}
 }
-func WithByDetailType(tp string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("`detail_type` = ?", tp)
-	}
-}
 
 func WithTypes(types []string) DBOption {
 	return func(db *gorm.DB) *gorm.DB {

agent/app/repo/cronjob.go

@@ -173,7 +173,7 @@ func (u *CronjobRepo) AddFailedRecord(cronjobID uint, message string) {
 	var record model.JobRecords
 	record.StartTime = time.Now()
 	record.CronjobID = cronjobID
-	record.Status = constant.StatusUnexecuted
+	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)

agent/app/repo/host.go

@@ -4,26 +4,24 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
-	"gorm.io/gorm"
 )
 
 type HostRepo struct{}
 
 type IHostRepo interface {
 	GetFirewallRecord(opts ...DBOption) (model.Firewall, error)
-	ListFirewallRecord(opts ...DBOption) ([]model.Firewall, error)
+	ListFirewallRecord() ([]model.Firewall, error)
 	SaveFirewallRecord(firewall *model.Firewall) error
 	DeleteFirewallRecordByID(id uint) error
+	DeleteFirewallRecord(fType, port, protocol, address, strategy string) error
 
 	SyncCert(data []model.RootCert) error
 	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
-
-	WithByChain(chain string) DBOption
 }
 
 func NewIHostRepo() IHostRepo {
@@ -40,16 +38,12 @@ func (h *HostRepo) GetFirewallRecord(opts ...DBOption) (model.Firewall, error) {
 	return firewall, err
 }
 
-func (h *HostRepo) ListFirewallRecord(opts ...DBOption) ([]model.Firewall, error) {
-	var firewalls []model.Firewall
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
+func (h *HostRepo) ListFirewallRecord() ([]model.Firewall, error) {
+	var datas []model.Firewall
+	if err := global.DB.Find(&datas).Error; err != nil {
+		return datas, nil
 	}
-	if err := global.DB.Find(&firewalls).Error; err != nil {
-		return firewalls, nil
-	}
-	return firewalls, nil
+	return datas, nil
 }
 
 func (h *HostRepo) SaveFirewallRecord(firewall *model.Firewall) error {
@@ -57,27 +51,16 @@ func (h *HostRepo) SaveFirewallRecord(firewall *model.Firewall) error {
 		return global.DB.Save(firewall).Error
 	}
 	var data model.Firewall
-	switch firewall.Type {
-	case "port":
-		_ = global.DB.Where("type = ? AND dst_port = ? AND protocol = ? AND src_ip = ? AND strategy = ?", "port",
-			firewall.DstPort,
-			firewall.Protocol,
-			firewall.SrcIP,
-			firewall.Strategy,
-		).First(&data).Error
-	case "ip":
-		_ = global.DB.Where("type = ? AND src_ip = ? AND strategy = ?", "address", firewall.SrcIP, firewall.Strategy).First(&data)
-	default:
-		_ = global.DB.Where("type = ? AND chain = ? AND src_port = ? AND dst_port = ? AND protocol = ? AND src_ip = ? AND dst_ip = ? AND strategy = ?",
-			firewall.Type,
-			firewall.Chain,
-			firewall.SrcPort,
-			firewall.DstPort,
-			firewall.Protocol,
-			firewall.SrcIP,
-			firewall.DstIP,
-			firewall.Strategy,
-		).First(&data).Error
+	if firewall.Type == "port" {
+		_ = global.DB.Where("type = ? AND port = ? AND protocol = ? AND address = ? AND strategy = ?", "port", firewall.Port, firewall.Protocol, firewall.Address, firewall.Strategy).First(&data)
+		if data.ID != 0 {
+			firewall.ID = data.ID
+		}
+	} else {
+		_ = global.DB.Where("type = ? AND address = ? AND strategy = ?", "address", firewall.Address, firewall.Strategy).First(&data)
+		if data.ID != 0 {
+			firewall.ID = data.ID
+		}
 	}
 	return global.DB.Save(firewall).Error
 }
@@ -86,6 +69,10 @@ func (h *HostRepo) DeleteFirewallRecordByID(id uint) error {
 	return global.DB.Where("id = ?", id).Delete(&model.Firewall{}).Error
 }
 
+func (h *HostRepo) DeleteFirewallRecord(fType, port, protocol, address, strategy string) error {
+	return global.DB.Where("type = ? AND port = ? AND protocol = ? AND address = ? AND strategy = ?", fType, port, protocol, address, strategy).Delete(&model.Firewall{}).Error
+}
+
 func (u *HostRepo) GetCert(opts ...DBOption) (model.RootCert, error) {
 	var cert model.RootCert
 	db := global.DB
@@ -120,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 {
@@ -164,9 +151,3 @@ func (u *HostRepo) SyncCert(data []model.RootCert) error {
 	tx.Commit()
 	return nil
 }
-
-func (u *HostRepo) WithByChain(chain string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("chain = ?", chain)
-	}
-}

agent/app/repo/monitor.go

@@ -5,27 +5,21 @@ import (
 
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/global"
-	"gorm.io/gorm"
 )
 
 type MonitorRepo struct{}
 
 type IMonitorRepo interface {
 	GetBase(opts ...DBOption) ([]model.MonitorBase, error)
-	GetGPU(opts ...DBOption) ([]model.MonitorGPU, error)
 	GetIO(opts ...DBOption) ([]model.MonitorIO, error)
 	GetNetwork(opts ...DBOption) ([]model.MonitorNetwork, error)
 
 	CreateMonitorBase(model model.MonitorBase) error
-	BatchCreateMonitorGPU(list []model.MonitorGPU) error
 	BatchCreateMonitorIO(ioList []model.MonitorIO) error
 	BatchCreateMonitorNet(ioList []model.MonitorNetwork) error
 	DelMonitorBase(timeForDelete time.Time) error
-	DelMonitorGPU(timeForDelete time.Time) error
 	DelMonitorIO(timeForDelete time.Time) error
 	DelMonitorNet(timeForDelete time.Time) error
-
-	WithByProductName(name string) DBOption
 }
 
 func NewIMonitorRepo() IMonitorRepo {
@@ -59,22 +53,10 @@ func (u *MonitorRepo) GetNetwork(opts ...DBOption) ([]model.MonitorNetwork, erro
 	err := db.Find(&data).Error
 	return data, err
 }
-func (u *MonitorRepo) GetGPU(opts ...DBOption) ([]model.MonitorGPU, error) {
-	var data []model.MonitorGPU
-	db := global.GPUMonitorDB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&data).Error
-	return data, err
-}
 
 func (u *MonitorRepo) CreateMonitorBase(model model.MonitorBase) error {
 	return global.MonitorDB.Create(&model).Error
 }
-func (s *MonitorRepo) BatchCreateMonitorGPU(list []model.MonitorGPU) error {
-	return global.GPUMonitorDB.CreateInBatches(&list, len(list)).Error
-}
 func (u *MonitorRepo) BatchCreateMonitorIO(ioList []model.MonitorIO) error {
 	return global.MonitorDB.CreateInBatches(ioList, len(ioList)).Error
 }
@@ -90,12 +72,3 @@ func (u *MonitorRepo) DelMonitorIO(timeForDelete time.Time) error {
 func (u *MonitorRepo) DelMonitorNet(timeForDelete time.Time) error {
 	return global.MonitorDB.Where("created_at < ?", timeForDelete).Delete(&model.MonitorNetwork{}).Error
 }
-func (s *MonitorRepo) DelMonitorGPU(timeForDelete time.Time) error {
-	return global.GPUMonitorDB.Where("created_at < ?", timeForDelete).Delete(&model.MonitorGPU{}).Error
-}
-
-func (s *MonitorRepo) WithByProductName(name string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("product_name = ?", name)
-	}
-}

agent/app/repo/setting.go

@@ -2,6 +2,7 @@ package repo
 
 import (
 	"errors"
+	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/global"
@@ -18,14 +19,13 @@ type ISettingRepo interface {
 	Update(key, value string) error
 	WithByKey(key string) DBOption
 
+	CreateMonitorBase(model model.MonitorBase) error
+	BatchCreateMonitorIO(ioList []model.MonitorIO) error
+	BatchCreateMonitorNet(ioList []model.MonitorNetwork) error
+	DelMonitorBase(timeForDelete time.Time) error
+	DelMonitorIO(timeForDelete time.Time) error
+	DelMonitorNet(timeForDelete time.Time) error
 	UpdateOrCreate(key, value string) error
-
-	GetDescription(opts ...DBOption) (model.CommonDescription, error)
-	GetDescriptionList(opts ...DBOption) ([]model.CommonDescription, error)
-	CreateDescription(data *model.CommonDescription) error
-	UpdateDescription(id string, val map[string]interface{}) error
-	DelDescription(id string) error
-	WithByDescriptionID(id string) DBOption
 }
 
 func NewISettingRepo() ISettingRepo {
@@ -78,6 +78,25 @@ func (s *SettingRepo) Update(key, value string) error {
 	return global.DB.Model(&model.Setting{}).Where("key = ?", key).Updates(map[string]interface{}{"value": value}).Error
 }
 
+func (s *SettingRepo) CreateMonitorBase(model model.MonitorBase) error {
+	return global.MonitorDB.Create(&model).Error
+}
+func (s *SettingRepo) BatchCreateMonitorIO(ioList []model.MonitorIO) error {
+	return global.MonitorDB.CreateInBatches(ioList, len(ioList)).Error
+}
+func (s *SettingRepo) BatchCreateMonitorNet(ioList []model.MonitorNetwork) error {
+	return global.MonitorDB.CreateInBatches(ioList, len(ioList)).Error
+}
+func (s *SettingRepo) DelMonitorBase(timeForDelete time.Time) error {
+	return global.MonitorDB.Where("created_at < ?", timeForDelete).Delete(&model.MonitorBase{}).Error
+}
+func (s *SettingRepo) DelMonitorIO(timeForDelete time.Time) error {
+	return global.MonitorDB.Where("created_at < ?", timeForDelete).Delete(&model.MonitorIO{}).Error
+}
+func (s *SettingRepo) DelMonitorNet(timeForDelete time.Time) error {
+	return global.MonitorDB.Where("created_at < ?", timeForDelete).Delete(&model.MonitorNetwork{}).Error
+}
+
 func (s *SettingRepo) UpdateOrCreate(key, value string) error {
 	var setting model.Setting
 	result := global.DB.Where("key = ?", key).First(&setting)
@@ -89,36 +108,3 @@ func (s *SettingRepo) UpdateOrCreate(key, value string) error {
 	}
 	return global.DB.Model(&setting).UpdateColumn("value", value).Error
 }
-
-func (s *SettingRepo) GetDescriptionList(opts ...DBOption) ([]model.CommonDescription, error) {
-	var lists []model.CommonDescription
-	db := global.DB.Model(&model.CommonDescription{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&lists).Error
-	return lists, err
-}
-func (s *SettingRepo) GetDescription(opts ...DBOption) (model.CommonDescription, error) {
-	var data model.CommonDescription
-	db := global.DB.Model(&model.CommonDescription{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&data).Error
-	return data, err
-}
-func (s *SettingRepo) CreateDescription(data *model.CommonDescription) error {
-	return global.DB.Create(data).Error
-}
-func (s *SettingRepo) UpdateDescription(id string, val map[string]interface{}) error {
-	return global.DB.Model(&model.CommonDescription{}).Where("id = ?", id).Updates(val).Error
-}
-func (s *SettingRepo) DelDescription(id string) error {
-	return global.DB.Where("id = ?", id).Delete(&model.CommonDescription{}).Error
-}
-func (s *SettingRepo) WithByDescriptionID(id string) 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/service/ai.go

@@ -134,8 +134,9 @@ func (u *AIToolService) Close(name string) error {
 	if err != nil {
 		return err
 	}
-	if err := cmd.RunDefaultBashCf("docker exec %s ollama stop %s", containerName, name); err != nil {
-		return fmt.Errorf("handle ollama stop %s failed, %v", name, err)
+	stdout, err := cmd.RunDefaultWithStdoutBashCf("docker exec %s ollama stop %s", containerName, name)
+	if err != nil {
+		return fmt.Errorf("handle ollama stop %s failed, stdout: %s, err: %v", name, stdout, err)
 	}
 	return nil
 }
@@ -192,8 +193,9 @@ func (u *AIToolService) Delete(req dto.ForceDelete) error {
 	}
 	for _, item := range ollamaList {
 		if item.Status != constant.StatusDeleted {
-			if err := cmd.RunDefaultBashCf("docker exec %s ollama rm %s", containerName, item.Name); err != nil && !req.ForceDelete {
-				return fmt.Errorf("handle ollama rm %s failed, %v", item.Name, err)
+			stdout, err := cmd.RunDefaultWithStdoutBashCf("docker exec %s ollama rm %s", containerName, item.Name)
+			if err != nil && !req.ForceDelete {
+				return fmt.Errorf("handle ollama rm %s failed, stdout: %s, err: %v", item.Name, stdout, err)
 			}
 		}
 		_ = aiRepo.Delete(repo.WithByID(item.ID))

agent/app/service/alert.go

@@ -479,17 +479,12 @@ 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,
-		Sender:     req.Sender,
-		Username:   username,
+		Username:   req.Sender,
 		Password:   req.Password,
-		From:       fmt.Sprintf(`"%s" <%s>`, req.DisplayName, req.Sender),
+		From:       fmt.Sprintf("%s <%s>", req.DisplayName, req.Sender),
 		Encryption: req.Encryption,
 		Recipient:  req.Recipient,
 	}

agent/app/service/alert_helper.go

@@ -9,7 +9,6 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/global"
 	alertUtil "github.com/1Panel-dev/1Panel/agent/utils/alert"
 	"github.com/1Panel-dev/1Panel/agent/utils/common"
-	"github.com/1Panel-dev/1Panel/agent/utils/psutil"
 	versionUtil "github.com/1Panel-dev/1Panel/agent/utils/version"
 	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
 	"github.com/shirou/gopsutil/v4/cpu"
@@ -353,7 +352,7 @@ func loadLoadInfo(alert dto.AlertDTO) {
 		return
 	}
 	var loadValue float64
-	CPUTotal, _ := psutil.CPUInfo.GetLogicalCores(false)
+	CPUTotal, _ := cpu.Counts(true)
 	switch alert.Cycle {
 	case 1:
 		loadValue = avgStat.Load1 / (float64(CPUTotal*2) * 0.75) * 100
@@ -580,11 +579,7 @@ func sendAlerts(alert dto.AlertDTO, alertType, quota, quotaType string, params [
 					AlertId: alert.ID,
 					Count:   todayCount + 1,
 				}
-				alertErr := xpack.CreateSMSAlertLog(alertType, alert, create, quotaType, params, constant.SMS)
-				if alertErr != nil {
-					global.LOG.Infof("%s alert sms push faild, err: %v", alertType, alertErr.Error())
-					continue
-				}
+				_ = xpack.CreateSMSAlertLog(alertType, alert, create, quotaType, params, constant.SMS)
 				alertUtil.CreateNewAlertTask(quota, alertType, quotaType, constant.SMS)
 				global.LOG.Infof("%s alert sms push successful", alertType)
 
@@ -603,12 +598,7 @@ func sendAlerts(alert dto.AlertDTO, alertType, quota, quotaType string, params [
 				create.AlertRule = alertUtil.ProcessAlertRule(alert)
 				create.AlertDetail = alertUtil.ProcessAlertDetail(alertInfo, quotaType, params, constant.Email)
 				transport := xpack.LoadRequestTransport()
-				agentInfo, _ := xpack.GetAgentInfo()
-				alertErr := alertUtil.CreateEmailAlertLog(create, alertInfo, params, transport, agentInfo)
-				if alertErr != nil {
-					global.LOG.Infof("%s alert email push faild, err: %v", alertType, alertErr.Error())
-					continue
-				}
+				_ = alertUtil.CreateEmailAlertLog(create, alertInfo, params, transport)
 				alertUtil.CreateNewAlertTask(quota, alertType, quotaType, constant.Email)
 				global.LOG.Infof("%s alert email push successful", alertType)
 			}
@@ -849,7 +839,7 @@ func processSingleDisk(alert dto.AlertDTO) error {
 }
 
 func checkAndCreateDiskAlert(alert dto.AlertDTO, path string) (bool, error) {
-	usageStat, err := psutil.DISK.GetUsage(path, false)
+	usageStat, err := disk.Usage(path)
 	if err != nil {
 		global.LOG.Errorf("error getting disk usage for %s, err: %v", path, err)
 		return false, err

agent/app/service/alert_sender.go

@@ -85,8 +85,7 @@ func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
 	}
 
 	transport := xpack.LoadRequestTransport()
-	agentInfo, _ := xpack.GetAgentInfo()
-	_ = alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo)
+	_ = 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)
 }
@@ -132,8 +131,7 @@ func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
 	}
 
 	transport := xpack.LoadRequestTransport()
-	agentInfo, _ := xpack.GetAgentInfo()
-	if err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo); err != nil {
+	if err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport); err != nil {
 		global.LOG.Errorf("failed to send Email alert: %v", err)
 		return
 	}

agent/app/service/app.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"path"
 	"path/filepath"
 	"reflect"
 	"strconv"
@@ -37,7 +36,7 @@ type AppService struct {
 }
 
 type IAppService interface {
-	PageApp(ctx *gin.Context, req request.AppSearch) (*response.AppRes, error)
+	PageApp(ctx *gin.Context, req request.AppSearch) (interface{}, error)
 	GetAppTags(ctx *gin.Context) ([]response.TagDTO, error)
 	GetApp(ctx *gin.Context, key string) (*response.AppDTO, error)
 	GetAppDetail(appId uint, version, appType string) (response.AppDetailDTO, error)
@@ -46,15 +45,13 @@ type IAppService interface {
 	GetAppUpdate() (*response.AppUpdateRes, error)
 	GetAppDetailByID(id uint) (*response.AppDetailDTO, error)
 	SyncAppListFromLocal(taskID string)
-	GetAppIcon(key string) ([]byte, error)
-	GetAppDetailByKey(appKey, version string) (response.AppDetailSimpleDTO, error)
 }
 
 func NewIAppService() IAppService {
 	return &AppService{}
 }
 
-func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.AppRes, error) {
+func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{}, error) {
 	var opts []repo.DBOption
 	opts = append(opts, appRepo.OrderByRecommend())
 	if req.Name != "" {
@@ -75,11 +72,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.
 		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)
@@ -100,7 +93,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.
 		}
 		opts = append(opts, repo.WithByIDs(appIds))
 	}
-	res := &response.AppRes{}
+	var res response.AppRes
 
 	total, apps, err := appRepo.Page(req.Page, req.PageSize, opts...)
 	if err != nil {
@@ -114,29 +107,30 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.
 	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
 			}
 		}
 		appDTO := &response.AppItem{
-			ID:                  ap.ID,
-			Name:                ap.Name,
-			Key:                 ap.Key,
-			Limit:               ap.Limit,
-			GpuSupport:          ap.GpuSupport,
-			Recommend:           ap.Recommend,
-			Description:         ap.GetDescription(ctx),
-			Type:                ap.Type,
-			BatchInstallSupport: ap.BatchInstallSupport,
+			ID:          ap.ID,
+			Name:        ap.Name,
+			Key:         ap.Key,
+			Type:        ap.Type,
+			Icon:        ap.Icon,
+			Resource:    ap.Resource,
+			Limit:       ap.Limit,
+			Website:     ap.Website,
+			Github:      ap.Github,
+			GpuSupport:  ap.GpuSupport,
+			Recommend:   ap.Recommend,
+			Description: ap.GetDescription(ctx),
 		}
 		appDTOs = append(appDTOs, appDTO)
 		tags, err := getAppTags(ap.ID, lang)
 		if err != nil {
 			continue
 		}
-		for _, tag := range tags {
-			appDTO.Tags = append(appDTO.Tags, tag.Name)
-		}
+		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
@@ -196,7 +190,24 @@ func (a AppService) GetApp(ctx *gin.Context, key string) (*response.AppDTO, erro
 	if err != nil {
 		return nil, err
 	}
-	appDTO.Versions = getAppVersions(key, details)
+	var versionsRaw []string
+	hasLatest := false
+	latestVersion := ""
+	for _, detail := range details {
+		if strings.Contains(detail.Version, "latest") {
+			hasLatest = true
+			latestVersion = detail.Version
+			continue
+		}
+		if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") {
+			continue
+		}
+		versionsRaw = append(versionsRaw, detail.Version)
+	}
+	appDTO.Versions = common.GetSortedVersions(versionsRaw)
+	if hasLatest {
+		appDTO.Versions = append([]string{latestVersion}, appDTO.Versions...)
+	}
 	tags, err := getAppTags(app.ID, strings.ToLower(common.GetLang(ctx)))
 	if err != nil {
 		return nil, err
@@ -205,20 +216,6 @@ func (a AppService) GetApp(ctx *gin.Context, key string) (*response.AppDTO, erro
 	return &appDTO, nil
 }
 
-func (a AppService) GetAppDetailByKey(appKey, version string) (response.AppDetailSimpleDTO, error) {
-	var appDetailDTO response.AppDetailSimpleDTO
-	app, err := appRepo.GetFirst(appRepo.WithKey(appKey))
-	if err != nil {
-		return appDetailDTO, err
-	}
-	appDetail, err := appDetailRepo.GetFirst(appDetailRepo.WithAppId(app.ID), appDetailRepo.WithVersion(version))
-	if err != nil {
-		return appDetailDTO, err
-	}
-	appDetailDTO.ID = appDetail.ID
-	return appDetailDTO, nil
-}
-
 func (a AppService) GetAppDetail(appID uint, version, appType string) (response.AppDetailDTO, error) {
 	var (
 		appDetailDTO response.AppDetailDTO
@@ -402,21 +399,11 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 		App:         app,
 	}
 	composeMap := make(map[string]interface{})
-	var composeRes []byte
 	if req.EditCompose {
 		if err = yaml.Unmarshal([]byte(req.DockerCompose), &composeMap); err != nil {
 			return
 		}
 	} else {
-		if appDetail.DockerCompose == "" {
-			dockerComposeUrl := fmt.Sprintf("%s/%s/1panel/%s/%s/docker-compose.yml", global.CONF.RemoteURL.AppRepo, global.CONF.Base.Mode, app.Key, appDetail.Version)
-			_, composeRes, err = req_helper.HandleRequest(dockerComposeUrl, http.MethodGet, constant.TimeOut20s)
-			if err != nil {
-				return
-			}
-			appDetail.DockerCompose = string(composeRes)
-			_ = appDetailRepo.Update(context.Background(), appDetail)
-		}
 		if err = yaml.Unmarshal([]byte(appDetail.DockerCompose), &composeMap); err != nil {
 			return
 		}
@@ -458,11 +445,10 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 		}
 		index++
 	}
-	newServiceName := strings.ToLower(appInstall.Name)
-	if app.Limit == 0 && newServiceName != serviceName && len(servicesMap) == 1 {
-		servicesMap[newServiceName] = servicesMap[serviceName]
+	if app.Limit == 0 && appInstall.Name != serviceName && len(servicesMap) == 1 {
+		servicesMap[appInstall.Name] = servicesMap[serviceName]
 		delete(servicesMap, serviceName)
-		serviceName = newServiceName
+		serviceName = appInstall.Name
 	}
 	appInstall.ServiceName = serviceName
 
@@ -494,15 +480,6 @@ func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.App
 		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
@@ -802,11 +779,6 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
 	res := &response.AppUpdateRes{
 		CanUpdate: false,
 	}
-	mysql, _ := appRepo.GetFirst(appRepo.WithKey("mysql"))
-	if !mysql.BatchInstallSupport {
-		res.CanUpdate = true
-		return res, nil
-	}
 
 	versionUrl := fmt.Sprintf("%s/%s/1panel.json.version.txt", global.CONF.RemoteURL.AppRepo, global.CONF.Base.Mode)
 	_, versionRes, err := req_helper.HandleRequest(versionUrl, http.MethodGet, constant.TimeOut20s)
@@ -877,15 +849,13 @@ func getAppList() (*dto.AppList, error) {
 		return nil, err
 	}
 	listFile := filepath.Join(global.Dir.ResourceDir, "1panel.json")
-	file, err := os.Open(listFile)
+	content, err := os.ReadFile(listFile)
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
-	if err = json.NewDecoder(file).Decode(list); err != nil {
+	if err = json.Unmarshal(content, list); err != nil {
 		return nil, err
 	}
-
 	return list, nil
 }
 
@@ -1168,7 +1138,7 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
 	}, nil)
 
 	go func() {
-		if err := syncTask.Execute(); err != nil {
+		if err = syncTask.Execute(); err != nil {
 			_ = NewISettingService().Update("AppStoreLastModified", "0")
 			_ = NewISettingService().Update("AppStoreSyncStatus", constant.StatusError)
 		}
@@ -1176,15 +1146,3 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
 
 	return nil
 }
-
-func (a AppService) GetAppIcon(key string) ([]byte, error) {
-	app, err := appRepo.GetFirst(appRepo.WithKey(key))
-	if err != nil {
-		return nil, err
-	}
-	iconBytes, err := base64.StdEncoding.DecodeString(app.Icon)
-	if err != nil {
-		return nil, err
-	}
-	return iconBytes, nil
-}

agent/app/service/app_install.go

@@ -515,7 +515,6 @@ func (a *AppInstallService) GetServices(key string) ([]response.AppService, erro
 			} else {
 				service.From = constant.AppResourceRemote
 				service.Status = constant.StatusRunning
-				service.Config = map[string]string{"PANEL_DB_ROOT_PASSWORD": db.Password, "PANEL_DB_ROOT_USER": db.Username}
 			}
 			res = append(res, service)
 		}
@@ -797,9 +796,6 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 	res.RestartPolicy = getRestartPolicy(install.DockerCompose)
 	res.WebUI = install.WebUI
 	res.Type = install.App.Type
-	if rawCompose, err := getUpgradeCompose(install, detail); err == nil {
-		res.RawCompose = rawCompose
-	}
 	return &res, nil
 }
 
@@ -944,26 +940,8 @@ func (a *AppInstallService) GetAppInstallInfo(installID uint) (*response.AppInst
 		HttpPort:    appInstall.HttpPort,
 		Status:      appInstall.Status,
 		Message:     appInstall.Message,
-		AppKey:      appInstall.App.Key,
 		Env:         envMap,
 		ComposePath: appInstall.GetComposePath(),
 	}
-	for k, v := range envMap {
-		if strings.Contains(strings.ToUpper(k), "PANEL_APP_PORT") {
-			var port int
-			switch val := v.(type) {
-			case int:
-				port = val
-			case string:
-				port, err = strconv.Atoi(val)
-				if err != nil {
-					continue
-				}
-			default:
-				continue
-			}
-			res.AppPorts = append(res.AppPorts, port)
-		}
-	}
 	return res, nil
 }

agent/app/service/app_utils.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"log"
 	"maps"
 	"math"
 	"net/http"
@@ -14,6 +15,7 @@ import (
 	"path"
 	"path/filepath"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -38,13 +40,11 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/utils/files"
 	"github.com/1Panel-dev/1Panel/agent/utils/nginx"
 	"github.com/1Panel-dev/1Panel/agent/utils/nginx/parser"
-	"github.com/1Panel-dev/1Panel/agent/utils/re"
 	"github.com/1Panel-dev/1Panel/agent/utils/req_helper"
 	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/subosito/gotenv"
 	"gopkg.in/yaml.v3"
 )
@@ -134,76 +134,6 @@ var ToolKeys = map[string]uint{
 	"minio": 9001,
 }
 
-func CreateDB(ctx context.Context, app model.App, appInstall *model.AppInstall, params map[string]interface{}) error {
-	database := &model.Database{
-		AppInstallID: appInstall.ID,
-		Name:         appInstall.Name,
-		Type:         app.Key,
-		Version:      appInstall.Version,
-		From:         "local",
-		Address:      appInstall.ServiceName,
-		Port:         DatabaseKeys[app.Key],
-	}
-	detail, err := appDetailRepo.GetFirst(repo.WithByID(appInstall.AppDetailId))
-	if err != nil {
-		return err
-	}
-	formFields := &dto.AppForm{}
-	if err := json.Unmarshal([]byte(detail.Params), formFields); err != nil {
-		return err
-	}
-	for _, form := range formFields.FormFields {
-		if form.EnvKey == "PANEL_APP_PORT_HTTP" {
-			portFloat, ok := form.Default.(float64)
-			if ok {
-				database.Port = uint(int(portFloat))
-			}
-			break
-		}
-	}
-
-	switch app.Key {
-	case constant.AppMysql, constant.AppMariaDB, constant.AppPostgresql, constant.AppMongodb, constant.AppMysqlCluster, constant.AppPostgresqlCluster:
-		if password, ok := params["PANEL_DB_ROOT_PASSWORD"]; ok {
-			if password != "" {
-				database.Password = password.(string)
-				if app.Key == "mysql" || app.Key == "mariadb" || app.Key == constant.AppMysqlCluster {
-					database.Username = "root"
-				}
-				if rootUser, ok := params["PANEL_DB_ROOT_USER"]; ok {
-					database.Username = rootUser.(string)
-				}
-				authParam := dto.AuthParam{
-					RootPassword: password.(string),
-					RootUser:     database.Username,
-				}
-				authByte, err := json.Marshal(authParam)
-				if err != nil {
-					return err
-				}
-				appInstall.Param = string(authByte)
-
-			}
-		}
-	case constant.AppRedis, constant.AppRedisCluster:
-		if password, ok := params["PANEL_REDIS_ROOT_PASSWORD"]; ok {
-			authParam := dto.RedisAuthParam{
-				RootPassword: "",
-			}
-			if password != "" {
-				authParam.RootPassword = password.(string)
-				database.Password = password.(string)
-			}
-			authByte, err := json.Marshal(authParam)
-			if err != nil {
-				return err
-			}
-			appInstall.Param = string(authByte)
-		}
-	}
-	return databaseRepo.Create(ctx, database)
-}
-
 func createLink(ctx context.Context, installTask *task.Task, app model.App, appInstall *model.AppInstall, params map[string]interface{}) error {
 	deleteAppLink := func(t *task.Task) {
 		del := dto.DelAppLink{
@@ -215,7 +145,74 @@ func createLink(ctx context.Context, installTask *task.Task, app model.App, appI
 	}
 	if DatabaseKeys[app.Key] > 0 {
 		handleDataBaseApp := func(task *task.Task) error {
-			return CreateDB(ctx, app, appInstall, params)
+			database := &model.Database{
+				AppInstallID: appInstall.ID,
+				Name:         appInstall.Name,
+				Type:         app.Key,
+				Version:      appInstall.Version,
+				From:         "local",
+				Address:      appInstall.ServiceName,
+				Port:         DatabaseKeys[app.Key],
+			}
+			detail, err := appDetailRepo.GetFirst(repo.WithByID(appInstall.AppDetailId))
+			if err != nil {
+				return err
+			}
+
+			formFields := &dto.AppForm{}
+			if err := json.Unmarshal([]byte(detail.Params), formFields); err != nil {
+				return err
+			}
+			for _, form := range formFields.FormFields {
+				if form.EnvKey == "PANEL_APP_PORT_HTTP" {
+					portFloat, ok := form.Default.(float64)
+					if ok {
+						database.Port = uint(int(portFloat))
+					}
+					break
+				}
+			}
+
+			switch app.Key {
+			case constant.AppMysql, constant.AppMariaDB, constant.AppPostgresql, constant.AppMongodb, constant.AppMysqlCluster, constant.AppPostgresqlCluster:
+				if password, ok := params["PANEL_DB_ROOT_PASSWORD"]; ok {
+					if password != "" {
+						database.Password = password.(string)
+						if app.Key == "mysql" || app.Key == "mariadb" || app.Key == constant.AppMysqlCluster {
+							database.Username = "root"
+						}
+						if rootUser, ok := params["PANEL_DB_ROOT_USER"]; ok {
+							database.Username = rootUser.(string)
+						}
+						authParam := dto.AuthParam{
+							RootPassword: password.(string),
+							RootUser:     database.Username,
+						}
+						authByte, err := json.Marshal(authParam)
+						if err != nil {
+							return err
+						}
+						appInstall.Param = string(authByte)
+
+					}
+				}
+			case constant.AppRedis, constant.AppRedisCluster:
+				if password, ok := params["PANEL_REDIS_ROOT_PASSWORD"]; ok {
+					authParam := dto.RedisAuthParam{
+						RootPassword: "",
+					}
+					if password != "" {
+						authParam.RootPassword = password.(string)
+						database.Password = password.(string)
+					}
+					authByte, err := json.Marshal(authParam)
+					if err != nil {
+						return err
+					}
+					appInstall.Param = string(authByte)
+				}
+			}
+			return databaseRepo.Create(ctx, database)
 		}
 		installTask.AddSubTask(i18n.GetMsgByKey("HandleDatabaseApp"), handleDataBaseApp, deleteAppLink)
 	}
@@ -300,11 +297,10 @@ func createLink(ctx context.Context, installTask *task.Task, app model.App, appI
 						createMysql.Name = dbConfig.DbName
 						createMysql.Username = dbConfig.DbUser
 						createMysql.Database = database.Name
-						createMysql.Format = dbConfig.Format
+						createMysql.Format = "utf8mb4"
 						createMysql.Permission = "%"
 						createMysql.Password = dbConfig.Password
 						createMysql.From = database.From
-						createMysql.Collation = dbConfig.Collation
 						mysqldb, err := NewIMysqlService().Create(ctx, createMysql)
 						if err != nil {
 							return err
@@ -541,18 +537,8 @@ func handleUpgradeCompose(install model.AppInstall, detail model.AppDetail) (map
 	if !ok || oldValue == nil {
 		return nil, buserr.New("ErrFileParse")
 	}
-	oldValueMap, ok := oldValue.(map[string]interface{})
-	if !ok {
-		return nil, buserr.New("ErrFileParse")
-	}
-	oldServiceValueInterface, ok := oldValueMap[install.ServiceName]
-	if !ok || oldServiceValueInterface == nil {
-		return nil, buserr.New("ErrFileParse")
-	}
-	oldServiceValue, ok := oldServiceValueInterface.(map[string]interface{})
-	if !ok {
-		return nil, buserr.New("ErrFileParse")
-	}
+	oldValueMap := oldValue.(map[string]interface{})
+	oldServiceValue := oldValueMap[install.ServiceName].(map[string]interface{})
 	if oldServiceValue["deploy"] != nil {
 		serviceValue["deploy"] = oldServiceValue["deploy"]
 	}
@@ -691,29 +677,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()
@@ -959,8 +945,8 @@ func handleMap(params map[string]interface{}, envParams map[string]string) {
 	}
 }
 
-func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.AppInstall, logger *logrus.Logger) (err error) {
-	if app.IsLocalApp() || app.IsCustomApp() {
+func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.AppInstall, logger *log.Logger) (err error) {
+	if app.IsLocalApp() {
 		return nil
 	}
 	appResourceDir := path.Join(global.Dir.AppResourceDir, app.Resource)
@@ -1096,7 +1082,11 @@ 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))
-	if err := cmdMgr.RunBashC(scriptPath); err != nil {
+	out, err := cmdMgr.RunWithStdoutBashC(scriptPath)
+	if err != nil {
+		if out != "" {
+			err = errors.New(out)
+		}
 		task.LogFailedWithErr(logStr, err)
 		return err
 	}
@@ -1173,11 +1163,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"))
 				}
@@ -1312,7 +1298,6 @@ func getApps(oldApps []model.App, items []dto.AppDefine, systemVersion string, t
 		app.MemoryRequired = config.MemoryRequired
 		app.Architectures = strings.Join(config.Architectures, ",")
 		app.GpuSupport = config.GpuSupport
-		app.BatchInstallSupport = config.BatchInstallSupport
 		apps[key] = app
 	}
 	return apps
@@ -1424,9 +1409,6 @@ func handleLocalApp(appDir string) (app *model.App, err error) {
 	desc, _ := json.Marshal(appDefine.Description)
 	app.Description = string(desc)
 	app.Key = "local" + appDefine.Key
-	app.Architectures = strings.Join(appDefine.Architectures, ",")
-	app.GpuSupport = appDefine.GpuSupport
-	app.MemoryRequired = appDefine.MemoryRequired
 
 	app.Resource = constant.AppResourceLocal
 	app.Status = constant.AppNormal
@@ -1568,6 +1550,7 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
 			Message:     installed.Message,
 			HttpPort:    installed.HttpPort,
 			HttpsPort:   installed.HttpsPort,
+			Icon:        installed.App.Icon,
 			AppName:     installed.App.Name,
 			AppKey:      installed.App.Key,
 			AppType:     installed.App.Type,
@@ -1579,41 +1562,41 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
 				Website:  installed.App.Website,
 				Document: installed.App.Document,
 			},
-			Favorite:    installed.Favorite,
-			Container:   installed.ContainerName,
-			ServiceName: strings.ToLower(installed.ServiceName),
+			Favorite:  installed.Favorite,
+			Container: installed.ContainerName,
 		}
-		if !updated {
-			installDTO.LinkDB = hasLinkDB(installed.ID)
-			res = append(res, installDTO)
-			continue
+		if updated {
+			installDTO.DockerCompose = installed.DockerCompose
 		}
-		if installed.Version == "latest" {
-			continue
+		app, err := appRepo.GetFirst(repo.WithByID(installed.AppId))
+		if err != nil {
+			return nil, err
 		}
-		installDTO.DockerCompose = installed.DockerCompose
-		installDTO.IsEdit = isEditCompose(installed)
-		details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(installed.App.ID))
+		details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(app.ID))
 		if err != nil {
 			return nil, err
 		}
 		var versions []string
-		for _, appDetail := range details {
-			ignores, _ := appIgnoreUpgradeRepo.List(runtimeRepo.WithDetailId(appDetail.ID), appIgnoreUpgradeRepo.WithScope("version"))
-			if len(ignores) > 0 {
+		for _, detail := range details {
+			ignores, _ := appIgnoreUpgradeRepo.List(runtimeRepo.WithDetailId(detail.ID), appIgnoreUpgradeRepo.WithScope("version"))
+			if len(ignores) > 0 || installed.Version == "latest" {
 				continue
 			}
-			if common.IsCrossVersion(installed.Version, appDetail.Version) && !installed.App.CrossVersionUpdate {
+			if common.IsCrossVersion(installed.Version, detail.Version) && !app.CrossVersionUpdate {
 				continue
 			}
-			versions = append(versions, appDetail.Version)
-		}
-		if len(versions) == 0 {
-			continue
+			versions = append(versions, detail.Version)
 		}
 		versions = common.GetSortedVersions(versions)
+		if len(versions) == 0 {
+			if !updated {
+				installDTO.CanUpdate = false
+				res = append(res, installDTO)
+			}
+			continue
+		}
 		lastVersion := versions[0]
-		if installed.App.Key == constant.AppMysql || installed.App.Key == constant.AppMysqlCluster {
+		if app.Key == constant.AppMysql || app.Key == constant.AppMysqlCluster {
 			for _, version := range versions {
 				majorVersion := getMajorVersion(installed.Version)
 				if !strings.HasPrefix(version, majorVersion) {
@@ -1625,11 +1608,15 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
 			}
 		}
 		if common.IsCrossVersion(installed.Version, lastVersion) {
-			installDTO.CanUpdate = installed.App.CrossVersionUpdate
+			installDTO.CanUpdate = app.CrossVersionUpdate
 		} else {
 			installDTO.CanUpdate = common.CompareVersion(lastVersion, installed.Version)
 		}
-		if installDTO.CanUpdate {
+		if updated {
+			if installDTO.CanUpdate {
+				res = append(res, installDTO)
+			}
+		} else {
 			res = append(res, installDTO)
 		}
 	}
@@ -1833,7 +1820,8 @@ func getAppCommonConfig(envs map[string]interface{}) request.AppContainerConfig
 		config.CpuQuota = 0
 	}
 	if memLimit, ok := envs[constant.MemoryLimit]; ok {
-		matches := re.GetRegex(re.NumberAlphaPattern).FindStringSubmatch(memLimit.(string))
+		re := regexp.MustCompile(`(\d+)([A-Za-z]+)`)
+		matches := re.FindStringSubmatch(memLimit.(string))
 		if len(matches) == 3 {
 			num, err := strconv.ParseFloat(matches[1], 64)
 			if err == nil {
@@ -2007,7 +1995,7 @@ func handleOpenrestyFile(appInstall *model.AppInstall) error {
 			break
 		}
 	}
-	if err := handleSSLConfig(appInstall, hasDefaultWebsite, true); err != nil {
+	if err := handleSSLConfig(appInstall, hasDefaultWebsite); err != nil {
 		return err
 	}
 	if len(websites) == 0 {
@@ -2036,37 +2024,34 @@ func handleDefaultServer(appInstall *model.AppInstall) error {
 	return nil
 }
 
-func handleSSLConfig(appInstall *model.AppInstall, hasDefaultWebsite bool, sslRejectHandshake bool) error {
+func handleSSLConfig(appInstall *model.AppInstall, hasDefaultWebsite bool) error {
 	sslDir := path.Join(appInstall.GetPath(), "conf", "ssl")
 	fileOp := files.NewFileOp()
 	if !fileOp.Stat(sslDir) {
 		return errors.New("ssl dir not found")
 	}
-	hasDefaultSSL := fileOp.Stat(path.Join(sslDir, "fullchain.pem")) && fileOp.Stat(path.Join(sslDir, "privkey.pem")) && fileOp.Stat(path.Join(sslDir, "root_ssl.conf"))
-	if !hasDefaultSSL {
-		ca, _ := websiteCARepo.GetFirst(repo.WithByName("1Panel"))
-		if ca.ID == 0 {
-			global.LOG.Errorf("create openresty default ssl failed ca not found")
-			return nil
-		}
-		caService := NewIWebsiteCAService()
-		caRequest := request.WebsiteCAObtain{
-			ID:      ca.ID,
-			Domains: "localhost",
-			KeyType: "4096",
-			Time:    99,
-			Unit:    "year",
-			Dir:     sslDir,
-			PushDir: true,
-		}
-		websiteSSL, err := caService.ObtainSSL(caRequest)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			_ = NewIWebsiteSSLService().Delete([]uint{websiteSSL.ID})
-		}()
+	ca, _ := websiteCARepo.GetFirst(repo.WithByName("1Panel"))
+	if ca.ID == 0 {
+		global.LOG.Errorf("create openresty default ssl failed ca not found")
+		return nil
 	}
+	caService := NewIWebsiteCAService()
+	caRequest := request.WebsiteCAObtain{
+		ID:      ca.ID,
+		Domains: "localhost",
+		KeyType: "4096",
+		Time:    99,
+		Unit:    "year",
+		Dir:     sslDir,
+		PushDir: true,
+	}
+	websiteSSL, err := caService.ObtainSSL(caRequest)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = NewIWebsiteSSLService().Delete([]uint{websiteSSL.ID})
+	}()
 	defaultConfigPath := path.Join(appInstall.GetPath(), "conf", "default", "00.default.conf")
 	content, err := os.ReadFile(defaultConfigPath)
 	if err != nil {
@@ -2078,14 +2063,9 @@ func handleSSLConfig(appInstall *model.AppInstall, hasDefaultWebsite bool, sslRe
 	}
 	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 sslRejectHandshake {
-		defaultServer.UpdateDirective("ssl_reject_handshake", []string{"on"})
-	} else {
-		defaultServer.RemoveDirective("ssl_reject_handshake", []string{})
-	}
 	if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil {
 		return err
 	}
@@ -2147,56 +2127,3 @@ func needsUpdate(localTag *model.Tag, remoteTag dto.Tag, translations string) bo
 		localTag.Sort != remoteTag.Sort ||
 		localTag.Translations != translations
 }
-
-func hasLinkDB(installID uint) bool {
-	resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(installID))
-	hasDB := false
-	if len(resources) > 0 {
-		for _, resource := range resources {
-			if resource.Key == constant.AppPostgres || resource.Key == constant.AppMysql ||
-				resource.Key == constant.AppMariaDB || resource.Key == constant.AppMysqlCluster ||
-				resource.Key == constant.AppPostgresql || resource.Key == constant.AppPostgresqlCluster {
-				hasDB = true
-				break
-			}
-		}
-	}
-	return hasDB
-}
-
-func isEditCompose(installed model.AppInstall) bool {
-	detail, _ := appDetailRepo.GetFirst(repo.WithByID(installed.AppDetailId))
-	rawCompose, err := getUpgradeCompose(installed, detail)
-	if rawCompose == "" || err != nil {
-		return false
-	}
-	if rawCompose != installed.DockerCompose {
-		return true
-	}
-	return false
-}
-
-func getAppVersions(key string, details []model.AppDetail) []string {
-	var (
-		versionsRaw []string
-		versions    []string
-	)
-	hasLatest := false
-	latestVersion := ""
-	for _, detail := range details {
-		if key != "mssql" && strings.Contains(detail.Version, "latest") {
-			hasLatest = true
-			latestVersion = detail.Version
-			continue
-		}
-		if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") {
-			continue
-		}
-		versionsRaw = append(versionsRaw, detail.Version)
-	}
-	versions = common.GetSortedVersions(versionsRaw)
-	if hasLatest {
-		versions = append([]string{latestVersion}, versions...)
-	}
-	return versions
-}

agent/app/service/backup.go

@@ -34,7 +34,6 @@ type IBackupService interface {
 	LoadBackupOptions() ([]dto.BackupOption, error)
 	SearchWithPage(search dto.SearchPageWithType) (int64, interface{}, error)
 	Create(backupDto dto.BackupOperate) error
-	CheckConn(req dto.BackupOperate) dto.BackupCheckRes
 	GetBuckets(backupDto dto.ForBuckets) ([]interface{}, error)
 	Update(req dto.BackupOperate) error
 	Delete(id uint) error
@@ -124,43 +123,6 @@ func (u *BackupService) SearchWithPage(req dto.SearchPageWithType) (int64, inter
 	return count, data, nil
 }
 
-func (u *BackupService) CheckConn(req dto.BackupOperate) dto.BackupCheckRes {
-	var res dto.BackupCheckRes
-	var backup model.BackupAccount
-	if err := copier.Copy(&backup, &req); err != nil {
-		res.Msg = i18n.GetMsgWithDetail("ErrStructTransform", err.Error())
-		return res
-	}
-	itemAccessKey, err := base64.StdEncoding.DecodeString(backup.AccessKey)
-	if err != nil {
-		res.Msg = err.Error()
-		return res
-	}
-	backup.AccessKey = string(itemAccessKey)
-	itemCredential, err := base64.StdEncoding.DecodeString(backup.Credential)
-	if err != nil {
-		res.Msg = err.Error()
-		return res
-	}
-	backup.Credential = string(itemCredential)
-
-	if req.Type == constant.OneDrive || req.Type == constant.GoogleDrive {
-		refreshToken, err := loadRefreshTokenByCode(&backup)
-		if err != nil {
-			res.Msg = err.Error()
-			return res
-		}
-		res.Token = base64.StdEncoding.EncodeToString([]byte(refreshToken))
-	}
-	isOk, err := u.checkBackupConn(&backup)
-	if err != nil {
-		res.Msg = err.Error()
-		return res
-	}
-	res.IsOk = isOk
-	return res
-}
-
 func (u *BackupService) Create(req dto.BackupOperate) error {
 	if req.Type == constant.Local {
 		return buserr.New("ErrBackupLocalCreate")
@@ -185,6 +147,19 @@ func (u *BackupService) Create(req dto.BackupOperate) error {
 		return err
 	}
 	backup.Credential = string(itemCredential)
+
+	if req.Type == constant.OneDrive || req.Type == constant.GoogleDrive || req.Type == constant.ALIYUN {
+		if err := loadRefreshTokenByCode(&backup); err != nil {
+			return err
+		}
+	}
+	if req.Type != constant.Local {
+		isOk, err := u.checkBackupConn(&backup)
+		if err != nil || !isOk {
+			return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
+		}
+	}
+
 	backup.AccessKey, err = encrypt.StringEncrypt(backup.AccessKey)
 	if err != nil {
 		return err
@@ -273,7 +248,16 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 		global.Dir.LocalBackupDir = newBackup.BackupPath
 	}
 
+	if newBackup.Type == constant.OneDrive || newBackup.Type == constant.GoogleDrive || newBackup.Type == constant.ALIYUN {
+		if err := loadRefreshTokenByCode(&newBackup); err != nil {
+			return err
+		}
+	}
 	if backup.Type != constant.Local {
+		isOk, err := u.checkBackupConn(&newBackup)
+		if err != nil || !isOk {
+			return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
+		}
 		newBackup.AccessKey, err = encrypt.StringEncrypt(newBackup.AccessKey)
 		if err != nil {
 			return err
@@ -530,34 +514,37 @@ func newClient(account *model.BackupAccount, isEncrypt bool) (cloud_storage.Clou
 	return client, nil
 }
 
-func loadRefreshTokenByCode(backup *model.BackupAccount) (string, error) {
+func loadRefreshTokenByCode(backup *model.BackupAccount) error {
 	varMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
-		return "", fmt.Errorf("unmarshal backup vars failed, err: %v", err)
-	}
-	if _, ok := varMap["refresh_token"]; ok {
-		return "", nil
+		return fmt.Errorf("unmarshal backup vars failed, err: %v", err)
 	}
 	refreshToken := ""
 	var err error
-	switch backup.Type {
-	case constant.GoogleDrive:
+	if backup.Type == constant.GoogleDrive {
 		refreshToken, err = client.RefreshGoogleToken("authorization_code", "refreshToken", varMap)
 		if err != nil {
-			return "", err
+			return err
 		}
-	case constant.OneDrive:
+	}
+	if backup.Type == constant.OneDrive {
 		refreshToken, err = client.RefreshToken("authorization_code", "refreshToken", varMap)
 		if err != nil {
-			return "", err
+			return err
 		}
 	}
 	if backup.Type != constant.ALIYUN {
+		delete(varMap, "code")
 		varMap["refresh_token"] = refreshToken
 	}
-	itemVars, _ := json.Marshal(varMap)
+	varMap["refresh_status"] = constant.StatusSuccess
+	varMap["refresh_time"] = time.Now().Format(constant.DateTimeLayout)
+	itemVars, err := json.Marshal(varMap)
+	if err != nil {
+		return fmt.Errorf("json marshal var map failed, err: %v", err)
+	}
 	backup.Vars = string(itemVars)
-	return refreshToken, nil
+	return nil
 }
 
 func loadBackupNamesByID(accountIDs string, downloadID uint) ([]string, string, error) {