fix: Fixed issue with recover postgres-cluster database failed (#9732)

* Update container.go

* Update website.go

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -0,0 +1,50 @@
+name: 'Bug Report'
+description: 'Report an Bug'
+title: '[Bug] '
+assignees: wanghe-fit2cloud
+body:
+  - type: markdown
+    attributes:
+      value: "## Contact Information"
+  - type: input
+    validations:
+      required: false
+    attributes:
+      label: "Contact Information"
+      description: "The ways to quickly contact you: WeChat group number and nickname, email, etc."
+  - type: markdown
+    attributes:
+      value: "## Environment Information"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: "1Panel Version"
+      description: "Log in to the 1Panel Web console and check the current version at the bottom right of the page."
+  - type: markdown
+    attributes:
+      value: "## Detailed information"
+  - type: textarea
+    attributes:
+      label: "Problem Description"
+      description: "Briefly describe the issue you’ve encountered."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Steps to Reproduce"
+      description: "How can this issue be reproduced."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "The expected correct result"
+  - type: textarea
+    attributes:
+      label: "Related log output"
+      description: "Please paste any relevant log output here. It will automatically be formatted as code, so no backticks are necessary."
+      render: shell
+  - type: textarea
+    attributes:
+      label: "Additional Information"
+      description: "If you have any additional information to provide, you can include it here (screenshots, videos, etc., are welcome)."

.github/ISSUE_TEMPLATE/2_feature_request.yml

@@ -0,0 +1,29 @@
+name: 'Feature Request'
+description: 'Suggest an idea'
+title: '[Feature] '
+assignees: wanghe-fit2cloud
+body:
+  - type: markdown
+    attributes:
+      value: "## Environment Information"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: "1Panel Version"
+      description: "Log in to the 1Panel Web console and check the current version at the bottom right of the page."
+  - type: markdown
+    attributes:
+      value: "## Detailed information"
+  - type: textarea
+    attributes:
+      label: "Please describe your needs or suggestions for improvements"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Please describe the solution you suggest"
+  - type: textarea
+    attributes:
+      label: "Additional Information"
+      description: "If you have any additional information to provide, you can include it here (screenshots, videos, etc., are welcome)."

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,61 +0,0 @@
-name: BUG 提交
-description: 提交产品缺陷帮助我们更好的改进
-title: "[BUG]"
-labels: "类型: 缺陷"
-assignees: wanghe-fit2cloud
-body:
-  - type: markdown
-    id: contacts_title
-    attributes:
-      value: "## 联系方式"
-  - type: input
-    id: contacts
-    validations:
-      required: false
-    attributes:
-      label: "联系方式"
-      description: "可以快速联系到您的方式：交流群号及昵称、邮箱等"
-  - type: markdown
-    id: environment
-    attributes:
-      value: "## 环境信息"
-  - type: input
-    id: version
-    validations:
-      required: true
-    attributes:
-      label: "1Panel 版本"
-      description: "登录 1Panel Web 控制台，在页面右下角查看当前版本。"
-  - type: markdown
-    id: details
-    attributes:
-      value: "## 详细信息"
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: "问题描述"
-      description: "简要描述您碰到的问题"
-    validations:
-      required: true
-  - type: textarea
-    id: how-happened
-    attributes:
-      label: "重现步骤"
-      description: "如果操作可以重现该问题"
-    validations:
-      required: true
-  - type: textarea
-    id: expect
-    attributes:
-      label: "期待的正确结果"
-  - type: textarea
-    id: logs
-    attributes:
-      label: "相关日志输出"
-      description: "请复制并粘贴任何相关的日志输出。 这将自动格式化为代码，因此无需反引号。"
-      render: shell
-  - type: textarea
-    id: additional-information
-    attributes:
-      label: "附加信息"
-      description: "如果你还有其他需要提供的信息，可以在这里填写（可以提供截图、视频等）。"

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 问题与讨论 / Questions & Discussions
+  - name: Questions & Discussions
     url: https://github.com/1Panel-dev/1Panel/discussions
-    about: 提出针对本项目安装部署、使用及其他方面的相关问题 / Raise questions about the installation, deployment, use and other aspects of the project.
-  - name: 对 1Panel 项目有其他问题
-    url: https://bbs.fit2cloud.com/c/1p/7
-    about: 如果你对 1Panel 有其他想要提问的，我们欢迎到我们的官方社区进行提问。
+    about: Raise questions about the installation, deployment, use and other aspects of the project.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,36 +0,0 @@
-name: 需求建议
-description: 提出针对本项目的想法和建议
-title: "[FEATURE]"
-labels: enhancement
-assignees: wanghe-fit2cloud
-body:
-  - type: markdown
-    id: environment
-    attributes:
-      value: "## 环境信息"
-  - type: input
-    id: version
-    validations:
-      required: true
-    attributes:
-      label: "1Panel 版本"
-      description: "登录 1Panel Web 控制台，在页面右下角查看当前版本。"
-  - type: markdown
-    id: details
-    attributes:
-      value: "## 详细信息"
-  - type: textarea
-    id: description
-    attributes:
-      label: "请描述您的需求或者改进建议"
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: "请描述你建议的实现方案"
-  - type: textarea
-    id: additional-information
-    attributes:
-      label: "附加信息"
-      description: "如果你还有其他需要提供的信息，可以在这里填写（可以提供截图、视频等）。"

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

@@ -1,13 +1,11 @@
+
+name: General PR Handling for 1Panel
 on: pull_request
-
-name: 1Panel 通用 PR 处理
-
 permissions:
   pull-requests: write
-
 jobs:
   generic_handler:
-    name: 为 PR 添加标签
+    name: Add Labels to PR
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

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

@@ -1,11 +1,8 @@
+name: Create Release And Upload assets
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-name: Create Release And Upload assets
-
+      - 'v*'
 jobs:
   create-release:
     runs-on: ubuntu-latest
@@ -24,43 +21,27 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - name: Build Release
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: latest
+          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
-          body: |
-            # 一、安装和升级
-
-            ## 1.1 一键安装
-            ```sh
-            curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_start.sh && sudo bash quick_start.sh
-            ```
-
-            ## 1.2 在线升级
-
-            登录 1Panel Web 控制台，在页面右下角点击 **【检查更新】** 进行在线升级。
-
-            >更多信息请查阅在线文档：https://1panel.cn/docs/
-
-            # 二、更新日志
-
           files: |
             dist/*.tar.gz
             dist/checksums.txt
       - name: Setup OSSUTIL
-        uses: yizhoumo/setup-ossutil@v1
+        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.14'
+          ossutil-version: '1.7.18'
       - name: Upload Assets to OSS
-        run: ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/stable/${{  github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force
+        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

@@ -0,0 +1,45 @@
+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: '20.2'
+      - 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 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/build-test.yml

@@ -1,34 +0,0 @@
-on:
-  pull_request:
-    branches:
-      - dev
-  push:
-    branches:
-      - dev
-
-name: Build Test
-
-jobs:
-  build-linux-binary:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.2'
-      - name: Build Web
-        id: build_frontend
-        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.22'
-      - name: Build Server
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          args: release --snapshot --clean

.github/workflows/issue-recent-alert.yml

@@ -1,17 +0,0 @@
-on:
-  schedule:
-    - cron: "0 1 * * *"
-
-name: Check recent handle issues
-
-jobs:
-  check-recent-issues-not-handle:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check recent issues and send msg
-        uses: jumpserver/action-issues-alert@master
-        with:
-          hook: ${{ secrets.WECHAT_GROUP_WEB_HOOK }}
-          type: recent
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-translator.yml

@@ -0,0 +1,14 @@
+name: Issue Translator
+on: 
+  issue_comment: 
+    types: [created]
+  issues: 
+    types: [opened]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: usthe/issues-translate-action@v2.7
+        with:
+          IS_MODIFY_TITLE: true
+          BOT_GITHUB_TOKEN: ${{ secrets.ISSUE_TRANSLATOR_TOKEN }} 

.github/workflows/issue-untimely-alert.yml

@@ -1,17 +0,0 @@
-on:
-  schedule:
-    - cron: "0 9 * * 1-5"
-
-name: Check untimely handle issues
-
-jobs:
-  check-untimely-handle-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check untimely issues and send msg
-        uses: jumpserver/action-issues-alert@master
-        with:
-          hook: ${{ secrets.WECHAT_GROUP_WEB_HOOK }}
-          type: untimely
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/llm-code-review.yml

@@ -0,0 +1,25 @@
+name: LLM Code Review
+permissions:
+  contents: read
+  pull-requests: write
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+jobs:
+  llm-code-review:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: fit2cloud/LLM-CodeReview-Action@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.FIT2CLOUDRD_LLM_CODE_REVIEW_TOKEN }}
+          OPENAI_API_KEY: ${{ secrets.ALIYUN_LLM_API_KEY }}
+          LANGUAGE: English
+          OPENAI_API_ENDPOINT: https://dashscope.aliyuncs.com/compatible-mode/v1
+          MODEL: qwen2.5-coder-3b-instruct
+          PROMPT: "Please check the following code differences for any irregularities, potential issues, or optimization suggestions, and provide your answers in English."
+          top_p: 1
+          temperature: 1
+          # max_tokens: 10000
+          MAX_PATCH_LENGTH: 10000 
+          IGNORE_PATTERNS: "/node_modules,*.md,/dist,/.github"
+          FILE_PATTERNS: "*.java,*.go,*.py,*.vue,*.ts,*.js,*.css,*.scss,*.html"

.github/workflows/sonarcloud-scan.yml

@@ -1,4 +1,4 @@
-name: Build
+name: SonarCloud Scan
 on:
   push:
     branches:

.github/workflows/sync2gitee.yml

@@ -1,6 +1,5 @@
-name: sync2gitee
+name: Synchronize to Gitee
 on: [push]
-
 jobs:
   repo-sync:
     runs-on: ubuntu-latest
@@ -13,4 +12,4 @@ jobs:
           dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
           dst_token:  ${{ secrets.GITEE_TOKEN }}
           static_list: "1Panel"
-          force_update: true
+          force_update: true

.github/workflows/tyops-check.yml

@@ -1,6 +1,5 @@
 name: Typos Check
 on: pull_request
-
 jobs:
   run:
     name: Spell Check with Typos
@@ -8,6 +7,5 @@ jobs:
     steps:
     - name: Checkout Actions Repository
       uses: actions/checkout@v2
-
     - name: Check spelling
-      uses: crate-ci/typos@master
+      uses: crate-ci/typos@master

.gitignore

@@ -4,7 +4,8 @@
 *.dll
 *.so
 *.dylib
-build/1panel
+build/1panel-agent
+build/1panel-core
 
 # Mac
 .DS_Store
@@ -14,6 +15,7 @@ build/1panel
 .vscode
 *.project
 *.factorypath
+__debug*
 
 # IntelliJ IDEA
 .idea/*
@@ -29,19 +31,25 @@ build/1panel
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-
 # Dependency directories
 /pkg/
 backend/__debug_bin
-cmd/server/__debug_bin
-cmd/server/web/assets
-cmd/server/web/monacoeditorwork
-cmd/server/web/index.html
+core/cmd/server/__debug_bin
+core/cmd/server/web/assets
+core/cmd/server/web/monacoeditorwork
+core/cmd/server/web/index.html
 frontend/auto-imports.d.ts
 frontend/components.d.ts
 frontend/src/xpack
-backend/xpack
-*_xpack.go
+agent/xpack
+agent/router/entry_xpack.go
+agent/server/init_xpack.go
+agent/utils/xpack/xpack_xpack.go
+core/xpack
+core/router/entry_xpack.go
+core/server/init_xpack.go
+core/utils/xpack/xpack_xpack.go
+xpack
 
 .history/
 dist/
@@ -52,3 +60,6 @@ quick_start.sh
 cmd/server/fileList.txt
 .fileList.txt
 1Panel.code-workspace
+
+core/.golangci.yml
+agent/.golangci.yml

.goreleaser.yaml

@@ -1,17 +1,20 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=jcroql
+version: 2
+
 before:
   hooks:
     # - export NODE_OPTIONS="--max-old-space-size=8192"
     # - make build_web
-    - chmod +x ./script.sh
-    - ./script.sh
+    - chmod +x ./ci/script.sh
+    - ./ci/script.sh
     - sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl
-    - go mod tidy
     
 builds:
-  - main: ./cmd/server/main.go
-    binary: 1panel
+  - id: agent
+    dir: agent
+    main: cmd/server/main.go
+    binary: 1panel-agent
     flags:
       - -tags=xpack
       - -trimpath
@@ -29,31 +32,54 @@ builds:
       - arm
       - ppc64le
       - s390x
+    hooks:
+      post:
+        - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
+
+  - id: core
+    dir: core
+    main: cmd/server/main.go
+    binary: 1panel-core
+    flags:
+      - -tags=xpack
+      - -trimpath
+    ldflags:
+      - -w -s
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+    goarm:
+      - 7
+    goarch:
+      - amd64
+      - arm64
+      - arm
+      - ppc64le
+      - s390x
+    hooks:
+      post:
+        - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
 
 archives:
-  - format: tar.gz
+  - formats: [ 'tar.gz' ]
+    ids: [core, agent]
     name_template: "1panel-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"
     wrap_in_directory: true
     files:
       - 1pctl
-      - 1panel.service
+      - 1panel-core.service
+      - 1panel-agent.service
       - install.sh
-      - README.md
-      - LICENSE
-    
+      - GeoIP.mmdb
+      - lang/*
+
 checksum:
   name_template: 'checksums.txt'
-snapshot:
-  version_template: "{{ incpatch .Version }}-next"
-release:
-  draft: true
-  mode: append
-  extra_files:
-    - glob: dist/*.tar.gz
-    - glob: dist/checksums.txt
-  name_template: "Release {{.Tag}}"
 
-# The lines beneath this are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
     "ansible.python.interpreterPath": "/opt/homebrew/bin/python3"
-}
+}

CODE_OF_CONDUCT.md

@@ -125,4 +125,4 @@ enforcement ladder](https://github.com/mozilla/diversity).
 
 For answers to common questions about this code of conduct, see the FAQ at
 https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -10,7 +10,7 @@ PR are always welcome, even if they only contain small fixes like typos or a few
 
 Please submit a PR broken down into small changes bit by bit. A PR consisting of a lot of features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
 
-This [development guideline](https://1panel.cn/docs/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
+This [development guideline](https://docs.1panel.pro/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
 
 Note: If you split your pull request to small changes, please make sure any of the changes goes to master will not break anything. Otherwise, it can not be merged until this feature complete.
 

Makefile

@@ -4,31 +4,46 @@ GOCLEAN=$(GOCMD) clean
 GOARCH=$(shell go env GOARCH)
 GOOS=$(shell go env GOOS )
 
-BASE_PAH := $(shell pwd)
-BUILD_PATH = $(BASE_PAH)/build
-WEB_PATH=$(BASE_PAH)/frontend
-SERVER_PATH=$(BASE_PAH)/backend
-MAIN= $(BASE_PAH)/cmd/server/main.go
-APP_NAME=1panel
-ASSERT_PATH= $(BASE_PAH)/cmd/server/web/assets
+BASE_PATH := $(shell pwd)
+BUILD_PATH = $(BASE_PATH)/build
+WEB_PATH=$(BASE_PATH)/frontend
+ASSERT_PATH= $(BASE_PATH)/core/cmd/server/web/assets
+
+CORE_PATH=$(BASE_PATH)/core
+CORE_MAIN=$(CORE_PATH)/cmd/server/main.go
+CORE_NAME=1panel-core
+
+AGENT_PATH=$(BASE_PATH)/agent
+AGENT_MAIN=$(AGENT_PATH)/cmd/server/main.go
+AGENT_NAME=1panel-agent
+
 
 clean_assets:
 	rm -rf $(ASSERT_PATH)
 
 upx_bin:
-	upx $(BUILD_PATH)/$(APP_NAME)
+	upx $(BUILD_PATH)/$(CORE_NAME)
+	upx $(BUILD_PATH)/$(AGENT_NAME)
 
 build_frontend:
 	cd $(WEB_PATH) && npm install && npm run build:pro
 
-build_backend_on_linux:
-	cd $(SERVER_PATH) \
-    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
+build_core_on_linux:
+	cd $(CORE_PATH) \
+	&& GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
 
-build_backend_on_darwin:
-	cd $(SERVER_PATH) \
-    && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
+build_agent_on_linux:
+	cd $(AGENT_PATH) \
+    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
 
-build_all: build_frontend build_backend_on_linux
+build_core_on_darwin:
+	cd $(CORE_PATH) \
+	&& GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
 
-build_on_local: clean_assets build_frontend build_backend_on_darwin upx_bin
+build_agent_on_darwin:
+	cd $(AGENT_PATH) \
+    && 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 upx_bin

OWNERS

@@ -1,11 +1,9 @@
 reviewers:
+- wanghe-fit2cloud
 - zhengkunwang223
 - ssongliu
-- wanghe-fit2cloud
-- wangdan-fit2cloud
 
 approvers:
+- wanghe-fit2cloud
 - zhengkunwang223
 - ssongliu
-- wanghe-fit2cloud
-- wangdan-fit2cloud

README.md

@@ -1,65 +1,76 @@
-<p align="center"><a href="https://1panel.cn"><img src="http://1panel.oss-cn-hangzhou.aliyuncs.com/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
-<p align="center"><b>Web-based linux server management control panel</b></p>
-<p align="center"><b>现代化、开源的 Linux 服务器运维管理面板</b></p>
+<p align="center"><a href="https://1panel.pro"><img src="https://resource.1panel.pro/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
+<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: 250px; height: 55px;" width="250" height="55"/></a>
-  <a href="https://hellogithub.com/repository/71791baf930149ac9b84e1acf186573f" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=71791baf930149ac9b84e1acf186573f&claim_uid=p8vB3kP5CMrthiL&theme=dark&theme=neutral" alt="Featured｜HelloGitHub" style="width: 250px; height: 55px;" width="250" height="55" /></a>
+  <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>
 <p align="center">
   <a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://shields.io/github/license/1Panel-dev/1Panel?color=%231890FF" alt="License: GPL v3"></a>
   <a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
+  <a href="https://discord.gg/bUpUqWqdRr" target="_blank">
+        <img src="https://img.shields.io/discord/1318846410149335080?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb"
+            alt="chat on Discord"></a>
   <a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
-  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="GitHub Stars"></a>
-  <a href="https://gitee.com/fit2cloud-feizhiyun/1Panel"><img src="https://gitee.com/fit2cloud-feizhiyun/1Panel/badge/star.svg?theme=gvp" alt="Gitee Stars"></a><br>
-  [<a href="docs/README_EN.md">English</a>] | [<a href="docs/README_TW.md">中文(繁體)</a>] | [<a href="docs/README_JP.md">日本語</a>]
+  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a><br>
+</p>
+<p align="center">
+  <a href="/README.md"><img alt="English" src="https://img.shields.io/badge/English-d9d9d9"></a>
+  <a href="/docs/README.zh-Hans.md"><img alt="中文(简体)" src="https://img.shields.io/badge/中文(简体)-d9d9d9"></a>
+  <a href="/docs/README.ja.md"><img alt="日本語" src="https://img.shields.io/badge/日本語-d9d9d9"></a>
+  <a href="/docs/README.pt-br.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-d9d9d9"></a>
+  <a href="/docs/README.ar.md"><img alt="العربية" src="https://img.shields.io/badge/العربية-d9d9d9"></a>
+  <a href="/docs/README.de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-d9d9d9"></a>
+  <a href="/docs/README.es.md"><img alt="Español" src="https://img.shields.io/badge/Español-d9d9d9"></a><br>
+  <a href="/docs/README.fr.md"><img alt="français" src="https://img.shields.io/badge/français-d9d9d9"></a>
+  <a href="/docs/README.ko.md"><img alt="한국어" src="https://img.shields.io/badge/한국어-d9d9d9"></a>
+  <a href="/docs/README.id.md"><img alt="Bahasa Indonesia" src="https://img.shields.io/badge/Bahasa Indonesia-d9d9d9"></a>
+  <a href="/docs/README.zh-Hant.md"><img alt="中文(繁體)" src="https://img.shields.io/badge/中文(繁體)-d9d9d9"></a>
+  <a href="/docs/README.tr.md"><img alt="Türkçe" src="https://img.shields.io/badge/Türkçe-d9d9d9"></a>
+  <a href="/docs/README.ru.md"><img alt="Русский" src="https://img.shields.io/badge/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9-d9d9d9"></a>
+  <a href="/docs/README.ms.md"><img alt="Bahasa Melayu" src="https://img.shields.io/badge/Bahasa Melayu-d9d9d9"></a>
 </p>
 
-[![Watch the video](https://resource.fit2cloud.com/1panel/img/overview_video.png)](https://www.bilibili.com/video/BV1Mt421n7LZ/)
-
 ------------------------------
-## 什么是 1Panel？
 
-1Panel 是新一代的 Linux 服务器运维管理面板。
+1Panel is an open-source, modern web-based control panel for Linux server management.
 
-- **高效管理**：用户可以通过 Web 界面轻松管理 Linux 服务器，如主机监控、文件管理、数据库管理、容器管理等；
-- **快速建站**：深度集成开源建站软件 WordPress 和 [Halo](https://github.com/halo-dev/halo/)，域名绑定、SSL 证书配置等操作一键搞定；
-- **应用商店**：精选上架各类高质量的开源工具和应用软件，协助用户轻松安装并升级；
-- **安全可靠**：基于容器管理并部署应用，实现最小的漏洞暴露面，同时提供病毒防护、防火墙和日志审计等功能；
-- **一键备份**：支持一键备份和恢复，用户可以将数据备份到各类云端存储介质，永不丢失。
+- **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:
 
-执行如下命令一键安装 1Panel:
-
-```sh
-curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_start.sh && sudo bash quick_start.sh
+```bash
+curl -sSL https://resource.1panel.pro/quick_start.sh -o quick_start.sh && bash quick_start.sh
 ```
 
-如果是用于离线环境，推荐使用 [安装包方式](https://1panel.cn/docs/installation/package_installation/) 进行安装部署。
+Please refer to our [documentation](https://docs.1panel.pro/quick_start/) for more details.
 
-**学习资料**
+中国用户请使用这个 [安装脚本](https://1panel.cn/docs/installation/online_installation/)，其应用数量比国际版本更丰富。
 
-- [在线文档](https://1panel.cn/docs/)
-- [社区论坛](https://bbs.fit2cloud.com/c/1p/7)
-- [如何加入微信交流群?](https://bbs.fit2cloud.com/t/topic/2147)
+## Screenshot
 
-## 飞致云的其他明星项目
+![UI Display](https://resource.1panel.pro/img/1panel.png)
 
-- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - 基于 LLM 大语言模型的开源知识库问答系统
-- [JumpServer](https://github.com/jumpserver/jumpserver/) - 广受欢迎的开源堡垒机
-- [Halo](https://github.com/halo-dev/halo/) - 强大易用的开源建站工具
-- [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
-- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源持续测试工具
-- [KubePi](https://github.com/1Panel-dev/KubePi/) - 现代化、开源的 K8s 面板
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=1Panel-dev/1Panel&type=Date)](https://star-history.com/#1Panel-dev/1Panel&Date)
+
+## Pro Edition
+
+Compared to the OSS Edition, 1Panel Pro Edition provides users with a wealth of enhanced features and technical support services. Enhanced features include WAF enhancement, website tamper protection, website monitoring, GPU monitoring, custom logo and theme color, etc. [Click to view the detailed introduction of the Pro Edition](https://1panel.pro/pricing).
+
+## Security Information
+
+If you discover any security issues, please refer to [SECURITY.md](/SECURITY.md).
 
 ## License
 
-Copyright (c) 2014-2024 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
-
 Licensed under The GNU General Public License version 3 (GPLv3)  (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
 <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.

SECURITY.md

@@ -1,15 +1,13 @@
-# 安全说明
+# Security policy
 
-如果您发现安全问题，请直接联系我们：
+## Supported versions
 
-- wanghe@fit2cloud.com
+| Version | Supported          |
+| ------- | ------------------ |
+| v1.x     | :white_check_mark: |
 
-感谢您的支持！
+## Reporting a vulnerability
 
-# Security Policy
+We first appreciate and are very thankful that you've found a vulnerability issue in 1Panel! By disclosing such issue to 1Panel development team you are helping 1Panel to become a much more safer project than before! ;)
 
-All security bugs should be reported to the contact as below:
-
-- wanghe@fit2cloud.com
-
-Thanks for your support!
+To protect the existing users of 1Panel, we kindly ask you to not disclose the vulnerability to anyone except the 1Panel development team before a fix has been rolled out. Send an email to `wanghe@fit2cloud.com` instead.

agent/app/api/v2/ai.go

@@ -0,0 +1,256 @@
+package v2
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu"
+	"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/gpu/common"
+	"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/xpu"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags AI
+// @Summary Create Ollama model
+// @Accept json
+// @Param request body dto.OllamaModelName true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加 Ollama 模型 [name]","formatEN":"add Ollama model [name]"}
+func (b *BaseApi) CreateOllamaModel(c *gin.Context) {
+	var req dto.OllamaModelName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := aiToolService.Create(req); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags AI
+// @Summary Rereate Ollama model
+// @Accept json
+// @Param request body dto.OllamaModelName true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/recreate [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加 Ollama 模型重试 [name]","formatEN":"re-add Ollama model [name]"}
+func (b *BaseApi) RecreateOllamaModel(c *gin.Context) {
+	var req dto.OllamaModelName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := aiToolService.Recreate(req); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags AI
+// @Summary Close Ollama model conn
+// @Accept json
+// @Param request body dto.OllamaModelName true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/close [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"关闭 Ollama 模型连接 [name]","formatEN":"close conn for Ollama model [name]"}
+func (b *BaseApi) CloseOllamaModel(c *gin.Context) {
+	var req dto.OllamaModelName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := aiToolService.Close(req.Name); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags AI
+// @Summary Sync Ollama model list
+// @Success 200 {array} dto.OllamaModelDropList
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/sync [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步 Ollama 模型列表","formatEN":"sync Ollama model list"}
+func (b *BaseApi) SyncOllamaModel(c *gin.Context) {
+	list, err := aiToolService.Sync()
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags AI
+// @Summary Page Ollama models
+// @Accept json
+// @Param request body dto.SearchWithPage true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/search [post]
+func (b *BaseApi) SearchOllamaModel(c *gin.Context) {
+	var req dto.SearchWithPage
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := aiToolService.Search(req)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags AI
+// @Summary Page Ollama models
+// @Accept json
+// @Param request body dto.OllamaModelName true "request"
+// @Success 200 {string} details
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/load [post]
+func (b *BaseApi) LoadOllamaModelDetail(c *gin.Context) {
+	var req dto.OllamaModelName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	detail, err := aiToolService.LoadDetail(req.Name)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, detail)
+}
+
+// @Tags AI
+// @Summary Delete Ollama model
+// @Accept json
+// @Param request body dto.ForceDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/ollama/model/del [post]
+// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"ollama_models","output_column":"name","output_value":"names"}],"formatZH":"删除 Ollama 模型 [names]","formatEN":"remove Ollama model [names]"}
+func (b *BaseApi) DeleteOllamaModel(c *gin.Context) {
+	var req dto.ForceDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := aiToolService.Delete(req); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+
+	helper.Success(c)
+}
+
+// @Tags AI
+// @Summary Load gpu / xpu info
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/gpu/load [get]
+func (b *BaseApi) LoadGpuInfo(c *gin.Context) {
+	ok, client := gpu.New()
+	if ok {
+		info, err := client.LoadGpuInfo()
+		if err != nil {
+			helper.BadRequest(c, err)
+			return
+		}
+		helper.SuccessWithData(c, info)
+		return
+	}
+	xpuOK, xpuClient := xpu.New()
+	if xpuOK {
+		info, err := xpuClient.LoadGpuInfo()
+		if err != nil {
+			helper.BadRequest(c, err)
+			return
+		}
+		helper.SuccessWithData(c, info)
+		return
+	}
+	helper.SuccessWithData(c, &common.GpuInfo{})
+}
+
+// @Tags AI
+// @Summary Bind domain
+// @Accept json
+// @Param request body dto.OllamaBindDomain true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/domain/bind [post]
+func (b *BaseApi) BindDomain(c *gin.Context) {
+	var req dto.OllamaBindDomain
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := aiToolService.BindDomain(req); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags AI
+// @Summary Get bind domain
+// @Accept json
+// @Param request body dto.OllamaBindDomainReq true "request"
+// @Success 200 {object} dto.OllamaBindDomainRes
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /ai/domain/get [post]
+func (b *BaseApi) GetBindDomain(c *gin.Context) {
+	var req dto.OllamaBindDomainReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := aiToolService.GetBindDomain(req)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// Tags AI
+// Summary Update bind domain
+// Accept json
+// Param request body dto.OllamaBindDomain true "request"
+// Success 200
+// Security ApiKeyAuth
+// Security Timestamp
+// Router /ai/domain/update [post]
+func (b *BaseApi) UpdateBindDomain(c *gin.Context) {
+	var req dto.OllamaBindDomain
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := aiToolService.UpdateBindDomain(req); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	helper.Success(c)
+}

agent/app/api/v2/alert.go

@@ -0,0 +1,200 @@
+package v2
+
+import (
+	"errors"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/gin-gonic/gin"
+)
+
+func (b *BaseApi) PageAlert(c *gin.Context) {
+	var req dto.AlertSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, alerts, err := alertService.PageAlert(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Total: total,
+		Items: alerts,
+	})
+}
+
+func (b *BaseApi) GetAlerts(c *gin.Context) {
+	alerts, err := alertService.GetAlerts()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, alerts)
+}
+
+func (b *BaseApi) CreateAlert(c *gin.Context) {
+	var req dto.AlertCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := alertService.CreateAlert(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) DeleteAlert(c *gin.Context) {
+	var req dto.DeleteRequest
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := alertService.DeleteAlert(req.ID)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) UpdateAlert(c *gin.Context) {
+	var req dto.AlertUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := alertService.UpdateAlert(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) GetAlert(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.BadRequest(c, errors.New("no such id in request param"))
+		return
+	}
+	alert, err := alertService.GetAlert(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, alert)
+}
+
+func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
+	var req dto.AlertUpdateStatus
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := alertService.UpdateStatus(req.ID, req.Status); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) GetDisks(c *gin.Context) {
+	alerts, err := alertService.GetDisks()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, alerts)
+}
+
+func (b *BaseApi) PageAlertLogs(c *gin.Context) {
+	var req dto.AlertLogSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, alertLogs, err := alertService.PageAlertLogs(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Total: total,
+		Items: alertLogs,
+	})
+}
+
+func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
+	if err := alertService.CleanAlertLogs(); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) GetClams(c *gin.Context) {
+	clams, err := alertService.GetClams()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, clams)
+}
+
+func (b *BaseApi) GetCronJobs(c *gin.Context) {
+	var req dto.CronJobReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	cronJobs, err := alertService.GetCronJobs(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, cronJobs)
+}
+
+func (b *BaseApi) GetAlertConfig(c *gin.Context) {
+	config, err := alertService.GetAlertConfig()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, config)
+}
+
+func (b *BaseApi) UpdateAlertConfig(c *gin.Context) {
+	var req dto.AlertConfigUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := alertService.UpdateAlertConfig(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
+	var req dto.DeleteRequest
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := alertService.DeleteAlertConfig(req.ID)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+func (b *BaseApi) TestAlertConfig(c *gin.Context) {
+	var req dto.AlertConfigTest
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	flag, err := alertService.TestAlertConfig(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, flag)
+}

agent/app/api/v2/app.go

@@ -1,50 +1,51 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/i18n"
+	"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/gin-gonic/gin"
 )
 
 // @Tags App
 // @Summary List apps
-// @Description 获取应用列表
 // @Accept json
 // @Param request body request.AppSearch true "request"
-// @Success 200
+// @Success 200 {object} response.AppRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/search [post]
 func (b *BaseApi) SearchApp(c *gin.Context) {
 	var req request.AppSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	list, err := appService.PageApp(req)
+	list, err := appService.PageApp(c, req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
 }
 
 // @Tags App
-// @Summary Sync app list
-// @Description 同步应用列表
+// @Summary Sync remote app list
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /apps/sync [post]
+// @Security Timestamp
+// @Router /apps/sync/remote [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用商店同步","formatEN":"App store synchronization"}
 func (b *BaseApi) SyncApp(c *gin.Context) {
-	go appService.SyncAppListFromLocal()
+	var req dto.OperateWithTask
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
 	res, err := appService.GetAppUpdate()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-
 	if !res.CanUpdate {
 		if res.IsSyncing {
 			helper.SuccessWithMsg(c, i18n.GetMsgByKey("AppStoreIsSyncing"))
@@ -53,31 +54,46 @@ func (b *BaseApi) SyncApp(c *gin.Context) {
 		}
 		return
 	}
-	go func() {
-		if err := appService.SyncAppListFromRemote(); err != nil {
-			global.LOG.Errorf("Synchronization with the App Store failed [%s]", err.Error())
-		}
-	}()
-	helper.SuccessWithData(c, "")
+	if err = appService.SyncAppListFromRemote(req.TaskID); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags App
+// @Summary Sync local  app list
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /apps/sync/local [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用商店同步","formatEN":"App store synchronization"}
+func (b *BaseApi) SyncLocalApp(c *gin.Context) {
+	var req dto.OperateWithTask
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	go appService.SyncAppListFromLocal(req.TaskID)
+	helper.Success(c)
 }
 
 // @Tags App
 // @Summary Search app by key
-// @Description 通过 key 获取应用信息
 // @Accept json
 // @Param key path string true "app key"
 // @Success 200 {object} response.AppDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/:key [get]
 func (b *BaseApi) GetApp(c *gin.Context) {
 	appKey, err := helper.GetStrParamByKey(c, "key")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
-	appDTO, err := appService.GetApp(appKey)
+	appDTO, err := appService.GetApp(c, appKey)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, appDTO)
@@ -85,25 +101,25 @@ func (b *BaseApi) GetApp(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app detail by appid
-// @Description 通过 appid 获取应用详情
 // @Accept json
 // @Param appId path integer true "app id"
 // @Param version path string true "app 版本"
 // @Param version path string true "app 类型"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/detail/:appId/:version/:type [get]
 func (b *BaseApi) GetAppDetail(c *gin.Context) {
 	appID, err := helper.GetIntParamByKey(c, "appId")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		helper.BadRequest(c, err)
 		return
 	}
 	version := c.Param("version")
 	appType := c.Param("type")
 	appDetailDTO, err := appService.GetAppDetail(appID, version, appType)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, appDetailDTO)
@@ -111,49 +127,33 @@ func (b *BaseApi) GetAppDetail(c *gin.Context) {
 
 // @Tags App
 // @Summary Get app detail by id
-// @Description 通过 id 获取应用详情
 // @Accept json
 // @Param appId path integer true "id"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/details/:id [get]
 func (b *BaseApi) GetAppDetailByID(c *gin.Context) {
 	appDetailID, err := helper.GetIntParamByKey(c, "id")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		helper.BadRequest(c, err)
 		return
 	}
 	appDetailDTO, err := appService.GetAppDetailByID(appDetailID)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, appDetailDTO)
 }
 
-// @Tags App
-// @Summary Get Ignore App
-// @Description 获取忽略的应用版本
-// @Accept json
-// @Success 200 {object} response.IgnoredApp
-// @Security ApiKeyAuth
-// @Router /apps/ignored [get]
-func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
-	res, err := appService.GetIgnoredApp()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
 // @Tags App
 // @Summary Install app
-// @Description 安装应用
 // @Accept json
 // @Param request body request.AppInstallCreate true "request"
 // @Success 200 {object} model.AppInstall
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/install [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"安装应用 [name]","formatEN":"Install app [name]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
@@ -161,21 +161,18 @@ func (b *BaseApi) InstallApp(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	tx, ctx := helper.GetTxAndContext()
-	install, err := appService.Install(ctx, req)
+	install, err := appService.Install(req)
 	if err != nil {
-		tx.Rollback()
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	tx.Commit()
 	helper.SuccessWithData(c, install)
 }
 
 func (b *BaseApi) GetAppTags(c *gin.Context) {
-	tags, err := appService.GetAppTags()
+	tags, err := appService.GetAppTags(c)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, tags)
@@ -183,14 +180,14 @@ func (b *BaseApi) GetAppTags(c *gin.Context) {
 
 // @Tags App
 // @Summary Get app list update
-// @Description 获取应用更新版本
-// @Success 200
+// @Success 200 {object} response.AppUpdateRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/checkupdate [get]
 func (b *BaseApi) GetAppListUpdate(c *gin.Context) {
 	res, err := appService.GetAppUpdate()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)

agent/app/api/v2/app_ignore_upgrade.go

@@ -0,0 +1,66 @@
+package v2
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags App
+// @Summary List Upgrade Ignored App
+// @Accept json
+// @Success 200 {array} model.AppIgnoreUpgrade
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /apps/ignored/detail [get]
+func (b *BaseApi) ListAppIgnored(c *gin.Context) {
+	res, err := appIgnoreUpgradeService.List()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags App
+// @Summary Ignore Upgrade App
+// @Accept json
+// @Param request body request.AppIgnoreUpgradeReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /apps/installed/ignore [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"忽略应用升级","formatEN":"Ignore application upgrade"}
+func (b *BaseApi) IgnoreAppUpgrade(c *gin.Context) {
+	var req request.AppIgnoreUpgradeReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := appIgnoreUpgradeService.CreateAppIgnore(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// 写一个去掉忽略的接口
+// @Tags App
+// @Summary Cancel Ignore Upgrade App
+// @Accept json
+// @Param request body request.ReqWithID true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /apps/ignored/cancel [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"取消忽略应用升级","formatEN":"Cancel ignore application upgrade"}
+func (b *BaseApi) CancelIgnoreAppUpgrade(c *gin.Context) {
+	var req request.ReqWithID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := appIgnoreUpgradeService.Delete(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}

agent/app/api/v2/app_install.go

@@ -1,21 +1,20 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags App
 // @Summary Page app installed
-// @Description 分页获取已安装应用列表
 // @Accept json
 // @Param request body request.AppInstalledSearch true "request"
-// @Success 200
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/search [post]
 func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 	var req request.AppInstalledSearch
@@ -25,14 +24,17 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 	if req.All {
 		list, err := appInstallService.SearchForWebsite(req)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-		helper.SuccessWithData(c, list)
+		helper.SuccessWithData(c, dto.PageResult{
+			Items: list,
+			Total: int64(len(list)),
+		})
 	} else {
 		total, list, err := appInstallService.Page(req)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		helper.SuccessWithData(c, dto.PageResult{
@@ -44,15 +46,15 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary List app installed
-// @Description 获取已安装应用列表
 // @Accept json
-// @Success 200 array dto.AppInstallInfo
+// @Success 200 {array} dto.AppInstallInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/list [get]
 func (b *BaseApi) ListAppInstalled(c *gin.Context) {
 	list, err := appInstallService.GetInstallList()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
@@ -60,11 +62,11 @@ func (b *BaseApi) ListAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Check app installed
-// @Description 检查应用安装情况
 // @Accept json
 // @Param request body request.AppInstalledInfo true "request"
 // @Success 200 {object} response.AppInstalledCheck
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/check [post]
 func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 	var req request.AppInstalledInfo
@@ -73,7 +75,7 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 	}
 	checkData, err := appInstallService.CheckExist(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, checkData)
@@ -81,11 +83,11 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app port by key
-// @Description 获取应用端口
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {integer} port
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/loadport [post]
 func (b *BaseApi) LoadPort(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -94,7 +96,7 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 	}
 	port, err := appInstallService.LoadPort(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, port)
@@ -102,11 +104,11 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app password by key
-// @Description 获取应用连接信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200 {string} response.DatabaseConn
+// @Success 200 {object} response.DatabaseConn
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/conninfo/:key [get]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -115,7 +117,7 @@ func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	}
 	conn, err := appInstallService.LoadConnInfo(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, conn)
@@ -123,21 +125,21 @@ func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 
 // @Tags App
 // @Summary Check before delete
-// @Description 删除前检查
 // @Accept json
 // @Param appInstallId path integer true "App install id"
 // @Success 200 {array} dto.AppResource
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/delete/check/:appInstallId [get]
 func (b *BaseApi) DeleteCheck(c *gin.Context) {
 	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		helper.BadRequest(c, err)
 		return
 	}
 	checkData, err := appInstallService.DeleteCheck(appInstallId)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, checkData)
@@ -146,26 +148,26 @@ func (b *BaseApi) DeleteCheck(c *gin.Context) {
 // Sync app installed
 // @Tags App
 // @Summary Sync app installed
-// @Description 同步已安装应用列表
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/sync [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步已安装应用列表","formatEN":"Sync the list of installed apps"}
 func (b *BaseApi) SyncInstalled(c *gin.Context) {
 	if err := appInstallService.SyncAll(false); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, "")
+	helper.Success(c)
 }
 
 // @Tags App
 // @Summary Operate installed app
-// @Description 操作已安装应用
 // @Accept json
 // @Param request body request.AppInstalledOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/op [post]
 // @x-panel-log {"bodyKeys":["installId","operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"name","output_value":"appName"},{"input_column":"id","input_value":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"[operate] 应用 [appKey][appName]","formatEN":"[operate] App [appKey][appName]"}
 func (b *BaseApi) OperateInstalled(c *gin.Context) {
@@ -174,25 +176,25 @@ func (b *BaseApi) OperateInstalled(c *gin.Context) {
 		return
 	}
 	if err := appInstallService.Operate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags App
 // @Summary Search app service by key
-// @Description 通过 key 获取应用 service
 // @Accept json
 // @Param key path string true "request"
 // @Success 200 {array} response.AppService
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/services/:key [get]
 func (b *BaseApi) GetServices(c *gin.Context) {
 	key := c.Param("key")
 	services, err := appInstallService.GetServices(key)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, services)
@@ -200,11 +202,11 @@ func (b *BaseApi) GetServices(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app update version by install id
-// @Description 通过 install id 获取应用更新版本
 // @Accept json
 // @Param appInstallId path integer true "request"
 // @Success 200 {array} dto.AppVersion
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/update/versions [post]
 func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
 	var req request.AppUpdateVersion
@@ -213,7 +215,7 @@ func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
 	}
 	versions, err := appInstallService.GetUpdateVersions(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, versions)
@@ -221,11 +223,11 @@ func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
 
 // @Tags App
 // @Summary Change app port
-// @Description 修改应用端口
 // @Accept json
 // @Param request body request.PortUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/port/change [post]
 // @x-panel-log {"bodyKeys":["key","name","port"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用端口修改 [key]-[name] => [port]","formatEN":"Application port update [key]-[name] => [port]"}
 func (b *BaseApi) ChangeAppPort(c *gin.Context) {
@@ -234,19 +236,19 @@ func (b *BaseApi) ChangeAppPort(c *gin.Context) {
 		return
 	}
 	if err := appInstallService.ChangeAppPort(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags App
 // @Summary Search default config by key
-// @Description 通过 key 获取应用默认配置
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/conf [post]
 func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -255,7 +257,7 @@ func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 	}
 	content, err := appInstallService.GetDefaultConfigByKey(req.Type, req.Name)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -264,21 +266,21 @@ func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 
 // @Tags App
 // @Summary Search params by appInstallId
-// @Description 通过 install id 获取应用参数
 // @Accept json
 // @Param appInstallId path string true "request"
-// @Success 200 {object} response.AppParam
+// @Success 200 {object} response.AppConfig
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/params/:appInstallId [get]
 func (b *BaseApi) GetParams(c *gin.Context) {
 	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		helper.BadRequest(c, err)
 		return
 	}
 	content, err := appInstallService.GetParams(appInstallId)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, content)
@@ -286,11 +288,11 @@ func (b *BaseApi) GetParams(c *gin.Context) {
 
 // @Tags App
 // @Summary Change app params
-// @Description 修改应用参数
 // @Accept json
 // @Param request body request.AppInstalledUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/params/update [post]
 // @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用参数修改 [installId]","formatEN":"Application param update [installId]"}
 func (b *BaseApi) UpdateInstalled(c *gin.Context) {
@@ -299,29 +301,51 @@ func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 		return
 	}
 	if err := appInstallService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags App
-// @Summary ignore App Update
-// @Description 忽略应用升级版本
+// @Summary Update app config
 // @Accept json
-// @Param request body request.AppInstalledIgnoreUpgrade true "request"
+// @Param request body request.AppConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /apps/installed/ignore [post]
-// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"忽略应用 [installId] 版本升级","formatEN":"Application param update [installId]"}
-func (b *BaseApi) IgnoreUpgrade(c *gin.Context) {
-	var req request.AppInstalledIgnoreUpgrade
+// @Security Timestamp
+// @Router /apps/installed/config/update [post]
+// @x-panel-log {"bodyKeys":["installID","webUI"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用配置更新 [installID]","formatEN":"Application config update [installID]"}
+func (b *BaseApi) UpdateAppConfig(c *gin.Context) {
+	var req request.AppConfigUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := appInstallService.IgnoreUpgrade(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := appInstallService.UpdateAppConfig(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
+}
+
+// @Tags App
+// @Summary Get app install info
+// @Accept json
+// @Param appInstallId path integer true "App install id"
+// @Success 200 {object} dto.AppInstallInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /apps/installed/info/:appInstallId [get]
+func (b *BaseApi) GetAppInstallInfo(c *gin.Context) {
+	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	info, err := appInstallService.GetAppInstallInfo(appInstallId)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, info)
 }

agent/app/api/v2/backup.go

@@ -1,127 +1,102 @@
-package v1
+package v2
 
 import (
-	"encoding/base64"
 	"fmt"
 	"path"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/gin-gonic/gin"
 )
 
+func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
+	name, err := helper.GetStrParamByKey(c, "name")
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+
+	if err := backupService.CheckUsed(name, true); err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+
+	helper.Success(c)
+}
+
 // @Tags Backup Account
 // @Summary Create backup account
-// @Description 创建备份账号
 // @Accept json
 // @Param request body dto.BackupOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup [post]
+// @Security Timestamp
+// @Router /backups [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建备份账号 [type]","formatEN":"create backup account [type]"}
 func (b *BaseApi) CreateBackup(c *gin.Context) {
 	var req dto.BackupOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if len(req.Credential) != 0 {
-		credential, err := base64.StdEncoding.DecodeString(req.Credential)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Credential = string(credential)
-	}
-	if len(req.AccessKey) != 0 {
-		accessKey, err := base64.StdEncoding.DecodeString(req.AccessKey)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.AccessKey = string(accessKey)
-	}
 
 	if err := backupService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Backup Account
-// @Summary Refresh OneDrive token
-// @Description 刷新 OneDrive token
+// @Summary Refresh token
+// @Accept json
+// @Param request body dto.BackupOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/refresh/onedrive [post]
-func (b *BaseApi) RefreshOneDriveToken(c *gin.Context) {
-	backupService.Run()
-	helper.SuccessWithData(c, nil)
+// @Security Timestamp
+// @Router /backups/refresh/token [post]
+func (b *BaseApi) RefreshToken(c *gin.Context) {
+	var req dto.OperateByID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := backupService.RefreshToken(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
 }
 
 // @Tags Backup Account
 // @Summary List buckets
-// @Description 获取 bucket 列表
 // @Accept json
 // @Param request body dto.ForBuckets true "request"
-// @Success 200 {array} string
+// @Success 200 {array} object
 // @Security ApiKeyAuth
-// @Router /settings/backup/search [post]
+// @Security Timestamp
+// @Router /buckets [post]
 func (b *BaseApi) ListBuckets(c *gin.Context) {
 	var req dto.ForBuckets
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if len(req.Credential) != 0 {
-		credential, err := base64.StdEncoding.DecodeString(req.Credential)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Credential = string(credential)
-	}
-	if len(req.AccessKey) != 0 {
-		accessKey, err := base64.StdEncoding.DecodeString(req.AccessKey)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.AccessKey = string(accessKey)
-	}
 
 	buckets, err := backupService.GetBuckets(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, buckets)
 }
 
-// @Tags Backup Account
-// @Summary Load OneDrive info
-// @Description 获取 OneDrive 信息
-// @Accept json
-// @Success 200 {object} dto.OneDriveInfo
-// @Security ApiKeyAuth
-// @Router /settings/backup/onedrive [get]
-func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
-	data, err := backupService.LoadOneDriveInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Backup Account
 // @Summary Delete backup account
-// @Description 删除备份账号
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/del [post]
+// @Security Timestamp
+// @Router /backups/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"backup_accounts","output_column":"type","output_value":"types"}],"formatZH":"删除备份账号 [types]","formatEN":"delete backup account [types]"}
 func (b *BaseApi) DeleteBackup(c *gin.Context) {
 	var req dto.OperateByID
@@ -130,29 +105,132 @@ func (b *BaseApi) DeleteBackup(c *gin.Context) {
 	}
 
 	if err := backupService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
+}
+
+// @Tags Backup Account
+// @Summary Update backup account
+// @Accept json
+// @Param request body dto.BackupOperate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backups/update [post]
+// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [types]","formatEN":"update backup account [types]"}
+func (b *BaseApi) UpdateBackup(c *gin.Context) {
+	var req dto.BackupOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := backupService.Update(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Backup Account
+// @Summary Load backup account options
+// @Accept json
+// @Success 200 {array} dto.BackupOption
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backups/options [get]
+func (b *BaseApi) LoadBackupOptions(c *gin.Context) {
+	list, err := backupService.LoadBackupOptions()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags Backup Account
+// @Summary Search backup accounts with page
+// @Accept json
+// @Param request body dto.SearchPageWithType true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backups/search [post]
+func (b *BaseApi) SearchBackup(c *gin.Context) {
+	var req dto.SearchPageWithType
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := backupService.SearchWithPage(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags Backup Account
+// @Summary get local backup dir
+// @Success 200 {string} dir
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backups/local [get]
+func (b *BaseApi) GetLocalDir(c *gin.Context) {
+	dir, err := backupService.GetLocalDir()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dir)
+}
+
+// @Tags Backup Account
+// @Summary Load backup record size
+// @Accept json
+// @Param request body dto.SearchForSize true "request"
+// @Success 200 {array} dto.RecordFileSize
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backups/record/size [post]
+func (b *BaseApi) LoadBackupRecordSize(c *gin.Context) {
+	var req dto.SearchForSize
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	list, err := backupRecordService.LoadRecordSize(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
 }
 
 // @Tags Backup Account
 // @Summary Page backup records
-// @Description 获取备份记录列表分页
 // @Accept json
 // @Param request body dto.RecordSearch true "request"
-// @Success 200
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
-// @Router /settings/backup/record/search [post]
+// @Security Timestamp
+// @Router /backups/record/search [post]
 func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 	var req dto.RecordSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	total, list, err := backupService.SearchRecordsWithPage(req)
+	total, list, err := backupRecordService.SearchRecordsWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -164,21 +242,21 @@ func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Page backup records by cronjob
-// @Description 通过计划任务获取备份记录列表分页
 // @Accept json
 // @Param request body dto.RecordSearchByCronjob true "request"
-// @Success 200
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
-// @Router /settings/backup/record/search/bycronjob [post]
+// @Security Timestamp
+// @Router /backups/record/search/bycronjob [post]
 func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
 	var req dto.RecordSearchByCronjob
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	total, list, err := backupService.SearchRecordsByCronjobWithPage(req)
+	total, list, err := backupRecordService.SearchRecordsByCronjobWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -190,12 +268,12 @@ func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Download backup record
-// @Description 下载备份记录
 // @Accept json
 // @Param request body dto.DownloadRecord true "request"
-// @Success 200
+// @Success 200 {string} filePath
 // @Security ApiKeyAuth
-// @Router /settings/backup/record/download [post]
+// @Security Timestamp
+// @Router /backup/record/download [post]
 // @x-panel-log {"bodyKeys":["source","fileName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载备份记录 [source][fileName]","formatEN":"download backup records [source][fileName]"}
 func (b *BaseApi) DownloadRecord(c *gin.Context) {
 	var req dto.DownloadRecord
@@ -203,22 +281,43 @@ func (b *BaseApi) DownloadRecord(c *gin.Context) {
 		return
 	}
 
-	filePath, err := backupService.DownloadRecord(req)
+	filePath, err := backupRecordService.DownloadRecord(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, filePath)
 }
 
+// @Tags Backup Account
+// @Summary Update backup record description
+// @Accept json
+// @Param request body dto.UpdateDescription true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /backup/record/description/update [post]
+func (b *BaseApi) UpdateRecordDescription(c *gin.Context) {
+	var req dto.UpdateDescription
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := backupRecordService.UpdateDescription(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
 // @Tags Backup Account
 // @Summary Delete backup record
-// @Description 删除备份记录
 // @Accept json
 // @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/record/del [post]
+// @Security Timestamp
+// @Router /record/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"backup_records","output_column":"file_name","output_value":"files"}],"formatZH":"删除备份记录 [files]","formatEN":"delete backup records [files]"}
 func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
 	var req dto.BatchDeleteReq
@@ -226,94 +325,39 @@ func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
 		return
 	}
 
-	if err := backupService.BatchDeleteRecord(req.Ids); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := backupRecordService.BatchDeleteRecord(req.Ids); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Backup Account
-// @Summary Update backup account
-// @Description 更新备份账号信息
-// @Accept json
-// @Param request body dto.BackupOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/backup/update [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [types]","formatEN":"update backup account [types]"}
-func (b *BaseApi) UpdateBackup(c *gin.Context) {
-	var req dto.BackupOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Credential) != 0 {
-		credential, err := base64.StdEncoding.DecodeString(req.Credential)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Credential = string(credential)
-	}
-	if len(req.AccessKey) != 0 {
-		accessKey, err := base64.StdEncoding.DecodeString(req.AccessKey)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.AccessKey = string(accessKey)
-	}
-
-	if err := backupService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Backup Account
-// @Summary List backup accounts
-// @Description 获取备份账号列表
-// @Success 200 {array} dto.BackupInfo
-// @Security ApiKeyAuth
-// @Router /settings/backup/search [get]
-func (b *BaseApi) ListBackup(c *gin.Context) {
-	data, err := backupService.List()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
+	helper.Success(c)
 }
 
 // @Tags Backup Account
 // @Summary List files from backup accounts
-// @Description 获取备份账号内文件列表
 // @Accept json
-// @Param request body dto.BackupSearchFile true "request"
+// @Param request body dto.OperateByID true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
-// @Router /settings/backup/search/files [post]
+// @Security Timestamp
+// @Router /backups/search/files [post]
 func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
-	var req dto.BackupSearchFile
+	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	data := backupService.ListFiles(req)
+	data := backupRecordService.ListFiles(req)
 	helper.SuccessWithData(c, data)
 }
 
 // @Tags Backup Account
 // @Summary Backup system data
-// @Description 备份系统数据
 // @Accept json
 // @Param request body dto.CommonBackup true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/backup [post]
+// @Security Timestamp
+// @Router /backups/backup [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"备份 [type] 数据 [name][detailName]","formatEN":"backup [type] data [name][detailName]"}
 func (b *BaseApi) Backup(c *gin.Context) {
 	var req dto.CommonBackup
@@ -324,41 +368,41 @@ func (b *BaseApi) Backup(c *gin.Context) {
 	switch req.Type {
 	case "app":
 		if _, err := backupService.AppBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case "mysql", "mariadb":
+	case "mysql", "mariadb", constant.AppMysqlCluster:
 		if err := backupService.MysqlBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case constant.AppPostgresql:
+	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	case "website":
 		if err := backupService.WebsiteBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case "redis":
+	case "redis", constant.AppRedisCluster:
 		if err := backupService.RedisBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Backup Account
 // @Summary Recover system data
-// @Description 恢复系统数据
 // @Accept json
 // @Param request body dto.CommonRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/recover [post]
+// @Security Timestamp
+// @Router /backups/recover [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) Recover(c *gin.Context) {
 	var req dto.CommonRecover
@@ -366,50 +410,54 @@ func (b *BaseApi) Recover(c *gin.Context) {
 		return
 	}
 
-	downloadPath, err := backupService.DownloadRecord(dto.DownloadRecord{Source: req.Source, FileDir: path.Dir(req.File), FileName: path.Base(req.File)})
+	downloadPath, err := backupRecordService.DownloadRecord(dto.DownloadRecord{
+		DownloadAccountID: req.DownloadAccountID,
+		FileDir:           path.Dir(req.File),
+		FileName:          path.Base(req.File),
+	})
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("download file failed, err: %v", err))
+		helper.BadRequest(c, fmt.Errorf("download file failed, err: %v", err))
 		return
 	}
 	req.File = downloadPath
 	switch req.Type {
-	case "mysql", "mariadb":
+	case "mysql", "mariadb", constant.AppMysqlCluster:
 		if err := backupService.MysqlRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case constant.AppPostgresql:
+	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	case "website":
 		if err := backupService.WebsiteRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case "redis":
+	case "redis", constant.AppRedisCluster:
 		if err := backupService.RedisRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	case "app":
 		if err := backupService.AppRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Backup Account
 // @Summary Recover system data by upload
-// @Description 从上传恢复系统数据
 // @Accept json
 // @Param request body dto.CommonRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/recover/byupload [post]
+// @Security Timestamp
+// @Router /backups/recover/byupload [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 	var req dto.CommonRecover
@@ -418,26 +466,26 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 	}
 
 	switch req.Type {
-	case "mysql", "mariadb":
+	case "mysql", "mariadb", constant.AppMysqlCluster:
 		if err := backupService.MysqlRecoverByUpload(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-	case constant.AppPostgresql:
+	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlRecoverByUpload(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	case "app":
 		if err := backupService.AppRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	case "website":
 		if err := backupService.WebsiteRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/clam.go

@@ -1,19 +1,18 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Clam
 // @Summary Create clam
-// @Description 创建扫描规则
 // @Accept json
 // @Param request body dto.ClamCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam [post]
 // @x-panel-log {"bodyKeys":["name","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建扫描规则 [name][path]","formatEN":"create clam [name][path]"}
 func (b *BaseApi) CreateClam(c *gin.Context) {
@@ -23,19 +22,19 @@ func (b *BaseApi) CreateClam(c *gin.Context) {
 	}
 
 	if err := clamService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Update clam
-// @Description 修改扫描规则
 // @Accept json
 // @Param request body dto.ClamUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/update [post]
 // @x-panel-log {"bodyKeys":["name","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改扫描规则 [name][path]","formatEN":"update clam [name][path]"}
 func (b *BaseApi) UpdateClam(c *gin.Context) {
@@ -45,19 +44,19 @@ func (b *BaseApi) UpdateClam(c *gin.Context) {
 	}
 
 	if err := clamService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Update clam status
-// @Description 修改扫描规则状态
 // @Accept json
 // @Param request body dto.ClamUpdateStatus true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/status/update [post]
 // @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"修改扫描规则 [name] 状态为 [status]","formatEN":"change the status of clam [name] to [status]."}
 func (b *BaseApi) UpdateClamStatus(c *gin.Context) {
@@ -67,19 +66,19 @@ func (b *BaseApi) UpdateClamStatus(c *gin.Context) {
 	}
 
 	if err := clamService.UpdateStatus(req.ID, req.Status); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Page clam
-// @Description 获取扫描规则列表分页
 // @Accept json
 // @Param request body dto.SearchClamWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/search [post]
 func (b *BaseApi) SearchClam(c *gin.Context) {
 	var req dto.SearchClamWithPage
@@ -89,7 +88,7 @@ func (b *BaseApi) SearchClam(c *gin.Context) {
 
 	total, list, err := clamService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -101,15 +100,15 @@ func (b *BaseApi) SearchClam(c *gin.Context) {
 
 // @Tags Clam
 // @Summary Load clam base info
-// @Description 获取 Clam 基础信息
 // @Accept json
 // @Success 200 {object} dto.ClamBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/base [get]
 func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
 	info, err := clamService.LoadBaseInfo()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -118,10 +117,11 @@ func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
 
 // @Tags Clam
 // @Summary Operate Clam
-// @Description 修改 Clam 状态
 // @Accept json
+// @Success 200
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] FTP"}
 func (b *BaseApi) OperateClam(c *gin.Context) {
@@ -131,19 +131,20 @@ func (b *BaseApi) OperateClam(c *gin.Context) {
 	}
 
 	if err := clamService.Operate(req.Operation); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Clean clam record
-// @Description 清空扫描报告
 // @Accept json
 // @Param request body dto.OperateByID true "request"
+// @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/record/clean [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"清空扫描报告 [name]","formatEN":"clean clam record [name]"}
 func (b *BaseApi) CleanClamRecord(c *gin.Context) {
@@ -152,20 +153,20 @@ func (b *BaseApi) CleanClamRecord(c *gin.Context) {
 		return
 	}
 	if err := clamService.CleanRecord(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Page clam record
-// @Description 获取扫描结果列表分页
 // @Accept json
 // @Param request body dto.ClamLogSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/record/search [post]
 func (b *BaseApi) SearchClamRecord(c *gin.Context) {
 	var req dto.ClamLogSearch
@@ -175,7 +176,7 @@ func (b *BaseApi) SearchClamRecord(c *gin.Context) {
 
 	total, list, err := clamService.LoadRecords(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -187,11 +188,11 @@ func (b *BaseApi) SearchClamRecord(c *gin.Context) {
 
 // @Tags Clam
 // @Summary Load clam record detail
-// @Description 获取扫描结果详情
 // @Accept json
 // @Param request body dto.ClamLogReq true "request"
-// @Success 200
+// @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/record/log [post]
 func (b *BaseApi) LoadClamRecordLog(c *gin.Context) {
 	var req dto.ClamLogReq
@@ -201,7 +202,7 @@ func (b *BaseApi) LoadClamRecordLog(c *gin.Context) {
 
 	content, err := clamService.LoadRecordLog(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -210,11 +211,11 @@ func (b *BaseApi) LoadClamRecordLog(c *gin.Context) {
 
 // @Tags Clam
 // @Summary Load clam file
-// @Description 获取扫描文件
 // @Accept json
 // @Param request body dto.ClamFileReq true "request"
-// @Success 200 {object} dto.PageResult
+// @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/file/search [post]
 func (b *BaseApi) SearchClamFile(c *gin.Context) {
 	var req dto.ClamFileReq
@@ -224,7 +225,7 @@ func (b *BaseApi) SearchClamFile(c *gin.Context) {
 
 	content, err := clamService.LoadFile(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -233,11 +234,11 @@ func (b *BaseApi) SearchClamFile(c *gin.Context) {
 
 // @Tags Clam
 // @Summary Update clam file
-// @Description 更新病毒扫描配置文件
 // @Accept json
 // @Param request body dto.UpdateByNameAndFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/file/update [post]
 func (b *BaseApi) UpdateFile(c *gin.Context) {
 	var req dto.UpdateByNameAndFile
@@ -245,19 +246,19 @@ func (b *BaseApi) UpdateFile(c *gin.Context) {
 		return
 	}
 	if err := clamService.UpdateFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Delete clam
-// @Description 删除扫描规则
 // @Accept json
 // @Param request body dto.ClamDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"clams","output_column":"name","output_value":"names"}],"formatZH":"删除扫描规则 [names]","formatEN":"delete clam [names]"}
 func (b *BaseApi) DeleteClam(c *gin.Context) {
@@ -267,19 +268,19 @@ func (b *BaseApi) DeleteClam(c *gin.Context) {
 	}
 
 	if err := clamService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Clam
 // @Summary Handle clam scan
-// @Description 执行病毒扫描
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clam/handle [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"执行病毒扫描 [name]","formatEN":"handle clam scan [name]"}
 func (b *BaseApi) HandleClamScan(c *gin.Context) {
@@ -289,8 +290,8 @@ func (b *BaseApi) HandleClamScan(c *gin.Context) {
 	}
 
 	if err := clamService.HandleOnce(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/compose_template.go

@@ -1,19 +1,18 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Container Compose-template
 // @Summary Create compose template
-// @Description 创建容器编排模版
 // @Accept json
 // @Param request body dto.ComposeTemplateCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose 模版 [name]","formatEN":"create compose template [name]"}
 func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
@@ -23,20 +22,20 @@ func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 	}
 
 	if err := composeTemplateService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Compose-template
 // @Summary Page compose templates
-// @Description 获取容器编排模版列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/search [post]
 func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -46,7 +45,7 @@ func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 
 	total, list, err := composeTemplateService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -58,15 +57,15 @@ func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary List compose templates
-// @Description 获取容器编排模版列表
 // @Produce json
 // @Success 200 {array} dto.ComposeTemplateInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template [get]
 func (b *BaseApi) ListComposeTemplate(c *gin.Context) {
 	list, err := composeTemplateService.List()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -75,11 +74,11 @@ func (b *BaseApi) ListComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary Delete compose template
-// @Description 删除容器编排模版
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"compose_templates","output_column":"name","output_value":"names"}],"formatZH":"删除 compose 模版 [names]","formatEN":"delete compose template [names]"}
 func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
@@ -89,19 +88,19 @@ func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
 	}
 
 	if err := composeTemplateService.Delete(req.Ids); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Compose-template
 // @Summary Update compose template
-// @Description 更新容器编排模版
 // @Accept json
 // @Param request body dto.ComposeTemplateUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"compose_templates","output_column":"name","output_value":"name"}],"formatZH":"更新 compose 模版 [name]","formatEN":"update compose template information [name]"}
 func (b *BaseApi) UpdateComposeTemplate(c *gin.Context) {
@@ -114,8 +113,8 @@ func (b *BaseApi) UpdateComposeTemplate(c *gin.Context) {
 	upMap["content"] = req.Content
 	upMap["description"] = req.Description
 	if err := composeTemplateService.Update(req.ID, upMap); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/container.go

@@ -1,23 +1,22 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
+	"strconv"
+
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
-	"strconv"
 )
 
 // @Tags Container
 // @Summary Page containers
-// @Description 获取容器列表分页
 // @Accept json
 // @Param request body dto.PageContainer true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/search [post]
 func (b *BaseApi) SearchContainer(c *gin.Context) {
 	var req dto.PageContainer
@@ -27,7 +26,7 @@ func (b *BaseApi) SearchContainer(c *gin.Context) {
 
 	total, list, err := containerService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -37,29 +36,59 @@ func (b *BaseApi) SearchContainer(c *gin.Context) {
 }
 
 // @Tags Container
-// @Summary List containers
-// @Description 获取容器名称
+// @Summary Load container users
 // @Accept json
+// @Param request body dto.OperationWithName true "request"
 // @Produce json
-// @Success 200
+// @Success 200 {array} string
 // @Security ApiKeyAuth
-// @Router /containers/list [post]
-func (b *BaseApi) ListContainer(c *gin.Context) {
-	list, err := containerService.List()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+// @Security Timestamp
+// @Router /containers/users [post]
+func (b *BaseApi) LoadContainerUsers(c *gin.Context) {
+	var req dto.OperationWithName
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	helper.SuccessWithData(c, list)
+
+	helper.SuccessWithData(c, containerService.LoadUsers(req))
+}
+
+// @Tags Container
+// @Summary List containers
+// @Accept json
+// @Produce json
+// @Success 200 {array} string
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /containers/list [post]
+func (b *BaseApi) ListContainer(c *gin.Context) {
+	helper.SuccessWithData(c, containerService.List())
+}
+
+// @Tags Container
+// @Summary Load containers status
+// @Accept json
+// @Produce json
+// @Success 200 {object} dto.ContainerStatus
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /containers/status [get]
+func (b *BaseApi) LoadContainerStatus(c *gin.Context) {
+	data, err := containerService.LoadStatus()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
 }
 
 // @Tags Container Compose
 // @Summary Page composes
-// @Description 获取编排列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/search [post]
 func (b *BaseApi) SearchCompose(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -69,7 +98,7 @@ func (b *BaseApi) SearchCompose(c *gin.Context) {
 
 	total, list, err := containerService.PageCompose(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -80,11 +109,11 @@ func (b *BaseApi) SearchCompose(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Test compose
-// @Description 测试 compose 是否可用
 // @Accept json
 // @Param request body dto.ComposeCreate true "request"
-// @Success 200
+// @Success 200 {boolean} isOK
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/test [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测 compose [name] 格式","formatEN":"check compose [name]"}
 func (b *BaseApi) TestCompose(c *gin.Context) {
@@ -95,7 +124,7 @@ func (b *BaseApi) TestCompose(c *gin.Context) {
 
 	isOK, err := containerService.TestCompose(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, isOK)
@@ -103,11 +132,11 @@ func (b *BaseApi) TestCompose(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Create compose
-// @Description 创建容器编排
 // @Accept json
 // @Param request body dto.ComposeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose [name]","formatEN":"create compose [name]"}
 func (b *BaseApi) CreateCompose(c *gin.Context) {
@@ -116,21 +145,20 @@ func (b *BaseApi) CreateCompose(c *gin.Context) {
 		return
 	}
 
-	log, err := containerService.CreateCompose(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := containerService.CreateCompose(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, log)
+	helper.Success(c)
 }
 
 // @Tags Container Compose
 // @Summary Operate compose
-// @Description 容器编排操作
 // @Accept json
 // @Param request body dto.ComposeOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/operate [post]
 // @x-panel-log {"bodyKeys":["name","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"compose [operation] [name]","formatEN":"compose [operation] [name]"}
 func (b *BaseApi) OperatorCompose(c *gin.Context) {
@@ -140,19 +168,19 @@ func (b *BaseApi) OperatorCompose(c *gin.Context) {
 	}
 
 	if err := containerService.ComposeOperation(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Update container
-// @Description 更新容器
 // @Accept json
 // @Param request body dto.ContainerOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/update [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器 [name][image]","formatEN":"update container [name][image]"}
 func (b *BaseApi) ContainerUpdate(c *gin.Context) {
@@ -162,19 +190,19 @@ func (b *BaseApi) ContainerUpdate(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerUpdate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Load container info
-// @Description 获取容器表单信息
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.ContainerOperate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/info [post]
 func (b *BaseApi) ContainerInfo(c *gin.Context) {
 	var req dto.OperationWithName
@@ -184,35 +212,35 @@ func (b *BaseApi) ContainerInfo(c *gin.Context) {
 
 	data, err := containerService.ContainerInfo(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)
 }
 
 // @Summary Load container limits
-// @Description 获取容器限制
 // @Success 200 {object} dto.ResourceLimit
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/limit [get]
 func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
 	data, err := containerService.LoadResourceLimit()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)
 }
 
 // @Summary Load container stats
-// @Description 获取容器列表资源占用
 // @Success 200 {array} dto.ContainerListStats
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/list/stats [get]
 func (b *BaseApi) ContainerListStats(c *gin.Context) {
 	data, err := containerService.ContainerListStats()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)
@@ -220,11 +248,11 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
 
 // @Tags Container
 // @Summary Create container
-// @Description 创建容器
 // @Accept json
 // @Param request body dto.ContainerOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器 [name][image]","formatEN":"create container [name][image]"}
 func (b *BaseApi) ContainerCreate(c *gin.Context) {
@@ -233,20 +261,41 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 		return
 	}
 
-	if err := containerService.ContainerCreate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := containerService.ContainerCreate(req, true); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	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
-// @Description 更新容器镜像
 // @Accept json
 // @Param request body dto.ContainerUpgrade true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/upgrade [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
 func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
@@ -256,19 +305,19 @@ func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerUpgrade(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Clean container
-// @Description 容器清理
 // @Accept json
 // @Param request body dto.ContainerPrune true "request"
 // @Success 200 {object} dto.ContainerPruneReport
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/prune [post]
 // @x-panel-log {"bodyKeys":["pruneType"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [pruneType]","formatEN":"clean container [pruneType]"}
 func (b *BaseApi) ContainerPrune(c *gin.Context) {
@@ -279,7 +328,7 @@ func (b *BaseApi) ContainerPrune(c *gin.Context) {
 
 	report, err := containerService.Prune(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, report)
@@ -287,11 +336,11 @@ func (b *BaseApi) ContainerPrune(c *gin.Context) {
 
 // @Tags Container
 // @Summary Clean container log
-// @Description 清理容器日志
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/clean/log [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [name] 日志","formatEN":"clean container [name] logs"}
 func (b *BaseApi) CleanContainerLog(c *gin.Context) {
@@ -301,37 +350,19 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerLogClean(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Container
-// @Summary Load container log
-// @Description 获取容器操作日志
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /containers/load/log [post]
-func (b *BaseApi) LoadContainerLog(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	content := containerService.LoadContainerLogs(req)
-	helper.SuccessWithData(c, content)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Rename Container
-// @Description 容器重命名
 // @Accept json
 // @Param request body dto.ContainerRename true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/rename [post]
 // @x-panel-log {"bodyKeys":["name","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器重命名 [name] => [newName]","formatEN":"rename container [name] => [newName]"}
 func (b *BaseApi) ContainerRename(c *gin.Context) {
@@ -341,18 +372,19 @@ func (b *BaseApi) ContainerRename(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerRename(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Commit Container
-// @Description 容器提交生成新镜像
 // @Accept json
 // @Param request body dto.ContainerCommit true "request"
 // @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/commit [post]
 func (b *BaseApi) ContainerCommit(c *gin.Context) {
 	var req dto.ContainerCommit
@@ -361,19 +393,19 @@ func (b *BaseApi) ContainerCommit(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerCommit(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Operate Container
-// @Description 容器操作
 // @Accept json
 // @Param request body dto.ContainerOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/operate [post]
 // @x-panel-log {"bodyKeys":["names","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [names] 执行 [operation]","formatEN":"container [operation] [names]"}
 func (b *BaseApi) ContainerOperation(c *gin.Context) {
@@ -383,29 +415,29 @@ func (b *BaseApi) ContainerOperation(c *gin.Context) {
 	}
 
 	if err := containerService.ContainerOperation(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container
 // @Summary Container stats
-// @Description 容器监控信息
-// @Param id path integer true "容器id"
+// @Param id path string true "容器id"
 // @Success 200 {object} dto.ContainerStats
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/stats/:id [get]
 func (b *BaseApi) ContainerStats(c *gin.Context) {
 	containerID, ok := c.Params.Get("id")
 	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error container id in path"))
+		helper.BadRequest(c, errors.New("error container id in path"))
 		return
 	}
 
 	result, err := containerService.ContainerStats(containerID)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, result)
@@ -413,11 +445,11 @@ func (b *BaseApi) ContainerStats(c *gin.Context) {
 
 // @Tags Container
 // @Summary Container inspect
-// @Description 容器详情
 // @Accept json
 // @Param request body dto.InspectReq true "request"
 // @Success 200 {string} result
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/inspect [post]
 func (b *BaseApi) Inspect(c *gin.Context) {
 	var req dto.InspectReq
@@ -427,41 +459,12 @@ func (b *BaseApi) Inspect(c *gin.Context) {
 
 	result, err := containerService.Inspect(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, result)
 }
 
-// @Tags Container
-// @Summary Container logs
-// @Description 容器日志
-// @Param container query string false "容器名称"
-// @Param since query string false "时间筛选"
-// @Param follow query string false "是否追踪"
-// @Param tail query string false "显示行号"
-// @Security ApiKeyAuth
-// @Router /containers/search/log [post]
-func (b *BaseApi) ContainerLogs(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
-	}
-	defer wsConn.Close()
-
-	container := c.Query("container")
-	since := c.Query("since")
-	follow := c.Query("follow") == "true"
-	tail := c.Query("tail")
-
-	if err := containerService.ContainerLogs(wsConn, "container", container, since, tail, follow); err != nil {
-		_ = wsConn.WriteMessage(1, []byte(err.Error()))
-		return
-	}
-}
-
-// @Description 下载容器日志
 // @Router /containers/download/log [post]
 func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
 	var req dto.ContainerLog
@@ -470,18 +473,18 @@ func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
 	}
 	err := containerService.DownloadContainerLogs(req.ContainerType, req.Container, req.Since, strconv.Itoa(int(req.Tail)), c)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 	}
 }
 
 // @Tags Container Network
 // @Summary Page networks
-// @Description 获取容器网络列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network/search [post]
 func (b *BaseApi) SearchNetwork(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -491,7 +494,7 @@ func (b *BaseApi) SearchNetwork(c *gin.Context) {
 
 	total, list, err := containerService.PageNetwork(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -502,16 +505,16 @@ func (b *BaseApi) SearchNetwork(c *gin.Context) {
 
 // @Tags Container Network
 // @Summary List networks
-// @Description 获取容器网络列表
 // @Accept json
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network [get]
 func (b *BaseApi) ListNetwork(c *gin.Context) {
 	list, err := containerService.ListNetwork()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
@@ -519,11 +522,11 @@ func (b *BaseApi) ListNetwork(c *gin.Context) {
 
 // @Tags Container Network
 // @Summary Delete network
-// @Description 删除容器网络
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network/del [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器网络 [names]","formatEN":"delete container network [names]"}
 func (b *BaseApi) DeleteNetwork(c *gin.Context) {
@@ -533,19 +536,19 @@ func (b *BaseApi) DeleteNetwork(c *gin.Context) {
 	}
 
 	if err := containerService.DeleteNetwork(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Network
 // @Summary Create network
-// @Description 创建容器网络
 // @Accept json
 // @Param request body dto.NetworkCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器网络 name","formatEN":"create container network [name]"}
 func (b *BaseApi) CreateNetwork(c *gin.Context) {
@@ -555,20 +558,20 @@ func (b *BaseApi) CreateNetwork(c *gin.Context) {
 	}
 
 	if err := containerService.CreateNetwork(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Volume
 // @Summary Page volumes
-// @Description 获取容器存储卷分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume/search [post]
 func (b *BaseApi) SearchVolume(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -578,7 +581,7 @@ func (b *BaseApi) SearchVolume(c *gin.Context) {
 
 	total, list, err := containerService.PageVolume(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -589,16 +592,16 @@ func (b *BaseApi) SearchVolume(c *gin.Context) {
 
 // @Tags Container Volume
 // @Summary List volumes
-// @Description 获取容器存储卷列表
 // @Accept json
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume [get]
 func (b *BaseApi) ListVolume(c *gin.Context) {
 	list, err := containerService.ListVolume()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
@@ -606,11 +609,11 @@ func (b *BaseApi) ListVolume(c *gin.Context) {
 
 // @Tags Container Volume
 // @Summary Delete volume
-// @Description 删除容器存储卷
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume/del [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器存储卷 [names]","formatEN":"delete container volume [names]"}
 func (b *BaseApi) DeleteVolume(c *gin.Context) {
@@ -620,19 +623,19 @@ func (b *BaseApi) DeleteVolume(c *gin.Context) {
 	}
 
 	if err := containerService.DeleteVolume(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Volume
 // @Summary Create volume
-// @Description 创建容器存储卷
 // @Accept json
 // @Param request body dto.VolumeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器存储卷 [name]","formatEN":"create container volume [name]"}
 func (b *BaseApi) CreateVolume(c *gin.Context) {
@@ -642,19 +645,19 @@ func (b *BaseApi) CreateVolume(c *gin.Context) {
 	}
 
 	if err := containerService.CreateVolume(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Compose
 // @Summary Update compose
-// @Description 更新容器编排
 // @Accept json
 // @Param request body dto.ComposeUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 compose [name]","formatEN":"update compose information [name]"}
 func (b *BaseApi) ComposeUpdate(c *gin.Context) {
@@ -664,36 +667,44 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 	}
 
 	if err := containerService.ComposeUpdate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Container Compose
-// @Summary Container Compose logs
-// @Description docker-compose 日志
-// @Param compose query string false "compose 文件地址"
+// @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 "显示行号"
 // @Security ApiKeyAuth
-// @Router /containers/compose/search/log [get]
-func (b *BaseApi) ComposeLogs(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
-	}
-	defer wsConn.Close()
+// @Security Timestamp
+// @Router /containers/search/log [post]
+func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
+	c.Header("Content-Type", "text/event-stream")
+	c.Header("Cache-Control", "no-cache")
+	c.Header("Connection", "keep-alive")
+	c.Header("Transfer-Encoding", "chunked")
 
-	compose := c.Query("compose")
 	since := c.Query("since")
 	follow := c.Query("follow") == "true"
 	tail := c.Query("tail")
 
-	if err := containerService.ContainerLogs(wsConn, "compose", compose, since, tail, follow); err != nil {
-		_ = wsConn.WriteMessage(1, []byte(err.Error()))
-		return
+	container := c.Query("container")
+	compose := c.Query("compose")
+	streamLog := dto.StreamLog{
+		Compose:   compose,
+		Container: container,
+		Since:     since,
+		Follow:    follow,
+		Tail:      tail,
+		Type:      "container",
 	}
+	if compose != "" {
+		streamLog.Type = "compose"
+	}
+
+	containerService.StreamLogs(c, streamLog)
 }

agent/app/api/v2/cronjob.go

@@ -1,44 +1,142 @@
-package v1
+package v2
 
 import (
+	"net/http"
+	"strings"
 	"time"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/utils/common"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/utils/common"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Cronjob
 // @Summary Create cronjob
-// @Description 创建计划任务
 // @Accept json
-// @Param request body dto.CronjobCreate true "request"
+// @Param request body dto.CronjobOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs [post]
 // @x-panel-log {"bodyKeys":["type","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建计划任务 [type][name]","formatEN":"create cronjob [type][name]"}
 func (b *BaseApi) CreateCronjob(c *gin.Context) {
-	var req dto.CronjobCreate
+	var req dto.CronjobOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
 	if err := cronjobService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
+}
+
+// @Tags Cronjob
+// @Summary Load cronjob info
+// @Accept json
+// @Param request body dto.OperateByID true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/load/info [post]
+func (b *BaseApi) LoadCronjobInfo(c *gin.Context) {
+	var req dto.OperateByID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := cronjobService.LoadInfo(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Cronjob
+// @Summary Export cronjob list
+// @Accept json
+// @Param request body dto.OperateByIDs true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/export [post]
+func (b *BaseApi) ExportCronjob(c *gin.Context) {
+	var req dto.OperateByIDs
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	content, err := cronjobService.Export(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	http.ServeContent(c.Writer, c.Request, "", time.Now(), strings.NewReader(content))
+}
+
+// @Tags Cronjob
+// @Summary Import cronjob list
+// @Accept json
+// @Param request body dto.CronjobImport true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/import [post]
+func (b *BaseApi) ImportCronjob(c *gin.Context) {
+	var req dto.CronjobImport
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := cronjobService.Import(req.Cronjobs); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Cronjob
+// @Summary Load script options
+// @Success 200 {array} dto.ScriptOptions
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/script/options [get]
+func (b *BaseApi) LoadScriptOptions(c *gin.Context) {
+	helper.SuccessWithData(c, cronjobService.LoadScriptOptions())
+}
+
+// @Tags Cronjob
+// @Summary Load cronjob spec time
+// @Accept json
+// @Param request body dto.CronjobSpec true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /cronjobs/next [post]
+func (b *BaseApi) LoadNextHandle(c *gin.Context) {
+	var req dto.CronjobSpec
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	list, err := cronjobService.LoadNextHandle(req.Spec)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, list)
 }
 
 // @Tags Cronjob
 // @Summary Page cronjobs
-// @Description 获取计划任务分页
 // @Accept json
 // @Param request body dto.PageCronjob true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/search [post]
 func (b *BaseApi) SearchCronjob(c *gin.Context) {
 	var req dto.PageCronjob
@@ -48,7 +146,7 @@ func (b *BaseApi) SearchCronjob(c *gin.Context) {
 
 	total, list, err := cronjobService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -60,11 +158,11 @@ func (b *BaseApi) SearchCronjob(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Page job records
-// @Description 获取计划任务记录
 // @Accept json
 // @Param request body dto.SearchRecord true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/search/records [post]
 func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 	var req dto.SearchRecord
@@ -78,7 +176,7 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 
 	total, list, err := cronjobService.SearchRecords(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -90,11 +188,11 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Load Cronjob record log
-// @Description 获取计划任务记录日志
 // @Accept json
 // @Param request body dto.OperateByID true "request"
-// @Success 200
+// @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/records/log [post]
 func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 	var req dto.OperateByID
@@ -107,11 +205,11 @@ func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Clean job records
-// @Description 清空计划任务记录
 // @Accept json
 // @Param request body dto.CronjobClean true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/records/clean [post]
 // @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) {
@@ -121,20 +219,20 @@ func (b *BaseApi) CleanRecord(c *gin.Context) {
 	}
 
 	if err := cronjobService.CleanRecord(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Cronjob
 // @Summary Delete cronjob
-// @Description 删除计划任务
 // @Accept json
 // @Param request body dto.CronjobBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"cronjobs","output_column":"name","output_value":"names"}],"formatZH":"删除计划任务 [names]","formatEN":"delete cronjob [names]"}
 func (b *BaseApi) DeleteCronjob(c *gin.Context) {
@@ -144,41 +242,41 @@ func (b *BaseApi) DeleteCronjob(c *gin.Context) {
 	}
 
 	if err := cronjobService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Cronjob
 // @Summary Update cronjob
-// @Description 更新计划任务
 // @Accept json
-// @Param request body dto.CronjobUpdate true "request"
+// @Param request body dto.CronjobOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"更新计划任务 [name]","formatEN":"update cronjob [name]"}
 func (b *BaseApi) UpdateCronjob(c *gin.Context) {
-	var req dto.CronjobUpdate
+	var req dto.CronjobOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
 	if err := cronjobService.Update(req.ID, req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Cronjob
 // @Summary Update cronjob status
-// @Description 更新计划任务状态
 // @Accept json
 // @Param request body dto.CronjobUpdateStatus true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/status [post]
 // @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"修改计划任务 [name] 状态为 [status]","formatEN":"change the status of cronjob [name] to [status]."}
 func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
@@ -188,19 +286,19 @@ func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
 	}
 
 	if err := cronjobService.UpdateStatus(req.ID, req.Status); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Cronjob
 // @Summary Download cronjob records
-// @Description 下载计划任务记录
 // @Accept json
 // @Param request body dto.CronjobDownload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/download [post]
 // @x-panel-log {"bodyKeys":["recordID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"recordID","isList":false,"db":"job_records","output_column":"file","output_value":"file"}],"formatZH":"下载计划任务记录 [file]","formatEN":"download the cronjob record [file]"}
 func (b *BaseApi) TargetDownload(c *gin.Context) {
@@ -211,7 +309,7 @@ func (b *BaseApi) TargetDownload(c *gin.Context) {
 
 	filePath, err := cronjobService.Download(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -220,11 +318,11 @@ func (b *BaseApi) TargetDownload(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Handle cronjob once
-// @Description 手动执行计划任务
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/handle [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"手动执行计划任务 [name]","formatEN":"manually execute the cronjob [name]"}
 func (b *BaseApi) HandleOnce(c *gin.Context) {
@@ -234,8 +332,8 @@ func (b *BaseApi) HandleOnce(c *gin.Context) {
 	}
 
 	if err := cronjobService.HandleOnce(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/dashboard.go

@@ -0,0 +1,169 @@
+package v2
+
+import (
+	"errors"
+
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Dashboard
+// @Summary Load os info
+// @Accept json
+// @Success 200 {object} dto.OsInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/base/os [get]
+func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
+	data, err := dashboardService.LoadOsInfo()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Dashboard
+// @Summary Load app launcher
+// @Accept json
+// @Success 200 {Array} dto.AppLauncher
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/app/launcher [get]
+func (b *BaseApi) LoadAppLauncher(c *gin.Context) {
+	data, err := dashboardService.LoadAppLauncher(c)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	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
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/app/launcher/option [post]
+func (b *BaseApi) LoadAppLauncherOption(c *gin.Context) {
+	var req dto.SearchByFilter
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+	data, err := dashboardService.ListLauncherOption(req.Filter)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Dashboard
+// @Summary Update app Launcher
+// @Accept json
+// @Param request body dto.SettingUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/app/launcher/show [post]
+// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"首页应用 [key] => 显示：[value]","formatEN":"app launcher [key] => show: [value]"}
+func (b *BaseApi) UpdateAppLauncher(c *gin.Context) {
+	var req dto.SettingUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := dashboardService.ChangeShow(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Dashboard
+// @Summary Load dashboard base info
+// @Accept json
+// @Param ioOption path string true "request"
+// @Param netOption path string true "request"
+// @Success 200 {object} dto.DashboardBase
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/base/:ioOption/:netOption [get]
+func (b *BaseApi) LoadDashboardBaseInfo(c *gin.Context) {
+	ioOption, ok := c.Params.Get("ioOption")
+	if !ok {
+		helper.BadRequest(c, errors.New("error ioOption in path"))
+		return
+	}
+	netOption, ok := c.Params.Get("netOption")
+	if !ok {
+		helper.BadRequest(c, errors.New("error ioOption in path"))
+		return
+	}
+	data, err := dashboardService.LoadBaseInfo(ioOption, netOption)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Dashboard
+// @Summary Load dashboard current info for node
+// @Success 200 {object} dto.NodeCurrent
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/current/node [get]
+func (b *BaseApi) LoadCurrentInfoForNode(c *gin.Context) {
+	data := dashboardService.LoadCurrentInfoForNode()
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Dashboard
+// @Summary Load dashboard current info
+// @Accept json
+// @Param ioOption path string true "request"
+// @Param netOption path string true "request"
+// @Success 200 {object} dto.DashboardCurrent
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/current/:ioOption/:netOption [get]
+func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
+	ioOption, ok := c.Params.Get("ioOption")
+	if !ok {
+		helper.BadRequest(c, errors.New("error ioOption in path"))
+		return
+	}
+	netOption, ok := c.Params.Get("netOption")
+	if !ok {
+		helper.BadRequest(c, errors.New("error netOption in path"))
+		return
+	}
+
+	data := dashboardService.LoadCurrentInfo(ioOption, netOption)
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Dashboard
+// @Summary System restart
+// @Accept json
+// @Param operation path string true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /dashboard/system/restart/:operation [post]
+func (b *BaseApi) SystemRestart(c *gin.Context) {
+	operation, ok := c.Params.Get("operation")
+	if !ok {
+		helper.BadRequest(c, errors.New("error operation in path"))
+		return
+	}
+	if err := dashboardService.Restart(operation); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}

agent/app/api/v2/database.go

@@ -1,21 +1,20 @@
-package v1
+package v2
 
 import (
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Database
 // @Summary Create database
-// @Description 创建远程数据库
 // @Accept json
 // @Param request body dto.DatabaseCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db [post]
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建远程数据库 [name][type]","formatEN":"create database [name][type]"}
 func (b *BaseApi) CreateDatabase(c *gin.Context) {
@@ -33,19 +32,19 @@ func (b *BaseApi) CreateDatabase(c *gin.Context) {
 	}
 
 	if err := databaseService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database
 // @Summary Check database
-// @Description 检测远程数据库连接性
 // @Accept json
 // @Param request body dto.DatabaseCreate true "request"
-// @Success 200
+// @Success 200 {boolean} isOk
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/check [post]
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测远程数据库 [name][type] 连接性","formatEN":"check if database [name][type] is connectable"}
 func (b *BaseApi) CheckDatabase(c *gin.Context) {
@@ -67,11 +66,11 @@ func (b *BaseApi) CheckDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Page databases
-// @Description 获取远程数据库列表分页
 // @Accept json
 // @Param request body dto.DatabaseSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/search [post]
 func (b *BaseApi) SearchDatabase(c *gin.Context) {
 	var req dto.DatabaseSearch
@@ -81,7 +80,7 @@ func (b *BaseApi) SearchDatabase(c *gin.Context) {
 
 	total, list, err := databaseService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -93,19 +92,19 @@ func (b *BaseApi) SearchDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary List databases
-// @Description 获取远程数据库列表
 // @Success 200 {array} dto.DatabaseOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/list/:type [get]
 func (b *BaseApi) ListDatabase(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	list, err := databaseService.List(dbType)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -114,19 +113,19 @@ func (b *BaseApi) ListDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary List databases
-// @Description 获取数据库列表
 // @Success 200 {array} dto.DatabaseItem
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/item/:type [get]
 func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	list, err := databaseService.LoadItems(dbType)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -135,19 +134,19 @@ func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 
 // @Tags Database
 // @Summary Get databases
-// @Description 获取远程数据库
 // @Success 200 {object} dto.DatabaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/:name [get]
 func (b *BaseApi) GetDatabase(c *gin.Context) {
 	name, err := helper.GetStrParamByKey(c, "name")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	data, err := databaseService.Get(name)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -156,11 +155,11 @@ func (b *BaseApi) GetDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Check before delete remote database
-// @Description Mysql 远程数据库删除前检查
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /db/remote/del/check [post]
 func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 	var req dto.OperateByID
@@ -170,7 +169,7 @@ func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 
 	apps, err := databaseService.DeleteCheck(req.ID)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, apps)
@@ -178,11 +177,11 @@ func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Delete database
-// @Description 删除远程数据库
 // @Accept json
 // @Param request body dto.DatabaseDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"databases","output_column":"name","output_value":"names"}],"formatZH":"删除远程数据库 [names]","formatEN":"delete database [names]"}
 func (b *BaseApi) DeleteDatabase(c *gin.Context) {
@@ -192,19 +191,19 @@ func (b *BaseApi) DeleteDatabase(c *gin.Context) {
 	}
 
 	if err := databaseService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database
 // @Summary Update database
-// @Description 更新远程数据库
 // @Accept json
 // @Param request body dto.DatabaseUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新远程数据库 [name]","formatEN":"update database [name]"}
 func (b *BaseApi) UpdateDatabase(c *gin.Context) {
@@ -222,8 +221,8 @@ func (b *BaseApi) UpdateDatabase(c *gin.Context) {
 	}
 
 	if err := databaseService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/database_common.go

@@ -1,19 +1,18 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Database Common
 // @Summary Load base info
-// @Description 获取数据库基础信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.DBBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/info [post]
 func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -23,7 +22,7 @@ func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
 
 	data, err := dbCommonService.LoadBaseInfo(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -32,11 +31,11 @@ func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
 
 // @Tags Database Common
 // @Summary Load Database conf
-// @Description 获取数据库配置文件
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200
+// @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/load/file [post]
 func (b *BaseApi) LoadDBFile(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -45,7 +44,7 @@ func (b *BaseApi) LoadDBFile(c *gin.Context) {
 	}
 	content, err := dbCommonService.LoadDatabaseFile(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, content)
@@ -53,11 +52,11 @@ func (b *BaseApi) LoadDBFile(c *gin.Context) {
 
 // @Tags Database Common
 // @Summary Update conf by upload file
-// @Description 上传替换配置文件
 // @Accept json
 // @Param request body dto.DBConfUpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/update/conf [post]
 // @x-panel-log {"bodyKeys":["type","database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 [type] 数据库 [database] 配置信息","formatEN":"update the [type] [database] database configuration information"}
 func (b *BaseApi) UpdateDBConfByFile(c *gin.Context) {
@@ -67,9 +66,9 @@ func (b *BaseApi) UpdateDBConfByFile(c *gin.Context) {
 	}
 
 	if err := dbCommonService.UpdateConfByFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/database_mysql.go

@@ -1,22 +1,21 @@
-package v1
+package v2
 
 import (
 	"context"
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Database Mysql
 // @Summary Create mysql database
-// @Description 创建 mysql 数据库
 // @Accept json
 // @Param request body dto.MysqlDBCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mysql 数据库 [name]","formatEN":"create mysql database [name]"}
 func (b *BaseApi) CreateMysql(c *gin.Context) {
@@ -28,26 +27,26 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
 	if len(req.Password) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Password = string(password)
 	}
 
 	if _, err := mysqlService.Create(context.Background(), req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Bind user of mysql database
-// @Description 绑定 mysql 数据库用户
 // @Accept json
 // @Param request body dto.BindUser true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/bind [post]
 // @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 mysql 数据库名 [database] [username]","formatEN":"bind mysql database [database] [username]"}
 func (b *BaseApi) BindUser(c *gin.Context) {
@@ -59,26 +58,26 @@ func (b *BaseApi) BindUser(c *gin.Context) {
 	if len(req.Password) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Password = string(password)
 	}
 
 	if err := mysqlService.BindUser(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Update mysql database description
-// @Description 更新 mysql 数据库库描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/description/update [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"mysql 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the mysql database [name] is modified => [description]"}
 func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
@@ -88,19 +87,19 @@ func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
 	}
 
 	if err := mysqlService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Change mysql password
-// @Description 修改 mysql 密码
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/change/password [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
@@ -112,26 +111,26 @@ func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 	if len(req.Value) != 0 {
 		value, err := base64.StdEncoding.DecodeString(req.Value)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Value = string(value)
 	}
 
 	if err := mysqlService.ChangePassword(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Change mysql access
-// @Description 修改 mysql 访问权限
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/change/access [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 访问权限","formatEN":"Update database [name] access"}
 func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
@@ -141,19 +140,19 @@ func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 	}
 
 	if err := mysqlService.ChangeAccess(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Update mysql variables
-// @Description mysql 性能调优
 // @Accept json
 // @Param request body dto.MysqlVariablesUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/variables/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"调整 mysql 数据库性能参数","formatEN":"adjust mysql database performance parameters"}
 func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
@@ -163,19 +162,19 @@ func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
 	}
 
 	if err := mysqlService.UpdateVariables(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Page mysql databases
-// @Description 获取 mysql 数据库列表分页
 // @Accept json
 // @Param request body dto.MysqlDBSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/search [post]
 func (b *BaseApi) SearchMysql(c *gin.Context) {
 	var req dto.MysqlDBSearch
@@ -185,7 +184,7 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 
 	total, list, err := mysqlService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -197,16 +196,16 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary List mysql database names
-// @Description 获取 mysql 数据库列表
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {array} dto.MysqlOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/options [get]
 func (b *BaseApi) ListDBName(c *gin.Context) {
 	list, err := mysqlService.ListDBOption()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -215,10 +214,10 @@ func (b *BaseApi) ListDBName(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql database from remote
-// @Description 从服务器获取
 // @Accept json
 // @Param request body dto.MysqlLoadDB true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/load [post]
 func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 	var req dto.MysqlLoadDB
@@ -227,20 +226,20 @@ func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 	}
 
 	if err := mysqlService.LoadFromRemote(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Check before delete mysql database
-// @Description Mysql 数据库删除前检查
 // @Accept json
 // @Param request body dto.MysqlDBDeleteCheck true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/del/check [post]
 func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 	var req dto.MysqlDBDeleteCheck
@@ -250,7 +249,7 @@ func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 
 	apps, err := mysqlService.DeleteCheck(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, apps)
@@ -258,11 +257,11 @@ func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Delete mysql database
-// @Description 删除 mysql 数据库
 // @Accept json
 // @Param request body dto.MysqlDBDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"删除 mysql 数据库 [name]","formatEN":"delete mysql database [name]"}
 func (b *BaseApi) DeleteMysql(c *gin.Context) {
@@ -273,21 +272,21 @@ func (b *BaseApi) DeleteMysql(c *gin.Context) {
 
 	tx, ctx := helper.GetTxAndContext()
 	if err := mysqlService.Delete(ctx, req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		tx.Rollback()
 		return
 	}
 	tx.Commit()
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Mysql
 // @Summary Load mysql remote access
-// @Description 获取 mysql 远程访问权限
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {boolean} isRemote
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/remote [post]
 func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -296,7 +295,7 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 	}
 	isRemote, err := mysqlService.LoadRemoteAccess(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -305,11 +304,11 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql status info
-// @Description 获取 mysql 状态信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/status [post]
 func (b *BaseApi) LoadStatus(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -319,7 +318,7 @@ func (b *BaseApi) LoadStatus(c *gin.Context) {
 
 	data, err := mysqlService.LoadStatus(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -328,11 +327,11 @@ func (b *BaseApi) LoadStatus(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql variables info
-// @Description 获取 mysql 性能参数信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlVariables
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/variables [post]
 func (b *BaseApi) LoadVariables(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -342,7 +341,7 @@ func (b *BaseApi) LoadVariables(c *gin.Context) {
 
 	data, err := mysqlService.LoadVariables(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 

agent/app/api/v2/database_postgresql.go

@@ -1,22 +1,21 @@
-package v1
+package v2
 
 import (
 	"context"
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Create postgresql database
-// @Description 创建 postgresql 数据库
 // @Accept json
 // @Param request body dto.PostgresqlDBCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 postgresql 数据库 [name]","formatEN":"create postgresql database [name]"}
 func (b *BaseApi) CreatePostgresql(c *gin.Context) {
@@ -28,26 +27,26 @@ func (b *BaseApi) CreatePostgresql(c *gin.Context) {
 	if len(req.Password) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Password = string(password)
 	}
 
 	if _, err := postgresqlService.Create(context.Background(), req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Bind postgresql user
-// @Description 绑定 postgresql 数据库用户
 // @Accept json
 // @Param request body dto.PostgresqlBindUser true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/bind [post]
 // @x-panel-log {"bodyKeys":["name", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 postgresql 数据库 [name] 用户 [username]","formatEN":"bind postgresql database [name] user [username]"}
 func (b *BaseApi) BindPostgresqlUser(c *gin.Context) {
@@ -57,19 +56,19 @@ func (b *BaseApi) BindPostgresqlUser(c *gin.Context) {
 	}
 
 	if err := postgresqlService.BindUser(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Update postgresql database description
-// @Description 更新 postgresql 数据库库描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/description [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"postgresql 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the postgresql database [name] is modified => [description]"}
 func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
@@ -79,19 +78,19 @@ func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
 	}
 
 	if err := postgresqlService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Change postgresql privileges
-// @Description 修改 postgresql 用户权限
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/privileges [post]
 // @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] 用户 [username] 权限","formatEN":"Update [user] privileges of database [database]"}
 func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
@@ -101,19 +100,19 @@ func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
 	}
 
 	if err := postgresqlService.ChangePrivileges(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Change postgresql password
-// @Description 修改 postgresql 密码
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/password [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangePostgresqlPassword(c *gin.Context) {
@@ -125,26 +124,26 @@ func (b *BaseApi) ChangePostgresqlPassword(c *gin.Context) {
 	if len(req.Value) != 0 {
 		value, err := base64.StdEncoding.DecodeString(req.Value)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Value = string(value)
 	}
 
 	if err := postgresqlService.ChangePassword(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Page postgresql databases
-// @Description 获取 postgresql 数据库列表分页
 // @Accept json
 // @Param request body dto.PostgresqlDBSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/search [post]
 func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 	var req dto.PostgresqlDBSearch
@@ -154,7 +153,7 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 
 	total, list, err := postgresqlService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -164,35 +163,35 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 	})
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Load postgresql database from remote
-// @Description 从服务器获取
 // @Accept json
 // @Param request body dto.PostgresqlLoadDB true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/:database/load [post]
 func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
 	database, err := helper.GetStrParamByKey(c, "database")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 
 	if err := postgresqlService.LoadFromRemote(database); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Check before delete postgresql database
-// @Description Postgresql 数据库删除前检查
 // @Accept json
 // @Param request body dto.PostgresqlDBDeleteCheck true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/del/check [post]
 func (b *BaseApi) DeleteCheckPostgresql(c *gin.Context) {
 	var req dto.PostgresqlDBDeleteCheck
@@ -202,19 +201,19 @@ func (b *BaseApi) DeleteCheckPostgresql(c *gin.Context) {
 
 	apps, err := postgresqlService.DeleteCheck(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, apps)
 }
 
-// @Tags Database Postgresql
+// @Tags Database PostgreSQL
 // @Summary Delete postgresql database
-// @Description 删除 postgresql 数据库
 // @Accept json
 // @Param request body dto.PostgresqlDBDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"删除 postgresql 数据库 [name]","formatEN":"delete postgresql database [name]"}
 func (b *BaseApi) DeletePostgresql(c *gin.Context) {
@@ -224,10 +223,10 @@ func (b *BaseApi) DeletePostgresql(c *gin.Context) {
 	}
 	tx, ctx := helper.GetTxAndContext()
 	if err := postgresqlService.Delete(ctx, req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		tx.Rollback()
 		return
 	}
 	tx.Commit()
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/database_redis.go

@@ -1,30 +1,29 @@
-package v1
+package v2
 
 import (
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Database Redis
 // @Summary Load redis status info
-// @Description 获取 redis 状态信息
 // @Accept json
-// @Param request body dto.OperationWithName true "request"
+// @Param request body dto.LoadRedisStatus true "request"
 // @Success 200 {object} dto.RedisStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/status [post]
 func (b *BaseApi) LoadRedisStatus(c *gin.Context) {
-	var req dto.OperationWithName
+	var req dto.LoadRedisStatus
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 	data, err := redisService.LoadStatus(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -33,20 +32,20 @@ func (b *BaseApi) LoadRedisStatus(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Load redis conf
-// @Description 获取 redis 配置信息
 // @Accept json
-// @Param request body dto.OperationWithName true "request"
+// @Param request body dto.LoadRedisStatus true "request"
 // @Success 200 {object} dto.RedisConf
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/conf [post]
 func (b *BaseApi) LoadRedisConf(c *gin.Context) {
-	var req dto.OperationWithName
+	var req dto.LoadRedisStatus
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 	data, err := redisService.LoadConf(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -55,20 +54,20 @@ func (b *BaseApi) LoadRedisConf(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Load redis persistence conf
-// @Description 获取 redis 持久化配置
 // @Accept json
-// @Param request body dto.OperationWithName true "request"
+// @Param request body dto.LoadRedisStatus true "request"
 // @Success 200 {object} dto.RedisPersistence
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/persistence/conf [post]
 func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
-	var req dto.OperationWithName
+	var req dto.LoadRedisStatus
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
 	data, err := redisService.LoadPersistenceConf(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -81,26 +80,26 @@ func (b *BaseApi) CheckHasCli(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Install redis-cli
-// @Description 安装 redis cli
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/install/cli [post]
 func (b *BaseApi) InstallCli(c *gin.Context) {
 	if err := redisService.InstallCli(); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Database Redis
 // @Summary Update redis conf
-// @Description 更新 redis 配置信息
 // @Accept json
 // @Param request body dto.RedisConfUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/conf/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 redis 数据库配置信息","formatEN":"update the redis database configuration information"}
 func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
@@ -110,19 +109,19 @@ func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
 	}
 
 	if err := redisService.UpdateConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Redis
 // @Summary Change redis password
-// @Description 更新 redis 密码
 // @Accept json
 // @Param request body dto.ChangeRedisPass true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/password [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 redis 数据库密码","formatEN":"change the password of the redis database"}
 func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
@@ -134,26 +133,26 @@ func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
 	if len(req.Value) != 0 {
 		value, err := base64.StdEncoding.DecodeString(req.Value)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Value = string(value)
 	}
 
 	if err := redisService.ChangePassword(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Database Redis
 // @Summary Update redis persistence conf
-// @Description 更新 redis 持久化配置
 // @Accept json
 // @Param request body dto.RedisConfPersistenceUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/persistence/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"redis 数据库持久化配置更新","formatEN":"redis database persistence configuration update"}
 func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
@@ -163,8 +162,8 @@ func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
 	}
 
 	if err := redisService.UpdatePersistenceConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/device.go

@@ -1,24 +1,23 @@
-package v1
+package v2
 
 import (
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Device
 // @Summary Load device base info
-// @Description 获取设备基础信息
 // @Success 200 {object} dto.DeviceBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/base [post]
 func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 	data, err := deviceService.LoadBaseInfo()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -27,15 +26,15 @@ func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 
 // @Tags Device
 // @Summary list time zone options
-// @Description 获取系统可用时区选项
 // @Accept json
 // @Success 200 {Array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/zone/options [get]
 func (b *BaseApi) LoadTimeOption(c *gin.Context) {
 	list, err := deviceService.LoadTimeZone()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -44,11 +43,11 @@ func (b *BaseApi) LoadTimeOption(c *gin.Context) {
 
 // @Tags Device
 // @Summary load conf
-// @Description 获取系统配置文件
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
-// @Success 200
+// @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/conf [post]
 func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
 	var req dto.OperationWithName
@@ -58,7 +57,7 @@ func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
 
 	list, err := deviceService.LoadConf(req.Name)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -67,11 +66,11 @@ func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device conf by file
-// @Description 通过文件修改配置
 // @Accept json
 // @Param request body dto.UpdateByNameAndFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/byconf [post]
 func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
 	var req dto.UpdateByNameAndFile
@@ -79,20 +78,35 @@ func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
 		return
 	}
 	if err := deviceService.UpdateByConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
+}
+
+// @Tags Device
+// @Summary Load user list
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/device/users  [get]
+func (b *BaseApi) LoadUsers(c *gin.Context) {
+	users, err := deviceService.LoadUsers()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, users)
 }
 
 // @Tags Device
 // @Summary Update device
-// @Description 修改系统参数
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/conf [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机参数 [key] => [value]","formatEN":"update device conf [key] => [value]"}
 func (b *BaseApi) UpdateDeviceConf(c *gin.Context) {
@@ -102,18 +116,18 @@ func (b *BaseApi) UpdateDeviceConf(c *gin.Context) {
 	}
 
 	if err := deviceService.Update(req.Key, req.Value); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Device
 // @Summary Update device hosts
-// @Description 修改系统 hosts
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/host [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机 Host [key] => [value]","formatEN":"update device host [key] => [value]"}
 func (b *BaseApi) UpdateDeviceHost(c *gin.Context) {
@@ -123,20 +137,20 @@ func (b *BaseApi) UpdateDeviceHost(c *gin.Context) {
 	}
 
 	if err := deviceService.UpdateHosts(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Device
 // @Summary Update device passwd
-// @Description 修改系统密码
 // @Accept json
 // @Param request body dto.ChangePasswd true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/passwd [post]
 func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
 	var req dto.ChangePasswd
@@ -146,26 +160,26 @@ func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
 	if len(req.Passwd) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Passwd)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Passwd = string(password)
 	}
 	if err := deviceService.UpdatePasswd(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Device
 // @Summary Update device swap
-// @Description 修改系统 Swap
 // @Accept json
 // @Param request body dto.SwapHelper true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/swap [post]
 // @x-panel-log {"bodyKeys":["operate","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机 swap [path]","formatEN":"[operate] device swap [path]"}
 func (b *BaseApi) UpdateDeviceSwap(c *gin.Context) {
@@ -174,20 +188,20 @@ func (b *BaseApi) UpdateDeviceSwap(c *gin.Context) {
 		return
 	}
 	if err := deviceService.UpdateSwap(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Device
 // @Summary Check device DNS conf
-// @Description 检查系统 DNS 配置可用性
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
-// @Success 200
+// @Success 200 {boolean} data
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/check/dns [post]
 func (b *BaseApi) CheckDNS(c *gin.Context) {
 	var req dto.SettingUpdate
@@ -197,7 +211,7 @@ func (b *BaseApi) CheckDNS(c *gin.Context) {
 
 	data, err := deviceService.CheckDNS(req.Key, req.Value)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -206,9 +220,9 @@ func (b *BaseApi) CheckDNS(c *gin.Context) {
 
 // @Tags Device
 // @Summary Scan system
-// @Description 扫描系统垃圾文件
-// @Success 200
+// @Success 200 {object} dto.CleanData
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/scan [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
 func (b *BaseApi) ScanSystem(c *gin.Context) {
@@ -217,11 +231,11 @@ func (b *BaseApi) ScanSystem(c *gin.Context) {
 
 // @Tags Device
 // @Summary Clean system
-// @Description 清理系统垃圾文件
 // @Accept json
 // @Param request body []dto.Clean true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clean [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
 func (b *BaseApi) SystemClean(c *gin.Context) {
@@ -232,5 +246,5 @@ func (b *BaseApi) SystemClean(c *gin.Context) {
 
 	deviceService.Clean(req)
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/docker.go

@@ -1,20 +1,20 @@
-package v1
+package v2
 
 import (
 	"os"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Container Docker
 // @Summary Load docker status
-// @Description 获取 docker 服务状态
 // @Produce json
-// @Success 200 {string} status
+// @Success 200 {string} dto.DockerStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/docker/status [get]
 func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 	status := dockerService.LoadDockerStatus()
@@ -23,10 +23,10 @@ func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Load docker daemon.json
-// @Description 获取 docker 配置信息(表单)
 // @Produce json
 // @Success 200 {object} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/file [get]
 func (b *BaseApi) LoadDaemonJsonFile(c *gin.Context) {
 	if _, err := os.Stat(constant.DaemonJsonPath); err != nil {
@@ -35,7 +35,7 @@ func (b *BaseApi) LoadDaemonJsonFile(c *gin.Context) {
 	}
 	content, err := os.ReadFile(constant.DaemonJsonPath)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, string(content))
@@ -43,23 +43,27 @@ func (b *BaseApi) LoadDaemonJsonFile(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Load docker daemon.json
-// @Description 获取 docker 配置信息
 // @Produce json
 // @Success 200 {object} dto.DaemonJsonConf
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson [get]
 func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
-	conf := dockerService.LoadDockerConf()
+	conf, err := dockerService.LoadDockerConf()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
 	helper.SuccessWithData(c, conf)
 }
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json
-// @Description 修改 docker 配置信息
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/update [post]
 // @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置 [key]","formatEN":"Updated configuration [key]"}
 func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
@@ -68,21 +72,21 @@ func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 		return
 	}
 
-	if err := dockerService.UpdateConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := dockerService.UpdateConf(req, true); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json log option
-// @Description 修改 docker 日志配置
 // @Accept json
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/logoption/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新日志配置","formatEN":"Updated the log option"}
 func (b *BaseApi) UpdateLogOption(c *gin.Context) {
@@ -92,20 +96,20 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	}
 
 	if err := dockerService.UpdateLogOption(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json ipv6 option
-// @Description 修改 docker ipv6 配置
 // @Accept json
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/ipv6option/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 ipv6 配置","formatEN":"Updated the ipv6 option"}
 func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
@@ -115,20 +119,20 @@ func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
 	}
 
 	if err := dockerService.UpdateIpv6Option(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json by upload file
-// @Description 上传替换 docker 配置文件
 // @Accept json
 // @Param request body dto.DaemonJsonUpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/update/byfile [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置文件","formatEN":"Updated configuration file"}
 func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
@@ -138,20 +142,20 @@ func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 	}
 
 	if err := dockerService.UpdateConfByFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Docker
 // @Summary Operate docker
-// @Description Docker 操作
 // @Accept json
 // @Param request body dto.DockerOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/docker/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"docker 服务 [operation]","formatEN":"[operation] docker service"}
 func (b *BaseApi) OperateDocker(c *gin.Context) {
@@ -161,9 +165,9 @@ func (b *BaseApi) OperateDocker(c *gin.Context) {
 	}
 
 	if err := dockerService.OperateDocker(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/entry.go

@@ -1,6 +1,6 @@
-package v1
+package v2
 
-import "github.com/1Panel-dev/1Panel/backend/app/service"
+import "github.com/1Panel-dev/1Panel/agent/app/service"
 
 type ApiGroup struct {
 	BaseApi
@@ -8,12 +8,17 @@ type ApiGroup struct {
 
 var ApiGroupApp = new(ApiGroup)
 
+type BaseApi struct{}
+
 var (
-	authService      = service.NewIAuthService()
 	dashboardService = service.NewIDashboardService()
 
-	appService        = service.NewIAppService()
-	appInstallService = service.NewIAppInstalledService()
+	appService              = service.NewIAppService()
+	appInstallService       = service.NewIAppInstalledService()
+	appIgnoreUpgradeService = service.NewIAppIgnoreUpgradeService()
+
+	aiToolService    = service.NewIAIToolService()
+	mcpServerService = service.NewIMcpServerService()
 
 	containerService       = service.NewIContainerService()
 	composeTemplateService = service.NewIComposeTemplateService()
@@ -29,21 +34,19 @@ var (
 
 	cronjobService = service.NewICronjobService()
 
-	hostService     = service.NewIHostService()
-	groupService    = service.NewIGroupService()
 	fileService     = service.NewIFileService()
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
+	monitorService  = service.NewIMonitorService()
 
 	deviceService   = service.NewIDeviceService()
 	fail2banService = service.NewIFail2BanService()
 	ftpService      = service.NewIFtpService()
 	clamService     = service.NewIClamService()
 
-	settingService = service.NewISettingService()
-	backupService  = service.NewIBackupService()
-
-	commandService = service.NewICommandService()
+	settingService      = service.NewISettingService()
+	backupService       = service.NewIBackupService()
+	backupRecordService = service.NewIBackupRecordService()
 
 	websiteService            = service.NewIWebsiteService()
 	websiteDnsAccountService  = service.NewIWebsiteDnsAccountService()
@@ -54,7 +57,6 @@ var (
 
 	logService      = service.NewILogService()
 	snapshotService = service.NewISnapshotService()
-	upgradeService  = service.NewIUpgradeService()
 
 	runtimeService       = service.NewRuntimeService()
 	processService       = service.NewIProcessService()
@@ -66,4 +68,7 @@ var (
 	favoriteService   = service.NewIFavoriteService()
 
 	websiteCAService = service.NewIWebsiteCAService()
+	taskService      = service.NewITaskService()
+	groupService     = service.NewIGroupService()
+	alertService     = service.NewIAlertService()
 )

agent/app/api/v2/fail2ban.go

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

agent/app/api/v2/favorite.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/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/gin-gonic/gin"
 )
 
 // @Tags File
 // @Summary List favorites
-// @Description 获取收藏列表
 // @Accept json
 // @Param request body dto.PageInfo true "request"
-// @Success 200
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite/search [post]
 func (b *BaseApi) SearchFavorite(c *gin.Context) {
 	var req dto.PageInfo
@@ -23,7 +22,7 @@ func (b *BaseApi) SearchFavorite(c *gin.Context) {
 	}
 	total, list, err := favoriteService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -34,11 +33,11 @@ func (b *BaseApi) SearchFavorite(c *gin.Context) {
 
 // @Tags File
 // @Summary Create favorite
-// @Description 创建收藏
 // @Accept json
 // @Param request body request.FavoriteCreate true "request"
-// @Success 200
+// @Success 200 {object} model.Favorite
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"收藏文件/文件夹 [path]","formatEN":"收藏文件/文件夹 [path]"}
 func (b *BaseApi) CreateFavorite(c *gin.Context) {
@@ -48,7 +47,7 @@ func (b *BaseApi) CreateFavorite(c *gin.Context) {
 	}
 	favorite, err := favoriteService.Create(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, favorite)
@@ -56,11 +55,11 @@ func (b *BaseApi) CreateFavorite(c *gin.Context) {
 
 // @Tags File
 // @Summary Delete favorite
-// @Description 删除收藏
 // @Accept json
 // @Param request body request.FavoriteDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"favorites","output_column":"path","output_value":"path"}],"formatZH":"删除收藏 [path]","formatEN":"delete avorite [path]"}
 func (b *BaseApi) DeleteFavorite(c *gin.Context) {
@@ -69,8 +68,8 @@ func (b *BaseApi) DeleteFavorite(c *gin.Context) {
 		return
 	}
 	if err := favoriteService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }

agent/app/api/v2/file.go

@@ -1,6 +1,7 @@
-package v1
+package v2
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -13,47 +14,47 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/response"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/files"
-	websocket2 "github.com/1Panel-dev/1Panel/backend/utils/websocket"
+	"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/app/dto/response"
+	"github.com/1Panel-dev/1Panel/agent/buserr"
+	"github.com/1Panel-dev/1Panel/agent/constant"
+	"github.com/1Panel-dev/1Panel/agent/global"
+	"github.com/1Panel-dev/1Panel/agent/utils/files"
+	websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
 
 // @Tags File
 // @Summary List files
-// @Description 获取文件列表
 // @Accept json
 // @Param request body request.FileOption true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/search [post]
 func (b *BaseApi) ListFiles(c *gin.Context) {
 	var req request.FileOption
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	files, err := fileService.GetFileList(req)
+	fileList, err := fileService.GetFileList(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, files)
+	helper.SuccessWithData(c, fileList)
 }
 
 // @Tags File
 // @Summary Page file
-// @Description 分页获取上传文件
 // @Accept json
 // @Param request body request.SearchUploadWithPage true "request"
-// @Success 200 {array} response.FileInfo
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/upload/search [post]
 func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 	var req request.SearchUploadWithPage
@@ -62,7 +63,7 @@ func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 	}
 	total, files, err := fileService.SearchUploadWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -73,11 +74,11 @@ func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 
 // @Tags File
 // @Summary Load files tree
-// @Description 加载文件树
 // @Accept json
 // @Param request body request.FileOption true "request"
 // @Success 200 {array} response.FileTree
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/tree [post]
 func (b *BaseApi) GetFileTree(c *gin.Context) {
 	var req request.FileOption
@@ -86,7 +87,7 @@ func (b *BaseApi) GetFileTree(c *gin.Context) {
 	}
 	tree, err := fileService.GetFileTree(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, tree)
@@ -94,11 +95,11 @@ func (b *BaseApi) GetFileTree(c *gin.Context) {
 
 // @Tags File
 // @Summary Create file
-// @Description 创建文件/文件夹
 // @Accept json
 // @Param request body request.FileCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建文件/文件夹 [path]","formatEN":"Create dir or file [path]"}
 func (b *BaseApi) CreateFile(c *gin.Context) {
@@ -108,19 +109,19 @@ func (b *BaseApi) CreateFile(c *gin.Context) {
 	}
 	err := fileService.Create(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Delete file
-// @Description 删除文件/文件夹
 // @Accept json
 // @Param request body request.FileDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/del [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除文件/文件夹 [path]","formatEN":"Delete dir or file [path]"}
 func (b *BaseApi) DeleteFile(c *gin.Context) {
@@ -130,19 +131,19 @@ func (b *BaseApi) DeleteFile(c *gin.Context) {
 	}
 	err := fileService.Delete(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Batch delete file
-// @Description 批量删除文件/文件夹
 // @Accept json
 // @Param request body request.FileBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/batch/del [post]
 // @x-panel-log {"bodyKeys":["paths"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量删除文件/文件夹 [paths]","formatEN":"Batch delete dir or file [paths]"}
 func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
@@ -152,19 +153,19 @@ func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
 	}
 	err := fileService.BatchDelete(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Change file mode
-// @Description 修改文件权限
 // @Accept json
 // @Param request body request.FileCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/mode [post]
 // @x-panel-log {"bodyKeys":["path","mode"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改权限 [paths] => [mode]","formatEN":"Change mode [paths] => [mode]"}
 func (b *BaseApi) ChangeFileMode(c *gin.Context) {
@@ -174,19 +175,19 @@ func (b *BaseApi) ChangeFileMode(c *gin.Context) {
 	}
 	err := fileService.ChangeMode(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Change file owner
-// @Description 修改文件用户/组
 // @Accept json
 // @Param request body request.FileRoleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/owner [post]
 // @x-panel-log {"bodyKeys":["path","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改用户/组 [paths] => [user]/[group]","formatEN":"Change owner [paths] => [user]/[group]"}
 func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
@@ -195,19 +196,19 @@ func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
 		return
 	}
 	if err := fileService.ChangeOwner(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Compress file
-// @Description 压缩文件
 // @Accept json
 // @Param request body request.FileCompress true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/compress [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"压缩文件 [name]","formatEN":"Compress file [name]"}
 func (b *BaseApi) CompressFile(c *gin.Context) {
@@ -217,19 +218,19 @@ func (b *BaseApi) CompressFile(c *gin.Context) {
 	}
 	err := fileService.Compress(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Decompress file
-// @Description 解压文件
 // @Accept json
 // @Param request body request.FileDeCompress true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/decompress [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"解压 [path]","formatEN":"Decompress file [path]"}
 func (b *BaseApi) DeCompressFile(c *gin.Context) {
@@ -239,19 +240,19 @@ func (b *BaseApi) DeCompressFile(c *gin.Context) {
 	}
 	err := fileService.DeCompress(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Load file content
-// @Description 获取文件内容
 // @Accept json
 // @Param request body request.FileContentReq true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/content [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件内容 [path]","formatEN":"Load file content [path]"}
 func (b *BaseApi) GetContent(c *gin.Context) {
@@ -261,7 +262,7 @@ func (b *BaseApi) GetContent(c *gin.Context) {
 	}
 	info, err := fileService.GetContent(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, info)
@@ -269,11 +270,11 @@ func (b *BaseApi) GetContent(c *gin.Context) {
 
 // @Tags File
 // @Summary Update file content
-// @Description 更新文件内容
 // @Accept json
 // @Param request body request.FileEdit true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/save [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新文件内容 [path]","formatEN":"Update file content [path]"}
 func (b *BaseApi) SaveContent(c *gin.Context) {
@@ -282,24 +283,24 @@ func (b *BaseApi) SaveContent(c *gin.Context) {
 		return
 	}
 	if err := fileService.SaveContent(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Upload file
-// @Description 上传文件
 // @Param file formData file true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/upload [post]
-// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传文件 [path]","formatEN":"Upload file [path]"}
+// @x-panel-log {"bodyKeys":["path", "file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传文件 [path]/[file]","formatEN":"Upload file [path]/[file]"}
 func (b *BaseApi) UploadFiles(c *gin.Context) {
 	form, err := c.MultipartForm()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	uploadFiles := form.File["file"]
@@ -314,7 +315,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 	}
 
 	if len(paths) == 0 || !strings.Contains(paths[0], "/") {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error paths in request"))
+		helper.BadRequest(c, errors.New("error paths in request"))
 		return
 	}
 	dir := path.Dir(paths[0])
@@ -323,27 +324,27 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 	if err != nil && os.IsNotExist(err) {
 		mode, err := files.GetParentMode(dir)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		if err = os.MkdirAll(dir, mode); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("mkdir %s failed, err: %v", dir, err))
+			helper.BadRequest(c, fmt.Errorf("mkdir %s failed, err: %v", dir, err))
 			return
 		}
 	}
 	info, err := os.Stat(dir)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	mode := info.Mode()
+
 	fileOp := files.NewFileOp()
 	stat, ok := info.Sys().(*syscall.Stat_t)
 	uid, gid := -1, -1
 	if ok {
 		uid, gid = int(stat.Uid), int(stat.Gid)
 	}
-
 	success := 0
 	failures := make(buserr.MultiErr)
 	for _, file := range uploadFiles {
@@ -390,7 +391,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		success++
 	}
 	if success == 0 {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, failures)
+		helper.InternalServer(c, failures)
 	} else {
 		helper.SuccessWithMsg(c, fmt.Sprintf("%d files upload success", success))
 	}
@@ -398,31 +399,57 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 
 // @Tags File
 // @Summary Check file exist
-// @Description 检测文件是否存在
 // @Accept json
 // @Param request body request.FilePathCheck true "request"
-// @Success 200
+// @Success 200 {boolean} isOk
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/check [post]
 func (b *BaseApi) CheckFile(c *gin.Context) {
 	var req request.FilePathCheck
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if _, err := os.Stat(req.Path); err != nil {
-		helper.SuccessWithData(c, false)
+	fileOp := files.NewFileOp()
+	if fileOp.Stat(req.Path) {
+		helper.SuccessWithData(c, true)
 		return
 	}
-	helper.SuccessWithData(c, true)
+	if req.WithInit {
+		if err := fileOp.CreateDir(req.Path, 0644); err != nil {
+			helper.SuccessWithData(c, false)
+			return
+		}
+		helper.SuccessWithData(c, true)
+		return
+	}
+	helper.SuccessWithData(c, false)
+}
+
+// @Tags File
+// @Summary Batch check file exist
+// @Accept json
+// @Param request body request.FilePathsCheck true "request"
+// @Success 200 {array} response.ExistFileInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /files/batch/check [post]
+func (b *BaseApi) BatchCheckFiles(c *gin.Context) {
+	var req request.FilePathsCheck
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	fileList := fileService.BatchCheckFiles(req)
+	helper.SuccessWithData(c, fileList)
 }
 
 // @Tags File
 // @Summary Change file name
-// @Description 修改文件名称
 // @Accept json
 // @Param request body request.FileRename true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/rename [post]
 // @x-panel-log {"bodyKeys":["oldName","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重命名 [oldName] => [newName]","formatEN":"Rename [oldName] => [newName]"}
 func (b *BaseApi) ChangeFileName(c *gin.Context) {
@@ -431,19 +458,19 @@ func (b *BaseApi) ChangeFileName(c *gin.Context) {
 		return
 	}
 	if err := fileService.ChangeName(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Wget file
-// @Description 下载远端文件
 // @Accept json
 // @Param request body request.FileWget true "request"
-// @Success 200
+// @Success 200 {object} response.FileWgetRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/wget [post]
 // @x-panel-log {"bodyKeys":["url","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载 url => [path]/[name]","formatEN":"Download url => [path]/[name]"}
 func (b *BaseApi) WgetFile(c *gin.Context) {
@@ -453,7 +480,7 @@ func (b *BaseApi) WgetFile(c *gin.Context) {
 	}
 	key, err := fileService.Wget(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, response.FileWgetRes{
@@ -463,11 +490,11 @@ func (b *BaseApi) WgetFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Move file
-// @Description 移动文件
 // @Accept json
 // @Param request body request.FileMove true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/move [post]
 // @x-panel-log {"bodyKeys":["oldPaths","newPath"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移动文件 [oldPaths] => [newPath]","formatEN":"Move [oldPaths] => [newPath]"}
 func (b *BaseApi) MoveFile(c *gin.Context) {
@@ -476,24 +503,24 @@ func (b *BaseApi) MoveFile(c *gin.Context) {
 		return
 	}
 	if err := fileService.MvFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags File
 // @Summary Download file
-// @Description 下载文件
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/download [get]
 func (b *BaseApi) Download(c *gin.Context) {
 	filePath := c.Query("path")
 	file, err := os.Open(filePath)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 	}
 	defer file.Close()
 	info, _ := file.Stat()
@@ -504,11 +531,11 @@ func (b *BaseApi) Download(c *gin.Context) {
 
 // @Tags File
 // @Summary Chunk Download file
-// @Description 分片下载下载文件
 // @Accept json
 // @Param request body request.FileDownload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/chunkdownload [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载文件 [name]","formatEN":"Download file [name]"}
 func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
@@ -518,22 +545,22 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 	}
 	fileOp := files.NewFileOp()
 	if !fileOp.Stat(req.Path) {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrPathNotFound, nil)
+		helper.ErrorWithDetail(c, http.StatusInternalServerError, "ErrPathNotFound", nil)
 		return
 	}
 	filePath := req.Path
 	fstFile, err := fileOp.OpenFile(filePath)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	info, err := fstFile.Stat()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	if info.IsDir() {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrFileDownloadDir, err)
+		helper.ErrorWithDetail(c, http.StatusInternalServerError, "ErrFileDownloadDir", err)
 		return
 	}
 
@@ -562,7 +589,7 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 		buffer := make([]byte, 1024*1024)
 		file, err := os.Open(filePath)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		defer file.Close()
@@ -571,7 +598,7 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 		reader := io.LimitReader(file, endPos-startPos+1)
 		_, err = io.CopyBuffer(c.Writer, reader, buffer)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 	} else {
@@ -581,11 +608,11 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 
 // @Tags File
 // @Summary Load file size
-// @Description 获取文件夹大小
 // @Accept json
 // @Param request body request.DirSizeReq true "request"
-// @Success 200
+// @Success 200 {object} response.DirSizeRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/size [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件夹大小 [path]","formatEN":"Load file size [path]"}
 func (b *BaseApi) Size(c *gin.Context) {
@@ -595,7 +622,29 @@ func (b *BaseApi) Size(c *gin.Context) {
 	}
 	res, err := fileService.DirSize(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags File
+// @Summary Multi file size
+// @Accept json
+// @Param request body request.DirSizeReq true "request"
+// @Success 200 {array} response.DepthDirSizeRes
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /files/depth/size [post]
+// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取目录及其第一层子目录文件夹大小 [path]","formatEN":"Multi file size [path]"}
+func (b *BaseApi) DepthDirSize(c *gin.Context) {
+	var req request.DirSizeReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := fileService.DepthDirSize(req)
+	if err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -610,19 +659,11 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	dstDir = strings.TrimSpace(dstDir)
 	mode, _ := files.GetParentMode(dstDir)
 	if mode == 0 {
-		mode = 0755
+		mode = constant.DirPerm
 	}
-	uid, gid := -1, -1
-	if info, err := os.Stat(dstDir); err != nil {
-		if os.IsNotExist(err) {
-			if err = op.CreateDir(dstDir, mode); err != nil {
-				return err
-			}
-		}
-	} else {
-		stat, ok := info.Sys().(*syscall.Stat_t)
-		if ok {
-			uid, gid = int(stat.Uid), int(stat.Gid)
+	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
+		if err = op.CreateDir(dstDir, mode); err != nil {
+			return err
 		}
 	}
 	dstFileName := filepath.Join(dstDir, fileName)
@@ -632,7 +673,6 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	} else {
 		mode = 0644
 	}
-
 	if overwrite {
 		_ = os.Remove(dstFileName)
 	}
@@ -653,48 +693,45 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 		}
 		_ = os.Remove(chunkPath)
 	}
-	if uid != -1 && gid != -1 {
-		_ = os.Chown(dstFileName, uid, gid)
-	}
 
 	return nil
 }
 
 // @Tags File
 // @Summary ChunkUpload file
-// @Description 分片上传文件
 // @Param file formData file true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/chunkupload [post]
 func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 	var err error
 	fileForm, err := c.FormFile("chunk")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	uploadFile, err := fileForm.Open()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	defer uploadFile.Close()
 	chunkIndex, err := strconv.Atoi(c.PostForm("chunkIndex"))
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	chunkCount, err := strconv.Atoi(c.PostForm("chunkCount"))
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	fileOp := files.NewFileOp()
-	tmpDir := path.Join(global.CONF.System.TmpDir, "upload")
+	tmpDir := path.Join(global.Dir.TmpDir, "upload")
 	if !fileOp.Stat(tmpDir) {
-		if err := fileOp.CreateDir(tmpDir, 0755); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		if err := fileOp.CreateDir(tmpDir, constant.DirPerm); err != nil {
+			helper.BadRequest(c, err)
 			return
 		}
 	}
@@ -704,7 +741,7 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 		if fileOp.Stat(fileDir) {
 			_ = fileOp.DeleteDir(fileDir)
 		}
-		_ = os.MkdirAll(fileDir, 0755)
+		_ = os.MkdirAll(fileDir, constant.DirPerm)
 	}
 	filePath := filepath.Join(fileDir, filename)
 
@@ -720,21 +757,21 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 
 	emptyFile, err = os.Create(filePath)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	defer emptyFile.Close()
 
 	chunkData, err = io.ReadAll(uploadFile)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, buserr.WithMap(constant.ErrFileUpload, map[string]interface{}{"name": filename, "detail": err.Error()}, err))
+		helper.InternalServer(c, buserr.WithMap("ErrFileUpload", map[string]interface{}{"name": filename, "detail": err.Error()}, err))
 		return
 	}
 
 	chunkPath := filepath.Join(fileDir, fmt.Sprintf("%s.%d", filename, chunkIndex))
-	err = os.WriteFile(chunkPath, chunkData, 0644)
+	err = os.WriteFile(chunkPath, chunkData, constant.DirPerm)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, buserr.WithMap(constant.ErrFileUpload, map[string]interface{}{"name": filename, "detail": err.Error()}, err))
+		helper.InternalServer(c, buserr.WithMap("ErrFileUpload", map[string]interface{}{"name": filename, "detail": err.Error()}, err))
 		return
 	}
 
@@ -745,7 +782,7 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 		}
 		err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount, overwrite)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, buserr.WithMap(constant.ErrFileUpload, map[string]interface{}{"name": filename, "detail": err.Error()}, err))
+			helper.InternalServer(c, buserr.WithMap("ErrFileUpload", map[string]interface{}{"name": filename, "detail": err.Error()}, err))
 			return
 		}
 		helper.SuccessWithData(c, true)
@@ -760,7 +797,7 @@ var wsUpgrade = websocket.Upgrader{
 	},
 }
 
-func (b *BaseApi) Ws(c *gin.Context) {
+func (b *BaseApi) WgetProcess(c *gin.Context) {
 	ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		return
@@ -770,23 +807,29 @@ func (b *BaseApi) Ws(c *gin.Context) {
 	go wsClient.Write()
 }
 
-func (b *BaseApi) Keys(c *gin.Context) {
+func (b *BaseApi) ProcessKeys(c *gin.Context) {
 	res := &response.FileProcessKeys{}
-	keys, err := global.CACHE.PrefixScanKey("file-wget-")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
+	keys := global.CACHE.PrefixScanKey("file-wget-")
+	for _, key := range keys {
+		value := global.CACHE.Get(key)
+		if value == "" {
+			continue
+		}
+		var process files.Process
+		if err := json.Unmarshal([]byte(value), &process); err != nil {
+			continue
+		}
+		res.Keys = append(res.Keys, key)
 	}
-	res.Keys = keys
 	helper.SuccessWithData(c, res)
 }
 
 // @Tags File
 // @Summary Read file by Line
-// @Description 按行读取日志文件
 // @Param request body request.FileReadByLineReq true "request"
-// @Success 200
+// @Success 200 {object} response.FileLineContent
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/read [post]
 func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 	var req request.FileReadByLineReq
@@ -795,7 +838,7 @@ func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 	}
 	res, err := fileService.ReadLogByLine(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -803,11 +846,11 @@ func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 
 // @Tags File
 // @Summary Batch change file mode and owner
-// @Description 批量修改文件权限和用户/组
 // @Accept json
 // @Param request body request.FileRoleReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/batch/role [post]
 // @x-panel-log {"bodyKeys":["paths","mode","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量修改文件权限和用户/组 [paths] => [mode]/[user]/[group]","formatEN":"Batch change file mode and owner [paths] => [mode]/[user]/[group]"}
 func (b *BaseApi) BatchChangeModeAndOwner(c *gin.Context) {
@@ -816,7 +859,45 @@ func (b *BaseApi) BatchChangeModeAndOwner(c *gin.Context) {
 		return
 	}
 	if err := fileService.BatchChangeModeAndOwner(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
+}
+
+func (b *BaseApi) GetPathByType(c *gin.Context) {
+	pathType, ok := c.Params.Get("type")
+	if !ok {
+		helper.BadRequest(c, errors.New("error pathType id in path"))
+		return
+	}
+	resPath := fileService.GetPathByType(pathType)
+	helper.SuccessWithData(c, resPath)
+}
+
+// @Tags File
+// @Summary system mount
+// @Accept json
+// @Success 200 {object} dto.DiskInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mount [post]
+func (b *BaseApi) GetHostMount(c *gin.Context) {
+	disks := fileService.GetHostMount()
+	helper.SuccessWithData(c, disks)
+}
+
+// @Tags File
+// @Summary system user and group
+// @Accept json
+// @Success 200 {object} response.UserGroupResponse
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /user/group [post]
+func (b *BaseApi) GetUsersAndGroups(c *gin.Context) {
+	res, err := fileService.GetUsersAndGroups()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
 }

agent/app/api/v2/firewall.go

@@ -1,22 +1,21 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Firewall
 // @Summary Load firewall base info
-// @Description 获取防火墙基础信息
 // @Success 200 {object} dto.FirewallBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/base [get]
 func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 	data, err := firewallService.LoadBaseInfo()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -25,11 +24,11 @@ func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 
 // @Tags Firewall
 // @Summary Page firewall rules
-// @Description 获取防火墙规则列表分页
 // @Accept json
 // @Param request body dto.RuleSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/search [post]
 func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 	var req dto.RuleSearch
@@ -39,7 +38,7 @@ func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 
 	total, list, err := firewallService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -50,12 +49,12 @@ func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Page firewall status
-// @Description 修改防火墙状态
+// @Summary Operate firewall
 // @Accept json
 // @Param request body dto.FirewallOperation true "request"
-// @Success 200 {object} dto.PageResult
+// @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] 防火墙","formatEN":"[operation] firewall"}
 func (b *BaseApi) OperateFirewall(c *gin.Context) {
@@ -65,20 +64,20 @@ func (b *BaseApi) OperateFirewall(c *gin.Context) {
 	}
 
 	if err := firewallService.OperateFirewall(req.Operation); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Create group
-// @Description 创建防火墙端口规则
 // @Accept json
 // @Param request body dto.PortRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/port [post]
 // @x-panel-log {"bodyKeys":["port","strategy"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加端口规则 [strategy] [port]","formatEN":"create port rules [strategy][port]"}
 func (b *BaseApi) OperatePortRule(c *gin.Context) {
@@ -88,20 +87,20 @@ func (b *BaseApi) OperatePortRule(c *gin.Context) {
 	}
 
 	if err := firewallService.OperatePortRule(req, true); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // OperateForwardRule
 // @Tags Firewall
 // @Summary Create group
-// @Description 更新防火墙端口转发规则
 // @Accept json
 // @Param request body dto.ForwardRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/forward [post]
 // @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) {
@@ -111,19 +110,19 @@ func (b *BaseApi) OperateForwardRule(c *gin.Context) {
 	}
 
 	if err := firewallService.OperateForwardRule(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Create group
-// @Description 创建防火墙 IP 规则
 // @Accept json
 // @Param request body dto.AddrRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/ip [post]
 // @x-panel-log {"bodyKeys":["strategy","address"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加 ip 规则 [strategy] [address]","formatEN":"create address rules [strategy][address]"}
 func (b *BaseApi) OperateIPRule(c *gin.Context) {
@@ -133,19 +132,19 @@ func (b *BaseApi) OperateIPRule(c *gin.Context) {
 	}
 
 	if err := firewallService.OperateAddressRule(req, true); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Create group
-// @Description 批量删除防火墙规则
 // @Accept json
 // @Param request body dto.BatchRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/batch [post]
 func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 	var req dto.BatchRuleOperate
@@ -154,19 +153,19 @@ func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 	}
 
 	if err := firewallService.BatchOperateRule(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Update rule description
-// @Description 更新防火墙描述
 // @Accept json
 // @Param request body dto.UpdateFirewallDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/description [post]
 func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 	var req dto.UpdateFirewallDescription
@@ -175,19 +174,19 @@ func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 	}
 
 	if err := firewallService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Create group
-// @Description 更新端口防火墙规则
 // @Accept json
 // @Param request body dto.PortRuleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/port [post]
 func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 	var req dto.PortRuleUpdate
@@ -196,19 +195,19 @@ func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 	}
 
 	if err := firewallService.UpdatePortRule(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Firewall
 // @Summary Create group
-// @Description 更新 ip 防火墙规则
 // @Accept json
 // @Param request body dto.AddrRuleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/addr [post]
 func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
 	var req dto.AddrRuleUpdate
@@ -217,8 +216,8 @@ func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
 	}
 
 	if err := firewallService.UpdateAddrRule(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/ftp.go

@@ -1,24 +1,23 @@
-package v1
+package v2
 
 import (
 	"encoding/base64"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags FTP
 // @Summary Load FTP base info
-// @Description 获取 FTP 基础信息
 // @Success 200 {object} dto.FtpBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/base [get]
 func (b *BaseApi) LoadFtpBaseInfo(c *gin.Context) {
 	data, err := ftpService.LoadBaseInfo()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -27,11 +26,11 @@ func (b *BaseApi) LoadFtpBaseInfo(c *gin.Context) {
 
 // @Tags FTP
 // @Summary Load FTP operation log
-// @Description 获取 FTP 操作日志
 // @Accept json
 // @Param request body dto.FtpLogSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/log/search [post]
 func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
 	var req dto.FtpLogSearch
@@ -41,7 +40,7 @@ func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
 
 	total, list, err := ftpService.LoadLog(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -53,10 +52,10 @@ func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
 
 // @Tags FTP
 // @Summary Operate FTP
-// @Description 修改 FTP 状态
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] FTP","formatEN":"[operation] FTP"}
 func (b *BaseApi) OperateFtp(c *gin.Context) {
@@ -66,20 +65,20 @@ func (b *BaseApi) OperateFtp(c *gin.Context) {
 	}
 
 	if err := ftpService.Operate(req.Operation); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags FTP
 // @Summary Page FTP user
-// @Description 获取 FTP 账户列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/search [post]
 func (b *BaseApi) SearchFtp(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -89,7 +88,7 @@ func (b *BaseApi) SearchFtp(c *gin.Context) {
 
 	total, list, err := ftpService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -101,11 +100,11 @@ func (b *BaseApi) SearchFtp(c *gin.Context) {
 
 // @Tags FTP
 // @Summary Create FTP user
-// @Description 创建 FTP 账户
 // @Accept json
 // @Param request body dto.FtpCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp [post]
 // @x-panel-log {"bodyKeys":["user", "path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 FTP 账户 [user][path]","formatEN":"create FTP [user][path]"}
 func (b *BaseApi) CreateFtp(c *gin.Context) {
@@ -117,25 +116,25 @@ func (b *BaseApi) CreateFtp(c *gin.Context) {
 	if len(req.Password) != 0 {
 		pass, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Password = string(pass)
 	}
 	if _, err := ftpService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags FTP
 // @Summary Delete FTP user
-// @Description 删除 FTP 账户
 // @Accept json
 // @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"ftps","output_column":"user","output_value":"users"}],"formatZH":"删除 FTP 账户 [users]","formatEN":"delete FTP users [users]"}
 func (b *BaseApi) DeleteFtp(c *gin.Context) {
@@ -145,36 +144,36 @@ func (b *BaseApi) DeleteFtp(c *gin.Context) {
 	}
 
 	if err := ftpService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags FTP
 // @Summary Sync FTP user
-// @Description 同步 FTP 账户
 // @Accept json
 // @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/sync [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步 FTP 账户","formatEN":"sync FTP users"}
 func (b *BaseApi) SyncFtp(c *gin.Context) {
 	if err := ftpService.Sync(); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags FTP
 // @Summary Update FTP user
-// @Description 修改 FTP 账户
 // @Accept json
 // @Param request body dto.FtpUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/ftp/update [post]
 // @x-panel-log {"bodyKeys":["user", "path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 FTP 账户 [user][path]","formatEN":"update FTP [user][path]"}
 func (b *BaseApi) UpdateFtp(c *gin.Context) {
@@ -186,14 +185,14 @@ func (b *BaseApi) UpdateFtp(c *gin.Context) {
 	if len(req.Password) != 0 {
 		pass, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			helper.BadRequest(c, err)
 			return
 		}
 		req.Password = string(pass)
 	}
 	if err := ftpService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }

agent/app/api/v2/group.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags System Group
 // @Summary Create group
-// @Description 创建系统组
 // @Accept json
 // @Param request body dto.GroupCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /groups [post]
+// @Security Timestamp
+// @Router /agent/groups [post]
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建组 [name][type]","formatEN":"create group [name][type]"}
 func (b *BaseApi) CreateGroup(c *gin.Context) {
 	var req dto.GroupCreate
@@ -23,20 +22,20 @@ func (b *BaseApi) CreateGroup(c *gin.Context) {
 	}
 
 	if err := groupService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Group
 // @Summary Delete group
-// @Description 删除系统组
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /groups/del [post]
+// @Security Timestamp
+// @Router /agent/groups/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"name","output_value":"name"},{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"type","output_value":"type"}],"formatZH":"删除组 [type][name]","formatEN":"delete group [type][name]"}
 func (b *BaseApi) DeleteGroup(c *gin.Context) {
 	var req dto.OperateByID
@@ -45,20 +44,20 @@ func (b *BaseApi) DeleteGroup(c *gin.Context) {
 	}
 
 	if err := groupService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Group
 // @Summary Update group
-// @Description 更新系统组
 // @Accept json
 // @Param request body dto.GroupUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /groups/update [post]
+// @Security Timestamp
+// @Router /agent/groups/update [post]
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新组 [name][type]","formatEN":"update group [name][type]"}
 func (b *BaseApi) UpdateGroup(c *gin.Context) {
 	var req dto.GroupUpdate
@@ -67,29 +66,29 @@ func (b *BaseApi) UpdateGroup(c *gin.Context) {
 	}
 
 	if err := groupService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Group
 // @Summary List groups
-// @Description 查询系统组
 // @Accept json
 // @Param request body dto.GroupSearch true "request"
-// @Success 200 {array} dto.GroupInfo
+// @Success 200 {array} dto.OperateByType
 // @Security ApiKeyAuth
-// @Router /groups/search [post]
+// @Security Timestamp
+// @Router /agent/groups/search [post]
 func (b *BaseApi) ListGroup(c *gin.Context) {
-	var req dto.GroupSearch
+	var req dto.OperateByType
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
 	list, err := groupService.List(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 

agent/app/api/v2/health.go

@@ -0,0 +1,10 @@
+package v2
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/gin-gonic/gin"
+)
+
+func (b *BaseApi) CheckHealth(c *gin.Context) {
+	helper.Success(c)
+}

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

@@ -6,13 +6,12 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/1Panel-dev/1Panel/backend/global"
+	"github.com/1Panel-dev/1Panel/agent/global"
 	"gorm.io/gorm"
 
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/i18n"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/constant"
+	"github.com/1Panel-dev/1Panel/agent/i18n"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
 )
@@ -22,51 +21,34 @@ func ErrorWithDetail(ctx *gin.Context, code int, msgKey string, err error) {
 		Code:    code,
 		Message: "",
 	}
-	if msgKey == constant.ErrTypeInternalServer {
-		switch {
-		case errors.Is(err, constant.ErrRecordExist):
-			res.Message = i18n.GetMsgWithMap("ErrRecordExist", nil)
-		case errors.Is(constant.ErrRecordNotFound, err):
-			res.Message = i18n.GetMsgWithMap("ErrRecordNotFound", nil)
-		case errors.Is(constant.ErrInvalidParams, err):
-			res.Message = i18n.GetMsgWithMap("ErrInvalidParams", nil)
-		case errors.Is(constant.ErrStructTransform, err):
-			res.Message = i18n.GetMsgWithMap("ErrStructTransform", map[string]interface{}{"detail": err})
-		case errors.Is(constant.ErrCaptchaCode, err):
-			res.Code = constant.CodeAuth
-			res.Message = "ErrCaptchaCode"
-		case errors.Is(constant.ErrAuth, err):
-			res.Code = constant.CodeAuth
-			res.Message = "ErrAuth"
-		case errors.Is(constant.ErrInitialPassword, err):
-			res.Message = i18n.GetMsgWithMap("ErrInitialPassword", map[string]interface{}{"detail": err})
-		case errors.As(err, &buserr.BusinessError{}):
-			res.Message = err.Error()
-		default:
-			res.Message = i18n.GetMsgWithMap(msgKey, map[string]interface{}{"detail": err})
-		}
-	} else {
-		res.Message = i18n.GetMsgWithMap(msgKey, map[string]interface{}{"detail": err})
-	}
+	res.Message = i18n.GetMsgWithDetail(msgKey, err.Error())
 	ctx.JSON(http.StatusOK, res)
 	ctx.Abort()
 }
 
+func InternalServer(ctx *gin.Context, err error) {
+	ErrorWithDetail(ctx, http.StatusInternalServerError, "ErrInternalServer", err)
+}
+
+func BadRequest(ctx *gin.Context, err error) {
+	ErrorWithDetail(ctx, http.StatusBadRequest, "ErrInvalidParams", err)
+}
+
 func SuccessWithData(ctx *gin.Context, data interface{}) {
 	if data == nil {
 		data = gin.H{}
 	}
 	res := dto.Response{
-		Code: constant.CodeSuccess,
+		Code: http.StatusOK,
 		Data: data,
 	}
 	ctx.JSON(http.StatusOK, res)
 	ctx.Abort()
 }
 
-func SuccessWithOutData(ctx *gin.Context) {
+func Success(ctx *gin.Context) {
 	res := dto.Response{
-		Code:    constant.CodeSuccess,
+		Code:    http.StatusOK,
 		Message: "success",
 	}
 	ctx.JSON(http.StatusOK, res)
@@ -75,7 +57,7 @@ func SuccessWithOutData(ctx *gin.Context) {
 
 func SuccessWithMsg(ctx *gin.Context, msg string) {
 	res := dto.Response{
-		Code:    constant.CodeSuccess,
+		Code:    http.StatusOK,
 		Message: msg,
 	}
 	ctx.JSON(http.StatusOK, res)
@@ -116,11 +98,11 @@ func GetTxAndContext() (tx *gorm.DB, ctx context.Context) {
 
 func CheckBindAndValidate(req interface{}, c *gin.Context) error {
 	if err := c.ShouldBindJSON(req); err != nil {
-		ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		ErrorWithDetail(c, http.StatusBadRequest, "ErrInvalidParams", err)
 		return err
 	}
 	if err := global.VALID.Struct(req); err != nil {
-		ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		ErrorWithDetail(c, http.StatusBadRequest, "ErrInvalidParams", err)
 		return err
 	}
 	return nil
@@ -128,7 +110,7 @@ func CheckBindAndValidate(req interface{}, c *gin.Context) error {
 
 func CheckBind(req interface{}, c *gin.Context) error {
 	if err := c.ShouldBindJSON(&req); err != nil {
-		ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		ErrorWithDetail(c, http.StatusBadRequest, "ErrInvalidParams", err)
 		return err
 	}
 	return nil

agent/app/api/v2/host_tool.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具状态
+// @Summary Get tool status
 // @Accept json
 // @Param request body request.HostToolReq true "request"
-// @Success 200
+// @Success 200 {object} response.HostToolRes
 // @Security ApiKeyAuth
-// @Router /host/tool [post]
+// @Security Timestamp
+// @Router /hosts/tool [post]
 func (b *BaseApi) GetToolStatus(c *gin.Context) {
 	var req request.HostToolReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -23,7 +22,7 @@ func (b *BaseApi) GetToolStatus(c *gin.Context) {
 
 	config, err := hostToolService.GetToolStatus(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, config)
@@ -31,12 +30,12 @@ func (b *BaseApi) GetToolStatus(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Create Host tool Config
-// @Description 创建主机工具配置
 // @Accept json
 // @Param request body request.HostToolCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/tool/create [post]
+// @Security Timestamp
+// @Router /hosts/tool/create [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 [type] 配置","formatEN":"create [type] config"}
 func (b *BaseApi) InitToolConfig(c *gin.Context) {
 	var req request.HostToolCreate
@@ -45,20 +44,20 @@ func (b *BaseApi) InitToolConfig(c *gin.Context) {
 	}
 
 	if err := hostToolService.CreateToolConfig(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Host tool
 // @Summary Operate tool
-// @Description 操作主机工具
 // @Accept json
 // @Param request body request.HostToolReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/tool/operate [post]
+// @Security Timestamp
+// @Router /hosts/tool/operate [post]
 // @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
 func (b *BaseApi) OperateTool(c *gin.Context) {
 	var req request.HostToolReq
@@ -67,20 +66,20 @@ func (b *BaseApi) OperateTool(c *gin.Context) {
 	}
 	err := hostToolService.OperateTool(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Host tool
 // @Summary Get tool config
-// @Description 操作主机工具配置文件
 // @Accept json
 // @Param request body request.HostToolConfig true "request"
-// @Success 200
+// @Success 200 {object} response.HostToolConfig
 // @Security ApiKeyAuth
-// @Router /host/tool/config [post]
+// @Security Timestamp
+// @Router /hosts/tool/config [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机工具配置文件 ","formatEN":"[operate] tool config"}
 func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 	var req request.HostToolConfig
@@ -90,20 +89,20 @@ func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 
 	config, err := hostToolService.OperateToolConfig(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, config)
 }
 
 // @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具日志
+// @Summary Get tool logs
 // @Accept json
 // @Param request body request.HostToolLogReq true "request"
-// @Success 200
+// @Success 200 {string} logContent
 // @Security ApiKeyAuth
-// @Router /host/tool/log [post]
+// @Security Timestamp
+// @Router /hosts/tool/log [post]
 func (b *BaseApi) GetToolLog(c *gin.Context) {
 	var req request.HostToolLogReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -112,7 +111,7 @@ func (b *BaseApi) GetToolLog(c *gin.Context) {
 
 	logContent, err := hostToolService.GetToolLog(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, logContent)
@@ -120,12 +119,12 @@ func (b *BaseApi) GetToolLog(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Create Supervisor process
-// @Description 操作守护进程
 // @Accept json
 // @Param request body request.SupervisorProcessConfig true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process [post]
+// @Security Timestamp
+// @Router /hosts/tool/supervisor/process [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 守护进程 ","formatEN":"[operate] process"}
 func (b *BaseApi) OperateProcess(c *gin.Context) {
 	var req request.SupervisorProcessConfig
@@ -135,36 +134,36 @@ func (b *BaseApi) OperateProcess(c *gin.Context) {
 
 	err := hostToolService.OperateSupervisorProcess(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Host tool
 // @Summary Get Supervisor process config
-// @Description 获取 Supervisor 进程配置
 // @Accept json
-// @Success 200
+// @Success 200 {object} response.SupervisorProcessConfig
 // @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process [get]
+// @Security Timestamp
+// @Router /hosts/tool/supervisor/process [get]
 func (b *BaseApi) GetProcess(c *gin.Context) {
 	configs, err := hostToolService.GetSupervisorProcessConfig()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, configs)
 }
 
 // @Tags Host tool
-// @Summary Get Supervisor process config
-// @Description 操作 Supervisor 进程文件
+// @Summary Get Supervisor process config file
 // @Accept json
 // @Param request body request.SupervisorProcessFileReq true "request"
-// @Success 200
+// @Success 200 {string} content
 // @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process/file [post]
+// @Security Timestamp
+// @Router /hosts/tool/supervisor/process/file [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
 func (b *BaseApi) GetProcessFile(c *gin.Context) {
 	var req request.SupervisorProcessFileReq
@@ -173,7 +172,7 @@ func (b *BaseApi) GetProcessFile(c *gin.Context) {
 	}
 	content, err := hostToolService.OperateSupervisorProcessFile(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, content)

agent/app/api/v2/image.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Container Image
 // @Summary Page images
-// @Description 获取镜像列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/search [post]
 func (b *BaseApi) SearchImage(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -24,7 +23,7 @@ func (b *BaseApi) SearchImage(c *gin.Context) {
 
 	total, list, err := imageService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -36,15 +35,15 @@ func (b *BaseApi) SearchImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary List all images
-// @Description 获取所有镜像列表
 // @Produce json
 // @Success 200 {array} dto.ImageInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/all [get]
 func (b *BaseApi) ListAllImage(c *gin.Context) {
 	list, err := imageService.ListAll()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
@@ -52,15 +51,15 @@ func (b *BaseApi) ListAllImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary load images options
-// @Description 获取镜像名称列表
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image [get]
 func (b *BaseApi) ListImage(c *gin.Context) {
 	list, err := imageService.List()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, list)
@@ -68,11 +67,11 @@ func (b *BaseApi) ListImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Build image
-// @Description 构建镜像
 // @Accept json
 // @Param request body dto.ImageBuild true "request"
 // @Success 200 {string} log
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/build [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"构建镜像 [name]","formatEN":"build image [name]"}
 func (b *BaseApi) ImageBuild(c *gin.Context) {
@@ -81,22 +80,21 @@ func (b *BaseApi) ImageBuild(c *gin.Context) {
 		return
 	}
 
-	log, err := imageService.ImageBuild(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := imageService.ImageBuild(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, log)
+	helper.Success(c)
 }
 
 // @Tags Container Image
 // @Summary Pull image
-// @Description 拉取镜像
 // @Accept json
 // @Param request body dto.ImagePull true "request"
-// @Success 200 {string} log
+// @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/pull [post]
 // @x-panel-log {"bodyKeys":["repoID","imageName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"镜像拉取 [reponame][imageName]","formatEN":"image pull [reponame][imageName]"}
 func (b *BaseApi) ImagePull(c *gin.Context) {
@@ -105,22 +103,21 @@ func (b *BaseApi) ImagePull(c *gin.Context) {
 		return
 	}
 
-	logPath, err := imageService.ImagePull(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := imageService.ImagePull(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, logPath)
+	helper.Success(c)
 }
 
 // @Tags Container Image
 // @Summary Push image
-// @Description 推送镜像
 // @Accept json
 // @Param request body dto.ImagePush true "request"
-// @Success 200 {string} log
+// @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/push [post]
 // @x-panel-log {"bodyKeys":["repoID","tagName","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"[tagName] 推送到 [reponame][name]","formatEN":"push [tagName] to [reponame][name]"}
 func (b *BaseApi) ImagePush(c *gin.Context) {
@@ -129,22 +126,21 @@ func (b *BaseApi) ImagePush(c *gin.Context) {
 		return
 	}
 
-	logPath, err := imageService.ImagePush(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := imageService.ImagePush(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, logPath)
+	helper.Success(c)
 }
 
 // @Tags Container Image
 // @Summary Delete image
-// @Description 删除镜像
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
-// @Success 200
+// @Success 200 {object} dto.ContainerPruneReport
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/remove [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移除镜像 [names]","formatEN":"remove image [names]"}
 func (b *BaseApi) ImageRemove(c *gin.Context) {
@@ -153,21 +149,22 @@ func (b *BaseApi) ImageRemove(c *gin.Context) {
 		return
 	}
 
-	if err := imageService.ImageRemove(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	data, err := imageService.ImageRemove(req)
+	if err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.SuccessWithData(c, data)
 }
 
 // @Tags Container Image
 // @Summary Save image
-// @Description 导出镜像
 // @Accept json
 // @Param request body dto.ImageSave true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/save [post]
 // @x-panel-log {"bodyKeys":["tagName","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"保留 [tagName] 为 [path]/[name]","formatEN":"save [tagName] as [path]/[name]"}
 func (b *BaseApi) ImageSave(c *gin.Context) {
@@ -177,20 +174,20 @@ func (b *BaseApi) ImageSave(c *gin.Context) {
 	}
 
 	if err := imageService.ImageSave(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Image
 // @Summary Tag image
-// @Description Tag 镜像
 // @Accept json
 // @Param request body dto.ImageTag true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/tag [post]
 // @x-panel-log {"bodyKeys":["repoID","targetName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"tag 镜像 [reponame][targetName]","formatEN":"tag image [reponame][targetName]"}
 func (b *BaseApi) ImageTag(c *gin.Context) {
@@ -200,20 +197,20 @@ func (b *BaseApi) ImageTag(c *gin.Context) {
 	}
 
 	if err := imageService.ImageTag(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Image
 // @Summary Load image
-// @Description 导入镜像
 // @Accept json
 // @Param request body dto.ImageLoad true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/load [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [path] 加载镜像","formatEN":"load image from [path]"}
 func (b *BaseApi) ImageLoad(c *gin.Context) {
@@ -223,9 +220,9 @@ func (b *BaseApi) ImageLoad(c *gin.Context) {
 	}
 
 	if err := imageService.ImageLoad(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/image_repo.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags Container Image-repo
 // @Summary Page image repos
-// @Description 获取镜像仓库列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/search [post]
 func (b *BaseApi) SearchRepo(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -24,7 +23,7 @@ func (b *BaseApi) SearchRepo(c *gin.Context) {
 
 	total, list, err := imageRepoService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -36,15 +35,15 @@ func (b *BaseApi) SearchRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary List image repos
-// @Description 获取镜像仓库列表
 // @Produce json
 // @Success 200 {array} dto.ImageRepoOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo [get]
 func (b *BaseApi) ListRepo(c *gin.Context) {
 	list, err := imageRepoService.List()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 
@@ -53,12 +52,12 @@ func (b *BaseApi) ListRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary Load repo status
-// @Description 获取 docker 仓库状态
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/status [get]
 func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 	var req dto.OperateByID
@@ -67,20 +66,20 @@ func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 	}
 
 	if err := imageRepoService.Login(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Image-repo
 // @Summary Create image repo
-// @Description 创建镜像仓库
 // @Accept json
 // @Param request body dto.ImageRepoDelete true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建镜像仓库 [name]","formatEN":"create image repo [name]"}
 func (b *BaseApi) CreateRepo(c *gin.Context) {
@@ -90,43 +89,43 @@ func (b *BaseApi) CreateRepo(c *gin.Context) {
 	}
 
 	if err := imageRepoService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Image-repo
 // @Summary Delete image repo
-// @Description 删除镜像仓库
 // @Accept json
-// @Param request body dto.ImageRepoDelete true "request"
+// @Param request body dto.OperateByID true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/del [post]
-// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"image_repos","output_column":"name","output_value":"names"}],"formatZH":"删除镜像仓库 [names]","formatEN":"delete image repo [names]"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"image_repos","output_column":"name","output_value":"name"}],"formatZH":"删除镜像仓库 [name]","formatEN":"delete image repo [name]"}
 func (b *BaseApi) DeleteRepo(c *gin.Context) {
-	var req dto.ImageRepoDelete
+	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	if err := imageRepoService.BatchDelete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := imageRepoService.Delete(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Container Image-repo
 // @Summary Update image repo
-// @Description 更新镜像仓库
 // @Accept json
 // @Param request body dto.ImageRepoUpdate true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"image_repos","output_column":"name","output_value":"name"}],"formatZH":"更新镜像仓库 [name]","formatEN":"update image repo information [name]"}
 func (b *BaseApi) UpdateRepo(c *gin.Context) {
@@ -136,8 +135,8 @@ func (b *BaseApi) UpdateRepo(c *gin.Context) {
 	}
 
 	if err := imageRepoService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/logs.go

@@ -0,0 +1,22 @@
+package v2
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Logs
+// @Summary Load system log files
+// @Success 200 {array} string
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /logs/system/files [get]
+func (b *BaseApi) GetSystemFiles(c *gin.Context) {
+	data, err := logService.ListSystemLogFile()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}

agent/app/api/v2/mcp_server.go

@@ -0,0 +1,166 @@
+package v2
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags McpServer
+// @Summary List mcp servers
+// @Accept json
+// @Param request body request.McpServerSearch true "request"
+// @Success 200 {object} response.McpServersRes
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/search [post]
+func (b *BaseApi) PageMcpServers(c *gin.Context) {
+	var req request.McpServerSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	list := mcpServerService.Page(req)
+	helper.SuccessWithData(c, list)
+}
+
+// @Tags McpServer
+// @Summary Create mcp server
+// @Accept json
+// @Param request body request.McpServerCreate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/server [post]
+func (b *BaseApi) CreateMcpServer(c *gin.Context) {
+	var req request.McpServerCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.Create(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Update mcp server
+// @Accept json
+// @Param request body request.McpServerUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/server/update [post]
+func (b *BaseApi) UpdateMcpServer(c *gin.Context) {
+	var req request.McpServerUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.Update(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Delete mcp server
+// @Accept json
+// @Param request body request.McpServerDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/server/del [post]
+func (b *BaseApi) DeleteMcpServer(c *gin.Context) {
+	var req request.McpServerDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.Delete(req.ID)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Operate mcp server
+// @Accept json
+// @Param request body request.McpServerOperate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/server/op [post]
+func (b *BaseApi) OperateMcpServer(c *gin.Context) {
+	var req request.McpServerOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.Operate(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Bind Domain for mcp server
+// @Accept json
+// @Param request body request.McpBindDomain true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/domain/bind [post]
+func (b *BaseApi) BindMcpDomain(c *gin.Context) {
+	var req request.McpBindDomain
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.BindDomain(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Update bind Domain for mcp server
+// @Accept json
+// @Param request body request.McpBindDomainUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/domain/update [post]
+func (b *BaseApi) UpdateMcpBindDomain(c *gin.Context) {
+	var req request.McpBindDomainUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := mcpServerService.UpdateBindDomain(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags McpServer
+// @Summary Get bin Domain for mcp server
+// @Accept json
+// @Success 200 {object} response.McpBindDomainRes
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /mcp/domain/get [get]
+func (b *BaseApi) GetMcpBindDomain(c *gin.Context) {
+	res, err := mcpServerService.GetBindDomain()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}

agent/app/api/v2/monitor.go

@@ -0,0 +1,107 @@
+package v2
+
+import (
+	"sort"
+
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/gin-gonic/gin"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/net"
+)
+
+// @Tags Monitor
+// @Summary Load monitor data
+// @Param request body dto.MonitorSearch true "request"
+// @Success 200 {array} dto.MonitorData
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/monitor/search [post]
+func (b *BaseApi) LoadMonitor(c *gin.Context) {
+	var req dto.MonitorSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := monitorService.LoadMonitorData(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Monitor
+// @Summary Clean monitor data
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/monitor/clean [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空监控数据","formatEN":"clean monitor datas"}
+func (b *BaseApi) CleanMonitor(c *gin.Context) {
+	if err := monitorService.CleanData(); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.Success(c)
+}
+
+// @Tags Monitor
+// @Summary Load monitor setting
+// @Success 200 {object} dto.MonitorSetting
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/monitor/setting [get]
+func (b *BaseApi) LoadMonitorSetting(c *gin.Context) {
+	setting, err := monitorService.LoadSetting()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, setting)
+}
+
+// @Tags Monitor
+// @Summary Update monitor setting
+// @Param request body dto.MonitorSettingUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/monitor/setting/update [post]
+// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改默认监控网卡 [name]-[value]","formatEN":"update default monitor [name]-[value]"}
+func (b *BaseApi) UpdateMonitorSetting(c *gin.Context) {
+	var req dto.MonitorSettingUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := monitorService.UpdateSetting(req.Key, req.Value); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.Success(c)
+}
+
+func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
+	netStat, _ := net.IOCounters(true)
+	var options []string
+	options = append(options, "all")
+	for _, net := range netStat {
+		options = append(options, net.Name)
+	}
+	sort.Strings(options)
+	helper.SuccessWithData(c, options)
+}
+
+func (b *BaseApi) GetIOOptions(c *gin.Context) {
+	diskStat, _ := disk.IOCounters()
+	var options []string
+	options = append(options, "all")
+	for _, net := range diskStat {
+		options = append(options, net.Name)
+	}
+	sort.Strings(options)
+	helper.SuccessWithData(c, options)
+}

agent/app/api/v2/nginx.go

@@ -1,22 +1,21 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags OpenResty
 // @Summary Load OpenResty conf
-// @Description 获取 OpenResty 配置信息
-// @Success 200 {object} response.FileInfo
+// @Success 200 {object} response.NginxFile
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty [get]
 func (b *BaseApi) GetNginx(c *gin.Context) {
 	fileInfo, err := nginxService.GetNginxConfig()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, fileInfo)
@@ -24,11 +23,11 @@ func (b *BaseApi) GetNginx(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Load partial OpenResty conf
-// @Description 获取部分 OpenResty 配置信息
 // @Accept json
 // @Param request body request.NginxScopeReq true "request"
 // @Success 200 {array} response.NginxParam
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/scope [post]
 func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 	var req request.NginxScopeReq
@@ -38,7 +37,7 @@ func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 
 	params, err := nginxService.GetConfigByScope(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, params)
@@ -46,11 +45,11 @@ func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Update OpenResty conf
-// @Description 更新 OpenResty 配置信息
 // @Accept json
 // @Param request body request.NginxConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/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":"更新 nginx 配置 [domain]","formatEN":"Update nginx conf [domain]"}
 func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
@@ -59,22 +58,22 @@ func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
 		return
 	}
 	if err := nginxService.UpdateConfigByScope(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags OpenResty
 // @Summary Load OpenResty status info
-// @Description 获取 OpenResty 状态信息
 // @Success 200 {object} response.NginxStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/status [get]
 func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 	res, err := nginxService.GetStatus()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -82,11 +81,11 @@ func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Update OpenResty conf by upload file
-// @Description 上传更新 OpenResty 配置文件
 // @Accept json
 // @Param request body request.NginxConfigFileUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/file [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 nginx 配置","formatEN":"Update nginx conf"}
 func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
@@ -96,23 +95,65 @@ func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
 	}
 
 	if err := nginxService.UpdateConfigFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags OpenResty
-// @Summary Clear OpenResty proxy cache
-// @Description 清理 OpenResty 代理缓存
+// @Summary Build OpenResty
+// @Accept json
+// @Param request body request.NginxBuildReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /openresty/clear [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理 Openresty 代理缓存","formatEN":"Clear nginx proxy cache"}
-func (b *BaseApi) ClearNginxProxyCache(c *gin.Context) {
-	if err := nginxService.ClearProxyCache(); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+// @Security Timestamp
+// @Router /openresty/build [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"构建 OpenResty","formatEN":"Build OpenResty"}
+func (b *BaseApi) BuildNginx(c *gin.Context) {
+	var req request.NginxBuildReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	helper.SuccessWithOutData(c)
+	if err := nginxService.Build(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags OpenResty
+// @Summary Update OpenResty module
+// @Accept json
+// @Param request body request.NginxModuleUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /openresty/module/update [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 OpenResty 模块","formatEN":"Update OpenResty module"}
+func (b *BaseApi) UpdateNginxModule(c *gin.Context) {
+	var req request.NginxModuleUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := nginxService.UpdateModule(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags OpenResty
+// @Summary Get OpenResty modules
+// @Success 200 {object} response.NginxBuildConfig
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /openresty/modules [get]
+func (b *BaseApi) GetNginxModules(c *gin.Context) {
+	modules, err := nginxService.GetModules()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, modules)
 }

agent/app/api/v2/php_extensions.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/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/gin-gonic/gin"
 )
 
 // @Tags PHP Extensions
 // @Summary Page Extensions
-// @Description Page Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsSearch true "request"
-// @Success 200 {array} response.PHPExtensionsDTO
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/search [post]
 func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsSearch
@@ -24,14 +23,17 @@ func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
 	if req.All {
 		list, err := phpExtensionsService.List()
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
-		helper.SuccessWithData(c, list)
+		helper.SuccessWithData(c, dto.PageResult{
+			Total: int64(len(list)),
+			Items: list,
+		})
 	} else {
 		total, list, err := phpExtensionsService.Page(req)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		helper.SuccessWithData(c, dto.PageResult{
@@ -44,11 +46,11 @@ func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
 
 // @Tags PHP Extensions
 // @Summary Create Extensions
-// @Description Create Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions [post]
 func (b *BaseApi) CreatePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsCreate
@@ -56,19 +58,19 @@ func (b *BaseApi) CreatePHPExtensions(c *gin.Context) {
 		return
 	}
 	if err := phpExtensionsService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags PHP Extensions
 // @Summary Update Extensions
-// @Description Update Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/update [post]
 func (b *BaseApi) UpdatePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsUpdate
@@ -76,19 +78,19 @@ func (b *BaseApi) UpdatePHPExtensions(c *gin.Context) {
 		return
 	}
 	if err := phpExtensionsService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags PHP Extensions
 // @Summary Delete Extensions
-// @Description Delete Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/del [post]
 func (b *BaseApi) DeletePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsDelete
@@ -96,8 +98,8 @@ func (b *BaseApi) DeletePHPExtensions(c *gin.Context) {
 		return
 	}
 	if err := phpExtensionsService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }

agent/app/api/v2/process.go

@@ -1,10 +1,9 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	websocket2 "github.com/1Panel-dev/1Panel/backend/utils/websocket"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
+	websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
 	"github.com/gin-gonic/gin"
 )
 
@@ -20,10 +19,10 @@ func (b *BaseApi) ProcessWs(c *gin.Context) {
 
 // @Tags Process
 // @Summary Stop Process
-// @Description 停止进程
 // @Param request body request.ProcessReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /process/stop [post]
 // @x-panel-log {"bodyKeys":["PID"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"结束进程 [PID]","formatEN":"结束进程 [PID]"}
 func (b *BaseApi) StopProcess(c *gin.Context) {
@@ -32,8 +31,8 @@ func (b *BaseApi) StopProcess(c *gin.Context) {
 		return
 	}
 	if err := processService.StopProcess(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }

agent/app/api/v2/recycle_bin.go

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

agent/app/api/v2/runtime.go

@@ -0,0 +1,557 @@
+package v2
+
+import (
+	"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/gin-gonic/gin"
+)
+
+// @Tags Runtime
+// @Summary List runtimes
+// @Accept json
+// @Param request body request.RuntimeSearch true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/search [post]
+func (b *BaseApi) SearchRuntimes(c *gin.Context) {
+	var req request.RuntimeSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, items, err := runtimeService.Page(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Total: total,
+		Items: items,
+	})
+}
+
+// @Tags Runtime
+// @Summary Create runtime
+// @Accept json
+// @Param request body request.RuntimeCreate true "request"
+// @Success 200 {object} model.Runtime
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建运行环境 [name]","formatEN":"Create runtime [name]"}
+func (b *BaseApi) CreateRuntime(c *gin.Context) {
+	var req request.RuntimeCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	ssl, err := runtimeService.Create(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, ssl)
+}
+
+// @Tags Website
+// @Summary Delete runtime
+// @Accept json
+// @Param request body request.RuntimeDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/del [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [name]","formatEN":"Delete runtime [name]"}
+func (b *BaseApi) DeleteRuntime(c *gin.Context) {
+	var req request.RuntimeDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.Delete(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Website
+// @Summary Delete runtime
+// @Accept json
+// @Success 200 {array} dto.AppResource
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /installed/delete/check/:id [get]
+func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
+	runTimeId, err := helper.GetIntParamByKey(c, "id")
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	checkData, err := runtimeService.DeleteCheck(runTimeId)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, checkData)
+}
+
+// @Tags Runtime
+// @Summary Update runtime
+// @Accept json
+// @Param request body request.RuntimeUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/update [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新运行环境 [name]","formatEN":"Update runtime [name]"}
+func (b *BaseApi) UpdateRuntime(c *gin.Context) {
+	var req request.RuntimeUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.Update(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get runtime
+// @Accept json
+// @Param id path string true "request"
+// @Success 200 {object} response.RuntimeDTO
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/:id [get]
+func (b *BaseApi) GetRuntime(c *gin.Context) {
+	id, err := helper.GetIntParamByKey(c, "id")
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	res, err := runtimeService.Get(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Runtime
+// @Summary Get Node package scripts
+// @Accept json
+// @Param request body request.NodePackageReq true "request"
+// @Success 200 {array} response.PackageScripts
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/node/package [post]
+func (b *BaseApi) GetNodePackageRunScript(c *gin.Context) {
+	var req request.NodePackageReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := runtimeService.GetNodePackageRunScript(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Runtime
+// @Summary Operate runtime
+// @Accept json
+// @Param request body request.RuntimeOperate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/operate [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作运行环境 [name]","formatEN":"Operate runtime [name]"}
+func (b *BaseApi) OperateRuntime(c *gin.Context) {
+	var req request.RuntimeOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.OperateRuntime(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get Node modules
+// @Accept json
+// @Param request body request.NodeModuleReq true "request"
+// @Success 200 {array} response.NodeModule
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/node/modules [post]
+func (b *BaseApi) GetNodeModules(c *gin.Context) {
+	var req request.NodeModuleReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := runtimeService.GetNodeModules(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Runtime
+// @Summary Operate Node modules
+// @Accept json
+// @Param request body request.NodeModuleReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/node/modules/operate [post]
+func (b *BaseApi) OperateNodeModules(c *gin.Context) {
+	var req request.NodeModuleOperateReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.OperateNodeModules(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Sync runtime status
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /runtimes/sync [post]
+func (b *BaseApi) SyncStatus(c *gin.Context) {
+	err := runtimeService.SyncRuntimeStatus()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get php runtime extension
+// @Accept json
+// @Param id path string true "request"
+// @Success 200 {object} response.PHPExtensionRes
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/:id/extensions [get]
+func (b *BaseApi) GetRuntimeExtension(c *gin.Context) {
+	id, err := helper.GetIntParamByKey(c, "id")
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	res, err := runtimeService.GetPHPExtensions(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Runtime
+// @Summary Install php extension
+// @Accept json
+// @Param request body request.PHPExtensionInstallReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/extensions/install [post]
+func (b *BaseApi) InstallPHPExtension(c *gin.Context) {
+	var req request.PHPExtensionInstallReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.InstallPHPExtension(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary UnInstall php extension
+// @Accept json
+// @Param request body request.PHPExtensionInstallReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/extensions/uninstall [post]
+func (b *BaseApi) UnInstallPHPExtension(c *gin.Context) {
+	var req request.PHPExtensionInstallReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.UnInstallPHPExtension(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Load php runtime conf
+// @Accept json
+// @Param id path integer true "request"
+// @Success 200 {object} response.PHPConfig
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/config/:id [get]
+func (b *BaseApi) GetPHPConfig(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	data, err := runtimeService.GetPHPConfig(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Runtime
+// @Summary Update runtime php conf
+// @Accept json
+// @Param request body request.PHPConfigUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/config [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain] PHP 配置修改","formatEN":"[domain] PHP conf update"}
+func (b *BaseApi) UpdatePHPConfig(c *gin.Context) {
+	var req request.PHPConfigUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.UpdatePHPConfig(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Update php conf file
+// @Accept json
+// @Param request body request.PHPFileUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/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":"php 配置修改 [domain]","formatEN":"Nginx conf update [domain]"}
+func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
+	var req request.PHPFileUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.UpdatePHPConfigFile(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get php conf file
+// @Accept json
+// @Param request body request.PHPFileReq true "request"
+// @Success 200 {object} response.FileInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/file [post]
+func (b *BaseApi) GetPHPConfigFile(c *gin.Context) {
+	var req request.PHPFileReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	data, err := runtimeService.GetPHPConfigFile(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Runtime
+// @Summary Update fpm config
+// @Accept json
+// @Param request body request.FPMConfig true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/fpm/config [post]
+func (b *BaseApi) UpdateFPMConfig(c *gin.Context) {
+	var req request.FPMConfig
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.UpdateFPMConfig(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get fpm config
+// @Accept json
+// @Param id path integer true "request"
+// @Success 200 {object} request.FPMConfig
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/fpm/config/:id [get]
+func (b *BaseApi) GetFPMConfig(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	data, err := runtimeService.GetFPMConfig(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Runtime
+// @Summary Get supervisor process
+// @Accept json
+// @Param id path integer true "request"
+// @Success 200 {array} response.SupervisorProcessConfig
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/supervisor/process/:id [get]
+func (b *BaseApi) GetSupervisorProcess(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	data, err := runtimeService.GetSupervisorProcess(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Runtime
+// @Summary Operate supervisor process
+// @Accept json
+// @Param request body request.PHPSupervisorProcessConfig true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/supervisor/process/operate [post]
+func (b *BaseApi) OperateSupervisorProcess(c *gin.Context) {
+	var req request.PHPSupervisorProcessConfig
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	err := runtimeService.OperateSupervisorProcess(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Operate supervisor process file
+// @Accept json
+// @Param request body request.PHPSupervisorProcessFileReq true "request"
+// @Success 200 {string} content
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/supervisor/process/file/operate [post]
+func (b *BaseApi) OperateSupervisorProcessFile(c *gin.Context) {
+	var req request.PHPSupervisorProcessFileReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := runtimeService.OperateSupervisorProcessFile(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
+}
+
+// @Tags Runtime
+// @Summary Update PHP container config
+// @Accept json
+// @Param request body request.PHPContainerUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/container/update [post]
+func (b *BaseApi) UpdatePHPContainer(c *gin.Context) {
+	var req request.PHPContainerConfig
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.UpdatePHPContainer(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags Runtime
+// @Summary Get PHP container config
+// @Accept json
+// @Param id path integer true "request"
+// @Success 200 {object} response.PHPContainerConfig
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/php/container/:id [get]
+func (b *BaseApi) GetPHPContainerConfig(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.BadRequest(c, err)
+		return
+	}
+	data, err := runtimeService.GetPHPContainerConfig(id)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Runtime
+// @Summary Update runtime remark
+// @Accept json
+// @Param request body request.RuntimeRemarkUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /runtimes/remark [post]
+func (b *BaseApi) UpdateRuntimeRemark(c *gin.Context) {
+	var req request.RuntimeRemark
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := runtimeService.UpdateRemark(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}

agent/app/api/v2/setting.go

@@ -0,0 +1,161 @@
+package v2
+
+import (
+	"encoding/json"
+	"os"
+	"os/user"
+	"path"
+
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/global"
+	"github.com/1Panel-dev/1Panel/agent/utils/ssh"
+	"github.com/gin-gonic/gin"
+	"github.com/pkg/errors"
+)
+
+// @Tags System Setting
+// @Summary Load system setting info
+// @Success 200 {object} dto.SettingInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/search [post]
+func (b *BaseApi) GetSettingInfo(c *gin.Context) {
+	setting, err := settingService.GetSettingInfo()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, setting)
+}
+
+// @Tags System Setting
+// @Summary Load system available status
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/search/available [get]
+func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
+	helper.Success(c)
+}
+
+// @Tags System Setting
+// @Summary Update system setting
+// @Accept json
+// @Param request body dto.SettingUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/update [post]
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统配置 [key] => [value]","formatEN":"update system setting [key] => [value]"}
+func (b *BaseApi) UpdateSetting(c *gin.Context) {
+	var req dto.SettingUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := settingService.Update(req.Key, req.Value); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
+// @Tags System Setting
+// @Summary Load local backup dir
+// @Success 200 {string} path
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/basedir [get]
+func (b *BaseApi) LoadBaseDir(c *gin.Context) {
+	helper.SuccessWithData(c, global.Dir.DataDir)
+}
+
+func (b *BaseApi) CheckLocalConn(c *gin.Context) {
+	_, err := loadLocalConn()
+	helper.SuccessWithData(c, err == nil)
+}
+
+// @Tags System Setting
+// @Summary Check local conn info
+// @Success 200 {bool} isOk
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/ssh/check/info [post]
+func (b *BaseApi) CheckLocalConnByInfo(c *gin.Context) {
+	var req dto.SSHConnData
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	helper.SuccessWithData(c, settingService.TestConnByInfo(req))
+}
+
+// @Tags System Setting
+// @Summary Save local conn info
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/ssh [post]
+func (b *BaseApi) SaveLocalConnInfo(c *gin.Context) {
+	var req dto.SSHConnData
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	helper.SuccessWithData(c, settingService.SaveConnInfo(req))
+}
+
+func loadLocalConn() (*ssh.SSHClient, error) {
+	itemPath := ""
+	currentInfo, _ := user.Current()
+	if len(currentInfo.HomeDir) == 0 {
+		itemPath = "/root/.ssh/id_ed25519_1panel"
+	} else {
+		itemPath = path.Join(currentInfo.HomeDir, ".ssh/id_ed25519_1panel")
+	}
+	if _, err := os.Stat(itemPath); err != nil {
+		_ = sshService.GenerateSSH(dto.GenerateSSH{EncryptionMode: "ed25519", Name: "_1panel"})
+	}
+
+	privateKey, _ := os.ReadFile(itemPath)
+	connWithKey := ssh.ConnInfo{
+		Addr:       "127.0.0.1",
+		User:       "root",
+		Port:       22,
+		AuthMode:   "key",
+		PrivateKey: privateKey,
+	}
+	client, err := ssh.NewClient(connWithKey)
+	if err == nil {
+		return client, nil
+	}
+
+	connInfoInDB, err := settingService.GetSSHInfo()
+	if err != nil {
+		return nil, err
+	}
+	if len(connInfoInDB) == 0 {
+		return nil, errors.New("no such ssh conn info in db!")
+	}
+	var connInDB ssh.ConnInfo
+	if err := json.Unmarshal([]byte(connInfoInDB), &connInDB); err != nil {
+		return nil, err
+	}
+	return ssh.NewClient(connInDB)
+}
+
+// @Tags System Setting
+// @Summary Load system setting by key
+// @Param key path string true "key"
+// @Success 200 {object} dto.SettingInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/get/{key} [get]
+func (b *BaseApi) GetSettingByKey(c *gin.Context) {
+	key := c.Param("key")
+	if len(key) == 0 {
+		helper.BadRequest(c, errors.New("key is empty"))
+		return
+	}
+	value := settingService.GetSettingByKey(key)
+	helper.SuccessWithData(c, value)
+}

agent/app/api/v2/snapshot.go

@@ -1,19 +1,33 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
+// @Tags System Setting
+// @Summary Load system snapshot data
+// @Success 200 {object} dto.SnapshotData
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/snapshot/load [get]
+func (b *BaseApi) LoadSnapshotData(c *gin.Context) {
+	data, err := snapshotService.LoadSnapshotData()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
 // @Tags System Setting
 // @Summary Create system snapshot
-// @Description 创建系统快照
 // @Accept json
 // @Param request body dto.SnapshotCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot [post]
 // @x-panel-log {"bodyKeys":["from", "description"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建系统快照 [description] 到 [from]","formatEN":"Create system backup [description] to [from]"}
 func (b *BaseApi) CreateSnapshot(c *gin.Context) {
@@ -22,20 +36,42 @@ func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 		return
 	}
 
-	if err := snapshotService.SnapshotCreate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	if err := snapshotService.SnapshotCreate(nil, req, 0, 0, 0); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
+}
+
+// @Tags System Setting
+// @Summary Recreate system snapshot
+// @Accept json
+// @Param request body dto.OperateByID true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/snapshot/recrete [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"重试创建快照 [name]","formatEN":"recrete the snapshot [name]"}
+func (b *BaseApi) RecreateSnapshot(c *gin.Context) {
+	var req dto.OperateByID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := snapshotService.SnapshotReCreate(req.ID); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
 }
 
 // @Tags System Setting
 // @Summary Import system snapshot
-// @Description 导入已有快照
 // @Accept json
 // @Param request body dto.SnapshotImport true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/import [post]
 // @x-panel-log {"bodyKeys":["from", "names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [from] 同步系统快照 [names]","formatEN":"Sync system snapshots [names] from [from]"}
 func (b *BaseApi) ImportSnapshot(c *gin.Context) {
@@ -45,41 +81,19 @@ func (b *BaseApi) ImportSnapshot(c *gin.Context) {
 	}
 
 	if err := snapshotService.SnapshotImport(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags System Setting
-// @Summary Load Snapshot status
-// @Description 获取快照状态
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/snapshot/status [post]
-func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := snapshotService.LoadSnapShotStatus(req.ID)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
+	helper.Success(c)
 }
 
 // @Tags System Setting
 // @Summary Update snapshot description
-// @Description 更新快照描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/description/update [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"快照 [name] 描述信息修改 [description]","formatEN":"The description of the snapshot [name] is modified => [description]"}
 func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
@@ -89,19 +103,19 @@ func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
 	}
 
 	if err := snapshotService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Setting
 // @Summary Page system snapshot
-// @Description 获取系统快照列表分页
 // @Accept json
 // @Param request body dto.PageSnapshot true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/search [post]
 func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 	var req dto.PageSnapshot
@@ -111,7 +125,7 @@ func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 
 	total, accounts, err := snapshotService.SearchWithPage(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -120,35 +134,13 @@ func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 	})
 }
 
-// @Tags System Setting
-// @Summary Load system snapshot size
-// @Description 获取系统快照大小
-// @Accept json
-// @Param request body dto.PageSnapshot true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/snapshot/size [post]
-func (b *BaseApi) LoadSnapshotSize(c *gin.Context) {
-	var req dto.PageSnapshot
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := snapshotService.LoadSize(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags System Setting
 // @Summary Recover system backup
-// @Description 从系统快照恢复
 // @Accept json
 // @Param request body dto.SnapshotRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/recover [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 恢复","formatEN":"Recover from system backup [name]"}
 func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
@@ -158,19 +150,19 @@ func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
 	}
 
 	if err := snapshotService.SnapshotRecover(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Setting
 // @Summary Rollback system backup
-// @Description 从系统快照回滚
 // @Accept json
 // @Param request body dto.SnapshotRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/rollback [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 回滚","formatEN":"Rollback from system backup [name]"}
 func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
@@ -180,19 +172,19 @@ func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
 	}
 
 	if err := snapshotService.SnapshotRollback(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags System Setting
 // @Summary Delete system backup
-// @Description 删除系统快照
 // @Accept json
 // @Param request body dto.SnapshotBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"删除系统快照 [name]","formatEN":"Delete system backup [name]"}
 func (b *BaseApi) DeleteSnapshot(c *gin.Context) {
@@ -202,8 +194,8 @@ func (b *BaseApi) DeleteSnapshot(c *gin.Context) {
 	}
 
 	if err := snapshotService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/ssh.go

@@ -1,22 +1,21 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/gin-gonic/gin"
 )
 
 // @Tags SSH
 // @Summary Load host SSH setting info
-// @Description 加载 SSH 配置信息
 // @Success 200 {object} dto.SSHInfo
 // @Security ApiKeyAuth
-// @Router /host/ssh/search [post]
+// @Security Timestamp
+// @Router /hosts/ssh/search [post]
 func (b *BaseApi) GetSSHInfo(c *gin.Context) {
 	info, err := sshService.GetSSHInfo()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, info)
@@ -24,11 +23,12 @@ func (b *BaseApi) GetSSHInfo(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Operate SSH
-// @Description 修改 SSH 服务状态
 // @Accept json
 // @Param request body dto.Operate true "request"
+// @Success 200
 // @Security ApiKeyAuth
-// @Router /host/ssh/operate [post]
+// @Security Timestamp
+// @Router /hosts/ssh/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] SSH ","formatEN":"[operation] SSH"}
 func (b *BaseApi) OperateSSH(c *gin.Context) {
 	var req dto.Operate
@@ -37,20 +37,20 @@ func (b *BaseApi) OperateSSH(c *gin.Context) {
 	}
 
 	if err := sshService.OperateSSH(req.Operation); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags SSH
 // @Summary Update host SSH setting
-// @Description 更新 SSH 配置
 // @Accept json
 // @Param request body dto.SSHUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/ssh/update [post]
+// @Security Timestamp
+// @Router /hosts/ssh/update [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [value]","formatEN":"update SSH setting [key] => [value]"}
 func (b *BaseApi) UpdateSSH(c *gin.Context) {
 	var req dto.SSHUpdate
@@ -59,20 +59,20 @@ func (b *BaseApi) UpdateSSH(c *gin.Context) {
 	}
 
 	if err := sshService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags SSH
 // @Summary Update host SSH setting by file
-// @Description 上传文件更新 SSH 配置
 // @Accept json
 // @Param request body dto.SSHConf true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/conffile/update [post]
+// @Security Timestamp
+// @Router /hosts/conffile/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件","formatEN":"update SSH conf"}
 func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
 	var req dto.SSHConf
@@ -81,20 +81,20 @@ func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
 	}
 
 	if err := sshService.UpdateByFile(req.File); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags SSH
 // @Summary Generate host SSH secret
-// @Description 生成 SSH 密钥
 // @Accept json
 // @Param request body dto.GenerateSSH true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /host/ssh/generate [post]
+// @Security Timestamp
+// @Router /hosts/ssh/generate [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 SSH 密钥 ","formatEN":"generate SSH secret"}
 func (b *BaseApi) GenerateSSH(c *gin.Context) {
 	var req dto.GenerateSSH
@@ -103,20 +103,20 @@ func (b *BaseApi) GenerateSSH(c *gin.Context) {
 	}
 
 	if err := sshService.GenerateSSH(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags SSH
 // @Summary Load host SSH secret
-// @Description 获取 SSH 密钥
 // @Accept json
 // @Param request body dto.GenerateLoad true "request"
-// @Success 200
+// @Success 200 {string} secret
 // @Security ApiKeyAuth
-// @Router /host/ssh/secret [post]
+// @Security Timestamp
+// @Router /hosts/ssh/secret [post]
 func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 	var req dto.GenerateLoad
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -125,7 +125,7 @@ func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 
 	data, err := sshService.LoadSSHSecret(req.EncryptionMode)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)
@@ -133,21 +133,21 @@ func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Load host SSH logs
-// @Description 获取 SSH 登录日志
 // @Accept json
 // @Param request body dto.SearchSSHLog true "request"
 // @Success 200 {object} dto.SSHLog
 // @Security ApiKeyAuth
-// @Router /host/ssh/log [post]
+// @Security Timestamp
+// @Router /hosts/ssh/log [post]
 func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 	var req dto.SearchSSHLog
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	data, err := sshService.LoadLog(req)
+	data, err := sshService.LoadLog(c, req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)
@@ -155,14 +155,14 @@ func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Load host SSH conf
-// @Description 获取 SSH 配置文件
-// @Success 200
+// @Success 200 {string} conf
 // @Security ApiKeyAuth
-// @Router /host/ssh/conf [get]
+// @Security Timestamp
+// @Router /hosts/ssh/conf [get]
 func (b *BaseApi) LoadSSHConf(c *gin.Context) {
 	data, err := sshService.LoadSSHConf()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, data)

agent/app/api/v2/task.go

@@ -0,0 +1,46 @@
+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 TaskLog
+// @Summary Page task logs
+// @Accept json
+// @Param request body dto.SearchTaskLogReq true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /logs/tasks/search [post]
+func (b *BaseApi) PageTasks(c *gin.Context) {
+	var req dto.SearchTaskLogReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	total, list, err := taskService.Page(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags TaskLog
+// @Summary Get the number of executing tasks
+// @Success 200 {object} int64
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /logs/tasks/executing/count [get]
+func (b *BaseApi) CountExecutingTasks(c *gin.Context) {
+	count, err := taskService.CountExecutingTask()
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, count)
+}

agent/app/api/v2/terminal.go

@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"encoding/base64"
@@ -9,18 +9,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
-	"github.com/1Panel-dev/1Panel/backend/utils/copier"
-	"github.com/1Panel-dev/1Panel/backend/utils/ssh"
-	"github.com/1Panel-dev/1Panel/backend/utils/terminal"
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/global"
+	"github.com/1Panel-dev/1Panel/agent/utils/cmd"
+	"github.com/1Panel-dev/1Panel/agent/utils/terminal"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 )
 
-func (b *BaseApi) WsSsh(c *gin.Context) {
+func (b *BaseApi) WsSSH(c *gin.Context) {
 	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		global.LOG.Errorf("gin context http handler failed, err: %v", err)
@@ -28,60 +26,7 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
 	}
 	defer wsConn.Close()
 
-	id, err := strconv.Atoi(c.Query("id"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param id in request")) {
-		return
-	}
-	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
-		return
-	}
-	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
-		return
-	}
-	host, err := hostService.GetHostInfo(uint(id))
-	if wshandleError(wsConn, errors.WithMessage(err, "load host info by id failed")) {
-		return
-	}
-	var connInfo ssh.ConnInfo
-	_ = copier.Copy(&connInfo, &host)
-	connInfo.PrivateKey = []byte(host.PrivateKey)
-	if len(host.PassPhrase) != 0 {
-		connInfo.PassPhrase = []byte(host.PassPhrase)
-	}
-
-	client, err := connInfo.NewClient()
-	if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) {
-		return
-	}
-	defer client.Close()
-	sws, err := terminal.NewLogicSshWsSession(cols, rows, true, connInfo.Client, wsConn)
-	if wshandleError(wsConn, err) {
-		return
-	}
-	defer sws.Close()
-
-	quitChan := make(chan bool, 3)
-	sws.Start(quitChan)
-	go sws.Wait(quitChan)
-
-	<-quitChan
-
-	if wshandleError(wsConn, err) {
-		return
-	}
-}
-
-func (b *BaseApi) RedisWsSsh(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
-	}
-	defer wsConn.Close()
-
-	if global.CONF.System.IsDemo {
+	if global.CONF.Base.IsDemo {
 		if wshandleError(wsConn, errors.New("   demo server, prohibit this operation!")) {
 			return
 		}
@@ -95,38 +40,75 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
 		return
 	}
-	name := c.Query("name")
-	from := c.Query("from")
-	commands := []string{"redis-cli"}
-	database, err := databaseService.Get(name)
-	if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
+
+	client, err := loadLocalConn()
+	if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) {
 		return
 	}
-	if from == "local" {
-		redisInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: name, Type: "redis"})
-		if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
-			return
-		}
-		name = redisInfo.ContainerName
-		if len(database.Password) != 0 {
-			commands = []string{"redis-cli", "-a", database.Password, "--no-auth-warning"}
-		}
-	} else {
-		itemPort := fmt.Sprintf("%v", database.Port)
-		commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort}
-		if len(database.Password) != 0 {
-			commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort, "-a", database.Password, "--no-auth-warning"}
-		}
-		name = "1Panel-redis-cli-tools"
-	}
-
-	pidMap := loadMapFromDockerTop(name)
-	itemCmds := append([]string{"exec", "-it", name}, commands...)
-	slave, err := terminal.NewCommand(itemCmds)
+	defer client.Close()
+	command := c.DefaultQuery("command", "")
+	sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, command)
 	if wshandleError(wsConn, err) {
 		return
 	}
-	defer killBash(name, strings.Join(commands, " "), pidMap)
+	defer sws.Close()
+
+	quitChan := make(chan bool, 3)
+	sws.Start(quitChan)
+	go sws.Wait(quitChan)
+
+	<-quitChan
+
+	dt := time.Now().Add(time.Second)
+	_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
+}
+
+func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
+	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
+	if err != nil {
+		global.LOG.Errorf("gin context http handler failed, err: %v", err)
+		return
+	}
+	defer wsConn.Close()
+
+	if global.CONF.Base.IsDemo {
+		if wshandleError(wsConn, errors.New("   demo server, prohibit this operation!")) {
+			return
+		}
+	}
+
+	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
+	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
+		return
+	}
+	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
+	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
+		return
+	}
+	source := c.Query("source")
+	var containerID string
+	var initCmd []string
+	switch source {
+	case "redis", "redis-cluster":
+		containerID, initCmd, err = loadRedisInitCmd(c, source)
+	case "ollama":
+		containerID, initCmd, err = loadOllamaInitCmd(c)
+	case "container":
+		containerID, initCmd, err = loadContainerInitCmd(c)
+	default:
+		if wshandleError(wsConn, fmt.Errorf("not support such source %s", source)) {
+			return
+		}
+	}
+	if wshandleError(wsConn, err) {
+		return
+	}
+	pidMap := loadMapFromDockerTop(containerID)
+	slave, err := terminal.NewCommand("docker", initCmd...)
+	if wshandleError(wsConn, err) {
+		return
+	}
+	defer killBash(containerID, strings.ReplaceAll(strings.Join(initCmd, " "), fmt.Sprintf("exec -it %s ", containerID), ""), pidMap)
 	defer slave.Close()
 
 	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
@@ -141,83 +123,67 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 	<-quitChan
 
 	global.LOG.Info("websocket finished")
-	if wshandleError(wsConn, err) {
-		return
-	}
+	dt := time.Now().Add(time.Second)
+	_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
 }
 
-func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
+func loadRedisInitCmd(c *gin.Context, redisType string) (string, []string, error) {
+	name := c.Query("name")
+	from := c.Query("from")
+	commands := []string{"exec", "-it"}
+	database, err := databaseService.Get(name)
 	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
+		return "", nil, fmt.Errorf("no such database in db, err: %v", err)
 	}
-	defer wsConn.Close()
-
-	if global.CONF.System.IsDemo {
-		if wshandleError(wsConn, errors.New("   demo server, prohibit this operation!")) {
-			return
+	if from == "local" {
+		redisInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: name, Type: redisType})
+		if err != nil {
+			return "", nil, fmt.Errorf("no such app in db, err: %v", err)
+		}
+		name = redisInfo.ContainerName
+		commands = append(commands, []string{name, "redis-cli"}...)
+		if len(database.Password) != 0 {
+			commands = append(commands, []string{"-a", database.Password, "--no-auth-warning"}...)
+		}
+	} else {
+		name = "1Panel-redis-cli-tools"
+		commands = append(commands, []string{name, "redis-cli", "-h", database.Address, "-p", fmt.Sprintf("%v", database.Port)}...)
+		if len(database.Password) != 0 {
+			commands = append(commands, []string{"-a", database.Password, "--no-auth-warning"}...)
 		}
 	}
+	return name, commands, nil
+}
 
+func loadOllamaInitCmd(c *gin.Context) (string, []string, error) {
+	name := c.Query("name")
+	if cmd.CheckIllegal(name) {
+		return "", nil, fmt.Errorf("ollama model %s contains illegal characters", name)
+	}
+	ollamaInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: "", Type: "ollama"})
+	if err != nil {
+		return "", nil, fmt.Errorf("no such app in db, err: %v", err)
+	}
+	containerName := ollamaInfo.ContainerName
+	return containerName, []string{"exec", "-it", containerName, "ollama", "run", name}, nil
+}
+
+func loadContainerInitCmd(c *gin.Context) (string, []string, error) {
 	containerID := c.Query("containerid")
 	command := c.Query("command")
 	user := c.Query("user")
-	if len(command) == 0 || len(containerID) == 0 {
-		if wshandleError(wsConn, errors.New("error param of command or containerID")) {
-			return
-		}
-	}
-	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
-		return
-	}
-	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
-		return
-	}
-
-	cmds := []string{"exec", containerID, command}
-	if len(user) != 0 {
-		cmds = []string{"exec", "-u", user, containerID, command}
-	}
 	if cmd.CheckIllegal(user, containerID, command) {
-		if wshandleError(wsConn, errors.New("  The command contains illegal characters.")) {
-			return
-		}
+		return "", nil, fmt.Errorf("the command contains illegal characters. command: %s, user: %s, containerID: %s", command, user, containerID)
 	}
-	stdout, err := cmd.ExecWithCheck("docker", cmds...)
-	if wshandleError(wsConn, errors.WithMessage(err, stdout)) {
-		return
+	if len(command) == 0 || len(containerID) == 0 {
+		return "", nil, fmt.Errorf("error param of command: %s or containerID: %s", command, containerID)
 	}
-
 	commands := []string{"exec", "-it", containerID, command}
 	if len(user) != 0 {
 		commands = []string{"exec", "-it", "-u", user, containerID, command}
 	}
-	pidMap := loadMapFromDockerTop(containerID)
-	slave, err := terminal.NewCommand(commands)
-	if wshandleError(wsConn, err) {
-		return
-	}
-	defer killBash(containerID, command, pidMap)
-	defer slave.Close()
 
-	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true)
-	if wshandleError(wsConn, err) {
-		return
-	}
-
-	quitChan := make(chan bool, 3)
-	tty.Start(quitChan)
-	go slave.Wait(quitChan)
-
-	<-quitChan
-
-	global.LOG.Info("websocket finished")
-	if wshandleError(wsConn, err) {
-		return
-	}
+	return containerID, commands, nil
 }
 
 func wshandleError(ws *websocket.Conn, err error) bool {
@@ -244,7 +210,7 @@ func loadMapFromDockerTop(containerID string) map[string]string {
 	pidMap := make(map[string]string)
 	sudo := cmd.SudoHandleCmd()
 
-	stdout, err := cmd.Execf("%s docker top %s -eo pid,command ", sudo, containerID)
+	stdout, err := cmd.RunDefaultWithStdoutBashCf("%s docker top %s -eo pid,command ", sudo, containerID)
 	if err != nil {
 		return pidMap
 	}
@@ -271,7 +237,7 @@ func killBash(containerID, comm string, pidMap map[string]string) {
 			}
 		}
 		if !isOld && command == comm {
-			_, _ = cmd.Execf("%s kill -9 %s", sudo, pid)
+			_, _ = cmd.RunDefaultWithStdoutBashCf("%s kill -9 %s", sudo, pid)
 		}
 	}
 }

agent/app/api/v2/website_acme_account.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/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/gin-gonic/gin"
 )
 
 // @Tags Website Acme
 // @Summary Page website acme accounts
-// @Description 获取网站 acme 列表分页
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme/search [post]
 func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 	var req dto.PageInfo
@@ -23,7 +22,7 @@ func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 	}
 	total, accounts, err := websiteAcmeAccountService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -34,11 +33,11 @@ func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 
 // @Tags Website Acme
 // @Summary Create website acme account
-// @Description 创建网站 acme
 // @Accept json
 // @Param request body request.WebsiteAcmeAccountCreate true "request"
 // @Success 200 {object} response.WebsiteAcmeAccountDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme [post]
 // @x-panel-log {"bodyKeys":["email"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 acme [email]","formatEN":"Create website acme [email]"}
 func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
@@ -48,7 +47,7 @@ func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
 	}
 	res, err := websiteAcmeAccountService.Create(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -56,11 +55,11 @@ func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
 
 // @Tags Website Acme
 // @Summary Delete website acme account
-// @Description 删除网站 acme
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_acme_accounts","output_column":"email","output_value":"email"}],"formatZH":"删除网站 acme [email]","formatEN":"Delete website acme [email]"}
 func (b *BaseApi) DeleteWebsiteAcmeAccount(c *gin.Context) {
@@ -69,8 +68,30 @@ func (b *BaseApi) DeleteWebsiteAcmeAccount(c *gin.Context) {
 		return
 	}
 	if err := websiteAcmeAccountService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
+}
+
+// @Tags Website Acme
+// @Summary Update website acme account
+// @Accept json
+// @Param request body request.WebsiteAcmeAccountUpdate true "request"
+// @Success 200 {object} response.WebsiteAcmeAccountDTO
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /websites/acme/update [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_acme_accounts","output_column":"email","output_value":"email"}],"formatZH":"更新 acme [email]","formatEN":"Update acme [email]"}
+func (b *BaseApi) UpdateWebsiteAcmeAccount(c *gin.Context) {
+	var req request.WebsiteAcmeAccountUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	res, err := websiteAcmeAccountService.Update(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.SuccessWithData(c, res)
 }

agent/app/api/v2/website_ca.go

@@ -1,23 +1,23 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"net/url"
 	"strconv"
+
+	"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/gin-gonic/gin"
 )
 
 // @Tags Website CA
 // @Summary Page website ca
-// @Description 获取网站 ca 列表分页
 // @Accept json
 // @Param request body request.WebsiteCASearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/search [post]
 func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
 	var req request.WebsiteCASearch
@@ -26,7 +26,7 @@ func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
 	}
 	total, cas, err := websiteCAService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -37,11 +37,11 @@ func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Create website ca
-// @Description 创建网站 ca
 // @Accept json
 // @Param request body request.WebsiteCACreate true "request"
 // @Success 200 {object} request.WebsiteCACreate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ca [name]","formatEN":"Create website ca [name]"}
 func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
@@ -51,7 +51,7 @@ func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
 	}
 	res, err := websiteCAService.Create(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -59,11 +59,11 @@ func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Get website ca
-// @Description 获取网站 ca
 // @Accept json
 // @Param id path int true "id"
 // @Success 200 {object} response.WebsiteCADTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/{id} [get]
 func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -72,7 +72,7 @@ func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
 	}
 	res, err := websiteCAService.GetCA(id)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -80,11 +80,11 @@ func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Delete website ca
-// @Description 删除网站 ca
 // @Accept json
 // @Param request body request.WebsiteCommonReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"删除网站 ca [name]","formatEN":"Delete website ca [name]"}
 func (b *BaseApi) DeleteWebsiteCA(c *gin.Context) {
@@ -93,19 +93,19 @@ func (b *BaseApi) DeleteWebsiteCA(c *gin.Context) {
 		return
 	}
 	if err := websiteCAService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Website CA
 // @Summary Obtain SSL
-// @Description 自签 SSL 证书
 // @Accept json
 // @Param request body request.WebsiteCAObtain true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/obtain [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
 func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) {
@@ -113,20 +113,21 @@ func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if _, err := websiteCAService.ObtainSSL(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	res, err := websiteCAService.ObtainSSL(req)
+	if err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.SuccessWithData(c, res)
 }
 
 // @Tags Website CA
 // @Summary Obtain SSL
-// @Description 续签 SSL 证书
 // @Accept json
 // @Param request body request.WebsiteCAObtain true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/renew [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
 func (b *BaseApi) RenewWebsiteCA(c *gin.Context) {
@@ -140,19 +141,19 @@ func (b *BaseApi) RenewWebsiteCA(c *gin.Context) {
 		Unit:  "year",
 		Time:  1,
 	}); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Website CA
 // @Summary Download CA file
-// @Description 下载 CA 证书文件
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router  /websites/ca/download [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"下载 CA 证书文件 [name]","formatEN":"download ca file [name]"}
 func (b *BaseApi) DownloadCAFile(c *gin.Context) {
@@ -162,13 +163,13 @@ func (b *BaseApi) DownloadCAFile(c *gin.Context) {
 	}
 	file, err := websiteCAService.DownloadFile(req.ID)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	defer file.Close()
 	info, err := file.Stat()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))

agent/app/api/v2/website_dns_account.go

@@ -1,20 +1,19 @@
-package v1
+package v2
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/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/gin-gonic/gin"
 )
 
 // @Tags Website DNS
 // @Summary Page website dns accounts
-// @Description 获取网站 dns 列表分页
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/search [post]
 func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 	var req dto.PageInfo
@@ -23,7 +22,7 @@ func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 	}
 	total, accounts, err := websiteDnsAccountService.Page(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, dto.PageResult{
@@ -34,11 +33,11 @@ func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 
 // @Tags Website DNS
 // @Summary Create website dns account
-// @Description 创建网站 dns
 // @Accept json
 // @Param request body request.WebsiteDnsAccountCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 dns [name]","formatEN":"Create website dns [name]"}
 func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
@@ -47,19 +46,19 @@ func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
 		return
 	}
 	if _, err := websiteDnsAccountService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Website DNS
 // @Summary Update website dns account
-// @Description 更新网站 dns
 // @Accept json
 // @Param request body request.WebsiteDnsAccountUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站 dns [name]","formatEN":"Update website dns [name]"}
 func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
@@ -68,19 +67,19 @@ func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
 		return
 	}
 	if _, err := websiteDnsAccountService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Website DNS
 // @Summary Delete website dns account
-// @Description 删除网站 dns
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_dns_accounts","output_column":"name","output_value":"name"}],"formatZH":"删除网站 dns [name]","formatEN":"Delete website dns [name]"}
 func (b *BaseApi) DeleteWebsiteDnsAccount(c *gin.Context) {
@@ -89,8 +88,8 @@ func (b *BaseApi) DeleteWebsiteDnsAccount(c *gin.Context) {
 		return
 	}
 	if err := websiteDnsAccountService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }

agent/app/api/v2/website_domain.go

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

agent/app/api/v2/website_ssl.go

@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"net/http"
@@ -6,20 +6,19 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/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/gin-gonic/gin"
 )
 
 // @Tags Website SSL
 // @Summary Page website ssl
-// @Description 获取网站 ssl 列表分页
 // @Accept json
 // @Param request body request.WebsiteSSLSearch true "request"
-// @Success 200
+// @Success 200 {array} response.WebsiteSSLDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/search [post]
 func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLSearch
@@ -29,7 +28,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {
 		total, accounts, err := websiteSSLService.Page(req)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		helper.SuccessWithData(c, dto.PageResult{
@@ -39,7 +38,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	} else {
 		list, err := websiteSSLService.Search(req)
 		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			helper.InternalServer(c, err)
 			return
 		}
 		helper.SuccessWithData(c, list)
@@ -48,11 +47,11 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Create website ssl
-// @Description 创建网站 ssl
 // @Accept json
 // @Param request body request.WebsiteSSLCreate true "request"
 // @Success 200 {object} request.WebsiteSSLCreate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl [post]
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ssl [primaryDomain]","formatEN":"Create website ssl [primaryDomain]"}
 func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
@@ -62,7 +61,7 @@ func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 	}
 	res, err := websiteSSLService.Create(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -70,11 +69,11 @@ func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Apply  ssl
-// @Description 申请证书
 // @Accept json
 // @Param request body request.WebsiteSSLApply true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/obtain [post]
 // @x-panel-log {"bodyKeys":["ID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ID","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"申请证书  [domain]","formatEN":"apply ssl [domain]"}
 func (b *BaseApi) ApplyWebsiteSSL(c *gin.Context) {
@@ -83,19 +82,19 @@ func (b *BaseApi) ApplyWebsiteSSL(c *gin.Context) {
 		return
 	}
 	if err := websiteSSLService.ObtainSSL(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.Success(c)
 }
 
 // @Tags Website SSL
 // @Summary Resolve website ssl
-// @Description 解析网站 ssl
 // @Accept json
 // @Param request body request.WebsiteDNSReq true "request"
 // @Success 200 {array} response.WebsiteDNSRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/resolve [post]
 func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 	var req request.WebsiteDNSReq
@@ -104,7 +103,7 @@ func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 	}
 	res, err := websiteSSLService.GetDNSResolve(req)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, res)
@@ -112,11 +111,11 @@ func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Delete website ssl
-// @Description 删除网站 ssl
 // @Accept json
 // @Param request body request.WebsiteBatchDelReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除 ssl [domain]","formatEN":"Delete ssl [domain]"}
 func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
@@ -125,29 +124,29 @@ func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
 		return
 	}
 	if err := websiteSSLService.Delete(req.IDs); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Website SSL
 // @Summary Search website ssl by website id
-// @Description 通过网站 id 查询 ssl
 // @Accept json
 // @Param websiteId path integer true "request"
-// @Success 200
+// @Success 200 {object} response.WebsiteSSLDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/website/:websiteId [get]
 func (b *BaseApi) GetWebsiteSSLByWebsiteId(c *gin.Context) {
 	websiteId, err := helper.GetIntParamByKey(c, "websiteId")
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	websiteSSL, err := websiteSSLService.GetWebsiteSSL(websiteId)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, websiteSSL)
@@ -155,21 +154,21 @@ func (b *BaseApi) GetWebsiteSSLByWebsiteId(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Search website ssl by id
-// @Description 通过 id 查询 ssl
 // @Accept json
 // @Param id path integer true "request"
-// @Success 200
+// @Success 200 {object} response.WebsiteSSLDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/:id [get]
 func (b *BaseApi) GetWebsiteSSLById(c *gin.Context) {
 	id, err := helper.GetParamID(c)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		helper.BadRequest(c, err)
 		return
 	}
 	websiteSSL, err := websiteSSLService.GetSSL(id)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.SuccessWithData(c, websiteSSL)
@@ -177,11 +176,11 @@ func (b *BaseApi) GetWebsiteSSLById(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Update ssl
-// @Description 更新 ssl
 // @Accept json
 // @Param request body request.WebsiteSSLUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新证书设置 [domain]","formatEN":"Update ssl config [domain]"}
 func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
@@ -190,19 +189,19 @@ func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
 		return
 	}
 	if err := websiteSSLService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Website SSL
 // @Summary Upload ssl
-// @Description 上传 ssl
 // @Accept json
 // @Param request body request.WebsiteSSLUpload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/upload [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传 ssl [type]","formatEN":"Upload ssl [type]"}
 func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
@@ -211,19 +210,19 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 		return
 	}
 	if err := websiteSSLService.Upload(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, nil)
+	helper.Success(c)
 }
 
 // @Tags Website SSL
 // @Summary Download SSL  file
-// @Description 下载证书文件
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router  /websites/ssl/download [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"下载证书文件 [domain]","formatEN":"download ssl file [domain]"}
 func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
@@ -233,13 +232,13 @@ func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
 	}
 	file, err := websiteSSLService.DownloadFile(req.ID)
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	defer file.Close()
 	info, err := file.Stat()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.InternalServer(c, err)
 		return
 	}
 	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))

agent/app/dto/ai.go

@@ -0,0 +1,46 @@
+package dto
+
+import "time"
+
+type OllamaModelInfo struct {
+	ID           uint   `json:"id"`
+	Name         string `json:"name"`
+	Size         string `json:"size"`
+	From         string `json:"from"`
+	LogFileExist bool   `json:"logFileExist"`
+
+	Status    string    `json:"status"`
+	Message   string    `json:"message"`
+	CreatedAt time.Time `json:"createdAt"`
+}
+
+type OllamaModelDropList struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+type OllamaModelName struct {
+	Name   string `json:"name"`
+	TaskID string `json:"taskID"`
+}
+
+type OllamaBindDomain struct {
+	Domain       string `json:"domain" validate:"required"`
+	AppInstallID uint   `json:"appInstallID" validate:"required"`
+	SSLID        uint   `json:"sslID"`
+	WebsiteID    uint   `json:"websiteID"`
+	IPList       string `json:"ipList"`
+}
+
+type OllamaBindDomainReq struct {
+	AppInstallID uint `json:"appInstallID" validate:"required"`
+}
+
+type OllamaBindDomainRes struct {
+	Domain        string   `json:"domain"`
+	SSLID         uint     `json:"sslID"`
+	AllowIPs      []string `json:"allowIPs"`
+	WebsiteID     uint     `json:"websiteID"`
+	ConnUrl       string   `json:"connUrl"`
+	AcmeAccountID uint     `json:"acmeAccountID"`
+}

agent/app/dto/alert.go

@@ -0,0 +1,327 @@
+package dto
+
+import (
+	"encoding/json"
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"time"
+)
+
+type CreateOrUpdateAlert struct {
+	AlertTitle  string `json:"alertTitle"`
+	AlertType   string `json:"alertType"`
+	AlertMethod string `json:"alertMethod"`
+	AlertCount  uint   `json:"alertCount"`
+	EntryID     uint   `json:"entryID"`
+}
+
+type AlertBase struct {
+	AlertType string `json:"alertType"`
+	EntryID   uint   `json:"entryID"`
+}
+
+type PushAlert struct {
+	TaskName  string `json:"taskName"`
+	AlertType string `json:"alertType"`
+	EntryID   uint   `json:"entryID"`
+	Param     string `json:"param"`
+}
+
+type AlertSearch struct {
+	PageInfo
+	OrderBy string `json:"orderBy" validate:"required,oneof=created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+	Type    string `json:"type"`
+	Status  string `json:"status"`
+	Method  string `json:"method"`
+}
+
+type AlertDTO struct {
+	ID        uint      `json:"id"`
+	Type      string    `json:"type"`
+	Cycle     uint      `json:"cycle"`
+	Count     uint      `json:"count"`
+	Method    string    `json:"method"`
+	Title     string    `json:"title"`
+	Project   string    `json:"project"`
+	Status    string    `json:"status"`
+	SendCount uint      `json:"sendCount"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+}
+
+type AlertCreate struct {
+	Type      string `json:"type" validate:"required"`
+	Cycle     uint   `json:"cycle"`
+	Count     uint   `json:"count"`
+	Method    string `json:"method" validate:"required"`
+	Title     string `json:"title"`
+	Project   string `json:"project"`
+	Status    string `json:"status"`
+	SendCount uint   `json:"sendCount"`
+}
+
+type AlertUpdate struct {
+	ID        uint   `json:"id" validate:"required"`
+	Type      string `json:"type"`
+	Cycle     uint   `json:"cycle"`
+	Count     uint   `json:"count"`
+	Method    string `json:"method"`
+	Title     string `json:"title"`
+	Project   string `json:"project"`
+	Status    string `json:"status"`
+	SendCount uint   `json:"sendCount"`
+}
+
+type DeleteRequest struct {
+	ID uint `json:"id" validate:"required"`
+}
+
+type AlertUpdateStatus struct {
+	ID     uint   `json:"id" validate:"required"`
+	Status string `json:"status" validate:"required"`
+}
+
+type DiskDTO struct {
+	Path        string  `json:"path"`
+	Type        string  `json:"type"`
+	Device      string  `json:"device"`
+	Total       uint64  `json:"total"`
+	Free        uint64  `json:"free"`
+	Used        uint64  `json:"used"`
+	UsedPercent float64 `json:"usedPercent"`
+
+	InodesTotal       uint64  `json:"inodesTotal"`
+	InodesUsed        uint64  `json:"inodesUsed"`
+	InodesFree        uint64  `json:"inodesFree"`
+	InodesUsedPercent float64 `json:"inodesUsedPercent"`
+}
+
+type AlertLogSearch struct {
+	PageInfo
+	Count  uint   `json:"count"`
+	Status string `json:"status"`
+}
+
+type AlertLogDTO struct {
+	ID          uint        `json:"id"`
+	Type        string      `json:"type"`
+	Count       uint        `json:"count"`
+	AlertId     uint        `json:"alertId"`
+	AlertDetail AlertDetail `json:"alertDetail"`
+	AlertRule   AlertRule   `json:"alertRule"`
+	Status      string      `json:"status"`
+	Method      string      `json:"method"`
+	Message     string      `json:"message"`
+	CreatedAt   time.Time   `json:"createdAt"`
+	UpdatedAt   time.Time   `json:"updatedAt"`
+}
+
+type AlertLogCreate struct {
+	Type        string `json:"type" validate:"required"`
+	Count       uint   `json:"count" validate:"required"`
+	AlertId     uint   `json:"alertId" validate:"required"`
+	AlertDetail string `json:"alertDetail" validate:"required"`
+	AlertRule   string `json:"alertRule" validate:"required"`
+	Status      string `json:"status" validate:"required"`
+	Method      string `json:"method" validate:"required"`
+	Message     string `json:"message"`
+	RecordId    uint   `json:"recordId"`
+	LicenseId   string `json:"licenseId" validate:"required"`
+}
+
+type AlertLog struct {
+	ID uint `json:"id" validate:"required"`
+}
+
+type AlertDetail struct {
+	LicenseId   string  `json:"licenseId"`
+	Type        string  `json:"type"`
+	SubType     string  `json:"subType"`
+	Title       string  `json:"title"`
+	Method      string  `json:"method"`
+	LicenseCode string  `json:"licenseCode"`
+	DeviceId    string  `json:"deviceId"`
+	Project     string  `json:"project"`
+	Params      []Param `json:"params"`
+	Phone       string  `json:"phone"`
+}
+
+type AlertRule struct {
+	ID        uint      `json:"id"`
+	Type      string    `json:"type"`
+	Cycle     uint      `json:"cycle"`
+	Count     uint      `json:"count"`
+	Method    string    `json:"method"`
+	Title     string    `json:"title"`
+	Project   string    `json:"project"`
+	Status    string    `json:"status"`
+	SendCount uint      `json:"sendCount"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+}
+
+type Param struct {
+	Index string `json:"index"`
+	Key   string `json:"key"`
+	Value string `json:"value"`
+}
+
+type ClamDTO struct {
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+	Name      string    `json:"name"`
+	Status    string    `json:"status"`
+	Path      string    `json:"path"`
+}
+
+type CronJobDTO struct {
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+	Name      string    `json:"name"`
+	Status    string    `json:"status"`
+	Type      string    `json:"type"`
+}
+
+type CronJobReq struct {
+	Name   string `json:"name"`
+	Status string `json:"status"`
+	Type   string `json:"type"`
+}
+
+type UpgradeInfo struct {
+	TestVersion   string `json:"testVersion"`
+	NewVersion    string `json:"newVersion"`
+	LatestVersion string `json:"latestVersion"`
+	ReleaseNote   string `json:"releaseNote"`
+}
+
+type AlertDiskInfo struct {
+	Type   string
+	Mount  string
+	Device string
+}
+
+type SyncResult struct {
+	ID          uint   `json:"id"`
+	LicenseID   string `json:"licenseId"`
+	SendStatus  string `json:"sendStatus"`
+	CreateTime  string `json:"createTime"`
+	UpdateTime  string `json:"updateTime"`
+	Remarks     string `json:"remarks"`
+	MsgCount    int    `json:"msgCount"`
+	MsgCountMax int    `json:"msgCountMax"`
+}
+
+type QueryRequest struct {
+	QueryIds  []uint `json:"queryIds"`
+	LicenseId string `json:"licenseId"`
+}
+
+type AlertResponse struct {
+	Result  bool            `json:"result"`
+	Data    json.RawMessage `json:"data"`
+	Message string          `json:"message"`
+}
+
+type PushResult struct {
+	RecordId  uint   `json:"recordId"`
+	LicenseId string `json:"licenseId"`
+}
+
+type UpdateOfflineAlertLog struct {
+	ID        uint   `json:"id"`
+	Status    string `json:"status"`
+	Message   string `json:"message"`
+	RecordId  uint   `json:"recordId"`
+	LicenseId string `json:"licenseId"`
+}
+
+type SyncOfflineAlertLogDTO struct {
+	QueryRequest string           `json:"queryRequest"`
+	Ids          []uint           `json:"ids"`
+	AlertLogs    []model.AlertLog `json:"alertLogs"`
+	LicenseId    string           `json:"licenseId"`
+}
+
+type OfflineAlertResponse struct {
+	ID             uint             `json:"id"`
+	Type           string           `json:"type"`
+	RemoteErr      error            `json:"remoteErr"`
+	ResponseStruct AlertResponse    `json:"responseStruct"`
+	AlertLogs      []model.AlertLog `json:"alertLogs"`
+	Ids            []uint           `json:"ids"`
+	LicenseId      string           `json:"licenseId"`
+}
+
+type OfflineAlertLogDTO struct {
+	ID          uint      `json:"id"`
+	Type        string    `json:"type"`
+	Count       uint      `json:"count"`
+	AlertId     uint      `json:"alertId"`
+	AlertDetail string    `json:"alertDetail"`
+	AlertRule   string    `json:"alertRule"`
+	Status      string    `json:"status"`
+	Method      string    `json:"method"`
+	Message     string    `json:"message"`
+	RecordId    uint      `json:"recordId"`
+	LicenseId   string    `json:"licenseId"`
+	CreatedAt   time.Time `json:"createdAt"`
+	UpdatedAt   time.Time `json:"updatedAt"`
+}
+
+type OfflineQueryRequest struct {
+	Ids       []uint `json:"ids"`
+	QueryIds  []uint `json:"queryIds"`
+	LicenseId string `json:"licenseId"`
+}
+
+type AlertConfigUpdate struct {
+	ID     uint   `json:"id"`
+	Type   string `json:"type"`
+	Title  string `json:"title"`
+	Status string `json:"status"`
+	Config string `json:"config"`
+}
+
+type AlertConfigTest struct {
+	Host        string `json:"host"`
+	Port        int    `json:"port"`
+	Sender      string `json:"sender"`
+	Password    string `json:"password"`
+	DisplayName string `json:"displayName"`
+	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"
+	Recipient   string `json:"recipient"`
+}
+
+type AlertSendTimeRange struct {
+	NoticeAlert struct {
+		SendTimeRange string   `json:"sendTimeRange"`
+		Type          []string `json:"type"`
+	} `json:"noticeAlert"`
+	ResourceAlert struct {
+		SendTimeRange string   `json:"sendTimeRange"`
+		Type          []string `json:"type"`
+	} `json:"resourceAlert"`
+}
+
+type AlertCommonConfig struct {
+	IsOffline          string             `json:"isOffline"`
+	AlertSendTimeRange AlertSendTimeRange `json:"alertSendTimeRange"`
+}
+
+type AlertSmsConfig struct {
+	Phone         string `json:"phone"`
+	AlertDailyNum uint   `json:"alertDailyNum"`
+}
+
+type AlertEmailConfig struct {
+	Host        string `json:"host"`
+	Port        int    `json:"port"`
+	Sender      string `json:"sender"`
+	Password    string `json:"password"`
+	DisplayName string `json:"displayName"`
+	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"
+	Recipient   string `json:"recipient"`
+}

agent/app/dto/app.go

@@ -1,14 +1,17 @@
 package dto
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/model"
+	"context"
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"github.com/1Panel-dev/1Panel/agent/app/task"
 )
 
 type AppDatabase struct {
-	ServiceName string `json:"PANEL_DB_HOST"`
-	DbName      string `json:"PANEL_DB_NAME"`
-	DbUser      string `json:"PANEL_DB_USER"`
-	Password    string `json:"PANEL_DB_USER_PASSWORD"`
+	ServiceName  string `json:"PANEL_DB_HOST"`
+	DbName       string `json:"PANEL_DB_NAME"`
+	DbUser       string `json:"PANEL_DB_USER"`
+	Password     string `json:"PANEL_DB_USER_PASSWORD"`
+	DatabaseName string `json:"DATABASE_NAME"`
 }
 
 type AuthParam struct {
@@ -62,7 +65,7 @@ type AppDefine struct {
 }
 
 type LocalAppAppDefine struct {
-	AppProperty model.App `json:"additionalProperties" yaml:"additionalProperties"`
+	AppProperty AppProperty `json:"additionalProperties" yaml:"additionalProperties"`
 }
 
 type LocalAppParam struct {
@@ -82,8 +85,9 @@ type AppProperty struct {
 	Name               string   `json:"name"`
 	Type               string   `json:"type"`
 	Tags               []string `json:"tags"`
-	ShortDescZh        string   `json:"shortDescZh"`
-	ShortDescEn        string   `json:"shortDescEn"`
+	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"`
@@ -92,6 +96,11 @@ type AppProperty struct {
 	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 {
@@ -103,28 +112,44 @@ type AppConfigVersion struct {
 }
 
 type Tag struct {
-	Key  string `json:"key"`
-	Name string `json:"name"`
-	Sort int    `json:"sort"`
+	Key     string `json:"key"`
+	Name    string `json:"name"`
+	Sort    int    `json:"sort"`
+	Locales Locale `json:"locales"`
+}
+
+type Locale struct {
+	En     string `json:"en"`
+	Ja     string `json:"ja"`
+	Ms     string `json:"ms"`
+	PtBr   string `json:"pt-br" yaml:"pt-br"`
+	Ru     string `json:"ru"`
+	ZhHant string `json:"zh-hant" yaml:"zh-hant"`
+	Zh     string `json:"zh"`
+	Ko     string `json:"ko"`
+	Tr     string `json:"tr"`
 }
 
 type AppForm struct {
-	FormFields []AppFormFields `json:"formFields"`
+	FormFields     []AppFormFields `json:"formFields"`
+	SupportVersion float64         `json:"supportVersion"`
 }
 
 type AppFormFields struct {
-	Type     string         `json:"type"`
-	LabelZh  string         `json:"labelZh"`
-	LabelEn  string         `json:"labelEn"`
-	Required bool           `json:"required"`
-	Default  interface{}    `json:"default"`
-	EnvKey   string         `json:"envKey"`
-	Disabled bool           `json:"disabled"`
-	Edit     bool           `json:"edit"`
-	Rule     string         `json:"rule"`
-	Multiple bool           `json:"multiple"`
-	Child    interface{}    `json:"child"`
-	Values   []AppFormValue `json:"values"`
+	Type        string         `json:"type"`
+	LabelZh     string         `json:"labelZh"`
+	LabelEn     string         `json:"labelEn"`
+	Label       Locale         `json:"label"`
+	Description Locale         `json:"description"`
+	Required    bool           `json:"required"`
+	Default     interface{}    `json:"default"`
+	EnvKey      string         `json:"envKey"`
+	Disabled    bool           `json:"disabled"`
+	Edit        bool           `json:"edit"`
+	Rule        string         `json:"rule"`
+	Multiple    bool           `json:"multiple"`
+	Child       interface{}    `json:"child"`
+	Values      []AppFormValue `json:"values"`
 }
 
 type AppFormValue struct {
@@ -147,3 +172,16 @@ type AppInstallInfo struct {
 	Key  string `json:"key"`
 	Name string `json:"name"`
 }
+
+type DelAppLink struct {
+	Ctx         context.Context
+	Task        *task.Task
+	Install     *model.AppInstall
+	ForceDelete bool
+}
+
+type PHPForm struct {
+	AdditionalProperties struct {
+		FormFields []interface{} `yaml:"formFields"`
+	} `yaml:"additionalProperties"`
+}

agent/app/dto/backup.go

@@ -0,0 +1,120 @@
+package dto
+
+import (
+	"time"
+)
+
+type BackupOperate struct {
+	ID         uint   `json:"id"`
+	Name       string `json:"name"`
+	Type       string `json:"type" validate:"required"`
+	IsPublic   bool   `json:"isPublic"`
+	Bucket     string `json:"bucket"`
+	AccessKey  string `json:"accessKey"`
+	Credential string `json:"credential"`
+	BackupPath string `json:"backupPath"`
+	Vars       string `json:"vars" validate:"required"`
+
+	RememberAuth bool `json:"rememberAuth"`
+}
+
+type BackupInfo struct {
+	ID         uint      `json:"id"`
+	Name       string    `json:"name"`
+	Type       string    `json:"type"`
+	IsPublic   bool      `json:"isPublic"`
+	Bucket     string    `json:"bucket"`
+	AccessKey  string    `json:"accessKey"`
+	Credential string    `json:"credential"`
+	BackupPath string    `json:"backupPath"`
+	Vars       string    `json:"vars"`
+	CreatedAt  time.Time `json:"createdAt"`
+
+	RememberAuth bool `json:"rememberAuth"`
+}
+
+type ForBuckets struct {
+	Type       string `json:"type" validate:"required"`
+	AccessKey  string `json:"accessKey"`
+	Credential string `json:"credential" validate:"required"`
+	Vars       string `json:"vars" validate:"required"`
+}
+
+type SyncFromMaster struct {
+	Name      string `json:"name" validate:"required"`
+	Operation string `json:"operation" validate:"required,oneof=create delete update"`
+	Data      string `json:"data"`
+}
+
+type BackupOption struct {
+	ID       uint   `json:"id"`
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+	IsPublic bool   `json:"isPublic"`
+}
+
+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"`
+
+	Description string `json:"description"`
+}
+type CommonRecover struct {
+	DownloadAccountID uint   `json:"downloadAccountID" validate:"required"`
+	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"`
+	File              string `json:"file"`
+	Secret            string `json:"secret"`
+	TaskID            string `json:"taskID"`
+	BackupRecordID    uint   `json:"backupRecordID"`
+}
+
+type RecordSearch struct {
+	PageInfo
+	Type       string `json:"type" validate:"required"`
+	Name       string `json:"name"`
+	DetailName string `json:"detailName"`
+}
+
+type RecordSearchByCronjob struct {
+	PageInfo
+	CronjobID uint `json:"cronjobID" validate:"required"`
+}
+
+type BackupRecords struct {
+	ID                uint      `json:"id"`
+	CreatedAt         time.Time `json:"createdAt"`
+	AccountType       string    `json:"accountType"`
+	AccountName       string    `json:"accountName"`
+	DownloadAccountID uint      `json:"downloadAccountID"`
+	FileDir           string    `json:"fileDir"`
+	FileName          string    `json:"fileName"`
+	Description       string    `json:"description"`
+}
+
+type DownloadRecord struct {
+	DownloadAccountID uint   `json:"downloadAccountID" validate:"required"`
+	FileDir           string `json:"fileDir" validate:"required"`
+	FileName          string `json:"fileName" validate:"required"`
+}
+
+type SearchForSize struct {
+	PageInfo
+	Type       string `json:"type" validate:"required"`
+	Name       string `json:"name"`
+	DetailName string `json:"detailName"`
+	Info       string `json:"info"`
+	CronjobID  uint   `json:"cronjobID"`
+	OrderBy    string `json:"orderBy"`
+	Order      string `json:"order"`
+}
+type RecordFileSize struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name"`
+	Size int64  `json:"size"`
+}

agent/app/dto/clam.go

@@ -7,7 +7,7 @@ import (
 type SearchClamWithPage struct {
 	PageInfo
 	Info    string `json:"info"`
-	OrderBy string `json:"orderBy" validate:"required,oneof=name status created_at"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name status createdAt"`
 	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
@@ -33,6 +33,8 @@ type ClamInfo struct {
 	LastHandleDate   string `json:"lastHandleDate"`
 	Spec             string `json:"spec"`
 	Description      string `json:"description"`
+	AlertCount       uint   `json:"alertCount"`
+	AlertMethod      string `json:"alertMethod"`
 }
 
 type ClamLogSearch struct {
@@ -71,6 +73,9 @@ type ClamCreate struct {
 	InfectedDir      string `json:"infectedDir"`
 	Spec             string `json:"spec"`
 	Description      string `json:"description"`
+	AlertCount       uint   `json:"alertCount"`
+	AlertTitle       string `json:"alertTitle"`
+	AlertMethod      string `json:"alertMethod"`
 }
 
 type ClamUpdate struct {
@@ -84,6 +89,7 @@ type ClamUpdate struct {
 	Description      string `json:"description"`
 	AlertCount       uint   `json:"alertCount"`
 	AlertTitle       string `json:"alertTitle"`
+	AlertMethod      string `json:"alertMethod"`
 }
 
 type ClamUpdateStatus struct {

agent/app/dto/command.go

@@ -2,7 +2,7 @@ package dto
 
 type SearchCommandWithPage struct {
 	PageInfo
-	OrderBy string `json:"orderBy" validate:"required,oneof=name command created_at"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name command createdAt"`
 	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
 	GroupID uint   `json:"groupID"`
 	Info    string `json:"info"`

agent/app/dto/common_req.go

@@ -5,6 +5,12 @@ type SearchWithPage struct {
 	Info string `json:"info"`
 }
 
+type SearchPageWithType struct {
+	PageInfo
+	Info string `json:"info"`
+	Type string `json:"type"`
+}
+
 type PageInfo struct {
 	Page     int `json:"page" validate:"required,number"`
 	PageSize int `json:"pageSize" validate:"required,number"`
@@ -22,11 +28,18 @@ type OperationWithName struct {
 type OperateByID struct {
 	ID uint `json:"id" validate:"required"`
 }
+type OperateByIDs struct {
+	IDs []uint `json:"ids"`
+}
 
 type Operate struct {
 	Operation string `json:"operation" validate:"required"`
 }
 
+type SearchByFilter struct {
+	Filter string `json:"filter"`
+}
+
 type BatchDeleteReq struct {
 	Ids []uint `json:"ids" validate:"required"`
 }
@@ -52,3 +65,17 @@ type OperationWithNameAndType struct {
 	Name string `json:"name"`
 	Type string `json:"type" validate:"required"`
 }
+
+type UpdateGroup struct {
+	Group    uint `json:"group"`
+	NewGroup uint `json:"newGroup"`
+}
+
+type OperateWithTask struct {
+	TaskID string `json:"taskID"`
+}
+
+type ForceDelete struct {
+	IDs         []uint `json:"ids"`
+	ForceDelete bool   `json:"forceDelete"`
+}

agent/app/dto/container.go

@@ -8,7 +8,7 @@ type PageContainer struct {
 	PageInfo
 	Name            string `json:"name"`
 	State           string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"`
-	OrderBy         string `json:"orderBy" validate:"required,oneof=name state created_at"`
+	OrderBy         string `json:"orderBy" validate:"required,oneof=name createdAt state"`
 	Order           string `json:"order" validate:"required,oneof=null ascending descending"`
 	Filters         string `json:"filters"`
 	ExcludeAppStore bool   `json:"excludeAppStore"`
@@ -39,23 +39,55 @@ type ContainerInfo struct {
 	Websites       []string `json:"websites"`
 }
 
+type ContainerOptions struct {
+	Name  string `json:"name"`
+	State string `json:"state"`
+}
+
+type ContainerStatus struct {
+	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"`
+	ComposeTemplateCount int `json:"composeTemplateCount"`
+	ImageCount           int `json:"imageCount"`
+	NetworkCount         int `json:"networkCount"`
+	VolumeCount          int `json:"volumeCount"`
+	RepoCount            int `json:"repoCount"`
+
+	ImageSize uint64 `json:"imageSize"`
+}
 type ResourceLimit struct {
 	CPU    int    `json:"cpu"`
 	Memory uint64 `json:"memory"`
 }
 
 type ContainerOperate struct {
+	TaskID          string         `json:"taskID"`
 	ContainerID     string         `json:"containerID"`
 	ForcePull       bool           `json:"forcePull"`
 	Name            string         `json:"name" validate:"required"`
 	Image           string         `json:"image" validate:"required"`
 	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"`
 	OpenStdin       bool           `json:"openStdin"`
+	WorkingDir      string         `json:"workingDir"`
+	User            string         `json:"user"`
 	Cmd             []string       `json:"cmd"`
 	Entrypoint      []string       `json:"entrypoint"`
 	CPUShares       int64          `json:"cpuShares"`
@@ -69,7 +101,13 @@ type ContainerOperate struct {
 	RestartPolicy   string         `json:"restartPolicy"`
 }
 
+type ContainerCreateByCommand struct {
+	TaskID  string `json:"taskID"`
+	Command string `json:"command"`
+}
+
 type ContainerUpgrade struct {
+	TaskID    string `json:"taskID"`
 	Name      string `json:"name" validate:"required"`
 	Image     string `json:"image" validate:"required"`
 	ForcePull bool   `json:"forcePull"`
@@ -131,6 +169,8 @@ type ContainerCommit struct {
 	Comment       string `json:"comment"`
 	Author        string `json:"author"`
 	Pause         bool   `json:"pause"`
+
+	TaskID string `json:"taskID"`
 }
 
 type ContainerPrune struct {
@@ -209,6 +249,7 @@ type ComposeContainer struct {
 	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"`
@@ -235,3 +276,12 @@ type ContainerLog struct {
 	Tail          uint   `json:"tail"`
 	ContainerType string `json:"containerType"`
 }
+
+type StreamLog struct {
+	Compose   string
+	Container string
+	Since     string
+	Follow    bool
+	Tail      string
+	Type      string
+}

agent/app/dto/cronjob.go

@@ -0,0 +1,200 @@
+package dto
+
+import (
+	"time"
+)
+
+type PageCronjob struct {
+	PageInfo
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name status createdAt"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+}
+
+type CronjobSpec struct {
+	Spec string `json:"spec" validate:"required"`
+}
+
+type CronjobOperate struct {
+	ID         uint   `json:"id"`
+	Name       string `json:"name" validate:"required"`
+	Type       string `json:"type" validate:"required"`
+	SpecCustom bool   `json:"specCustom"`
+	Spec       string `json:"spec" validate:"required"`
+
+	Executor      string `json:"executor"`
+	ScriptMode    string `json:"scriptMode"`
+	Script        string `json:"script"`
+	Command       string `json:"command"`
+	ContainerName string `json:"containerName"`
+	User          string `json:"user"`
+
+	ScriptID       uint         `json:"scriptID"`
+	AppID          string       `json:"appID"`
+	Website        string       `json:"website"`
+	ExclusionRules string       `json:"exclusionRules"`
+	DBType         string       `json:"dbType"`
+	DBName         string       `json:"dbName"`
+	URL            string       `json:"url"`
+	IsDir          bool         `json:"isDir"`
+	SourceDir      string       `json:"sourceDir"`
+	SnapshotRule   SnapshotRule `json:"snapshotRule"`
+
+	SourceAccountIDs  string `json:"sourceAccountIDs"`
+	DownloadAccountID uint   `json:"downloadAccountID"`
+	RetainCopies      int    `json:"retainCopies" validate:"number,min=1"`
+	RetryTimes        int    `json:"retryTimes" validate:"number,min=0"`
+	Timeout           uint   `json:"timeout" validate:"number,min=1"`
+	IgnoreErr         bool   `json:"ignoreErr"`
+	Secret            string `json:"secret"`
+
+	AlertCount  uint   `json:"alertCount"`
+	AlertTitle  string `json:"alertTitle"`
+	AlertMethod string `json:"alertMethod"`
+}
+
+type SnapshotRule struct {
+	WithImage    bool   `json:"withImage"`
+	IgnoreAppIDs []uint `json:"ignoreAppIDs"`
+}
+
+type CronjobUpdateStatus struct {
+	ID     uint   `json:"id" validate:"required"`
+	Status string `json:"status" validate:"required"`
+}
+
+type CronjobDownload struct {
+	RecordID        uint `json:"recordID" validate:"required"`
+	BackupAccountID uint `json:"backupAccountID" validate:"required"`
+}
+
+type CronjobClean struct {
+	IsDelete        bool `json:"isDelete"`
+	CleanData       bool `json:"cleanData"`
+	CronjobID       uint `json:"cronjobID" validate:"required"`
+	CleanRemoteData bool `json:"cleanRemoteData"`
+}
+
+type CronjobBatchDelete struct {
+	CleanData       bool   `json:"cleanData"`
+	CleanRemoteData bool   `json:"cleanRemoteData"`
+	IDs             []uint `json:"ids" validate:"required"`
+}
+
+type CronjobInfo struct {
+	ID         uint   `json:"id"`
+	Name       string `json:"name"`
+	Type       string `json:"type"`
+	SpecCustom bool   `json:"specCustom"`
+	Spec       string `json:"spec"`
+
+	Executor      string `json:"executor"`
+	ScriptMode    string `json:"scriptMode"`
+	Script        string `json:"script"`
+	Command       string `json:"command"`
+	ContainerName string `json:"containerName"`
+	User          string `json:"user"`
+
+	ScriptID       uint         `json:"scriptID"`
+	AppID          string       `json:"appID"`
+	Website        string       `json:"website"`
+	ExclusionRules string       `json:"exclusionRules"`
+	DBType         string       `json:"dbType"`
+	DBName         string       `json:"dbName"`
+	URL            string       `json:"url"`
+	IsDir          bool         `json:"isDir"`
+	SourceDir      string       `json:"sourceDir"`
+	RetainCopies   int          `json:"retainCopies"`
+	RetryTimes     int          `json:"retryTimes"`
+	Timeout        uint         `json:"timeout"`
+	IgnoreErr      bool         `json:"ignoreErr"`
+	SnapshotRule   SnapshotRule `json:"snapshotRule"`
+
+	SourceAccounts    []string `json:"sourceAccounts"`
+	DownloadAccount   string   `json:"downloadAccount"`
+	SourceAccountIDs  string   `json:"sourceAccountIDs"`
+	DownloadAccountID uint     `json:"downloadAccountID"`
+
+	LastRecordStatus string `json:"lastRecordStatus"`
+	LastRecordTime   string `json:"lastRecordTime"`
+	Status           string `json:"status"`
+	Secret           string `json:"secret"`
+
+	AlertCount uint `json:"alertCount"`
+}
+
+type CronjobImport struct {
+	Cronjobs []CronjobTrans `json:"cronjobs"`
+}
+type CronjobTrans struct {
+	Name       string `json:"name"`
+	Type       string `json:"type"`
+	SpecCustom bool   `json:"specCustom"`
+	Spec       string `json:"spec"`
+
+	Executor      string `json:"executor"`
+	ScriptMode    string `json:"scriptMode"`
+	Script        string `json:"script"`
+	Command       string `json:"command"`
+	ContainerName string `json:"containerName"`
+	User          string `json:"user"`
+	URL           string `json:"url"`
+
+	ScriptName string        `json:"scriptName"`
+	Apps       []TransHelper `json:"apps"`
+	Websites   []string      `json:"websites"`
+	DBType     string        `json:"dbType"`
+	DBNames    []TransHelper `json:"dbName"`
+
+	ExclusionRules string `json:"exclusionRules"`
+
+	IsDir     bool   `json:"isDir"`
+	SourceDir string `json:"sourceDir"`
+
+	RetainCopies uint64              `json:"retainCopies"`
+	RetryTimes   uint                `json:"retryTimes"`
+	Timeout      uint                `json:"timeout"`
+	IgnoreErr    bool                `json:"ignoreErr"`
+	SnapshotRule SnapshotTransHelper `json:"snapshotRule"`
+	Secret       string              `json:"secret"`
+
+	SourceAccounts  []string `json:"sourceAccounts"`
+	DownloadAccount string   `json:"downloadAccount"`
+
+	AlertCount  uint   `json:"alertCount"`
+	AlertTitle  string `json:"alertTitle"`
+	AlertMethod string `json:"alertMethod"`
+}
+type TransHelper struct {
+	Name       string `json:"name"`
+	DetailName string `json:"detailName"`
+}
+type SnapshotTransHelper struct {
+	WithImage  bool          `json:"withImage"`
+	IgnoreApps []TransHelper `json:"ignoreApps"`
+}
+
+type ScriptOptions struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+type SearchRecord struct {
+	PageInfo
+	CronjobID int       `json:"cronjobID"`
+	StartTime time.Time `json:"startTime"`
+	EndTime   time.Time `json:"endTime"`
+	Status    string    `json:"status"`
+}
+
+type Record struct {
+	ID         uint   `json:"id"`
+	TaskID     string `json:"taskID"`
+	StartTime  string `json:"startTime"`
+	Records    string `json:"records"`
+	Status     string `json:"status"`
+	Message    string `json:"message"`
+	TargetPath string `json:"targetPath"`
+	Interval   int    `json:"interval"`
+	File       string `json:"file"`
+}

agent/app/dto/dashboard.go

@@ -16,11 +16,12 @@ type DashboardBase struct {
 	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"`
+	IpV4Addr             string `json:"ipV4Addr"`
+	SystemProxy          string `json:"systemProxy"`
+
+	CPUCores        int    `json:"cpuCores"`
+	CPULogicalCores int    `json:"cpuLogicalCores"`
+	CPUModelName    string `json:"cpuModelName"`
 
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
 }
@@ -35,10 +36,25 @@ type OsInfo struct {
 	DiskSize int64 `json:"diskSize"`
 }
 
-type DashboardReq struct {
-	Scope     string `json:"scope"`
-	IoOption  string `json:"ioOption"`
-	NetOption string `json:"netOption"`
+type NodeCurrent struct {
+	Load1            float64 `json:"load1"`
+	Load5            float64 `json:"load5"`
+	Load15           float64 `json:"load15"`
+	LoadUsagePercent float64 `json:"loadUsagePercent"`
+
+	CPUUsedPercent float64 `json:"cpuUsedPercent"`
+	CPUUsed        float64 `json:"cpuUsed"`
+	CPUTotal       int     `json:"cpuTotal"`
+
+	MemoryTotal       uint64  `json:"memoryTotal"`
+	MemoryAvailable   uint64  `json:"memoryAvailable"`
+	MemoryUsed        uint64  `json:"memoryUsed"`
+	MemoryUsedPercent float64 `json:"memoryUsedPercent"`
+
+	SwapMemoryTotal       uint64  `json:"swapMemoryTotal"`
+	SwapMemoryAvailable   uint64  `json:"swapMemoryAvailable"`
+	SwapMemoryUsed        uint64  `json:"swapMemoryUsed"`
+	SwapMemoryUsedPercent float64 `json:"swapMemoryUsedPercent"`
 }
 
 type DashboardCurrent struct {
@@ -58,8 +74,11 @@ type DashboardCurrent struct {
 	CPUTotal       int       `json:"cpuTotal"`
 
 	MemoryTotal       uint64  `json:"memoryTotal"`
-	MemoryAvailable   uint64  `json:"memoryAvailable"`
 	MemoryUsed        uint64  `json:"memoryUsed"`
+	MemoryFree        uint64  `json:"memoryFree"`
+	MemoryShard       uint64  `json:"memoryShard"`
+	MemoryCache       uint64  `json:"memoryCache"`
+	MemoryAvailable   uint64  `json:"memoryAvailable"`
 	MemoryUsedPercent float64 `json:"memoryUsedPercent"`
 
 	SwapMemoryTotal       uint64  `json:"swapMemoryTotal"`
@@ -84,6 +103,10 @@ type DashboardCurrent struct {
 	ShotTime time.Time `json:"shotTime"`
 }
 
+type AppLauncherSync struct {
+	Keys []string `json:"keys"`
+}
+
 type DiskInfo struct {
 	Path        string  `json:"path"`
 	Type        string  `json:"type"`
@@ -114,6 +137,37 @@ type GPUInfo struct {
 	FanSpeed         string `json:"fanSpeed"`
 }
 
+type AppLauncher struct {
+	Key         string `json:"key"`
+	Type        string `json:"type"`
+	Name        string `json:"name"`
+	Icon        string `json:"icon"`
+	Limit       int    `json:"limit"`
+	Description string `json:"description"`
+	Recommend   int    `json:"recommend"`
+
+	IsInstall   bool            `json:"isInstall"`
+	IsRecommend bool            `json:"isRecommend"`
+	Detail      []InstallDetail `json:"detail"`
+}
+
+type InstallDetail struct {
+	InstallID uint   `json:"installID"`
+	DetailID  uint   `json:"detailID"`
+	Name      string `json:"name"`
+	Version   string `json:"version"`
+	Path      string `json:"path"`
+	Status    string `json:"status"`
+	WebUI     string `json:"webUI"`
+	HttpPort  int    `json:"httpPort"`
+	HttpsPort int    `json:"httpsPort"`
+}
+
+type LauncherOption struct {
+	Key    string `json:"key"`
+	IsShow bool   `json:"isShow"`
+}
+
 type XPUInfo struct {
 	DeviceID    int    `json:"deviceID"`
 	DeviceName  string `json:"deviceName"`

agent/app/dto/database.go

@@ -4,14 +4,14 @@ import "time"
 
 // common
 type DBConfUpdateByFile struct {
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis mysql-cluster postgresql-cluster"`
 	Database string `json:"database" validate:"required"`
 	File     string `json:"file"`
 }
 type ChangeDBInfo struct {
 	ID       uint   `json:"id"`
 	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql mysql-cluster postgresql-cluster"`
 	Database string `json:"database" validate:"required"`
 	Value    string `json:"value" validate:"required"`
 }
@@ -27,7 +27,7 @@ type MysqlDBSearch struct {
 	PageInfo
 	Info     string `json:"info"`
 	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy" validate:"required,oneof=name created_at"`
+	OrderBy  string `json:"orderBy" validate:"required,oneof=name createdAt"`
 	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
@@ -74,19 +74,19 @@ type BindUser struct {
 
 type MysqlLoadDB struct {
 	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb mysql-cluster"`
 	Database string `json:"database" validate:"required"`
 }
 
 type MysqlDBDeleteCheck struct {
 	ID       uint   `json:"id" validate:"required"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb mysql-cluster"`
 	Database string `json:"database" validate:"required"`
 }
 
 type MysqlDBDelete struct {
 	ID           uint   `json:"id" validate:"required"`
-	Type         string `json:"type" validate:"required,oneof=mysql mariadb"`
+	Type         string `json:"type" validate:"required,oneof=mysql mariadb mysql-cluster"`
 	Database     string `json:"database" validate:"required"`
 	ForceDelete  bool   `json:"forceDelete"`
 	DeleteBackup bool   `json:"deleteBackup"`
@@ -153,7 +153,7 @@ type MysqlVariables struct {
 }
 
 type MysqlVariablesUpdate struct {
-	Type      string                       `json:"type" validate:"required,oneof=mysql mariadb"`
+	Type      string                       `json:"type" validate:"required,oneof=mysql mariadb mysql-cluster"`
 	Database  string                       `json:"database" validate:"required"`
 	Variables []MysqlVariablesUpdateHelper `json:"variables"`
 }
@@ -174,6 +174,7 @@ type RedisConfUpdate struct {
 	Timeout    string `json:"timeout"`
 	Maxclients string `json:"maxclients"`
 	Maxmemory  string `json:"maxmemory"`
+	DBType     string `json:"dbType" validate:"required,oneof=redis redis-cluster"`
 }
 type RedisConfPersistenceUpdate struct {
 	Database    string `json:"database" validate:"required"`
@@ -181,6 +182,7 @@ type RedisConfPersistenceUpdate struct {
 	Appendonly  string `json:"appendonly"`
 	Appendfsync string `json:"appendfsync"`
 	Save        string `json:"save"`
+	DBType      string `json:"dbType" validate:"required,oneof=redis redis-cluster"`
 }
 
 type RedisConf struct {
@@ -236,7 +238,7 @@ type DatabaseSearch struct {
 	PageInfo
 	Info    string `json:"info"`
 	Type    string `json:"type"`
-	OrderBy string `json:"orderBy" validate:"required,oneof=name created_at"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name createdAt"`
 	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
@@ -319,3 +321,8 @@ type DatabaseDelete struct {
 	ForceDelete  bool `json:"forceDelete"`
 	DeleteBackup bool `json:"deleteBackup"`
 }
+
+type LoadRedisStatus struct {
+	Name string `json:"name" validate:"required"`
+	Type string `json:"type" validate:"required"`
+}

agent/app/dto/database_postgresql.go

@@ -6,7 +6,7 @@ type PostgresqlDBSearch struct {
 	PageInfo
 	Info     string `json:"info"`
 	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy" validate:"required,oneof=name created_at"`
+	OrderBy  string `json:"orderBy" validate:"required,oneof=name createdAt"`
 	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 

agent/app/dto/docker.go

@@ -4,9 +4,13 @@ type DaemonJsonUpdateByFile struct {
 	File string `json:"file"`
 }
 
+type DockerStatus struct {
+	IsActive bool `json:"isActive"`
+	IsExist  bool `json:"isExist"`
+}
+
 type DaemonJsonConf struct {
 	IsSwarm      bool     `json:"isSwarm"`
-	Status       string   `json:"status"`
 	Version      string   `json:"version"`
 	Mirrors      []string `json:"registryMirrors"`
 	Registries   []string `json:"insecureRegistries"`

agent/app/dto/firewall.go

@@ -2,7 +2,8 @@ package dto
 
 type FirewallBaseInfo struct {
 	Name       string `json:"name"`
-	Status     string `json:"status"`
+	IsExist    bool   `json:"isExist"`
+	IsActive   bool   `json:"isActive"`
 	Version    string `json:"version"`
 	PingStatus string `json:"pingStatus"`
 }
@@ -30,7 +31,8 @@ type PortRuleOperate struct {
 }
 
 type ForwardRuleOperate struct {
-	Rules []struct {
+	ForceDelete bool `json:"forceDelete"`
+	Rules       []struct {
 		Operation  string `json:"operation" validate:"required,oneof=add remove"`
 		Num        string `json:"num"`
 		Protocol   string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`

agent/app/dto/group.go

@@ -0,0 +1,29 @@
+package dto
+
+type GroupCreate struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name" validate:"required"`
+	Type string `json:"type" validate:"required"`
+}
+
+type GroupSearch struct {
+	Type string `json:"type" validate:"required"`
+}
+
+type GroupUpdate struct {
+	ID        uint   `json:"id"`
+	Name      string `json:"name"`
+	Type      string `json:"type" validate:"required"`
+	IsDefault bool   `json:"isDefault"`
+}
+
+type GroupInfo struct {
+	ID        uint   `json:"id"`
+	Name      string `json:"name"`
+	Type      string `json:"type"`
+	IsDefault bool   `json:"isDefault"`
+}
+
+type OperateByType struct {
+	Type string `json:"type"`
+}

agent/app/dto/image.go

@@ -15,6 +15,7 @@ type ImageLoad struct {
 }
 
 type ImageBuild struct {
+	TaskID     string   `json:"taskID"`
 	From       string   `json:"from" validate:"required"`
 	Name       string   `json:"name" validate:"required"`
 	Dockerfile string   `json:"dockerfile" validate:"required"`
@@ -22,6 +23,7 @@ type ImageBuild struct {
 }
 
 type ImagePull struct {
+	TaskID    string `json:"taskID"`
 	RepoID    uint   `json:"repoID"`
 	ImageName string `json:"imageName" validate:"required"`
 }
@@ -32,6 +34,7 @@ type ImageTag struct {
 }
 
 type ImagePush struct {
+	TaskID  string `json:"taskID"`
 	RepoID  uint   `json:"repoID" validate:"required"`
 	TagName string `json:"tagName" validate:"required"`
 	Name    string `json:"name" validate:"required"`

agent/app/dto/image_repo.go

@@ -6,8 +6,8 @@ type ImageRepoCreate struct {
 	Name        string `json:"name" validate:"required"`
 	DownloadUrl string `json:"downloadUrl"`
 	Protocol    string `json:"protocol"`
-	Username    string `json:"username" validate:"max=256"`
-	Password    string `json:"password" validate:"max=256"`
+	Username    string `json:"username"`
+	Password    string `json:"password"`
 	Auth        bool   `json:"auth"`
 }
 
@@ -15,8 +15,8 @@ type ImageRepoUpdate struct {
 	ID          uint   `json:"id"`
 	DownloadUrl string `json:"downloadUrl"`
 	Protocol    string `json:"protocol"`
-	Username    string `json:"username" validate:"max=256"`
-	Password    string `json:"password" validate:"max=256"`
+	Username    string `json:"username"`
+	Password    string `json:"password"`
 	Auth        bool   `json:"auth"`
 }
 

agent/app/dto/logs.go

@@ -0,0 +1,15 @@
+package dto
+
+import (
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+)
+
+type SearchTaskLogReq struct {
+	Status string `json:"status"`
+	Type   string `json:"type"`
+	PageInfo
+}
+
+type TaskDTO struct {
+	model.Task
+}

agent/app/dto/monitor.go

@@ -14,3 +14,15 @@ type MonitorData struct {
 	Date  []time.Time   `json:"date"`
 	Value []interface{} `json:"value"`
 }
+
+type MonitorSetting struct {
+	MonitorStatus    string `json:"monitorStatus"`
+	MonitorStoreDays string `json:"monitorStoreDays"`
+	MonitorInterval  string `json:"monitorInterval"`
+	DefaultNetwork   string `json:"defaultNetwork"`
+}
+
+type MonitorSettingUpdate struct {
+	Key   string `json:"key" validate:"required,oneof=MonitorStatus MonitorStoreDays MonitorInterval DefaultNetwork"`
+	Value string `json:"value"`
+}

agent/app/dto/nginx.go

@@ -1,8 +1,8 @@
 package dto
 
 import (
-	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/utils/nginx/components"
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"github.com/1Panel-dev/1Panel/agent/utils/nginx/components"
 )
 
 type NginxFull struct {
@@ -33,6 +33,13 @@ type NginxAuth struct {
 	Remark   string `json:"remark"`
 }
 
+type NginxPathAuth struct {
+	Username string `json:"username"`
+	Remark   string `json:"remark"`
+	Path     string `json:"path"`
+	Name     string `json:"name"`
+}
+
 type NginxKey string
 
 const (
@@ -57,3 +64,31 @@ var StaticFileKeyMap = map[NginxKey]struct {
 	CACHE:      {},
 	ProxyCache: {},
 }
+
+type NginxUpstream struct {
+	Name      string                `json:"name"`
+	Algorithm string                `json:"algorithm"`
+	Servers   []NginxUpstreamServer `json:"servers"`
+	Content   string                `json:"content"`
+}
+
+type NginxUpstreamServer struct {
+	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": {}}
+
+var RealIPKeys = map[string]struct{}{"X-Forwarded-For": {}, "X-Real-IP": {}, "CF-Connecting-IP": {}}
+
+type NginxModule struct {
+	Name     string   `json:"name"`
+	Script   string   `json:"script"`
+	Packages []string `json:"packages"`
+	Params   string   `json:"params"`
+	Enable   bool     `json:"enable"`
+}