feat: add backend api timeout

.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

@@ -0,0 +1,47 @@
+name: Create Release And Upload assets
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.19.0'
+      - name: Build Web
+        run: |
+          cd frontend && npm install && npm run build:pro
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: Build Release
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --skip=publish --clean
+      - name: Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            dist/*.tar.gz
+            dist/checksums.txt
+      - name: Setup OSSUTIL
+        uses: yizhoumo/setup-ossutil@v2
+        with:
+          endpoint: ${{ secrets.OSS_ENDPOINT }}
+          access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
+          access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+          ossutil-version: '1.7.18'
+      - name: Upload Assets to OSS
+        run: ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force

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

@@ -1,43 +1,33 @@
-name: Build And Publish (OSS + R2)
-
+name: Create Release And Upload Cloudflare R2
 on:
   push:
     tags:
       - 'v*'
-
 jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: '22.19.0'
-
       - name: Build Web
         run: |
           cd frontend && npm install && npm run build:pro
         env:
           NODE_OPTIONS: --max-old-space-size=8192
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
-          cache-dependency-path: |
-            core/go.sum
-            agent/go.sum
-
+          go-version: '1.23'
       - name: Build Release
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: '~> v2'
           args: release --skip=publish --clean
-
       - name: Upload Assets
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
@@ -46,24 +36,10 @@ jobs:
           files: |
             dist/*.tar.gz
             dist/checksums.txt
-
-      - name: Setup OSSUTIL
-        uses: yizhoumo/setup-ossutil@v2
-        with:
-          endpoint: ${{ secrets.OSS_ENDPOINT }}
-          access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
-          access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-          ossutil-version: '1.7.18'
-
-      - name: Upload Assets to OSS
-        run: |
-          ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force
-
       - name: Setup Rclone
         uses: AnimMouse/setup-rclone@v1
         with:
           rclone_config: ${{ secrets.RCLONE_CONFIG }}
-
       - name: Upload to Cloudflare R2
         run: |
           rclone copy dist/ cloudflare_r2:package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --progress

.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

@@ -44,17 +44,12 @@ frontend/src/xpack
 agent/xpack
 agent/router/entry_xpack.go
 agent/server/init_xpack.go
-agent/utils/xpack/xpack.go
 agent/utils/xpack/xpack_xpack.go
 core/xpack
 core/router/entry_xpack.go
 core/server/init_xpack.go
-core/utils/xpack/xpack.go
 core/utils/xpack/xpack_xpack.go
-core/xpack-ee
-core/router/entry_xpackee.go
-core/server/init_xpackee.go
-core/utils/xpack/xpack_xpackee.go
+xpack
 
 .history/
 dist/
@@ -67,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

README.md

@@ -1,5 +1,5 @@
 <p align="center"><a href="https://1panel.pro"><img src="https://resource.1panel.pro/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
-<h3 align="center">Take control of your VPS with 1Panel</h3>
+<p align="center"><b>Top-Rated Web-based Linux Server Management Tool</b><br>Best VPS control panel<br>新一代的 Linux 服务器运维管理面板</p>
 <p align="center">
   <a href="https://trendshift.io/repositories/2462" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2462" alt="1Panel-dev%2F1Panel | Trendshift" style="width: 240px; height: auto;" /></a>
 </p>
@@ -30,30 +30,30 @@
 </p>
 
 ------------------------------
-## What is 1Panel? 
 
-1Panel is a modern, open-source VPS control panel that streamlines administration through an intuitive, clean web interface. 
+1Panel is an open-source, modern web-based control panel for Linux server management.
 
-## Key Features  
-
-- **One-Click OpenClaw Deployment**: Seamlessly deploy OpenClaw agents, host local LLMs using Ollama, and monitor GPU utilization—all within a unified workspace.  
-- **One-Click Website Deployment**: Launch production-ready websites instantly with automatic domain binding, SSL certificate provisioning, and configuration—zero manual setup required.  
-- **Curated App Marketplace**: Discover, install, and update trusted open-source applications (Nextcloud, Bitwarden, Umami, and more) with a single click.  
-- **Centralized Server Management**: Monitor system resources and manage files, databases, containers, and services effortlessly through a unified, intuitive dashboard.  
-- **Enterprise-Grade Security**: Strengthen your defenses with container isolation, firewall controls, audit logging, and secure deployment practices—ensuring compliance and peace of mind.  
-- **Intelligent Backup & Restore**: Schedule automated backups or perform instant restores to local storage or major cloud platforms (AWS S3, Cloudflare R2, and more), with flexible retention and destination options.  
+- **Efficient Management**: Through a user-friendly web graphical interface, 1Panel enables users to effortlessly manage their Linux servers. Key features include host monitoring, file management, database administration, container management, LLMs management.
+- **Rapid Website Deployment**: With deep integration of the popular open-source website building software WordPress, 1Panel streamlines the process of domain binding and SSL certificate configuration, all achievable with just one click.
+- **Application Store**: 1Panel curates a wide range of high-quality open-source tools and applications, facilitating easy installation and updates for its users.
+- **Security and Reliability**: By leveraging containerization and secure application deployment practices, 1Panel minimizes vulnerability exposure. It further enhances security through integrated firewall management and log auditing capabilities.
+- **One-Click Backup & Restore**: Data protection is made simple with 1Panel's one-click backup and restore functionality, supporting various cloud storage solutions to ensure data integrity and availability.
 
 ## Quick Start
 
 Execute the script below and follow the prompts to install 1Panel:
 
 ```bash
-bash -c "$(curl -sSL https://resource.1panel.pro/v2/quick_start.sh)"
+curl -sSL https://resource.1panel.pro/quick_start.sh -o quick_start.sh && bash quick_start.sh
 ```
 
+Please refer to our [documentation](https://docs.1panel.pro/quick_start/) for more details.
+
+中国用户请使用这个 [安装脚本](https://1panel.cn/docs/installation/online_installation/)，其应用数量比国际版本更丰富。
+
 ## Screenshot
 
-![UI Display](https://resource.1panel.pro/img/overview_en_v2.png)
+![UI Display](https://resource.1panel.pro/img/1panel.png)
 
 ## Star History
 
@@ -73,4 +73,4 @@ Licensed under The GNU General Public License version 3 (GPLv3)  (the "License")
 
 <https://www.gnu.org/licenses/gpl-3.0.html>
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

agent/app/api/v2/agents.go

@@ -1,476 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags AI
-// @Summary Create Agent
-// @Accept json
-// @Param request body dto.AgentCreateReq true "request"
-// @Success 200 {object} dto.AgentItem
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents [post]
-func (b *BaseApi) CreateAgent(c *gin.Context) {
-	var req dto.AgentCreateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := agentService.Create(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags AI
-// @Summary Page Agents
-// @Accept json
-// @Param request body dto.SearchWithPage true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/search [post]
-func (b *BaseApi) PageAgents(c *gin.Context) {
-	var req dto.SearchWithPage
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, list, err := agentService.Page(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
-// @Tags AI
-// @Summary Delete Agent
-// @Accept json
-// @Param request body dto.AgentDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/delete [post]
-func (b *BaseApi) DeleteAgent(c *gin.Context) {
-	var req dto.AgentDeleteReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.Delete(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Reset Agent token
-// @Accept json
-// @Param request body dto.AgentTokenResetReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/token/reset [post]
-func (b *BaseApi) ResetAgentToken(c *gin.Context) {
-	var req dto.AgentTokenResetReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.ResetToken(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Update Agent model config
-// @Accept json
-// @Param request body dto.AgentModelConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/model/update [post]
-func (b *BaseApi) UpdateAgentModelConfig(c *gin.Context) {
-	var req dto.AgentModelConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateModelConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Providers
-// @Success 200 {array} dto.ProviderInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/providers [get]
-func (b *BaseApi) GetAgentProviders(c *gin.Context) {
-	list, err := agentService.GetProviders()
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags AI
-// @Summary Create Agent account
-// @Accept json
-// @Param request body dto.AgentAccountCreateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/accounts [post]
-func (b *BaseApi) CreateAgentAccount(c *gin.Context) {
-	var req dto.AgentAccountCreateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.CreateAccount(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Update Agent account
-// @Accept json
-// @Param request body dto.AgentAccountUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/accounts/update [post]
-func (b *BaseApi) UpdateAgentAccount(c *gin.Context) {
-	var req dto.AgentAccountUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateAccount(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Page Agent accounts
-// @Accept json
-// @Param request body dto.AgentAccountSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/accounts/search [post]
-func (b *BaseApi) PageAgentAccounts(c *gin.Context) {
-	var req dto.AgentAccountSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, list, err := agentService.PageAccounts(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
-// @Tags AI
-// @Summary Verify Agent account
-// @Accept json
-// @Param request body dto.AgentAccountVerifyReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/accounts/verify [post]
-func (b *BaseApi) VerifyAgentAccount(c *gin.Context) {
-	var req dto.AgentAccountVerifyReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.VerifyAccount(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Delete Agent account
-// @Accept json
-// @Param request body dto.AgentAccountDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/accounts/delete [post]
-func (b *BaseApi) DeleteAgentAccount(c *gin.Context) {
-	var req dto.AgentAccountDeleteReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.DeleteAccount(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Agent Feishu channel config
-// @Accept json
-// @Param request body dto.AgentFeishuConfigReq true "request"
-// @Success 200 {object} dto.AgentFeishuConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/feishu/get [post]
-func (b *BaseApi) GetAgentFeishuConfig(c *gin.Context) {
-	var req dto.AgentFeishuConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := agentService.GetFeishuConfig(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags AI
-// @Summary Update Agent Feishu channel config
-// @Accept json
-// @Param request body dto.AgentFeishuConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/feishu/update [post]
-func (b *BaseApi) UpdateAgentFeishuConfig(c *gin.Context) {
-	var req dto.AgentFeishuConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateFeishuConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Agent Telegram channel config
-// @Accept json
-// @Param request body dto.AgentTelegramConfigReq true "request"
-// @Success 200 {object} dto.AgentTelegramConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/telegram/get [post]
-func (b *BaseApi) GetAgentTelegramConfig(c *gin.Context) {
-	var req dto.AgentTelegramConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := agentService.GetTelegramConfig(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags AI
-// @Summary Update Agent Telegram channel config
-// @Accept json
-// @Param request body dto.AgentTelegramConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/telegram/update [post]
-func (b *BaseApi) UpdateAgentTelegramConfig(c *gin.Context) {
-	var req dto.AgentTelegramConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateTelegramConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Agent Discord channel config
-// @Accept json
-// @Param request body dto.AgentDiscordConfigReq true "request"
-// @Success 200 {object} dto.AgentDiscordConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/discord/get [post]
-func (b *BaseApi) GetAgentDiscordConfig(c *gin.Context) {
-	var req dto.AgentDiscordConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := agentService.GetDiscordConfig(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags AI
-// @Summary Update Agent Discord channel config
-// @Accept json
-// @Param request body dto.AgentDiscordConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/discord/update [post]
-func (b *BaseApi) UpdateAgentDiscordConfig(c *gin.Context) {
-	var req dto.AgentDiscordConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateDiscordConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Agent Browser config
-// @Accept json
-// @Param request body dto.AgentBrowserConfigReq true "request"
-// @Success 200 {object} dto.AgentBrowserConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/browser/get [post]
-func (b *BaseApi) GetAgentBrowserConfig(c *gin.Context) {
-	var req dto.AgentBrowserConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := agentService.GetBrowserConfig(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags AI
-// @Summary Update Agent Browser config
-// @Accept json
-// @Param request body dto.AgentBrowserConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/browser/update [post]
-func (b *BaseApi) UpdateAgentBrowserConfig(c *gin.Context) {
-	var req dto.AgentBrowserConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateBrowserConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Get Agent Other config
-// @Accept json
-// @Param request body dto.AgentOtherConfigReq true "request"
-// @Success 200 {object} dto.AgentOtherConfig
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/other/get [post]
-func (b *BaseApi) GetAgentOtherConfig(c *gin.Context) {
-	var req dto.AgentOtherConfigReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := agentService.GetOtherConfig(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags AI
-// @Summary Update Agent Other config
-// @Accept json
-// @Param request body dto.AgentOtherConfigUpdateReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/other/update [post]
-func (b *BaseApi) UpdateAgentOtherConfig(c *gin.Context) {
-	var req dto.AgentOtherConfigUpdateReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.UpdateOtherConfig(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Approve Agent Feishu pairing code
-// @Accept json
-// @Param request body dto.AgentFeishuPairingApproveReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/feishu/approve [post]
-func (b *BaseApi) ApproveAgentFeishuPairing(c *gin.Context) {
-	var req dto.AgentFeishuPairingApproveReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.ApproveFeishuPairing(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags AI
-// @Summary Approve Agent channel pairing code
-// @Accept json
-// @Param request body dto.AgentChannelPairingApproveReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/agents/channel/pairing/approve [post]
-func (b *BaseApi) ApproveAgentChannelPairing(c *gin.Context) {
-	var req dto.AgentChannelPairingApproveReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := agentService.ApproveChannelPairing(req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}

agent/app/api/v2/app.go

@@ -1,13 +1,10 @@
 package v2
 
 import (
-	"net/http"
-
 	"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"
 	"github.com/1Panel-dev/1Panel/agent/i18n"
-	"github.com/1Panel-dev/1Panel/agent/utils/appicon"
 	"github.com/gin-gonic/gin"
 )
 
@@ -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
@@ -164,7 +161,7 @@ func (b *BaseApi) InstallApp(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	install, err := appService.Install(req, true)
+	install, err := appService.Install(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -195,61 +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, filename, etag, err := appService.GetAppIcon(appKey)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	if len(iconBytes) == 0 {
-		c.Status(http.StatusNoContent)
-		return
-	}
-
-	c.Header("Cache-Control", "public, max-age=2592000")
-
-	if etag != "" && filename != "" {
-		c.Header("ETag", etag)
-		if c.GetHeader("If-None-Match") == etag {
-			c.Status(http.StatusNotModified)
-			return
-		}
-	}
-
-	c.Data(http.StatusOK, appicon.ContentTypePNG, 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/app_install.go

@@ -109,7 +109,7 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 // @Success 200 {object} response.DatabaseConn
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /apps/installed/conninfo [post]
+// @Router /apps/installed/conninfo [POST]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -294,7 +294,7 @@ func (b *BaseApi) GetParams(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /apps/installed/params/update [post]
-// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"name","output_value":"name"}],"formatZH":"应用参数修改 [name]","formatEN":"Application param update [name]"}
+// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用参数修改 [installId]","formatEN":"Application param update [installId]"}
 func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 	var req request.AppInstalledUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -349,15 +349,3 @@ func (b *BaseApi) GetAppInstallInfo(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, info)
 }
-
-func (b *BaseApi) UpdateAppInstallSort(c *gin.Context) {
-	var req request.AppInstallSort
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := appInstallService.UpdateSort(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

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
@@ -306,6 +285,27 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 	helper.Success(c)
 }
 
+// @Tags Container
+// @Summary Create container by command
+// @Accept json
+// @Param request body dto.ContainerCreateByCommand true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /containers/command [post]
+func (b *BaseApi) ContainerCreateByCommand(c *gin.Context) {
+	var req dto.ContainerCreateByCommand
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := containerService.ContainerCreateByCommand(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
 // @Tags Container
 // @Summary Upgrade container
 // @Accept json
@@ -314,7 +314,7 @@ func (b *BaseApi) ContainerCreate(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 {
@@ -372,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
@@ -503,12 +481,13 @@ 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 {
 		return
 	}
-	err := containerService.DownloadContainerLogs(req.ContainerType, req.Container, req.Since, strconv.Itoa(int(req.Tail)), req.Timestamp, c)
+	err := containerService.DownloadContainerLogs(req.ContainerType, req.Container, req.Since, strconv.Itoa(int(req.Tail)), c)
 	if err != nil {
 		helper.InternalServer(c, err)
 	}
@@ -710,34 +689,12 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Container Compose
-// @Summary Load compose environment variables
-// @Accept json
-// @Param request body dto.FilePath true "request"
-// @Success 200 {array} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/compose/env [post]
-func (b *BaseApi) LoadComposeEnv(c *gin.Context) {
-	var req dto.FilePath
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := containerService.LoadComposeEnv(req.Path)
-	if err != nil {
-		helper.InternalServer(c, err)
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Container
 // @Summary Container logs
 // @Param container query string false "容器名称"
 // @Param since query string false "时间筛选"
 // @Param follow query string false "是否追踪"
 // @Param tail query string false "显示行号"
-// @Param timestamp query string false "是否显示时间"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/search/log [get]
@@ -750,7 +707,6 @@ func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
 	since := c.Query("since")
 	follow := c.Query("follow") == "true"
 	tail := c.Query("tail")
-	timestamp := c.Query("timestamp") == "true"
 
 	container := c.Query("container")
 	compose := c.Query("compose")
@@ -760,7 +716,6 @@ func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
 		Since:     since,
 		Follow:    follow,
 		Tail:      tail,
-		Timestamp: timestamp,
 		Type:      "container",
 	}
 	if compose != "" {

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 {

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

@@ -12,7 +12,7 @@ import (
 // @Tags Container Docker
 // @Summary Load docker status
 // @Produce json
-// @Success 200 {object} dto.DockerStatus
+// @Success 200 {string} dto.DockerStatus
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/docker/status [get]
@@ -24,7 +24,7 @@ func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 // @Tags Container Docker
 // @Summary Load docker daemon.json
 // @Produce json
-// @Success 200 {string} string
+// @Success 200 {object} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/daemonjson/file [get]

agent/app/api/v2/entry.go

@@ -20,7 +20,6 @@ var (
 	aiToolService      = service.NewIAIToolService()
 	mcpServerService   = service.NewIMcpServerService()
 	tensorrtLLMService = service.NewITensorRTLLMService()
-	agentService       = service.NewIAgentService()
 
 	containerService       = service.NewIContainerService()
 	composeTemplateService = service.NewIComposeTemplateService()
@@ -39,7 +38,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
@@ -978,40 +942,3 @@ func (b *BaseApi) ConvertLog(c *gin.Context) {
 		Total: total,
 	})
 }
-
-// @Tags File
-// @Summary Batch get file remarks
-// @Accept json
-// @Param request body request.FileRemarkBatch true "request"
-// @Success 200 {object} response.FileRemarksRes
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/remarks [post]
-func (b *BaseApi) BatchGetFileRemarks(c *gin.Context) {
-	var req request.FileRemarkBatch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	remarks := fileService.BatchGetRemarks(req)
-	helper.SuccessWithData(c, response.FileRemarksRes{Remarks: remarks})
-}
-
-// @Tags File
-// @Summary Set file remark
-// @Accept json
-// @Param request body request.FileRemarkUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/remark [post]
-func (b *BaseApi) SetFileRemark(c *gin.Context) {
-	var req request.FileRemarkUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := fileService.SetRemark(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

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/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]
@@ -57,18 +57,3 @@ func (b *BaseApi) GetProcessInfoByPID(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, data)
 }
-
-// @Tags Process
-// @Summary Get Listening Process
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /process/listening [post]
-func (b *BaseApi) GetListeningProcess(c *gin.Context) {
-	procs, err := processService.GetListeningProcess(c)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, procs)
-}

agent/app/api/v2/setting.go

@@ -80,38 +80,13 @@ func (b *BaseApi) LoadLocalConn(c *gin.Context) {
 }
 
 func (b *BaseApi) CheckLocalConn(c *gin.Context) {
-	client, err := loadLocalConn()
-	if err == nil && client != nil {
-		client.Close()
-	}
+	_, err := loadLocalConn()
 	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]
@@ -180,24 +155,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 {

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

@@ -32,7 +32,7 @@ func (b *BaseApi) PageTasks(c *gin.Context) {
 
 // @Tags TaskLog
 // @Summary Get the number of executing tasks
-// @Success 200 {integer} int64
+// @Success 200 {object} int64
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /logs/tasks/executing/count [get]

agent/app/api/v2/terminal.go

@@ -228,8 +228,8 @@ func wshandleError(ws *websocket.Conn, err error) bool {
 }
 
 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 {
@@ -506,7 +506,7 @@ func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/proxies/update [post]
-// @x-panel-log {"bodyKeys":["id","name","operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改 [operate] 网站 [domain] 反向代理配置 [name] ","formatEN":"Update [operate] domain [domain] proxy config [name]"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 ","formatEN":"Update domain [domain] proxy config"}
 func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 	var req request.WebsiteProxyConfig
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -520,50 +520,6 @@ func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Website
-// @Summary Delete proxy config
-// @Accept json
-// @Param request body request.WebsiteProxyDel true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/proxies/delete [post]
-// @x-panel-log {"bodyKeys":["id","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除网站 [domain] 反向代理配置 [name] ","formatEN":"Delete domain [domain] proxy config [name]"}
-func (b *BaseApi) DeleteProxyConfig(c *gin.Context) {
-	var req request.WebsiteProxyDel
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := websiteService.DeleteProxy(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Update proxy config status
-// @Accept json
-// @Param request body request.WebsiteProxyStatusUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/proxies/status [post]
-// @x-panel-log {"bodyKeys":["id","name","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 [name] 状态 [status] ","formatEN":"Update domain [domain] proxy config [name] status [status]"}
-func (b *BaseApi) UpdateProxyConfigStatus(c *gin.Context) {
-	var req request.WebsiteProxyStatusUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := websiteService.UpdateProxyStatus(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Website
 // @Summary Update proxy file
 // @Accept json
@@ -572,7 +528,7 @@ func (b *BaseApi) UpdateProxyConfigStatus(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/proxies/file [post]
-// @x-panel-log {"bodyKeys":["websiteID","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置文件 [name] ","formatEN":"Update domain [domain] proxy config file [name]"}
+// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新反向代理文件 [domain]","formatEN":"Nginx conf proxy file update [domain]"}
 func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
 	var req request.NginxProxyUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -716,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 {
@@ -1189,7 +1145,7 @@ func (b *BaseApi) ExecComposer(c *gin.Context) {
 // @Tags Website
 // @Summary Batch operate websites
 // @Accept json
-// @Param request body request.BatchWebsiteOp true "request"
+// @Param request body request.BatchOpWebsite true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -1206,26 +1162,6 @@ func (b *BaseApi) BatchOpWebsites(c *gin.Context) {
 	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
@@ -1267,43 +1203,3 @@ func (b *BaseApi) UpdateCORSConfig(c *gin.Context) {
 	}
 	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,14 +1,14 @@
 package v2
 
 import (
+	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"io"
 	"mime/multipart"
 	"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"
@@ -25,39 +25,27 @@ import (
 // @Router /websites/ssl/search [post]
 func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, accounts, err := websiteSSLService.Page(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithDataGzipped(c, dto.PageResult{
-		Total: total,
-		Items: accounts,
-	})
-}
-
-// @Tags Website SSL
-// @Summary List website ssl
-// @Accept json
-// @Param request body request.WebsiteSSLListReq true "request"
-// @Success 200 {array} response.WebsiteSSLDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/ssl/list [post]
-func (b *BaseApi) ListWebsiteSSL(c *gin.Context) {
-	var req request.WebsiteSSLListReq
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
-	list, err := websiteSSLService.Search(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
+	if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {
+		total, accounts, err := websiteSSLService.Page(req)
+		if err != nil {
+			helper.InternalServer(c, err)
+			return
+		}
+		helper.SuccessWithData(c, dto.PageResult{
+			Total: total,
+			Items: accounts,
+		})
+	} else {
+		list, err := websiteSSLService.Search(req)
+		if err != nil {
+			helper.InternalServer(c, err)
+			return
+		}
+		helper.SuccessWithData(c, list)
 	}
-	helper.SuccessWithDataGzipped(c, list)
 }
 
 // @Tags Website SSL
@@ -247,6 +235,7 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 func (b *BaseApi) UploadSSLFile(c *gin.Context) {
 	var req request.WebsiteSSLFileUpload
 
+	req.Type = c.PostForm("type")
 	req.Description = c.PostForm("description")
 	sslID := c.PostForm("sslID")
 	if sslID != "" {
@@ -290,7 +279,7 @@ func (b *BaseApi) UploadSSLFile(c *gin.Context) {
 		return
 	}
 
-	helper.Success(c)
+	helper.SuccessWithData(c, nil)
 }
 
 func readUploadedFile(fileHeader *multipart.FileHeader) ([]byte, error) {

agent/app/dto/agents.go

@@ -1,253 +0,0 @@
-package dto
-
-import "time"
-
-type AgentCreateReq struct {
-	Name          string  `json:"name" validate:"required"`
-	AppVersion    string  `json:"appVersion" validate:"required"`
-	WebUIPort     int     `json:"webUIPort" validate:"required"`
-	BridgePort    int     `json:"bridgePort"`
-	AgentType     string  `json:"agentType"`
-	Provider      string  `json:"provider"`
-	Model         string  `json:"model"`
-	APIType       string  `json:"apiType"`
-	MaxTokens     int     `json:"maxTokens"`
-	ContextWindow int     `json:"contextWindow"`
-	AccountID     uint    `json:"accountId"`
-	APIKey        string  `json:"apiKey"`
-	BaseURL       string  `json:"baseURL"`
-	Token         string  `json:"token"`
-	TaskID        string  `json:"taskID"`
-	Advanced      bool    `json:"advanced"`
-	ContainerName string  `json:"containerName"`
-	AllowPort     bool    `json:"allowPort"`
-	SpecifyIP     string  `json:"specifyIP"`
-	RestartPolicy string  `json:"restartPolicy"`
-	CpuQuota      float64 `json:"cpuQuota"`
-	MemoryLimit   float64 `json:"memoryLimit"`
-	MemoryUnit    string  `json:"memoryUnit"`
-	PullImage     bool    `json:"pullImage"`
-	EditCompose   bool    `json:"editCompose"`
-	DockerCompose string  `json:"dockerCompose"`
-}
-
-type AgentItem struct {
-	ID            uint      `json:"id"`
-	Name          string    `json:"name"`
-	AgentType     string    `json:"agentType"`
-	Provider      string    `json:"provider"`
-	ProviderName  string    `json:"providerName"`
-	Model         string    `json:"model"`
-	APIType       string    `json:"apiType"`
-	MaxTokens     int       `json:"maxTokens"`
-	ContextWindow int       `json:"contextWindow"`
-	BaseURL       string    `json:"baseUrl"`
-	APIKey        string    `json:"apiKey"`
-	Token         string    `json:"token"`
-	Status        string    `json:"status"`
-	Message       string    `json:"message"`
-	AppInstallID  uint      `json:"appInstallId"`
-	AccountID     uint      `json:"accountId"`
-	AppVersion    string    `json:"appVersion"`
-	Container     string    `json:"containerName"`
-	WebUIPort     int       `json:"webUIPort"`
-	BridgePort    int       `json:"bridgePort"`
-	Path          string    `json:"path"`
-	ConfigPath    string    `json:"configPath"`
-	Upgradable    bool      `json:"upgradable"`
-	CreatedAt     time.Time `json:"createdAt"`
-}
-
-type AgentDeleteReq struct {
-	ID          uint   `json:"id" validate:"required"`
-	TaskID      string `json:"taskID"`
-	ForceDelete bool   `json:"forceDelete"`
-}
-
-type AgentTokenResetReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type AgentModelConfigUpdateReq struct {
-	AgentID   uint   `json:"agentId" validate:"required"`
-	AccountID uint   `json:"accountId" validate:"required"`
-	Model     string `json:"model" validate:"required"`
-}
-
-type AgentAccountCreateReq struct {
-	Provider       string `json:"provider" validate:"required"`
-	Name           string `json:"name" validate:"required"`
-	APIKey         string `json:"apiKey" validate:"required"`
-	RememberAPIKey bool   `json:"rememberApiKey"`
-	BaseURL        string `json:"baseURL"`
-	Model          string `json:"model"`
-	APIType        string `json:"apiType"`
-	MaxTokens      int    `json:"maxTokens"`
-	ContextWindow  int    `json:"contextWindow"`
-	Remark         string `json:"remark"`
-}
-
-type AgentAccountUpdateReq struct {
-	ID             uint   `json:"id" validate:"required"`
-	Name           string `json:"name" validate:"required"`
-	APIKey         string `json:"apiKey" validate:"required"`
-	RememberAPIKey bool   `json:"rememberApiKey"`
-	BaseURL        string `json:"baseURL"`
-	Model          string `json:"model"`
-	APIType        string `json:"apiType"`
-	MaxTokens      int    `json:"maxTokens"`
-	ContextWindow  int    `json:"contextWindow"`
-	Remark         string `json:"remark"`
-	SyncAgents     bool   `json:"syncAgents"`
-}
-
-type AgentAccountVerifyReq struct {
-	Provider string `json:"provider" validate:"required"`
-	APIKey   string `json:"apiKey" validate:"required"`
-	BaseURL  string `json:"baseURL"`
-}
-
-type AgentAccountDeleteReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type AgentAccountSearch struct {
-	PageInfo
-	Provider string `json:"provider"`
-	Name     string `json:"name"`
-}
-
-type AgentAccountInfo struct {
-	ID             uint      `json:"id"`
-	Provider       string    `json:"provider"`
-	ProviderName   string    `json:"providerName"`
-	Name           string    `json:"name"`
-	APIKey         string    `json:"apiKey"`
-	RememberAPIKey bool      `json:"rememberApiKey"`
-	BaseURL        string    `json:"baseUrl"`
-	Model          string    `json:"model"`
-	APIType        string    `json:"apiType"`
-	MaxTokens      int       `json:"maxTokens"`
-	ContextWindow  int       `json:"contextWindow"`
-	Verified       bool      `json:"verified"`
-	Remark         string    `json:"remark"`
-	CreatedAt      time.Time `json:"createdAt"`
-}
-
-type ProviderModelInfo struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-}
-
-type ProviderInfo struct {
-	Sort        uint                `json:"-"`
-	Provider    string              `json:"provider"`
-	DisplayName string              `json:"displayName"`
-	BaseURL     string              `json:"baseUrl"`
-	Models      []ProviderModelInfo `json:"models"`
-}
-
-type AgentFeishuConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentFeishuConfigUpdateReq struct {
-	AgentID   uint   `json:"agentId" validate:"required"`
-	BotName   string `json:"botName" validate:"required"`
-	AppID     string `json:"appId" validate:"required"`
-	AppSecret string `json:"appSecret" validate:"required"`
-	Enabled   bool   `json:"enabled"`
-	DmPolicy  string `json:"dmPolicy" validate:"required"`
-}
-
-type AgentFeishuPairingApproveReq struct {
-	AgentID     uint   `json:"agentId" validate:"required"`
-	PairingCode string `json:"pairingCode" validate:"required"`
-}
-
-type AgentFeishuConfig struct {
-	Enabled   bool   `json:"enabled"`
-	DmPolicy  string `json:"dmPolicy"`
-	BotName   string `json:"botName"`
-	AppID     string `json:"appId"`
-	AppSecret string `json:"appSecret"`
-}
-
-type AgentTelegramConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentTelegramConfigUpdateReq struct {
-	AgentID  uint   `json:"agentId" validate:"required"`
-	Enabled  bool   `json:"enabled"`
-	DmPolicy string `json:"dmPolicy" validate:"required"`
-	BotToken string `json:"botToken" validate:"required"`
-	Proxy    string `json:"proxy"`
-}
-
-type AgentTelegramConfig struct {
-	Enabled  bool   `json:"enabled"`
-	DmPolicy string `json:"dmPolicy"`
-	BotToken string `json:"botToken"`
-	Proxy    string `json:"proxy"`
-}
-
-type AgentChannelPairingApproveReq struct {
-	AgentID     uint   `json:"agentId" validate:"required"`
-	Type        string `json:"type" validate:"required,oneof=feishu telegram discord"`
-	PairingCode string `json:"pairingCode" validate:"required"`
-}
-
-type AgentDiscordConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentDiscordConfigUpdateReq struct {
-	AgentID     uint   `json:"agentId" validate:"required"`
-	Enabled     bool   `json:"enabled"`
-	DmPolicy    string `json:"dmPolicy" validate:"required"`
-	GroupPolicy string `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	Token       string `json:"token" validate:"required"`
-	Proxy       string `json:"proxy"`
-}
-
-type AgentDiscordConfig struct {
-	Enabled     bool   `json:"enabled"`
-	DmPolicy    string `json:"dmPolicy"`
-	GroupPolicy string `json:"groupPolicy"`
-	Token       string `json:"token"`
-	Proxy       string `json:"proxy"`
-}
-
-type AgentBrowserConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentBrowserConfigUpdateReq struct {
-	AgentID        uint   `json:"agentId" validate:"required"`
-	Enabled        bool   `json:"enabled"`
-	Headless       bool   `json:"headless"`
-	NoSandbox      bool   `json:"noSandbox"`
-	DefaultProfile string `json:"defaultProfile" validate:"required"`
-}
-
-type AgentBrowserConfig struct {
-	Enabled        bool   `json:"enabled"`
-	ExecutablePath string `json:"executablePath"`
-	Headless       bool   `json:"headless"`
-	NoSandbox      bool   `json:"noSandbox"`
-	DefaultProfile string `json:"defaultProfile"`
-}
-
-type AgentOtherConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentOtherConfigUpdateReq struct {
-	AgentID      uint   `json:"agentId" validate:"required"`
-	UserTimezone string `json:"userTimezone" validate:"required"`
-}
-
-type AgentOtherConfig struct {
-	UserTimezone string `json:"userTimezone"`
-}

agent/app/dto/alert.go

@@ -317,7 +317,7 @@ type AlertCommonConfig struct {
 
 type AlertSmsConfig struct {
 	Phone         string `json:"phone"`
-	AlertDailyNum string `json:"alertDailyNum"`
+	AlertDailyNum uint   `json:"alertDailyNum"`
 }
 
 type AlertEmailConfig struct {
@@ -330,13 +330,3 @@ type AlertEmailConfig struct {
 	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"
 	Recipient   string `json:"recipient"`
 }
-
-type AgentInfo struct {
-	NodeName string `json:"nodeName"`
-	NodeAddr string `json:"nodeAddr"`
-}
-
-type AlertWebhookConfig struct {
-	DisplayName string `json:"displayName"`
-	Url         string `json:"url"`
-}

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 {

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 {

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,17 @@ 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"`
+	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"`
@@ -95,23 +95,11 @@ type ContainerOperate struct {
 	Privileged      bool           `json:"privileged"`
 	AutoRemove      bool           `json:"autoRemove"`
 	Volumes         []VolumeHelper `json:"volumes"`
-	ExtraHosts      []ExtraHost    `json:"extraHosts"`
 	Labels          []string       `json:"labels"`
 	Env             []string       `json:"env"`
 	RestartPolicy   string         `json:"restartPolicy"`
 }
 
-type ExtraHost struct {
-	Hostname string `json:"hostname"`
-	IP       string `json:"ip"`
-}
-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"`
 	Command string `json:"command"`
@@ -124,19 +112,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"`
 
@@ -178,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"`
 }
@@ -268,52 +242,41 @@ 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"`
-	ForcePull bool   `json:"forcePull"`
+	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 {
-	TaskID     string `json:"taskID"`
-	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"`
-	ForcePull  bool   `json:"forcePull"`
-}
-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 {
 	Container     string `json:"container" validate:"required"`
 	Since         string `json:"since"`
 	Tail          uint   `json:"tail"`
-	Timestamp     bool   `json:"timestamp"`
 	ContainerType string `json:"containerType"`
 }
 
@@ -323,6 +286,5 @@ type StreamLog struct {
 	Since     string
 	Follow    bool
 	Tail      string
-	Timestamp bool
 	Type      string
 }

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"`
@@ -50,7 +48,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 +58,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 +84,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 +116,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/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"`
@@ -50,11 +46,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 +55,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 +76,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"`
-	Paths  []string `json:"paths" validate:"required,dive,required"`
+	Path string `json:"path" validate:"required"`
 }
 
 type ImageBuild struct {
@@ -31,7 +27,6 @@ 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 {
@@ -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 {
@@ -54,14 +45,13 @@ type AppContainerConfig struct {
 
 type AppInstalledSearch struct {
 	dto.PageInfo
-	Type        string   `json:"type"`
-	Name        string   `json:"name"`
-	Tags        []string `json:"tags"`
-	Update      bool     `json:"update"`
-	Unused      bool     `json:"unused"`
-	All         bool     `json:"all"`
-	Sync        bool     `json:"sync"`
-	CheckUpdate bool     `json:"checkUpdate"`
+	Type   string   `json:"type"`
+	Name   string   `json:"name"`
+	Tags   []string `json:"tags"`
+	Update bool     `json:"update"`
+	Unused bool     `json:"unused"`
+	All    bool     `json:"all"`
+	Sync   bool     `json:"sync"`
 }
 
 type AppInstalledInfo struct {
@@ -138,12 +128,3 @@ type AppUpdateVersion struct {
 	AppInstallID  uint   `json:"appInstallID" validate:"required"`
 	UpdateVersion string `json:"updateVersion"`
 }
-
-type AppInstallSortItem struct {
-	InstallID uint `json:"installID"`
-	SortOrder int  `json:"sortOrder"`
-}
-
-type AppInstallSort struct {
-	Items []AppInstallSortItem `json:"items" validate:"required"`
-}

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"`
@@ -163,12 +164,3 @@ type FileConvertRequest struct {
 	DeleteSource bool          `json:"deleteSource"`
 	TaskID       string        `json:"taskID"`
 }
-
-type FileRemarkBatch struct {
-	Paths []string `json:"paths" validate:"required"`
-}
-
-type FileRemarkUpdate struct {
-	Path   string `json:"path" validate:"required"`
-	Remark string `json:"remark"`
-}

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"`
@@ -141,7 +135,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/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 {
@@ -125,30 +109,6 @@ type BatchWebsiteOp struct {
 	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"`
@@ -272,17 +232,6 @@ type WebsiteProxyConfig struct {
 	CorsConfig
 }
 
-type WebsiteProxyDelete struct {
-	ID   uint   `json:"id" validate:"required"`
-	Name string `json:"name" validate:"required"`
-}
-
-type WebsiteProxyStatusUpdate struct {
-	ID     uint   `json:"id" validate:"required"`
-	Name   string `json:"name" validate:"required"`
-	Status string `json:"status" validate:"required"`
-}
-
 type CorsConfig struct {
 	Cors             bool   `json:"cors"`
 	AllowOrigins     string `json:"allowOrigins"`
@@ -322,7 +271,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

@@ -6,12 +6,8 @@ type WebsiteSSLSearch struct {
 	dto.PageInfo
 	AcmeAccountID string `json:"acmeAccountID"`
 	Domain        string `json:"domain"`
-	OrderBy       string `json:"orderBy" validate:"omitempty,oneof=created_at expire_date"`
-	Order         string `json:"order" validate:"omitempty,oneof=null ascending descending"`
-}
-
-type WebsiteSSLListReq struct {
-	AcmeAccountID string `json:"acmeAccountID"`
+	OrderBy       string `json:"orderBy" validate:"required,oneof=expire_date"`
+	Order         string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
 type WebsiteSSLCreate struct {
@@ -35,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 {
@@ -67,7 +62,6 @@ type WebsiteAcmeAccountCreate struct {
 	EabHmacKey string `json:"eabHmacKey"`
 	UseProxy   bool   `json:"useProxy"`
 	CaDirURL   string `json:"caDirURL"`
-	UseEAB     bool   `json:"useEAB"`
 }
 
 type WebsiteAcmeAccountUpdate struct {

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"`
@@ -126,12 +126,8 @@ type AppInstallDTO struct {
 	WebUI         string    `json:"webUI"`
 	CreatedAt     time.Time `json:"createdAt"`
 	Favorite      bool      `json:"favorite"`
-	SortOrder     int       `json:"sortOrder"`
 	App           AppDetail `json:"app"`
 	Container     string    `json:"container"`
-	IsEdit        bool      `json:"isEdit"`
-	LinkDB        bool      `json:"linkDB"`
-	ServiceName   string    `json:"serviceName"`
 }
 
 type AppInstallInfo struct {
@@ -143,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"`
 }
@@ -182,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

@@ -81,7 +81,3 @@ type FileConvertLog struct {
 	Status  string `json:"status"`
 	Message string `json:"message"`
 }
-
-type FileRemarksRes struct {
-	Remarks map[string]string `json:"remarks"`
-}

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/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 {
@@ -40,7 +35,6 @@ type WebsiteRes struct {
 	SSLStatus     string    `json:"sslStatus"`
 	AppInstallID  uint      `json:"appInstallId"`
 	ChildSites    []string  `json:"childSites"`
-	ParentSite    string    `json:"parentSite"`
 	RuntimeType   string    `json:"runtimeType"`
 	Favorite      bool      `json:"favorite"`
 	IPV6          bool      `json:"IPV6"`

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"`
@@ -86,11 +80,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/model/agent.go

@@ -1,20 +0,0 @@
-package model
-
-type Agent struct {
-	BaseModel
-	Name          string `json:"name" gorm:"not null;unique"`
-	AgentType     string `json:"agentType" gorm:"default:openclaw"`
-	Provider      string `json:"provider"`
-	Model         string `json:"model"`
-	APIType       string `json:"apiType"`
-	MaxTokens     int    `json:"maxTokens"`
-	ContextWindow int    `json:"contextWindow"`
-	BaseURL       string `json:"baseUrl"`
-	APIKey        string `json:"apiKey"`
-	Token         string `json:"token"`
-	Status        string `json:"status"`
-	Message       string `json:"message"`
-	AppInstallID  uint   `json:"appInstallId"`
-	AccountID     uint   `json:"accountId"`
-	ConfigPath    string `json:"configPath"`
-}

agent/app/model/agent_account.go

@@ -1,20 +0,0 @@
-package model
-
-type AgentAccount struct {
-	BaseModel
-	Provider       string `json:"provider"`
-	Name           string `json:"name"`
-	APIKey         string `json:"apiKey"`
-	BaseURL        string `json:"baseUrl"`
-	Model          string `json:"model"`
-	APIType        string `json:"apiType"`
-	MaxTokens      int    `json:"maxTokens"`
-	ContextWindow  int    `json:"contextWindow"`
-	RememberAPIKey bool   `json:"rememberApiKey"`
-	Verified       bool   `json:"verified"`
-	Remark         string `json:"remark"`
-}
-
-func (AgentAccount) TableName() string {
-	return "agent_provider_accounts"
-}

agent/app/model/alert.go

@@ -11,7 +11,7 @@ type Alert struct {
 	Status         string `gorm:"type:varchar(64);not null" json:"status"`
 	Method         string `gorm:"type:varchar(64);not null" json:"method"`
 	SendCount      uint   `gorm:"type:integer" json:"sendCount"`
-	AdvancedParams string `gorm:"type:longText" json:"advancedParams"`
+	AdvancedParams string `gorm:"type:longText" json:"advancedParam"`
 }
 
 type AlertTask struct {

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

agent/app/model/app_install.go

@@ -26,7 +26,6 @@ type AppInstall struct {
 	HttpsPort     int    `json:"httpsPort"`
 	WebUI         string `json:"webUI"`
 	Favorite      bool   `json:"favorite"`
-	SortOrder     int    `json:"sortOrder" gorm:"default:0"`
 
 	App App `json:"app" gorm:"-:migration"`
 }

agent/app/model/cronjob.go

@@ -37,7 +37,6 @@ 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"`

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,20 @@ 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"`
+	Interface  string `json:"interface"`
 }

agent/app/model/monitor.go

@@ -31,16 +31,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/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/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_acme_account.go

@@ -11,7 +11,6 @@ type WebsiteAcmeAccount struct {
 	KeyType    string `gorm:"not null;default:2048" json:"keyType"`
 	UseProxy   bool   `gorm:"default:false" json:"useProxy"`
 	CaDirURL   string `json:"caDirURL"`
-	UseEAB     bool   `json:"useEAB"`
 }
 
 func (w WebsiteAcmeAccount) TableName() string {

agent/app/model/website_ssl.go

@@ -41,7 +41,6 @@ type WebsiteSSL struct {
 	PushNode       bool      `json:"pushNode"`
 	PrivateKeyPath string    `json:"privateKeyPath"`
 	CertPath       string    `json:"certPath"`
-	IsIp           bool      `json:"isIP"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
 	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`

agent/app/provider/catalog.go

@@ -1,260 +0,0 @@
-package provider
-
-import (
-	"strings"
-)
-
-type Model struct {
-	ID   string
-	Name string
-}
-
-type Meta struct {
-	Key            string
-	DisplayName    string
-	Sort           uint
-	DefaultBaseURL string
-	EnvKey         string
-	Models         []Model
-	Enabled        bool
-}
-
-var catalog = map[string]Meta{
-	"ollama": {
-		Key:         "ollama",
-		DisplayName: "Ollama",
-		Sort:        10,
-		Enabled:     true,
-	},
-	"deepseek": {
-		Key:            "deepseek",
-		DisplayName:    "DeepSeek",
-		Sort:           20,
-		DefaultBaseURL: "https://api.deepseek.com/v1",
-		EnvKey:         "DEEPSEEK_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "deepseek/deepseek-chat", Name: "DeepSeek Chat"},
-			{ID: "deepseek/deepseek-reasoner", Name: "DeepSeek Reasoner"},
-			{ID: "deepseek/deepseek-r1:1.5b", Name: "DeepSeek R1 1.5B"},
-		},
-	},
-	"custom": {
-		Key:            "custom",
-		DisplayName:    "Custom",
-		Sort:           30,
-		DefaultBaseURL: "",
-		EnvKey:         "CUSTOM_API_KEY",
-		Enabled:        true,
-		Models:         []Model{},
-	},
-	"openai": {
-		Key:            "openai",
-		DisplayName:    "OpenAI",
-		Sort:           40,
-		DefaultBaseURL: "https://api.openai.com/v1",
-		EnvKey:         "OPENAI_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "openai/codex-mini-latest", Name: "Codex Mini"},
-			{ID: "openai/gpt-4.1", Name: "GPT-4.1"},
-			{ID: "openai/gpt-4o", Name: "GPT-4o"},
-			{ID: "openai/gpt-4o-mini", Name: "GPT-4o Mini"},
-			{ID: "openai/gpt-5", Name: "GPT-5"},
-			{ID: "openai/gpt-5-mini", Name: "GPT-5 Mini"},
-		},
-	},
-	"anthropic": {
-		Key:            "anthropic",
-		DisplayName:    "Anthropic",
-		Sort:           50,
-		DefaultBaseURL: "https://api.anthropic.com",
-		EnvKey:         "ANTHROPIC_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "anthropic/claude-3-haiku-20240307", Name: "Claude 3 Haiku"},
-			{ID: "anthropic/claude-3-5-haiku-latest", Name: "Claude 3.5 Haiku"},
-			{ID: "anthropic/claude-3-5-sonnet-20241022", Name: "Claude 3.5 Sonnet"},
-			{ID: "anthropic/claude-3-7-sonnet-20250219", Name: "Claude 3.7 Sonnet"},
-			{ID: "anthropic/claude-opus-4-1", Name: "Claude Opus 4.1"},
-		},
-	},
-	"gemini": {
-		Key:            "gemini",
-		DisplayName:    "Gemini",
-		Sort:           60,
-		DefaultBaseURL: "https://generativelanguage.googleapis.com",
-		EnvKey:         "GEMINI_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "google/gemini-1.5-flash", Name: "Gemini 1.5 Flash"},
-			{ID: "google/gemini-1.5-pro", Name: "Gemini 1.5 Pro"},
-			{ID: "google/gemini-2.0-flash", Name: "Gemini 2.0 Flash"},
-			{ID: "google/gemini-2.5-flash", Name: "Gemini 2.5 Flash"},
-			{ID: "google/gemini-2.5-pro", Name: "Gemini 2.5 Pro"},
-			{ID: "google/gemini-3-flash-preview", Name: "Gemini 3 Flash Preview"},
-		},
-	},
-	"minimax": {
-		Key:            "minimax",
-		DisplayName:    "MiniMax (CN)",
-		Sort:           70,
-		DefaultBaseURL: "https://api.minimaxi.com/anthropic",
-		EnvKey:         "MINIMAX_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "minimax/MiniMax-M2.1", Name: "MiniMax M2.1"},
-			{ID: "minimax/MiniMax-M2.1-lightning", Name: "MiniMax M2.1 Lightning"},
-		},
-	},
-	"moonshot": {
-		Key:            "moonshot",
-		DisplayName:    "Moonshot (Global)",
-		Sort:           80,
-		DefaultBaseURL: "https://api.moonshot.ai/v1",
-		EnvKey:         "MOONSHOT_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "moonshot/kimi-k2.5", Name: "Kimi K2.5"},
-			{ID: "moonshot/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
-			{ID: "moonshot/kimi-k2-thinking", Name: "Kimi K2 Thinking"},
-		},
-	},
-	"kimi": {
-		Key:            "kimi",
-		DisplayName:    "Kimi (CN)",
-		Sort:           90,
-		DefaultBaseURL: "https://api.moonshot.cn/v1",
-		EnvKey:         "KIMI_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "kimi/kimi-k2.5", Name: "Kimi K2.5"},
-			{ID: "kimi/kimi-k2-0905-preview", Name: "Kimi K2 0905 Preview"},
-			{ID: "kimi/kimi-k2-thinking", Name: "Kimi K2 Thinking"},
-		},
-	},
-	"zai": {
-		Key:            "zai",
-		DisplayName:    "Z.ai",
-		Sort:           95,
-		DefaultBaseURL: "https://open.bigmodel.cn/api/paas/v4",
-		EnvKey:         "ZAI_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "zai/glm-5", Name: "GLM-5"},
-			{ID: "zai/glm-4.7", Name: "GLM-4.7"},
-			{ID: "zai/glm-4.7-flash", Name: "GLM-4.7-Flash"},
-			{ID: "zai/glm-4.7-flashx", Name: "GLM-4.7-FlashX"},
-		},
-	},
-	"kimi-coding": {
-		Key:            "kimi-coding",
-		DisplayName:    "Kimi Coding",
-		Sort:           100,
-		DefaultBaseURL: "https://api.kimi.com/coding/",
-		EnvKey:         "KIMI_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "kimi-coding/k2p5", Name: "Kimi K2.5"},
-		},
-	},
-	"bailian-coding-plan": {
-		Key:            "bailian-coding-plan",
-		DisplayName:    "阿里云百炼 Coding Plan",
-		Sort:           11,
-		DefaultBaseURL: "https://coding.dashscope.aliyuncs.com/v1",
-		EnvKey:         "QWEN_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "bailian-coding-plan/qwen3.5-plus", Name: "Qwen3.5-Plus"},
-			{ID: "bailian-coding-plan/qwen3-max", Name: "Qwen3-Max"},
-			{ID: "bailian-coding-plan/qwen3-coder-next", Name: "Qwen3-Coder-Next"},
-			{ID: "bailian-coding-plan/qwen3-coder-plus", Name: "Qwen3-Coder-Plus"},
-			{ID: "bailian-coding-plan/minimax-m2.5", Name: "MiniMax M2.5"},
-			{ID: "bailian-coding-plan/glm-5", Name: "GLM-5"},
-			{ID: "bailian-coding-plan/kimi-k2.5", Name: "Kimi-k2.5"},
-			{ID: "bailian-coding-plan/glm-4.7", Name: "GLM-4.7"},
-		},
-	},
-	"ark-coding-plan": {
-		Key:            "ark-coding-plan",
-		DisplayName:    "方舟 Coding Plan",
-		Sort:           12,
-		DefaultBaseURL: "https://ark.cn-beijing.volces.com/api/coding/v3",
-		EnvKey:         "ARK_API_KEY",
-		Enabled:        true,
-		Models: []Model{
-			{ID: "ark-coding-plan/doubao-seed-2.0-code", Name: "Doubao-Seed-2.0-Code"},
-			{ID: "ark-coding-plan/doubao-seed-code", Name: "Doubao-Seed-Code"},
-			{ID: "ark-coding-plan/kimi-k2.5", Name: "Kimi-K2.5"},
-			{ID: "ark-coding-plan/glm-4.7", Name: "GLM-4.7"},
-			{ID: "ark-coding-plan/deepseek-v3.2", Name: "DeepSeek-V3.2"},
-			{ID: "ark-coding-plan/kimi-k2-thinking", Name: "Kimi-K2-thinking"},
-		},
-	},
-	"qwen": {
-		Key:            "qwen",
-		DisplayName:    "Qwen",
-		Sort:           110,
-		DefaultBaseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
-		EnvKey:         "QWEN_API_KEY",
-		Enabled:        false,
-	},
-}
-
-func Get(key string) (Meta, bool) {
-	meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
-	if !ok {
-		return Meta{}, false
-	}
-	return cloneMeta(meta), true
-}
-
-func All() map[string]Meta {
-	result := make(map[string]Meta, len(catalog))
-	for key, meta := range catalog {
-		result[key] = cloneMeta(meta)
-	}
-	return result
-}
-
-func IsEnabled(key string) bool {
-	meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
-	return ok && meta.Enabled
-}
-
-func DefaultBaseURL(key string) (string, bool) {
-	meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
-	if !ok || strings.TrimSpace(meta.DefaultBaseURL) == "" {
-		return "", false
-	}
-	return meta.DefaultBaseURL, true
-}
-
-func EnvKey(key string) string {
-	meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
-	if !ok {
-		return ""
-	}
-	return meta.EnvKey
-}
-
-func DisplayName(key string) string {
-	meta, ok := catalog[strings.ToLower(strings.TrimSpace(key))]
-	if !ok {
-		return key
-	}
-	if strings.TrimSpace(meta.DisplayName) == "" {
-		return key
-	}
-	return meta.DisplayName
-}
-
-func cloneMeta(meta Meta) Meta {
-	clone := meta
-	if len(meta.Models) > 0 {
-		clone.Models = make([]Model, len(meta.Models))
-		copy(clone.Models, meta.Models)
-	}
-	return clone
-}

agent/app/repo/agent.go

@@ -1,75 +0,0 @@
-package repo
-
-import (
-	"context"
-
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-)
-
-type AgentRepo struct{}
-
-type IAgentRepo interface {
-	Page(page, size int, opts ...DBOption) (int64, []model.Agent, error)
-	GetFirst(opts ...DBOption) (*model.Agent, error)
-	Create(agent *model.Agent) error
-	Save(agent *model.Agent) error
-	DeleteByID(id uint) error
-	DeleteByAppInstallID(appInstallID uint) error
-	DeleteByAppInstallIDWithCtx(ctx context.Context, appInstallID uint) error
-	List(opts ...DBOption) ([]model.Agent, error)
-}
-
-func NewIAgentRepo() IAgentRepo {
-	return &AgentRepo{}
-}
-
-func (a AgentRepo) Page(page, size int, opts ...DBOption) (int64, []model.Agent, error) {
-	var agents []model.Agent
-	db := getDb(opts...).Model(&model.Agent{})
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&agents).Error
-	return count, agents, err
-}
-
-func (a AgentRepo) GetFirst(opts ...DBOption) (*model.Agent, error) {
-	var agent model.Agent
-	if err := getDb(opts...).First(&agent).Error; err != nil {
-		return nil, err
-	}
-	return &agent, nil
-}
-
-func (a AgentRepo) Create(agent *model.Agent) error {
-	return getDb().Create(agent).Error
-}
-
-func (a AgentRepo) Save(agent *model.Agent) error {
-	return getDb().Save(agent).Error
-}
-
-func (a AgentRepo) DeleteByID(id uint) error {
-	return getDb().Delete(&model.Agent{}, id).Error
-}
-
-func (a AgentRepo) DeleteByAppInstallID(appInstallID uint) error {
-	if appInstallID == 0 {
-		return nil
-	}
-	return getDb().Where("app_install_id = ?", appInstallID).Delete(&model.Agent{}).Error
-}
-
-func (a AgentRepo) DeleteByAppInstallIDWithCtx(ctx context.Context, appInstallID uint) error {
-	if appInstallID == 0 {
-		return nil
-	}
-	return getTx(ctx).Where("app_install_id = ?", appInstallID).Delete(&model.Agent{}).Error
-}
-
-func (a AgentRepo) List(opts ...DBOption) ([]model.Agent, error) {
-	var agents []model.Agent
-	if err := getDb(opts...).Find(&agents).Error; err != nil {
-		return nil, err
-	}
-	return agents, nil
-}

agent/app/repo/agent_account.go

@@ -1,55 +0,0 @@
-package repo
-
-import "github.com/1Panel-dev/1Panel/agent/app/model"
-
-type AgentAccountRepo struct{}
-
-type IAgentAccountRepo interface {
-	Page(page, size int, opts ...DBOption) (int64, []model.AgentAccount, error)
-	GetFirst(opts ...DBOption) (*model.AgentAccount, error)
-	Create(account *model.AgentAccount) error
-	Save(account *model.AgentAccount) error
-	DeleteByID(id uint) error
-	List(opts ...DBOption) ([]model.AgentAccount, error)
-}
-
-func NewIAgentAccountRepo() IAgentAccountRepo {
-	return &AgentAccountRepo{}
-}
-
-func (a AgentAccountRepo) Page(page, size int, opts ...DBOption) (int64, []model.AgentAccount, error) {
-	var accounts []model.AgentAccount
-	db := getDb(opts...).Model(&model.AgentAccount{})
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&accounts).Error
-	return count, accounts, err
-}
-
-func (a AgentAccountRepo) GetFirst(opts ...DBOption) (*model.AgentAccount, error) {
-	var account model.AgentAccount
-	if err := getDb(opts...).First(&account).Error; err != nil {
-		return nil, err
-	}
-	return &account, nil
-}
-
-func (a AgentAccountRepo) Create(account *model.AgentAccount) error {
-	return getDb().Create(account).Error
-}
-
-func (a AgentAccountRepo) Save(account *model.AgentAccount) error {
-	return getDb().Save(account).Error
-}
-
-func (a AgentAccountRepo) DeleteByID(id uint) error {
-	return getDb().Delete(&model.AgentAccount{}, id).Error
-}
-
-func (a AgentAccountRepo) List(opts ...DBOption) ([]model.AgentAccount, error) {
-	var accounts []model.AgentAccount
-	if err := getDb(opts...).Find(&accounts).Error; err != nil {
-		return nil, err
-	}
-	return accounts, nil
-}

agent/app/repo/app.go

@@ -20,7 +20,6 @@ type IAppRepo interface {
 	WithResource(resource string) DBOption
 	WithNotLocal() DBOption
 	WithByLikeName(name string) DBOption
-	WithKeyIn(keys []string) DBOption
 	WithArch(arch string) DBOption
 	WithPanelVersion(panelVersion string) DBOption
 
@@ -28,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 {
@@ -56,12 +56,6 @@ func (a AppRepo) WithKey(key string) DBOption {
 	}
 }
 
-func (a AppRepo) WithKeyIn(keys []string) DBOption {
-	return func(db *gorm.DB) *gorm.DB {
-		return db.Where("`key` in (?)", keys)
-	}
-}
-
 func (a AppRepo) WithType(typeStr string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("type = ?", typeStr)
@@ -131,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
@@ -150,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/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

@@ -7,7 +7,6 @@ import (
 
 	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/utils/re"
 	"gorm.io/gorm"
 )
 
@@ -73,43 +72,11 @@ func WithByDetailName(detailName string) DBOption {
 	}
 }
 
-func WithByProvider(provider string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if len(provider) == 0 {
-			return g
-		}
-		return g.Where("provider = ?", provider)
-	}
-}
-
-func WithByModel(model string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if len(model) == 0 {
-			return g
-		}
-		return g.Where("model = ?", model)
-	}
-}
-
-func WithByAccountID(accountID uint) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if accountID == 0 {
-			return g
-		}
-		return g.Where("account_id = ?", accountID)
-	}
-}
-
 func WithByType(tp string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		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 {
@@ -152,30 +119,23 @@ func WithByCreatedAt(startTime, endTime time.Time) DBOption {
 	}
 }
 
-func WithOrderDesc(orderBy string) DBOption {
-	return WithOrderRuleBy(orderBy, constant.Desc)
+func WithOrderBy(orderStr string) DBOption {
+	if orderStr == "createdAt" {
+		orderStr = "created_at"
+	}
+	return func(g *gorm.DB) *gorm.DB {
+		return g.Order(orderStr)
+	}
 }
-
-func WithOrderAsc(orderBy string) DBOption {
-	return WithOrderRuleBy(orderBy, constant.Asc)
-}
-
 func WithOrderRuleBy(orderBy, order string) DBOption {
 	if orderBy == "createdAt" {
 		orderBy = "created_at"
 	}
-	if !re.GetRegex(re.OrderByValidationPattern).MatchString(orderBy) {
-		orderBy = "created_at"
-	}
 	switch order {
 	case constant.OrderDesc:
 		order = "desc"
 	case constant.OrderAsc:
 		order = "asc"
-	case constant.Desc:
-		order = "desc"
-	case constant.Asc:
-		order = "asc"
 	default:
 		orderBy = "created_at"
 		order = "desc"

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,16 +4,16 @@ 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)
@@ -22,8 +22,6 @@ type IHostRepo interface {
 	SaveCert(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
@@ -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/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

@@ -60,7 +60,7 @@ func (a AlertService) PageAlert(search dto.AlertSearch) (int64, []dto.AlertDTO,
 	if search.Type != "" {
 		opts = append(opts, alertRepo.WithByType(search.Type))
 	}
-	opts = append(opts, repo.WithOrderDesc("created_at"))
+	opts = append(opts, repo.WithOrderBy("created_at desc"))
 
 	total, alerts, err := alertRepo.Page(search.Page, search.PageSize, opts...)
 	if err != nil {
@@ -343,7 +343,7 @@ func (a AlertService) PageAlertLogs(search dto.AlertLogSearch) (int64, []dto.Ale
 	if search.Count != 0 {
 		opts = append(opts, alertRepo.WithByCount(search.Count))
 	}
-	opts = append(opts, repo.WithOrderDesc("created_at"))
+	opts = append(opts, repo.WithOrderBy("created_at desc"))
 
 	total, alerts, err := alertRepo.PageLog(search.Page, search.PageSize, opts...)
 	if err != nil {
@@ -486,10 +486,9 @@ func (a AlertService) TestAlertConfig(req dto.AlertConfigTest) (bool, error) {
 	cfg := email.SMTPConfig{
 		Host:       req.Host,
 		Port:       req.Port,
-		Sender:     req.Sender,
 		Username:   username,
 		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

@@ -2,7 +2,6 @@ package service
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
@@ -10,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"
@@ -111,7 +109,7 @@ func (m *AlertTaskHelper) getClassifiedAlerts() (baseAlerts, resourceAlerts []dt
 
 func handleBaseAlerts(baseAlerts []dto.AlertDTO) {
 	if len(baseAlerts) == 0 {
-		stopBaseJob()
+		stopResourceJob()
 		return
 	}
 	if global.AlertBaseJobID == 0 {
@@ -228,30 +226,11 @@ func loadSSLInfo(alert dto.AlertDTO) {
 		return
 	}
 	sender := NewAlertSender(alert, projectJSON)
-	minDays := math.MaxInt
-	maxDays := 0
-	allDomains := make([]string, 0)
 	for daysDiff, domains := range daysDiffMap {
-		allDomains = append(allDomains, domains...)
-		if daysDiff < minDays {
-			minDays = daysDiff
-		}
-		if daysDiff > maxDays {
-			maxDays = daysDiff
-		}
+		domainStr := strings.Join(domains, ",")
+		params := createAlertBaseParams(strconv.Itoa(len(domains)), strconv.Itoa(daysDiff))
+		sender.Send(domainStr, params)
 	}
-	if len(allDomains) == 0 {
-		return
-	}
-	var daysStr string
-	if len(allDomains) == 1 {
-		daysStr = strconv.Itoa(minDays)
-	} else {
-		daysStr = strconv.Itoa(minDays) + "-" + strconv.Itoa(maxDays)
-	}
-	domainStr := strings.Join(allDomains, ",")
-	params := createAlertBaseParams(strconv.Itoa(len(daysDiffMap)), daysStr)
-	sender.Send(domainStr, params)
 }
 
 func loadWebsiteInfo(alert dto.AlertDTO) {
@@ -267,30 +246,11 @@ func loadWebsiteInfo(alert dto.AlertDTO) {
 		return
 	}
 	sender := NewAlertSender(alert, projectJSON)
-	minDays := math.MaxInt
-	maxDays := 0
-	allDomains := make([]string, 0)
 	for daysDiff, domains := range daysDiffMap {
-		allDomains = append(allDomains, domains...)
-		if daysDiff < minDays {
-			minDays = daysDiff
-		}
-		if daysDiff > maxDays {
-			maxDays = daysDiff
-		}
+		domainStr := strings.Join(domains, ",")
+		params := createAlertBaseParams(strconv.Itoa(len(domains)), strconv.Itoa(daysDiff))
+		sender.Send(domainStr, params)
 	}
-	if len(allDomains) == 0 {
-		return
-	}
-	var daysStr string
-	if len(allDomains) == 1 {
-		daysStr = strconv.Itoa(minDays)
-	} else {
-		daysStr = strconv.Itoa(minDays) + "-" + strconv.Itoa(maxDays)
-	}
-	domainStr := strings.Join(allDomains, ",")
-	params := createAlertBaseParams(strconv.Itoa(len(daysDiffMap)), daysStr)
-	sender.Send(domainStr, params)
 }
 
 func loadPanelPwd(alert dto.AlertDTO) {
@@ -392,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
@@ -619,12 +579,10 @@ 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)
+
 			case constant.Email:
 				todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, constant.Email)
 				if !isValid {
@@ -640,32 +598,9 @@ 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)
-			case constant.WeCom, constant.DingTalk, constant.FeiShu:
-				todayCount, isValid := canSendAlertToday(alertType, quotaType, alert.SendCount, m)
-				if !isValid {
-					continue
-				}
-				var create = dto.AlertLogCreate{
-					Type:    alertUtil.GetCronJobType(alert.Type),
-					AlertId: alert.ID,
-					Count:   todayCount + 1,
-				}
-				transport := xpack.LoadRequestTransport()
-				agentInfo, _ := xpack.GetAgentInfo()
-				err := xpack.CreateWebhookAlertLog(alertType, alert, create, quotaType, params, m, transport, agentInfo)
-				if err != nil {
-					global.LOG.Infof("%s alert webhook %s push faild, err: %v", alertType, m, err)
-					continue
-				}
-				alertUtil.CreateNewAlertTask(quota, alertType, quotaType, m)
-			default:
+				global.LOG.Infof("%s alert email push successful", alertType)
 			}
 		}
 	}
@@ -705,9 +640,7 @@ func calculateSSLExpiryDays(sslList []model.WebsiteSSL, cycle uint) (map[int][]s
 	projectMap := make(map[uint][]time.Time)
 
 	for _, ssl := range sslList {
-		daysDiff := int(math.Ceil(
-			ssl.ExpireDate.Sub(currentDate).Hours() / 24,
-		))
+		daysDiff := int(ssl.ExpireDate.Sub(currentDate).Hours() / 24)
 		if daysDiff > 0 && int(cycle) >= daysDiff {
 			daysDiffMap[daysDiff] = append(daysDiffMap[daysDiff], ssl.PrimaryDomain)
 			projectMap[ssl.ID] = append(projectMap[ssl.ID], ssl.ExpireDate)
@@ -722,9 +655,7 @@ func calculateWebsiteExpiryDays(websites []model.Website, cycle uint) (map[int][
 	projectMap := make(map[uint][]time.Time)
 
 	for _, website := range websites {
-		daysDiff := int(math.Ceil(
-			website.ExpireDate.Sub(currentDate).Hours() / 24,
-		))
+		daysDiff := int(website.ExpireDate.Sub(currentDate).Hours() / 24)
 		if daysDiff > 0 && int(cycle) >= daysDiff {
 			daysDiffMap[daysDiff] = append(daysDiffMap[daysDiff], website.PrimaryDomain)
 			projectMap[website.ID] = append(projectMap[website.ID], website.ExpireDate)
@@ -888,36 +819,30 @@ func processAllDisks(alert dto.AlertDTO) error {
 		global.LOG.Errorf("error getting disk list, err: %v", err)
 		return err
 	}
-	var errMsgs []string
 	for _, item := range diskList {
-		err := checkAndCreateDiskAlert(alert, item.Path)
-		if err != nil {
-			errMsg := fmt.Sprintf("disk path %s process failed: %v", item.Path, err)
-			errMsgs = append(errMsgs, errMsg)
-			global.LOG.Errorf(errMsg)
-			continue
+		if success, err := checkAndCreateDiskAlert(alert, item.Path); err == nil && success {
+			global.LOG.Infof("disk alert pushed successfully for %s", item.Path)
 		}
 	}
-	if len(errMsgs) > 0 {
-		return fmt.Errorf("batch process disks failed, error count: %d, details: %s", len(errMsgs), strings.Join(errMsgs, "; "))
-	}
 	return nil
 }
 
 func processSingleDisk(alert dto.AlertDTO) error {
-	err := checkAndCreateDiskAlert(alert, alert.Project)
+	success, err := checkAndCreateDiskAlert(alert, alert.Project)
 	if err != nil {
-		global.LOG.Errorf(err.Error())
 		return err
 	}
+	if success {
+		global.LOG.Infof("disk alert pushed successfully for %s", alert.Project)
+	}
 	return nil
 }
 
-func checkAndCreateDiskAlert(alert dto.AlertDTO, path string) error {
-	usageStat, err := psutil.DISK.GetUsage(path, false)
+func checkAndCreateDiskAlert(alert dto.AlertDTO, path string) (bool, error) {
+	usageStat, err := disk.Usage(path)
 	if err != nil {
 		global.LOG.Errorf("error getting disk usage for %s, err: %v", path, err)
-		return err
+		return false, err
 	}
 
 	usedTotal, usedStr := calculateUsedTotal(alert.Cycle, usageStat)
@@ -926,12 +851,13 @@ func checkAndCreateDiskAlert(alert dto.AlertDTO, path string) error {
 		commonTotal *= 1024 * 1024 * 1024
 	}
 	if usedTotal < commonTotal {
-		return nil
+		return false, nil
 	}
+	global.LOG.Infof("disk「 %s 」usage: %s", path, usedStr)
 	params := createAlertDiskParams(path, usedStr)
 	sender := NewAlertSender(alert, alert.Project)
 	sender.ResourceSend(path, params)
-	return nil
+	return true, nil
 }
 
 func calculateUsedTotal(cycle uint, usageStat *disk.UsageStat) (float64, string) {

agent/app/service/alert_sender.go

@@ -30,8 +30,6 @@ func (s *AlertSender) Send(quota string, params []dto.Param) {
 			s.sendSMS(quota, params)
 		case constant.Email:
 			s.sendEmail(quota, params)
-		case constant.WeCom, constant.DingTalk, constant.FeiShu:
-			s.sendWebhook(quota, params, method)
 		}
 	}
 }
@@ -45,8 +43,6 @@ func (s *AlertSender) ResourceSend(quota string, params []dto.Param) {
 			s.sendResourceSMS(quota, params)
 		case constant.Email:
 			s.sendResourceEmail(quota, params)
-		case constant.WeCom, constant.DingTalk, constant.FeiShu:
-			s.sendResourceWebhook(quota, params, method)
 		}
 	}
 }
@@ -68,12 +64,9 @@ func (s *AlertSender) sendSMS(quota string, params []dto.Param) {
 		Type:    s.alert.Type,
 	}
 
-	err := xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS)
-	if err != nil {
-		global.LOG.Errorf("%s alert sms push failed: %v", s.alert.Type, err)
-		return
-	}
+	_ = xpack.CreateSMSAlertLog(s.alert.Type, s.alert, create, quota, params, constant.SMS)
 	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
+	global.LOG.Infof("%s alert sms push successful", s.alert.Type)
 }
 
 func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
@@ -92,35 +85,9 @@ func (s *AlertSender) sendEmail(quota string, params []dto.Param) {
 	}
 
 	transport := xpack.LoadRequestTransport()
-	agentInfo, _ := xpack.GetAgentInfo()
-	err := alertUtil.CreateEmailAlertLog(create, s.alert, params, transport, agentInfo)
-	if err != nil {
-		global.LOG.Errorf("%s alert email push failed: %v", s.alert.Type, err)
-		return
-	}
+	_ = alertUtil.CreateEmailAlertLog(create, s.alert, params, transport)
 	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
-}
-
-func (s *AlertSender) sendWebhook(quota string, params []dto.Param, method string) {
-	totalCount, isValid := s.canSendAlert(method)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:  constant.AlertSuccess,
-		Count:   totalCount + 1,
-		AlertId: s.alert.ID,
-		Type:    s.alert.Type,
-	}
-	transport := xpack.LoadRequestTransport()
-	agentInfo, _ := xpack.GetAgentInfo()
-	err := xpack.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, method, transport, agentInfo)
-	if err != nil {
-		global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, method, err)
-		return
-	}
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
+	global.LOG.Infof("%s alert email push successful", s.alert.Type)
 }
 
 func (s *AlertSender) sendResourceSMS(quota string, params []dto.Param) {
@@ -145,6 +112,7 @@ func (s *AlertSender) sendResourceSMS(quota string, params []dto.Param) {
 		return
 	}
 	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.SMS)
+	global.LOG.Infof("%s alert sms push successful", s.alert.Type)
 }
 
 func (s *AlertSender) sendResourceEmail(quota string, params []dto.Param) {
@@ -163,33 +131,12 @@ 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
 	}
 	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, constant.Email)
-}
-
-func (s *AlertSender) sendResourceWebhook(quota string, params []dto.Param, method string) {
-	todayCount, isValid := s.canResourceSendAlert(method)
-	if !isValid {
-		return
-	}
-
-	create := dto.AlertLogCreate{
-		Status:  constant.AlertSuccess,
-		Count:   todayCount + 1,
-		AlertId: s.alert.ID,
-		Type:    s.alert.Type,
-	}
-	transport := xpack.LoadRequestTransport()
-	agentInfo, _ := xpack.GetAgentInfo()
-	if err := xpack.CreateWebhookAlertLog(s.alert.Type, s.alert, create, quota, params, method, transport, agentInfo); err != nil {
-		global.LOG.Errorf("%s alert %s webhook push failed: %v", s.alert.Type, method, err)
-		return
-	}
-	alertUtil.CreateNewAlertTask(quota, s.alert.Type, s.quotaType, method)
+	global.LOG.Infof("%s alert email push successful", s.alert.Type)
 }
 
 func (s *AlertSender) canSendAlert(method string) (uint, bool) {

agent/app/service/app.go

@@ -12,7 +12,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/gin-gonic/gin"
 
@@ -26,7 +25,6 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/i18n"
-	"github.com/1Panel-dev/1Panel/agent/utils/appicon"
 	"github.com/1Panel-dev/1Panel/agent/utils/common"
 	"github.com/1Panel-dev/1Panel/agent/utils/docker"
 	"github.com/1Panel-dev/1Panel/agent/utils/files"
@@ -35,33 +33,26 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var (
-	appStoreSyncMu  sync.Mutex
-	appStoreSyncing bool
-)
-
 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)
-	Install(req request.AppInstallCreate, executeScript bool) (*model.AppInstall, error)
+	Install(req request.AppInstallCreate) (*model.AppInstall, error)
 	SyncAppListFromRemote(taskID string) error
 	GetAppUpdate() (*response.AppUpdateRes, error)
 	GetAppDetailByID(id uint) (*response.AppDetailDTO, error)
 	SyncAppListFromLocal(taskID string)
-	GetAppIcon(key string) ([]byte, string, string, 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 != "" {
@@ -107,7 +98,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 {
@@ -126,24 +117,25 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (*response.
 			}
 		}
 		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
@@ -203,7 +195,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
@@ -212,20 +221,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
@@ -339,7 +334,7 @@ func (a AppService) GetAppDetailByID(id uint) (*response.AppDetailDTO, error) {
 	return res, nil
 }
 
-func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (appInstall *model.AppInstall, err error) {
+func (a AppService) Install(req request.AppInstallCreate) (appInstall *model.AppInstall, err error) {
 	if err = docker.CreateDefaultDockerNetwork(); err != nil {
 		err = buserr.WithDetail("Err1PanelNetworkFailed", err.Error(), nil)
 		return
@@ -409,21 +404,11 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
 		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.AppRepoURL(), 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
 		}
@@ -465,11 +450,10 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
 		}
 		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
 
@@ -516,10 +500,6 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
 	}
 	appInstall.Env = string(paramByte)
 
-	var maxSort int
-	global.DB.Model(&model.AppInstall{}).Where("favorite = ?", false).Select("COALESCE(MAX(sort_order),0)").Scan(&maxSort)
-	appInstall.SortOrder = maxSort + 1
-
 	if err = appInstallRepo.Create(context.Background(), appInstall); err != nil {
 		return
 	}
@@ -537,10 +517,8 @@ func (a AppService) Install(req request.AppInstallCreate, executeScript bool) (a
 		if err = copyData(t, app, appDetail, appInstall, req); err != nil {
 			return err
 		}
-		if executeScript {
-			if err = runScript(t, appInstall, "init"); err != nil {
-				return err
-			}
+		if err = runScript(t, appInstall, "init"); err != nil {
+			return err
 		}
 		if app.Key == "openresty" {
 			if err = handleSiteDir(app, appDetail, req, t); err != nil {
@@ -815,13 +793,8 @@ 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.AppRepoURL(), global.CONF.Base.Mode)
+	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)
 	if err != nil {
 		return nil, err
@@ -852,13 +825,6 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
 			res.CanUpdate = true
 			return res, err
 		}
-		if appicon.IsIconFile(app.Icon) {
-			fileName, _ := appicon.ParseIconField(app.Icon)
-			if fileName == "" || !appicon.IconFileExists(fileName) {
-				res.CanUpdate = true
-				return res, err
-			}
-		}
 	}
 
 	list, err := getAppList()
@@ -893,19 +859,17 @@ func getAppFromRepo(downloadPath string) error {
 
 func getAppList() (*dto.AppList, error) {
 	list := &dto.AppList{}
-	if err := getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.AppRepoURL(), global.CONF.Base.Mode)); err != nil {
+	if err := getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.CONF.RemoteURL.AppRepo, global.CONF.Base.Mode)); err != nil {
 		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
 }
 
@@ -916,116 +880,283 @@ var InitTypes = map[string]struct{}{
 }
 
 func deleteCustomApp() {
-	installs, err := appInstallRepo.ListBy(context.Background())
-	if err != nil {
-		global.LOG.Errorf("[AppStore] deleteCustomApp: failed to list installs, skipping: %v", err)
-		return
-	}
 	var appIDS []uint
+	installs, _ := appInstallRepo.ListBy(context.Background())
 	for _, install := range installs {
 		appIDS = append(appIDS, install.AppId)
 	}
 	var ops []repo.DBOption
+	ops = append(ops, repo.WithByIDNotIn(appIDS))
 	if len(appIDS) > 0 {
 		ops = append(ops, repo.WithByIDNotIn(appIDS))
 	}
-	apps, err := appRepo.GetBy(ops...)
-	if err != nil {
-		global.LOG.Errorf("[AppStore] deleteCustomApp: failed to get apps, skipping: %v", err)
-		return
-	}
+	apps, _ := appRepo.GetBy(ops...)
 	var deleteIDS []uint
 	for _, app := range apps {
 		if app.Resource == constant.AppResourceCustom {
 			deleteIDS = append(deleteIDS, app.ID)
 		}
 	}
-	if len(deleteIDS) == 0 {
-		return
-	}
-	if err = appRepo.DeleteByIDs(context.Background(), deleteIDS); err != nil {
-		global.LOG.Errorf("[AppStore] deleteCustomApp: failed to delete apps: %v", err)
-	}
-	if err = appDetailRepo.DeleteByAppIds(context.Background(), deleteIDS); err != nil {
-		global.LOG.Errorf("[AppStore] deleteCustomApp: failed to delete app details: %v", err)
-	}
+	_ = appRepo.DeleteByIDs(context.Background(), deleteIDS)
+	_ = appDetailRepo.DeleteByAppIds(context.Background(), deleteIDS)
 }
 
 func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
 	if xpack.IsUseCustomApp() {
 		return nil
 	}
-
-	appStoreSyncMu.Lock()
-	global.LOG.Info("[AppStore] sync app from remote task create start")
-	if appStoreSyncing {
-		appStoreSyncMu.Unlock()
-		global.LOG.Info("[AppStore] sync already in progress, skipping")
-		return nil
-	}
-	appStoreSyncing = true
-	appStoreSyncMu.Unlock()
-
 	syncTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("App"), task.TaskSync, task.TaskScopeAppStore, taskID, 0)
 	if err != nil {
-		appStoreSyncMu.Lock()
-		appStoreSyncing = false
-		appStoreSyncMu.Unlock()
 		return err
 	}
+	syncTask.AddSubTask(task.GetTaskName(i18n.GetMsgByKey("App"), task.TaskSync, task.TaskScopeAppStore), func(t *task.Task) (err error) {
+		updateRes, err := a.GetAppUpdate()
+		if err != nil {
+			return err
+		}
+		if !updateRes.CanUpdate {
+			if updateRes.IsSyncing {
+				t.Log(i18n.GetMsgByKey("AppStoreIsSyncing"))
+				return nil
+			}
+			t.Log(i18n.GetMsgByKey("AppStoreIsUpToDate"))
+			return nil
+		}
+		list := &dto.AppList{}
+		if updateRes.AppList == nil {
+			list, err = getAppList()
+			if err != nil {
+				return err
+			}
+		} else {
+			list = updateRes.AppList
+		}
+		settingService := NewISettingService()
+		_ = settingService.Update("AppStoreSyncStatus", constant.StatusSyncing)
 
-	var sharedCtx *appSyncContext
+		setting, err := settingService.GetSettingInfo()
+		if err != nil {
+			return err
+		}
+		var (
+			appTags   []*model.AppTag
+			oldAppIds []uint
+		)
+		if err = SyncTags(list.Extra); err != nil {
+			return err
+		}
+		deleteCustomApp()
+		oldApps, err := appRepo.GetBy(appRepo.WithNotLocal())
+		if err != nil {
+			return err
+		}
+		for _, old := range oldApps {
+			oldAppIds = append(oldAppIds, old.ID)
+		}
 
-	syncTask.AddSubTask(task.GetTaskName(i18n.GetMsgByKey("App"), task.TaskSync, task.TaskScopeAppStore), a.createSyncAppStoreTask(&sharedCtx), nil)
-	syncTask.AddSubTask(i18n.GetMsgByKey("SyncAppDetail"), a.createSyncAppStoreMetaTask(&sharedCtx), nil)
+		baseRemoteUrl := fmt.Sprintf("%s/%s/1panel", global.CONF.RemoteURL.AppRepo, global.CONF.Base.Mode)
 
-	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				global.LOG.Errorf("[AppStore] sync goroutine recovered from panic: %v", r)
-				if updateErr := NewISettingService().Update("AppStoreSyncStatus", constant.StatusError); updateErr != nil {
-					global.LOG.Warnf("[AppStore] failed to update sync status after panic: %v", updateErr)
+		appsMap := getApps(oldApps, list.Apps, setting.SystemVersion, t)
+
+		t.LogStart(i18n.GetMsgByKey("SyncAppDetail"))
+		for _, l := range list.Apps {
+			app, ok := appsMap[l.AppProperty.Key]
+			if !ok {
+				continue
+			}
+			iconStr := ""
+			_, iconRes, err := req_helper.HandleRequest(l.Icon, http.MethodGet, constant.TimeOut20s)
+			if err == nil {
+				if !strings.Contains(string(iconRes), "<xml>") {
+					iconStr = base64.StdEncoding.EncodeToString(iconRes)
 				}
 			}
-			appStoreSyncMu.Lock()
-			appStoreSyncing = false
-			appStoreSyncMu.Unlock()
+			app.Icon = iconStr
+			app.TagsKey = l.AppProperty.Tags
+			if l.AppProperty.Recommend > 0 {
+				app.Recommend = l.AppProperty.Recommend
+			} else {
+				app.Recommend = 9999
+			}
+			app.ReadMe = l.ReadMe
+			app.LastModified = l.LastModified
+			versions := l.Versions
+			detailsMap := getAppDetails(app.Details, versions)
+			for _, v := range versions {
+				version := v.Name
+				detail := detailsMap[version]
+				versionUrl := fmt.Sprintf("%s/%s/%s", baseRemoteUrl, app.Key, version)
+				paramByte, _ := json.Marshal(v.AppForm)
+				var appForm dto.AppForm
+				_ = json.Unmarshal(paramByte, &appForm)
+				if appForm.SupportVersion > 0 && common.CompareVersion(strconv.FormatFloat(appForm.SupportVersion, 'f', -1, 64), setting.SystemVersion) {
+					delete(detailsMap, version)
+					continue
+				}
+				if _, ok := InitTypes[app.Type]; ok {
+					dockerComposeUrl := fmt.Sprintf("%s/%s", versionUrl, "docker-compose.yml")
+					_, composeRes, err := req_helper.HandleRequest(dockerComposeUrl, http.MethodGet, constant.TimeOut20s)
+					if err == nil {
+						detail.DockerCompose = string(composeRes)
+					}
+				} else {
+					detail.DockerCompose = ""
+				}
+
+				detail.Params = string(paramByte)
+				detail.DownloadUrl = fmt.Sprintf("%s/%s", versionUrl, app.Key+"-"+version+".tar.gz")
+				detail.DownloadCallBackUrl = v.DownloadCallBackUrl
+				detail.Update = true
+				detail.LastModified = v.LastModified
+				detailsMap[version] = detail
+			}
+			var newDetails []model.AppDetail
+			for _, detail := range detailsMap {
+				newDetails = append(newDetails, detail)
+			}
+			app.Details = newDetails
+			appsMap[l.AppProperty.Key] = app
+		}
+		t.LogSuccess(i18n.GetMsgByKey("SyncAppDetail"))
+
+		tags, _ := tagRepo.All()
+		var (
+			addAppArray    []model.App
+			updateAppArray []model.App
+			deleteAppArray []model.App
+			deleteIds      []uint
+			tagMap         = make(map[string]uint, len(tags))
+		)
+
+		for _, v := range appsMap {
+			if v.ID == 0 {
+				addAppArray = append(addAppArray, v)
+			} else {
+				if v.Status == constant.AppTakeDown {
+					installs, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(v.ID))
+					if len(installs) > 0 {
+						updateAppArray = append(updateAppArray, v)
+						continue
+					}
+					deleteAppArray = append(deleteAppArray, v)
+					deleteIds = append(deleteIds, v.ID)
+				} else {
+					updateAppArray = append(updateAppArray, v)
+				}
+			}
+		}
+
+		tx, ctx := getTxAndContext()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+				return
+			}
 		}()
-		if err := syncTask.Execute(); err != nil {
-			if updateErr := NewISettingService().Update("AppStoreLastModified", "0"); updateErr != nil {
-				global.LOG.Warnf("[AppStore] failed to reset last modified: %v", updateErr)
+		if len(addAppArray) > 0 {
+			if err = appRepo.BatchCreate(ctx, addAppArray); err != nil {
+				return
 			}
-			if updateErr := NewISettingService().Update("AppStoreSyncStatus", constant.StatusError); updateErr != nil {
-				global.LOG.Warnf("[AppStore] failed to update sync status to error: %v", updateErr)
+		}
+		if len(deleteAppArray) > 0 {
+			if err = appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
+				return
 			}
-			return
+			if err = appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
+				return
+			}
+		}
+		for _, tag := range tags {
+			tagMap[tag.Key] = tag.ID
+		}
+		for _, update := range updateAppArray {
+			if err = appRepo.Save(ctx, &update); err != nil {
+				return
+			}
+		}
+		apps := append(addAppArray, updateAppArray...)
+
+		var (
+			addDetails    []model.AppDetail
+			updateDetails []model.AppDetail
+			deleteDetails []model.AppDetail
+		)
+		for _, app := range apps {
+			for _, tag := range app.TagsKey {
+				tagId, ok := tagMap[tag]
+				if ok {
+					exist, _ := appTagRepo.GetFirst(ctx, appTagRepo.WithByTagID(tagId), appTagRepo.WithByAppID(app.ID))
+					if exist == nil {
+						appTags = append(appTags, &model.AppTag{
+							AppId: app.ID,
+							TagId: tagId,
+						})
+					}
+				}
+			}
+			for _, d := range app.Details {
+				d.AppId = app.ID
+				if d.ID == 0 {
+					addDetails = append(addDetails, d)
+				} else {
+					if d.Status == constant.AppTakeDown {
+						runtime, _ := runtimeRepo.GetFirst(ctx, runtimeRepo.WithDetailId(d.ID))
+						if runtime != nil {
+							updateDetails = append(updateDetails, d)
+							continue
+						}
+						installs, _ := appInstallRepo.ListBy(ctx, appInstallRepo.WithDetailIdsIn([]uint{d.ID}))
+						if len(installs) > 0 {
+							updateDetails = append(updateDetails, d)
+							continue
+						}
+						deleteDetails = append(deleteDetails, d)
+					} else {
+						updateDetails = append(updateDetails, d)
+					}
+				}
+			}
+		}
+		if len(addDetails) > 0 {
+			if err = appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
+				return
+			}
+		}
+		if len(deleteDetails) > 0 {
+			if err = appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
+				return
+			}
+		}
+		for _, u := range updateDetails {
+			if err = appDetailRepo.Update(ctx, u); err != nil {
+				return
+			}
+		}
+
+		if len(oldAppIds) > 0 {
+			if err = appTagRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
+				return
+			}
+		}
+
+		if len(appTags) > 0 {
+			if err = appTagRepo.BatchCreate(ctx, appTags); err != nil {
+				return
+			}
+		}
+		tx.Commit()
+
+		_ = settingService.Update("AppStoreSyncStatus", constant.StatusSyncSuccess)
+		_ = settingService.Update("AppStoreLastModified", strconv.Itoa(list.LastModified))
+		return nil
+	}, nil)
+
+	go func() {
+		if err = syncTask.Execute(); err != nil {
+			_ = NewISettingService().Update("AppStoreLastModified", "0")
+			_ = NewISettingService().Update("AppStoreSyncStatus", constant.StatusError)
 		}
 	}()
 
-	global.LOG.Info("[AppStore] sync app from remote task create ok")
 	return nil
 }
-
-func (a AppService) GetAppIcon(key string) ([]byte, string, string, error) {
-	app, err := appRepo.GetFirst(appRepo.WithKey(key))
-	if err != nil {
-		return nil, "", "", err
-	}
-
-	if appicon.IsIconFile(app.Icon) {
-		fileName, etag := appicon.ParseIconField(app.Icon)
-		iconBytes, err := appicon.ReadIconFile(fileName)
-		if err != nil {
-			global.LOG.Warnf("[AppIcon] read icon file failed key=%s, file=%s, err=%v", key, fileName, err)
-			return nil, "", "", nil
-		}
-		return iconBytes, fileName, etag, nil
-	}
-
-	iconBytes, err := base64.StdEncoding.DecodeString(app.Icon)
-	if err != nil {
-		global.LOG.Warnf("[AppIcon] decode base64 icon failed key=%s, err=%v", key, err)
-		return nil, "", "", nil
-	}
-	return iconBytes, "", "", nil
-}

agent/app/service/app_install.go

@@ -57,7 +57,6 @@ type IAppInstallService interface {
 	UpdateAppConfig(req request.AppConfigUpdate) error
 	GetInstallList() ([]dto.AppInstallInfo, error)
 	GetAppInstallInfo(appInstallID uint) (*response.AppInstallInfo, error)
-	UpdateSort(req request.AppInstallSort) error
 }
 
 func NewIAppInstalledService() IAppInstallService {
@@ -84,7 +83,6 @@ func (a *AppInstallService) Page(req request.AppInstalledSearch) (int64, []respo
 		err      error
 	)
 	opts = append(opts, repo.WithOrderRuleBy("favorite", "descending"))
-	opts = append(opts, repo.WithOrderRuleBy("sort_order", "ascending"))
 
 	if req.Name != "" {
 		opts = append(opts, repo.WithByLikeName(req.Name))
@@ -123,7 +121,7 @@ func (a *AppInstallService) Page(req request.AppInstalledSearch) (int64, []respo
 		}
 	}
 
-	installDTOs, _ := handleInstalled(installs, req.Update, req.Sync, req.CheckUpdate)
+	installDTOs, _ := handleInstalled(installs, req.Update, req.Sync)
 	if req.Update {
 		total = int64(len(installDTOs))
 	}
@@ -240,7 +238,7 @@ func (a *AppInstallService) SearchForWebsite(req request.AppInstalledSearch) ([]
 		}
 	}
 
-	return handleInstalled(installs, false, true, false)
+	return handleInstalled(installs, false, true)
 }
 
 func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
@@ -302,9 +300,6 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
 		return opNginx(install.ContainerName, constant.NginxReload)
 	case constant.Favorite:
 		install.Favorite = req.Favorite
-		var maxSort int
-		global.DB.Model(&model.AppInstall{}).Where("favorite = ?", req.Favorite).Select("COALESCE(MAX(sort_order),0)").Scan(&maxSort)
-		install.SortOrder = maxSort + 1
 		return appInstallRepo.Save(context.Background(), &install)
 	default:
 		return errors.New("operate not support")
@@ -323,15 +318,6 @@ func (a *AppInstallService) UpdateAppConfig(req request.AppConfigUpdate) error {
 	return appInstallRepo.Save(context.Background(), &installed)
 }
 
-func (a *AppInstallService) UpdateSort(req request.AppInstallSort) error {
-	for _, item := range req.Items {
-		if err := appInstallRepo.BatchUpdateBy(map[string]interface{}{"sort_order": item.SortOrder}, repo.WithByID(item.InstallID)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func (a *AppInstallService) Update(req request.AppInstalledUpdate) error {
 	installed, err := appInstallRepo.GetFirst(repo.WithByID(req.InstallId))
 	if err != nil {
@@ -529,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)
 		}
@@ -811,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
 }
 
@@ -958,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_sync_task.go

@@ -1,608 +0,0 @@
-package service
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-	"github.com/1Panel-dev/1Panel/agent/app/task"
-	"github.com/1Panel-dev/1Panel/agent/constant"
-	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/i18n"
-	"github.com/1Panel-dev/1Panel/agent/utils/appicon"
-	"github.com/1Panel-dev/1Panel/agent/utils/common"
-	"github.com/1Panel-dev/1Panel/agent/utils/req_helper"
-	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
-)
-
-type appSyncContext struct {
-	task           *task.Task
-	httpClient     http.Client
-	baseRemoteUrl  string
-	systemVersion  string
-	appsMap        map[string]model.App
-	settingService ISettingService
-	list           *dto.AppList
-	oldAppIds      []uint
-	appTags        []*model.AppTag
-	skipMetaSync   bool
-	pendingIcons   map[string]string
-}
-
-func (a AppService) createSyncAppStoreTask(sharedCtx **appSyncContext) func(t *task.Task) error {
-	return func(t *task.Task) (err error) {
-		t.LogStart(i18n.GetMsgByKey("AppStore") + " " + i18n.GetMsgByKey("TaskSync"))
-
-		updateRes, err := a.GetAppUpdate()
-		if err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("CheckAppStoreUpdate"), err)
-			return err
-		}
-		if !updateRes.CanUpdate {
-			if updateRes.IsSyncing {
-				t.Log(i18n.GetMsgByKey("AppStoreIsSyncing"))
-				return nil
-			}
-			global.LOG.Infof("[AppStore] Appstore is up to date")
-			t.Log(i18n.GetMsgByKey("AppStoreIsUpToDate"))
-			*sharedCtx = &appSyncContext{skipMetaSync: true}
-			t.LogSuccess(i18n.GetMsgByKey("AppStore") + " " + i18n.GetMsgByKey("TaskSync"))
-			return nil
-		}
-
-		list := &dto.AppList{}
-		if updateRes.AppList == nil {
-			list, err = getAppList()
-			if err != nil {
-				t.LogFailedWithErr(i18n.GetMsgByKey("DownloadAppList"), err)
-				return err
-			}
-		} else {
-			list = updateRes.AppList
-		}
-
-		settingService := NewISettingService()
-		if err := settingService.Update("AppStoreSyncStatus", constant.StatusSyncing); err != nil {
-			global.LOG.Warnf("[AppStore] failed to update sync status to syncing: %v", err)
-		}
-
-		setting, err := settingService.GetSettingInfo()
-		if err != nil {
-			t.LogFailedWithErr("GetSettingInfo", err)
-			return err
-		}
-
-		ctx := &appSyncContext{
-			task:           t,
-			httpClient:     http.Client{Timeout: time.Duration(constant.TimeOut20s) * time.Second, Transport: xpack.LoadRequestTransport()},
-			baseRemoteUrl:  fmt.Sprintf("%s/%s/1panel", global.AppRepoURL(), global.CONF.Base.Mode),
-			systemVersion:  setting.SystemVersion,
-			settingService: settingService,
-			list:           list,
-			appTags:        make([]*model.AppTag, 0),
-			pendingIcons:   make(map[string]string),
-		}
-
-		if err = SyncTags(list.Extra); err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("SyncTags"), err)
-			return err
-		}
-		deleteCustomApp()
-
-		oldApps, err := appRepo.GetBy(appRepo.WithNotLocal())
-		if err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("LoadLocalApps"), err)
-			return err
-		}
-		ctx.oldAppIds = make([]uint, 0, len(oldApps))
-		for _, old := range oldApps {
-			ctx.oldAppIds = append(ctx.oldAppIds, old.ID)
-		}
-
-		ctx.appsMap, ctx.pendingIcons = getApps(oldApps, list.Apps, setting.SystemVersion, t)
-
-		var addCount, updateCount, deleteCount int
-		if err = ctx.classifyAndPersistAppsWithStats(&addCount, &updateCount, &deleteCount); err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("PersistApps"), err)
-			return err
-		}
-
-		if err := settingService.Update("AppStoreSyncStatus", constant.StatusSyncSuccess); err != nil {
-			global.LOG.Warnf("[AppStore] failed to update sync status to success: %v", err)
-		}
-		if err := settingService.Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
-			global.LOG.Warnf("[AppStore] failed to update last modified: %v", err)
-		}
-		global.LOG.Infof("[AppStore] Appstore sync completed")
-
-		*sharedCtx = ctx
-		t.LogSuccess(i18n.GetMsgByKey("AppStore") + " " + i18n.GetMsgByKey("TaskSync"))
-		return nil
-	}
-}
-
-type appWorkItem struct {
-	appDef  dto.AppDefine
-	app     model.App
-	iconUrl string
-	hadIcon bool
-}
-
-type appWorkResult struct {
-	appKey     string
-	app        model.App
-	iconStatus int
-	hadIcon    bool
-	httpFailed bool
-}
-
-func (c *appSyncContext) processOneApp(item appWorkItem) appWorkResult {
-	app := item.app
-	l := item.appDef
-	result := appWorkResult{
-		appKey:  l.AppProperty.Key,
-		hadIcon: item.hadIcon,
-	}
-
-	if item.hadIcon {
-		status, iconField := c.downloadAppIcon(item.iconUrl, l.AppProperty.Key, app.Icon)
-		result.iconStatus = status
-		switch status {
-		case http.StatusOK:
-			app.Icon = iconField
-		case http.StatusNotModified:
-		default:
-			result.httpFailed = true
-		}
-	}
-
-	app.TagsKey = l.AppProperty.Tags
-	if l.AppProperty.Recommend > 0 {
-		app.Recommend = l.AppProperty.Recommend
-	} else {
-		app.Recommend = 9999
-	}
-	app.ReadMe = l.ReadMe
-	app.LastModified = l.LastModified
-
-	versions := l.Versions
-	detailsMap := getAppDetails(app.Details, versions)
-	for _, v := range versions {
-		version := v.Name
-		detail := detailsMap[version]
-		versionUrl := fmt.Sprintf("%s/%s/%s", c.baseRemoteUrl, app.Key, version)
-
-		paramByte, _ := json.Marshal(v.AppForm)
-		var appForm dto.AppForm
-		_ = json.Unmarshal(paramByte, &appForm)
-
-		if appForm.SupportVersion > 0 && common.CompareVersion(strconv.FormatFloat(appForm.SupportVersion, 'f', -1, 64), c.systemVersion) {
-			delete(detailsMap, version)
-			continue
-		}
-
-		if _, ok := InitTypes[app.Type]; ok {
-			dockerComposeUrl := fmt.Sprintf("%s/%s", versionUrl, "docker-compose.yml")
-			_, composeRes, err := req_helper.HandleRequestWithClient(&c.httpClient, dockerComposeUrl, http.MethodGet, constant.TimeOut20s)
-			if err == nil {
-				detail.DockerCompose = string(composeRes)
-			} else {
-				result.httpFailed = true
-			}
-		} else {
-			detail.DockerCompose = ""
-		}
-
-		detail.Params = string(paramByte)
-		detail.DownloadUrl = fmt.Sprintf("%s/%s", versionUrl, app.Key+"-"+version+".tar.gz")
-		detail.DownloadCallBackUrl = v.DownloadCallBackUrl
-		detail.Update = true
-		detail.LastModified = v.LastModified
-		detailsMap[version] = detail
-	}
-
-	newDetails := make([]model.AppDetail, 0, len(detailsMap))
-	for _, detail := range detailsMap {
-		newDetails = append(newDetails, detail)
-	}
-	app.Details = newDetails
-
-	result.app = app
-	return result
-}
-
-func (c *appSyncContext) syncAppIconsAndDetails() error {
-	total := len(c.list.Apps)
-	global.LOG.Infof("[AppStore] sync app detail start, total apps: %d", total)
-
-	workItems := make([]appWorkItem, 0, total)
-	for _, l := range c.list.Apps {
-		app, ok := c.appsMap[l.AppProperty.Key]
-		if !ok {
-			continue
-		}
-		iconUrl, hasPending := c.pendingIcons[l.AppProperty.Key]
-		workItems = append(workItems, appWorkItem{
-			appDef:  l,
-			app:     app,
-			iconUrl: iconUrl,
-			hadIcon: hasPending,
-		})
-	}
-
-	totalWork := len(workItems)
-	if totalWork == 0 {
-		return nil
-	}
-
-	const maxWorkers = 4
-	var (
-		failFlag atomic.Bool
-		workCh   = make(chan int, maxWorkers)
-		resultCh = make(chan appWorkResult, maxWorkers)
-		wg       sync.WaitGroup
-	)
-
-	wg.Add(maxWorkers)
-	for range maxWorkers {
-		go func() {
-			defer wg.Done()
-			for idx := range workCh {
-				result := c.processOneApp(workItems[idx])
-				resultCh <- result
-				if result.httpFailed {
-					failFlag.Store(true)
-				}
-			}
-		}()
-	}
-	go func() { wg.Wait(); close(resultCh) }()
-
-	var fed atomic.Int32
-	go func() {
-		for i := range workItems {
-			if failFlag.Load() {
-				break
-			}
-			workCh <- i
-			fed.Store(int32(i + 1))
-		}
-		close(workCh)
-	}()
-
-	var (
-		completed    int
-		icon200Count int
-		icon304Count int
-		iconFailCount int
-	)
-	milestones := [4]int{totalWork / 4, totalWork / 2, totalWork * 3 / 4, totalWork}
-	nextMS := 0
-	checkProgress := func() {
-		if nextMS < len(milestones) && completed >= milestones[nextMS] {
-			c.task.LogWithProgress(i18n.GetMsgByKey("SyncAppDetail"), completed, totalWork)
-			nextMS++
-		}
-	}
-
-	applyResult := func(result appWorkResult) {
-		c.appsMap[result.appKey] = result.app
-		if result.hadIcon {
-			switch result.iconStatus {
-			case http.StatusOK:
-				icon200Count++
-			case http.StatusNotModified:
-				icon304Count++
-			default:
-				iconFailCount++
-			}
-		}
-		completed++
-		checkProgress()
-	}
-
-	for result := range resultCh {
-		applyResult(result)
-	}
-
-	fedCount := int(fed.Load())
-	if failFlag.Load() && fedCount < len(workItems) {
-		global.LOG.Warnf("[AppStore] HTTP failure detected, falling back to serial for remaining %d apps", len(workItems)-fedCount)
-		for i := fedCount; i < len(workItems); i++ {
-			result := c.processOneApp(workItems[i])
-			applyResult(result)
-		}
-	}
-
-	global.LOG.Infof("[AppStore] icon download completed - total: %d, success(200): %d, cached(304): %d, failed: %d",
-		total, icon200Count, icon304Count, iconFailCount)
-
-	return nil
-}
-
-func (c *appSyncContext) downloadAppIcon(iconUrl, appKey, oldIcon string) (status int, iconField string) {
-	iconFileName, existingEtag := appicon.ParseIconField(oldIcon)
-
-	reqHeaders := make(map[string]string)
-	if existingEtag != "" && iconFileName != "" && appicon.IconFileExists(iconFileName) {
-		reqHeaders["If-None-Match"] = existingEtag
-	}
-
-	resp, err := req_helper.HandleRequestWithHeaders(&c.httpClient, iconUrl, http.MethodGet, constant.TimeOut20s, reqHeaders)
-	if err != nil {
-		global.LOG.Warnf("[AppStore] request icon failed url=%s, err=%v", iconUrl, err)
-		return 0, ""
-	}
-
-	if resp.StatusCode == http.StatusNotModified {
-		return http.StatusNotModified, ""
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		global.LOG.Warnf("[AppStore] download icon failed url=%s, status=%d", iconUrl, resp.StatusCode)
-		return 0, ""
-	}
-
-	if len(resp.Body) == 0 {
-		global.LOG.Warnf("[AppStore] download icon empty body url=%s", iconUrl)
-		return 0, ""
-	}
-
-	if resp.Body[0] == '<' {
-		global.LOG.Warnf("[AppStore] download icon got HTML response url=%s", iconUrl)
-		return 0, ""
-	}
-
-	contentType := resp.Header.Get("Content-Type")
-	ct := strings.TrimSpace(strings.Split(contentType, ";")[0])
-	if strings.ToLower(ct) != "image/png" {
-		global.LOG.Warnf("[AppStore] unexpected icon content-type: %s, expected image/png, url=%s", ct, iconUrl)
-	}
-
-	fileName, err := appicon.WriteIconFile(appKey, resp.Body)
-	if err != nil {
-		global.LOG.Warnf("[AppStore] write icon file failed appKey=%s, err=%v", appKey, err)
-		return 0, ""
-	}
-
-	newEtag := resp.Header.Get("ETag")
-	iconField = appicon.BuildIconField(fileName, newEtag)
-
-	return http.StatusOK, iconField
-}
-
-func (a AppService) createSyncAppStoreMetaTask(sharedCtx **appSyncContext) func(t *task.Task) error {
-	return func(t *task.Task) (err error) {
-		t.LogStart(i18n.GetMsgByKey("SyncAppDetail"))
-		ctx := *sharedCtx
-		if ctx == nil {
-			global.LOG.Warnf("[AppStore] meta sync skipped: shared context is nil")
-			t.Log(i18n.GetMsgByKey("SyncAppDetail") + " skipped: shared context is nil")
-			return nil
-		}
-
-		if ctx.skipMetaSync {
-			global.LOG.Infof("[AppStore] meta sync skipped: no update needed")
-			t.Log(i18n.GetMsgByKey("SyncAppDetail") + " skipped: no update needed")
-			return nil
-		}
-
-		if ctx.list == nil || ctx.appsMap == nil {
-			global.LOG.Errorf("[AppStore] meta sync failed: shared context data not initialized")
-			err := fmt.Errorf("shared context data not initialized")
-			t.LogFailedWithErr(i18n.GetMsgByKey("SyncAppDetail"), err)
-			return err
-		}
-
-		t.Logf("%s: %d apps", i18n.GetMsgByKey("SyncAppDetail"), len(ctx.list.Apps))
-
-		ctx.task = t
-		ctx.appTags = make([]*model.AppTag, 0)
-
-		if err = ctx.syncAppIconsAndDetails(); err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("SyncAppDetail"), err)
-			return err
-		}
-
-		if err = ctx.classifyAndPersistApps(); err != nil {
-			t.LogFailedWithErr(i18n.GetMsgByKey("PersistAppDetails"), err)
-			return err
-		}
-
-		global.LOG.Infof("[AppStore] Appstore meta sync completed")
-		return nil
-	}
-}
-
-func (c *appSyncContext) classifyAndPersistApps() (err error) {
-	var addCount, updateCount, deleteCount int
-	return c.classifyAndPersistAppsWithStats(&addCount, &updateCount, &deleteCount)
-}
-
-func (c *appSyncContext) classifyAndPersistAppsWithStats(addCount, updateCount, deleteCount *int) (err error) {
-	tags, _ := tagRepo.All()
-	var (
-		addAppArray    []model.App
-		updateAppArray []model.App
-		deleteAppArray []model.App
-		deleteIds      []uint
-		tagMap         = make(map[string]uint, len(tags))
-	)
-
-	for _, v := range c.appsMap {
-		if v.ID == 0 {
-			addAppArray = append(addAppArray, v)
-		} else {
-			if v.Status == constant.AppTakeDown {
-				installs, _ := appInstallRepo.ListBy(context.Background(), appInstallRepo.WithAppId(v.ID))
-				if len(installs) > 0 {
-					updateAppArray = append(updateAppArray, v)
-					continue
-				}
-				deleteAppArray = append(deleteAppArray, v)
-				deleteIds = append(deleteIds, v.ID)
-			} else {
-				updateAppArray = append(updateAppArray, v)
-			}
-		}
-	}
-
-	if len(addAppArray) > 0 {
-		addKeys := make([]string, 0, len(addAppArray))
-		for _, app := range addAppArray {
-			addKeys = append(addKeys, app.Key)
-		}
-		existingApps, _ := appRepo.GetBy(appRepo.WithKeyIn(addKeys))
-		if len(existingApps) > 0 {
-			existingMap := make(map[string]model.App, len(existingApps))
-			for _, e := range existingApps {
-				existingMap[e.Key] = e
-			}
-			filteredAdd := make([]model.App, 0, len(addAppArray))
-			for _, app := range addAppArray {
-				if existing, ok := existingMap[app.Key]; ok {
-					app.ID = existing.ID
-					if len(app.Details) == 0 {
-						app.Details = existing.Details
-					}
-					updateAppArray = append(updateAppArray, app)
-				} else {
-					filteredAdd = append(filteredAdd, app)
-				}
-			}
-			addAppArray = filteredAdd
-		}
-	}
-
-	*addCount = len(addAppArray)
-	*updateCount = len(updateAppArray)
-	*deleteCount = len(deleteAppArray)
-
-	tx, ctx := getTxAndContext()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-			return
-		}
-	}()
-
-	if len(addAppArray) > 0 {
-		if err = appRepo.BatchCreate(ctx, addAppArray); err != nil {
-			return
-		}
-	}
-
-	if len(deleteAppArray) > 0 {
-		if err = appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
-			return
-		}
-		if err = appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
-			return
-		}
-	}
-
-	for _, tag := range tags {
-		tagMap[tag.Key] = tag.ID
-	}
-
-	if len(updateAppArray) > 0 {
-		for _, update := range updateAppArray {
-			if err = appRepo.Save(ctx, &update); err != nil {
-				return
-			}
-		}
-	}
-
-	apps := append(addAppArray, updateAppArray...)
-
-	var (
-		addDetails    []model.AppDetail
-		updateDetails []model.AppDetail
-		deleteDetails []model.AppDetail
-	)
-
-	totalDetails := 0
-	for _, app := range apps {
-		for _, tag := range app.TagsKey {
-			tagId, ok := tagMap[tag]
-			if ok {
-				exist, _ := appTagRepo.GetFirst(ctx, appTagRepo.WithByTagID(tagId), appTagRepo.WithByAppID(app.ID))
-				if exist == nil {
-					c.appTags = append(c.appTags, &model.AppTag{
-						AppId: app.ID,
-						TagId: tagId,
-					})
-				}
-			}
-		}
-
-		for _, d := range app.Details {
-			totalDetails++
-			d.AppId = app.ID
-			if d.ID == 0 {
-				addDetails = append(addDetails, d)
-			} else {
-				if d.Status == constant.AppTakeDown {
-					runtime, _ := runtimeRepo.GetFirst(ctx, runtimeRepo.WithDetailId(d.ID))
-					if runtime != nil {
-						updateDetails = append(updateDetails, d)
-						continue
-					}
-					installs, _ := appInstallRepo.ListBy(ctx, appInstallRepo.WithDetailIdsIn([]uint{d.ID}))
-					if len(installs) > 0 {
-						updateDetails = append(updateDetails, d)
-						continue
-					}
-					deleteDetails = append(deleteDetails, d)
-				} else {
-					updateDetails = append(updateDetails, d)
-				}
-			}
-		}
-	}
-
-	if len(addDetails) > 0 {
-		if err = appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
-			return
-		}
-	}
-
-	if len(deleteDetails) > 0 {
-		if err = appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
-			return
-		}
-	}
-
-	if len(updateDetails) > 0 {
-		for _, u := range updateDetails {
-			if err = appDetailRepo.Update(ctx, u); err != nil {
-				return
-			}
-		}
-	}
-
-	if len(c.oldAppIds) > 0 {
-		if err = appTagRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
-			return
-		}
-	}
-
-	if len(c.appTags) > 0 {
-		if err = appTagRepo.BatchCreate(ctx, c.appTags); err != nil {
-			return
-		}
-	}
-
-	if err = tx.Commit().Error; err != nil {
-		return
-	}
-	return 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
@@ -392,10 +388,6 @@ func deleteAppInstall(deleteReq request.AppInstallDelete) error {
 		if err = appInstallRepo.Delete(ctx, install); err != nil {
 			return err
 		}
-		appKey := install.App.Key
-		if appKey == constant.AppOpenclaw || appKey == constant.AppCopaw {
-			_ = agentRepo.DeleteByAppInstallIDWithCtx(ctx, install.ID)
-		}
 
 		resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
 		if len(resources) > 0 {
@@ -545,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"]
 	}
@@ -768,30 +750,6 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 
 		command := exec.Command("/bin/bash", "-c", fmt.Sprintf("cp -rn %s/* %s || true", detailDir, install.GetPath()))
 		_, _ = command.CombinedOutput()
-		if install.App.Key == constant.AppOpenresty {
-			installBuildDir := path.Join(install.GetPath(), "build")
-			detailBuildDir := path.Join(detailDir, "build")
-			if !fileOp.Stat(installBuildDir) {
-				if err := fileOp.CreateDir(installBuildDir, constant.DirPerm); err != nil {
-					return err
-				}
-			}
-			if err := fileOp.DeleteDir(path.Join(installBuildDir, "tmp")); err != nil {
-				return err
-			}
-			if err := fileOp.CopyDir(path.Join(detailBuildDir, "tmp"), installBuildDir); err != nil {
-				return err
-			}
-			if err := fileOp.CopyFile(path.Join(detailBuildDir, "Dockerfile"), installBuildDir); err != nil {
-				return err
-			}
-			if err := fileOp.CopyFile(path.Join(detailBuildDir, "nginx.conf"), installBuildDir); err != nil {
-				return err
-			}
-			if err := fileOp.CopyFile(path.Join(detailBuildDir, "nginx.vh.default.conf"), installBuildDir); err != nil {
-				return err
-			}
-		}
 		sourceScripts := path.Join(detailDir, "scripts")
 		if fileOp.Stat(sourceScripts) {
 			dstScripts := path.Join(install.GetPath(), "scripts")
@@ -987,7 +945,7 @@ 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) {
+func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.AppInstall, logger *log.Logger) (err error) {
 	if app.IsLocalApp() || app.IsCustomApp() {
 		return nil
 	}
@@ -1124,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
 	}
@@ -1299,9 +1261,8 @@ func getAppDetails(details []model.AppDetail, versions []dto.AppConfigVersion) m
 	return appDetails
 }
 
-func getApps(oldApps []model.App, items []dto.AppDefine, systemVersion string, task *task.Task) (map[string]model.App, map[string]string) {
+func getApps(oldApps []model.App, items []dto.AppDefine, systemVersion string, task *task.Task) map[string]model.App {
 	apps := make(map[string]model.App, len(oldApps))
-	pendingIcons := make(map[string]string, len(items))
 	for _, old := range oldApps {
 		old.Status = constant.AppTakeDown
 		apps[old.Key] = old
@@ -1341,13 +1302,9 @@ 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
-		if item.Icon != "" {
-			pendingIcons[key] = item.Icon
-		}
 		apps[key] = app
 	}
-	return apps, pendingIcons
+	return apps
 }
 
 func handleLocalAppDetail(versionDir string, appDetail *model.AppDetail) error {
@@ -1456,9 +1413,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
@@ -1563,7 +1517,7 @@ func synAppInstall(containers map[string]container.Summary, appInstall *model.Ap
 	_ = appInstallRepo.Save(context.Background(), appInstall)
 }
 
-func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpdate bool) ([]response.AppInstallDTO, error) {
+func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool) ([]response.AppInstallDTO, error) {
 	var (
 		res           []response.AppInstallDTO
 		containersMap map[string]container.Summary
@@ -1586,7 +1540,6 @@ func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpda
 		if updated && ignoreUpdate(installed) {
 			continue
 		}
-
 		if sync && !doNotNeedSync(installed) {
 			synAppInstall(containersMap, &installed, false)
 		}
@@ -1601,6 +1554,7 @@ func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpda
 			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,
@@ -1612,60 +1566,41 @@ func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpda
 				Website:  installed.App.Website,
 				Document: installed.App.Document,
 			},
-			Favorite:    installed.Favorite,
-			SortOrder:   installed.SortOrder,
-			Container:   installed.ContainerName,
-			ServiceName: strings.ToLower(installed.ServiceName),
+			Favorite:  installed.Favorite,
+			Container: installed.ContainerName,
 		}
-
-		if !updated && !checkUpdate {
-			installDTO.LinkDB = hasLinkDB(installed.ID)
-			res = append(res, installDTO)
-			continue
+		if updated {
+			installDTO.DockerCompose = installed.DockerCompose
 		}
-
-		if installed.Version == "latest" {
-			if checkUpdate {
-				installDTO.CanUpdate = false
-				installDTO.LinkDB = hasLinkDB(installed.ID)
-				res = append(res, installDTO)
-			}
-			continue
-		}
-
-		installDTO.DockerCompose = installed.DockerCompose
-		installDTO.IsEdit = isEditCompose(installed)
-
-		details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(installed.App.ID))
+		app, err := appRepo.GetFirst(repo.WithByID(installed.AppId))
 		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 {
-				continue
-			}
-			if common.IsCrossVersion(installed.Version, appDetail.Version) && !installed.App.CrossVersionUpdate {
-				continue
-			}
-			versions = append(versions, appDetail.Version)
+		details, err := appDetailRepo.GetBy(appDetailRepo.WithAppId(app.ID))
+		if err != nil {
+			return nil, err
 		}
-
+		var versions []string
+		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, detail.Version) && !app.CrossVersionUpdate {
+				continue
+			}
+			versions = append(versions, detail.Version)
+		}
+		versions = common.GetSortedVersions(versions)
 		if len(versions) == 0 {
-			if checkUpdate {
+			if !updated {
 				installDTO.CanUpdate = false
-				installDTO.LinkDB = hasLinkDB(installed.ID)
 				res = append(res, installDTO)
 			}
 			continue
 		}
-
-		versions = common.GetSortedVersions(versions)
 		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) {
@@ -1676,23 +1611,19 @@ func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpda
 				}
 			}
 		}
-
 		if common.IsCrossVersion(installed.Version, lastVersion) {
-			installDTO.CanUpdate = installed.App.CrossVersionUpdate
+			installDTO.CanUpdate = app.CrossVersionUpdate
 		} else {
 			installDTO.CanUpdate = common.CompareVersion(lastVersion, installed.Version)
 		}
-
 		if updated {
 			if installDTO.CanUpdate {
 				res = append(res, installDTO)
 			}
-		} else if checkUpdate {
-			installDTO.LinkDB = hasLinkDB(installed.ID)
+		} else {
 			res = append(res, installDTO)
 		}
 	}
-
 	return res, nil
 }
 
@@ -1893,7 +1824,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 {
@@ -2021,26 +1953,23 @@ func handleSiteDir(app model.App, appDetail model.AppDetail, req request.AppInst
 			req.Params["WEBSITE_DIR"] = siteDir
 			oldWebStePath, _ := settingRepo.GetValueByKey("WEBSITE_DIR")
 			fileOp := files.NewFileOp()
-			movePath := func(src, dst string) error {
-				return cmd.NewCommandMgr().Run("mv", src, dst)
-			}
 			if oldWebStePath != "" && oldWebStePath != siteDir && fileOp.Stat(oldWebStePath) {
 				t.Log(i18n.GetWithName("MoveSiteDir", siteDir))
 				if fileOp.Stat(siteDir) {
 					if fileOp.Stat(path.Join(siteDir, "conf.d")) {
-						_ = movePath(path.Join(siteDir, "conf.d"), path.Join(siteDir, "conf.d.bak"))
+						_ = fileOp.Rename(path.Join(siteDir, "conf.d"), path.Join(siteDir, "conf.d.bak"))
 					}
 					if fileOp.Stat(path.Join(siteDir, "sites")) {
-						_ = movePath(path.Join(siteDir, "sites"), path.Join(siteDir, "sites.bak"))
+						_ = fileOp.Rename(path.Join(siteDir, "sites"), path.Join(siteDir, "sites.bak"))
 					}
-					if err := movePath(path.Join(oldWebStePath, "sites"), path.Join(siteDir, "sites")); err != nil {
+					if err := fileOp.Rename(path.Join(oldWebStePath, "sites"), path.Join(siteDir, "sites")); err != nil {
 						return err
 					}
-					if err := movePath(path.Join(oldWebStePath, "conf.d"), path.Join(siteDir, "conf.d")); err != nil {
+					if err := fileOp.Rename(path.Join(oldWebStePath, "conf.d"), path.Join(siteDir, "conf.d")); err != nil {
 						return err
 					}
 				} else {
-					err := movePath(oldWebStePath, siteDir)
+					err := fileOp.Rename(oldWebStePath, siteDir)
 					if err != nil {
 						return err
 					}
@@ -2070,7 +1999,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 {
@@ -2099,37 +2028,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 {
@@ -2144,32 +2070,21 @@ func handleSSLConfig(appInstall *model.AppInstall, hasDefaultWebsite bool, sslRe
 	updateDefaultServer(defaultServer, appInstall.HttpPort, appInstall.HttpsPort, !hasDefaultWebsite, true)
 	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
 	}
 	return nil
 }
 
-func SyncTags(remoteProperties dto.ExtraProperties) (err error) {
+func SyncTags(remoteProperties dto.ExtraProperties) error {
 	tx, ctx := getTxAndContext()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-	}()
-	localTags, err := tagRepo.All()
-	if err != nil {
-		return err
-	}
+	defer tx.Rollback()
+	localTags, _ := tagRepo.All()
 	localTagsMap := make(map[string]*model.Tag)
 	for i := range localTags {
 		localTagsMap[localTags[i].Key] = &localTags[i]
 	}
+	var err error
 	remoteTagsMap := make(map[string]*dto.Tag)
 	for i := range remoteProperties.Tags {
 		remoteTagsMap[remoteProperties.Tags[i].Key] = &remoteProperties.Tags[i]
@@ -2177,9 +2092,7 @@ func SyncTags(remoteProperties dto.ExtraProperties) (err error) {
 
 	for key, localTag := range localTagsMap {
 		if _, exists := remoteTagsMap[key]; !exists {
-			if err = tagRepo.DeleteByID(ctx, localTag.ID); err != nil {
-				return err
-			}
+			_ = tagRepo.DeleteByID(ctx, localTag.ID)
 		}
 	}
 
@@ -2209,9 +2122,7 @@ func SyncTags(remoteProperties dto.ExtraProperties) (err error) {
 		}
 	}
 
-	if err = tx.Commit().Error; err != nil {
-		return err
-	}
+	tx.Commit()
 	return nil
 }
 
@@ -2220,56 +2131,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
@@ -72,7 +71,7 @@ func (u *BackupService) GetLocalDir() (string, error) {
 }
 
 func (u *BackupService) SearchWithPage(req dto.SearchPageWithType) (int64, interface{}, error) {
-	options := []repo.DBOption{repo.WithOrderDesc("created_at")}
+	options := []repo.DBOption{repo.WithOrderBy("created_at desc")}
 	if len(req.Type) != 0 {
 		options = append(options, repo.WithByType(req.Type))
 	}
@@ -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
@@ -372,7 +356,7 @@ func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, erro
 }
 
 func (u *BackupService) LoadBackupOptions() ([]dto.BackupOption, error) {
-	accounts, err := backupRepo.List(repo.WithOrderDesc("created_at"))
+	accounts, err := backupRepo.List(repo.WithOrderBy("created_at desc"))
 	if err != nil {
 		return nil, 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 token, ok := varMap["refresh_token"]; ok && len(token.(string)) != 0 {
-		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) {

agent/app/service/backup_app.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
-	"github.com/subosito/gotenv"
 
 	"github.com/1Panel-dev/1Panel/agent/app/task"
 	"github.com/1Panel-dev/1Panel/agent/i18n"
@@ -103,7 +102,7 @@ func backupDatabaseWithTask(parentTask *task.Task, resourceKey, tmpDir, name str
 		}
 		parentTask.LogStart(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
 		databaseHelper := DatabaseHelper{Database: db.MysqlName, DBType: resourceKey, Name: db.Name}
-		if err := handleMysqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), "", ""); err != nil {
+		if err := handleMysqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
 			return err
 		}
 		parentTask.LogSuccess(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
@@ -114,7 +113,7 @@ func backupDatabaseWithTask(parentTask *task.Task, resourceKey, tmpDir, name str
 		}
 		parentTask.LogStart(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
 		databaseHelper := DatabaseHelper{Database: db.PostgresqlName, DBType: resourceKey, Name: db.Name}
-		if err := handlePostgresqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), "", ""); err != nil {
+		if err := handlePostgresqlBackup(databaseHelper, parentTask, 0, tmpDir, fmt.Sprintf("%s.sql.gz", name), ""); err != nil {
 			return err
 		}
 		parentTask.LogSuccess(task.GetTaskName(db.Name, task.TaskBackup, task.TaskScopeDatabase))
@@ -180,9 +179,6 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 			return err
 		}
 		tmpPath := strings.ReplaceAll(recoverFile, ".tar.gz", "")
-		if err := fileOp.TarGzExtractPro(tmpPath+"/app.tar.gz", tmpPath, ""); err != nil {
-			return err
-		}
 		defer func() {
 			_, _ = compose.Up(install.GetComposePath())
 			_ = os.RemoveAll(strings.ReplaceAll(recoverFile, ".tar.gz", ""))
@@ -191,26 +187,19 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 		if !fileOp.Stat(tmpPath+"/app.json") || !fileOp.Stat(tmpPath+"/app.tar.gz") {
 			return errors.New(i18n.GetMsgByKey("AppBackupFileIncomplete"))
 		}
-		var backupInstall model.AppInstall
+		var oldInstall model.AppInstall
 		appJson, err := os.ReadFile(tmpPath + "/app.json")
 		if err != nil {
 			return err
 		}
-		if err := json.Unmarshal(appJson, &backupInstall); err != nil {
+		if err := json.Unmarshal(appJson, &oldInstall); err != nil {
 			return fmt.Errorf("unmarshal app.json failed, err: %v", err)
 		}
-		if backupInstall.App.Key != install.App.Key || backupInstall.Name != install.Name {
+		if oldInstall.App.Key != install.App.Key || oldInstall.Name != install.Name {
 			return errors.New(i18n.GetMsgByKey("AppAttributesNotMatch"))
 		}
-		backupEnvMap, err := getEnvMapByPath(path.Join(tmpPath, install.Name, ".env"))
-		if err != nil {
-			return err
-		}
-		installedEnvMap, err := getEnvMapByPath(install.GetEnvPath())
-		if err != nil {
-			return err
-		}
-		var mergedEnvContent string
+
+		newEnvFile := ""
 		resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
 		for _, resource := range resources {
 			var database model.Database
@@ -236,20 +225,11 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 				if err != nil {
 					return err
 				}
-				newDB, err := reCreatePostgresqlDB(db.ID, database, backupEnvMap)
-				if err != nil {
-					return err
-				}
-				backupInstall.Env, mergedEnvContent, err = buildRecoverEnv(backupInstall.Env, backupEnvMap, installedEnvMap)
-				if err != nil {
-					return err
-				}
-				_ = appInstallResourceRepo.BatchUpdateBy(map[string]interface{}{"resource_id": newDB.ID}, repo.WithByID(resource.ID))
 				taskName := task.GetTaskName(db.Name, task.TaskRecover, task.TaskScopeDatabase)
 				t.LogStart(taskName)
 				if err := handlePostgresqlRecover(dto.CommonRecover{
-					Name:       newDB.PostgresqlName,
-					DetailName: newDB.Name,
+					Name:       database.Name,
+					DetailName: db.Name,
 					File:       fmt.Sprintf("%s/%s.sql.gz", tmpPath, install.Name),
 				}, parentTask, true); err != nil {
 					t.LogFailedWithErr(taskName, err)
@@ -261,11 +241,15 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 				if err != nil {
 					return err
 				}
-				newDB, err := reCreateDB(db.ID, database, backupEnvMap)
+				newDB, envMap, err := reCreateDB(db.ID, database, oldInstall.Env)
 				if err != nil {
 					return err
 				}
-				backupInstall.Env, mergedEnvContent, err = buildRecoverEnv(backupInstall.Env, backupEnvMap, installedEnvMap)
+				oldHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", envMap["PANEL_DB_HOST"].(string))
+				newHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", database.Address)
+				oldInstall.Env = strings.ReplaceAll(oldInstall.Env, oldHost, newHost)
+				envMap["PANEL_DB_HOST"] = database.Address
+				newEnvFile, err = coverEnvJsonToStr(oldInstall.Env)
 				if err != nil {
 					return err
 				}
@@ -276,7 +260,7 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 					Name:       newDB.MysqlName,
 					DetailName: newDB.Name,
 					File:       fmt.Sprintf("%s/%s.sql.gz", tmpPath, install.Name),
-				}, parentTask, true); err != nil {
+				}, parentTask, true, ""); err != nil {
 					t.LogFailedWithErr(taskName, err)
 					return err
 				}
@@ -300,22 +284,22 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 		t.LogSuccess(deCompressName)
 		_ = fileOp.DeleteDir(backPath)
 
-		if len(mergedEnvContent) != 0 {
+		if len(newEnvFile) != 0 {
 			envPath := fmt.Sprintf("%s/%s/.env", install.GetAppPath(), install.Name)
 			file, err := os.OpenFile(envPath, os.O_WRONLY|os.O_TRUNC, 0640)
 			if err != nil {
 				return err
 			}
 			defer file.Close()
-			_, _ = file.WriteString(mergedEnvContent)
+			_, _ = file.WriteString(newEnvFile)
 		}
 
-		backupInstall.ID = install.ID
-		backupInstall.Status = constant.StatusRunning
-		backupInstall.AppId = install.AppId
-		backupInstall.AppDetailId = install.AppDetailId
-		backupInstall.App.ID = install.AppId
-		if err := appInstallRepo.Save(context.Background(), &backupInstall); err != nil {
+		oldInstall.ID = install.ID
+		oldInstall.Status = constant.StatusRunning
+		oldInstall.AppId = install.AppId
+		oldInstall.AppDetailId = install.AppDetailId
+		oldInstall.App.ID = install.AppId
+		if err := appInstallRepo.Save(context.Background(), &oldInstall); err != nil {
 			global.LOG.Errorf("save db app install failed, err: %v", err)
 			return err
 		}
@@ -389,131 +373,33 @@ func doAppBackup(install *model.AppInstall, parentTask *task.Task, backupDir, fi
 	return nil
 }
 
-func reCreateDB(dbID uint, database model.Database, envMap map[string]interface{}) (*model.DatabaseMysql, error) {
+func reCreateDB(dbID uint, database model.Database, oldEnv string) (*model.DatabaseMysql, map[string]interface{}, error) {
 	mysqlService := NewIMysqlService()
 	ctx := context.Background()
 	_ = mysqlService.Delete(ctx, dto.MysqlDBDelete{ID: dbID, Database: database.Name, Type: database.Type, DeleteBackup: false, ForceDelete: true})
 
-	dbInfo := getDBCreateInfoFromEnv(envMap, "utf8mb4")
+	envMap := make(map[string]interface{})
+	if err := json.Unmarshal([]byte(oldEnv), &envMap); err != nil {
+		return nil, envMap, err
+	}
+	oldName, _ := envMap["PANEL_DB_NAME"].(string)
+	oldUser, _ := envMap["PANEL_DB_USER"].(string)
+	oldPassword, _ := envMap["PANEL_DB_USER_PASSWORD"].(string)
 	createDB, err := mysqlService.Create(context.Background(), dto.MysqlDBCreate{
-		Name:       dbInfo.Name,
+		Name:       oldName,
 		From:       database.From,
 		Database:   database.Name,
-		Format:     dbInfo.Format,
-		Username:   dbInfo.User,
-		Password:   dbInfo.Password,
+		Format:     "utf8mb4",
+		Username:   oldUser,
+		Password:   oldPassword,
 		Permission: "%",
 	})
-	if err != nil {
-		return nil, err
-	}
-	updateCronjobsDBRef(dbID, createDB.ID)
-	return createDB, nil
-}
-
-func reCreatePostgresqlDB(dbID uint, database model.Database, envMap map[string]interface{}) (*model.DatabasePostgresql, error) {
-	postgresqlService := NewIPostgresqlService()
-	_ = postgresqlService.Delete(context.Background(), dto.PostgresqlDBDelete{
-		ID:           dbID,
-		Type:         database.Type,
-		Database:     database.Name,
-		DeleteBackup: false,
-		ForceDelete:  true,
-	})
-
-	dbInfo := getDBCreateInfoFromEnv(envMap, "UTF8")
-	createDB, err := postgresqlService.Create(context.Background(), dto.PostgresqlDBCreate{
-		Name:      dbInfo.Name,
-		From:      database.From,
-		Database:  database.Name,
-		Format:    dbInfo.Format,
-		Username:  dbInfo.User,
-		Password:  dbInfo.Password,
-		SuperUser: true,
-	})
-	if err != nil {
-		return nil, err
-	}
-	updateCronjobsDBRef(dbID, createDB.ID)
-	return createDB, nil
-}
-
-type dbRecreateInfo struct {
-	Name     string
-	User     string
-	Password string
-	Format   string
-}
-
-func getDBCreateInfoFromEnv(envMap map[string]interface{}, defaultFormat string) dbRecreateInfo {
-	name, _ := envMap["PANEL_DB_NAME"].(string)
-	user, _ := envMap["PANEL_DB_USER"].(string)
-	password, _ := envMap["PANEL_DB_USER_PASSWORD"].(string)
-	format, _ := envMap["format"].(string)
-	if len(format) == 0 {
-		format = defaultFormat
-	}
-	return dbRecreateInfo{
-		Name:     name,
-		User:     user,
-		Password: password,
-		Format:   format,
-	}
-}
-
-func updateCronjobsDBRef(oldDBID, newDBID uint) {
-	cronjobs, _ := cronjobRepo.List(cronjobRepo.WithByDbName(fmt.Sprintf("%v", oldDBID)))
+	cronjobs, _ := cronjobRepo.List(cronjobRepo.WithByDbName(fmt.Sprintf("%v", dbID)))
 	for _, job := range cronjobs {
-		_ = cronjobRepo.Update(job.ID, map[string]interface{}{"db_name": fmt.Sprintf("%v", newDBID)})
+		_ = cronjobRepo.Update(job.ID, map[string]interface{}{"db_name": fmt.Sprintf("%v", createDB.ID)})
 	}
-}
-
-func buildRecoverEnv(appEnv string, backupEnvMap, installedEnvMap map[string]interface{}) (string, string, error) {
-	currentHostVal, hasCurrentHost := installedEnvMap["PANEL_DB_HOST"]
-	if hasCurrentHost && fmt.Sprintf("%v", currentHostVal) != "" {
-		backupHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", backupEnvMap["PANEL_DB_HOST"])
-		currentHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", currentHostVal)
-		appEnv = strings.ReplaceAll(appEnv, backupHost, currentHost)
-		if _, ok := backupEnvMap["CASDOOR_DATASOURCE_NAME"]; ok {
-			backupEnvMap["CASDOOR_DATASOURCE_NAME"] = strings.ReplaceAll(
-				fmt.Sprintf("%v", backupEnvMap["CASDOOR_DATASOURCE_NAME"]),
-				fmt.Sprintf("%v", backupEnvMap["PANEL_DB_HOST"]),
-				fmt.Sprintf("%v", currentHostVal),
-			)
-		}
-		backupEnvMap["PANEL_DB_HOST"] = currentHostVal
-	}
-	newEnvMap := make(map[string]string, len(backupEnvMap))
-	handleMap(backupEnvMap, newEnvMap)
-	mergedEnvContent, err := gotenv.Marshal(newEnvMap)
 	if err != nil {
-		return appEnv, "", err
+		return nil, envMap, err
 	}
-	return appEnv, mergedEnvContent, nil
-}
-
-func getEnvMapByPath(envPath string) (map[string]interface{}, error) {
-	envMap := make(map[string]interface{})
-	envFile, err := os.ReadFile(envPath)
-	if err != nil {
-		return envMap, err
-	}
-	lines := strings.Split(string(envFile), "\n")
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if line == "" || strings.HasPrefix(line, "#") {
-			continue
-		}
-		parts := strings.SplitN(line, "=", 2)
-		if len(parts) == 2 {
-			value := strings.TrimSpace(parts[1])
-			if len(value) >= 2 {
-				if (value[0] == '"' && value[len(value)-1] == '"') || (value[0] == '\'' && value[len(value)-1] == '\'') {
-					value = value[1 : len(value)-1]
-				}
-			}
-			envMap[parts[0]] = value
-		}
-	}
-	return envMap, nil
+	return createDB, envMap, nil
 }