feat: add backend api timeout

fix: Fixed frontend list loading failure issue
perf: Optimized tensorrtLLM display performanceperf
2026-10-09 16:00:29 +00:00 · 2025-12-15 16:42:54 +08:00 · 2025-12-04 17:29:53 +08:00 · 2025-12-04 16:33:57 +08:00 · 2025-12-02 05:49:41 +00:00 · 2025-11-11 15:42:26 +08:00
1528 changed files with 104502 additions and 300607 deletions
@@ -1,14 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: "gomod"
-    directories:
-      - "/agent"
-      - "/core"
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "npm"
-    directory: "/frontend"
-    schedule:
-      interval: "daily"
@@ -6,7 +6,6 @@ permissions:
 jobs:
  generic_handler:
    name: Add Labels to PR
-    if: github.repository == '1Panel-dev/1Panel' && github.event.pull_request.user.login != 'dependabot[bot]'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
@@ -0,0 +1,47 @@
+name: Create Release And Upload assets
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.19.0'
+      - name: Build Web
+        run: |
+          cd frontend && npm install && npm run build:pro
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: Build Release
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --skip=publish --clean
+      - name: Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            dist/*.tar.gz
+            dist/checksums.txt
+      - name: Setup OSSUTIL
+        uses: yizhoumo/setup-ossutil@v2
+        with:
+          endpoint: ${{ secrets.OSS_ENDPOINT }}
+          access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
+          access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+          ossutil-version: '1.7.18'
+      - name: Upload Assets to OSS
+        run: ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/v2/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force
@@ -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: '22.19.0'
+      - name: Build Web
+        run: |
+          cd frontend && npm install && npm run build:pro
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: Build Release
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --skip=publish --clean
+      - name: Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            dist/*.tar.gz
+            dist/checksums.txt
+      - name: Setup 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
@@ -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"
@@ -0,0 +1,20 @@
+name: SonarCloud Scan
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -2,11 +2,10 @@ name: Synchronize to Gitee
 on: [push]
 jobs:
  repo-sync:
-    if: github.repository == '1Panel-dev/1Panel'
    runs-on: ubuntu-latest
    steps:
      - name: Mirror the Github organization repos to Gitee.
-        uses: Yikun/hub-mirror-action@ba51c01b28a6c9f95a25d4f1bcf6af2a147c0e18 # master
+        uses: Yikun/hub-mirror-action@master
        with:
          src: 'github/1Panel-dev'
          dst: 'gitee/fit2cloud-feizhiyun'
@@ -0,0 +1,11 @@
+name: Typos Check
+on: pull_request
+jobs:
+  run:
+    name: Spell Check with Typos
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v2
+    - name: Check spelling
+      uses: crate-ci/typos@master
@@ -9,6 +9,7 @@ build/1panel-core

 # Mac
 .DS_Store
+*/.DS_Store

 # VS Code
 .vscode
@@ -40,23 +41,15 @@ core/cmd/server/web/index.html
 frontend/auto-imports.d.ts
 frontend/components.d.ts
 frontend/src/xpack
-frontend/src/enterprise
 agent/xpack
-agent/enterprise
 agent/router/entry_xpack.go
-agent/router/entry_enterprise.go
 agent/server/init_xpack.go
-agent/server/init_enterprise.go
-agent/utils/xpack/xpack.go
-agent/utils/xpack/enterprise.go
+agent/utils/xpack/xpack_xpack.go
 core/xpack
-core/enterprise
 core/router/entry_xpack.go
-core/router/entry_enterprise.go
 core/server/init_xpack.go
-core/server/init_enterprise.go
-core/utils/xpack/xpack.go
-core/utils/xpack/enterprise.go
+core/utils/xpack/xpack_xpack.go
+xpack

 .history/
 dist/
@@ -69,13 +62,4 @@ cmd/server/fileList.txt
 1Panel.code-workspace

 core/.golangci.yml
-agent/.golangci.yml
-
-.opencode
-openspec
-CLAUDE.md
-AGENTS.md
-opencode.json
-superpowers
-.worktrees/
-.codex/
+agent/.golangci.yml
@@ -0,0 +1,87 @@
+# 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 ./ci/script.sh
+    - ./ci/script.sh
+    - sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl
+    
+builds:
+  - id: agent
+    dir: agent
+    main: cmd/server/main.go
+    binary: 1panel-agent
+    flags:
+      - -tags=xpack
+      - -trimpath
+    ldflags:
+      - -w -s
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+    goarm:
+      - 7
+    goarch:
+      - amd64
+      - arm64
+      - arm
+      - ppc64le
+      - s390x
+      - riscv64
+    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
+      - riscv64
+    hooks:
+      post:
+        - ./ci/script.sh compress_binary {{ .Path }} {{ .Arch }}
+
+archives:
+  - 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-core.service
+      - 1panel-agent.service
+      - install.sh
+      - GeoIP.mmdb
+      - lang/*
+
+checksum:
+  name_template: 'checksums.txt'
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
@@ -10,12 +10,10 @@ 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://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.

-## Add a new translation
-
-If you'd like to help translate 1Panel into a new language, please read the [Translation Contribution Guide](docs/TRANSLATION.md). It lists every file you need to create or modify, along with a reference PR you can use as a concrete example.
-
 ## Report issues
 It is a great way to contribute by reporting an issue. Well-written and complete bug reports are always welcome! Please open an issue and follow the template to fill in required information.

@@ -30,20 +30,20 @@ build_frontend:

 build_core_on_linux:
 	cd $(CORE_PATH) \
-	&& CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
+	&& GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)

 build_agent_on_linux:
 	cd $(AGENT_PATH) \
-    && CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
+    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)

 build_core_on_darwin:
 	cd $(CORE_PATH) \
-	&&  CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)
+	&& GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(CORE_NAME) $(CORE_MAIN)

 build_agent_on_darwin:
 	cd $(AGENT_PATH) \
-    &&  CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)
+    && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(AGENT_NAME) $(AGENT_MAIN)

 build_all: build_frontend build_core_on_linux build_agent_on_linux

-build_on_local: clean_assets build_frontend build_core_on_darwin build_agent_on_darwin
+build_on_local: clean_assets build_frontend build_core_on_darwin build_agent_on_darwin upx_bin
@@ -2,10 +2,8 @@ reviewers:
 - wanghe-fit2cloud
 - zhengkunwang223
 - ssongliu
- lan-yonghui

 approvers:
 - wanghe-fit2cloud
 - zhengkunwang223
 - ssongliu
- lan-yonghui
@@ -1,19 +1,17 @@
 <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">
-  Loved by a global community of <strong>2.5M+</strong> self-hosters.
-</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: 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://discord.gg/bUpUqWqdRr"><img src="https://img.shields.io/discord/1318846410149335080?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb" alt="Discord"></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="Stars"></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>
@@ -21,83 +19,58 @@
  <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-es.md"><img alt="Español" src="https://img.shields.io/badge/Español-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/Русский-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>
-  <a href="/docs/README.fa.md"><img alt="Persian" src="https://img.shields.io/badge/%D9%81%D8%A7%D8%B1%D8%B3%DB%8C-d9d9d9"></a>
-  <a href="/docs/README.lo.md"><img alt="ພາສາລາວ" src="https://img.shields.io/badge/%E0%BA%9E%E0%BA%B2%E0%BA%AA%E0%BA%B2%E0%BA%A5%E0%BA%B2%E0%BA%A7-d9d9d9"></a>
 </p>

---
+------------------------------

-## What is 1Panel?
+1Panel is an open-source, modern web-based control panel for Linux server management.

-1Panel is a modern, open-source Linux server management panel and a lightweight AI management platform. Through an intuitive web interface, it provides users with comprehensive, one-stop server management capabilities:
- **AI Management**: Offers a unified management platform from bare metal to agents (Metal-to-Agent). It integrates an AI gateway, and Skills Hub, while supporting centralized management of agents and models.
- **Efficient Visual Operations**: Easily manage Linux servers through a web-based GUI, streamlining tasks such as host monitoring, file management, database management, and container management.
- **Rapid Website Deployment**: Deeply integrates with popular website builders like WordPress and Halo. It enables one-click domain binding and SSL certificate configuration, significantly lowering the barrier to website creation.
- **Curated App Store**: Features a built-in store of high-quality open-source applications, providing one-click installation and upgrade services to effortlessly extend server capabilities.
- **Enterprise-Grade Security**: Deploys applications based on container technology to effectively minimize vulnerability exposure. It also provides security features such as WAF and log auditing to ensure comprehensive server protection.
- **One-Click Data Backup**: Supports one-click backup and restoration, and integrates with various cloud storage solutions to ensure data security and prevent loss.
-
-## Why 1Panel?
-
-| | 1Panel | cPanel / Plesk | aaPanel | Webmin |
-|--|--------|----------------|---------|--------|
-| Free & open source | ✅ | ❌ | Partial | ✅ |
-| AI management | ✅ | ❌ | ❌ | ❌ |
-| One-click app marketplace | ✅ 165+ apps | ❌ | ✅ | ❌ |
-| Modern UI (post-2020) | ✅ | ❌ | Partial | ❌ |
-| Docker / container management | ✅ | ❌ | ❌ | ❌ |
-| Active development | ✅ | ✅ | ✅ | Slow |
+- **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

-Prepare your Linux server and run the following script:
+Execute the script below and follow the prompts to install 1Panel:

 ```bash
-bash -c "$(curl -sSL https://resource.1panel.pro/v2/quick_start.sh)"
+curl -sSL https://resource.1panel.pro/quick_start.sh -o quick_start.sh && bash quick_start.sh
 ```

-After installation, open `http://<your-server-ip>:<port>/<security-path>` in your browser.  
-Run `1pctl user-info` via SSH if you need to retrieve your access credentials.
+Please refer to our [documentation](https://docs.1panel.pro/quick_start/) for more details.
+
+中国用户请使用这个 [安装脚本](https://1panel.cn/docs/installation/online_installation/)，其应用数量比国际版本更丰富。

 ## Screenshot

-![1Panel UI](https://resource.1panel.pro/img/overview_en_v2.png)
+![UI Display](https://resource.1panel.pro/img/1panel.png)
+
+## 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

-1Panel OSS is free forever. 1Panel Pro and Ent adds features built for teams and production workloads:
+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).

-| Feature | OSS | Pro | Ent |
-|---------|:---:|:---:|:---:|
-| One-click app installs | ✅ | ✅ | ✅ |
-| AI agents (OpenClaw) | 5 agent | Unlimited | ✅ |
-| WAF & advanced security | Basic | ✅ | ✅ |
-| Website tamper protection | ❌ | ✅ | ✅ |
-| Website uptime monitoring | ❌ | ✅ | ✅ |
-| Multi-node management | ❌ | ✅ | ✅ |
-| Custom logo & theme | ❌ | ✅ | ✅ |
-| KVM Web UI | ❌ | ❌ | ✅ |
-| AI Gateway | ❌ | ❌ | ✅ |
-| Priority support | ❌ | ❌ | ✅ |
+## Security Information

-## Community & Support
-
- **Discord** — [Join the community](https://discord.gg/bUpUqWqdRr) for help, feature requests, and show-and-tell
- **Docs** — [1panel.pro/docs](https://1panel.pro/docs)
- **Issues** — [GitHub Issues](https://github.com/1Panel-dev/1Panel/issues) for bug reports
-
-## Security
-
-Found a vulnerability? Please read [SECURITY.md](/SECURITY.md) before disclosing.
+If you discover any security issues, please refer to [SECURITY.md](/SECURITY.md).

 ## License

-Licensed under the [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.html).
+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.
@@ -3,6 +3,9 @@ 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"
 )

@@ -160,6 +163,37 @@ func (b *BaseApi) DeleteOllamaModel(c *gin.Context) {
 	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
@@ -201,15 +235,14 @@ func (b *BaseApi) GetBindDomain(c *gin.Context) {
 	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]
-// @x-panel-log {"bodyKeys":["domain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 Ollama 绑定域名 [domain]","formatEN":"update Ollama bind domain [domain]"}
+// 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 {
@@ -2,27 +2,11 @@ package v2

 import (
 	"errors"
-	"net/http"
-	"net/url"
-	"strings"
-
 	"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/repo"
-	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/gin-gonic/gin"
 )

-const defaultAuditUser = "system"
-
-// @Tags Alert
-// @Summary Page alert
-// @Accept json
-// @Param request body dto.AlertSearch true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/search [post]
 func (b *BaseApi) PageAlert(c *gin.Context) {
 	var req dto.AlertSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -48,21 +32,12 @@ func (b *BaseApi) GetAlerts(c *gin.Context) {
 	helper.SuccessWithData(c, alerts)
 }

-// @Tags Alert
-// @Summary Create alert
-// @Accept json
-// @Param request body dto.AlertCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert [post]
-// @x-panel-log {"bodyKeys":["title"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建告警任务 [title]","formatEN":"create alert [title]"}
 func (b *BaseApi) CreateAlert(c *gin.Context) {
 	var req dto.AlertCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	err := alertService.CreateAlert(req, loadAuditUser(c))
+	err := alertService.CreateAlert(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -70,15 +45,6 @@ func (b *BaseApi) CreateAlert(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Alert
-// @Summary Delete alert
-// @Accept json
-// @Param request body dto.DeleteRequest true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警任务 [id]","formatEN":"delete alert [id]"}
 func (b *BaseApi) DeleteAlert(c *gin.Context) {
 	var req dto.DeleteRequest
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -92,21 +58,12 @@ func (b *BaseApi) DeleteAlert(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Alert
-// @Summary Update alert
-// @Accept json
-// @Param request body dto.AlertUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/update [post]
-// @x-panel-log {"bodyKeys":["title"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警任务 [title]","formatEN":"update alert [title]"}
 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, loadAuditUser(c)); err != nil {
+	if err := alertService.UpdateAlert(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -127,15 +84,6 @@ func (b *BaseApi) GetAlert(c *gin.Context) {
 	helper.SuccessWithData(c, alert)
 }

-// @Tags Alert
-// @Summary Update alert status
-// @Accept json
-// @Param request body dto.AlertUpdateStatus true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/status [post]
-// @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警任务 [id] 状态 [status]","formatEN":"update alert [id] status [status]"}
 func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
 	var req dto.AlertUpdateStatus
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -149,12 +97,6 @@ func (b *BaseApi) UpdateAlertStatus(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Alert
-// @Summary Get disks
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/disks/list [get]
 func (b *BaseApi) GetDisks(c *gin.Context) {
 	alerts, err := alertService.GetDisks()
 	if err != nil {
@@ -164,14 +106,6 @@ func (b *BaseApi) GetDisks(c *gin.Context) {
 	helper.SuccessWithData(c, alerts)
 }

-// @Tags Alert
-// @Summary Page alert logs
-// @Accept json
-// @Param request body dto.AlertLogSearch true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/logs/search [post]
 func (b *BaseApi) PageAlertLogs(c *gin.Context) {
 	var req dto.AlertLogSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -188,13 +122,6 @@ func (b *BaseApi) PageAlertLogs(c *gin.Context) {
 	})
 }

-// @Tags Alert
-// @Summary Clean alert logs
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/logs/clean [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空告警日志","formatEN":"clean alert logs"}
 func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
 	if err := alertService.CleanAlertLogs(); err != nil {
 		helper.InternalServer(c, err)
@@ -203,12 +130,6 @@ func (b *BaseApi) CleanAlertLogs(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Alert
-// @Summary Get clams
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/clams/list [get]
 func (b *BaseApi) GetClams(c *gin.Context) {
 	clams, err := alertService.GetClams()
 	if err != nil {
@@ -218,14 +139,6 @@ func (b *BaseApi) GetClams(c *gin.Context) {
 	helper.SuccessWithData(c, clams)
 }

-// @Tags Alert
-// @Summary Get cron jobs
-// @Accept json
-// @Param request body dto.CronJobReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/cronjob/list [post]
 func (b *BaseApi) GetCronJobs(c *gin.Context) {
 	var req dto.CronJobReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -239,18 +152,8 @@ func (b *BaseApi) GetCronJobs(c *gin.Context) {
 	helper.SuccessWithData(c, cronJobs)
 }

-// @Tags Alert
-// @Summary Get alert config
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/info [post]
 func (b *BaseApi) GetAlertConfig(c *gin.Context) {
-	var req dto.AlertConfigQuery
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	config, err := alertService.GetAlertConfig(req)
+	config, err := alertService.GetAlertConfig()
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -258,99 +161,18 @@ func (b *BaseApi) GetAlertConfig(c *gin.Context) {
 	helper.SuccessWithData(c, config)
 }

-// @Tags Alert
-// @Summary Page alert config
-// @Accept json
-// @Param request body dto.AlertConfigPageReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/search [post]
-func (b *BaseApi) PageAlertConfig(c *gin.Context) {
-	var req dto.AlertConfigPageReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, configs, err := alertService.PageAlertConfig(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Total: total,
-		Items: configs,
-	})
-}
-
-// @Tags Alert
-// @Summary Update alert config
-// @Accept json
-// @Param request body dto.AlertConfigUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/update [post]
-// @x-panel-log {"bodyKeys":["id","displayName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置 [id][displayName]","formatEN":"update alert config [id][displayName]"}
 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, loadAuditUser(c)); err != nil {
-		switch {
-		case errors.Is(err, repo.ErrAlertConfigRevisionConflict):
-			helper.ErrorWithBusinessCode(c, http.StatusConflict, "ALERT_CONFIG_REVISION_CONFLICT", "ErrInvalidParams", err)
-		case errors.Is(err, repo.ErrAlertConfigRevisionRequired):
-			helper.ErrorWithBusinessCode(c, http.StatusConflict, "ALERT_CONFIG_REVISION_REQUIRED", "ErrInvalidParams", err)
-		default:
-			helper.InternalServer(c, err)
-		}
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Alert
-// @Summary Update alert config status
-// @Accept json
-// @Param request body dto.AlertConfigStatusUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/status [post]
-// @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置状态 [id][status]","formatEN":"update alert config status [id][status]"}
-func (b *BaseApi) UpdateAlertConfigStatus(c *gin.Context) {
-	var req dto.AlertConfigStatusUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := alertService.UpdateAlertConfigStatus(req, loadAuditUser(c)); err != nil {
+	if err := alertService.UpdateAlertConfig(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
 	helper.Success(c)
 }

-func loadAuditUser(c *gin.Context) string {
-	userName := strings.TrimSpace(c.GetHeader("X-Panel-User"))
-	if userName == "" {
-		return defaultAuditUser
-	}
-	if decoded, err := url.QueryUnescape(userName); err == nil {
-		return decoded
-	}
-	return userName
-}
-
-// @Tags Alert
-// @Summary Delete alert config
-// @Accept json
-// @Param request body dto.DeleteRequest true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警配置 [id]","formatEN":"delete alert config [id]"}
 func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
 	var req dto.DeleteRequest
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -364,28 +186,11 @@ func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Alert
-// @Summary Test alert config
-// @Accept json
-// @Param request body dto.AlertConfigTest true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /alert/config/test [post]
 func (b *BaseApi) TestAlertConfig(c *gin.Context) {
 	var req dto.AlertConfigTest
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if req.Type == constant.Custom {
-		result, err := alertService.TestCustomAlertConfig(req)
-		if err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-		helper.SuccessWithData(c, result)
-		return
-	}
 	flag, err := alertService.TestAlertConfig(req)
 	if err != nil {
 		helper.InternalServer(c, err)
@@ -1,13 +1,10 @@
 package v2

 import (
-	"net/http"
-
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	"github.com/1Panel-dev/1Panel/agent/i18n"
-	"github.com/1Panel-dev/1Panel/agent/utils/appicon"
 	"github.com/gin-gonic/gin"
 )

@@ -29,7 +26,7 @@ func (b *BaseApi) SearchApp(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, list)
+	helper.SuccessWithData(c, list)
 }

 // @Tags App
@@ -107,7 +104,7 @@ func (b *BaseApi) GetApp(c *gin.Context) {
 // @Accept json
 // @Param appId path integer true "app id"
 // @Param version path string true "app 版本"
-// @Param type path string true "app 类型"
+// @Param version path string true "app 类型"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -131,7 +128,7 @@ func (b *BaseApi) GetAppDetail(c *gin.Context) {
 // @Tags App
 // @Summary Get app detail by id
 // @Accept json
-// @Param id path integer true "id"
+// @Param appId path integer true "id"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -164,7 +161,7 @@ func (b *BaseApi) InstallApp(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	install, err := appService.Install(req, true)
+	install, err := appService.Install(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -172,12 +169,6 @@ func (b *BaseApi) InstallApp(c *gin.Context) {
 	helper.SuccessWithData(c, install)
 }

-// @Tags App
-// @Summary Get app tags
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/tags [get]
 func (b *BaseApi) GetAppTags(c *gin.Context) {
 	tags, err := appService.GetAppTags(c)
 	if err != nil {
@@ -201,61 +192,3 @@ func (b *BaseApi) GetAppListUpdate(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, res)
 }
-
-// @Tags App
-// @Summary Get app icon by app_id
-// @Accept json
-// @Param key path string true "app key"
-// @Success 200 {file} file "app icon"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/icon/:key [get]
-func (b *BaseApi) GetAppIcon(c *gin.Context) {
-	appKey, err := helper.GetStrParamByKey(c, "key")
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	iconBytes, filename, etag, err := appService.GetAppIcon(appKey)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	if len(iconBytes) == 0 {
-		c.Status(http.StatusNoContent)
-		return
-	}
-
-	c.Header("Cache-Control", "public, max-age=2592000")
-
-	if etag != "" && filename != "" {
-		c.Header("ETag", etag)
-		if c.GetHeader("If-None-Match") == etag {
-			c.Status(http.StatusNotModified)
-			return
-		}
-	}
-
-	c.Data(http.StatusOK, appicon.ContentTypePNG, iconBytes)
-}
-
-// @Tags App
-// @Summary Search app detail by appkey and version
-// @Accept json
-// @Param appKey path string true "app key"
-// @Param version path string true "app version"
-// @Success 200 {object} response.AppDetailSimpleDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/detail/node/:appKey/:version [get]
-func (b *BaseApi) GetAppDetailForNode(c *gin.Context) {
-	appKey := c.Param("appKey")
-	version := c.Param("version")
-	appDetailDTO, err := appService.GetAppDetailByKey(appKey, version)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, appDetailDTO)
-}
@@ -109,7 +109,7 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 // @Success 200 {object} response.DatabaseConn
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /apps/installed/conninfo [post]
+// @Router /apps/installed/conninfo [POST]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -203,6 +203,7 @@ func (b *BaseApi) GetServices(c *gin.Context) {
 // @Tags App
 // @Summary Search app update version by install id
 // @Accept json
+// @Param appInstallId path integer true "request"
 // @Success 200 {array} dto.AppVersion
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -266,7 +267,7 @@ func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 // @Tags App
 // @Summary Search params by appInstallId
 // @Accept json
-// @Param appInstallId path integer true "request"
+// @Param appInstallId path string true "request"
 // @Success 200 {object} response.AppConfig
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -293,7 +294,7 @@ func (b *BaseApi) GetParams(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /apps/installed/params/update [post]
-// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"name","output_value":"name"}],"formatZH":"应用参数修改 [name]","formatEN":"Application param update [name]"}
+// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用参数修改 [installId]","formatEN":"Application param update [installId]"}
 func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 	var req request.AppInstalledUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -348,24 +349,3 @@ func (b *BaseApi) GetAppInstallInfo(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, info)
 }
-
-// @Tags App
-// @Summary Update app install sort
-// @Accept json
-// @Param request body request.AppInstallSort true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /apps/installed/sort/update [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新已安装应用排序","formatEN":"update installed app sort"}
-func (b *BaseApi) UpdateAppInstallSort(c *gin.Context) {
-	var req request.AppInstallSort
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := appInstallService.UpdateSort(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
@@ -10,13 +10,6 @@ import (
 	"github.com/gin-gonic/gin"
 )

-// @Tags Backup Account
-// @Summary Check backup used
-// @Param name path string true "name"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /backups/check/{name} [get]
 func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
 	name, err := helper.GetStrParamByKey(c, "name")
 	if err != nil {
@@ -32,23 +25,6 @@ func (b *BaseApi) CheckBackupUsed(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Backup Account
-// @Summary Check backup account
-// @Accept json
-// @Param request body dto.BackupOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /backups/conn/check [post]
-func (b *BaseApi) CheckBackup(c *gin.Context) {
-	var req dto.BackupOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, backupService.CheckConn(req))
-}
-
 // @Tags Backup Account
 // @Summary Create backup account
 // @Accept json
@@ -143,7 +119,7 @@ func (b *BaseApi) DeleteBackup(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /backups/update [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [type]","formatEN":"update backup account [type]"}
+// @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 {
@@ -413,25 +389,15 @@ func (b *BaseApi) Backup(c *gin.Context) {

 	switch req.Type {
 	case "app":
-		record, err := backupService.AppBackup(req)
-		if err != nil {
+		if _, err := backupService.AppBackup(req); err != nil {
 			helper.InternalServer(c, err)
 			return
 		}
-		if req.IsImmediate {
-			helper.SuccessWithData(c, record)
-			return
-		}
 	case "mysql", "mariadb", constant.AppMysqlCluster:
 		if err := backupService.MysqlBackup(req); err != nil {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "mongodb":
-		if err := backupService.MongodbBackup(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlBackup(req); err != nil {
 			helper.InternalServer(c, err)
@@ -447,16 +413,6 @@ func (b *BaseApi) Backup(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "container":
-		if err := backupService.ContainerBackup(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-	case "compose":
-		if err := backupService.ComposeBackup(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	}
 	helper.Success(c)
 }
@@ -492,11 +448,6 @@ func (b *BaseApi) Recover(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "mongodb":
-		if err := backupService.MongodbRecover(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlRecover(req); err != nil {
 			helper.InternalServer(c, err)
@@ -517,16 +468,6 @@ func (b *BaseApi) Recover(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "container":
-		if err := backupService.ContainerRecover(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-	case "compose":
-		if err := backupService.ComposeRecover(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	}
 	helper.Success(c)
 }
@@ -552,11 +493,6 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "mongodb":
-		if err := backupService.MongodbRecoverByUpload(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	case constant.AppPostgresql, constant.AppPostgresqlCluster:
 		if err := backupService.PostgresqlRecoverByUpload(req); err != nil {
 			helper.InternalServer(c, err)
@@ -572,16 +508,6 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 			helper.InternalServer(c, err)
 			return
 		}
-	case "container":
-		if err := backupService.ContainerRecover(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-	case "compose":
-		if err := backupService.ComposeRecover(req); err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
 	}
 	helper.Success(c)
 }
@@ -21,7 +21,7 @@ func (b *BaseApi) CreateClam(c *gin.Context) {
 		return
 	}

-	if err := clamService.Create(req, loadAuditUser(c)); err != nil {
+	if err := clamService.Create(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -43,7 +43,7 @@ func (b *BaseApi) UpdateClam(c *gin.Context) {
 		return
 	}

-	if err := clamService.Update(req, loadAuditUser(c)); err != nil {
+	if err := clamService.Update(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -123,7 +123,7 @@ func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/clam/operate [post]
-// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] Clam"}
+// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] FTP"}
 func (b *BaseApi) OperateClam(c *gin.Context) {
 	var req dto.Operate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -28,28 +28,6 @@ func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 	helper.Success(c)
 }

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

 import (
-	"net/http"
-	"net/url"
-	"path"
 	"strconv"
-	"strings"

 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
@@ -57,162 +53,6 @@ func (b *BaseApi) LoadContainerUsers(c *gin.Context) {
 	helper.SuccessWithData(c, containerService.LoadUsers(req))
 }

-// @Tags Container
-// @Summary List container files
-// @Accept json
-// @Param request body dto.ContainerFileReq true "request"
-// @Success 200 {array} dto.ContainerFileInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/search [post]
-func (b *BaseApi) ListContainerFiles(c *gin.Context) {
-	var req dto.ContainerFileReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	files, err := containerService.ListContainerFiles(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, files)
-}
-
-// @Tags Container
-// @Summary Upload container file
-// @Accept multipart/form-data
-// @Param containerID formData string true "containerID"
-// @Param path formData string true "path"
-// @Param file formData file true "file"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/upload [post]
-// @x-panel-log {"bodyKeys":["containerID","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [containerID] 上传文件到 [path]","formatEN":"Upload file to [path] in container [containerID]"}
-func (b *BaseApi) UploadContainerFile(c *gin.Context) {
-	form, err := c.MultipartForm()
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	containerIDs := form.Value["containerID"]
-	paths := form.Value["path"]
-	uploadFiles := form.File["file"]
-	if len(containerIDs) == 0 || len(paths) == 0 || len(uploadFiles) == 0 {
-		helper.BadRequest(c, errors.New("invalid container file upload params"))
-		return
-	}
-	req := dto.ContainerFileReq{
-		ContainerID: containerIDs[0],
-		Path:        paths[0],
-	}
-	for _, uploadFile := range uploadFiles {
-		file, err := uploadFile.Open()
-		if err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-		err = containerService.UploadContainerFile(req, path.Base(uploadFile.Filename), uploadFile.Size, file)
-		_ = file.Close()
-		if err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-	}
-	helper.Success(c)
-}
-
-// @Tags Container
-// @Summary Get container file content
-// @Accept json
-// @Param request body dto.ContainerFileReq true "request"
-// @Success 200 {object} dto.ContainerFileContent
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/content [post]
-func (b *BaseApi) GetContainerFileContent(c *gin.Context) {
-	var req dto.ContainerFileReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	content, err := containerService.GetContainerFileContent(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, content)
-}
-
-// @Tags Container
-// @Summary Get container file size
-// @Accept json
-// @Param request body dto.ContainerFileReq true "request"
-// @Success 200 {int} size
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/size [post]
-func (b *BaseApi) GetContainerFileSize(c *gin.Context) {
-	var req dto.ContainerFileReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	size, err := containerService.GetContainerFileSize(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, size)
-}
-
-// @Tags Container
-// @Summary Delete container file
-// @Accept json
-// @Param request body dto.ContainerFileBatchDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/del [post]
-// @x-panel-log {"bodyKeys":["containerID","paths"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器 [containerID] 文件 [paths]","formatEN":"Delete files [paths] in container [containerID]"}
-func (b *BaseApi) DeleteContainerFile(c *gin.Context) {
-	var req dto.ContainerFileBatchDeleteReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := containerService.DeleteContainerFile(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Container
-// @Summary Download container file
-// @Accept json
-// @Param request body dto.ContainerFileReq true "request"
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/files/download [post]
-// @x-panel-log {"bodyKeys":["containerID","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载容器 [containerID] 文件 [path]","formatEN":"Download file [path] from container [containerID]"}
-func (b *BaseApi) DownloadContainerFile(c *gin.Context) {
-	var req dto.ContainerFileReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	if req.ContainerID == "" || req.Path == "" {
-		helper.BadRequest(c, errors.New("invalid container file download params"))
-		return
-	}
-	reader, fileName, contentType, err := containerService.DownloadContainerFile(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	defer reader.Close()
-	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(fileName))
-	c.DataFromReader(http.StatusOK, -1, contentType, reader, nil)
-}
-
 // @Tags Container
 // @Summary List containers
 // @Accept json
@@ -395,7 +235,6 @@ func (b *BaseApi) ContainerInfo(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

-// @Tags Container
 // @Summary Load container limits
 // @Success 200 {object} dto.ResourceLimit
 // @Security ApiKeyAuth
@@ -410,7 +249,6 @@ func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

-// @Tags Container
 // @Summary Load container stats
 // @Success 200 {array} dto.ContainerListStats
 // @Security ApiKeyAuth
@@ -425,28 +263,6 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

-// @Tags Container
-// @Summary Load container stats size
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {object} dto.ContainerItemStats
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/item/stats [post]
-func (b *BaseApi) ContainerItemStats(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := containerService.ContainerItemStats(c.Request.Context(), req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Container
 // @Summary Create container
 // @Accept json
@@ -469,6 +285,27 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 	helper.Success(c)
 }

+// @Tags Container
+// @Summary Create container by command
+// @Accept json
+// @Param request body dto.ContainerCreateByCommand true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /containers/command [post]
+func (b *BaseApi) ContainerCreateByCommand(c *gin.Context) {
+	var req dto.ContainerCreateByCommand
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := containerService.ContainerCreateByCommand(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
 // @Tags Container
 // @Summary Upgrade container
 // @Accept json
@@ -477,7 +314,7 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/upgrade [post]
-// @x-panel-log {"bodyKeys":["names","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [names][image]","formatEN":"upgrade container image [names][image]"}
+// @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
 func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 	var req dto.ContainerUpgrade
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -535,28 +372,6 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Container
-// @Summary Clean compose log
-// @Accept json
-// @Param request body dto.ComposeLogClean true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/compose/clean/log [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器编排 [name] 日志","formatEN":"clean compose [name] logs"}
-func (b *BaseApi) CleanComposeLog(c *gin.Context) {
-	var req dto.ComposeLogClean
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := containerService.ComposeLogClean(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Container
 // @Summary Rename Container
 // @Accept json
@@ -666,20 +481,13 @@ func (b *BaseApi) Inspect(c *gin.Context) {
 	helper.SuccessWithData(c, result)
 }

-// @Tags Container
-// @Summary Download container logs
-// @Accept json
-// @Param request body dto.ContainerLog true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
 // @Router /containers/download/log [post]
 func (b *BaseApi) DownloadContainerLogs(c *gin.Context) {
 	var req dto.ContainerLog
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	err := containerService.DownloadContainerLogs(req.ContainerType, req.Container, req.Since, strconv.Itoa(int(req.Tail)), req.Timestamp, c)
+	err := containerService.DownloadContainerLogs(req.ContainerType, req.Container, req.Since, strconv.Itoa(int(req.Tail)), c)
 	if err != nil {
 		helper.InternalServer(c, err)
 	}
@@ -881,62 +689,16 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Container Compose
-// @Summary Pin compose
-// @Accept json
-// @Param request body dto.ComposePin true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/compose/pin [post]
-func (b *BaseApi) ComposePin(c *gin.Context) {
-	var req dto.ComposePin
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := containerService.ComposePin(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Container Compose
-// @Summary Load compose environment variables
-// @Accept json
-// @Param request body dto.FilePath true "request"
-// @Success 200 {array} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /containers/compose/env [post]
-func (b *BaseApi) LoadComposeEnv(c *gin.Context) {
-	var req dto.FilePath
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := containerService.LoadComposeEnv(req.Path)
-	if err != nil {
-		helper.InternalServer(c, err)
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Container
 // @Summary Container logs
 // @Param container query string false "容器名称"
 // @Param since query string false "时间筛选"
 // @Param follow query string false "是否追踪"
 // @Param tail query string false "显示行号"
-// @Param timestamp query string false "是否显示时间"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/search/log [get]
 func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
-	if !strings.Contains(strings.ToLower(c.GetHeader("Accept")), "text/event-stream") {
-		helper.Success(c)
-		return
-	}
 	c.Header("Content-Type", "text/event-stream")
 	c.Header("Cache-Control", "no-cache")
 	c.Header("Connection", "keep-alive")
@@ -945,7 +707,6 @@ func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
 	since := c.Query("since")
 	follow := c.Query("follow") == "true"
 	tail := c.Query("tail")
-	timestamp := c.Query("timestamp") == "true"

 	container := c.Query("container")
 	compose := c.Query("compose")
@@ -955,7 +716,6 @@ func (b *BaseApi) ContainerStreamLogs(c *gin.Context) {
 		Since:     since,
 		Follow:    follow,
 		Tail:      tail,
-		Timestamp: timestamp,
 		Type:      "container",
 	}
 	if compose != "" {
@@ -26,7 +26,7 @@ func (b *BaseApi) CreateCronjob(c *gin.Context) {
 		return
 	}

-	if err := cronjobService.Create(req, loadAuditUser(c)); err != nil {
+	if err := cronjobService.Create(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -91,7 +91,7 @@ func (b *BaseApi) ImportCronjob(c *gin.Context) {
 		return
 	}

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

-	if err := cronjobService.Update(req.ID, req, loadAuditUser(c)); err != nil {
+	if err := cronjobService.Update(req.ID, req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -27,7 +27,7 @@ func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
 // @Tags Dashboard
 // @Summary Load app launcher
 // @Accept json
-// @Success 200 {array} dto.AppLauncher
+// @Success 200 {Array} dto.AppLauncher
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/app/launcher [get]
@@ -37,14 +37,14 @@ func (b *BaseApi) LoadAppLauncher(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, data)
+	helper.SuccessWithData(c, data)
 }

 // @Tags Dashboard
 // @Summary Load app launcher options
 // @Accept json
 // @Param request body dto.SearchByFilter true "request"
-// @Success 200 {array} dto.LauncherOption
+// @Success 200 {Array} dto.LauncherOption
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/app/launcher/option [post]
@@ -85,7 +85,7 @@ func (b *BaseApi) UpdateAppLauncher(c *gin.Context) {

 // @Tags Dashboard
 // @Summary Load quick jump options
-// @Success 200 {array} dto.QuickJump
+// @Success 200 {Array} dto.QuickJump
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /dashboard/quick/option [get]
@@ -179,28 +179,6 @@ func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

-// @Tags Dashboard
-// @Summary Load top cpu processes
-// @Success 200 {array} dto.Process
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/current/top/cpu [get]
-func (b *BaseApi) LoadDashboardTopCPU(c *gin.Context) {
-	data := dashboardService.LoadTopCPU()
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Dashboard
-// @Summary Load top memory processes
-// @Success 200 {array} dto.Process
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /dashboard/current/top/mem [get]
-func (b *BaseApi) LoadDashboardTopMem(c *gin.Context) {
-	data := dashboardService.LoadTopMem()
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Dashboard
 // @Summary System restart
 // @Accept json
@@ -95,7 +95,6 @@ func (b *BaseApi) SearchDatabase(c *gin.Context) {
 // @Success 200 {array} dto.DatabaseOption
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param type path string true "type"
 // @Router /databases/db/list/:type [get]
 func (b *BaseApi) ListDatabase(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
@@ -117,7 +116,6 @@ func (b *BaseApi) ListDatabase(c *gin.Context) {
 // @Success 200 {array} dto.DatabaseItem
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param type path string true "type"
 // @Router /databases/db/item/:type [get]
 func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
@@ -139,7 +137,6 @@ func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 // @Success 200 {object} dto.DatabaseInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param name path string true "name"
 // @Router /databases/db/:name [get]
 func (b *BaseApi) GetDatabase(c *gin.Context) {
 	name, err := helper.GetStrParamByKey(c, "name")
@@ -1,294 +0,0 @@
-package v2
-
-import (
-	"context"
-	"encoding/base64"
-
-	"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 Mongodb
-// @Summary Create mongodb database
-// @Accept json
-// @Param request body dto.MongodbDBCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mongodb 数据库 [name]","formatEN":"create mongodb database [name]"}
-func (b *BaseApi) CreateMongodb(c *gin.Context) {
-	var req dto.MongodbDBCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Password = string(password)
-	}
-
-	if _, err := mongodbService.Create(context.Background(), req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Page mongodb databases
-// @Accept json
-// @Param request body dto.MongodbDBSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/search [post]
-func (b *BaseApi) SearchMongodb(c *gin.Context) {
-	var req dto.MongodbDBSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := mongodbService.SearchWithPage(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
-// @Tags Database Mongodb
-// @Summary Update mongodb database description
-// @Accept json
-// @Param request body dto.UpdateDescription true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/description [post]
-// @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mongodbs","output_column":"name","output_value":"name"}],"formatZH":"mongodb 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the mongodb database [name] is modified => [description]"}
-func (b *BaseApi) UpdateMongodbDescription(c *gin.Context) {
-	var req dto.UpdateDescription
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := mongodbService.UpdateDescription(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Load mongodb database from remote
-// @Accept json
-// @Param request body dto.MongodbLoadDB true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/load [post]
-func (b *BaseApi) LoadMongodbFromRemote(c *gin.Context) {
-	var req dto.MongodbLoadDB
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := mongodbService.LoadFromRemote(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Bind mongodb database user info
-// @Accept json
-// @Param request body dto.MongodbBind true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/bind [post]
-// @x-panel-log {"bodyKeys":["database", "name", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 mongodb 数据库 [database] [name] 用户 [username]","formatEN":"bind mongodb database [database] [name] user [username]"}
-func (b *BaseApi) BindMongodbUser(c *gin.Context) {
-	var req dto.MongodbBind
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Password = string(password)
-	}
-
-	if err := mongodbService.BindUser(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Change mongodb database password
-// @Accept json
-// @Param request body dto.MongodbPassword true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/password [post]
-// @x-panel-log {"bodyKeys":["database", "name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] [name] 密码","formatEN":"update mongodb database [database] [name] password"}
-func (b *BaseApi) ChangeMongodbPassword(c *gin.Context) {
-	var req dto.MongodbPassword
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Password = string(password)
-	}
-
-	if err := mongodbService.ChangePassword(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Change mongodb root password
-// @Accept json
-// @Param request body dto.ChangeDBInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/root/password [post]
-// @x-panel-log {"bodyKeys":["database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] root 密码","formatEN":"update mongodb database [database] root password"}
-func (b *BaseApi) ChangeMongodbRootPassword(c *gin.Context) {
-	var req dto.ChangeDBInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Value) != 0 {
-		value, err := base64.StdEncoding.DecodeString(req.Value)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Value = string(value)
-	}
-
-	if err := mongodbService.ChangeRootPassword(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Load mongodb privileges
-// @Accept json
-// @Param request body dto.MongodbPrivilegesLoad true "request"
-// @Success 200 {string} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/privileges [post]
-func (b *BaseApi) LoadMongodbPrivileges(c *gin.Context) {
-	var req dto.MongodbPrivilegesLoad
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	permission, err := mongodbService.LoadPrivileges(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, permission)
-}
-
-// @Tags Database Mongodb
-// @Summary Change mongodb privileges
-// @Accept json
-// @Param request body dto.MongodbPrivileges true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/privileges/change [post]
-// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mongodb 数据库 [database] 用户 [username] 权限","formatEN":"update mongodb database [database] user [username] privileges"}
-func (b *BaseApi) ChangeMongodbPrivileges(c *gin.Context) {
-	var req dto.MongodbPrivileges
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := mongodbService.ChangePrivileges(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mongodb
-// @Summary Check before delete mongodb database
-// @Accept json
-// @Param request body dto.MongodbDBDeleteCheck true "request"
-// @Success 200 {array} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/del/check [post]
-func (b *BaseApi) DeleteCheckMongodb(c *gin.Context) {
-	var req dto.MongodbDBDeleteCheck
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	apps, err := mongodbService.DeleteCheck(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, apps)
-}
-
-// @Tags Database Mongodb
-// @Summary Delete mongodb database
-// @Accept json
-// @Param request body dto.MongodbDBDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/mongodb/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mongodbs","output_column":"name","output_value":"name"}],"formatZH":"删除 mongodb 数据库 [name]","formatEN":"delete mongodb database [name]"}
-func (b *BaseApi) DeleteMongodb(c *gin.Context) {
-	var req dto.MongodbDBDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	tx, ctx := helper.GetTxAndContext()
-	if err := mongodbService.Delete(ctx, req); err != nil {
-		helper.InternalServer(c, err)
-		tx.Rollback()
-		return
-	}
-	tx.Commit()
-	helper.Success(c)
-}
@@ -41,40 +41,20 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
 }

 // @Tags Database Mysql
-// @Summary List mysql users
+// @Summary Bind user of mysql database
 // @Accept json
-// @Param request body dto.MysqlUserSearch true "request"
-// @Success 200 {array} dto.MysqlUser
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/users/search [post]
-func (b *BaseApi) ListMysqlUsers(c *gin.Context) {
-	var req dto.MysqlUserSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := mysqlService.ListUsers(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Database Mysql
-// @Summary Create mysql user
-// @Accept json
-// @Param request body dto.MysqlUserCreate true "request"
+// @Param request body dto.BindUser true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /databases/users [post]
-// @x-panel-log {"bodyKeys":["database","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mysql 数据库 [database] 用户 [username]@[host]","formatEN":"create mysql database [database] user [username]@[host]"}
-func (b *BaseApi) CreateMysqlUser(c *gin.Context) {
-	var req dto.MysqlUserCreate
+// @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) {
+	var req dto.BindUser
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	if len(req.Password) != 0 {
 		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
@@ -83,191 +63,8 @@ func (b *BaseApi) CreateMysqlUser(c *gin.Context) {
 		}
 		req.Password = string(password)
 	}
-	if err := mysqlService.CreateUser(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}

-// @Tags Database Mysql
-// @Summary Delete mysql user
-// @Accept json
-// @Param request body dto.MysqlUserDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/users/del [post]
-// @x-panel-log {"bodyKeys":["database","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除 mysql 数据库 [database] 用户 [username]@[host]","formatEN":"delete mysql database [database] user [username]@[host]"}
-func (b *BaseApi) DeleteMysqlUser(c *gin.Context) {
-	var req dto.MysqlUserDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := mysqlService.DeleteUser(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mysql
-// @Summary Update mysql user
-// @Accept json
-// @Param request body dto.MysqlUserUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/users/update [post]
-// @x-panel-log {"bodyKeys":["database","username","host","newHost","description"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mysql 数据库 [database] 用户 [username] 访问权限 [host] => [newHost] 描述 [description]","formatEN":"update mysql database [database] user [username] access [host] => [newHost] description [description]"}
-func (b *BaseApi) UpdateMysqlUser(c *gin.Context) {
-	var req dto.MysqlUserUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := mysqlService.UpdateUser(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mysql
-// @Summary Change mysql user password
-// @Accept json
-// @Param request body dto.MysqlUserPassword true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/users/password [post]
-// @x-panel-log {"bodyKeys":["database","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mysql 数据库 [database] 用户 [username]@[host] 密码","formatEN":"update mysql database [database] user [username]@[host] password"}
-func (b *BaseApi) ChangeMysqlUserPassword(c *gin.Context) {
-	var req dto.MysqlUserPassword
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Password = string(password)
-	}
-	if err := mysqlService.ChangeUserPassword(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mysql
-// @Summary Save mysql user password locally
-// @Accept json
-// @Param request body dto.MysqlUserPassword true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/users/password/save [post]
-// @x-panel-log {"bodyKeys":["database","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"补充 mysql 数据库 [database] 用户 [username]@[host] 密码","formatEN":"save mysql database [database] user [username]@[host] password locally"}
-func (b *BaseApi) SaveMysqlUserPassword(c *gin.Context) {
-	var req dto.MysqlUserPassword
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.Password = string(password)
-	}
-	if err := mysqlService.SaveUserPassword(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mysql
-// @Summary List mysql grants
-// @Accept json
-// @Param request body dto.MysqlUserSearch true "request"
-// @Success 200 {array} dto.MysqlGrant
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/grants/search [post]
-func (b *BaseApi) ListMysqlGrants(c *gin.Context) {
-	var req dto.MysqlUserSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := mysqlService.ListGrants(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Database Mysql
-// @Summary List mysql grant summary
-// @Accept json
-// @Param request body dto.MysqlGrantSummarySearch true "request"
-// @Success 200 {object} map[string][]dto.MysqlUser
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/grants/summary [post]
-func (b *BaseApi) ListMysqlGrantSummary(c *gin.Context) {
-	var req dto.MysqlGrantSummarySearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := mysqlService.ListGrantSummary(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Database Mysql
-// @Summary Grant mysql user
-// @Accept json
-// @Param request body dto.MysqlGrantCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/grants [post]
-// @x-panel-log {"bodyKeys":["database","db","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"授权 mysql 数据库 [database] 用户 [username]@[host] 访问 [db]","formatEN":"grant mysql database [database] user [username]@[host] access to [db]"}
-func (b *BaseApi) GrantMysqlUser(c *gin.Context) {
-	var req dto.MysqlGrantCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := mysqlService.GrantUser(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Database Mysql
-// @Summary Revoke mysql grant
-// @Accept json
-// @Param request body dto.MysqlGrantDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/grants/del [post]
-// @x-panel-log {"bodyKeys":["database","db","username","host"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"取消 mysql 数据库 [database] 用户 [username]@[host] 对 [db] 的授权","formatEN":"revoke mysql database [database] user [username]@[host] access to [db]"}
-func (b *BaseApi) RevokeMysqlGrant(c *gin.Context) {
-	var req dto.MysqlGrantDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := mysqlService.RevokeGrant(req); err != nil {
+	if err := mysqlService.BindUser(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -297,14 +94,14 @@ func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
 }

 // @Tags Database Mysql
-// @Summary Change mysql root password
+// @Summary Change mysql password
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/change/password [post]
-// @x-panel-log {"bodyKeys":["database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] root 密码","formatEN":"Update database [database] root password"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 	var req dto.ChangeDBInfo
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -328,14 +125,14 @@ func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 }

 // @Tags Database Mysql
-// @Summary Change mysql root access
+// @Summary Change mysql access
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/change/access [post]
-// @x-panel-log {"bodyKeys":["database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] root 访问权限","formatEN":"Update database [database] root access"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 访问权限","formatEN":"Update database [name] access"}
 func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 	var req dto.ChangeDBInfo
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -398,26 +195,27 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 }

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

 // @Tags Database Mysql
 // @Summary Load mysql database from remote
 // @Accept json
 // @Param request body dto.MysqlLoadDB true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/load [post]
@@ -92,7 +92,7 @@ func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /databases/pg/privileges [post]
-// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] 用户 [username] 权限","formatEN":"Update [username] privileges of database [database]"}
+// @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) {
 	var req dto.PostgresqlPrivileges
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -167,10 +167,8 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 // @Summary Load postgresql database from remote
 // @Accept json
 // @Param request body dto.PostgresqlLoadDB true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param database path string true "database"
 // @Router /databases/pg/:database/load [post]
 func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
 	database, err := helper.GetStrParamByKey(c, "database")
@@ -74,12 +74,6 @@ func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

-// @Tags Database Redis
-// @Summary Check has cli
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /databases/redis/check [get]
 func (b *BaseApi) CheckHasCli(c *gin.Context) {
 	helper.SuccessWithData(c, redisService.CheckHasCli())
 }
@@ -27,7 +27,7 @@ func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 // @Tags Device
 // @Summary list time zone options
 // @Accept json
-// @Success 200 {array} string
+// @Success 200 {Array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/device/zone/options [get]
@@ -12,7 +12,7 @@ import (
 // @Tags Container Docker
 // @Summary Load docker status
 // @Produce json
-// @Success 200 {object} dto.DockerStatus
+// @Success 200 {string} dto.DockerStatus
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/docker/status [get]
@@ -24,7 +24,7 @@ func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 // @Tags Container Docker
 // @Summary Load docker daemon.json
 // @Produce json
-// @Success 200 {string} string
+// @Success 200 {object} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /containers/daemonjson/file [get]
@@ -20,7 +20,6 @@ var (
 	aiToolService      = service.NewIAIToolService()
 	mcpServerService   = service.NewIMcpServerService()
 	tensorrtLLMService = service.NewITensorRTLLMService()
-	agentService       = service.NewIAgentService()

 	containerService       = service.NewIContainerService()
 	composeTemplateService = service.NewIComposeTemplateService()
@@ -31,23 +30,16 @@ var (
 	dbCommonService   = service.NewIDBCommonService()
 	mysqlService      = service.NewIMysqlService()
 	postgresqlService = service.NewIPostgresqlService()
-	mongodbService    = service.NewIMongodbService()
 	databaseService   = service.NewIDatabaseService()
 	redisService      = service.NewIRedisService()

 	cronjobService = service.NewICronjobService()

-	fileService               = service.NewIFileService()
-	fileHistoryService        = service.NewIFileHistoryService()
-	fileShareService          = service.NewIFileShareService()
-	sshService                = service.NewISSHService()
-	firewallService           = service.NewIFirewallService()
-	firewallSettingService    = service.NewIFirewallSettingService()
-	forwardingService         = service.NewIForwardingService()
-	dockerPortGuardService    = service.NewIDockerPortGuardService()
-	monitorService            = service.NewIMonitorService()
-	systemService             = service.NewISystemService()
-	runtimeDiagnosticsService = service.NewIRuntimeDiagnosticsService()
+	fileService     = service.NewIFileService()
+	sshService      = service.NewISSHService()
+	firewallService = service.NewIFirewallService()
+	monitorService  = service.NewIMonitorService()
+	systemService   = service.NewISystemService()

 	deviceService   = service.NewIDeviceService()
 	fail2banService = service.NewIFail2BanService()
@@ -62,7 +54,6 @@ var (
 	websiteDnsAccountService  = service.NewIWebsiteDnsAccountService()
 	websiteSSLService         = service.NewIWebsiteSSLService()
 	websiteAcmeAccountService = service.NewIWebsiteAcmeAccountService()
-	websiteTemplateService    = service.NewIWebsiteTemplateService()

 	nginxService = service.NewINginxService()

@@ -77,7 +68,6 @@ var (

 	recycleBinService = service.NewIRecycleBinService()
 	favoriteService   = service.NewIFavoriteService()
-	hostService       = service.NewIHostService()

 	websiteCAService = service.NewIWebsiteCAService()
 	taskService      = service.NewITaskService()
@@ -28,7 +28,7 @@ func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
 // @Summary Page fail2ban ip list
 // @Accept json
 // @Param request body dto.Fail2BanSearch true "request"
-// @Success 200 {array} string
+// @Success 200 {Array} string
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/search [post]
@@ -51,7 +51,6 @@ func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
 // @Summary Operate fail2ban
 // @Accept json
 // @Param request body dto.Operate true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/operate [post]
@@ -73,8 +72,7 @@ func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
 // @Tags Fail2ban
 // @Summary Operate sshd of fail2ban
 // @Accept json
-// @Param request body dto.Fail2BanSet true "request"
-// @Success 200
+// @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/fail2ban/operate/sshd [post]
@@ -1,91 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags File
-// @Summary Load file history list
-// @Accept json
-// @Param request body request.FileHistorySearchReq true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/history/search [post]
-func (b *BaseApi) SearchFileHistory(c *gin.Context) {
-	var req request.FileHistorySearchReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, items, err := fileHistoryService.Search(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{Items: items, Total: total})
-}
-
-// @Tags File
-// @Summary Load file history content
-// @Accept json
-// @Param request body request.FileHistoryContentReq true "request"
-// @Success 200 {object} response.FileHistoryInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/history/content [post]
-func (b *BaseApi) GetFileHistoryContent(c *gin.Context) {
-	var req request.FileHistoryContentReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	item, err := fileHistoryService.GetContent(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, item)
-}
-
-// @Tags File
-// @Summary Delete file history record
-// @Accept json
-// @Param request body request.FileHistoryDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/history/del [post]
-func (b *BaseApi) DeleteFileHistory(c *gin.Context) {
-	var req request.FileHistoryDeleteReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := fileHistoryService.Delete(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags File
-// @Summary Restore file history record
-// @Accept json
-// @Param request body request.FileHistoryRestoreReq true "request"
-// @Success 200 {object} response.FileInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /files/history/restore [post]
-func (b *BaseApi) RestoreFileHistory(c *gin.Context) {
-	var req request.FileHistoryRestoreReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	info, err := fileHistoryService.Restore(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, info)
-}
@@ -1,53 +1,19 @@
 package v2

 import (
-	"errors"
-	"github.com/1Panel-dev/1Panel/agent/buserr"
-	"net/http"
-
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
-
-	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/utils/docker"
-	"github.com/1Panel-dev/1Panel/agent/utils/firewall/filter"
 	"github.com/gin-gonic/gin"
 )

-func (b *BaseApi) UpdatePanelFirewallPort(c *gin.Context) {
-	if !global.IsMaster {
-		c.AbortWithStatus(http.StatusForbidden)
-		return
-	}
-	var request struct {
-		OldPort uint `json:"oldPort" validate:"required,min=1,max=65535"`
-		NewPort uint `json:"newPort" validate:"required,min=1,max=65535"`
-	}
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	if err := firewallService.UpdatePanelPort(c.Request.Context(), request.OldPort, request.NewPort); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Firewall
 // @Summary Load firewall base info
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {object} dto.FirewallSubsystemStatus
+// @Success 200 {object} dto.FirewallBaseInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/base [post]
+// @Router /hosts/firewall/base [get]
 func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
-	var request dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-
-	data, err := firewallService.LoadBaseInfo(request.Name)
+	data, err := firewallService.LoadBaseInfo()
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -56,361 +22,94 @@ func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }

+// @Tags Firewall
+// @Summary Page firewall rules
+// @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
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := firewallService.SearchWithPage(req)
+	if err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
 // @Tags Firewall
 // @Summary Operate firewall
 // @Accept json
-// @Param request body dto.FirewallLifecycleOperation true "request"
-// @Success 200 {object} dto.FirewallLifecycleOperationResponse
+// @Param request body dto.FirewallOperation true "request"
+// @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) {
-	var request dto.FirewallLifecycleOperation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+	var req dto.FirewallOperation
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

-	result, err := firewallService.QueueFirewallOperation(request)
-	if err != nil {
+	if err := firewallService.OperateFirewall(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}

-	helper.SuccessWithData(c, result)
+	helper.Success(c)
 }

 // @Tags Firewall
-// @Summary Load forwarding base info
+// @Summary Create group
 // @Accept json
-// @Success 200 {object} dto.FirewallSubsystemStatus
+// @Param request body dto.PortRuleOperate true "request"
+// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/forward/base [post]
-func (b *BaseApi) LoadForwardingBaseInfo(c *gin.Context) {
-	data, err := forwardingService.LoadBaseInfo(c.Request.Context())
-	if err != nil {
+// @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) {
+	var req dto.PortRuleOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := firewallService.OperatePortRule(req, true); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, data)
+	helper.Success(c)
 }

+// OperateForwardRule
 // @Tags Firewall
-// @Summary Page forwarding rules
-// @Accept json
-// @Param request body dto.ForwardRuleSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/forward/search [post]
-func (b *BaseApi) SearchForwardingRules(c *gin.Context) {
-	var request dto.ForwardRuleSearch
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	total, items, err := forwardingService.SearchRules(c.Request.Context(), request)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{Items: items, Total: total})
-}
-
-// @Tags Firewall
-// @Summary Operate forwarding rules
+// @Summary Create group
 // @Accept json
 // @Param request body dto.ForwardRuleOperate true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/forward/operate [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新端口转发规则","formatEN":"update port forward rules"}
-func (b *BaseApi) OperateForwardingRules(c *gin.Context) {
-	var request dto.ForwardRuleOperate
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-
-	result, err := forwardingService.OperateRules(request)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Enable forwarding
-// @Accept json
-// @Param request body dto.FirewallInitializationTask true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/forward/enable [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"初始化并启用端口转发","formatEN":"initialize and enable port forwarding"}
-func (b *BaseApi) EnableForwarding(c *gin.Context) {
-	var request dto.FirewallInitializationTask
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := forwardingService.QueueInitialization(request)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Apply/Unload/Init firewall filter chain
-// @Accept json
-// @Param request body dto.FilterChainOperation true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/filter/operate [post]
-// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 防火墙过滤链","formatEN":"[operate] firewall filter chain"}
-func (b *BaseApi) OperateFilterChain(c *gin.Context) {
-	var request dto.FilterChainOperation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	if request.Operate == "init-base" {
-		result, err := firewallService.QueueFilterChainInitialization(request)
-		if err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-		helper.SuccessWithData(c, result)
-		return
-	}
-	if err := firewallService.OperateFilterChain(request); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.FilterChainOperationResponse{})
-}
-
-// @Tags Firewall
-// @Summary List unified firewall v2 rules
-// @Accept json
-// @Param request body dto.FirewallRuleInventory true "request"
-// @Success 200 {object} dto.FirewallRuleInventoryResponse
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/search [post]
-func (b *BaseApi) SearchFirewallRules(c *gin.Context) {
-	var request dto.FirewallRuleInventory
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	inventory, err := firewallService.Inventory(c.Request.Context(), request)
-	if err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, inventory)
-}
-
-// @Tags Firewall
-// @Summary Reset firewall rules
-// @Accept json
-// @Param request body dto.FirewallRuleReset true "request"
-// @Success 200 {object} dto.FirewallRuleResetResponse
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/reset [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重置防火墙规则","formatEN":"reset firewall rules"}
-func (b *BaseApi) ResetFirewallRules(c *gin.Context) {
-	var request dto.FirewallRuleReset
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := firewallService.Reset(c.Request.Context(), request)
-	if err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Load one provider-native firewall object definition
-// @Accept json
-// @Param request body dto.FirewallNativeDetail true "request"
-// @Success 200 {string} string
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/native/detail [post]
-func (b *BaseApi) LoadFirewallNativeDetail(c *gin.Context) {
-	var request dto.FirewallNativeDetail
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	info, err := firewallService.LoadFirewallNativeDetail(c.Request.Context(), request)
-	if err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, info)
-}
-
-// @Tags Firewall
-// @Summary Queue firewall rule creation
-// @Description Creation and import return a taskID immediately; validation and execution results are written to the task log.
-// @Accept json
-// @Param request body dto.FirewallRuleCreate true "request"
-// @Success 200 {object} dto.FirewallRuleCreateResponse
-// @Failure 400 {object} dto.Response
-// @Failure 409 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加防火墙规则","formatEN":"create firewall rules"}
-func (b *BaseApi) CreateFirewallRules(c *gin.Context) {
-	var request dto.FirewallRuleCreate
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := firewallService.Create(c.Request.Context(), request)
-	if err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Queue firewall rule deletion
-// @Description Deletes non-whitelist rules by scope and instance key. Returns a taskID immediately; results are written to the task log.
-// @Accept json
-// @Param request body dto.FirewallRuleDelete true "request"
-// @Success 200 {object} dto.FirewallRuleDeleteResponse
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/delete [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除防火墙规则","formatEN":"delete firewall rules"}
-func (b *BaseApi) DeleteFirewallRules(c *gin.Context) {
-	var request dto.FirewallRuleDelete
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := firewallService.Delete(c.Request.Context(), request)
-	if err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Update a firewall rule
-// @Accept json
-// @Param request body dto.FirewallRuleUpdate true "request"
-// @Success 200
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/update [post]
-// @x-panel-log {"bodyKeys":["instanceKey"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新防火墙规则 [instanceKey]","formatEN":"update firewall rule [instanceKey]"}
-func (b *BaseApi) UpdateFirewallRule(c *gin.Context) {
-	var request dto.FirewallRuleUpdate
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	if err := firewallService.Update(c.Request.Context(), request); err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Firewall
-// @Summary Reorder a firewall rule
-// @Accept json
-// @Param request body dto.FirewallRuleReorder true "request"
-// @Success 200
-// @Failure 400 {object} dto.Response
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/reorder [post]
-// @x-panel-log {"bodyKeys":["instanceKey"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"调整防火墙规则顺序 [instanceKey]","formatEN":"reorder firewall rule [instanceKey]"}
-func (b *BaseApi) ReorderFirewallRule(c *gin.Context) {
-	var request dto.FirewallRuleReorder
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	if err := firewallService.Reorder(c.Request.Context(), request); err != nil {
-		handleFirewallRuleError(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-func handleFirewallRuleError(c *gin.Context, err error) {
-	var businessErr buserr.BusinessError
-	isBusinessError := errors.As(err, &businessErr)
-	switch {
-	case errors.Is(err, filter.ErrProtectedRule):
-		helper.ErrorWithBusinessCode(c, http.StatusBadRequest, "FW_LOCKOUT_RISK", "ErrInvalidParams", err)
-	case errors.Is(err, filter.ErrRuleStale):
-		helper.ErrorWithBusinessCode(c, http.StatusConflict, "FW_RULE_STALE", "ErrInvalidParams", err)
-	case errors.Is(err, filter.ErrUnsupportedScope), errors.Is(err, filter.ErrInvalidScope),
-		errors.Is(err, filter.ErrProviderUnavailable), errors.Is(err, filter.ErrAdapterUnavailable):
-		helper.ErrorWithBusinessCode(c, http.StatusBadRequest, "FW_SCOPE_UNSUPPORTED", "ErrInvalidParams", err)
-	case errors.Is(err, filter.ErrInvalidRule), errors.Is(err, filter.ErrRuleOperation):
-		helper.ErrorWithBusinessCode(c, http.StatusBadRequest, "FW_RULE_UNSUPPORTED", "ErrInvalidParams", err)
-	case isBusinessError && businessErr.Msg == "ErrRecordExist":
-		c.JSON(http.StatusOK, dto.Response{Code: http.StatusConflict, ErrorCode: "FW_RULE_DUPLICATE", Message: err.Error()})
-		c.Abort()
-	case isBusinessError && businessErr.Msg == "ErrFirewallRuleConflict":
-		c.JSON(http.StatusOK, dto.Response{Code: http.StatusConflict, ErrorCode: "FW_RULE_CONFLICT", Message: err.Error()})
-		c.Abort()
-	case isBusinessError && businessErr.Msg == "ErrInvalidParams":
-		c.JSON(http.StatusOK, dto.Response{Code: http.StatusBadRequest, ErrorCode: "FW_RULE_UNSUPPORTED", Message: err.Error()})
-		c.Abort()
-	default:
-		helper.ErrorWithBusinessCode(c, http.StatusInternalServerError, "FW_APPLY_FAILED", "ErrInternalServer", err)
-	}
-}
-
-// @Tags Firewall
-// @Summary Load firewall settings
-// @Success 200 {object} dto.FirewallSettings
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/settings [get]
-func (b *BaseApi) LoadFirewallSettings(c *gin.Context) {
-	data, err := firewallSettingService.Load(c.Request.Context())
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Firewall
-// @Summary Create firewall port whitelist rules
-// @Description Saves whitelist configuration and applies missing allowances; existing rules are not removed.
-// @Accept json
-// @Param request body dto.FirewallPortWhitelistCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/settings/whitelist [post]
-// @x-panel-log {"bodyKeys":["rule"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建防火墙端口白名单","formatEN":"create firewall port whitelist"}
-func (b *BaseApi) CreateFirewallPortWhitelist(c *gin.Context) {
-	var request dto.FirewallPortWhitelistCreate
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @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) {
+	var req dto.ForwardRuleOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := firewallSettingService.CreatePortWhitelist(c.Request.Context(), request); err != nil {
+
+	if err := firewallService.OperateForwardRule(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -418,21 +117,21 @@ func (b *BaseApi) CreateFirewallPortWhitelist(c *gin.Context) {
 }

 // @Tags Firewall
-// @Summary Update firewall port whitelist rules
-// @Description Saves whitelist configuration and applies missing allowances; existing rules are not removed.
+// @Summary Create group
 // @Accept json
-// @Param request body dto.FirewallPortWhitelistUpdate true "request"
+// @Param request body dto.AddrRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/settings/whitelist/update [post]
-// @x-panel-log {"bodyKeys":["oldRule","rule"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"编辑防火墙端口白名单","formatEN":"update firewall port whitelist"}
-func (b *BaseApi) UpdateFirewallPortWhitelist(c *gin.Context) {
-	var request dto.FirewallPortWhitelistUpdate
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @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) {
+	var req dto.AddrRuleOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := firewallSettingService.UpdatePortWhitelist(c.Request.Context(), request); err != nil {
+
+	if err := firewallService.OperateAddressRule(req, true); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -440,21 +139,20 @@ func (b *BaseApi) UpdateFirewallPortWhitelist(c *gin.Context) {
 }

 // @Tags Firewall
-// @Summary Delete firewall port whitelist rules
-// @Description Removes whitelist configuration; existing firewall rules are not removed.
+// @Summary Create group
 // @Accept json
-// @Param request body dto.FirewallPortWhitelistDelete true "request"
+// @Param request body dto.BatchRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/settings/whitelist/delete [post]
-// @x-panel-log {"bodyKeys":["rules"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除防火墙端口白名单","formatEN":"delete firewall port whitelist"}
-func (b *BaseApi) DeleteFirewallPortWhitelist(c *gin.Context) {
-	var request dto.FirewallPortWhitelistDelete
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @Router /hosts/firewall/batch [post]
+func (b *BaseApi) BatchOperateRule(c *gin.Context) {
+	var req dto.BatchRuleOperate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := firewallSettingService.DeletePortWhitelist(c.Request.Context(), request); err != nil {
+
+	if err := firewallService.BatchOperateRule(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -462,26 +160,20 @@ func (b *BaseApi) DeleteFirewallPortWhitelist(c *gin.Context) {
 }

 // @Tags Firewall
-// @Summary Operate firewall backend
+// @Summary Update rule description
 // @Accept json
-// @Param request body dto.FirewallBackendOperation true "request"
+// @Param request body dto.UpdateFirewallDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/settings/operate [post]
-// @x-panel-log {"bodyKeys":["subsystem","backend","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"防火墙子系统 [subsystem] 后端 [operation] [backend]","formatEN":"[operation] firewall [subsystem] backend [backend]"}
-func (b *BaseApi) OperateFirewallBackend(c *gin.Context) {
-	var request dto.FirewallBackendOperation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @Router /hosts/firewall/update/description [post]
+func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
+	var req dto.UpdateFirewallDescription
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := firewallSettingService.Operate(c.Request.Context(), request); err != nil {
-		var businessErr buserr.BusinessError
-		if errors.As(err, &businessErr) && businessErr.Msg == "ErrFirewallBackendCleanupRequired" {
-			c.JSON(http.StatusOK, dto.Response{Code: http.StatusConflict, ErrorCode: "FW_BACKEND_CLEANUP_REQUIRED", Message: err.Error()})
-			c.Abort()
-			return
-		}
+
+	if err := firewallService.UpdateDescription(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -489,192 +181,43 @@ func (b *BaseApi) OperateFirewallBackend(c *gin.Context) {
 }

 // @Tags Firewall
-// @Summary List Docker port guard status and policies
-// @Success 200 {object} dto.DockerPortGuardList
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/docker/ports [get]
-func (b *BaseApi) ListDockerPortGuard(c *gin.Context) {
-	data, err := dockerPortGuardService.LoadOverview(c.Request.Context())
-	if err != nil {
-		handleDockerPortGuardError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Firewall
-// @Summary List Docker published ports
-// @Success 200 {array} dto.DockerPortGuardContainer
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/docker/endpoints [get]
-func (b *BaseApi) ListDockerPublishedPorts(c *gin.Context) {
-	data, err := dockerPortGuardService.LoadPublishedPorts(c.Request.Context())
-	if err != nil {
-		handleDockerPortGuardError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Firewall
-// @Summary Operate Docker port guard
+// @Summary Create group
 // @Accept json
-// @Param request body dto.DockerPortGuardOperation true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
+// @Param request body dto.PortRuleUpdate true "request"
+// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/docker/operate [post]
-// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Docker 端口防护","formatEN":"[operation] Docker port guard"}
-func (b *BaseApi) OperateDockerPortGuard(c *gin.Context) {
-	var request dto.DockerPortGuardOperation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @Router /hosts/firewall/update/port [post]
+func (b *BaseApi) UpdatePortRule(c *gin.Context) {
+	var req dto.PortRuleUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if request.Operation == "initialize" {
-		result, err := dockerPortGuardService.QueueInitialization(request)
-		if err != nil {
-			handleDockerPortGuardError(c, err)
-			return
-		}
-		helper.SuccessWithData(c, result)
-		return
-	}
-	if err := dockerPortGuardService.Operate(c.Request.Context(), request); err != nil {
-		handleDockerPortGuardError(c, err)
+
+	if err := firewallService.UpdatePortRule(req); err != nil {
+		helper.InternalServer(c, err)
 		return
 	}
 	helper.Success(c)
 }

 // @Tags Firewall
-// @Summary Delete Docker port guard policies
+// @Summary Create group
 // @Accept json
-// @Param request body dto.DockerPortGuardPolicyBatchDelete true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
+// @Param request body dto.AddrRuleUpdate true "request"
+// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/firewall/docker/policies/delete/batch [post]
-// @x-panel-log {"bodyKeys":["uuids"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除 Docker 端口防护策略 [uuids]","formatEN":"delete Docker port guard policies [uuids]"}
-func (b *BaseApi) DeleteDockerPortGuardPolicies(c *gin.Context) {
-	var request dto.DockerPortGuardPolicyBatchDelete
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
+// @Router /hosts/firewall/update/addr [post]
+func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
+	var req dto.AddrRuleUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	result, err := dockerPortGuardService.DeletePolicies(request)
-	if err != nil {
-		handleDockerPortGuardError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}

-// @Tags Firewall
-// @Summary Batch upsert Docker port guard policies
-// @Accept json
-// @Param request body dto.DockerPortGuardPolicyBatch true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/docker/policies/batch [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量更新 Docker 端口防护策略","formatEN":"batch update Docker port guard policies"}
-func (b *BaseApi) UpsertDockerPortGuardPolicies(c *gin.Context) {
-	var request dto.DockerPortGuardPolicyBatch
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := dockerPortGuardService.UpsertPolicies(request)
-	if err != nil {
-		handleDockerPortGuardError(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-func handleDockerPortGuardError(c *gin.Context, err error) {
-	var businessErr buserr.BusinessError
-	if errors.As(err, &businessErr) {
-		code, errorCode := http.StatusInternalServerError, ""
-		switch businessErr.Msg {
-		case "ErrDockerIptablesChainUnavailable":
-			code, errorCode = http.StatusServiceUnavailable, "FW_DOCKER_IPTABLES_CHAIN_UNAVAILABLE"
-		case "ErrDockerNftablesChainUnavailable":
-			code, errorCode = http.StatusServiceUnavailable, "FW_DOCKER_NFTABLES_CHAIN_UNAVAILABLE"
-		case "ErrInvalidParams":
-			code, errorCode = http.StatusBadRequest, "FW_DOCKER_GUARD_INVALID"
-		case "ErrDockerFailed":
-			code, errorCode = http.StatusServiceUnavailable, "FW_DOCKER_UNAVAILABLE"
-		}
-		if errorCode != "" {
-			c.JSON(http.StatusOK, dto.Response{Code: code, ErrorCode: errorCode, Message: err.Error()})
-			c.Abort()
-			return
-		}
-	}
-	if errors.Is(err, docker.ErrUnavailable) {
-		helper.ErrorWithBusinessCode(c, http.StatusServiceUnavailable, "FW_DOCKER_UNAVAILABLE", "ErrDockerFailed", err)
-		return
-	}
-	helper.ErrorWithBusinessCode(c, http.StatusInternalServerError, "FW_DOCKER_GUARD_FAILED", "ErrInternalServer", err)
-}
-
-// @Tags Firewall
-// @Summary List firewall rule backups
-// @Param subsystem query string false "Firewall subsystem" Enums(system,forwarding,docker) default(system)
-// @Success 200 {object} dto.FirewallRuleBackups
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/rules/backups [get]
-func (b *BaseApi) ListFirewallRuleBackups(c *gin.Context) {
-	result, err := firewallService.ListRuleBackups(c.Request.Context(), c.DefaultQuery("subsystem", "system"))
-	if err != nil {
+	if err := firewallService.UpdateAddrRule(req); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Initialize, repair or bind one firewall address family
-// @Accept json
-// @Param request body dto.FirewallFamilyOperation true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/family/operate [post]
-// @x-panel-log {"bodyKeys":["subsystem","family","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] [subsystem] [family] 防火墙链","formatEN":"[operation] [subsystem] [family] firewall chains"}
-func (b *BaseApi) OperateFirewallFamily(c *gin.Context) {
-	var request dto.FirewallFamilyOperation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := firewallSettingService.OperateFamily(request)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
-}
-
-// @Tags Firewall
-// @Summary Update firewall IPv6 support
-// @Accept json
-// @Param request body dto.FirewallIPv6Operation true "request"
-// @Success 200 {object} dto.FilterChainOperationResponse
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/firewall/settings/ipv6 [post]
-// @x-panel-log {"bodyKeys":["status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"设置防火墙 IPv6 支持为 [status]","formatEN":"Set firewall IPv6 support to [status]"}
-func (b *BaseApi) OperateFirewallIPv6(c *gin.Context) {
-	var request dto.FirewallIPv6Operation
-	if err := helper.CheckBindAndValidate(&request, c); err != nil {
-		return
-	}
-	result, err := firewallSettingService.OperateIPv6(request)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, result)
+	helper.Success(c)
 }
@@ -54,7 +54,6 @@ func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
 // @Summary Operate FTP
 // @Accept json
 // @Param request body dto.Operate true "request"
-// @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /toolbox/ftp/operate [post]
@@ -1,64 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/utils/ai_tools/accelerator"
-	"github.com/gin-gonic/gin"
-)
-
-// @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 := accelerator.New()
-	if ok {
-		snapshot, err := client.Collect(c.Request.Context())
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		if warning := snapshot.Warning(); warning != nil {
-			global.LOG.Warnf("load realtime accelerator data partially failed, err: %v", warning)
-		}
-		helper.SuccessWithData(c, &snapshot.Info)
-		return
-	}
-	helper.SuccessWithData(c, &accelerator.Info{})
-}
-
-// @Tags AI
-// @Summary Get CPU options
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/gpu/options [get]
-func (b *BaseApi) GetCPUOptions(c *gin.Context) {
-	helper.SuccessWithData(c, monitorService.LoadGPUOptions())
-}
-
-// @Tags Monitor
-// @Summary Load monitor data
-// @Param request body dto.MonitorGPUSearch true "request"
-// @Success 200 {object} dto.MonitorGPUData
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/gpu/search [post]
-func (b *BaseApi) LoadGPUMonitor(c *gin.Context) {
-	var req dto.MonitorGPUSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := monitorService.LoadGPUMonitorData(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
@@ -5,12 +5,6 @@ import (
 	"github.com/gin-gonic/gin"
 )

-// @Tags Health
-// @Summary Check health
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /health/check [get]
 func (b *BaseApi) CheckHealth(c *gin.Context) {
 	helper.Success(c)
 }
@@ -1,14 +1,10 @@
 package helper

 import (
-	"compress/gzip"
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
-	"sync"

 	"github.com/1Panel-dev/1Panel/agent/global"
 	"gorm.io/gorm"
@@ -30,26 +26,6 @@ func ErrorWithDetail(ctx *gin.Context, code int, msgKey string, err error) {
 	ctx.Abort()
 }

-func ErrorWithBusinessCode(ctx *gin.Context, code int, businessCode, msgKey string, err error) {
-	res := dto.Response{
-		Code:      code,
-		ErrorCode: businessCode,
-		Message:   i18n.GetMsgWithDetail(msgKey, err.Error()),
-	}
-	ctx.JSON(http.StatusOK, res)
-	ctx.Abort()
-}
-
-func ErrorWithDetailAndData(ctx *gin.Context, code int, msgKey string, err error, data interface{}) {
-	res := dto.Response{
-		Code: code,
-		Data: data,
-	}
-	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)
 }
@@ -70,42 +46,6 @@ func SuccessWithData(ctx *gin.Context, data interface{}) {
 	ctx.Abort()
 }

-var gzipWriterPool = sync.Pool{
-	New: func() interface{} {
-		return gzip.NewWriter(nil)
-	},
-}
-
-func SuccessWithDataGzipped(ctx *gin.Context, data interface{}) {
-	if !strings.Contains(ctx.GetHeader("Accept-Encoding"), "gzip") {
-		SuccessWithData(ctx, data)
-		return
-	}
-	if data == nil {
-		data = gin.H{}
-	}
-	res := dto.Response{
-		Code: http.StatusOK,
-		Data: data,
-	}
-	jsonBytes, err := json.Marshal(res)
-	if err != nil {
-		ErrorWithDetail(ctx, http.StatusInternalServerError, "ErrInternalServer", err)
-		return
-	}
-
-	ctx.Header("Content-Encoding", "gzip")
-	ctx.Header("Content-Type", "application/json; charset=utf-8")
-	ctx.Status(http.StatusOK)
-
-	gz := gzipWriterPool.Get().(*gzip.Writer)
-	gz.Reset(ctx.Writer)
-	_, _ = gz.Write(jsonBytes)
-	_ = gz.Close()
-	gzipWriterPool.Put(gz)
-	ctx.Abort()
-}
-
 func Success(ctx *gin.Context) {
 	res := dto.Response{
 		Code:    http.StatusOK,
@@ -1,243 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/utils/encrypt"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Host
-// @Summary Create host
-// @Accept json
-// @Param request body dto.HostOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts [post]
-// @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建主机 [name][addr]","formatEN":"create host [name][addr]"}
-func (b *BaseApi) CreateHost(c *gin.Context) {
-	var req dto.HostOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	host, err := hostService.Create(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, host)
-}
-
-// @Tags Host
-// @Summary Test by info
-// @Accept json
-// @Param request body dto.HostConnTest true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/test/byinfo [post]
-func (b *BaseApi) TestByInfo(c *gin.Context) {
-	var req dto.HostConnTest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, hostService.TestByInfo(req))
-}
-
-// @Tags Host
-// @Summary Test by ID
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/test/byid [post]
-func (b *BaseApi) TestByID(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	helper.SuccessWithData(c, hostService.TestLocalConn(req.ID))
-}
-
-// @Tags Host
-// @Summary Host tree
-// @Accept json
-// @Param request body dto.SearchForTree true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/tree [post]
-func (b *BaseApi) HostTree(c *gin.Context) {
-	var req dto.SearchForTree
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := hostService.SearchForTree(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Host
-// @Summary Search host
-// @Accept json
-// @Param request body dto.SearchPageWithGroup true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/search [post]
-func (b *BaseApi) SearchHost(c *gin.Context) {
-	var req dto.SearchPageWithGroup
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := hostService.SearchWithPage(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{Items: list, Total: total})
-}
-
-// @Tags Host
-// @Summary Delete host
-// @Accept json
-// @Param request body dto.OperateByIDs true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/del [post]
-// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"hosts","output_column":"name","output_value":"names"}],"formatZH":"删除主机 [names]","formatEN":"delete host [names]"}
-func (b *BaseApi) DeleteHost(c *gin.Context) {
-	var req dto.OperateByIDs
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := hostService.Delete(req.IDs); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Host
-// @Summary Update host
-// @Accept json
-// @Param request body dto.HostOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/update [post]
-// @x-panel-log {"bodyKeys":["name","addr"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新主机 [name][addr]","formatEN":"update host [name][addr]"}
-func (b *BaseApi) UpdateHost(c *gin.Context) {
-	var req dto.HostOperate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	var err error
-	if len(req.Password) != 0 && req.AuthMode == "password" {
-		req.Password, err = hostService.EncryptHost(req.Password)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		req.PrivateKey = ""
-		req.PassPhrase = ""
-	}
-	if len(req.PrivateKey) != 0 && req.AuthMode == "key" {
-		req.PrivateKey, err = hostService.EncryptHost(req.PrivateKey)
-		if err != nil {
-			helper.BadRequest(c, err)
-			return
-		}
-		if len(req.PassPhrase) != 0 {
-			req.PassPhrase, err = encrypt.StringEncrypt(req.PassPhrase)
-			if err != nil {
-				helper.BadRequest(c, err)
-				return
-			}
-		}
-		req.Password = ""
-	}
-
-	upMap := map[string]interface{}{
-		"name":              req.Name,
-		"group_id":          req.GroupID,
-		"addr":              req.Addr,
-		"port":              req.Port,
-		"user":              req.User,
-		"auth_mode":         req.AuthMode,
-		"remember_password": req.RememberPassword,
-		"description":       req.Description,
-	}
-	if req.AuthMode == "password" {
-		upMap["password"] = req.Password
-		upMap["private_key"] = ""
-		upMap["pass_phrase"] = ""
-	} else {
-		upMap["password"] = ""
-		upMap["private_key"] = req.PrivateKey
-		upMap["pass_phrase"] = req.PassPhrase
-	}
-	hostItem, err := hostService.Update(req.ID, upMap)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, hostItem)
-}
-
-// @Tags Host
-// @Summary Update host group
-// @Accept json
-// @Param request body dto.ChangeGroup true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/update/group [post]
-// @x-panel-log {"bodyKeys":["id","groupID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"hosts","output_column":"name","output_value":"name"}],"formatZH":"更新主机 [name] 分组","formatEN":"update host [name] group"}
-func (b *BaseApi) UpdateHostGroup(c *gin.Context) {
-	var req dto.ChangeGroup
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if _, err := hostService.Update(req.ID, map[string]interface{}{"group_id": req.GroupID}); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Host
-// @Summary Get host by ID
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/info [post]
-func (b *BaseApi) GetHostByID(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	info, err := hostService.GetHostByID(req.ID)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, info)
-}
@@ -9,13 +9,13 @@ import (
 // @Tags Host tool
 // @Summary Get tool status
 // @Accept json
-// @Param request body request.HostToolTypeReq true "request"
+// @Param request body request.HostToolReq true "request"
 // @Success 200 {object} response.HostToolRes
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/tool/status [post]
+// @Router /hosts/tool [post]
 func (b *BaseApi) GetToolStatus(c *gin.Context) {
-	var req request.HostToolTypeReq
+	var req request.HostToolReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -53,14 +53,14 @@ func (b *BaseApi) InitToolConfig(c *gin.Context) {
 // @Tags Host tool
 // @Summary Operate tool
 // @Accept json
-// @Param request body request.HostToolOperateReq true "request"
+// @Param request body request.HostToolReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @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.HostToolOperateReq
+	var req request.HostToolReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -75,18 +75,19 @@ func (b *BaseApi) OperateTool(c *gin.Context) {
 // @Tags Host tool
 // @Summary Get tool config
 // @Accept json
-// @Param request body request.HostToolTypeReq true "request"
+// @Param request body request.HostToolConfig true "request"
 // @Success 200 {object} response.HostToolConfig
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /hosts/tool/config/get [post]
-func (b *BaseApi) GetToolConfig(c *gin.Context) {
-	var req request.HostToolTypeReq
+// @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
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

-	config, err := hostToolService.GetToolConfig(req)
+	config, err := hostToolService.OperateToolConfig(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -94,28 +95,6 @@ func (b *BaseApi) GetToolConfig(c *gin.Context) {
 	helper.SuccessWithData(c, config)
 }

-// @Tags Host tool
-// @Summary Update tool config
-// @Accept json
-// @Param request body request.HostToolConfigUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/tool/config/set [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 [type] 主机工具配置文件 ","formatEN":"update [type] tool config"}
-func (b *BaseApi) UpdateToolConfig(c *gin.Context) {
-	var req request.HostToolConfigUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := hostToolService.UpdateToolConfig(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Host tool
 // @Summary Create Supervisor process
 // @Accept json
@@ -158,44 +137,18 @@ func (b *BaseApi) GetProcess(c *gin.Context) {
 // @Tags Host tool
 // @Summary Get Supervisor process config file
 // @Accept json
-// @Param request body request.HostSupervisorProcessFileGetReq true "request"
-// @Success 200 {string} content
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/tool/supervisor/process/file/get [post]
-func (b *BaseApi) GetProcessFile(c *gin.Context) {
-	var req request.HostSupervisorProcessFileGetReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	content, err := hostToolService.GetSupervisorProcessFile(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, content)
-}
-
-// @Tags Host tool
-// @Summary Operate Supervisor process config file
-// @Accept json
-// @Param request body request.HostSupervisorProcessFileOperateReq true "request"
+// @Param request body request.SupervisorProcessFileReq true "request"
 // @Success 200 {string} content
 // @Security ApiKeyAuth
 // @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) OperateProcessFile(c *gin.Context) {
-	var req request.HostSupervisorProcessFileOperateReq
+func (b *BaseApi) GetProcessFile(c *gin.Context) {
+	var req request.SupervisorProcessFileReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	content, err := hostToolService.OperateSupervisorProcessFile(request.SupervisorProcessFileReq{
-		Name:    req.Name,
-		Operate: req.Operate,
-		Content: req.Content,
-		File:    req.File,
-	})
+	content, err := hostToolService.OperateSupervisorProcessFile(req)
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
@@ -2,7 +2,6 @@ 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"
 )

@@ -21,57 +20,3 @@ func (b *BaseApi) GetSystemFiles(c *gin.Context) {

 	helper.SuccessWithData(c, data)
 }
-
-// @Tags Logs
-// @Summary Get host system log status
-// @Produce json
-// @Success 200 {object} dto.SystemLogStatus
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /logs/system/status [get]
-func (b *BaseApi) GetSystemLogStatus(c *gin.Context) {
-	data, err := logService.GetSystemLogStatus()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Logs
-// @Summary Read host logs
-// @Accept json
-// @Param request body dto.SystemLogReq true "request"
-// @Produce json
-// @Success 200 {object} dto.SystemLogRes
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /logs/system/read [post]
-func (b *BaseApi) ReadSystemLog(c *gin.Context) {
-	var req dto.SystemLogReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := logService.ReadSystemLog(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Logs
-// @Summary List running host services
-// @Produce json
-// @Success 200 {array} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /logs/system/services [get]
-func (b *BaseApi) ListRunningServices(c *gin.Context) {
-	data, err := logService.ListRunningServices()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
@@ -23,27 +23,6 @@ func (b *BaseApi) PageMcpServers(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }

-// @Tags McpServer
-// @Summary Load mcp server detail
-// @Accept json
-// @Param request body request.McpServerDetail true "request"
-// @Success 200 {object} response.McpServerDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/mcp/server/detail [post]
-func (b *BaseApi) LoadMcpServerDetail(c *gin.Context) {
-	var req request.McpServerDetail
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := mcpServerService.Detail(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
 // @Tags McpServer
 // @Summary Create mcp server
 // @Accept json
@@ -128,48 +107,6 @@ func (b *BaseApi) OperateMcpServer(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags McpServer
-// @Summary Sync mcp server status
-// @Accept json
-// @Param request body request.McpServerStatusSync true "request"
-// @Success 200 {array} response.McpServerStatusDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/mcp/server/status/sync [post]
-func (b *BaseApi) SyncMcpServerStatus(c *gin.Context) {
-	var req request.McpServerStatusSync
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := mcpServerService.SyncStatus(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags McpServer
-// @Summary Test mcp server connection
-// @Accept json
-// @Param request body request.McpServerConnectionTest true "request"
-// @Success 200 {object} response.McpServerConnectionTestRes
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/mcp/server/connection/test [post]
-func (b *BaseApi) TestMcpServerConnection(c *gin.Context) {
-	var req request.McpServerConnectionTest
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := mcpServerService.TestConnection(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
 // @Tags McpServer
 // @Summary Bind Domain for mcp server
 // @Accept json
@@ -1,9 +1,13 @@
 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/v4/disk"
+	"github.com/shirou/gopsutil/v4/net"
 )

 // @Tags Monitor
@@ -24,23 +28,18 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithDataGzipped(c, data)
+	helper.SuccessWithData(c, data)
 }

 // @Tags Monitor
-// @Summary Clean host or GPU monitor data
-// @Param request body dto.MonitorClean true "request"
+// @Summary Clean monitor data
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/monitor/clean [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空 [type] 监控数据","formatEN":"clean [type] monitoring data"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空监控数据","formatEN":"clean monitor datas"}
 func (b *BaseApi) CleanMonitor(c *gin.Context) {
-	var req dto.MonitorClean
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := monitorService.CleanData(req.Type); err != nil {
+	if err := monitorService.CleanData(); err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -71,7 +70,7 @@ func (b *BaseApi) LoadMonitorSetting(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/monitor/setting/update [post]
-// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改默认监控网卡 [key]-[value]","formatEN":"update default monitor [key]-[value]"}
+// @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 {
@@ -85,22 +84,24 @@ func (b *BaseApi) UpdateMonitorSetting(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Monitor
-// @Summary Get network options
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/monitor/netoptions [get]
 func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
-	helper.SuccessWithData(c, monitorService.LoadNetworkOptions())
+	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)
 }

-// @Tags Monitor
-// @Summary Get IO options
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/monitor/iooptions [get]
 func (b *BaseApi) GetIOOptions(c *gin.Context) {
-	helper.SuccessWithData(c, monitorService.LoadIOOptions())
+	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)
 }
@@ -1,45 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/gin-gonic/gin"
-)
-
-func (b *BaseApi) LoadVLLMMonitor(c *gin.Context) {
-	var req dto.MonitorVLLMSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := monitorService.LoadVLLMMonitorData(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-func (b *BaseApi) LoadVLLMCurrent(c *gin.Context) {
-	var req dto.MonitorVLLMCurrent
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	data, err := monitorService.LoadVLLMCurrent(c.Request.Context(), req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-func (b *BaseApi) CleanVLLMMonitor(c *gin.Context) {
-	var req dto.MonitorVLLMClean
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := monitorService.CleanVLLMMonitor(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
@@ -161,13 +161,13 @@ func (b *BaseApi) GetNginxModules(c *gin.Context) {
 // @Tags OpenResty
 // @Summary Operate default HTTPs
 // @Accept json
-// @Param request body request.NginxDefaultHTTPSUpdate true "request"
+// @Param request body request.NginxOperateReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /openresty/https [post]
 func (b *BaseApi) OperateDefaultHTTPs(c *gin.Context) {
-	var req request.NginxDefaultHTTPSUpdate
+	var req request.NginxOperateReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -5,20 +5,9 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
 	websocket2 "github.com/1Panel-dev/1Panel/agent/utils/websocket"
 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 )

-// @Tags Process
-// @Summary Process ws
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /process/ws [get]
 func (b *BaseApi) ProcessWs(c *gin.Context) {
-	if !websocket.IsWebSocketUpgrade(c.Request) {
-		helper.Success(c)
-		return
-	}
 	ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		return
@@ -51,7 +40,7 @@ func (b *BaseApi) StopProcess(c *gin.Context) {
 // @Tags Process
 // @Summary Get Process Info By PID
 // @Param pid path int true "PID"
-// @Success 200
+// @Success 200 {object} websocket.PsProcessData
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /process/{pid} [get]
@@ -68,18 +57,3 @@ func (b *BaseApi) GetProcessInfoByPID(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, data)
 }
-
-// @Tags Process
-// @Summary Get Listening Process
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /process/listening [post]
-func (b *BaseApi) GetListeningProcess(c *gin.Context) {
-	procs, err := processService.GetListeningProcess(c)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.SuccessWithData(c, procs)
-}
@@ -61,7 +61,7 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /runtimes/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除运行环境 [id]","formatEN":"Delete runtime [id]"}
+// @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 {
@@ -81,7 +81,6 @@ func (b *BaseApi) DeleteRuntime(c *gin.Context) {
 // @Success 200 {array} dto.AppResource
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param id path integer true "id"
 // @Router /runtimes/installed/delete/check/:id [get]
 func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
 	runTimeId, err := helper.GetIntParamByKey(c, "id")
@@ -121,7 +120,7 @@ func (b *BaseApi) UpdateRuntime(c *gin.Context) {
 // @Tags Runtime
 // @Summary Get runtime
 // @Accept json
-// @Param id path integer true "request"
+// @Param id path string true "request"
 // @Success 200 {object} response.RuntimeDTO
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -169,7 +168,7 @@ func (b *BaseApi) GetNodePackageRunScript(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /runtimes/operate [post]
-// @x-panel-log {"bodyKeys":["ID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ID","isList":false,"db":"runtimes","output_column":"name","output_value":"name"}],"formatZH":"操作运行环境 [name]","formatEN":"Operate runtime [name]"}
+// @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 {
@@ -243,7 +242,7 @@ func (b *BaseApi) SyncStatus(c *gin.Context) {
 // @Tags Runtime
 // @Summary Get php runtime extension
 // @Accept json
-// @Param id path integer true "request"
+// @Param id path string true "request"
 // @Success 200 {object} response.PHPExtensionRes
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -1,63 +0,0 @@
-package v2
-
-import (
-	"os"
-
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags RuntimeDiagnostics
-// @Summary Load runtime diagnostics summary
-// @Success 200 {object} dto.RuntimeDiagnosticsSummary
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/diagnostics/summary [get]
-func (b *BaseApi) LoadRuntimeDiagnosticsSummary(c *gin.Context) {
-	data, err := runtimeDiagnosticsService.Summary()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags RuntimeDiagnostics
-// @Summary Load grouped goroutine snapshot
-// @Success 200 {object} dto.RuntimeGoroutineSnapshot
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/diagnostics/goroutines [get]
-func (b *BaseApi) LoadRuntimeGoroutines(c *gin.Context) {
-	data, err := runtimeDiagnosticsService.Goroutines()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithDataGzipped(c, data)
-}
-
-// @Tags RuntimeDiagnostics
-// @Summary Capture runtime profile
-// @Param request body dto.RuntimeProfileCreate true "request"
-// @Success 200 {file} file
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/diagnostics/profiles [post]
-func (b *BaseApi) CreateRuntimeProfile(c *gin.Context) {
-	var req dto.RuntimeProfileCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	profile, err := runtimeDiagnosticsService.CreateProfile(req)
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	defer os.Remove(profile.Path)
-	c.Header("Content-Disposition", `attachment; filename="`+profile.Name+`"`)
-	c.Header("Content-Type", "application/octet-stream")
-	c.File(profile.Path)
-	c.Abort()
-}
@@ -1,12 +1,15 @@
 package v2

 import (
+	"encoding/json"
+
 	"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/model"
 	"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
@@ -24,21 +27,6 @@ func (b *BaseApi) GetSettingInfo(c *gin.Context) {
 	helper.SuccessWithData(c, setting)
 }

-// @Tags System Setting
-// @Summary Get terminal AI setting info
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/terminal/ai/search [post]
-func (b *BaseApi) GetTerminalAISettingInfo(c *gin.Context) {
-	setting, err := settingService.GetTerminalAIInfo()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, setting)
-}
-
 // @Tags System Setting
 // @Summary Load system available status
 // @Success 200
@@ -52,14 +40,14 @@ func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
 // @Tags System Setting
 // @Summary Update system setting
 // @Accept json
-// @Param request body dto.AgentSettingUpdate true "request"
+// @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.AgentSettingUpdate
+	var req dto.SettingUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -71,109 +59,6 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags System Setting
-// @Summary Update terminal AI setting
-// @Accept json
-// @Param request body dto.TerminalAIInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/terminal/ai/update [post]
-// @x-panel-log {"bodyKeys":["aiStatus","aiAccountId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新终端 AI 设置 [aiStatus][aiAccountId]","formatEN":"update terminal AI setting [aiStatus][aiAccountId]"}
-func (b *BaseApi) UpdateTerminalAISetting(c *gin.Context) {
-	var req dto.TerminalAIInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := settingService.UpdateTerminalAI(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags System Setting
-// @Summary Get file manage AI setting info
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/files/ai/search [post]
-func (b *BaseApi) GetFileManageAISettingInfo(c *gin.Context) {
-	setting, err := settingService.GetFileManageAIInfo()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, setting)
-}
-
-// @Tags System Setting
-// @Summary Update file manage AI setting
-// @Accept json
-// @Param request body dto.FileManageAIInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/files/ai/update [post]
-// @x-panel-log {"bodyKeys":["aiStatus","aiAccountId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新文件管理 AI 设置 [aiStatus][aiAccountId]","formatEN":"update file manage AI setting [aiStatus][aiAccountId]"}
-func (b *BaseApi) UpdateFileManageAISetting(c *gin.Context) {
-	var req dto.FileManageAIInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := settingService.UpdateFileManageAI(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags System Setting
-// @Summary Load file history setting info
-// @Success 200 {object} response.FileHistorySettingInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/file-history/search [post]
-func (b *BaseApi) GetFileHistorySettingInfo(c *gin.Context) {
-	setting, err := settingService.GetFileHistorySettingInfo()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, setting)
-}
-
-// @Tags System Setting
-// @Summary Update file history setting
-// @Accept json
-// @Param request body request.FileHistorySettingUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/file-history/update [post]
-func (b *BaseApi) UpdateFileHistorySetting(c *gin.Context) {
-	var req request.FileHistorySettingUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := settingService.UpdateFileHistorySetting(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags System Setting
-// @Summary Load website dir
-// @Success 200 {string} path
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/website/dir [get]
-func (b *BaseApi) LoadWebsiteDir(c *gin.Context) {
-	helper.SuccessWithData(c, settingService.GetWebsiteDir())
-}
-
 // @Tags System Setting
 // @Summary Load local backup dir
 // @Success 200 {string} path
@@ -194,45 +79,14 @@ func (b *BaseApi) LoadLocalConn(c *gin.Context) {
 	helper.SuccessWithData(c, settingService.GetLocalConn())
 }

-// @Tags System Setting
-// @Summary Check local conn
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/ssh/check [post]
 func (b *BaseApi) CheckLocalConn(c *gin.Context) {
-	client, err := loadLocalConn()
-	if err == nil && client != nil {
-		client.Close()
-	}
+	_, err := loadLocalConn()
 	helper.SuccessWithData(c, err == nil)
 }

-// @Tags System Setting
-// @Summary Update local is conn
-// @Accept json
-// @Param request body dto.SSHDefaultConn true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /settings/ssh/default [post]
-// @x-panel-log {"bodyKeys":["defaultConn"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"本地终端默认连接 [defaultConn]","formatEN":"update system default conn [defaultConn]"}
-func (b *BaseApi) SetDefaultIsConn(c *gin.Context) {
-	var req dto.SSHDefaultConn
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := settingService.SetDefaultIsConn(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags System Setting
 // @Summary Check local conn info
-// @Success 200 {boolean} isOk
+// @Success 200 {bool} isOk
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /settings/ssh/check/info [post]
@@ -265,8 +119,12 @@ func (b *BaseApi) SaveLocalConn(c *gin.Context) {
 }

 func loadLocalConn() (*ssh.SSHClient, error) {
-	connInDB, err := settingService.GetLocalConnForSSH()
-	if err != nil {
+	connInfoInDB := settingService.GetSettingByKey("LocalSSHConn")
+	if len(connInfoInDB) == 0 {
+		return nil, errors.New("no such ssh conn info in db!")
+	}
+	var connInDB model.LocalConnInfo
+	if err := json.Unmarshal([]byte(connInfoInDB), &connInDB); err != nil {
 		return nil, err
 	}
 	sshInfo := ssh.ConnInfo{
@@ -282,22 +140,18 @@ func loadLocalConn() (*ssh.SSHClient, error) {
 }

 // @Tags System Setting
-// @Summary Save common description
-// @Accept json
-// @Param request body dto.CommonDescription true "request"
-// @Success 200
+// @Summary Load system setting by key
+// @Param key path string true "key"
+// @Success 200 {object} dto.SettingInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /settings/description/save [post]
-func (b *BaseApi) SaveDescription(c *gin.Context) {
-	var req dto.CommonDescription
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+// @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
 	}
-
-	if err := settingService.SaveDescription(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
+	value := settingService.GetSettingByKey(key)
+	helper.SuccessWithData(c, value)
 }
@@ -53,7 +53,7 @@ func (b *BaseApi) OperateSSH(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/ssh/update [post]
-// @x-panel-log {"bodyKeys":["key","newValue"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [newValue]","formatEN":"update SSH setting [key] => [newValue]"}
+// @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [value]","formatEN":"update SSH setting [key] => [value]"}
 func (b *BaseApi) UpdateSSH(c *gin.Context) {
 	var req dto.SSHUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -83,7 +83,6 @@ func (b *BaseApi) CreateRootCert(c *gin.Context) {
 	}
 	if err := loadCertAfterDecrypt(&req); err != nil {
 		helper.BadRequest(c, err)
-		return
 	}
 	if err := sshService.CreateRootCert(req); err != nil {
 		helper.InternalServer(c, err)
@@ -108,7 +107,6 @@ func (b *BaseApi) EditRootCert(c *gin.Context) {
 	}
 	if err := loadCertAfterDecrypt(&req); err != nil {
 		helper.BadRequest(c, err)
-		return
 	}
 	if err := sshService.EditRootCert(req); err != nil {
 		helper.InternalServer(c, err)
@@ -226,21 +224,6 @@ func (b *BaseApi) ExportSSHLogs(c *gin.Context) {
 	helper.SuccessWithData(c, tmpFile)
 }

-// @Tags SSH
-// @Summary Clean host SSH logs
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/ssh/log/clean [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空 SSH 登录日志","formatEN":"clean SSH login logs"}
-func (b *BaseApi) CleanSSHLogs(c *gin.Context) {
-	if err := sshService.CleanLog(); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags SSH
 // @Summary Load host SSH conf
 // @Accept json
@@ -266,14 +249,14 @@ func (b *BaseApi) LoadSSHFile(c *gin.Context) {
 // @Tags SSH
 // @Summary Update host SSH setting by file
 // @Accept json
-// @Param request body dto.SSHConfUpdate true "request"
+// @Param request body dto.SSHConf true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /hosts/ssh/file/update [post]
 // @x-panel-log {"bodyKeys":["key"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件 [key]","formatEN":"update SSH conf [key]"}
 func (b *BaseApi) UpdateSSHByFile(c *gin.Context) {
-	var req dto.SSHConfUpdate
+	var req dto.SettingUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -9,7 +9,7 @@ import (
 // @Tags Host
 // @Summary Check if a system component exists
 // @Accept json
-// @Param name path string true "Component name to check (e.g., rsync, docker)"
+// @Param name query string true "Component name to check (e.g., rsync, docker)"
 // @Success 200 {object} response.ComponentInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -3,8 +3,6 @@ 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/1Panel-dev/1Panel/agent/app/dto/response"
 	"github.com/gin-gonic/gin"
 )

@@ -32,34 +30,9 @@ func (b *BaseApi) PageTasks(c *gin.Context) {
 	})
 }

-// @Tags TaskLog
-// @Summary Read task log by Line
-// @Param request body request.TaskLogReadReq true "request"
-// @Success 200 {object} response.FileLineContent
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /logs/tasks/read [post]
-func (b *BaseApi) ReadTaskLogByLine(c *gin.Context) {
-	var req request.TaskLogReadReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	var res *response.FileLineContent
-	res, err := taskService.ReadByLine(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	if res.TotalLines > 100 {
-		helper.SuccessWithDataGzipped(c, res)
-	} else {
-		helper.SuccessWithData(c, res)
-	}
-}
-
 // @Tags TaskLog
 // @Summary Get the number of executing tasks
-// @Success 200 {integer} int64
+// @Success 200 {object} int64
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /logs/tasks/executing/count [get]
@@ -6,14 +6,6 @@ import (
 	"github.com/gin-gonic/gin"
 )

-// @Tags TensorRT LLM
-// @Summary Page TensorRT LLMs
-// @Accept json
-// @Param request body request.TensorRTLLMSearch true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/tensorrt/search [post]
 func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
 	var req request.TensorRTLLMSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -23,15 +15,6 @@ func (b *BaseApi) PageTensorRTLLMs(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }

-// @Tags TensorRT LLM
-// @Summary Create TensorRT LLM
-// @Accept json
-// @Param request body request.TensorRTLLMCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/tensorrt/create [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 TensorRT LLM [name]","formatEN":"create TensorRT LLM [name]"}
 func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
 	var req request.TensorRTLLMCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -45,15 +28,6 @@ func (b *BaseApi) CreateTensorRTLLM(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags TensorRT LLM
-// @Summary Update TensorRT LLM
-// @Accept json
-// @Param request body request.TensorRTLLMUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/tensorrt/update [post]
-// @x-panel-log {"bodyKeys":["id","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 TensorRT LLM [id][name]","formatEN":"update TensorRT LLM [id][name]"}
 func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
 	var req request.TensorRTLLMUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -67,15 +41,6 @@ func (b *BaseApi) UpdateTensorRTLLM(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags TensorRT LLM
-// @Summary Delete TensorRT LLM
-// @Accept json
-// @Param request body request.TensorRTLLMDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/tensorrt/delete [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除 TensorRT LLM [id]","formatEN":"delete TensorRT LLM [id]"}
 func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
 	var req request.TensorRTLLMDelete
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -89,15 +54,6 @@ func (b *BaseApi) DeleteTensorRTLLM(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags TensorRT LLM
-// @Summary Operate TensorRT LLM
-// @Accept json
-// @Param request body request.TensorRTLLMOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /ai/tensorrt/operate [post]
-// @x-panel-log {"bodyKeys":["id","operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作 TensorRT LLM [id][operate]","formatEN":"operate TensorRT LLM [id][operate]"}
 func (b *BaseApi) OperateTensorRTLLM(c *gin.Context) {
 	var req request.TensorRTLLMOperate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -1,299 +1,91 @@
 package v2

 import (
-	"crypto/sha256"
 	"encoding/base64"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"

-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-	"github.com/1Panel-dev/1Panel/agent/app/service"
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/utils/cmd"
-	"github.com/1Panel-dev/1Panel/agent/utils/ssh"
 	"github.com/1Panel-dev/1Panel/agent/utils/terminal"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
-	gossh "golang.org/x/crypto/ssh"
 )

-// @Tags Terminal
-// @Summary Ws local terminal
-// @Param command query string false "command"
-// @Param session query string false "session id to reattach"
-// @Param terminalPersistent query boolean false "allow recovery after an unexpected disconnect"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/local [get]
-func (b *BaseApi) WsLocalTerminal(c *gin.Context) {
-	b.runSSHSession(c, "local", loadLocalConn, c.DefaultQuery("command", ""))
-}
-
-// @Tags Terminal
-// @Summary Ws host SSH
-// @Param id query integer false "id"
-// @Param command query string false "command"
-// @Param session query string false "session id to reattach"
-// @Param title query string false "session title shown in the session list"
-// @Param terminalPersistent query boolean false "allow recovery after an unexpected disconnect"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/ssh [get]
-func (b *BaseApi) WsHostSSH(c *gin.Context) {
-	b.runSSHSession(c, "ssh", func() (*ssh.SSHClient, error) {
-		hostID, _ := strconv.Atoi(c.DefaultQuery("id", "0"))
-		if hostID <= 0 {
-			return nil, errors.New("missing host id")
-		}
-		host, err := service.GetHostInfo(uint(hostID))
-		return newHostSSHClient(host, err)
-	}, c.DefaultQuery("command", ""))
-}
-
-// @Tags Terminal
-// @Summary Ws container terminal
-// @Param cols query integer false "cols"
-// @Param rows query integer false "rows"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/container [get]
-func (b *BaseApi) WsContainerTerminal(c *gin.Context) {
-	wsConn, cols, rows, ok := prepareTerminalSession(c)
-	if !ok {
-		return
-	}
-	defer wsConn.Close()
-	identity, ok := loadTerminalIdentity(c)
-	if !ok {
-		_ = wshandleError(wsConn, errors.New("missing terminal identity"))
-		return
-	}
-
-	opts := terminal.SessionOptions{
-		Identity: identity,
-		Kind:     "container",
-		Target:   containerTerminalTarget(c),
-		Cols:     cols,
-		Rows:     rows,
-	}
-	if err := terminal.ServeCommand(wsConn, strings.TrimSpace(c.Query("session")), opts, func() (*terminal.LocalCommand, error) {
-		return loadContainerTerminalCommand(c)
-	}); err != nil {
-		_ = wshandleError(wsConn, err)
-	}
-}
-
-func containerTerminalTarget(c *gin.Context) string {
-	query := c.Request.URL.Query()
-	for _, key := range []string{"cols", "rows", "session", "terminalRevalidate"} {
-		query.Del(key)
-	}
-	sum := sha256.Sum256([]byte(query.Encode()))
-	return hex.EncodeToString(sum[:])
-}
-
-func prepareTerminalSession(c *gin.Context) (*websocket.Conn, int, int, bool) {
-	if !websocket.IsWebSocketUpgrade(c.Request) {
-		helper.Success(c)
-		return nil, 0, 0, false
-	}
+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)
-		return nil, 0, 0, false
+		return
 	}
+	defer wsConn.Close()

 	if global.CONF.Base.IsDemo {
 		if wshandleError(wsConn, errors.New("   demo server, prohibit this operation!")) {
-			return nil, 0, 0, false
+			return
 		}
 	}

 	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
 	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
-		return nil, 0, 0, false
+		return
 	}
 	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
 	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
-		return nil, 0, 0, false
-	}
-	return wsConn, cols, rows, true
-}
-
-func (b *BaseApi) runSSHSession(c *gin.Context, kind string, connect func() (*ssh.SSHClient, error), command string) {
-	wsConn, cols, rows, ok := prepareTerminalSession(c)
-	if !ok {
-		return
-	}
-	defer wsConn.Close()
-	identity, ok := loadTerminalIdentity(c)
-	if !ok {
-		_ = wshandleError(wsConn, errors.New("missing terminal identity"))
 		return
 	}

-	hostID := 0
-	if kind == "ssh" {
-		hostID, _ = strconv.Atoi(c.DefaultQuery("id", "0"))
-	}
-	opts := terminal.SessionOptions{
-		Identity:   identity,
-		Kind:       kind,
-		Title:      sanitizeTerminalTitle(c.Query("title")),
-		Persistent: c.Query("terminalPersistent") == "true",
-		HostID:     uint(max(hostID, 0)),
-		Cols:       cols,
-		Rows:       rows,
-		InitCmd:    command,
-	}
-	err := terminal.Serve(wsConn, strings.TrimSpace(c.Query("session")), opts, func() (*gossh.Client, error) {
-		client, err := connect()
-		if err != nil {
-			return nil, errors.WithMessage(err, "failed to set up the connection. Please check the host information")
-		}
-		return client.Client, nil
-	})
-	if err != nil {
-		_ = wshandleError(wsConn, err)
-	}
-}
-
-// @Tags Terminal
-// @Summary List the caller's live terminal sessions
-// @Success 200 {array} terminal.Info
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/sessions/search [post]
-func (b *BaseApi) SearchTerminalSessions(c *gin.Context) {
-	identity, ok := loadTerminalIdentity(c)
-	if !ok {
-		helper.BadRequest(c, errors.New("missing terminal identity"))
+	client, err := loadLocalConn()
+	if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) {
 		return
 	}
-	helper.SuccessWithData(c, terminal.List(identity))
-}
-
-// @Tags Terminal
-// @Summary Close a terminal session
-// @Accept json
-// @Param request body dto.TerminalSessionClose true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/sessions/close [post]
-func (b *BaseApi) CloseTerminalSession(c *gin.Context) {
-	var req dto.TerminalSessionClose
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+	defer client.Close()
+	command := c.DefaultQuery("command", "")
+	sws, err := terminal.NewLogicSshWsSession(cols, rows, client.Client, wsConn, command)
+	if wshandleError(wsConn, err) {
 		return
 	}
-	identity, ok := loadTerminalIdentity(c)
-	if !ok {
-		helper.BadRequest(c, errors.New("missing terminal identity"))
-		return
-	}
-	if err := terminal.CloseSession(req.ID, identity); err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	helper.Success(c)
-}
+	defer sws.Close()

-// @Tags Terminal
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /hosts/terminal/sessions/closeAll [post]
-func (b *BaseApi) CloseAllTerminalSessions(c *gin.Context) {
-	identity, ok := loadTerminalIdentity(c)
-	if !ok {
-		helper.BadRequest(c, errors.New("missing terminal identity"))
-		return
-	}
-	terminal.Revoke("auth_session", identity.UserID, identity.AuthSessionID)
-	helper.Success(c)
-}
+	quitChan := make(chan bool, 3)
+	sws.Start(quitChan)
+	go sws.Wait(quitChan)

-func (b *BaseApi) RevokeTerminalSessions(c *gin.Context) {
-	var req dto.TerminalSessionRevoke
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if (req.Scope == "auth_session" && (req.UserID == "" || req.AuthSessionID == "")) ||
-		(req.Scope == "user" && req.UserID == "") {
-		helper.BadRequest(c, errors.New("missing terminal revocation identity"))
-		return
-	}
-	terminal.Revoke(req.Scope, req.UserID, req.AuthSessionID)
-	helper.Success(c)
-}
+	<-quitChan

-func loadTerminalIdentity(c *gin.Context) (terminal.Identity, bool) {
-	identity := terminal.Identity{
-		UserID:        strings.TrimSpace(c.GetHeader(terminal.HeaderUserID)),
-		AuthSessionID: strings.TrimSpace(c.GetHeader(terminal.HeaderAuthSessionID)),
-	}
-	if value := c.GetHeader(terminal.HeaderAuthLeaseUntil); value != "" {
-		millis, err := strconv.ParseInt(value, 10, 64)
-		if err != nil || millis <= 0 {
-			return terminal.Identity{}, false
-		}
-		identity.AuthLeaseUntil = time.UnixMilli(millis)
-		if maximum := time.Now().Add(90 * time.Second); identity.AuthLeaseUntil.After(maximum) {
-			identity.AuthLeaseUntil = maximum
-		}
-	}
-	return identity, identity.Valid()
-}
-
-// sanitizeTerminalTitle keeps the title a short single line.
-func sanitizeTerminalTitle(title string) string {
-	title = strings.Join(strings.Fields(title), " ")
-	if r := []rune(title); len(r) > 64 {
-		title = string(r[:64])
-	}
-	return title
-}
-
-func closeTerminalConn(wsConn *websocket.Conn) {
 	dt := time.Now().Add(time.Second)
 	_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
 }

-func newHostSSHClient(host *model.Host, err error) (*ssh.SSHClient, error) {
+func (b *BaseApi) ContainerWsSSH(c *gin.Context) {
+	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
-		return nil, errors.WithMessage(err, "load host info by id failed")
+		global.LOG.Errorf("gin context http handler failed, err: %v", err)
+		return
 	}
-	connInfo := ssh.ConnInfo{
-		Addr:       host.Addr,
-		Port:       int(host.Port),
-		User:       host.User,
-		AuthMode:   host.AuthMode,
-		Password:   host.Password,
-		PrivateKey: []byte(host.PrivateKey),
-	}
-	if len(host.PassPhrase) != 0 {
-		connInfo.PassPhrase = []byte(host.PassPhrase)
-	}
-	return ssh.NewClient(connInfo)
-}
+	defer wsConn.Close()

-func loadContainerTerminalCommand(c *gin.Context) (*terminal.LocalCommand, error) {
+	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 (
-		initCmd []string
-		err     error
-	)
+	var initCmd []string
 	switch source {
 	case "redis", "redis-cluster":
 		initCmd, err = loadRedisInitCmd(c, source)
@@ -304,12 +96,33 @@ func loadContainerTerminalCommand(c *gin.Context) (*terminal.LocalCommand, error
 	case "database":
 		initCmd, err = loadDatabaseInitCmd(c)
 	default:
-		return nil, fmt.Errorf("not support such source %s", source)
+		if wshandleError(wsConn, fmt.Errorf("not support such source %s", source)) {
+			return
+		}
 	}
-	if err != nil {
-		return nil, err
+	if wshandleError(wsConn, err) {
+		return
 	}
-	return terminal.NewCommand("docker", initCmd...)
+	slave, err := terminal.NewCommand("docker", initCmd...)
+	if wshandleError(wsConn, err) {
+		return
+	}
+	defer slave.Close()
+
+	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
+	if wshandleError(wsConn, err) {
+		return
+	}
+
+	quitChan := make(chan bool, 3)
+	tty.Start(quitChan)
+	go slave.Wait(quitChan)
+
+	<-quitChan
+
+	global.LOG.Info("websocket finished")
+	dt := time.Now().Add(time.Second)
+	_ = wsConn.WriteControl(websocket.CloseMessage, nil, dt)
 }

 func loadRedisInitCmd(c *gin.Context, redisType string) ([]string, error) {
@@ -374,29 +187,19 @@ func loadContainerInitCmd(c *gin.Context) ([]string, error) {
 func loadDatabaseInitCmd(c *gin.Context) ([]string, error) {
 	database := c.Query("database")
 	databaseType := c.Query("databaseType")
-	if len(databaseType) == 0 {
+	if len(database) == 0 || len(databaseType) == 0 {
 		return nil, fmt.Errorf("error param of database: %s or database type: %s", database, databaseType)
 	}
 	databaseConn, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Type: databaseType, Name: database})
 	if err != nil {
 		return nil, fmt.Errorf("no such database in db, err: %v", err)
 	}
-	if len(databaseConn.ContainerName) == 0 {
-		return nil, fmt.Errorf("no such database container for database: %s or database type: %s", database, databaseType)
-	}
 	commands := []string{"exec", "-it", databaseConn.ContainerName}
 	switch databaseType {
 	case "mysql", "mysql-cluster":
 		commands = append(commands, []string{"mysql", "-uroot", "-p" + databaseConn.Password}...)
 	case "mariadb":
 		commands = append(commands, []string{"mariadb", "-uroot", "-p" + databaseConn.Password}...)
-	case "mongodb":
-		commands = append(commands, []string{
-			"mongosh",
-			"--username", databaseConn.Username,
-			"--password", databaseConn.Password,
-			"--authenticationDatabase", "admin",
-		}...)
 	case "postgresql", "postgresql-cluster":
 		commands = []string{"exec", "-e", fmt.Sprintf("PGPASSWORD=%s", databaseConn.Password), "-it", databaseConn.ContainerName, "psql", "-t", "-U", databaseConn.Username}
 	}
@@ -425,8 +228,8 @@ func wshandleError(ws *websocket.Conn, err error) bool {
 }

 var upGrader = websocket.Upgrader{
-	ReadBufferSize:  4096,
-	WriteBufferSize: 16384,
+	ReadBufferSize:  1024,
+	WriteBufferSize: 1024 * 1024 * 10,
 	CheckOrigin: func(r *http.Request) bool {
 		return true
 	},
@@ -1,10 +0,0 @@
-package v2
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/gin-gonic/gin"
-)
-
-func (b *BaseApi) TerminalCapabilities(c *gin.Context) {
-	helper.SuccessWithData(c, gin.H{"apiKeyLeaseVersion": 1})
-}
@@ -73,7 +73,7 @@ func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites [post]
-// @x-panel-log {"bodyKeys":["alias"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [alias]","formatEN":"Create website [alias]"}
+// @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [primaryDomain]","formatEN":"Create website [primaryDomain]"}
 func (b *BaseApi) CreateWebsite(c *gin.Context) {
 	var req request.WebsiteCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -181,7 +181,6 @@ func (b *BaseApi) GetWebsite(c *gin.Context) {
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param type path string true "type"
 // @Router /websites/:id/config/:type [get]
 func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -270,7 +269,6 @@ func (b *BaseApi) GetHTTPSConfig(c *gin.Context) {
 // @Success 200 {object} response.WebsiteHTTPS
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param id path string true "id"
 // @Router /websites/:id/https [post]
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] https 配置","formatEN":"Update website https [domain] conf"}
 func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
@@ -331,46 +329,26 @@ func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website
-// @Summary Get website log
-// @Accept json
-// @Param request body request.WebsiteLogSearchReq true "request"
-// @Success 200 {object} response.WebsiteLog
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/log/search [post]
-func (b *BaseApi) GetWebsiteLog(c *gin.Context) {
-	var req request.WebsiteLogSearchReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := websiteService.GetWebsiteLog(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
 // @Tags Website
 // @Summary Operate website log
 // @Accept json
 // @Param request body request.WebsiteLogReq true "request"
-// @Success 200
+// @Success 200 {object} response.WebsiteLog
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /websites/log/operate [post]
+// @Router /websites/log [post]
 // @x-panel-log {"bodyKeys":["id", "operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain][operate] 日志","formatEN":"[domain][operate] logs"}
 func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
 	var req request.WebsiteLogReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := websiteService.OpWebsiteLog(req); err != nil {
+	res, err := websiteService.OpWebsiteLog(req)
+	if err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.Success(c)
+	helper.SuccessWithData(c, res)
 }

 // @Tags Website
@@ -528,7 +506,7 @@ func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/proxies/update [post]
-// @x-panel-log {"bodyKeys":["id","name","operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改 [operate] 网站 [domain] 反向代理配置 [name] ","formatEN":"Update [operate] domain [domain] proxy config [name]"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 ","formatEN":"Update domain [domain] proxy config"}
 func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 	var req request.WebsiteProxyConfig
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -542,50 +520,6 @@ func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website
-// @Summary Delete proxy config
-// @Accept json
-// @Param request body request.WebsiteProxyDel true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/proxies/delete [post]
-// @x-panel-log {"bodyKeys":["id","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除网站 [domain] 反向代理配置 [name] ","formatEN":"Delete domain [domain] proxy config [name]"}
-func (b *BaseApi) DeleteProxyConfig(c *gin.Context) {
-	var req request.WebsiteProxyDel
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := websiteService.DeleteProxy(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Update proxy config status
-// @Accept json
-// @Param request body request.WebsiteProxyStatusUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/proxies/status [post]
-// @x-panel-log {"bodyKeys":["id","name","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 [name] 状态 [status] ","formatEN":"Update domain [domain] proxy config [name] status [status]"}
-func (b *BaseApi) UpdateProxyConfigStatus(c *gin.Context) {
-	var req request.WebsiteProxyStatusUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	err := websiteService.UpdateProxyStatus(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Website
 // @Summary Update proxy file
 // @Accept json
@@ -594,7 +528,7 @@ func (b *BaseApi) UpdateProxyConfigStatus(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/proxies/file [post]
-// @x-panel-log {"bodyKeys":["websiteID","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置文件 [name] ","formatEN":"Update domain [domain] proxy config file [name]"}
+// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新反向代理文件 [domain]","formatEN":"Nginx conf proxy file update [domain]"}
 func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
 	var req request.NginxProxyUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -738,7 +672,7 @@ func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /websites/redirect/update [post]
-// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 重定向配置 ","formatEN":"Update domain [domain] redirect config"}
+// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 重定向理配置 ","formatEN":"Update domain [domain] redirect config"}
 func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
 	var req request.NginxRedirectReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -821,7 +755,6 @@ func (b *BaseApi) GetDirConfig(c *gin.Context) {
 // @Success 200 {object} response.WebsiteHtmlRes
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Param type path string true "type"
 // @Router /websites/default/html/:type [get]
 func (b *BaseApi) GetDefaultHtml(c *gin.Context) {
 	resourceType, err := helper.GetStrParamByKey(c, "type")
@@ -861,11 +794,11 @@ func (b *BaseApi) UpdateDefaultHtml(c *gin.Context) {
 // @Tags Website
 // @Summary Get website upstreams
 // @Accept json
-// @Param id path integer true "id"
+// @Param request body request.WebsiteCommonReq true "request"
 // @Success 200 {array} dto.NginxUpstream
 // @Security ApiKeyAuth
 // @Security Timestamp
-// @Router /websites/{id}/lbs [get]
+// @Router /websites/lbs [get]
 func (b *BaseApi) GetLoadBalances(c *gin.Context) {
 	id, err := helper.GetParamID(c)
 	if err != nil {
@@ -960,15 +893,6 @@ func (b *BaseApi) UpdateLoadBalanceFile(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website
-// @Summary Change website group
-// @Accept json
-// @Param request body dto.UpdateGroup true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/group/change [post]
-// @x-panel-log {"bodyKeys":["group","newGroup"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"网站分组 [group] 迁移到 [newGroup]","formatEN":"change website group [group] to [newGroup]"}
 func (b *BaseApi) ChangeWebsiteGroup(c *gin.Context) {
 	var req dto.UpdateGroup
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -1001,7 +925,6 @@ func (b *BaseApi) UpdateProxyCache(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website
 // @Summary Get website proxy cache config
 // @Accept json
 // @Param id path int true "id"
@@ -1222,7 +1145,7 @@ func (b *BaseApi) ExecComposer(c *gin.Context) {
 // @Tags Website
 // @Summary Batch operate websites
 // @Accept json
-// @Param request body request.BatchWebsiteOp true "request"
+// @Param request body request.BatchOpWebsite true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp
@@ -1239,26 +1162,6 @@ func (b *BaseApi) BatchOpWebsites(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website
-// @Summary Batch set website group
-// @Accept json
-// @Param request body request.BatchWebsiteGroup true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/batch/group [post]
-func (b *BaseApi) BatchSetWebsiteGroup(c *gin.Context) {
-	var req request.BatchWebsiteGroup
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.BatchSetGroup(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Website
 // @Summary Get CORS Config
 // @Accept json
@@ -1300,43 +1203,3 @@ func (b *BaseApi) UpdateCORSConfig(c *gin.Context) {
 	}
 	helper.Success(c)
 }
-
-// @Tags Website
-// @Summary Update Stream Config
-// @Accept json
-// @Param request body request.StreamUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/stream/update [post]
-func (b *BaseApi) UpdateStreamConfig(c *gin.Context) {
-	var req request.StreamUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.UpdateStream(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website
-// @Summary Batch set HTTPS for websites
-// @Accept json
-// @Param request body request.BatchWebsiteHttps true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/batch/ssl [post]
-func (b *BaseApi) BatchSetHttps(c *gin.Context) {
-	var req request.BatchWebsiteHttps
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteService.BatchSetHttps(c, req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
@@ -1,14 +1,14 @@
 package v2

 import (
+	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strconv"

-	"github.com/1Panel-dev/1Panel/agent/app/model"
-
 	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
@@ -25,39 +25,27 @@ import (
 // @Router /websites/ssl/search [post]
 func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, accounts, err := websiteSSLService.Page(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithDataGzipped(c, dto.PageResult{
-		Total: total,
-		Items: accounts,
-	})
-}
-
-// @Tags Website SSL
-// @Summary List website ssl
-// @Accept json
-// @Param request body request.WebsiteSSLListReq true "request"
-// @Success 200 {array} response.WebsiteSSLDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/ssl/list [post]
-func (b *BaseApi) ListWebsiteSSL(c *gin.Context) {
-	var req request.WebsiteSSLListReq
 	if err := helper.CheckBind(&req, c); err != nil {
 		return
 	}
-	list, err := websiteSSLService.Search(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
+	if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {
+		total, accounts, err := websiteSSLService.Page(req)
+		if err != nil {
+			helper.InternalServer(c, err)
+			return
+		}
+		helper.SuccessWithData(c, dto.PageResult{
+			Total: total,
+			Items: accounts,
+		})
+	} else {
+		list, err := websiteSSLService.Search(req)
+		if err != nil {
+			helper.InternalServer(c, err)
+			return
+		}
+		helper.SuccessWithData(c, list)
 	}
-	helper.SuccessWithDataGzipped(c, list)
 }

 // @Tags Website SSL
@@ -210,27 +198,6 @@ func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
 	helper.Success(c)
 }

-// @Tags Website SSL
-// @Summary Push ssl to nodes
-// @Accept json
-// @Param request body request.WebsiteSSLPush true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/ssl/push [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":"Push ssl to nodes [domain]"}
-func (b *BaseApi) PushWebsiteSSLToNode(c *gin.Context) {
-	var req request.WebsiteSSLPush
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteSSLService.PushToNode(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 // @Tags Website SSL
 // @Summary Upload ssl
 // @Accept json
@@ -268,9 +235,8 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 func (b *BaseApi) UploadSSLFile(c *gin.Context) {
 	var req request.WebsiteSSLFileUpload

+	req.Type = c.PostForm("type")
 	req.Description = c.PostForm("description")
-	req.Nodes = c.PostForm("nodes")
-	req.PushNode, _ = strconv.ParseBool(c.PostForm("pushNode"))
 	sslID := c.PostForm("sslID")
 	if sslID != "" {
 		req.SSLID, _ = strconv.ParseUint(sslID, 10, 64)
@@ -306,8 +272,6 @@ func (b *BaseApi) UploadSSLFile(c *gin.Context) {
 		Certificate: string(certificateContent),
 		Description: req.Description,
 		SSLID:       uint(req.SSLID),
-		PushNode:    req.PushNode,
-		Nodes:       req.Nodes,
 	}

 	if err := websiteSSLService.Upload(uploadReq); err != nil {
@@ -315,7 +279,7 @@ func (b *BaseApi) UploadSSLFile(c *gin.Context) {
 		return
 	}

-	helper.Success(c)
+	helper.SuccessWithData(c, nil)
 }

 func readUploadedFile(fileHeader *multipart.FileHeader) ([]byte, error) {
@@ -358,15 +322,6 @@ func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
 	http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
 }

-// @Tags Website SSL
-// @Summary Import master SSL
-// @Accept json
-// @Param request body model.WebsiteSSL true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/ssl/import [post]
-// @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"导入主节点证书 [primaryDomain]","formatEN":"import master SSL [primaryDomain]"}
 func (b *BaseApi) ImportMasterSSL(c *gin.Context) {
 	var req model.WebsiteSSL
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -1,259 +0,0 @@
-package v2
-
-import (
-	"io"
-
-	"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 Template
-// @Summary Page website templates
-// @Accept json
-// @Param request body request.WebsiteTemplateSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/search [post]
-func (b *BaseApi) PageWebsiteTemplate(c *gin.Context) {
-	var req request.WebsiteTemplateSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, templates, err := websiteTemplateService.PageTemplate(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Total: total,
-		Items: templates,
-	})
-}
-
-// @Tags Website Template
-// @Summary Create website template
-// @Accept json
-// @Param request body request.WebsiteTemplateCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站模板 [name]","formatEN":"Create website template [name]"}
-func (b *BaseApi) CreateWebsiteTemplate(c *gin.Context) {
-	var req request.WebsiteTemplateCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteTemplateService.CreateTemplate(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website Template
-// @Summary Update website template
-// @Accept json
-// @Param request body request.WebsiteTemplateUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/update [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站模板 [name]","formatEN":"Update website template [name]"}
-func (b *BaseApi) UpdateWebsiteTemplate(c *gin.Context) {
-	var req request.WebsiteTemplateUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteTemplateService.UpdateTemplate(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website Template
-// @Summary Delete website template
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_templates","output_column":"name","output_value":"name"}],"formatZH":"删除网站模板 [name]","formatEN":"Delete website template [name]"}
-func (b *BaseApi) DeleteWebsiteTemplate(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteTemplateService.DeleteTemplate(req.ID); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website Template
-// @Summary Get website template
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200 {object} response.WebsiteTemplateDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/get [post]
-func (b *BaseApi) GetWebsiteTemplate(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	template, err := websiteTemplateService.GetTemplate(req.ID)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, template)
-}
-
-// @Tags Website Template
-// @Summary Upload website template zip
-// @Accept multipart/form-data
-// @Param file formData file true "file"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/upload [post]
-func (b *BaseApi) UploadTemplateZip(c *gin.Context) {
-	fileHeader, err := c.FormFile("file")
-	if err != nil {
-		helper.BadRequest(c, err)
-		return
-	}
-	file, err := fileHeader.Open()
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	defer file.Close()
-	content, err := io.ReadAll(file)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	filePath, variables, err := websiteTemplateService.SaveUploadZip(fileHeader.Filename, content)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, gin.H{"filePath": filePath, "variables": variables})
-}
-
-// @Tags Website Template
-// @Summary Preview website template
-// @Accept json
-// @Param request body request.WebsitePreviewReq true "request"
-// @Success 200 {object} response.WebsitePreviewDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/preview [post]
-func (b *BaseApi) PreviewWebsiteTemplate(c *gin.Context) {
-	var req request.WebsitePreviewReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	preview, err := websiteTemplateService.Preview(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, preview)
-}
-
-// @Tags Website Template
-// @Summary Page website template outputs
-// @Accept json
-// @Param request body request.WebsiteTemplateOutputSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/outputs/search [post]
-func (b *BaseApi) PageWebsiteTemplateOutput(c *gin.Context) {
-	var req request.WebsiteTemplateOutputSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, outputs, err := websiteTemplateService.PageOutput(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Total: total,
-		Items: outputs,
-	})
-}
-
-// @Tags Website Template
-// @Summary Create website template output
-// @Accept json
-// @Param request body request.WebsiteTemplateOutputCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/outputs [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成模板产物 [name]","formatEN":"Generate template output [name]"}
-func (b *BaseApi) CreateWebsiteTemplateOutput(c *gin.Context) {
-	var req request.WebsiteTemplateOutputCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteTemplateService.CreateOutput(req); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website Template
-// @Summary Delete website template output
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/outputs/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_template_outputs","output_column":"name","output_value":"name"}],"formatZH":"删除模板产物 [name]","formatEN":"Delete template output [name]"}
-func (b *BaseApi) DeleteWebsiteTemplateOutput(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteTemplateService.DeleteOutput(req.ID); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
-// @Tags Website Template
-// @Summary Get website template output
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200 {object} response.WebsiteTemplateOutputDTO
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /websites/templates/outputs/get [post]
-func (b *BaseApi) GetWebsiteTemplateOutput(c *gin.Context) {
-	var req dto.OperateByID
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	output, err := websiteTemplateService.GetOutput(req.ID)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, output)
-}
@@ -1,817 +0,0 @@
-package dto
-
-import "time"
-
-type AgentCreateReq struct {
-	Name              string   `json:"name" validate:"required"`
-	Remark            string   `json:"remark"`
-	AppVersion        string   `json:"appVersion" validate:"required"`
-	WebUIPort         int      `json:"webUIPort" validate:"required,min=1,max=65535"`
-	BridgePort        int      `json:"bridgePort"`
-	AllowedOrigins    []string `json:"allowedOrigins"`
-	AgentType         string   `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
-	Model             string   `json:"model"`
-	AccountID         uint     `json:"accountId"`
-	Token             string   `json:"token"`
-	DashboardUsername string   `json:"dashboardUsername"`
-	DashboardPassword string   `json:"dashboardPassword"`
-	TaskID            string   `json:"taskID"`
-	Advanced          bool     `json:"advanced"`
-	ContainerName     string   `json:"containerName"`
-	AllowPort         bool     `json:"allowPort"`
-	SpecifyIP         string   `json:"specifyIP"`
-	RestartPolicy     string   `json:"restartPolicy"`
-	CpuQuota          float64  `json:"cpuQuota"`
-	MemoryLimit       float64  `json:"memoryLimit"`
-	MemoryUnit        string   `json:"memoryUnit"`
-	PullImage         bool     `json:"pullImage"`
-	EditCompose       bool     `json:"editCompose"`
-	DockerCompose     string   `json:"dockerCompose"`
-}
-
-type AgentBatchInstallReq struct {
-	Name               string              `json:"name"`
-	Remark             string              `json:"remark"`
-	AppVersion         string              `json:"appVersion" validate:"required"`
-	WebUIPort          int                 `json:"webUIPort" validate:"required,min=1,max=65535"`
-	BridgePort         int                 `json:"bridgePort"`
-	AllowedOrigins     []string            `json:"allowedOrigins"`
-	AgentType          string              `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
-	Model              string              `json:"model"`
-	AccountID          uint                `json:"accountId"`
-	Token              string              `json:"token"`
-	DashboardUsername  string              `json:"dashboardUsername"`
-	DashboardPassword  string              `json:"dashboardPassword"`
-	TaskID             string              `json:"taskID"`
-	Advanced           bool                `json:"advanced"`
-	ContainerName      string              `json:"containerName"`
-	AllowPort          bool                `json:"allowPort"`
-	SpecifyIP          string              `json:"specifyIP"`
-	RestartPolicy      string              `json:"restartPolicy"`
-	CpuQuota           float64             `json:"cpuQuota"`
-	MemoryLimit        float64             `json:"memoryLimit"`
-	MemoryUnit         string              `json:"memoryUnit"`
-	PullImage          bool                `json:"pullImage"`
-	EditCompose        bool                `json:"editCompose"`
-	DockerCompose      string              `json:"dockerCompose"`
-	MasterAccountID    uint                `json:"masterAccountId"`
-	FallbackAccessHost string              `json:"fallbackAccessHost"`
-	AccountSnapshot    AgentAccountInfo    `json:"accountSnapshot"`
-	AccountModels      []AgentAccountModel `json:"accountModels"`
-}
-
-type AgentBatchUpgradeReq struct {
-	AgentType     string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
-	TargetVersion string `json:"targetVersion" validate:"required"`
-	Backup        bool   `json:"backup"`
-	PullImage     bool   `json:"pullImage"`
-	TaskID        string `json:"taskID"`
-}
-
-type AgentBatchUpgradeResult struct {
-	AgentID      uint   `json:"agentID"`
-	AgentName    string `json:"agentName"`
-	AppInstallID uint   `json:"appInstallID"`
-	Success      bool   `json:"success"`
-	Skipped      bool   `json:"skipped"`
-	Message      string `json:"message"`
-}
-
-type AgentBatchSkillInstallReq struct {
-	AgentType   string `json:"agentType" validate:"required,oneof=openclaw hermes-agent"`
-	SkillName   string `json:"skillName" validate:"required"`
-	PackagePath string `json:"packagePath" validate:"required"`
-	TaskID      string `json:"taskID"`
-}
-
-type AgentBatchSkillInstallResult struct {
-	AgentID      uint   `json:"agentID"`
-	AgentName    string `json:"agentName"`
-	AppInstallID uint   `json:"appInstallID"`
-	Success      bool   `json:"success"`
-	Skipped      bool   `json:"skipped"`
-	Message      string `json:"message"`
-}
-
-type AgentBatchOperateReq struct {
-	AgentType   string `json:"agentType" validate:"required,oneof=openclaw copaw hermes-agent"`
-	Operate     string `json:"operate" validate:"required,oneof=start stop restart delete"`
-	ForceDelete bool   `json:"forceDelete"`
-	TaskID      string `json:"taskID"`
-}
-
-type AgentBatchOperateResult struct {
-	AgentID      uint   `json:"agentID"`
-	AgentName    string `json:"agentName"`
-	AppInstallID uint   `json:"appInstallID"`
-	Success      bool   `json:"success"`
-	Skipped      bool   `json:"skipped"`
-	Message      string `json:"message"`
-}
-
-type AgentItem struct {
-	ID                   uint      `json:"id"`
-	Name                 string    `json:"name"`
-	Remark               string    `json:"remark"`
-	AgentType            string    `json:"agentType"`
-	Provider             string    `json:"provider"`
-	ProviderName         string    `json:"providerName"`
-	Model                string    `json:"model"`
-	APIType              string    `json:"apiType"`
-	BaseURL              string    `json:"baseUrl"`
-	APIKey               string    `json:"apiKey"`
-	Token                string    `json:"token"`
-	DashboardUsername    string    `json:"dashboardUsername"`
-	DashboardPassword    string    `json:"dashboardPassword"`
-	Status               string    `json:"status"`
-	Message              string    `json:"message"`
-	AppInstallID         uint      `json:"appInstallId"`
-	WebsiteID            uint      `json:"websiteId"`
-	WebsitePrimaryDomain string    `json:"websitePrimaryDomain"`
-	WebsiteType          string    `json:"websiteType"`
-	WebsiteProtocol      string    `json:"websiteProtocol"`
-	AccountID            uint      `json:"accountId"`
-	AppVersion           string    `json:"appVersion"`
-	Container            string    `json:"containerName"`
-	WebUIPort            int       `json:"webUIPort"`
-	BridgePort           int       `json:"bridgePort"`
-	Path                 string    `json:"path"`
-	ConfigPath           string    `json:"configPath"`
-	Upgradable           bool      `json:"upgradable"`
-	CreatedAt            time.Time `json:"createdAt"`
-}
-
-type AgentDeleteReq struct {
-	ID          uint   `json:"id" validate:"required"`
-	TaskID      string `json:"taskID"`
-	ForceDelete bool   `json:"forceDelete"`
-}
-
-type AgentTokenResetReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type AgentRemarkUpdateReq struct {
-	ID     uint   `json:"id" validate:"required"`
-	Remark string `json:"remark"`
-}
-
-type AgentWebsiteBindReq struct {
-	AgentID   uint `json:"agentId" validate:"required"`
-	WebsiteID uint `json:"websiteId" validate:"required"`
-}
-
-type AgentModelConfigUpdateReq struct {
-	AgentID   uint                 `json:"agentId" validate:"required"`
-	AccountID uint                 `json:"accountId" validate:"required"`
-	Model     string               `json:"model" validate:"required"`
-	Fallbacks []string             `json:"fallbacks"`
-	Metadata  []AgentModelMetadata `json:"metadata" validate:"dive"`
-}
-
-type AgentModelConfig struct {
-	AccountID uint                 `json:"accountId"`
-	Model     string               `json:"model"`
-	Fallbacks []string             `json:"fallbacks"`
-	Metadata  []AgentModelMetadata `json:"metadata"`
-}
-
-type AgentModelMetadata struct {
-	Model         string `json:"model" validate:"required"`
-	InputMode     string `json:"inputMode" validate:"required,oneof=auto text image"`
-	ContextWindow int    `json:"contextWindow" validate:"min=0"`
-	MaxTokens     int    `json:"maxTokens" validate:"min=0"`
-}
-
-type AgentHermesChatSessionItem struct {
-	ID           string `json:"id"`
-	Title        string `json:"title"`
-	Model        string `json:"model"`
-	MessageCount int64  `json:"messageCount"`
-	StartedAt    string `json:"startedAt"`
-	LastActive   string `json:"lastActive"`
-}
-
-type AgentOverviewReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentIDReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentHermesChatSessionRenameReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	ID      string `json:"id" validate:"required"`
-	Title   string `json:"title" validate:"required"`
-}
-
-type AgentHermesChatSessionDeleteReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	ID      string `json:"id" validate:"required"`
-}
-
-type AgentOverview struct {
-	Snapshot AgentOverviewSnapshot `json:"snapshot"`
-}
-
-type AgentRoleBinding struct {
-	Channel   string `json:"channel" validate:"required"`
-	AccountID string `json:"accountId"`
-}
-
-type AgentRoleCreateReq struct {
-	AgentID  uint               `json:"agentId" validate:"required"`
-	Name     string             `json:"name" validate:"required"`
-	Model    string             `json:"model"`
-	Bindings []AgentRoleBinding `json:"bindings"`
-}
-
-type AgentRoleCreateResp struct {
-	Output string `json:"output"`
-}
-
-type AgentRoleDeleteReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	ID      string `json:"id" validate:"required"`
-}
-
-type AgentRoleBindReq struct {
-	AgentID   uint   `json:"agentId" validate:"required"`
-	ID        string `json:"id" validate:"required"`
-	Channel   string `json:"channel" validate:"required"`
-	AccountID string `json:"accountId"`
-}
-
-type AgentConfiguredAgentsReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentRoleChannelsReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentRoleChannelItem struct {
-	Name       string   `json:"name"`
-	Bound      bool     `json:"bound"`
-	AccountIDs []string `json:"accountIds"`
-}
-
-type AgentRoleMarkdownFilesReq struct {
-	AgentID   uint   `json:"agentId" validate:"required"`
-	Workspace string `json:"workspace" validate:"required"`
-}
-
-type AgentConfiguredAgentItem struct {
-	ID        string             `json:"id"`
-	Name      string             `json:"name"`
-	Workspace string             `json:"workspace"`
-	Model     string             `json:"model"`
-	AgentDir  string             `json:"agentDir"`
-	Bindings  []AgentRoleBinding `json:"bindings"`
-}
-
-type AgentRoleMarkdownFileItem struct {
-	Name    string `json:"name"`
-	Content string `json:"content"`
-}
-
-type AgentRoleMarkdownFileUpdateItem struct {
-	Name    string `json:"name" validate:"required,oneof=AGENTS.md SOUL.md USER.md IDENTITY.md TOOLS.md HEARTBEAT.md BOOT.md BOOTSTRAP.md"`
-	Content string `json:"content"`
-}
-
-type AgentRoleMarkdownFilesUpdateReq struct {
-	AgentID   uint                              `json:"agentId" validate:"required"`
-	Workspace string                            `json:"workspace" validate:"required"`
-	Restart   bool                              `json:"restart"`
-	Files     []AgentRoleMarkdownFileUpdateItem `json:"files" validate:"required"`
-}
-
-type AgentOverviewSnapshot struct {
-	ContainerStatus string `json:"containerStatus"`
-	AppVersion      string `json:"appVersion"`
-	DefaultModel    string `json:"defaultModel"`
-	ChannelCount    int    `json:"channelCount"`
-	SkillCount      int    `json:"skillCount"`
-	JobCount        int    `json:"jobCount"`
-	SessionCount    int    `json:"sessionCount"`
-}
-
-type AgentAccountModel struct {
-	RecordID uint   `json:"recordId"`
-	ID       string `json:"id"`
-	Name     string `json:"name"`
-}
-
-type AgentAccountModelReq struct {
-	AccountID uint `json:"accountId" validate:"required"`
-}
-
-type AgentAccountModelDiscoverReq struct {
-	Provider string `json:"provider" validate:"required"`
-	BaseURL  string `json:"baseURL" validate:"required"`
-	APIKey   string `json:"apiKey" validate:"required"`
-	APIType  string `json:"apiType" validate:"required"`
-}
-
-type AgentAccountModelCreateReq struct {
-	AccountID uint              `json:"accountId" validate:"required"`
-	Model     AgentAccountModel `json:"model" validate:"required"`
-}
-
-type AgentAccountModelUpdateReq struct {
-	AccountID uint              `json:"accountId" validate:"required"`
-	Model     AgentAccountModel `json:"model" validate:"required"`
-}
-
-type AgentAccountModelDeleteReq struct {
-	AccountID uint `json:"accountId" validate:"required"`
-	RecordID  uint `json:"recordId" validate:"required"`
-}
-
-type AgentAccountCreateReq struct {
-	Provider             string              `json:"provider" validate:"required"`
-	Name                 string              `json:"name" validate:"required"`
-	APIKey               string              `json:"apiKey" validate:"required"`
-	RememberAPIKey       bool                `json:"rememberApiKey"`
-	BaseURL              string              `json:"baseURL"`
-	Models               []AgentAccountModel `json:"models"`
-	APIType              string              `json:"apiType" validate:"required"`
-	AuthMode             string              `json:"authMode"`
-	VerifyModel          string              `json:"verifyModel"`
-	ValidateAvailability *bool               `json:"validateAvailability"`
-	Remark               string              `json:"remark"`
-}
-
-type AgentAccountUpdateReq struct {
-	ID                   uint   `json:"id" validate:"required"`
-	Name                 string `json:"name" validate:"required"`
-	APIKey               string `json:"apiKey" validate:"required"`
-	RememberAPIKey       bool   `json:"rememberApiKey"`
-	BaseURL              string `json:"baseURL"`
-	APIType              string `json:"apiType" validate:"required"`
-	AuthMode             string `json:"authMode"`
-	VerifyModel          string `json:"verifyModel"`
-	ValidateAvailability *bool  `json:"validateAvailability"`
-	Remark               string `json:"remark"`
-	SyncAgents           bool   `json:"syncAgents"`
-}
-
-type AgentAccountVerifyReq struct {
-	Provider string `json:"provider" validate:"required"`
-	APIKey   string `json:"apiKey" validate:"required"`
-	BaseURL  string `json:"baseURL"`
-	APIType  string `json:"apiType" validate:"required"`
-	AuthMode string `json:"authMode"`
-	Model    string `json:"model"`
-}
-
-type AgentAccountDeleteReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type AgentAccountSearch struct {
-	PageInfo
-	Provider string `json:"provider"`
-	APIType  string `json:"apiType"`
-	TextOnly bool   `json:"textOnly"`
-	Name     string `json:"name"`
-}
-
-type AgentAccountProviderCountReq struct {
-	Providers []string `json:"providers"`
-}
-
-type AgentAccountInfo struct {
-	ID              uint                `json:"id"`
-	MasterAccountID uint                `json:"masterAccountId"`
-	Provider        string              `json:"provider"`
-	ProviderName    string              `json:"providerName"`
-	Name            string              `json:"name"`
-	APIKey          string              `json:"apiKey"`
-	RememberAPIKey  bool                `json:"rememberApiKey"`
-	BaseURL         string              `json:"baseUrl"`
-	Models          []AgentAccountModel `json:"models"`
-	APIType         string              `json:"apiType"`
-	AuthMode        string              `json:"authMode"`
-	VerifyModel     string              `json:"verifyModel"`
-	Verified        bool                `json:"verified"`
-	Remark          string              `json:"remark"`
-	CreatedAt       time.Time           `json:"createdAt"`
-}
-
-type ProviderModelInfo struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-}
-
-type ProviderAPIInfo struct {
-	APIType                string              `json:"apiType"`
-	BaseURL                string              `json:"baseUrl"`
-	EditableBaseURL        bool                `json:"editableBaseUrl"`
-	SupportsModelDiscovery bool                `json:"supportsModelDiscovery"`
-	DefaultAuthMode        string              `json:"defaultAuthMode"`
-	AuthModes              []string            `json:"authModes"`
-	Models                 []ProviderModelInfo `json:"models"`
-}
-
-type ProviderInfo struct {
-	Sort           uint                `json:"-"`
-	Provider       string              `json:"provider"`
-	DisplayName    string              `json:"displayName"`
-	BaseURL        string              `json:"baseUrl"`
-	DefaultAPIType string              `json:"defaultApiType"`
-	APITypes       []ProviderAPIInfo   `json:"apiTypes"`
-	Models         []ProviderModelInfo `json:"models"`
-}
-
-type AgentFeishuConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentFeishuConfigUpdateReq struct {
-	AgentID        uint             `json:"agentId" validate:"required"`
-	Enabled        bool             `json:"enabled"`
-	ThreadSession  bool             `json:"threadSession"`
-	ReplyMode      string           `json:"replyMode" validate:"required"`
-	Streaming      bool             `json:"streaming"`
-	RequireMention string           `json:"requireMention" validate:"required,oneof=true false open"`
-	GroupPolicy    string           `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	GroupAllowFrom []string         `json:"groupAllowFrom"`
-	Domain         string           `json:"domain"`
-	ConnectionMode string           `json:"connectionMode"`
-	Bots           []AgentFeishuBot `json:"bots" validate:"required,min=1"`
-}
-
-type AgentFeishuConfig struct {
-	Enabled        bool             `json:"enabled"`
-	ThreadSession  bool             `json:"threadSession"`
-	ReplyMode      string           `json:"replyMode"`
-	Streaming      bool             `json:"streaming"`
-	RequireMention string           `json:"requireMention"`
-	GroupPolicy    string           `json:"groupPolicy"`
-	GroupAllowFrom []string         `json:"groupAllowFrom"`
-	Domain         string           `json:"domain"`
-	ConnectionMode string           `json:"connectionMode"`
-	Bots           []AgentFeishuBot `json:"bots"`
-	Installed      bool             `json:"installed"`
-}
-
-type AgentTelegramConfigReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentTelegramConfigUpdateReq struct {
-	AgentID        uint               `json:"agentId" validate:"required"`
-	Enabled        bool               `json:"enabled"`
-	DmPolicy       string             `json:"dmPolicy" validate:"required,oneof=pairing open allowlist disabled"`
-	AllowFrom      []string           `json:"allowFrom"`
-	RequireMention bool               `json:"requireMention"`
-	GroupPolicy    string             `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	GroupAllowFrom []string           `json:"groupAllowFrom"`
-	Proxy          string             `json:"proxy"`
-	Streaming      string             `json:"streaming" validate:"required,oneof=off partial block progress"`
-	DefaultAccount string             `json:"defaultAccount" validate:"required"`
-	Bots           []AgentTelegramBot `json:"bots" validate:"required,min=1"`
-}
-
-type AgentTelegramConfig struct {
-	Enabled        bool               `json:"enabled"`
-	DmPolicy       string             `json:"dmPolicy"`
-	AllowFrom      []string           `json:"allowFrom"`
-	RequireMention bool               `json:"requireMention"`
-	GroupPolicy    string             `json:"groupPolicy"`
-	GroupAllowFrom []string           `json:"groupAllowFrom"`
-	Proxy          string             `json:"proxy"`
-	Streaming      string             `json:"streaming"`
-	DefaultAccount string             `json:"defaultAccount"`
-	Bots           []AgentTelegramBot `json:"bots"`
-}
-
-type AgentChannelPairingApproveReq struct {
-	AgentID     uint   `json:"agentId" validate:"required"`
-	Type        string `json:"type" validate:"required,oneof=feishu telegram discord wecom qqbot dingtalk"`
-	PairingCode string `json:"pairingCode" validate:"required"`
-	AccountID   string `json:"accountId"`
-}
-
-type AgentChannelDeleteReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Type    string `json:"type" validate:"required,oneof=feishu telegram discord wecom qqbot dingtalk weixin"`
-}
-
-type AgentWecomConfigUpdateReq struct {
-	AgentID        uint     `json:"agentId" validate:"required"`
-	Enabled        bool     `json:"enabled"`
-	DmPolicy       string   `json:"dmPolicy" validate:"required,oneof=pairing open allowlist disabled"`
-	AllowFrom      []string `json:"allowFrom"`
-	GroupPolicy    string   `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	GroupAllowFrom []string `json:"groupAllowFrom"`
-	BotID          string   `json:"botId" validate:"required"`
-	Secret         string   `json:"secret" validate:"required"`
-}
-
-type AgentWecomConfig struct {
-	Enabled        bool     `json:"enabled"`
-	DmPolicy       string   `json:"dmPolicy"`
-	AllowFrom      []string `json:"allowFrom"`
-	GroupPolicy    string   `json:"groupPolicy"`
-	GroupAllowFrom []string `json:"groupAllowFrom"`
-	BotID          string   `json:"botId"`
-	Secret         string   `json:"secret"`
-	Installed      bool     `json:"installed"`
-}
-
-type AgentDingTalkConfigUpdateReq struct {
-	AgentID                         uint               `json:"agentId" validate:"required"`
-	Enabled                         bool               `json:"enabled"`
-	DmPolicy                        string             `json:"dmPolicy" validate:"required,oneof=pairing allowlist open disabled"`
-	AllowFrom                       []string           `json:"allowFrom"`
-	GroupPolicy                     string             `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	GroupAllowFrom                  []string           `json:"groupAllowFrom"`
-	SeparateSessionByConversation   bool               `json:"separateSessionByConversation"`
-	GroupSessionScope               string             `json:"groupSessionScope" validate:"required,oneof=group group_sender"`
-	SharedMemoryAcrossConversations bool               `json:"sharedMemoryAcrossConversations"`
-	AsyncMode                       bool               `json:"asyncMode"`
-	AckText                         string             `json:"ackText"`
-	Bots                            []AgentDingTalkBot `json:"bots" validate:"required,min=1"`
-}
-
-type AgentDingTalkConfig struct {
-	Enabled                         bool               `json:"enabled"`
-	DmPolicy                        string             `json:"dmPolicy"`
-	AllowFrom                       []string           `json:"allowFrom"`
-	GroupPolicy                     string             `json:"groupPolicy"`
-	GroupAllowFrom                  []string           `json:"groupAllowFrom"`
-	SeparateSessionByConversation   bool               `json:"separateSessionByConversation"`
-	GroupSessionScope               string             `json:"groupSessionScope"`
-	SharedMemoryAcrossConversations bool               `json:"sharedMemoryAcrossConversations"`
-	AsyncMode                       bool               `json:"asyncMode"`
-	AckText                         string             `json:"ackText"`
-	Bots                            []AgentDingTalkBot `json:"bots"`
-	Installed                       bool               `json:"installed"`
-}
-
-type AgentWeixinLoginReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentWeixinConfig struct {
-	Enabled bool `json:"enabled"`
-}
-
-type AgentQQBotConfigUpdateReq struct {
-	AgentID        uint            `json:"agentId" validate:"required"`
-	Enabled        bool            `json:"enabled"`
-	DmPolicy       string          `json:"dmPolicy"`
-	AllowFrom      []string        `json:"allowFrom"`
-	GroupPolicy    string          `json:"groupPolicy"`
-	GroupAllowFrom []string        `json:"groupAllowFrom"`
-	Bots           []AgentQQBotBot `json:"bots" validate:"required,min=1"`
-}
-
-type AgentQQBotConfig struct {
-	Enabled        bool            `json:"enabled"`
-	DmPolicy       string          `json:"dmPolicy"`
-	AllowFrom      []string        `json:"allowFrom"`
-	GroupPolicy    string          `json:"groupPolicy"`
-	GroupAllowFrom []string        `json:"groupAllowFrom"`
-	Bots           []AgentQQBotBot `json:"bots"`
-	Installed      bool            `json:"installed"`
-}
-
-type AgentPluginInstallReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Type    string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentPluginUpgradeReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Type    string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentPluginUninstallReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Type    string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentPluginCheckReq struct {
-	AgentID     uint   `json:"agentId" validate:"required"`
-	Type        string `json:"type" validate:"required,oneof=feishu qqbot wecom dingtalk weixin"`
-	CheckLatest bool   `json:"checkLatest"`
-}
-
-type AgentPluginStatus struct {
-	Installed      bool   `json:"installed"`
-	CurrentVersion string `json:"currentVersion"`
-	LatestVersion  string `json:"latestVersion"`
-	Upgradable     bool   `json:"upgradable"`
-}
-
-type AgentPluginsReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentPluginSearchReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Keyword string `json:"keyword" validate:"required,max=100"`
-	Limit   int    `json:"limit" validate:"omitempty,min=1,max=100"`
-}
-
-type AgentPluginMarketInstallReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Package string `json:"package" validate:"required,max=200"`
-	Version string `json:"version" validate:"required,max=100"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentPluginOperateReq struct {
-	AgentID  uint   `json:"agentId" validate:"required"`
-	PluginID string `json:"pluginId" validate:"required,max=200"`
-	Operate  string `json:"operate" validate:"required,oneof=enable disable update uninstall"`
-	TaskID   string `json:"taskID" validate:"required"`
-}
-
-type AgentPluginItem struct {
-	ID      string `json:"id"`
-	Name    string `json:"name"`
-	Version string `json:"version"`
-	Origin  string `json:"origin"`
-	Enabled bool   `json:"enabled"`
-}
-
-type AgentPluginSearchItem struct {
-	Package          string   `json:"package"`
-	PluginID         string   `json:"pluginId"`
-	Name             string   `json:"name"`
-	Description      string   `json:"description"`
-	Version          string   `json:"version"`
-	Channel          string   `json:"channel"`
-	VerificationTier string   `json:"verificationTier"`
-	Categories       []string `json:"categories"`
-	Official         bool     `json:"official"`
-	Downloads        int64    `json:"downloads"`
-	Score            float64  `json:"score"`
-}
-
-type AgentDiscordConfigUpdateReq struct {
-	AgentID        uint              `json:"agentId" validate:"required"`
-	Enabled        bool              `json:"enabled"`
-	DmPolicy       string            `json:"dmPolicy" validate:"required"`
-	AllowFrom      []string          `json:"allowFrom"`
-	RequireMention bool              `json:"requireMention"`
-	GroupPolicy    string            `json:"groupPolicy" validate:"required,oneof=open allowlist disabled"`
-	Proxy          string            `json:"proxy"`
-	DefaultAccount string            `json:"defaultAccount" validate:"required"`
-	Bots           []AgentDiscordBot `json:"bots" validate:"required,min=1"`
-}
-
-type AgentDiscordConfig struct {
-	Enabled        bool              `json:"enabled"`
-	DmPolicy       string            `json:"dmPolicy"`
-	AllowFrom      []string          `json:"allowFrom"`
-	RequireMention bool              `json:"requireMention"`
-	GroupPolicy    string            `json:"groupPolicy"`
-	Proxy          string            `json:"proxy"`
-	DefaultAccount string            `json:"defaultAccount"`
-	Bots           []AgentDiscordBot `json:"bots"`
-}
-
-type AgentChannelBotBase struct {
-	AccountID string `json:"accountId"`
-	Name      string `json:"name"`
-	Enabled   bool   `json:"enabled"`
-	IsDefault bool   `json:"isDefault"`
-}
-
-func (b AgentChannelBotBase) IsEnabled() bool {
-	return b.Enabled
-}
-
-type AgentFeishuBot struct {
-	AgentChannelBotBase
-	AppID     string   `json:"appId"`
-	AppSecret string   `json:"appSecret"`
-	DmPolicy  string   `json:"dmPolicy"`
-	AllowFrom []string `json:"allowFrom"`
-}
-
-type AgentTelegramBot struct {
-	AgentChannelBotBase
-	BotToken    string `json:"botToken"`
-	DmPolicy    string `json:"dmPolicy"`
-	GroupPolicy string `json:"groupPolicy"`
-	Streaming   string `json:"streaming"`
-}
-
-type AgentDiscordBot struct {
-	AgentChannelBotBase
-	Token string `json:"token"`
-}
-
-type AgentQQBotBot struct {
-	AgentChannelBotBase
-	AppID        string   `json:"appId"`
-	ClientSecret string   `json:"clientSecret"`
-	AllowFrom    []string `json:"allowFrom"`
-	SystemPrompt string   `json:"systemPrompt"`
-}
-
-type AgentDingTalkBot struct {
-	AgentChannelBotBase
-	ClientID     string `json:"clientId"`
-	ClientSecret string `json:"clientSecret"`
-}
-
-type AgentSecurityConfigUpdateReq struct {
-	AgentID        uint     `json:"agentId" validate:"required"`
-	AllowedOrigins []string `json:"allowedOrigins"`
-}
-
-type AgentSecurityConfig struct {
-	AllowedOrigins []string `json:"allowedOrigins"`
-}
-
-type AgentOtherConfigUpdateReq struct {
-	AgentID           uint   `json:"agentId" validate:"required"`
-	UserTimezone      string `json:"userTimezone"`
-	BrowserEnabled    bool   `json:"browserEnabled"`
-	NPMRegistry       string `json:"npmRegistry"`
-	DashboardUsername string `json:"dashboardUsername"`
-	DashboardPassword string `json:"dashboardPassword"`
-}
-
-type AgentOtherConfig struct {
-	UserTimezone      string `json:"userTimezone"`
-	BrowserEnabled    bool   `json:"browserEnabled"`
-	NPMRegistry       string `json:"npmRegistry"`
-	DashboardUsername string `json:"dashboardUsername"`
-	DashboardPassword string `json:"dashboardPassword"`
-}
-
-type AgentConfigFileReq struct {
-	AgentID uint `json:"agentId" validate:"required"`
-}
-
-type AgentConfigFileUpdateReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Content string `json:"content" validate:"required"`
-}
-
-type AgentConfigFile struct {
-	Content string `json:"content"`
-}
-
-type AgentSkillSearchReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Source  string `json:"source" validate:"required,oneof=clawhub-global clawhub-cn skillhub official skills-sh local-hub"`
-	Keyword string `json:"keyword" validate:"required"`
-}
-
-type AgentSkillItem struct {
-	Name          string   `json:"name"`
-	Description   string   `json:"description"`
-	Category      string   `json:"category"`
-	Tags          []string `json:"tags"`
-	Source        string   `json:"source"`
-	Trust         string   `json:"trust"`
-	Identifier    string   `json:"identifier"`
-	Bundled       bool     `json:"bundled"`
-	Disabled      bool     `json:"disabled"`
-	Uninstallable bool     `json:"uninstallable"`
-}
-
-type AgentSkillSearchItem struct {
-	Slug        string `json:"slug"`
-	Identifier  string `json:"identifier"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	Summary     string `json:"summary"`
-	Version     string `json:"version"`
-	Source      string `json:"source"`
-	Trust       string `json:"trust"`
-	Score       string `json:"score"`
-}
-
-type AgentSkillUpdateReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Name    string `json:"name" validate:"required"`
-	Enabled bool   `json:"enabled"`
-}
-
-type AgentSkillInstallReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Source  string `json:"source" validate:"required,oneof=clawhub-global clawhub-cn skillhub official skills-sh local-hub"`
-	Slug    string `json:"slug" validate:"required"`
-	TaskID  string `json:"taskID" validate:"required"`
-}
-
-type AgentSkillUninstallReq struct {
-	AgentID uint   `json:"agentId" validate:"required"`
-	Name    string `json:"name" validate:"required"`
-}
@@ -2,9 +2,8 @@ package dto

 import (
 	"encoding/json"
-	"time"
-
 	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"time"
 )

 type CreateOrUpdateAlert struct {
@@ -21,7 +20,6 @@ type AlertBase struct {
 }

 type PushAlert struct {
-	Result    string `json:"result,omitempty"`
 	TaskName  string `json:"taskName"`
 	AlertType string `json:"alertType"`
 	EntryID   uint   `json:"entryID"`
@@ -37,15 +35,6 @@ type AlertSearch struct {
 	Method  string `json:"method"`
 }

-type AlertConfigQuery struct {
-	ExcludeTypes []string `json:"excludeTypes"`
-}
-
-type AlertConfigPageReq struct {
-	PageInfo
-	ExcludeTypes []string `json:"excludeTypes"`
-}
-
 type AlertDTO struct {
 	ID             uint      `json:"id"`
 	Type           string    `json:"type"`
@@ -54,12 +43,9 @@ type AlertDTO struct {
 	Method         string    `json:"method"`
 	Title          string    `json:"title"`
 	Project        string    `json:"project"`
-	TaskName       string    `json:"taskName,omitempty"`
 	Status         string    `json:"status"`
 	SendCount      uint      `json:"sendCount"`
 	AdvancedParams string    `json:"advancedParams"`
-	CreateUser     string    `json:"createUser"`
-	UpdateUser     string    `json:"updateUser"`
 	CreatedAt      time.Time `json:"createdAt"`
 	UpdatedAt      time.Time `json:"updatedAt"`
 }
@@ -115,10 +101,8 @@ type DiskDTO struct {

 type AlertLogSearch struct {
 	PageInfo
-	Count     uint      `json:"count"`
-	Status    string    `json:"status"`
-	StartTime time.Time `json:"startTime"`
-	EndTime   time.Time `json:"endTime"`
+	Count  uint   `json:"count"`
+	Status string `json:"status"`
 }

 type AlertLogDTO struct {
@@ -153,25 +137,16 @@ type AlertLog struct {
 }

 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"`
-	Task        *AlertTaskMetadata `json:"task,omitempty"`
-}
-
-type AlertTaskMetadata struct {
-	AlertID   uint   `json:"alertId"`
-	Type      string `json:"type"`
-	Quota     string `json:"quota"`
-	QuotaType string `json:"quotaType"`
-	Method    string `json:"method"`
+	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 {
@@ -306,19 +281,14 @@ type OfflineQueryRequest struct {
 }

 type AlertConfigUpdate struct {
-	ID          uint       `json:"id"`
-	Type        string     `json:"type"`
-	Title       string     `json:"title"`
-	Status      string     `json:"status"`
-	Config      string     `json:"config"`
-	DisplayName string     `json:"displayName"`
-	Revision    *time.Time `json:"revision"`
+	ID     uint   `json:"id"`
+	Type   string `json:"type"`
+	Title  string `json:"title"`
+	Status string `json:"status"`
+	Config string `json:"config"`
 }

 type AlertConfigTest struct {
-	ID          uint   `json:"id"`
-	Type        string `json:"type"`
-	Config      string `json:"config"`
 	Host        string `json:"host"`
 	Port        int    `json:"port"`
 	Sender      string `json:"sender"`
@@ -347,7 +317,7 @@ type AlertCommonConfig struct {

 type AlertSmsConfig struct {
 	Phone         string `json:"phone"`
-	AlertDailyNum string `json:"alertDailyNum"`
+	AlertDailyNum uint   `json:"alertDailyNum"`
 }

 type AlertEmailConfig struct {
@@ -360,13 +330,3 @@ type AlertEmailConfig struct {
 	Encryption  string `json:"encryption"` // "ssl" / "tls" / "none"
 	Recipient   string `json:"recipient"`
 }
-
-type AgentInfo struct {
-	NodeName string `json:"nodeName"`
-	NodeAddr string `json:"nodeAddr"`
-}
-
-type AlertWebhookConfig struct {
-	DisplayName string `json:"displayName"`
-	Url         string `json:"url"`
-}
@@ -1,80 +0,0 @@
-package dto
-
-const AlertCustomWebhookSchemaVersion = 1
-
-type AlertConfigStatusUpdate struct {
-	ID     uint   `json:"id" validate:"required"`
-	Status string `json:"status" validate:"required,oneof=Enable Disable"`
-}
-
-type AlertCustomWebhookSecretMutation struct {
-	Action string `json:"action,omitempty"`
-	Value  string `json:"value,omitempty"`
-}
-
-type AlertCustomWebhookURL struct {
-	AlertCustomWebhookSecretMutation
-	Configured bool   `json:"configured"`
-	Masked     string `json:"masked,omitempty"`
-}
-
-type AlertCustomWebhookBody struct {
-	Type     string                        `json:"type"`
-	Template string                        `json:"template,omitempty"`
-	Fields   []AlertCustomWebhookFormField `json:"fields,omitempty"`
-}
-
-type AlertCustomWebhookFormField struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-}
-
-type AlertCustomWebhookHeader struct {
-	UID        string `json:"uid"`
-	Key        string `json:"key"`
-	Secret     bool   `json:"secret"`
-	Action     string `json:"action,omitempty"`
-	Value      string `json:"value,omitempty"`
-	Configured bool   `json:"configured,omitempty"`
-	Masked     string `json:"masked,omitempty"`
-}
-
-type AlertCustomWebhookConfig struct {
-	SchemaVersion int                        `json:"schemaVersion"`
-	State         string                     `json:"state,omitempty"`
-	DisplayName   string                     `json:"displayName"`
-	Preset        string                     `json:"preset"`
-	Method        string                     `json:"method"`
-	URL           AlertCustomWebhookURL      `json:"url"`
-	Body          AlertCustomWebhookBody     `json:"body"`
-	Headers       []AlertCustomWebhookHeader `json:"headers"`
-}
-
-type AlertCustomWebhookSecretConfig struct {
-	SchemaVersion int               `json:"schemaVersion"`
-	URL           string            `json:"url"`
-	Headers       map[string]string `json:"headers,omitempty"`
-}
-
-type AlertCustomWebhookResolvedConfig struct {
-	SchemaVersion int
-	DisplayName   string
-	Preset        string
-	Method        string
-	URL           string
-	Body          AlertCustomWebhookBody
-	Headers       []AlertCustomWebhookResolvedHeader
-}
-
-type AlertCustomWebhookResolvedHeader struct {
-	Key   string
-	Value string
-}
-
-type AlertConfigTestResult struct {
-	Success    bool   `json:"success"`
-	StatusCode int    `json:"statusCode,omitempty"`
-	Duration   int64  `json:"duration,omitempty"` // milliseconds
-	Message    string `json:"message,omitempty"`
-	Response   string `json:"response,omitempty"`
-}
@@ -2,7 +2,6 @@ package dto

 import (
 	"context"
-
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/app/task"
 )
@@ -13,8 +12,6 @@ type AppDatabase struct {
 	DbUser       string `json:"PANEL_DB_USER"`
 	Password     string `json:"PANEL_DB_USER_PASSWORD"`
 	DatabaseName string `json:"DATABASE_NAME"`
-	Format       string `json:"format"`
-	Collation    string `json:"collation"`
 }

 type AuthParam struct {
@@ -85,26 +82,25 @@ type ExtraProperties struct {
 }

 type AppProperty struct {
-	Name                string   `json:"name"`
-	Type                string   `json:"type"`
-	Tags                []string `json:"tags"`
-	ShortDescZh         string   `json:"shortDescZh" yaml:"shortDescZh"`
-	ShortDescEn         string   `json:"shortDescEn" yaml:"shortDescEn"`
-	Description         Locale   `json:"description"`
-	Key                 string   `json:"key"`
-	Required            []string `json:"Required"`
-	CrossVersionUpdate  bool     `json:"crossVersionUpdate" yaml:"crossVersionUpdate"`
-	Limit               int      `json:"limit" yaml:"limit"`
-	Recommend           int      `json:"recommend" yaml:"recommend"`
-	Website             string   `json:"website"`
-	Github              string   `json:"github"`
-	Document            string   `json:"document"`
-	Architectures       []string `json:"architectures"`
-	MemoryRequired      int      `json:"memoryRequired" yaml:"memoryRequired"`
-	GpuSupport          bool     `json:"gpuSupport" yaml:"gpuSupport"`
-	Version             float64  `json:"version"`
-	Deprecated          float64  `json:"deprecated"`
-	BatchInstallSupport bool     `json:"batchInstallSupport"`
+	Name               string   `json:"name"`
+	Type               string   `json:"type"`
+	Tags               []string `json:"tags"`
+	ShortDescZh        string   `json:"shortDescZh" yaml:"shortDescZh"`
+	ShortDescEn        string   `json:"shortDescEn" yaml:"shortDescEn"`
+	Description        Locale   `json:"description"`
+	Key                string   `json:"key"`
+	Required           []string `json:"Required"`
+	CrossVersionUpdate bool     `json:"crossVersionUpdate"`
+	Limit              int      `json:"limit"`
+	Recommend          int      `json:"recommend"`
+	Website            string   `json:"website"`
+	Github             string   `json:"github"`
+	Document           string   `json:"document"`
+	Architectures      []string `json:"architectures"`
+	MemoryRequired     int      `json:"memoryRequired"`
+	GpuSupport         bool     `json:"gpuSupport"`
+	Version            float64  `json:"version"`
+	Deprecated         float64  `json:"deprecated"`
 }

 type AppConfigVersion struct {
@@ -133,8 +129,6 @@ type Locale struct {
 	Ko     string `json:"ko"`
 	Tr     string `json:"tr"`
 	Es     string `json:"es-es" yaml:"es-es"`
-	Fa     string `json:"fa"`
-	Lo     string `json:"lo"`
 }

 type AppForm struct {
@@ -33,12 +33,6 @@ type BackupInfo struct {
 	RememberAuth bool `json:"rememberAuth"`
 }

-type BackupCheckRes struct {
-	IsOk  bool   `json:"isOk"`
-	Msg   string `json:"msg"`
-	Token string `json:"token"`
-}
-
 type ForBuckets struct {
 	Type       string `json:"type" validate:"required"`
 	AccessKey  string `json:"accessKey"`
@@ -65,29 +59,24 @@ type UploadForRecover struct {
 }

 type CommonBackup struct {
-	Type        string   `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mongodb mysql-cluster postgresql-cluster redis-cluster container compose"`
-	Name        string   `json:"name"`
-	DetailName  string   `json:"detailName"`
-	Secret      string   `json:"secret"`
-	IsImmediate bool     `json:"isImmediate"`
-	StopBefore  bool     `json:"stopBefore"`
-	TaskID      string   `json:"taskID"`
-	FileName    string   `json:"fileName"`
-	Args        []string `json:"args"`
+	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mysql-cluster postgresql-cluster redis-cluster"`
+	Name       string `json:"name"`
+	DetailName string `json:"detailName"`
+	Secret     string `json:"secret"`
+	TaskID     string `json:"taskID"`
+	FileName   string `json:"fileName"`

 	Description string `json:"description"`
 }
 type CommonRecover struct {
-	DownloadAccountID  uint   `json:"downloadAccountID" validate:"required"`
-	Type               string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql mongodb mysql-cluster postgresql-cluster redis-cluster container compose"`
-	Name               string `json:"name"`
-	DetailName         string `json:"detailName"`
-	File               string `json:"file"`
-	Secret             string `json:"secret"`
-	DropAllCollections bool   `json:"dropAllCollections"`
-	TaskID             string `json:"taskID"`
-	BackupRecordID     uint   `json:"backupRecordID"`
-	Timeout            int    `json:"timeout"`
+	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 {
@@ -2,8 +2,7 @@ package dto

 type SearchWithPage struct {
 	PageInfo
-	Info            string `json:"info"`
-	ExcludeAppStore bool   `json:"excludeAppStore"`
+	Info string `json:"info"`
 }

 type SearchPageWithType struct {
@@ -12,12 +11,6 @@ type SearchPageWithType struct {
 	Type string `json:"type"`
 }

-type SearchPageWithGroup struct {
-	PageInfo
-	GroupID uint   `json:"groupID"`
-	Info    string `json:"info"`
-}
-
 type PageInfo struct {
 	Page     int `json:"page" validate:"required,number"`
 	PageSize int `json:"pageSize" validate:"required,number"`
@@ -6,10 +6,9 @@ type PageResult struct {
 }

 type Response struct {
-	Code      int         `json:"code"`
-	ErrorCode string      `json:"errorCode,omitempty"`
-	Message   string      `json:"message"`
-	Data      interface{} `json:"data"`
+	Code    int         `json:"code"`
+	Message string      `json:"message"`
+	Data    interface{} `json:"data"`
 }

 type Options struct {
@@ -8,10 +8,6 @@ type ComposeTemplateCreate struct {
 	Content     string `json:"content"`
 }

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

 type InspectReq struct {
-	ID     string `json:"id" validate:"required"`
-	Type   string `json:"type" validate:"required"`
-	Detail string `json:"detail"`
+	ID   string `json:"id" validate:"required"`
+	Type string `json:"type" validate:"required"`
 }

 type ContainerInfo struct {
@@ -38,9 +37,6 @@ type ContainerInfo struct {
 	AppName        string   `json:"appName"`
 	AppInstallName string   `json:"appInstallName"`
 	Websites       []string `json:"websites"`
-
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
 }

 type ContainerOptions struct {
@@ -48,42 +44,15 @@ type ContainerOptions struct {
 	State string `json:"state"`
 }

-type ContainerFileReq struct {
-	ContainerID string `json:"containerID" validate:"required"`
-	Path        string `json:"path" validate:"required"`
-}
-
-type ContainerFileBatchDeleteReq struct {
-	ContainerID string   `json:"containerID" validate:"required"`
-	Paths       []string `json:"paths" validate:"required,min=1,dive,required"`
-}
-
-type ContainerFileInfo struct {
-	Name    string `json:"name"`
-	Path    string `json:"path"`
-	IsDir   bool   `json:"isDir"`
-	IsLink  bool   `json:"isLink"`
-	LinkTo  string `json:"linkTo"`
-	Size    int64  `json:"size"`
-	Mode    string `json:"mode"`
-	ModTime string `json:"modTime"`
-}
-
-type ContainerFileContent struct {
-	Content   string `json:"content"`
-	Size      int64  `json:"size"`
-	Truncated bool   `json:"truncated"`
-	IsBinary  bool   `json:"isBinary"`
-}
-
 type ContainerStatus struct {
-	Created    int `json:"created"`
-	Running    int `json:"running"`
-	Paused     int `json:"paused"`
-	Restarting int `json:"restarting"`
-	Removing   int `json:"removing"`
-	Exited     int `json:"exited"`
-	Dead       int `json:"dead"`
+	All        uint `json:"all"`
+	Created    uint `json:"created"`
+	Running    uint `json:"running"`
+	Paused     uint `json:"paused"`
+	Restarting uint `json:"restarting"`
+	Removing   uint `json:"removing"`
+	Exited     uint `json:"exited"`
+	Dead       uint `json:"dead"`

 	ContainerCount       int `json:"containerCount"`
 	ComposeCount         int `json:"composeCount"`
@@ -92,6 +61,8 @@ type ContainerStatus struct {
 	NetworkCount         int `json:"networkCount"`
 	VolumeCount          int `json:"volumeCount"`
 	RepoCount            int `json:"repoCount"`
+
+	ImageSize uint64 `json:"imageSize"`
 }
 type ResourceLimit struct {
 	CPU    int    `json:"cpu"`
@@ -99,16 +70,17 @@ type ResourceLimit struct {
 }

 type ContainerOperate struct {
-	TaskID    string `json:"taskID"`
-	ForcePull bool   `json:"forcePull"`
-	Name      string `json:"name" validate:"required"`
-	Image     string `json:"image" validate:"required"`
-
-	Hostname   string             `json:"hostname"`
-	DomainName string             `json:"domainName"`
-	DNS        []string           `json:"dns"`
-	Networks   []ContainerNetwork `json:"networks"`
-
+	TaskID          string         `json:"taskID"`
+	ForcePull       bool           `json:"forcePull"`
+	Name            string         `json:"name" validate:"required"`
+	Image           string         `json:"image" validate:"required"`
+	Network         string         `json:"network"`
+	Hostname        string         `json:"hostname"`
+	DomainName      string         `json:"domainName"`
+	MacAddr         string         `json:"macAddr"`
+	DNS             []string       `json:"dns"`
+	Ipv4            string         `json:"ipv4"`
+	Ipv6            string         `json:"ipv6"`
 	PublishAllPorts bool           `json:"publishAllPorts"`
 	ExposedPorts    []PortHelper   `json:"exposedPorts"`
 	Tty             bool           `json:"tty"`
@@ -123,28 +95,11 @@ type ContainerOperate struct {
 	Privileged      bool           `json:"privileged"`
 	AutoRemove      bool           `json:"autoRemove"`
 	Volumes         []VolumeHelper `json:"volumes"`
-	ExtraHosts      []ExtraHost    `json:"extraHosts"`
 	Labels          []string       `json:"labels"`
 	Env             []string       `json:"env"`
 	RestartPolicy   string         `json:"restartPolicy"`
 }

-type ExtraHost struct {
-	Hostname string `json:"hostname"`
-	IP       string `json:"ip"`
-}
-type ContainerNetwork struct {
-	Network      string            `json:"network"`
-	Ipv4         string            `json:"ipv4"`
-	Ipv6         string            `json:"ipv6"`
-	MacAddr      string            `json:"macAddr"`
-	Links        []string          `json:"links"`
-	Aliases      []string          `json:"aliases"`
-	DriverOpts   map[string]string `json:"driverOpts"`
-	GwPriority   int               `json:"gwPriority"`
-	LinkLocalIPs []string          `json:"linkLocalIPs"`
-}
-
 type ContainerCreateByCommand struct {
 	TaskID  string `json:"taskID"`
 	Command string `json:"command"`
@@ -157,19 +112,6 @@ type ContainerUpgrade struct {
 	ForcePull bool     `json:"forcePull"`
 }

-type ContainerItemStats struct {
-	SizeRw     int64 `json:"sizeRw"`
-	SizeRootFs int64 `json:"sizeRootFs"`
-
-	ContainerUsage        int64 `json:"containerUsage"`
-	ContainerReclaimable  int64 `json:"containerReclaimable"`
-	ImageUsage            int64 `json:"imageUsage"`
-	ImageReclaimable      int64 `json:"imageReclaimable"`
-	VolumeUsage           int64 `json:"volumeUsage"`
-	VolumeReclaimable     int64 `json:"volumeReclaimable"`
-	BuildCacheUsage       int64 `json:"buildCacheUsage"`
-	BuildCacheReclaimable int64 `json:"buildCacheReclaimable"`
-}
 type ContainerListStats struct {
 	ContainerID string `json:"containerID"`

@@ -211,7 +153,6 @@ type PortHelper struct {
 }

 type ContainerOperation struct {
-	TaskID    string   `json:"taskID"`
 	Names     []string `json:"names" validate:"required"`
 	Operation string   `json:"operation" validate:"required,oneof=up start stop restart kill pause unpause remove"`
 }
@@ -292,68 +233,50 @@ type BatchDelete struct {
 }

 type ComposeInfo struct {
-	Name              string             `json:"name"`
-	CreatedAt         string             `json:"createdAt"`
-	CreatedBy         string             `json:"createdBy"`
-	ContainerCount    int                `json:"containerCount"`
-	RunningCount      int                `json:"runningCount"`
-	ConfigFile        string             `json:"configFile"`
-	Workdir           string             `json:"workdir"`
-	ComposeFileExists bool               `json:"composeFileExists"`
-	IsPinned          bool               `json:"isPinned"`
-	Path              string             `json:"path"`
-	Containers        []ComposeContainer `json:"containers"`
-	Env               string             `json:"env"`
+	Name           string             `json:"name"`
+	CreatedAt      string             `json:"createdAt"`
+	CreatedBy      string             `json:"createdBy"`
+	ContainerCount int                `json:"containerCount"`
+	RunningCount   int                `json:"runningCount"`
+	ConfigFile     string             `json:"configFile"`
+	Workdir        string             `json:"workdir"`
+	Path           string             `json:"path"`
+	Containers     []ComposeContainer `json:"containers"`
+	Env            []string           `json:"env"`
 }
 type ComposeContainer struct {
-	ContainerID string   `json:"containerID"`
-	Name        string   `json:"name"`
-	CreateTime  string   `json:"createTime"`
-	State       string   `json:"state"`
-	Ports       []string `json:"ports"`
+	ContainerID string `json:"containerID"`
+	Name        string `json:"name"`
+	CreateTime  string `json:"createTime"`
+	State       string `json:"state"`
 }
 type ComposeCreate struct {
-	TaskID    string `json:"taskID"`
-	Name      string `json:"name"`
-	DirName   string `json:"dirName"`
-	From      string `json:"from" validate:"required,oneof=edit path template"`
-	File      string `json:"file"`
-	Path      string `json:"path"`
-	Template  uint   `json:"template"`
-	Env       string `json:"env"`
-	ForcePull bool   `json:"forcePull"`
+	TaskID   string   `json:"taskID"`
+	Name     string   `json:"name"`
+	From     string   `json:"from" validate:"required,oneof=edit path template"`
+	File     string   `json:"file"`
+	Path     string   `json:"path"`
+	Template uint     `json:"template"`
+	Env      []string `json:"env"`
 }
 type ComposeOperation struct {
 	Name      string `json:"name" validate:"required"`
 	Path      string `json:"path"`
-	Operation string `json:"operation" validate:"required,oneof=up start restart stop down delete rebuild"`
+	Operation string `json:"operation" validate:"required,oneof=up start restart stop down delete"`
 	WithFile  bool   `json:"withFile"`
-	Force     bool   `json:"force"`
+	Force     bool   `josn:"force"`
 }
 type ComposeUpdate struct {
-	TaskID     string `json:"taskID"`
-	Name       string `json:"name" validate:"required"`
-	Path       string `json:"path" validate:"required"`
-	DetailPath string `json:"detailPath"`
-	Content    string `json:"content" validate:"required"`
-	Env        string `json:"env"`
-	ForcePull  bool   `json:"forcePull"`
-}
-type ComposePin struct {
-	Name     string `json:"name" validate:"required"`
-	IsPinned bool   `json:"isPinned"`
-}
-type ComposeLogClean struct {
-	Name       string `json:"name" validate:"required"`
-	Path       string `json:"path" validate:"required"`
-	DetailPath string `json:"detailPath"`
+	Name    string   `json:"name" validate:"required"`
+	Path    string   `json:"path" validate:"required"`
+	Content string   `json:"content" validate:"required"`
+	Env     []string `json:"env"`
 }

 type ContainerLog struct {
 	Container     string `json:"container" validate:"required"`
 	Since         string `json:"since"`
 	Tail          uint   `json:"tail"`
-	Timestamp     bool   `json:"timestamp"`
 	ContainerType string `json:"containerType"`
 }

@@ -363,6 +286,5 @@ type StreamLog struct {
 	Since     string
 	Follow    bool
 	Tail      string
-	Timestamp bool
 	Type      string
 }
@@ -49,18 +49,10 @@ type CronjobOperate struct {
 	Timeout           uint   `json:"timeout" validate:"number,min=1"`
 	IgnoreErr         bool   `json:"ignoreErr"`
 	Secret            string `json:"secret"`
-	Args              string `json:"args"`

-	AlertCount       uint   `json:"alertCount"`
-	AlertTitle       string `json:"alertTitle"`
-	AlertMethod      string `json:"alertMethod"`
-	AlertTriggerMode string `json:"alertTriggerMode" validate:"omitempty,oneof=failed success both"`
-
-	CleanLogConfig
-}
-
-type CleanLogConfig struct {
-	Scopes []string `json:"scopes"`
+	AlertCount  uint   `json:"alertCount"`
+	AlertTitle  string `json:"alertTitle"`
+	AlertMethod string `json:"alertMethod"`
 }

 type SnapshotRule struct {
@@ -125,10 +117,8 @@ type CronjobInfo struct {
 	LastRecordTime   string `json:"lastRecordTime"`
 	Status           string `json:"status"`
 	Secret           string `json:"secret"`
-	Args             string `json:"args"`

-	AlertCount       uint   `json:"alertCount"`
-	AlertTriggerMode string `json:"alertTriggerMode"`
+	AlertCount uint `json:"alertCount"`
 }

 type CronjobImport struct {
@@ -166,15 +156,13 @@ type CronjobTrans struct {
 	IgnoreErr    bool                `json:"ignoreErr"`
 	SnapshotRule SnapshotTransHelper `json:"snapshotRule"`
 	Secret       string              `json:"secret"`
-	Args         string              `json:"args"`

 	SourceAccounts  []string `json:"sourceAccounts"`
 	DownloadAccount string   `json:"downloadAccount"`

-	AlertCount       uint   `json:"alertCount"`
-	AlertTitle       string `json:"alertTitle"`
-	AlertMethod      string `json:"alertMethod"`
-	AlertTriggerMode string `json:"alertTriggerMode" validate:"omitempty,oneof=failed success both"`
+	AlertCount  uint   `json:"alertCount"`
+	AlertTitle  string `json:"alertTitle"`
+	AlertMethod string `json:"alertMethod"`
 }
 type TransHelper struct {
 	Name       string `json:"name"`
@@ -200,7 +188,6 @@ type SearchRecord struct {

 type Record struct {
 	ID         uint   `json:"id"`
-	CronjobID  uint   `json:"cronjobID"`
 	TaskID     string `json:"taskID"`
 	StartTime  string `json:"startTime"`
 	Records    string `json:"records"`
@@ -4,7 +4,6 @@ import "time"

 type DashboardBase struct {
 	WebsiteNumber      int `json:"websiteNumber"`
-	AgentNumber        int `json:"agentNumber"`
 	DatabaseNumber     int `json:"databaseNumber"`
 	CronjobNumber      int `json:"cronjobNumber"`
 	AppInstalledNumber int `json:"appInstalledNumber"`
@@ -14,17 +13,15 @@ type DashboardBase struct {
 	Platform             string `json:"platform"`
 	PlatformFamily       string `json:"platformFamily"`
 	PlatformVersion      string `json:"platformVersion"`
-	PrettyDistro         string `json:"prettyDistro"`
 	KernelArch           string `json:"kernelArch"`
 	KernelVersion        string `json:"kernelVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
 	IpV4Addr             string `json:"ipV4Addr"`
 	SystemProxy          string `json:"systemProxy"`

-	CPUCores        int     `json:"cpuCores"`
-	CPULogicalCores int     `json:"cpuLogicalCores"`
-	CPUModelName    string  `json:"cpuModelName"`
-	CPUMhz          float64 `json:"cpuMhz"`
+	CPUCores        int    `json:"cpuCores"`
+	CPULogicalCores int    `json:"cpuLogicalCores"`
+	CPUModelName    string `json:"cpuModelName"`

 	QuickJumps  []QuickJump      `json:"quickJump"`
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
@@ -51,7 +48,6 @@ type OsInfo struct {
 	PlatformFamily string `json:"platformFamily"`
 	KernelArch     string `json:"kernelArch"`
 	KernelVersion  string `json:"kernelVersion"`
-	PrettyDistro   string `json:"prettyDistro"`

 	DiskSize int64 `json:"diskSize"`
 }
@@ -62,10 +58,9 @@ type NodeCurrent struct {
 	Load15           float64 `json:"load15"`
 	LoadUsagePercent float64 `json:"loadUsagePercent"`

-	CPUUsedPercent     float64   `json:"cpuUsedPercent"`
-	CPUUsed            float64   `json:"cpuUsed"`
-	CPUTotal           int       `json:"cpuTotal"`
-	CPUDetailedPercent []float64 `json:"cpuDetailedPercent"`
+	CPUUsedPercent float64 `json:"cpuUsedPercent"`
+	CPUUsed        float64 `json:"cpuUsed"`
+	CPUTotal       int     `json:"cpuTotal"`

 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryAvailable   uint64  `json:"memoryAvailable"`
@@ -79,9 +74,8 @@ type NodeCurrent struct {
 }

 type DashboardCurrent struct {
-	Uptime          uint64      `json:"uptime"`
-	TimeSinceUptime string      `json:"timeSinceUptime"`
-	RunningTime     RunningTime `json:"runningTime"`
+	Uptime          uint64 `json:"uptime"`
+	TimeSinceUptime string `json:"timeSinceUptime"`

 	Procs uint64 `json:"procs"`

@@ -90,11 +84,10 @@ type DashboardCurrent struct {
 	Load15           float64 `json:"load15"`
 	LoadUsagePercent float64 `json:"loadUsagePercent"`

-	CPUPercent         []float64 `json:"cpuPercent"`
-	CPUUsedPercent     float64   `json:"cpuUsedPercent"`
-	CPUUsed            float64   `json:"cpuUsed"`
-	CPUTotal           int       `json:"cpuTotal"`
-	CPUDetailedPercent []float64 `json:"cpuDetailedPercent"`
+	CPUPercent     []float64 `json:"cpuPercent"`
+	CPUUsedPercent float64   `json:"cpuUsedPercent"`
+	CPUUsed        float64   `json:"cpuUsed"`
+	CPUTotal       int       `json:"cpuTotal"`

 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryUsed        uint64  `json:"memoryUsed"`
@@ -121,22 +114,11 @@ type DashboardCurrent struct {
 	NetBytesRecv uint64 `json:"netBytesRecv"`

 	GPUData []GPUInfo `json:"gpuData"`
-	NPUData []NPUInfo `json:"npuData"`
 	XPUData []XPUInfo `json:"xpuData"`

-	TopCPUItems []Process `json:"topCPUItems"`
-	TopMemItems []Process `json:"topMemItems"`
-
 	ShotTime time.Time `json:"shotTime"`
 }

-type RunningTime struct {
-	Days    uint64 `json:"days"`
-	Hours   uint64 `json:"hours"`
-	Minutes uint64 `json:"minutes"`
-	Seconds uint64 `json:"seconds"`
-}
-
 type AppLauncherSync struct {
 	Keys []string `json:"keys"`
 }
@@ -157,12 +139,8 @@ type DiskInfo struct {
 }

 type GPUInfo struct {
-	Type             string `json:"type"`
 	Index            uint   `json:"index"`
-	NPUIndex         uint   `json:"npuIndex"`
-	ChipIndex        uint   `json:"chipIndex"`
 	ProductName      string `json:"productName"`
-	BusID            string `json:"busID"`
 	GPUUtil          string `json:"gpuUtil"`
 	Temperature      string `json:"temperature"`
 	PerformanceState string `json:"performanceState"`
@@ -175,27 +153,6 @@ type GPUInfo struct {
 	FanSpeed         string `json:"fanSpeed"`
 }

-type NPUInfo struct {
-	Type           string `json:"type"`
-	Index          uint   `json:"index"`
-	NPUIndex       uint   `json:"npuIndex"`
-	ChipIndex      uint   `json:"chipIndex"`
-	ProductName    string `json:"productName"`
-	BusID          string `json:"busID"`
-	Health         string `json:"health"`
-	Temperature    string `json:"temperature"`
-	PowerDraw      string `json:"powerDraw"`
-	AICore         string `json:"aiCore"`
-	MemUsed        string `json:"memUsed"`
-	MemTotal       string `json:"memTotal"`
-	MemoryUsed     string `json:"memoryUsed"`
-	MemoryTotal    string `json:"memoryTotal"`
-	HBMUsed        string `json:"hbmUsed"`
-	HBMTotal       string `json:"hbmTotal"`
-	HugepagesUsed  string `json:"hugepagesUsed"`
-	HugepagesTotal string `json:"hugepagesTotal"`
-}
-
 type AppLauncher struct {
 	Key         string `json:"key"`
 	Type        string `json:"type"`
@@ -228,13 +185,11 @@ type LauncherOption struct {
 }

 type XPUInfo struct {
-	DeviceID      int    `json:"deviceID"`
-	DeviceName    string `json:"deviceName"`
-	PciBdfAddress string `json:"pciBdfAddress"`
-	Memory        string `json:"memory"`
-	Temperature   string `json:"temperature"`
-	GPUUtil       string `json:"gpuUtil"`
-	MemoryUsed    string `json:"memoryUsed"`
-	Power         string `json:"power"`
-	MemoryUtil    string `json:"memoryUtil"`
+	DeviceID    int    `json:"deviceID"`
+	DeviceName  string `json:"deviceName"`
+	Memory      string `json:"memory"`
+	Temperature string `json:"temperature"`
+	MemoryUsed  string `json:"memoryUsed"`
+	Power       string `json:"power"`
+	MemoryUtil  string `json:"memoryUtil"`
 }
@@ -11,7 +11,7 @@ type DBConfUpdateByFile struct {
 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 redis mongodb mysql-cluster postgresql-cluster redis-cluster"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis mysql-cluster postgresql-cluster redis-cluster"`
 	Database string `json:"database" validate:"required"`
 	Value    string `json:"value" validate:"required"`
 }
@@ -38,7 +38,6 @@ type MysqlDBInfo struct {
 	From        string    `json:"from"`
 	MysqlName   string    `json:"mysqlName"`
 	Format      string    `json:"format"`
-	Collation   string    `json:"collation"`
 	Username    string    `json:"username"`
 	Password    string    `json:"password"`
 	Permission  string    `json:"permission"`
@@ -58,84 +57,19 @@ type MysqlDBCreate struct {
 	Name        string `json:"name" validate:"required"`
 	From        string `json:"from" validate:"required,oneof=local remote"`
 	Database    string `json:"database" validate:"required"`
-	Format      string `json:"format" validate:"required"`
-	Collation   string `json:"collation"`
-	Username    string `json:"username"`
-	Password    string `json:"password"`
+	Format      string `json:"format" validate:"required,oneof=utf8mb4 utf8 gbk big5"`
+	Username    string `json:"username" validate:"required"`
+	Password    string `json:"password" validate:"required"`
 	Permission  string `json:"permission" validate:"required"`
 	Description string `json:"description"`
 }

-type MysqlUser struct {
-	Username    string `json:"username"`
-	Host        string `json:"host"`
-	Password    string `json:"password"`
-	Description string `json:"description"`
-	IsDelete    bool   `json:"isDelete"`
-}
-
-type MysqlGrant struct {
-	Database string `json:"database"`
-	Username string `json:"username"`
-	Host     string `json:"host"`
-}
-
-type MysqlGrantSummarySearch struct {
-	Database string   `json:"database" validate:"required"`
-	DBs      []string `json:"dbs" validate:"required"`
-}
-
-type MysqlUserSearch struct {
-	Database string `json:"database" validate:"required"`
-}
-
-type MysqlUserCreate struct {
-	Database    string   `json:"database" validate:"required"`
-	Username    string   `json:"username" validate:"required"`
-	Password    string   `json:"password" validate:"required"`
-	Host        string   `json:"host" validate:"required"`
-	Description string   `json:"description"`
-	DBs         []string `json:"dbs"`
-}
-
-type MysqlUserDelete struct {
-	Database string `json:"database" validate:"required"`
-	Username string `json:"username" validate:"required"`
-	Host     string `json:"host" validate:"required"`
-}
-
-type MysqlUserUpdate struct {
-	Database    string `json:"database" validate:"required"`
-	Username    string `json:"username" validate:"required"`
-	Host        string `json:"host" validate:"required"`
-	NewHost     string `json:"newHost" validate:"required"`
-	Description string `json:"description"`
-}
-
-type MysqlUserPassword struct {
-	Database string `json:"database" validate:"required"`
-	Username string `json:"username" validate:"required"`
-	Host     string `json:"host" validate:"required"`
-	Password string `json:"password" validate:"required"`
-}
-
-type MysqlGrantCreate struct {
-	Database string `json:"database" validate:"required"`
-	DB       string `json:"db" validate:"required"`
-	Username string `json:"username" validate:"required"`
-	Host     string `json:"host" validate:"required"`
-}
-
-type MysqlGrantDelete struct {
-	Database string `json:"database" validate:"required"`
-	DB       string `json:"db" validate:"required"`
-	Username string `json:"username" validate:"required"`
-	Host     string `json:"host" validate:"required"`
-}
-
-type MysqlFormatCollationOption struct {
-	Format     string   `json:"format"`
-	Collations []string `json:"collations"`
+type BindUser struct {
+	Database   string `json:"database" validate:"required"`
+	DB         string `json:"db" validate:"required"`
+	Username   string `json:"username" validate:"required"`
+	Password   string `json:"password" validate:"required"`
+	Permission string `json:"permission" validate:"required"`
 }

 type MysqlLoadDB struct {
@@ -196,83 +130,6 @@ type MysqlStatus struct {
 	Position                     string `json:"Position"`
 }

-// mongodb
-type MongodbDBSearch struct {
-	PageInfo
-	Info     string `json:"info"`
-	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy" validate:"required,oneof=name createdAt"`
-	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
-}
-
-type MongodbDBInfo struct {
-	ID          uint      `json:"id"`
-	CreatedAt   time.Time `json:"createdAt"`
-	Name        string    `json:"name"`
-	From        string    `json:"from"`
-	MongodbName string    `json:"mongodbName"`
-	Username    string    `json:"username"`
-	Password    string    `json:"password"`
-	IsDelete    bool      `json:"isDelete"`
-	Description string    `json:"description"`
-}
-
-type MongodbDBCreate struct {
-	Name        string `json:"name" validate:"required"`
-	From        string `json:"from" validate:"required,oneof=local remote"`
-	Database    string `json:"database" validate:"required"`
-	Username    string `json:"username" validate:"required"`
-	Password    string `json:"password" validate:"required"`
-	Permission  string `json:"permission" validate:"required,oneof=dbOwner read readWrite userAdmin"`
-	Description string `json:"description"`
-}
-
-type MongodbLoadDB struct {
-	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=mongodb"`
-	Database string `json:"database" validate:"required"`
-}
-
-type MongodbDBDeleteCheck struct {
-	ID       uint   `json:"id" validate:"required"`
-	Type     string `json:"type" validate:"required,oneof=mongodb"`
-	Database string `json:"database" validate:"required"`
-}
-
-type MongodbDBDelete struct {
-	ID           uint   `json:"id" validate:"required"`
-	Type         string `json:"type" validate:"required,oneof=mongodb"`
-	Database     string `json:"database" validate:"required"`
-	ForceDelete  bool   `json:"forceDelete"`
-	DeleteBackup bool   `json:"deleteBackup"`
-}
-
-type MongodbBind struct {
-	Database string `json:"database" validate:"required"`
-	Name     string `json:"name" validate:"required"`
-	Username string `json:"username" validate:"required"`
-	Password string `json:"password" validate:"required"`
-}
-
-type MongodbPassword struct {
-	Database string `json:"database" validate:"required"`
-	Name     string `json:"name" validate:"required"`
-	Password string `json:"password" validate:"required"`
-}
-
-type MongodbPrivileges struct {
-	Database   string `json:"database" validate:"required"`
-	Name       string `json:"name" validate:"required"`
-	Username   string `json:"username" validate:"required"`
-	Permission string `json:"permission" validate:"required,oneof=dbOwner read readWrite userAdmin"`
-}
-
-type MongodbPrivilegesLoad struct {
-	Database string `json:"database" validate:"required"`
-	Name     string `json:"name" validate:"required"`
-	Username string `json:"username" validate:"required"`
-}
-
 type MysqlVariables struct {
 	BinlogCacheSize      string `json:"binlog_cache_size"`
 	InnodbBufferPoolSize string `json:"innodb_buffer_pool_size"`
@@ -394,7 +251,6 @@ type DatabaseInfo struct {
 	Version   string    `json:"version"`
 	Address   string    `json:"address"`
 	Port      uint      `json:"port"`
-	InitialDB string    `json:"initialDB"`
 	Username  string    `json:"username"`
 	Password  string    `json:"password"`

@@ -425,15 +281,14 @@ type DatabaseItem struct {
 }

 type DatabaseCreate struct {
-	Name      string `json:"name" validate:"required,max=256"`
-	Type      string `json:"type" validate:"required"`
-	From      string `json:"from" validate:"required,oneof=local remote"`
-	Version   string `json:"version" validate:"required"`
-	Address   string `json:"address"`
-	Port      uint   `json:"port"`
-	InitialDB string `json:"initialDB"`
-	Username  string `json:"username" validate:"required"`
-	Password  string `json:"password"`
+	Name     string `json:"name" validate:"required,max=256"`
+	Type     string `json:"type" validate:"required"`
+	From     string `json:"from" validate:"required,oneof=local remote"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password"`

 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`
@@ -446,14 +301,13 @@ type DatabaseCreate struct {
 }

 type DatabaseUpdate struct {
-	ID        uint   `json:"id"`
-	Type      string `json:"type" validate:"required"`
-	Version   string `json:"version" validate:"required"`
-	Address   string `json:"address"`
-	Port      uint   `json:"port"`
-	InitialDB string `json:"initialDB"`
-	Username  string `json:"username" validate:"required"`
-	Password  string `json:"password"`
+	ID       uint   `json:"id"`
+	Type     string `json:"type" validate:"required"`
+	Version  string `json:"version" validate:"required"`
+	Address  string `json:"address"`
+	Port     uint   `json:"port"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password"`

 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`
@@ -1,353 +1,78 @@
 package dto

-import (
-	"github.com/1Panel-dev/1Panel/agent/utils/firewall"
-	dockerfirewall "github.com/1Panel-dev/1Panel/agent/utils/firewall/docker_guard"
-	"github.com/1Panel-dev/1Panel/agent/utils/firewall/filter"
-	"github.com/1Panel-dev/1Panel/agent/utils/firewall/forwarding"
-)
-
-type FirewallSubsystemStatus struct {
-	IPv6Enabled     bool                        `json:"ipv6Enabled"`
-	Name            string                      `json:"name"`
-	Backend         string                      `json:"backend"`
-	ConflictBackend string                      `json:"conflictBackend,omitempty"`
-	IsExist         bool                        `json:"isExist"`
-	IsActive        bool                        `json:"isActive"`
-	IsInit          bool                        `json:"isInit"`
-	IsBind          bool                        `json:"isBind"`
-	Version         string                      `json:"version"`
-	PingStatus      string                      `json:"pingStatus"`
-	Message         string                      `json:"message,omitempty"`
-	Reason          string                      `json:"reason,omitempty"`
-	LifecycleTaskID string                      `json:"lifecycleTaskID,omitempty"`
-	IPv4            FirewallBackendFamilyStatus `json:"ipv4"`
-	IPv6            FirewallBackendFamilyStatus `json:"ipv6"`
+type FirewallBaseInfo struct {
+	Name       string `json:"name"`
+	IsExist    bool   `json:"isExist"`
+	IsActive   bool   `json:"isActive"`
+	Version    string `json:"version"`
+	PingStatus string `json:"pingStatus"`
 }

-type FirewallLifecycleOperation struct {
-	Operation         string `json:"operation" validate:"required,oneof=start stop restart disableBanPing enableBanPing"`
+type RuleSearch struct {
+	PageInfo
+	Info     string `json:"info"`
+	Status   string `json:"status"`
+	Strategy string `json:"strategy"`
+	Type     string `json:"type" validate:"required"`
+}
+
+type FirewallOperation struct {
+	Operation         string `json:"operation" validate:"required,oneof=start stop restart disablePing enablePing"`
 	WithDockerRestart bool   `json:"withDockerRestart"`
 }

-type FirewallLifecycleOperationResponse struct {
-	TaskID string `json:"taskID,omitempty"`
-	Queued bool   `json:"queued"`
+type PortRuleOperate struct {
+	Operation string `json:"operation" validate:"required,oneof=add remove"`
+	Address   string `json:"address"`
+	Port      string `json:"port" validate:"required"`
+	Protocol  string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
+	Strategy  string `json:"strategy" validate:"required,oneof=accept drop"`
+
+	Description string `json:"description"`
 }

-type FirewallBackendOption struct {
-	Name           string                      `json:"name"`
-	Installed      bool                        `json:"installed"`
-	Active         bool                        `json:"active"`
-	Initialized    bool                        `json:"initialized"`
-	Bound          bool                        `json:"bound"`
-	Supported      bool                        `json:"supported"`
-	SupportReason  string                      `json:"supportReason,omitempty"`
-	Implementation string                      `json:"implementation,omitempty"`
-	Message        string                      `json:"message,omitempty"`
-	IPv4           FirewallBackendFamilyStatus `json:"ipv4"`
-	IPv6           FirewallBackendFamilyStatus `json:"ipv6"`
+type ForwardRuleOperate 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"`
+		Interface  string `json:"interface"`
+		Port       string `json:"port" validate:"required"`
+		TargetIP   string `json:"targetIP"`
+		TargetPort string `json:"targetPort" validate:"required"`
+	} `json:"rules"`
 }

-type FirewallBackendFamilyStatus struct {
-	Partial      bool     `json:"partial"`
-	Available    bool     `json:"available"`
-	Initialized  bool     `json:"initialized"`
-	Bound        bool     `json:"bound"`
-	Reason       string   `json:"reason,omitempty"`
-	RAInterfaces []string `json:"raInterfaces,omitempty"`
+type UpdateFirewallDescription struct {
+	Type     string `json:"type"`
+	Address  string `json:"address"`
+	Port     string `json:"port"`
+	Protocol string `json:"protocol"`
+	Strategy string `json:"strategy" validate:"required,oneof=accept drop"`
+
+	Description string `json:"description"`
 }

-type FirewallBackendGroup struct {
-	Selected string                  `json:"selected"`
-	Current  string                  `json:"current,omitempty"`
-	Options  []FirewallBackendOption `json:"options"`
+type AddrRuleOperate struct {
+	Operation string `json:"operation" validate:"required,oneof=add remove"`
+	Address   string `json:"address"  validate:"required"`
+	Strategy  string `json:"strategy" validate:"required,oneof=accept drop"`
+
+	Description string `json:"description"`
 }

-type FirewallSettings struct {
-	IPv6Enabled   bool                   `json:"ipv6Enabled"`
-	System        FirewallBackendGroup   `json:"system"`
-	Forwarding    FirewallBackendGroup   `json:"forwarding"`
-	Docker        FirewallBackendGroup   `json:"docker"`
-	PingStatus    string                 `json:"pingStatus"`
-	PortWhitelist []filter.PortWhitelist `json:"portWhiteList"`
-	PanelPort     string                 `json:"panelPort"`
-	SSHPort       string                 `json:"sshPort"`
+type PortRuleUpdate struct {
+	OldRule PortRuleOperate `json:"oldRule"`
+	NewRule PortRuleOperate `json:"newRule"`
 }

-type FirewallPortWhitelistCreate struct {
-	Rule filter.PortWhitelist `json:"rule" validate:"required"`
+type AddrRuleUpdate struct {
+	OldRule AddrRuleOperate `json:"oldRule"`
+	NewRule AddrRuleOperate `json:"newRule"`
 }

-type FirewallPortWhitelistUpdate struct {
-	OldRule filter.PortWhitelist `json:"oldRule" validate:"required"`
-	Rule    filter.PortWhitelist `json:"rule" validate:"required"`
-}
-
-type FirewallPortWhitelistDelete struct {
-	Rule *filter.PortWhitelist `json:"rule" validate:"required"`
-}
-
-type FirewallBackendOperation struct {
-	Subsystem string `json:"subsystem" validate:"required,oneof=system forwarding docker"`
-	Backend   string `json:"backend" validate:"required,oneof=firewalld ufw iptables nftables"`
-	Operation string `json:"operation" validate:"required,oneof=select initialize cleanup"`
-}
-
-type FirewallIPv6Operation struct {
-	Status string `json:"status" validate:"required,oneof=Enable Disable"`
-}
-
-type FirewallFamilyOperation struct {
-	Subsystem string `json:"subsystem" validate:"required,oneof=system forwarding docker"`
-	Backend   string `json:"backend" validate:"required,oneof=iptables nftables"`
-	Family    string `json:"family" validate:"required,oneof=ipv4 ipv6"`
-	Operation string `json:"operation" validate:"required,oneof=initialize repair bind"`
-}
-
-type FilterChainOperation struct {
-	Name    string `json:"name" validate:"required,eq=1PANEL_BASIC"`
-	Operate string `json:"operate" validate:"required,oneof=init-base bind-base unbind-base"`
-	TaskID  string `json:"taskID,omitempty" validate:"omitempty,max=64"`
-}
-
-type FilterChainOperationResponse struct {
-	TaskID string `json:"taskID"`
-	Queued bool   `json:"queued"`
-}
-
-type FirewallInitializationTask struct {
-	BackupFile string `json:"backupFile,omitempty" validate:"omitempty,max=255"`
-	TaskID     string `json:"taskID,omitempty" validate:"omitempty,max=64"`
-}
-
-type FirewallSystemPort = firewall.SystemPort
-
-type FirewallRuleInventoryResponse struct {
-	IPv4Range filter.PositionRange   `json:"ipv4Range"`
-	IPv6Range filter.PositionRange   `json:"ipv6Range"`
-	Total     int64                  `json:"total"`
-	AllTotal  int64                  `json:"allTotal"`
-	Items     []filter.InventoryItem `json:"items"`
-	Notices   []filter.ScopeNotice   `json:"notices,omitempty"`
-}
-
-type FirewallRuleBackup struct {
-	Name       string          `json:"name"`
-	Provider   filter.Provider `json:"provider"`
-	RuleCount  int             `json:"ruleCount"`
-	ModifiedAt int64           `json:"modifiedAt"`
-}
-
-type FirewallRuleBackups struct {
-	Directory string               `json:"directory"`
-	Files     []FirewallRuleBackup `json:"files"`
-}
-
-type FirewallRuleResetResponse struct {
-	BackupPath string `json:"backupPath"`
-	Removed    int    `json:"removed"`
-	Disabled   bool   `json:"disabled"`
-}
-
-type FirewallRuleReset struct {
-	Subsystem         string          `json:"subsystem,omitempty" validate:"omitempty,oneof=system forwarding docker"`
-	Backup            *bool           `json:"backup,omitempty" default:"true"`
-	Provider          filter.Provider `json:"provider,omitempty" validate:"omitempty,oneof=firewalld ufw iptables nftables"`
-	WithDockerRestart bool            `json:"withDockerRestart"`
-}
-
-type FirewallRuleInventory struct {
-	PageInfo
-	Scope         filter.Scope    `json:"scope,omitempty"`
-	Scopes        []filter.Scope  `json:"scopes,omitempty" validate:"max=16"`
-	All           bool            `json:"all,omitempty"`
-	Info          string          `json:"info"`
-	Families      []filter.Family `json:"families,omitempty" validate:"omitempty,dive,oneof=ipv4 ipv6"`
-	Actions       []string        `json:"actions,omitempty" validate:"omitempty,dive,oneof=accept deny"`
-	ExcludeChains []string        `json:"excludeChains,omitempty" validate:"omitempty,dive,oneof=1PANEL_BASIC_BEFORE 1PANEL_BASIC 1PANEL_BASIC_AFTER"`
-}
-
-type FirewallNativeDetail struct {
-	Provider   filter.Provider   `json:"provider" validate:"required,oneof=firewalld ufw"`
-	NativeKind filter.NativeKind `json:"nativeKind" validate:"required,oneof=zone_service ufw_application"`
-	Name       string            `json:"name" validate:"required"`
-	Permanent  bool              `json:"permanent"`
-}
-
-type DockerPortGuardBase struct {
-	IPv6Enabled bool                        `json:"ipv6Enabled"`
-	Name        string                      `json:"name"`
-	Version     string                      `json:"version"`
-	IsExist     bool                        `json:"isExist"`
-	Initialized bool                        `json:"initialized"`
-	Bound       bool                        `json:"bound"`
-	IPv4        DockerPortGuardFamilyStatus `json:"ipv4"`
-	IPv6        DockerPortGuardFamilyStatus `json:"ipv6"`
-	Backend     string                      `json:"backend"`
-	Message     string                      `json:"message,omitempty"`
-}
-
-type DockerPortGuardFamilyStatus struct {
-	Partial     bool   `json:"partial"`
-	State       string `json:"state"`
-	Reason      string `json:"reason,omitempty"`
-	Initialized bool   `json:"initialized"`
-	Bound       bool   `json:"bound"`
-	Effective   bool   `json:"effective"`
-}
-
-type DockerPortGuardEndpoint struct {
-	Family           string   `json:"family"`
-	HostIP           string   `json:"hostIP"`
-	HostPort         uint16   `json:"hostPort"`
-	Protocol         string   `json:"protocol"`
-	ContainerID      string   `json:"containerID"`
-	ContainerName    string   `json:"containerName"`
-	ContainerState   string   `json:"containerState,omitempty"`
-	ContainerPort    uint16   `json:"containerPort"`
-	Compose          string   `json:"compose,omitempty"`
-	Application      string   `json:"application,omitempty"`
-	PolicyUUID       string   `json:"policyUUID,omitempty"`
-	Mode             string   `json:"mode,omitempty"`
-	Sources          []string `json:"sources"`
-	Effective        bool     `json:"effective"`
-	TrafficPath      string   `json:"trafficPath"`
-	ManagementTarget string   `json:"managementTarget"`
-	ManagementReason string   `json:"managementReason,omitempty"`
-}
-
-type DockerPortGuardPortGroup struct {
-	Key       string                    `json:"key"`
-	Label     string                    `json:"label"`
-	Endpoint  DockerPortGuardEndpoint   `json:"endpoint"`
-	Endpoints []DockerPortGuardEndpoint `json:"endpoints"`
-}
-
-type DockerPortGuardContainer struct {
-	Key         string                     `json:"key"`
-	Name        string                     `json:"name"`
-	Compose     string                     `json:"compose,omitempty"`
-	Application string                     `json:"application,omitempty"`
-	Endpoints   []DockerPortGuardEndpoint  `json:"endpoints"`
-	PortGroups  []DockerPortGuardPortGroup `json:"portGroups"`
-}
-
-type DockerPortGuardList struct {
-	Base           DockerPortGuardBase        `json:"base"`
-	Containers     []DockerPortGuardContainer `json:"containers"`
-	OrphanPolicies []DockerPortGuardEndpoint  `json:"orphanPolicies"`
-}
-
-type DockerPortGuardEndpointIdentity struct {
-	Family   string `json:"family" validate:"required,oneof=ipv4 ipv6"`
-	HostIP   string `json:"hostIP" validate:"required,max=45"`
-	HostPort uint16 `json:"hostPort" validate:"required,min=1"`
-	Protocol string `json:"protocol" validate:"required,oneof=tcp udp"`
-}
-
-type DockerPortGuardPolicyBatch struct {
-	Policies []DockerPortGuardPolicy `json:"policies" validate:"required,min=1,dive"`
-	Import   bool                    `json:"import"`
-}
-
-type DockerPortGuardPolicyBatchDelete struct {
-	UUIDs []string `json:"uuids" validate:"required,min=1,dive,required,max=64"`
-}
-
-type DockerPortGuardPolicy struct {
-	DockerPortGuardEndpointIdentity
-	Mode    string   `json:"mode" validate:"required,oneof=deny_sources allow_sources deny_all accept_sources accept_all"`
-	Sources []string `json:"sources" validate:"dive,required,max=64"`
-}
-
-type DockerPortGuardOperation struct {
-	BackupFile string `json:"backupFile,omitempty" validate:"omitempty,max=255"`
-	Operation  string `json:"operation" validate:"required,oneof=initialize bind unbind"`
-	TaskID     string `json:"taskID,omitempty" validate:"omitempty,max=64"`
-}
-
-type FirewallRuleCreateItem struct {
-	Raw         string              `json:"raw,omitempty"`
-	ParseStatus filter.ParseStatus  `json:"parseStatus,omitempty"`
-	Rule        filter.FirewallRule `json:"rule" validate:"required"`
-	SourceKind  string              `json:"sourceKind" validate:"omitempty,oneof=user imported"`
-}
-
-type FirewallRuleCreate struct {
-	BackupFile string                   `json:"backupFile,omitempty" validate:"omitempty,max=255"`
-	Initialize bool                     `json:"initialize"`
-	Items      []FirewallRuleCreateItem `json:"items" validate:"dive"`
-}
-
-type FirewallRuleCreateResponse struct {
-	TaskID    string                      `json:"taskID,omitempty"`
-	Queued    bool                        `json:"queued,omitempty"`
-	Succeeded int                         `json:"succeeded"`
-	Failed    int                         `json:"failed"`
-	Skipped   int                         `json:"skipped"`
-	Errors    []FirewallRuleCreateFailure `json:"errors,omitempty"`
-}
-
-type FirewallRuleCreateFailure struct {
-	Index  int                 `json:"index"`
-	Status string              `json:"status"`
-	Rule   filter.FirewallRule `json:"rule"`
-	Error  string              `json:"error,omitempty"`
-}
-
-type FirewallRuleDelete struct {
-	Targets []FirewallRuleDeleteItem `json:"targets" validate:"required,min=1,dive"`
-}
-
-type FirewallRuleDeleteItem struct {
-	FirewallRuleDeleteTarget
-	Observed filter.ObservedRule `json:"observed" validate:"required"`
-}
-
-type FirewallRuleDeleteTarget struct {
-	Scope       filter.Scope `json:"scope" validate:"required"`
-	InstanceKey string       `json:"instanceKey" validate:"required,max=128"`
-}
-
-type FirewallRuleDeleteResponse struct {
-	TaskID    string                      `json:"taskID,omitempty"`
-	Queued    bool                        `json:"queued,omitempty"`
-	Succeeded int                         `json:"succeeded"`
-	Failed    int                         `json:"failed"`
-	Errors    []FirewallRuleDeleteFailure `json:"errors,omitempty"`
-}
-
-type FirewallRuleDeleteFailure struct {
-	Index       int    `json:"index"`
-	InstanceKey string `json:"instanceKey"`
-	Error       string `json:"error"`
-}
-
-type FirewallRuleUpdate struct {
-	FirewallRuleDeleteTarget
-	Rule        *filter.FirewallRule `json:"rule,omitempty" validate:"required_without_all=Description OrderIndex Priority,excluded_with=Description OrderIndex Priority"`
-	Description *string              `json:"description,omitempty" validate:"excluded_with=Rule"`
-	OrderIndex  *int64               `json:"orderIndex,omitempty" validate:"excluded_with=Rule Priority"`
-	Priority    *int                 `json:"priority,omitempty" validate:"excluded_with=Rule OrderIndex"`
-}
-
-type FirewallRuleReorder struct {
-	FirewallRuleDeleteTarget
-	TargetPosition *int64 `json:"targetPosition"`
-	Priority       *int   `json:"priority"`
-}
-
-type FirewallRuleExportItem struct {
-	filter.FirewallRule
-	Raw         string             `json:"raw,omitempty"`
-	ParseStatus filter.ParseStatus `json:"parseStatus,omitempty"`
-}
-
-type FirewallSubsystemBackup struct {
-	Families   []string                        `json:"families,omitempty"`
-	Subsystem  string                          `json:"subsystem"`
-	Provider   filter.Provider                 `json:"provider"`
-	Forwarding []forwarding.Rule               `json:"forwarding"`
-	Docker     *dockerfirewall.PolicyInventory `json:"docker,omitempty"`
+type BatchRuleOperate struct {
+	Type  string            `json:"type" validate:"required"`
+	Rules []PortRuleOperate `json:"rules"`
 }
@@ -1,43 +0,0 @@
-package dto
-
-type ForwardRuleSearch struct {
-	PageInfo
-	All      bool   `json:"all,omitempty"`
-	Info     string `json:"info"`
-	Status   string `json:"status"`
-	Strategy string `json:"strategy"`
-}
-
-type ForwardRule struct {
-	ID       uint   `json:"id"`
-	Chain    string `json:"chain"`
-	Family   string `json:"family"`
-	Address  string `json:"address"`
-	Port     string `json:"port"`
-	Protocol string `json:"protocol"`
-	Strategy string `json:"strategy"`
-
-	Num        string `json:"num"`
-	TargetIP   string `json:"targetIP"`
-	TargetPort string `json:"targetPort"`
-	Interface  string `json:"interface"`
-
-	UsedStatus  string `json:"usedStatus"`
-	Description string `json:"description"`
-}
-
-type ForwardRuleOperate struct {
-	Import bool                   `json:"import"`
-	Rules  []ForwardRuleOperation `json:"rules" validate:"required,min=1,dive"`
-}
-
-type ForwardRuleOperation struct {
-	Operation  string `json:"operation" validate:"required,oneof=add remove"`
-	Num        string `json:"num"`
-	Family     string `json:"family" validate:"omitempty,oneof=ipv4 ipv6"`
-	Protocol   string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
-	Interface  string `json:"interface"`
-	Port       string `json:"port" validate:"required"`
-	TargetIP   string `json:"targetIP"`
-	TargetPort string `json:"targetPort" validate:"required"`
-}
@@ -15,14 +15,10 @@ type ImageInfo struct {
 	IsUsed    bool      `json:"isUsed"`
 	Tags      []string  `json:"tags"`
 	Size      int64     `json:"size"`
-
-	IsPinned    bool   `json:"isPinned"`
-	Description string `json:"description"`
 }

 type ImageLoad struct {
-	TaskID string   `json:"taskID"`
-	Paths  []string `json:"paths" validate:"required,dive,required"`
+	Path string `json:"path" validate:"required"`
 }

 type ImageBuild struct {
@@ -31,7 +27,6 @@ type ImageBuild struct {
 	Name       string   `json:"name" validate:"required"`
 	Dockerfile string   `json:"dockerfile" validate:"required"`
 	Tags       []string `json:"tags"`
-	Args       []string `json:"args"`
 }

 type ImagePull struct {
@@ -53,7 +48,6 @@ type ImagePush struct {
 }

 type ImageSave struct {
-	TaskID  string `json:"taskID"`
 	TagName string `json:"tagName" validate:"required"`
 	Path    string `json:"path" validate:"required"`
 	Name    string `json:"name" validate:"required"`
@@ -1,52 +1,15 @@
 package dto

 import (
-	"time"
-
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 )

 type SearchTaskLogReq struct {
 	Status string `json:"status"`
 	Type   string `json:"type"`
-	TaskID string `json:"taskID"`
 	PageInfo
 }

 type TaskDTO struct {
 	model.Task
 }
-
-type SystemLogReq struct {
-	PageSize  int       `json:"pageSize" validate:"omitempty,min=1,max=500"`
-	Cursor    string    `json:"cursor"`
-	StartTime time.Time `json:"startTime"`
-	EndTime   time.Time `json:"endTime"`
-	Keyword   string    `json:"keyword"`
-	Priority  string    `json:"priority"`
-	Service   string    `json:"service"`
-}
-
-type SystemLogRes struct {
-	Source     string          `json:"source"`
-	Items      []SystemLogItem `json:"items"`
-	HasMore    bool            `json:"hasMore"`
-	NextCursor string          `json:"nextCursor"`
-}
-
-type SystemLogStatus struct {
-	Source                 string `json:"source"`
-	Version                string `json:"version"`
-	KeywordFilterSupported bool   `json:"keywordFilterSupported"`
-	Message                string `json:"message"`
-}
-
-type SystemLogItem struct {
-	Timestamp int64  `json:"-"`
-	Cursor    string `json:"-"`
-	Time      string `json:"time"`
-	Priority  string `json:"priority"`
-	Service   string `json:"service"`
-	Message   string `json:"message"`
-	Raw       string `json:"raw"`
-}
@@ -1,152 +1,28 @@
 package dto

-import (
-	"time"
-
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-)
+import "time"

 type MonitorSearch struct {
 	Param     string    `json:"param" validate:"required,oneof=all cpu memory load io network"`
-	IO        string    `json:"io"`
-	Network   string    `json:"network"`
+	Info      string    `json:"info"`
 	StartTime time.Time `json:"startTime"`
 	EndTime   time.Time `json:"endTime"`
 }

 type MonitorData struct {
-	Param string        `json:"param"`
+	Param string        `json:"param" validate:"required,oneof=cpu memory load io network"`
 	Date  []time.Time   `json:"date"`
 	Value []interface{} `json:"value"`
 }

-type Process struct {
-	Name    string  `json:"name"`
-	Pid     int32   `json:"pid"`
-	Percent float64 `json:"percent"`
-	Memory  uint64  `json:"memory"`
-	Cmd     string  `json:"cmd"`
-	User    string  `json:"user"`
-}
-
 type MonitorSetting struct {
-	GPUMonitorStatus     string `json:"gpuMonitorStatus"`
-	GPUMonitorStoreDays  string `json:"gpuMonitorStoreDays"`
-	GPUMonitorInterval   string `json:"gpuMonitorInterval"`
-	VLLMMonitorStatus    string `json:"vllmMonitorStatus"`
-	VLLMMonitorStoreDays string `json:"vllmMonitorStoreDays"`
-	VLLMMonitorInterval  string `json:"vllmMonitorInterval"`
-	MonitorStatus        string `json:"monitorStatus"`
-	MonitorStoreDays     string `json:"monitorStoreDays"`
-	MonitorInterval      string `json:"monitorInterval"`
-	DefaultNetwork       string `json:"defaultNetwork"`
-	DefaultIO            string `json:"defaultIO"`
+	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 GPUMonitorStatus GPUMonitorStoreDays GPUMonitorInterval VLLMMonitorStatus VLLMMonitorStoreDays VLLMMonitorInterval DefaultNetwork DefaultIO"`
+	Key   string `json:"key" validate:"required,oneof=MonitorStatus MonitorStoreDays MonitorInterval DefaultNetwork"`
 	Value string `json:"value"`
 }
-
-type MonitorGPUOptions struct {
-	Supported bool           `json:"supported"`
-	GPUType   string         `json:"gpuType"`
-	ChartHide []GPUChartHide `json:"chartHide"`
-	Options   []string       `json:"options"`
-}
-type GPUChartHide struct {
-	DeviceID    string `json:"deviceID"`
-	Legacy      bool   `json:"legacy"`
-	ProductName string `json:"productName"`
-	Type        string `json:"type"`
-	Process     bool   `json:"process"`
-	GPU         bool   `json:"gpu"`
-	Memory      bool   `json:"memory"`
-	Power       bool   `json:"power"`
-	PowerLimit  bool   `json:"powerLimit"`
-	Temperature bool   `json:"temperature"`
-	Speed       bool   `json:"speed"`
-}
-type MonitorGPUSearch struct {
-	Aggregation string    `json:"aggregation" validate:"omitempty,oneof=avg max"`
-	DeviceID    string    `json:"deviceID"`
-	Legacy      bool      `json:"legacy"`
-	ProductName string    `json:"productName"`
-	StartTime   time.Time `json:"startTime"`
-	EndTime     time.Time `json:"endTime"`
-}
-type MonitorGPUData struct {
-	MemoryActivity     []*float64 `json:"memoryActivity"`
-	EncoderUtil        []*float64 `json:"encoderUtil"`
-	DecoderUtil        []*float64 `json:"decoderUtil"`
-	JPEGUtil           []*float64 `json:"jpegUtil"`
-	OFAUtil            []*float64 `json:"ofaUtil"`
-	MediaUtil          []*float64 `json:"mediaUtil"`
-	ComputeUtil        []*float64 `json:"computeUtil"`
-	CopyUtil           []*float64 `json:"copyUtil"`
-	HotspotTemperature []*float64 `json:"hotspotTemperature"`
-	FanRPM             []*float64 `json:"fanRPM"`
-	AICPUUtil          []*float64 `json:"aiCPUUtil"`
-	CtrlCPUUtil        []*float64 `json:"ctrlCPUUtil"`
-	DDRUsed            []*float64 `json:"ddrUsed"`
-	DDRTotal           []*float64 `json:"ddrTotal"`
-	HBMUsed            []*float64 `json:"hbmUsed"`
-	HBMTotal           []*float64 `json:"hbmTotal"`
-	DDRBandwidth       []*float64 `json:"ddrBandwidth"`
-	HBMBandwidth       []*float64 `json:"hbmBandwidth"`
-	MemoryBandwidth    []*float64 `json:"memoryBandwidth"`
-	MediaFrequency     []*float64 `json:"mediaFrequency"`
-	HugepagesUsed      []*float64 `json:"hugepagesUsed"`
-	HugepagesTotal     []*float64 `json:"hugepagesTotal"`
-
-	BucketSeconds          int64       `json:"bucketSeconds"`
-	SampleCount            int64       `json:"sampleCount"`
-	MemoryTemperatureValue []*float64  `json:"memoryTemperatureValue"`
-	FrequencyValue         []*float64  `json:"frequencyValue"`
-	MemoryFrequencyValue   []*float64  `json:"memoryFrequencyValue"`
-	Date                   []time.Time `json:"date"`
-	GPUValue               []*float64  `json:"gpuValue"`
-	TemperatureValue       []*float64  `json:"temperatureValue"`
-	PowerTotal             []*float64  `json:"powerTotal"`
-	PowerUsed              []*float64  `json:"powerUsed"`
-	PowerPercent           []*float64  `json:"powerPercent"`
-	MemoryTotal            []*float64  `json:"memoryTotal"`
-	MemoryUsed             []*float64  `json:"memoryUsed"`
-	MemoryPercent          []*float64  `json:"memoryPercent"`
-	SpeedValue             []*float64  `json:"speedValue"`
-
-	ProcessCount []*float64     `json:"processCount"`
-	GPUProcesses [][]GPUProcess `json:"gpuProcesses"`
-}
-
-type GPUProcess struct {
-	Pid         string `json:"pid"`
-	Type        string `json:"type"`
-	ProcessName string `json:"processName"`
-	UsedMemory  string `json:"usedMemory"`
-}
-
-type MonitorVLLMSearch struct {
-	AppInstallID uint      `json:"appInstallID" validate:"required"`
-	StartTime    time.Time `json:"startTime" validate:"required"`
-	EndTime      time.Time `json:"endTime" validate:"required"`
-	Aggregation  string    `json:"aggregation" validate:"omitempty,oneof=avg max"`
-}
-
-type MonitorVLLMData struct {
-	SampleCount   int64               `json:"sampleCount"`
-	BucketSeconds int64               `json:"bucketSeconds"`
-	Points        []model.MonitorVLLM `json:"points"`
-}
-
-type MonitorVLLMCurrent struct {
-	AppInstallID uint `json:"appInstallID" validate:"required"`
-}
-
-type MonitorVLLMClean struct {
-	AppInstallID uint `json:"appInstallID" validate:"required"`
-}
-
-type MonitorClean struct {
-	Type string `json:"type" validate:"required,oneof=host gpu"`
-}
@@ -1,8 +1,6 @@
 package dto

 import (
-	"time"
-
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 	"github.com/1Panel-dev/1Panel/agent/utils/nginx/components"
 )
@@ -51,19 +49,13 @@ const (
 	CACHE      NginxKey = "cache"
 	HttpPer    NginxKey = "http-per"
 	ProxyCache NginxKey = "proxy-cache"
-	Brotli     NginxKey = "brotli"
 )

-// BrotliKeys are served from the panel-managed http.d file rather than
-// nginx.conf, because the module is optional: its directives must disappear
-// together with the module, otherwise nginx refuses to start.
-var BrotliKeys = []string{"brotli", "brotli_comp_level", "brotli_min_length", "brotli_types"}
-
 var ScopeKeyMap = map[NginxKey][]string{
 	Index:     {"index"},
 	LimitConn: {"limit_conn", "limit_rate", "limit_conn_zone"},
 	SSL:       {"ssl_certificate", "ssl_certificate_key"},
-	HttpPer:   {"server_names_hash_bucket_size", "client_header_buffer_size", "client_max_body_size", "keepalive_timeout", "gzip", "gzip_min_length", "gzip_comp_level", "gzip_types", "gzip_vary", "gzip_proxied"},
+	HttpPer:   {"server_names_hash_bucket_size", "client_header_buffer_size", "client_max_body_size", "keepalive_timeout", "gzip", "gzip_min_length", "gzip_comp_level"},
 }

 var StaticFileKeyMap = map[NginxKey]struct {
@@ -81,13 +73,12 @@ type NginxUpstream struct {
 }

 type NginxUpstreamServer struct {
-	Server          string `json:"server"`
-	Weight          int    `json:"weight"`
-	FailTimeout     int    `json:"failTimeout"`
-	FailTimeoutUnit string `json:"failTimeoutUnit"`
-	MaxFails        int    `json:"maxFails"`
-	MaxConns        int    `json:"maxConns"`
-	Flag            string `json:"flag"`
+	Server      string `json:"server"`
+	Weight      int    `json:"weight"`
+	FailTimeout string `json:"failTimeout"`
+	MaxFails    int    `json:"maxFails"`
+	MaxConns    int    `json:"maxConns"`
+	Flag        string `json:"flag"`
 }

 var LBAlgorithms = map[string]struct{}{"ip_hash": {}, "least_conn": {}}
@@ -95,41 +86,9 @@ 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"`
-	Custom    bool               `json:"custom,omitempty"`
-	Script    string             `json:"script"`
-	Packages  []string           `json:"packages"`
-	Params    string             `json:"params"`
-	Enable    bool               `json:"enable"`
-	BuildMode string             `json:"buildMode,omitempty"`
-	Provider  string             `json:"provider,omitempty"`
-	LoadOrder int                `json:"loadOrder,omitempty"`
-	Builds    []NginxModuleBuild `json:"builds,omitempty"`
-	LastError string             `json:"lastError,omitempty"`
-}
-
-type NginxModuleBuild struct {
-	Provider  string                `json:"provider"`
-	BuildMode string                `json:"buildMode"`
-	Status    string                `json:"status"`
-	Hash      string                `json:"hash"`
-	Target    NginxModuleTarget     `json:"target"`
-	Artifacts []NginxModuleArtifact `json:"artifacts,omitempty"`
-	Error     string                `json:"error,omitempty"`
-	BuiltAt   time.Time             `json:"builtAt,omitempty"`
-}
-
-type NginxModuleTarget struct {
-	Key              string `json:"key"`
-	OpenRestyVersion string `json:"openrestyVersion"`
-	Architecture     string `json:"architecture"`
-	Image            string `json:"image,omitempty"`
-	ImageDigest      string `json:"imageDigest,omitempty"`
-	BuilderDigest    string `json:"builderDigest,omitempty"`
-}
-
-type NginxModuleArtifact struct {
-	Name     string `json:"name"`
-	Path     string `json:"path"`
-	Checksum string `json:"checksum"`
+	Name     string   `json:"name"`
+	Script   string   `json:"script"`
+	Packages []string `json:"packages"`
+	Params   string   `json:"params"`
+	Enable   bool     `json:"enable"`
 }
@@ -22,16 +22,7 @@ type AppInstallCreate struct {
 	Name        string                 `json:"name" validate:"required"`
 	Services    map[string]string      `json:"services"`
 	TaskID      string                 `json:"taskID"`
-
 	AppContainerConfig
-	NodePushConfig
-}
-
-type NodePushConfig struct {
-	Nodes    []string `json:"nodes"`
-	PushNode bool     `json:"pushNode"`
-	AppKey   string   `json:"appKey"`
-	Version  string   `json:"version"`
 }

 type AppContainerConfig struct {
@@ -50,22 +41,17 @@ type AppContainerConfig struct {
 	Type          string  `json:"type"`
 	SpecifyIP     string  `json:"specifyIP"`
 	RestartPolicy string  `json:"restartPolicy" validate:"omitempty,oneof=always unless-stopped no on-failure"`
-
-	KeepServiceName         bool `json:"-"`
-	SkipComposeCommonConfig bool `json:"-"`
-	UseLifecycleScripts     bool `json:"-"`
 }

 type AppInstalledSearch struct {
 	dto.PageInfo
-	Type        string   `json:"type"`
-	Name        string   `json:"name"`
-	Tags        []string `json:"tags"`
-	Update      bool     `json:"update"`
-	Unused      bool     `json:"unused"`
-	All         bool     `json:"all"`
-	Sync        bool     `json:"sync"`
-	CheckUpdate bool     `json:"checkUpdate"`
+	Type   string   `json:"type"`
+	Name   string   `json:"name"`
+	Tags   []string `json:"tags"`
+	Update bool     `json:"update"`
+	Unused bool     `json:"unused"`
+	All    bool     `json:"all"`
+	Sync   bool     `json:"sync"`
 }

 type AppInstalledInfo struct {
@@ -96,8 +82,6 @@ type AppInstalledOperate struct {
 	TaskID        string              `json:"taskID"`
 	DeleteImage   bool                `json:"deleteImage"`
 	Favorite      bool                `json:"favorite"`
-
-	UseLifecycleScripts bool `json:"-"`
 }

 type AppInstallUpgrade struct {
@@ -105,7 +89,6 @@ type AppInstallUpgrade struct {
 	DetailID      uint   `json:"detailId"`
 	Backup        bool   `json:"backup"`
 	PullImage     bool   `json:"pullImage"`
-	DeleteImage   bool   `json:"deleteImage"`
 	DockerCompose string `json:"dockerCompose"`
 	TaskID        string `json:"taskID"`
 }
@@ -117,14 +100,11 @@ type AppInstallDelete struct {
 	DeleteDB     bool   `json:"deleteDB"`
 	DeleteImage  bool   `json:"deleteImage"`
 	TaskID       string `json:"taskID"`
-
-	UseLifecycleScripts bool `json:"-"`
 }

 type AppInstalledUpdate struct {
 	InstallId uint                   `json:"installId" validate:"required"`
 	Params    map[string]interface{} `json:"params" validate:"required"`
-	TaskID    string                 `json:"-"`
 	AppContainerConfig
 }

@@ -148,12 +128,3 @@ type AppUpdateVersion struct {
 	AppInstallID  uint   `json:"appInstallID" validate:"required"`
 	UpdateVersion string `json:"updateVersion"`
 }
-
-type AppInstallSortItem struct {
-	InstallID uint `json:"installID"`
-	SortOrder int  `json:"sortOrder"`
-}
-
-type AppInstallSort struct {
-	Items []AppInstallSortItem `json:"items" validate:"required"`
-}
@@ -13,7 +13,6 @@ type DiskMountRequest struct {
 	MountPoint string `json:"mountPoint" validate:"required"`
 	Filesystem string `json:"filesystem" validate:"required,oneof=ext4 xfs"`
 	AutoMount  bool   `json:"autoMount"`
-	NoFail     bool   `json:"noFail"`
 }

 type DiskUnmountRequest struct {
@@ -9,33 +9,11 @@ type FileOption struct {
 	files.FileOption
 }

-type FileAISearch struct {
-	Path             string   `json:"path" validate:"required"`
-	Query            string   `json:"query" validate:"required"`
-	ResponseLanguage string   `json:"responseLanguage,omitempty"`
-	ContainSub       *bool    `json:"containSub,omitempty"`
-	MaxItems         int      `json:"maxItems" validate:"omitempty,min=1,max=2000"`
-	MatchCase        bool     `json:"matchCase"`
-	WholeWord        bool     `json:"wholeWord"`
-	UseRegex         bool     `json:"useRegex"`
-	Extensions       []string `json:"extensions,omitempty"`
-	MinSize          int64    `json:"minSize"`
-	MaxSize          int64    `json:"maxSize"`
-	ModifiedAfter    string   `json:"modifiedAfter,omitempty"`
-	ModifiedBefore   string   `json:"modifiedBefore,omitempty"`
-
-	MaxScanFiles              int   `json:"maxScanFiles"`
-	MaxFileBytes              int64 `json:"maxFileBytes"`
-	MaxHitsPerFile            int   `json:"maxHitsPerFile"`
-	MaxTotalHits              int   `json:"maxTotalHits"`
-	ContentHitsPromptMaxBytes int   `json:"contentHitsPromptMaxBytes"`
-	LlmMaxOutputTokens        int   `json:"llmMaxOutputTokens"`
-}
-
 type FileContentReq struct {
 	Path     string `json:"path" validate:"required"`
 	IsDetail bool   `json:"isDetail"`
 }
+
 type SearchUploadWithPage struct {
 	dto.PageInfo
 	Path string `json:"path" validate:"required"`
@@ -78,11 +56,6 @@ type FileCompress struct {
 	Name    string   `json:"name" validate:"required"`
 	Replace bool     `json:"replace"`
 	Secret  string   `json:"secret"`
-	TaskID  string   `json:"taskID"`
-}
-
-type FileCompressStopReq struct {
-	TaskID string `json:"taskID" validate:"required"`
 }

 type FileDeCompress struct {
@@ -90,11 +63,6 @@ type FileDeCompress struct {
 	Type   string `json:"type"  validate:"required"`
 	Path   string `json:"path" validate:"required"`
 	Secret string `json:"secret"`
-	TaskID string `json:"taskID"`
-}
-
-type FileDeCompressStopReq struct {
-	TaskID string `json:"taskID" validate:"required"`
 }

 type FileEdit struct {
@@ -121,8 +89,6 @@ type FileWget struct {
 	Path              string `json:"path" validate:"required"`
 	Name              string `json:"name" validate:"required"`
 	IgnoreCertificate bool   `json:"ignoreCertificate"`
-	UseProxy          bool   `json:"useProxy"`
-	UseServerFilename bool   `json:"useServerFilename"`
 }

 type FileMove struct {
@@ -132,11 +98,6 @@ type FileMove struct {
 	Name       string   `json:"name"`
 	Cover      bool     `json:"cover"`
 	CoverPaths []string `json:"coverPaths"`
-	TaskID     string   `json:"taskID"`
-}
-
-type FileMoveStopReq struct {
-	TaskID string `json:"taskID" validate:"required"`
 }

 type FileDownload struct {
@@ -159,10 +120,6 @@ type FileProcessReq struct {
 	Key string `json:"key"`
 }

-type FileProcessRemoveReq struct {
-	Keys []string `json:"keys" validate:"required,min=1,max=1000"`
-}
-
 type FileRoleUpdate struct {
 	Path  string `json:"path" validate:"required"`
 	User  string `json:"user" validate:"required"`
@@ -173,20 +130,13 @@ type FileRoleUpdate struct {
 type FileReadByLineReq struct {
 	Page     int    `json:"page" validate:"required"`
 	PageSize int    `json:"pageSize" validate:"required"`
-	Type     string `json:"type"`
+	Type     string `json:"type" validate:"required"`
 	ID       uint   `json:"ID"`
 	Name     string `json:"name"`
 	Latest   bool   `json:"latest"`
 	TaskReq
 }

-type TaskLogReadReq struct {
-	Page     int  `json:"page" validate:"required,min=1"`
-	PageSize int  `json:"pageSize" validate:"required,min=1"`
-	Latest   bool `json:"latest"`
-	TaskReq
-}
-
 type TaskReq struct {
 	TaskID      string `json:"taskID"`
 	TaskType    string `json:"taskType"`
@@ -214,18 +164,3 @@ type FileConvertRequest struct {
 	DeleteSource bool          `json:"deleteSource"`
 	TaskID       string        `json:"taskID"`
 }
-
-type FileRemarkBatch struct {
-	Paths []string `json:"paths" validate:"required"`
-}
-
-type FileRemarkUpdate struct {
-	Path   string `json:"path" validate:"required"`
-	Remark string `json:"remark"`
-}
-
-type FileShareCreate struct {
-	Path          string  `json:"path" validate:"required"`
-	ExpireMinutes int     `json:"expireMinutes" validate:"min=0,max=10080"`
-	Password      *string `json:"password"`
-}
@@ -1,52 +0,0 @@
-package request
-
-import (
-	"encoding/json"
-
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-)
-
-type FileHistorySearchReq struct {
-	dto.PageInfo
-	Path      string `json:"path"`
-	Scope     string `json:"scope" validate:"required,oneof=current all"`
-	Operation string `json:"operation"`
-}
-
-type FileHistoryContentReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type FileHistoryIDs []uint
-
-func (ids *FileHistoryIDs) UnmarshalJSON(data []byte) error {
-	type alias []uint
-	var direct alias
-	if err := json.Unmarshal(data, &direct); err == nil {
-		*ids = FileHistoryIDs(direct)
-		return nil
-	}
-
-	var wrapped struct {
-		IDs []uint `json:"ids"`
-	}
-	if err := json.Unmarshal(data, &wrapped); err != nil {
-		return err
-	}
-	*ids = FileHistoryIDs(wrapped.IDs)
-	return nil
-}
-
-type FileHistoryDeleteReq struct {
-	IDs FileHistoryIDs `json:"ids" validate:"required"`
-}
-
-type FileHistoryRestoreReq struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type FileHistorySettingUpdate struct {
-	Enable      string `json:"enable" validate:"required,oneof=Enable Disable"`
-	MaxPerPath  int    `json:"maxPerPath" validate:"min=0,max=1000"`
-	DiskQuotaMB int    `json:"diskQuotaMB" validate:"min=0,max=1048576"`
-}
@@ -1,12 +1,8 @@
 package request

-type HostToolTypeReq struct {
-	Type string `json:"type" validate:"required,oneof=supervisord"`
-}
-
-type HostToolOperateReq struct {
+type HostToolReq struct {
 	Type    string `json:"type" validate:"required,oneof=supervisord"`
-	Operate string `json:"operate" validate:"required,oneof=restart start stop"`
+	Operate string `json:"operate" validate:"oneof=status restart start stop"`
 }

 type HostToolCreate struct {
@@ -19,8 +15,13 @@ type SupervisorConfig struct {
 	ServiceName string `json:"serviceName"`
 }

-type HostToolConfigUpdate struct {
+type HostToolLogReq struct {
+	Type string `json:"type" validate:"required,oneof=supervisord"`
+}
+
+type HostToolConfig struct {
 	Type    string `json:"type" validate:"required,oneof=supervisord"`
+	Operate string `json:"operate" validate:"oneof=get set"`
 	Content string `json:"content"`
 }

@@ -42,15 +43,3 @@ type SupervisorProcessFileReq struct {
 	Content string `json:"content"`
 	File    string `json:"file" validate:"required,oneof=out.log err.log config"`
 }
-
-type HostSupervisorProcessFileGetReq struct {
-	Name string `json:"name" validate:"required"`
-	File string `json:"file" validate:"required,oneof=out.log err.log config"`
-}
-
-type HostSupervisorProcessFileOperateReq struct {
-	Name    string `json:"name" validate:"required"`
-	Operate string `json:"operate" validate:"required,oneof=clear update"`
-	Content string `json:"content"`
-	File    string `json:"file" validate:"required,oneof=out.log err.log config"`
-}
@@ -21,10 +21,6 @@ type McpServerCreate struct {
 	StreamableHttpPath string        `json:"streamableHttpPath"`
 	OutputTransport    string        `json:"outputTransport" validate:"required"`
 	Type               string        `json:"type" validate:"required"`
-	GatewayImage       string        `json:"gatewayImage"`
-	ProtocolVersion    string        `json:"protocolVersion"`
-	GatewayArgs        string        `json:"gatewayArgs" validate:"max=4096"`
-	TaskID             string        `json:"taskID"`
 }

 type McpServerUpdate struct {
@@ -36,23 +32,11 @@ type McpServerDelete struct {
 	ID uint `json:"id" validate:"required"`
 }

-type McpServerDetail struct {
-	ID uint `json:"id" validate:"required"`
-}
-
-type McpServerStatusSync struct {
-	IDs []uint `json:"ids"`
-}
-
 type McpServerOperate struct {
 	ID      uint   `json:"id" validate:"required"`
 	Operate string `json:"operate" validate:"required"`
 }

-type McpServerConnectionTest struct {
-	ID uint `json:"id" validate:"required"`
-}
-
 type McpBindDomain struct {
 	Domain string `json:"domain" validate:"required"`
 	SSLID  uint   `json:"sslID"`
@@ -114,29 +114,19 @@ type NginxRedirectUpdate struct {
 }

 type NginxBuildReq struct {
-	TaskID  string   `json:"taskID" validate:"required"`
-	Mirror  string   `json:"mirror" validate:"required"`
-	Modules []string `json:"modules"`
-	Force   bool     `json:"force"`
+	TaskID string `json:"taskID" validate:"required"`
+	Mirror string `json:"mirror"  validate:"required"`
 }

 type NginxModuleUpdate struct {
-	Operate   string `json:"operate" validate:"required,oneof=create delete update"`
-	Name      string `json:"name" validate:"required"`
-	Script    string `json:"script"`
-	Packages  string `json:"packages"`
-	Enable    bool   `json:"enable"`
-	Params    string `json:"params"`
-	BuildMode string `json:"buildMode" validate:"omitempty,oneof=dynamic static"`
-	Provider  string `json:"provider" validate:"omitempty,oneof=local prebuilt"`
-	LoadOrder int    `json:"loadOrder" validate:"omitempty,min=0,max=9999"`
+	Operate  string `json:"operate" validate:"required,oneof=create delete update"`
+	Name     string `json:"name" validate:"required"`
+	Script   string `json:"script"`
+	Packages string `json:"packages"`
+	Enable   bool   `json:"enable"`
+	Params   string `json:"params"`
 }

 type NginxOperateReq struct {
 	Operate string `json:"operate" validate:"required,oneof=enable disable"`
 }
-
-type NginxDefaultHTTPSUpdate struct {
-	Operate            string `json:"operate" validate:"required,oneof=enable disable"`
-	SSLRejectHandshake bool   `json:"sslRejectHandshake"`
-}
@@ -21,19 +21,17 @@ type RuntimeCreate struct {
 	Source      string `json:"source"`
 	CodeDir     string `json:"codeDir"`
 	Remark      string `json:"remark"`
-	TaskID      string `json:"taskID"`

 	Params map[string]interface{} `json:"params"`
 	NodeConfig
 }

 type NodeConfig struct {
-	Install      *bool         `json:"install"`
+	Install      bool          `json:"install"`
 	Clean        bool          `json:"clean"`
 	ExposedPorts []ExposedPort `json:"exposedPorts"`
 	Environments []Environment `json:"environments"`
 	Volumes      []Volume      `json:"volumes"`
-	ExtraHosts   []ExtraHost   `json:"extraHosts"`
 }

 type Environment struct {
@@ -43,38 +41,28 @@ type Environment struct {
 type Volume struct {
 	Source string `json:"source"`
 	Target string `json:"target"`
-	Mode   string `json:"mode"`
 }

 type ExposedPort struct {
 	HostPort      int    `json:"hostPort"`
 	ContainerPort int    `json:"containerPort"`
 	HostIP        string `json:"hostIP"`
-	Protocol      string `json:"protocol"`
-}
-
-type ExtraHost struct {
-	Hostname string `json:"hostname"`
-	IP       string `json:"ip"`
 }

 type RuntimeDelete struct {
-	ID          uint   `json:"id"`
-	ForceDelete bool   `json:"forceDelete"`
-	DeleteImage bool   `json:"deleteImage"`
-	TaskID      string `json:"taskID"`
+	ID          uint `json:"id"`
+	ForceDelete bool `json:"forceDelete"`
 }

 type RuntimeUpdate struct {
-	AppDetailID uint   `json:"appDetailId"`
-	Name        string `json:"name"`
-	ID          uint   `json:"id"`
-	Image       string `json:"image"`
-	Version     string `json:"version"`
-	Rebuild     bool   `json:"rebuild"`
-	Source      string `json:"source"`
-	CodeDir     string `json:"codeDir"`
-	Remark      string `json:"remark"`
+	Name    string `json:"name"`
+	ID      uint   `json:"id"`
+	Image   string `json:"image"`
+	Version string `json:"version"`
+	Rebuild bool   `json:"rebuild"`
+	Source  string `json:"source"`
+	CodeDir string `json:"codeDir"`
+	Remark  string `json:"remark"`

 	Params map[string]interface{} `json:"params"`
 	NodeConfig
@@ -147,7 +135,6 @@ type PHPContainerConfig struct {
 	ExposedPorts  []ExposedPort `json:"exposedPorts"`
 	Environments  []Environment `json:"environments"`
 	Volumes       []Volume      `json:"volumes"`
-	ExtraHosts    []ExtraHost   `json:"extraHosts"`
 }

 type RuntimeRemark struct {
@@ -0,0 +1 @@
+package request
@@ -34,28 +34,10 @@ type WebsiteCreate struct {

 	SiteDir string `json:"siteDir"`

-	TemplateOutputID uint `json:"templateOutputID"`
-
 	RuntimeConfig
 	FtpConfig
 	DataBaseConfig
 	SSLConfig
-	StreamConfig
-}
-
-type StreamConfig struct {
-	StreamPorts string `json:"streamPorts"`
-	Name        string `json:"name"`
-	Algorithm   string `json:"algorithm"`
-	UDP         bool   `json:"udp"`
-
-	Servers []dto.NginxUpstreamServer `json:"servers"`
-}
-
-type StreamUpdate struct {
-	WebsiteID uint `json:"websiteID" validate:"required"`
-
-	StreamConfig
 }

 type WebsiteOptionReq struct {
@@ -127,30 +109,6 @@ type BatchWebsiteOp struct {
 	TaskID  string `json:"taskID" validate:"required"`
 }

-type BatchWebsiteGroup struct {
-	IDs     []uint `json:"ids" validate:"required"`
-	GroupID uint   `json:"groupID" validate:"required"`
-}
-
-type BatchWebsiteHttps struct {
-	IDs                   []uint   `json:"ids" validate:"required"`
-	TaskID                string   `json:"taskID" validate:"required"`
-	WebsiteSSLID          uint     `json:"websiteSSLId"`
-	Type                  string   `json:"type"  validate:"oneof=existed auto manual"`
-	PrivateKey            string   `json:"privateKey"`
-	Certificate           string   `json:"certificate"`
-	PrivateKeyPath        string   `json:"privateKeyPath"`
-	CertificatePath       string   `json:"certificatePath"`
-	ImportType            string   `json:"importType"`
-	HttpConfig            string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
-	SSLProtocol           []string `json:"SSLProtocol"`
-	Algorithm             string   `json:"algorithm"`
-	Hsts                  bool     `json:"hsts"`
-	HstsIncludeSubDomains bool     `json:"hstsIncludeSubDomains"`
-	HttpsPorts            []int    `json:"httpsPorts"`
-	Http3                 bool     `json:"http3"`
-}
-
 type WebsiteRedirectUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
@@ -225,14 +183,9 @@ type WebsiteNginxUpdate struct {
 }

 type WebsiteLogReq struct {
-	ID      uint   `json:"id" validate:"required"`
-	Operate string `json:"operate" validate:"required,oneof=enable disable delete"`
-	LogType string `json:"logType" validate:"required,oneof=access.log error.log"`
-}
-
-type WebsiteLogSearchReq struct {
 	ID       uint   `json:"id" validate:"required"`
-	LogType  string `json:"logType" validate:"required,oneof=access.log error.log"`
+	Operate  string `json:"operate" validate:"required"`
+	LogType  string `json:"logType" validate:"required"`
 	Page     int    `json:"page"`
 	PageSize int    `json:"pageSize"`
 }
@@ -276,21 +229,9 @@ type WebsiteProxyConfig struct {
 	Replaces        map[string]string `json:"replaces"`
 	SNI             bool              `json:"sni"`
 	ProxySSLName    string            `json:"proxySSLName"`
-	SSLVerify       bool              `json:"sslVerify"`
 	CorsConfig
 }

-type WebsiteProxyDelete struct {
-	ID   uint   `json:"id" validate:"required"`
-	Name string `json:"name" validate:"required"`
-}
-
-type WebsiteProxyStatusUpdate struct {
-	ID     uint   `json:"id" validate:"required"`
-	Name   string `json:"name" validate:"required"`
-	Status string `json:"status" validate:"required"`
-}
-
 type CorsConfig struct {
 	Cors             bool   `json:"cors"`
 	AllowOrigins     string `json:"allowOrigins"`
@@ -330,7 +271,6 @@ type WebsiteHtmlReq struct {
 type WebsiteHtmlUpdate struct {
 	Type    string `json:"type" validate:"required"`
 	Content string `json:"content" validate:"required"`
-	Sync    bool   `json:"sync"`
 }

 type WebsiteLBCreate struct {
@@ -6,12 +6,8 @@ type WebsiteSSLSearch struct {
 	dto.PageInfo
 	AcmeAccountID string `json:"acmeAccountID"`
 	Domain        string `json:"domain"`
-	OrderBy       string `json:"orderBy" validate:"omitempty,oneof=created_at updated_at expire_date"`
-	Order         string `json:"order" validate:"omitempty,oneof=null ascending descending"`
-}
-
-type WebsiteSSLListReq struct {
-	AcmeAccountID string `json:"acmeAccountID"`
+	OrderBy       string `json:"orderBy" validate:"required,oneof=expire_date"`
+	Order         string `json:"order" validate:"required,oneof=null ascending descending"`
 }

 type WebsiteSSLCreate struct {
@@ -35,7 +31,6 @@ type WebsiteSSLCreate struct {
 	Shell         string `json:"shell"`
 	PushNode      bool   `json:"pushNode"`
 	Nodes         string `json:"nodes"`
-	IsIp          bool   `json:"isIp"`
 }

 type WebsiteDNSReq struct {
@@ -51,6 +46,7 @@ type WebsiteSSLApply struct {
 	ID           uint     `json:"ID" validate:"required"`
 	SkipDNSCheck bool     `json:"skipDNSCheck"`
 	Nameservers  []string `json:"nameservers"`
+	DisableLog   bool     `json:"disableLog"`
 }

 type WebsiteSSLObtain struct {
@@ -61,12 +57,11 @@ type WebsiteSSLObtain struct {
 type WebsiteAcmeAccountCreate struct {
 	Email      string `json:"email" validate:"required"`
 	Type       string `json:"type" validate:"required,oneof=letsencrypt zerossl buypass google custom"`
-	KeyType    string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
+	KeyType    string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
 	EabKid     string `json:"eabKid"`
 	EabHmacKey string `json:"eabHmacKey"`
 	UseProxy   bool   `json:"useProxy"`
 	CaDirURL   string `json:"caDirURL"`
-	UseEAB     bool   `json:"useEAB"`
 }

 type WebsiteAcmeAccountUpdate struct {
@@ -126,16 +121,6 @@ type WebsiteSSLUpload struct {
 	Type            string `json:"type" validate:"required,oneof=paste local"`
 	SSLID           uint   `json:"sslID"`
 	Description     string `json:"description"`
-	PushNode        bool   `json:"pushNode"`
-	Nodes           string `json:"nodes"`
-}
-
-type WebsiteSSLPush struct {
-	ID       uint   `json:"id" validate:"required"`
-	PushNode bool   `json:"pushNode"`
-	Nodes    string `json:"nodes"`
-	TaskID   string `json:"taskID" validate:"required"`
-	Sync     bool   `json:"sync"`
 }

 type WebsiteCASearch struct {
@@ -148,7 +133,7 @@ type WebsiteCACreate struct {
 	Organization     string `json:"organization" validate:"required"`
 	OrganizationUint string `json:"organizationUint"`
 	Name             string `json:"name" validate:"required"`
-	KeyType          string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
+	KeyType          string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
 	Province         string `json:"province" `
 	City             string `json:"city"`
 }
@@ -156,7 +141,7 @@ type WebsiteCACreate struct {
 type WebsiteCAObtain struct {
 	ID          uint   `json:"id" validate:"required"`
 	Domains     string `json:"domains" validate:"required"`
-	KeyType     string `json:"keyType" validate:"required,oneof=EC256 EC384 RSA2048 RSA3072 RSA4096 RSA8192"`
+	KeyType     string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
 	Time        int    `json:"time" validate:"required"`
 	Unit        string `json:"unit" validate:"required"`
 	PushDir     bool   `json:"pushDir"`
@@ -167,8 +152,6 @@ type WebsiteCAObtain struct {
 	Description string `json:"description"`
 	ExecShell   bool   `json:"execShell"`
 	Shell       string `json:"shell"`
-	PushNode    bool   `json:"pushNode"`
-	Nodes       string `json:"nodes"`
 }

 type WebsiteCARenew struct {
@@ -179,6 +162,4 @@ type WebsiteSSLFileUpload struct {
 	Type        string `json:"type"`
 	Description string `json:"description"`
 	SSLID       uint64 `json:"sslID"`
-	PushNode    bool   `json:"pushNode"`
-	Nodes       string `json:"nodes"`
 }
@@ -1,46 +0,0 @@
-package request
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-)
-
-type WebsiteTemplateSearch struct {
-	dto.PageInfo
-	Name string `json:"name"`
-	Type string `json:"type"`
-}
-
-type WebsiteTemplateCreate struct {
-	Name      string `json:"name" validate:"required"`
-	Type      string `json:"type" validate:"required,oneof=single multi"`
-	Content   string `json:"content"`
-	FilePath  string `json:"filePath"`
-	Variables string `json:"variables"`
-	Remark    string `json:"remark"`
-}
-
-type WebsiteTemplateUpdate struct {
-	ID        uint   `json:"id" validate:"required"`
-	Name      string `json:"name" validate:"required"`
-	Type      string `json:"type" validate:"required,oneof=single multi"`
-	Content   string `json:"content"`
-	FilePath  string `json:"filePath"`
-	Variables string `json:"variables"`
-	Remark    string `json:"remark"`
-}
-
-type WebsiteTemplateOutputSearch struct {
-	dto.PageInfo
-	TemplateID uint `json:"templateID"`
-}
-
-type WebsiteTemplateOutputCreate struct {
-	TemplateID     uint              `json:"templateID" validate:"required"`
-	Name           string            `json:"name" validate:"required"`
-	VariableValues map[string]string `json:"variableValues"`
-}
-
-type WebsitePreviewReq struct {
-	TemplateID     uint              `json:"templateID" validate:"required"`
-	VariableValues map[string]string `json:"variableValues"`
-}
@@ -29,18 +29,22 @@ type AppDTO struct {
 }

 type AppItem struct {
-	Name                string   `json:"name"`
-	Key                 string   `json:"key"`
-	ID                  uint     `json:"id"`
-	Description         string   `json:"description"`
-	Status              string   `json:"status"`
-	Installed           bool     `json:"installed"`
-	Limit               int      `json:"limit"`
-	Tags                []string `json:"tags"`
-	GpuSupport          bool     `json:"gpuSupport"`
-	Recommend           int      `json:"recommend"`
-	Type                string   `json:"type"`
-	BatchInstallSupport bool     `json:"batchInstallSupport"`
+	Name        string   `json:"name"`
+	Key         string   `json:"key"`
+	ID          uint     `json:"id"`
+	Description string   `json:"description"`
+	Icon        string   `json:"icon"`
+	Type        string   `json:"type"`
+	Status      string   `json:"status"`
+	Resource    string   `json:"resource"`
+	Installed   bool     `json:"installed"`
+	Versions    []string `json:"versions"`
+	Limit       int      `json:"limit"`
+	Tags        []TagDTO `json:"tags"`
+	Github      string   `json:"github"`
+	Website     string   `json:"website"`
+	GpuSupport  bool     `json:"gpuSupport"`
+	Recommend   int      `json:"recommend"`
 }

 type TagDTO struct {
@@ -76,10 +80,6 @@ type AppDetailDTO struct {
 	GpuSupport     bool        `json:"gpuSupport"`
 }

-type AppDetailSimpleDTO struct {
-	ID uint `json:"id"`
-}
-
 type IgnoredApp struct {
 	Icon     string `json:"icon"`
 	Name     string `json:"name"`
@@ -104,36 +104,30 @@ type AppDetail struct {
 }

 type AppInstallDTO struct {
-	ID            uint                   `json:"id"`
-	Name          string                 `json:"name"`
-	AppID         uint                   `json:"appID"`
-	AppDetailID   uint                   `json:"appDetailID"`
-	Version       string                 `json:"version"`
-	Status        string                 `json:"status"`
-	Message       string                 `json:"message"`
-	HttpPort      int                    `json:"httpPort"`
-	HttpsPort     int                    `json:"httpsPort"`
-	Path          string                 `json:"path"`
-	CanUpdate     bool                   `json:"canUpdate"`
-	Icon          string                 `json:"icon"`
-	AppName       string                 `json:"appName"`
-	Ready         int                    `json:"ready"`
-	Total         int                    `json:"total"`
-	AppKey        string                 `json:"appKey"`
-	AppType       string                 `json:"appType"`
-	AppStatus     string                 `json:"appStatus"`
-	DockerCompose string                 `json:"dockerCompose"`
-	WebUI         string                 `json:"webUI"`
-	CreatedAt     time.Time              `json:"createdAt"`
-	Favorite      bool                   `json:"favorite"`
-	SortOrder     int                    `json:"sortOrder"`
-	App           AppDetail              `json:"app"`
-	Container     string                 `json:"container"`
-	IsEdit        bool                   `json:"isEdit"`
-	LinkDB        bool                   `json:"linkDB"`
-	ResourceKeys  []string               `json:"resourceKeys"`
-	ServiceName   string                 `json:"serviceName"`
-	Env           map[string]interface{} `json:"env"`
+	ID            uint      `json:"id"`
+	Name          string    `json:"name"`
+	AppID         uint      `json:"appID"`
+	AppDetailID   uint      `json:"appDetailID"`
+	Version       string    `json:"version"`
+	Status        string    `json:"status"`
+	Message       string    `json:"message"`
+	HttpPort      int       `json:"httpPort"`
+	HttpsPort     int       `json:"httpsPort"`
+	Path          string    `json:"path"`
+	CanUpdate     bool      `json:"canUpdate"`
+	Icon          string    `json:"icon"`
+	AppName       string    `json:"appName"`
+	Ready         int       `json:"ready"`
+	Total         int       `json:"total"`
+	AppKey        string    `json:"appKey"`
+	AppType       string    `json:"appType"`
+	AppStatus     string    `json:"appStatus"`
+	DockerCompose string    `json:"dockerCompose"`
+	WebUI         string    `json:"webUI"`
+	CreatedAt     time.Time `json:"createdAt"`
+	Favorite      bool      `json:"favorite"`
+	App           AppDetail `json:"app"`
+	Container     string    `json:"container"`
 }

 type AppInstallInfo struct {
@@ -145,8 +139,6 @@ type AppInstallInfo struct {
 	HttpPort    int    `json:"HttpPort"`
 	Container   string `json:"container"`
 	ComposePath string `json:"composePath"`
-	AppKey      string `json:"appKey"`
-	AppPorts    []int  `json:"appPorts"`

 	Env map[string]interface{} `json:"env"`
 }
@@ -184,7 +176,6 @@ type AppParam struct {
 }

 type AppConfig struct {
-	Params     []AppParam `json:"params"`
-	RawCompose string     `json:"rawCompose"`
+	Params []AppParam `json:"params"`
 	request.AppContainerConfig
 }
@@ -24,7 +24,7 @@ type DiskBasicInfo struct {
 type CompleteDiskInfo struct {
 	Disks              []DiskInfo      `json:"disks"`
 	UnpartitionedDisks []DiskBasicInfo `json:"unpartitionedDisks"`
-	SystemDisks        []DiskInfo      `json:"systemDisks"`
+	SystemDisk         *DiskInfo       `json:"systemDisk"`
 	TotalDisks         int             `json:"totalDisks"`
 	TotalCapacity      int64           `json:"totalCapacity"`
 }
@@ -81,45 +81,3 @@ type FileConvertLog struct {
 	Status  string `json:"status"`
 	Message string `json:"message"`
 }
-
-type FileRemarksRes struct {
-	Remarks map[string]string `json:"remarks"`
-}
-
-type FileShareInfo struct {
-	Code        string `json:"code"`
-	Path        string `json:"path"`
-	FileName    string `json:"fileName"`
-	ExpiresAt   int64  `json:"expiresAt"`
-	Permanent   bool   `json:"permanent"`
-	HasPassword bool   `json:"hasPassword"`
-	Password    string `json:"password,omitempty"`
-}
-
-type FileSharePublicInfo struct {
-	FileName    string `json:"fileName"`
-	ExpiresAt   int64  `json:"expiresAt"`
-	Permanent   bool   `json:"permanent"`
-	HasPassword bool   `json:"hasPassword"`
-}
-
-type FileAIContentHit struct {
-	Path string `json:"path"`
-	Line int    `json:"line"`
-	Text string `json:"text"`
-}
-
-type FileAISearchResult struct {
-	Mode                 string             `json:"mode"`
-	Summary              string             `json:"summary"`
-	Hits                 []FileAIContentHit `json:"hits"`
-	ContentScannedFiles  int                `json:"contentScannedFiles"`
-	ContentHitsTruncated bool               `json:"contentHitsTruncated"`
-	Truncated            bool               `json:"truncated"`
-	PreFiltered          bool               `json:"preFiltered"`
-	ItemCount            int                `json:"itemCount"`
-	PromptTokens         int                `json:"promptTokens"`
-	CompletionTokens     int                `json:"completionTokens"`
-	TotalTokens          int                `json:"totalTokens"`
-	Duration             string             `json:"duration"`
-}
@@ -1,31 +0,0 @@
-package response
-
-import "time"
-
-type FileHistoryInfo struct {
-	ID             uint      `json:"id"`
-	FileID         string    `json:"fileId"`
-	Path           string    `json:"path"`
-	CurrentPath    string    `json:"currentPath"`
-	PreviousID     uint      `json:"previousId"`
-	SourcePath     string    `json:"sourcePath"`
-	TargetPath     string    `json:"targetPath"`
-	FileName       string    `json:"fileName"`
-	Extension      string    `json:"extension"`
-	FileMode       string    `json:"fileMode"`
-	Operation      string    `json:"operation"`
-	Deleted        bool      `json:"deleted"`
-	ContentSize    int64     `json:"contentSize"`
-	ContentSHA     string    `json:"contentSHA"`
-	StoragePath    string    `json:"storagePath,omitempty"`
-	Content        string    `json:"content,omitempty"`
-	CurrentContent string    `json:"currentContent,omitempty"`
-	CreatedAt      time.Time `json:"createdAt"`
-	UpdatedAt      time.Time `json:"updatedAt"`
-}
-
-type FileHistorySettingInfo struct {
-	Enable      string `json:"enable"`
-	MaxPerPath  int    `json:"maxPerPath"`
-	DiskQuotaMB int    `json:"diskQuotaMB"`
-}
@@ -16,12 +16,6 @@ type McpServerDTO struct {
 	Volumes      []request.Volume      `json:"volumes"`
 }

-type McpServerStatusDTO struct {
-	ID      uint   `json:"id"`
-	Status  string `json:"status"`
-	Message string `json:"message"`
-}
-
 type McpBindDomainRes struct {
 	Domain        string   `json:"domain"`
 	SSLID         uint     `json:"sslID"`
@@ -30,11 +24,3 @@ type McpBindDomainRes struct {
 	WebsiteID     uint     `json:"websiteID"`
 	ConnUrl       string   `json:"connUrl"`
 }
-
-type McpServerConnectionTestRes struct {
-	Success         bool   `json:"success"`
-	Endpoint        string `json:"endpoint"`
-	OutputTransport string `json:"outputTransport"`
-	ProtocolVersion string `json:"protocolVersion,omitempty"`
-	Message         string `json:"message"`
-}
@@ -17,17 +17,6 @@ type NginxParam struct {
 	Params []string `json:"params"`
 }

-// NginxBrotliRes carries the brotli settings together with where they live.
-// ManagedExternally is true when the user defined brotli by hand, in which
-// case the panel only reports the values and must not write its own copy.
-// ManagedUnavailable is true when the panel could not wire the managed
-// configuration into nginx.conf at all, so the reported values are inert.
-type NginxBrotliRes struct {
-	Params             []NginxParam `json:"params"`
-	ManagedExternally  bool         `json:"managedExternally"`
-	ManagedUnavailable bool         `json:"managedUnavailable"`
-}
-
 type NginxAuthRes struct {
 	Enable bool            `json:"enable"`
 	Items  []dto.NginxAuth `json:"items"`
@@ -80,28 +69,18 @@ type NginxProxyCache struct {
 }

 type NginxModule struct {
-	Name        string                    `json:"name"`
-	Custom      bool                      `json:"custom"`
-	Script      string                    `json:"script"`
-	Packages    string                    `json:"packages"`
-	Params      string                    `json:"params"`
-	Enable      bool                      `json:"enable"`
-	BuildMode   string                    `json:"buildMode"`
-	Provider    string                    `json:"provider"`
-	LoadOrder   int                       `json:"loadOrder"`
-	BuildStatus string                    `json:"buildStatus"`
-	LoadStatus  string                    `json:"loadStatus"`
-	Artifacts   []dto.NginxModuleArtifact `json:"artifacts"`
-	LastError   string                    `json:"lastError"`
+	Name     string `json:"name"`
+	Script   string `json:"script"`
+	Packages string `json:"packages"`
+	Params   string `json:"params"`
+	Enable   bool   `json:"enable"`
 }

 type NginxBuildConfig struct {
-	Mirror           string        `json:"mirror"`
-	DynamicSupported bool          `json:"dynamicSupported"`
-	Modules          []NginxModule `json:"modules"`
+	Mirror  string        `json:"mirror"`
+	Modules []NginxModule `json:"modules"`
 }

 type NginxConfigRes struct {
-	Https              bool `json:"https"`
-	SSLRejectHandshake bool `json:"sslRejectHandshake"`
+	Https bool `json:"https"`
 }
@@ -28,7 +28,6 @@ type RuntimeDTO struct {
 	ExposedPorts    []request.ExposedPort  `json:"exposedPorts"`
 	Environments    []request.Environment  `json:"environments"`
 	Volumes         []request.Volume       `json:"volumes"`
-	ExtraHosts      []request.ExtraHost    `json:"extraHosts"`
 	ContainerStatus string                 `json:"containerStatus"`
 	Container       string                 `json:"container"`
 	Remark          string                 `json:"remark"`
@@ -3,7 +3,6 @@ package response
 import (
 	"time"

-	"github.com/1Panel-dev/1Panel/agent/app/dto"
 	"github.com/1Panel-dev/1Panel/agent/app/model"
 )

@@ -17,10 +16,6 @@ type WebsiteDTO struct {
 	RuntimeType   string `json:"runtimeType"`
 	SiteDir       string `json:"siteDir"`
 	OpenBaseDir   bool   `json:"openBaseDir"`
-	Algorithm     string `json:"algorithm"`
-	UDP           bool   `json:"udp"`
-
-	Servers []dto.NginxUpstreamServer `json:"servers"`
 }

 type WebsiteRes struct {
@@ -40,7 +35,6 @@ type WebsiteRes struct {
 	SSLStatus     string    `json:"sslStatus"`
 	AppInstallID  uint      `json:"appInstallId"`
 	ChildSites    []string  `json:"childSites"`
-	ParentSite    string    `json:"parentSite"`
 	RuntimeType   string    `json:"runtimeType"`
 	Favorite      bool      `json:"favorite"`
 	IPV6          bool      `json:"IPV6"`
@@ -1,18 +0,0 @@
-package response
-
-import (
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-)
-
-type WebsiteTemplateDTO struct {
-	model.WebsiteTemplate
-}
-
-type WebsiteTemplateOutputDTO struct {
-	model.WebsiteTemplateOutput
-	TemplateName string `json:"templateName"`
-}
-
-type WebsitePreviewDTO struct {
-	HTML string `json:"html"`
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhengkunwang223	5d674f14ad	feat: add backend api timeout	2025-12-15 16:42:54 +08:00
zhengkunwang223	b772effacd	fix: Fixed frontend list loading failure issue	2025-12-04 17:29:53 +08:00
zhengkunwang223	2417cc9eed	perf: Optimized tensorrtLLM display performanceperf	2025-12-04 16:33:57 +08:00
ssongliu	c0796dc7c4	fix: Fix the issue of monitoring fields not being generated properly (#11153 )	2025-12-02 05:49:41 +00:00
CityFun	ff9747560e	feat: add MODEL_PATH environment for tensorrt llm (#10921 )	2025-11-11 15:42:26 +08:00
CityFun	9c2828385b	feat: order env for tensorrt_llm (#10916 )	2025-11-11 14:10:04 +08:00
zhengkunwang223	ad5df58d0f	feat: support tensorrt LLM speedup	2025-11-10 17:54:50 +08:00
王贺	bb5e0f98c2	Update service file download paths in script.sh (#10843 )	2025-11-03 11:57:10 +08:00
CityFun	bfa2eb43ea	feat: change tensorrt button logic (#10805 )	2025-10-29 10:41:09 +08:00
BugKing	be27983938	chore: Add id attribute to welcome dialog (#10746 )	2025-10-24 15:02:43 +08:00
ssongliu	7ff1819799	fix: Fix the packaging failure issue (#10734 )	2025-10-23 16:45:02 +08:00
ssongliu	7ff39c91da	feat: Add xplay welcome page (#10733 )	2025-10-23 16:28:20 +08:00