fix: fix typos

Refs #7380

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: ["https://afdian.net/a/1Panel"]

.github/ISSUE_TEMPLATE/1_bug_report.yml

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

.github/ISSUE_TEMPLATE/2_feature_request.yml

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

.github/ISSUE_TEMPLATE/bug.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature.yml

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

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

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

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

@@ -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: '20.2'
+      - name: Build Web
+        run: |
+          cd frontend && npm install && npm run build:pro
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: Build Release
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --skip=publish --clean
+      - name: Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            dist/*.tar.gz
+            dist/checksums.txt
+      - name: Setup 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/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force

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

@@ -0,0 +1,45 @@
+name: Create Release And Upload Cloudflare R2
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.2'
+      - name: Build Web
+        run: |
+          cd frontend && npm install && npm run build:pro
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: Build Release
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --skip=publish --clean
+      - name: Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            dist/*.tar.gz
+            dist/checksums.txt
+      - name: Setup Rclone
+        uses: AnimMouse/setup-rclone@v1
+        with:
+          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+      - name: Upload to Cloudflare R2
+        run: |
+          rclone copy dist/ cloudflare_r2:package/stable/${{ github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --progress

.github/workflows/build-test.yml

@@ -1,34 +0,0 @@
-on:
-  pull_request:
-    branches:
-      - dev
-  push:
-    branches:
-      - dev
-
-name: Build Test
-
-jobs:
-  build-linux-binary:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18.14'
-      - name: Build Web
-        id: build_frontend
-        run: |
-          cd frontend && npm install && npm run build:pro
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20.x'
-      - name: Build Server
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          args: release --snapshot --clean

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

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

.github/workflows/issue-translator.yml

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

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

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

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

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

.github/workflows/release-drafter.yml

@@ -1,66 +0,0 @@
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-name: Create Release And Upload assets
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20.2'
-      - name: Build Web
-        run: |
-          cd frontend && npm install && npm run build:pro
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.21.x'
-      - name: Build Release
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          distribution: goreleaser
-          version: latest
-          args: release --skip-publish --clean
-      - name: Upload Assets
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          draft: true
-          body: |
-            # 一、安装和升级
-
-            ## 1.1 一键安装
-            ```sh
-            curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_start.sh && sudo bash quick_start.sh
-            ```
-
-            ## 1.2 在线升级
-
-            登录 1Panel Web 控制台，在页面右下角点击 **【检查更新】** 进行在线升级。
-
-            >更多信息请查阅在线文档：https://1panel.cn/docs/
-
-            # 二、更新日志
-
-          files: |
-            dist/*.tar.gz
-            dist/checksums.txt
-      - name: Setup OSSUTIL
-        uses: yizhoumo/setup-ossutil@v1
-        with:
-          endpoint: ${{ secrets.OSS_ENDPOINT }}
-          access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
-          access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-          ossutil-version: '1.7.14'
-      - name: Upload Assets to OSS
-        run: ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/stable/${{  github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir --force

.github/workflows/sonarcloud-scan.yml

@@ -1,4 +1,4 @@
-name: Build
+name: SonarCloud Scan
 on:
   push:
     branches:
@@ -17,4 +17,4 @@ jobs:
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sync2gitee.yml

@@ -1,6 +1,5 @@
-name: sync2gitee
+name: Synchronize to Gitee
 on: [push]
-
 jobs:
   repo-sync:
     runs-on: ubuntu-latest

.github/workflows/tyops-check.yml

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

.gitignore

@@ -22,7 +22,6 @@ build/1panel
 *.iml
 *.ipr
 
-
 # Test binary, built with `go test -c`
 *.test
 
@@ -40,10 +39,7 @@ frontend/auto-imports.d.ts
 frontend/components.d.ts
 frontend/src/xpack
 backend/xpack
-backend/router/entry_xpack.go
-backend/server/init_xpack.go
-backend/utils/xpack/xpack_xpack.go
-
+*_xpack.go
 .history/
 dist/
 1pctl

.goreleaser.yaml

@@ -1,11 +1,13 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=jcroql
+version: 2
+
 before:
   hooks:
     # - export NODE_OPTIONS="--max-old-space-size=8192"
     # - make build_web
-    - chmod +x ./script.sh
-    - ./script.sh
+    - chmod +x ./ci/script.sh
+    - ./ci/script.sh
     - sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl
     - go mod tidy
     
@@ -38,22 +40,15 @@ archives:
       - 1pctl
       - 1panel.service
       - install.sh
-      - README.md
-      - LICENSE
-    
+      - GeoIP.mmdb
+      - lang/*
+
 checksum:
   name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ incpatch .Version }}-next"
-release:
-  draft: true
-  mode: append
-  extra_files:
-    - glob: dist/*.tar.gz
-    - glob: dist/checksums.txt
-  name_template: "Release {{.Tag}}"
 
-# The lines beneath this are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"

.vscode/settings.json

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

CODE_OF_CONDUCT.md

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

CONTRIBUTING.md

@@ -1,5 +1,10 @@
 # Contributing
 
+As a contributor, you should agree that:
+
+- The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+- Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.
+
 ## Create pull request
 PR are always welcome, even if they only contain small fixes like typos or a few lines of code. If there will be a significant effort, please document it as an issue and get a discussion going before starting to work on it.
 

Makefile

@@ -2,15 +2,15 @@ GOCMD=go
 GOBUILD=$(GOCMD) build
 GOCLEAN=$(GOCMD) clean
 GOARCH=$(shell go env GOARCH)
-GOOS=$(shell go env GOOS )
+GOOS=$(shell go env GOOS)
 
-BASE_PAH := $(shell pwd)
-BUILD_PATH = $(BASE_PAH)/build
-WEB_PATH=$(BASE_PAH)/frontend
-SERVER_PATH=$(BASE_PAH)/backend
-MAIN= $(BASE_PAH)/cmd/server/main.go
+BASE_PATH := $(shell pwd)
+BUILD_PATH = $(BASE_PATH)/build
+WEB_PATH=$(BASE_PATH)/frontend
+SERVER_PATH=$(BASE_PATH)/backend
+MAIN= $(BASE_PATH)/cmd/server/main.go
 APP_NAME=1panel
-ASSERT_PATH= $(BASE_PAH)/cmd/server/web/assets
+ASSERT_PATH= $(BASE_PATH)/cmd/server/web/assets
 
 clean_assets:
 	rm -rf $(ASSERT_PATH)

OWNERS

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

README.md

@@ -1,26 +1,33 @@
 <p align="center"><a href="https://1panel.cn"><img src="http://1panel.oss-cn-hangzhou.aliyuncs.com/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
+<p align="center"><b>Top-Rated Web-based Linux Server Management Tool</b></p>
 <p align="center"><b>现代化、开源的 Linux 服务器运维管理面板</b></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: 180px; height: auto;" /></a>
+  <a href="https://hellogithub.com/repository/71791baf930149ac9b84e1acf186573f" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=71791baf930149ac9b84e1acf186573f&claim_uid=p8vB3kP5CMrthiL&theme=dark&theme=neutral" alt="Featured｜HelloGitHub" style="width: 180px; height: auto;" /></a>
+  <a href="https://market.aliyun.com/products/53690006/cmjj00062740.html?userCode=kmemb8jp" target="_blank"><img src="https://img.alicdn.com/imgextra/i2/O1CN01H5JIwY1rZ0OobDjnJ_!!6000000005644-2-tps-1000-216.png" alt="1Panel-dev%2F1Panel | Aliyun" style="width: 180px; height: auto;" /></a>
+</p>
 <p align="center">
   <a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://shields.io/github/license/1Panel-dev/1Panel?color=%231890FF" alt="License: GPL v3"></a>
   <a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://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://app.fossa.com/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel?ref=badge_shield"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel.svg?type=shield" alt="FOSSA Status"></a><br>
-  [<a href="docs/README_TW.md">中文(繁體)</a>] | [<a href="docs/README_EN.md">English</a>] | [<a href="docs/README_JP.md">日本語</a>]
+  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="GitHub Stars"></a>
+  <a href="https://gitee.com/fit2cloud-feizhiyun/1Panel"><img src="https://gitee.com/fit2cloud-feizhiyun/1Panel/badge/star.svg?theme=gvp" alt="Gitee Stars"></a><br>
+  [<a href="docs/README_EN.md">English</a>] | [<a href="docs/README_TW.md">中文(繁體)</a>] | [<a href="docs/README_JP.md">日本語</a>]
 </p>
 
+[![Watch the video](https://resource.fit2cloud.com/1panel/img/overview_video.png)](https://www.bilibili.com/video/BV1Mt421n7LZ/)
+
 ------------------------------
+## 什么是 1Panel？
 
 1Panel 是新一代的 Linux 服务器运维管理面板。
 
-- **高效管理**：用户可以通过 Web 图形界面轻松管理 Linux 服务器，实现主机监控、文件管理、数据库管理、容器管理等功能；
+- **高效管理**：用户可以通过 Web 界面轻松管理 Linux 服务器，如主机监控、文件管理、数据库管理、容器管理等；
 - **快速建站**：深度集成开源建站软件 WordPress 和 [Halo](https://github.com/halo-dev/halo/)，域名绑定、SSL 证书配置等操作一键搞定；
 - **应用商店**：精选上架各类高质量的开源工具和应用软件，协助用户轻松安装并升级；
-- **安全可靠**：基于容器管理并部署应用，实现最小的漏洞暴露面，同时提供防火墙和日志审计等功能；
+- **安全可靠**：基于容器管理并部署应用，实现最小的漏洞暴露面，同时提供病毒防护、防火墙和日志审计等功能；
 - **一键备份**：支持一键备份和恢复，用户可以将数据备份到各类云端存储介质，永不丢失。
 
-1Panel 三分钟速览：https://www.bilibili.com/video/BV1Mt421n7LZ/
-
 ## 快速开始
 
 **一键安装**
@@ -31,27 +38,26 @@
 curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_start.sh && sudo bash quick_start.sh
 ```
 
+如果是用于离线环境，推荐使用 [安装包方式](https://1panel.cn/docs/installation/package_installation/) 进行安装部署。
+
 **学习资料**
 
 - [在线文档](https://1panel.cn/docs/)
 - [社区论坛](https://bbs.fit2cloud.com/c/1p/7)
 - [如何加入微信交流群?](https://bbs.fit2cloud.com/t/topic/2147)
 
-## UI 展示
+## 专业版
 
-![UI展示](https://resource.fit2cloud.com/1panel/img/overview.png)
+相比于社区版，1Panel 专业版为用户提供了大量增强功能及技术支持服务，增强功能包括 WAF 增强、网站防篡改、网站监控、GPU 监控、黑金主题及自定义界面等。 [点击查看专业版详细介绍](https://www.lxware.cn/1panel)。
 
-## 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)
-
-## 我们的其他明星项目
+## 飞致云的其他明星项目
 
 - [MaxKB](https://github.com/1Panel-dev/MaxKB/) - 基于 LLM 大语言模型的开源知识库问答系统
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - 广受欢迎的开源堡垒机
 - [Halo](https://github.com/halo-dev/halo/) - 强大易用的开源建站工具
 - [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
-- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源自动化测试平台
+- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源持续测试工具
+- [KubePi](https://github.com/1Panel-dev/KubePi/) - 现代化、开源的 K8s 面板
 
 ## License
 

SECURITY.md

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

backend/app/api/v1/app.go

@@ -11,11 +11,11 @@ import (
 
 // @Tags App
 // @Summary List apps
-// @Description 获取应用列表
 // @Accept json
 // @Param request body request.AppSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/search [post]
 func (b *BaseApi) SearchApp(c *gin.Context) {
 	var req request.AppSearch
@@ -32,9 +32,9 @@ func (b *BaseApi) SearchApp(c *gin.Context) {
 
 // @Tags App
 // @Summary Sync app list
-// @Description 同步应用列表
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/sync [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用商店同步","formatEN":"App store synchronization"}
 func (b *BaseApi) SyncApp(c *gin.Context) {
@@ -63,11 +63,11 @@ func (b *BaseApi) SyncApp(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app by key
-// @Description 通过 key 获取应用信息
 // @Accept json
 // @Param key path string true "app key"
 // @Success 200 {object} response.AppDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/:key [get]
 func (b *BaseApi) GetApp(c *gin.Context) {
 	appKey, err := helper.GetStrParamByKey(c, "key")
@@ -85,13 +85,13 @@ func (b *BaseApi) GetApp(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app detail by appid
-// @Description 通过 appid 获取应用详情
 // @Accept json
 // @Param appId path integer true "app id"
-// @Param version path string true "app 版本"
-// @Param version path string true "app 类型"
+// @Param version path string true "app version"
+// @Param version path string true "app type"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/detail/:appId/:version/:type [get]
 func (b *BaseApi) GetAppDetail(c *gin.Context) {
 	appID, err := helper.GetIntParamByKey(c, "appId")
@@ -111,11 +111,11 @@ func (b *BaseApi) GetAppDetail(c *gin.Context) {
 
 // @Tags App
 // @Summary Get app detail by id
-// @Description 通过 id 获取应用详情
 // @Accept json
 // @Param appId path integer true "id"
 // @Success 200 {object} response.AppDetailDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/details/:id [get]
 func (b *BaseApi) GetAppDetailByID(c *gin.Context) {
 	appDetailID, err := helper.GetIntParamByKey(c, "id")
@@ -133,10 +133,10 @@ func (b *BaseApi) GetAppDetailByID(c *gin.Context) {
 
 // @Tags App
 // @Summary Get Ignore App
-// @Description 获取忽略的应用版本
 // @Accept json
 // @Success 200 {object} response.IgnoredApp
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/ignored [get]
 func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 	res, err := appService.GetIgnoredApp()
@@ -149,13 +149,13 @@ func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 
 // @Tags App
 // @Summary Install app
-// @Description 安装应用
 // @Accept json
 // @Param request body request.AppInstallCreate true "request"
 // @Success 200 {object} model.AppInstall
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/install [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"name","input_value":"name","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"info":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"安装应用 [appKey]-[name]","formatEN":"Install app [appKey]-[name]"}
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"安装应用 [name]","formatEN":"Install app [name]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
 	var req request.AppInstallCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -183,9 +183,9 @@ func (b *BaseApi) GetAppTags(c *gin.Context) {
 
 // @Tags App
 // @Summary Get app list update
-// @Description 获取应用更新版本
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/checkupdate [get]
 func (b *BaseApi) GetAppListUpdate(c *gin.Context) {
 	res, err := appService.GetAppUpdate()

backend/app/api/v1/app_install.go

@@ -11,11 +11,11 @@ import (
 
 // @Tags App
 // @Summary Page app installed
-// @Description 分页获取已安装应用列表
 // @Accept json
 // @Param request body request.AppInstalledSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/search [post]
 func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 	var req request.AppInstalledSearch
@@ -44,10 +44,10 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary List app installed
-// @Description 获取已安装应用列表
 // @Accept json
 // @Success 200 array dto.AppInstallInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/list [get]
 func (b *BaseApi) ListAppInstalled(c *gin.Context) {
 	list, err := appInstallService.GetInstallList()
@@ -60,11 +60,11 @@ func (b *BaseApi) ListAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Check app installed
-// @Description 检查应用安装情况
 // @Accept json
 // @Param request body request.AppInstalledInfo true "request"
 // @Success 200 {object} response.AppInstalledCheck
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/check [post]
 func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 	var req request.AppInstalledInfo
@@ -81,11 +81,11 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app port by key
-// @Description 获取应用端口
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {integer} port
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/loadport [post]
 func (b *BaseApi) LoadPort(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -102,11 +102,11 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app password by key
-// @Description 获取应用连接信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {string} response.DatabaseConn
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/conninfo/:key [get]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -123,11 +123,11 @@ func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 
 // @Tags App
 // @Summary Check before delete
-// @Description 删除前检查
 // @Accept json
 // @Param appInstallId path integer true "App install id"
 // @Success 200 {array} dto.AppResource
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/delete/check/:appInstallId [get]
 func (b *BaseApi) DeleteCheck(c *gin.Context) {
 	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
@@ -146,9 +146,9 @@ func (b *BaseApi) DeleteCheck(c *gin.Context) {
 // Sync app installed
 // @Tags App
 // @Summary Sync app installed
-// @Description 同步已安装应用列表
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/sync [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步已安装应用列表","formatEN":"Sync the list of installed apps"}
 func (b *BaseApi) SyncInstalled(c *gin.Context) {
@@ -161,11 +161,11 @@ func (b *BaseApi) SyncInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Operate installed app
-// @Description 操作已安装应用
 // @Accept json
 // @Param request body request.AppInstalledOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/op [post]
 // @x-panel-log {"bodyKeys":["installId","operate"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"input_column":"id","input_value":"installId","isList":false,"db":"app_installs","output_column":"name","output_value":"appName"},{"input_column":"id","input_value":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"[operate] 应用 [appKey][appName]","formatEN":"[operate] App [appKey][appName]"}
 func (b *BaseApi) OperateInstalled(c *gin.Context) {
@@ -182,11 +182,11 @@ func (b *BaseApi) OperateInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app service by key
-// @Description 通过 key 获取应用 service
 // @Accept json
 // @Param key path string true "request"
 // @Success 200 {array} response.AppService
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/services/:key [get]
 func (b *BaseApi) GetServices(c *gin.Context) {
 	key := c.Param("key")
@@ -200,19 +200,18 @@ func (b *BaseApi) GetServices(c *gin.Context) {
 
 // @Tags App
 // @Summary Search app update version by install id
-// @Description 通过 install id 获取应用更新版本
 // @Accept json
 // @Param appInstallId path integer true "request"
 // @Success 200 {array} dto.AppVersion
 // @Security ApiKeyAuth
-// @Router /apps/installed/:appInstallId/versions [get]
+// @Security Timestamp
+// @Router /apps/installed/update/versions [post]
 func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
-	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+	var req request.AppUpdateVersion
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	versions, err := appInstallService.GetUpdateVersions(appInstallId)
+	versions, err := appInstallService.GetUpdateVersions(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -222,11 +221,11 @@ func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
 
 // @Tags App
 // @Summary Change app port
-// @Description 修改应用端口
 // @Accept json
 // @Param request body request.PortUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/port/change [post]
 // @x-panel-log {"bodyKeys":["key","name","port"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用端口修改 [key]-[name] => [port]","formatEN":"Application port update [key]-[name] => [port]"}
 func (b *BaseApi) ChangeAppPort(c *gin.Context) {
@@ -243,11 +242,11 @@ func (b *BaseApi) ChangeAppPort(c *gin.Context) {
 
 // @Tags App
 // @Summary Search default config by key
-// @Description 通过 key 获取应用默认配置
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {string} content
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/conf [post]
 func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -265,11 +264,11 @@ func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
 
 // @Tags App
 // @Summary Search params by appInstallId
-// @Description 通过 install id 获取应用参数
 // @Accept json
 // @Param appInstallId path string true "request"
 // @Success 200 {object} response.AppParam
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/params/:appInstallId [get]
 func (b *BaseApi) GetParams(c *gin.Context) {
 	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
@@ -287,11 +286,11 @@ func (b *BaseApi) GetParams(c *gin.Context) {
 
 // @Tags App
 // @Summary Change app params
-// @Description 修改应用参数
 // @Accept json
 // @Param request body request.AppInstalledUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/params/update [post]
 // @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"应用参数修改 [installId]","formatEN":"Application param update [installId]"}
 func (b *BaseApi) UpdateInstalled(c *gin.Context) {
@@ -308,11 +307,11 @@ func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 
 // @Tags App
 // @Summary ignore App Update
-// @Description 忽略应用升级版本
 // @Accept json
 // @Param request body request.AppInstalledIgnoreUpgrade true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /apps/installed/ignore [post]
 // @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"忽略应用 [installId] 版本升级","formatEN":"Application param update [installId]"}
 func (b *BaseApi) IgnoreUpgrade(c *gin.Context) {

backend/app/api/v1/auth.go

@@ -2,14 +2,14 @@ package v1
 
 import (
 	"encoding/base64"
-
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/captcha"
-	"github.com/1Panel-dev/1Panel/backend/utils/qqwry"
+	"github.com/1Panel-dev/1Panel/backend/utils/common"
+	"github.com/1Panel-dev/1Panel/backend/utils/geo"
 	"github.com/gin-gonic/gin"
 )
 
@@ -17,9 +17,8 @@ type BaseApi struct{}
 
 // @Tags Auth
 // @Summary User login
-// @Description 用户登录
 // @Accept json
-// @Param EntranceCode header string true "安全入口 base64 加密串"
+// @Param EntranceCode header string true "Secure entrance base64 encrypted string"
 // @Param request body dto.Login true "request"
 // @Success 200 {object} dto.UserLoginInfo
 // @Router /auth/login [post]
@@ -35,11 +34,18 @@ func (b *BaseApi) Login(c *gin.Context) {
 			return
 		}
 	}
+
 	entranceItem := c.Request.Header.Get("EntranceCode")
 	var entrance []byte
 	if len(entranceItem) != 0 {
 		entrance, _ = base64.StdEncoding.DecodeString(entranceItem)
 	}
+	if len(entrance) == 0 {
+		cookieValue, err := c.Cookie("SecurityEntrance")
+		if err == nil {
+			entrance, _ = base64.StdEncoding.DecodeString(cookieValue)
+		}
+	}
 
 	user, err := authService.Login(c, req, string(entrance))
 	go saveLoginLogs(c, err)
@@ -52,12 +58,11 @@ func (b *BaseApi) Login(c *gin.Context) {
 
 // @Tags Auth
 // @Summary User login with mfa
-// @Description 用户 mfa 登录
 // @Accept json
 // @Param request body dto.MFALogin true "request"
 // @Success 200 {object} dto.UserLoginInfo
 // @Router /auth/mfalogin [post]
-// @Header 200 {string} EntranceCode "安全入口"
+// @Header 200 {string} EntranceCode
 func (b *BaseApi) MFALogin(c *gin.Context) {
 	var req dto.MFALogin
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -80,9 +85,9 @@ func (b *BaseApi) MFALogin(c *gin.Context) {
 
 // @Tags Auth
 // @Summary User logout
-// @Description 用户登出
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /auth/logout [post]
 func (b *BaseApi) LogOut(c *gin.Context) {
 	if err := authService.LogOut(c); err != nil {
@@ -94,7 +99,6 @@ func (b *BaseApi) LogOut(c *gin.Context) {
 
 // @Tags Auth
 // @Summary Load captcha
-// @Description 加载验证码
 // @Success 200 {object} dto.CaptchaResponse
 // @Router /auth/captcha [get]
 func (b *BaseApi) Captcha(c *gin.Context) {
@@ -106,21 +110,6 @@ func (b *BaseApi) Captcha(c *gin.Context) {
 	helper.SuccessWithData(c, captcha)
 }
 
-// @Tags Auth
-// @Summary Load safety status
-// @Description 获取系统安全登录状态
-// @Success 200
-// @Router /auth/issafety [get]
-func (b *BaseApi) CheckIsSafety(c *gin.Context) {
-	code := c.DefaultQuery("code", "")
-	status, err := authService.CheckIsSafety(code)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, status)
-}
-
 func (b *BaseApi) GetResponsePage(c *gin.Context) {
 	pageCode, err := authService.GetResponsePage()
 	if err != nil {
@@ -132,16 +121,22 @@ func (b *BaseApi) GetResponsePage(c *gin.Context) {
 
 // @Tags Auth
 // @Summary Check System isDemo
-// @Description 判断是否为demo环境
 // @Success 200
 // @Router /auth/demo [get]
 func (b *BaseApi) CheckIsDemo(c *gin.Context) {
 	helper.SuccessWithData(c, global.CONF.System.IsDemo)
 }
 
+// @Tags Auth
+// @Summary Check System isIntl
+// @Success 200
+// @Router /auth/intl [get]
+func (b *BaseApi) CheckIsIntl(c *gin.Context) {
+	helper.SuccessWithData(c, global.CONF.System.IsIntl)
+}
+
 // @Tags Auth
 // @Summary Load System Language
-// @Description 获取系统语言设置
 // @Success 200
 // @Router /auth/language [get]
 func (b *BaseApi) GetLanguage(c *gin.Context) {
@@ -162,12 +157,11 @@ func saveLoginLogs(c *gin.Context, err error) {
 		logs.Status = constant.StatusSuccess
 	}
 	logs.IP = c.ClientIP()
-	qqWry, err := qqwry.NewQQwry()
+	address, err := geo.GetIPLocation(logs.IP, common.GetLang(c))
 	if err != nil {
-		global.LOG.Errorf("load qqwry datas failed: %s", err)
+		global.LOG.Errorf("get ip location failed: %s", err)
 	}
-	res := qqWry.Find(logs.IP)
 	logs.Agent = c.GetHeader("User-Agent")
-	logs.Address = res.Area
+	logs.Address = address
 	_ = logService.CreateLoginLog(logs)
 }

backend/app/api/v1/backup.go

@@ -13,11 +13,11 @@ import (
 
 // @Tags Backup Account
 // @Summary Create backup account
-// @Description 创建备份账号
 // @Accept json
 // @Param request body dto.BackupOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建备份账号 [type]","formatEN":"create backup account [type]"}
 func (b *BaseApi) CreateBackup(c *gin.Context) {
@@ -51,9 +51,9 @@ func (b *BaseApi) CreateBackup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Refresh OneDrive token
-// @Description 刷新 OneDrive token
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/refresh/onedrive [post]
 func (b *BaseApi) RefreshOneDriveToken(c *gin.Context) {
 	backupService.Run()
@@ -62,11 +62,11 @@ func (b *BaseApi) RefreshOneDriveToken(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary List buckets
-// @Description 获取 bucket 列表
 // @Accept json
 // @Param request body dto.ForBuckets true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/search [post]
 func (b *BaseApi) ListBuckets(c *gin.Context) {
 	var req dto.ForBuckets
@@ -100,10 +100,10 @@ func (b *BaseApi) ListBuckets(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Load OneDrive info
-// @Description 获取 OneDrive 信息
 // @Accept json
 // @Success 200 {object} dto.OneDriveInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/onedrive [get]
 func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
 	data, err := backupService.LoadOneDriveInfo()
@@ -116,13 +116,13 @@ func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Delete backup account
-// @Description 删除备份账号
 // @Accept json
-// @Param request body dto.BatchDeleteReq true "request"
+// @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"backup_accounts","output_column":"type","output_value":"types"}],"formatZH":"删除备份账号 [types]","formatEN":"delete backup account [types]"}
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"backup_accounts","output_column":"type","output_value":"types"}],"formatZH":"删除备份账号 [types]","formatEN":"delete backup account [types]"}
 func (b *BaseApi) DeleteBackup(c *gin.Context) {
 	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -138,11 +138,11 @@ func (b *BaseApi) DeleteBackup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Page backup records
-// @Description 获取备份记录列表分页
 // @Accept json
 // @Param request body dto.RecordSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/record/search [post]
 func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 	var req dto.RecordSearch
@@ -164,11 +164,11 @@ func (b *BaseApi) SearchBackupRecords(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Page backup records by cronjob
-// @Description 通过计划任务获取备份记录列表分页
 // @Accept json
 // @Param request body dto.RecordSearchByCronjob true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/record/search/bycronjob [post]
 func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
 	var req dto.RecordSearchByCronjob
@@ -190,11 +190,11 @@ func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Download backup record
-// @Description 下载备份记录
 // @Accept json
 // @Param request body dto.DownloadRecord true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/record/download [post]
 // @x-panel-log {"bodyKeys":["source","fileName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载备份记录 [source][fileName]","formatEN":"download backup records [source][fileName]"}
 func (b *BaseApi) DownloadRecord(c *gin.Context) {
@@ -213,11 +213,11 @@ func (b *BaseApi) DownloadRecord(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Delete backup record
-// @Description 删除备份记录
 // @Accept json
 // @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/record/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"backup_records","output_column":"file_name","output_value":"files"}],"formatZH":"删除备份记录 [files]","formatEN":"delete backup records [files]"}
 func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
@@ -235,11 +235,11 @@ func (b *BaseApi) DeleteBackupRecord(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Update backup account
-// @Description 更新备份账号信息
 // @Accept json
 // @Param request body dto.BackupOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/update [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新备份账号 [types]","formatEN":"update backup account [types]"}
 func (b *BaseApi) UpdateBackup(c *gin.Context) {
@@ -274,9 +274,9 @@ func (b *BaseApi) UpdateBackup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary List backup accounts
-// @Description 获取备份账号列表
 // @Success 200 {array} dto.BackupInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/search [get]
 func (b *BaseApi) ListBackup(c *gin.Context) {
 	data, err := backupService.List()
@@ -290,11 +290,11 @@ func (b *BaseApi) ListBackup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary List files from backup accounts
-// @Description 获取备份账号内文件列表
 // @Accept json
 // @Param request body dto.BackupSearchFile true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/search/files [post]
 func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 	var req dto.BackupSearchFile
@@ -308,11 +308,11 @@ func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Backup system data
-// @Description 备份系统数据
 // @Accept json
 // @Param request body dto.CommonBackup true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/backup [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"备份 [type] 数据 [name][detailName]","formatEN":"backup [type] data [name][detailName]"}
 func (b *BaseApi) Backup(c *gin.Context) {
@@ -343,7 +343,7 @@ func (b *BaseApi) Backup(c *gin.Context) {
 			return
 		}
 	case "redis":
-		if err := backupService.RedisBackup(); err != nil {
+		if err := backupService.RedisBackup(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
@@ -353,11 +353,11 @@ func (b *BaseApi) Backup(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Recover system data
-// @Description 恢复系统数据
 // @Accept json
 // @Param request body dto.CommonRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/recover [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) Recover(c *gin.Context) {
@@ -404,11 +404,11 @@ func (b *BaseApi) Recover(c *gin.Context) {
 
 // @Tags Backup Account
 // @Summary Recover system data by upload
-// @Description 从上传恢复系统数据
 // @Accept json
 // @Param request body dto.CommonRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/backup/recover/byupload [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName","file"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [file] 恢复 [type] 数据 [name][detailName]","formatEN":"recover [type] data [name][detailName] from [file]"}
 func (b *BaseApi) RecoverByUpload(c *gin.Context) {

backend/app/api/v1/clam.go

@@ -0,0 +1,296 @@
+package v1
+
+import (
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags Clam
+// @Summary Create clam
+// @Accept json
+// @Param request body dto.ClamCreate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam [post]
+// @x-panel-log {"bodyKeys":["name","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建扫描规则 [name][path]","formatEN":"create clam [name][path]"}
+func (b *BaseApi) CreateClam(c *gin.Context) {
+	var req dto.ClamCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.Create(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Update clam
+// @Accept json
+// @Param request body dto.ClamUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/update [post]
+// @x-panel-log {"bodyKeys":["name","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改扫描规则 [name][path]","formatEN":"update clam [name][path]"}
+func (b *BaseApi) UpdateClam(c *gin.Context) {
+	var req dto.ClamUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.Update(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Update clam status
+// @Accept json
+// @Param request body dto.ClamUpdateStatus true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/status/update [post]
+// @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"修改扫描规则 [name] 状态为 [status]","formatEN":"change the status of clam [name] to [status]."}
+func (b *BaseApi) UpdateClamStatus(c *gin.Context) {
+	var req dto.ClamUpdateStatus
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.UpdateStatus(req.ID, req.Status); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Page clam
+// @Accept json
+// @Param request body dto.SearchClamWithPage true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/search [post]
+func (b *BaseApi) SearchClam(c *gin.Context) {
+	var req dto.SearchClamWithPage
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := clamService.SearchWithPage(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags Clam
+// @Summary Load clam base info
+// @Accept json
+// @Success 200 {object} dto.ClamBaseInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/base [get]
+func (b *BaseApi) LoadClamBaseInfo(c *gin.Context) {
+	info, err := clamService.LoadBaseInfo()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, info)
+}
+
+// @Tags Clam
+// @Summary Operate Clam
+// @Accept json
+// @Param request body dto.Operate true "request"
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/operate [post]
+// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Clam","formatEN":"[operation] FTP"}
+func (b *BaseApi) OperateClam(c *gin.Context) {
+	var req dto.Operate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.Operate(req.Operation); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Clean clam record
+// @Accept json
+// @Param request body dto.OperateByID true "request"
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/record/clean [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"清空扫描报告 [name]","formatEN":"clean clam record [name]"}
+func (b *BaseApi) CleanClamRecord(c *gin.Context) {
+	var req dto.OperateByID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := clamService.CleanRecord(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Page clam record
+// @Accept json
+// @Param request body dto.ClamLogSearch true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/record/search [post]
+func (b *BaseApi) SearchClamRecord(c *gin.Context) {
+	var req dto.ClamLogSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := clamService.LoadRecords(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags Clam
+// @Summary Load clam record detail
+// @Accept json
+// @Param request body dto.ClamLogReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/record/log [post]
+func (b *BaseApi) LoadClamRecordLog(c *gin.Context) {
+	var req dto.ClamLogReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	content, err := clamService.LoadRecordLog(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, content)
+}
+
+// @Tags Clam
+// @Summary Load clam file
+// @Accept json
+// @Param request body dto.ClamFileReq true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/file/search [post]
+func (b *BaseApi) SearchClamFile(c *gin.Context) {
+	var req dto.ClamFileReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	content, err := clamService.LoadFile(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, content)
+}
+
+// @Tags Clam
+// @Summary Update clam file
+// @Accept json
+// @Param request body dto.UpdateByNameAndFile true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/file/update [post]
+func (b *BaseApi) UpdateFile(c *gin.Context) {
+	var req dto.UpdateByNameAndFile
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := clamService.UpdateFile(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags Clam
+// @Summary Delete clam
+// @Accept json
+// @Param request body dto.ClamDelete true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/del [post]
+// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"clams","output_column":"name","output_value":"names"}],"formatZH":"删除扫描规则 [names]","formatEN":"delete clam [names]"}
+func (b *BaseApi) DeleteClam(c *gin.Context) {
+	var req dto.ClamDelete
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.Delete(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Clam
+// @Summary Handle clam scan
+// @Accept json
+// @Param request body dto.OperateByID true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/clam/handle [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":true,"db":"clams","output_column":"name","output_value":"name"}],"formatZH":"执行病毒扫描 [name]","formatEN":"handle clam scan [name]"}
+func (b *BaseApi) HandleClamScan(c *gin.Context) {
+	var req dto.OperateByID
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := clamService.HandleOnce(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/command.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags Command
 // @Summary Create command
-// @Description 创建快速命令
 // @Accept json
 // @Param request body dto.CommandOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command [post]
 // @x-panel-log {"bodyKeys":["name","command"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建快捷命令 [name][command]","formatEN":"create quick command [name][command]"}
 func (b *BaseApi) CreateCommand(c *gin.Context) {
@@ -29,13 +29,35 @@ func (b *BaseApi) CreateCommand(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Redis Command
+// @Summary Save redis command
+// @Accept json
+// @Param request body dto.RedisCommand true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/command/redis [post]
+// @x-panel-log {"bodyKeys":["name","command"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"保存 redis 快捷命令 [name][command]","formatEN":"save quick command for redis [name][command]"}
+func (b *BaseApi) SaveRedisCommand(c *gin.Context) {
+	var req dto.RedisCommand
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := commandService.SaveRedisCommand(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Command
 // @Summary Page commands
-// @Description 获取快速命令列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command/search [post]
 func (b *BaseApi) SearchCommand(c *gin.Context) {
 	var req dto.SearchCommandWithPage
@@ -55,12 +77,38 @@ func (b *BaseApi) SearchCommand(c *gin.Context) {
 	})
 }
 
+// @Tags Redis Command
+// @Summary Page redis commands
+// @Accept json
+// @Param request body dto.SearchWithPage true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/command/redis/search [post]
+func (b *BaseApi) SearchRedisCommand(c *gin.Context) {
+	var req dto.SearchWithPage
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := commandService.SearchRedisCommandWithPage(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
 // @Tags Command
 // @Summary Tree commands
-// @Description 获取快速命令树
 // @Accept json
 // @Success 200 {Array} dto.CommandTree
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command/tree [get]
 func (b *BaseApi) SearchCommandTree(c *gin.Context) {
 	list, err := commandService.SearchForTree()
@@ -72,11 +120,27 @@ func (b *BaseApi) SearchCommandTree(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }
 
+// @Tags Redis Command
+// @Summary List redis commands
+// @Success 200 {Array} dto.RedisCommand
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/command/redis [get]
+func (b *BaseApi) ListRedisCommand(c *gin.Context) {
+	list, err := commandService.ListRedisCommand()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, list)
+}
+
 // @Tags Command
 // @Summary List commands
-// @Description 获取快速命令列表
 // @Success 200 {object} dto.CommandInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command [get]
 func (b *BaseApi) ListCommand(c *gin.Context) {
 	list, err := commandService.List()
@@ -90,11 +154,11 @@ func (b *BaseApi) ListCommand(c *gin.Context) {
 
 // @Tags Command
 // @Summary Delete command
-// @Description 删除快速命令
 // @Accept json
 // @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"commands","output_column":"name","output_value":"names"}],"formatZH":"删除快捷命令 [names]","formatEN":"delete quick command [names]"}
 func (b *BaseApi) DeleteCommand(c *gin.Context) {
@@ -110,13 +174,35 @@ func (b *BaseApi) DeleteCommand(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Redis Command
+// @Summary Delete redis command
+// @Accept json
+// @Param request body dto.BatchDeleteReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/command/redis/del [post]
+// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"redis_commands","output_column":"name","output_value":"names"}],"formatZH":"删除 redis 快捷命令 [names]","formatEN":"delete quick command of redis [names]"}
+func (b *BaseApi) DeleteRedisCommand(c *gin.Context) {
+	var req dto.BatchDeleteReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := commandService.DeleteRedisCommand(req.Ids); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Command
 // @Summary Update command
-// @Description 更新快速命令
 // @Accept json
 // @Param request body dto.CommandOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/command/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新快捷命令 [name]","formatEN":"update quick command [name]"}
 func (b *BaseApi) UpdateCommand(c *gin.Context) {

backend/app/api/v1/compose_template.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags Container Compose-template
 // @Summary Create compose template
-// @Description 创建容器编排模版
 // @Accept json
 // @Param request body dto.ComposeTemplateCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose 模版 [name]","formatEN":"create compose template [name]"}
 func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
@@ -31,12 +31,12 @@ func (b *BaseApi) CreateComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary Page compose templates
-// @Description 获取容器编排模版列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/search [post]
 func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -58,10 +58,10 @@ func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary List compose templates
-// @Description 获取容器编排模版列表
 // @Produce json
 // @Success 200 {array} dto.ComposeTemplateInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template [get]
 func (b *BaseApi) ListComposeTemplate(c *gin.Context) {
 	list, err := composeTemplateService.List()
@@ -75,11 +75,11 @@ func (b *BaseApi) ListComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary Delete compose template
-// @Description 删除容器编排模版
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"compose_templates","output_column":"name","output_value":"names"}],"formatZH":"删除 compose 模版 [names]","formatEN":"delete compose template [names]"}
 func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
@@ -97,11 +97,11 @@ func (b *BaseApi) DeleteComposeTemplate(c *gin.Context) {
 
 // @Tags Container Compose-template
 // @Summary Update compose template
-// @Description 更新容器编排模版
 // @Accept json
 // @Param request body dto.ComposeTemplateUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/template/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"compose_templates","output_column":"name","output_value":"name"}],"formatZH":"更新 compose 模版 [name]","formatEN":"update compose template information [name]"}
 func (b *BaseApi) UpdateComposeTemplate(c *gin.Context) {

backend/app/api/v1/container.go

@@ -7,16 +7,17 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
+	"strconv"
 )
 
 // @Tags Container
 // @Summary Page containers
-// @Description 获取容器列表分页
 // @Accept json
 // @Param request body dto.PageContainer true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/search [post]
 func (b *BaseApi) SearchContainer(c *gin.Context) {
 	var req dto.PageContainer
@@ -37,11 +38,11 @@ func (b *BaseApi) SearchContainer(c *gin.Context) {
 
 // @Tags Container
 // @Summary List containers
-// @Description 获取容器名称
 // @Accept json
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/list [post]
 func (b *BaseApi) ListContainer(c *gin.Context) {
 	list, err := containerService.List()
@@ -54,11 +55,11 @@ func (b *BaseApi) ListContainer(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Page composes
-// @Description 获取编排列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/search [post]
 func (b *BaseApi) SearchCompose(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -79,11 +80,11 @@ func (b *BaseApi) SearchCompose(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Test compose
-// @Description 测试 compose 是否可用
 // @Accept json
 // @Param request body dto.ComposeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/test [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测 compose [name] 格式","formatEN":"check compose [name]"}
 func (b *BaseApi) TestCompose(c *gin.Context) {
@@ -102,11 +103,11 @@ func (b *BaseApi) TestCompose(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Create compose
-// @Description 创建容器编排
 // @Accept json
 // @Param request body dto.ComposeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 compose [name]","formatEN":"create compose [name]"}
 func (b *BaseApi) CreateCompose(c *gin.Context) {
@@ -125,11 +126,11 @@ func (b *BaseApi) CreateCompose(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Operate compose
-// @Description 容器编排操作
 // @Accept json
 // @Param request body dto.ComposeOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/operate [post]
 // @x-panel-log {"bodyKeys":["name","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"compose [operation] [name]","formatEN":"compose [operation] [name]"}
 func (b *BaseApi) OperatorCompose(c *gin.Context) {
@@ -147,11 +148,11 @@ func (b *BaseApi) OperatorCompose(c *gin.Context) {
 
 // @Tags Container
 // @Summary Update container
-// @Description 更新容器
 // @Accept json
 // @Param request body dto.ContainerOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/update [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器 [name][image]","formatEN":"update container [name][image]"}
 func (b *BaseApi) ContainerUpdate(c *gin.Context) {
@@ -169,11 +170,11 @@ func (b *BaseApi) ContainerUpdate(c *gin.Context) {
 
 // @Tags Container
 // @Summary Load container info
-// @Description 获取容器表单信息
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.ContainerOperate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/info [post]
 func (b *BaseApi) ContainerInfo(c *gin.Context) {
 	var req dto.OperationWithName
@@ -190,9 +191,9 @@ func (b *BaseApi) ContainerInfo(c *gin.Context) {
 }
 
 // @Summary Load container limits
-// @Description 获取容器限制
 // @Success 200 {object} dto.ResourceLimit
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/limit [get]
 func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
 	data, err := containerService.LoadResourceLimit()
@@ -204,9 +205,9 @@ func (b *BaseApi) LoadResourceLimit(c *gin.Context) {
 }
 
 // @Summary Load container stats
-// @Description 获取容器列表资源占用
 // @Success 200 {array} dto.ContainerListStats
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/list/stats [get]
 func (b *BaseApi) ContainerListStats(c *gin.Context) {
 	data, err := containerService.ContainerListStats()
@@ -219,11 +220,11 @@ func (b *BaseApi) ContainerListStats(c *gin.Context) {
 
 // @Tags Container
 // @Summary Create container
-// @Description 创建容器
 // @Accept json
 // @Param request body dto.ContainerOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器 [name][image]","formatEN":"create container [name][image]"}
 func (b *BaseApi) ContainerCreate(c *gin.Context) {
@@ -241,11 +242,11 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 
 // @Tags Container
 // @Summary Upgrade container
-// @Description 更新容器镜像
 // @Accept json
 // @Param request body dto.ContainerUpgrade true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/upgrade [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
 func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
@@ -263,11 +264,11 @@ func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
 
 // @Tags Container
 // @Summary Clean container
-// @Description 容器清理
 // @Accept json
 // @Param request body dto.ContainerPrune true "request"
 // @Success 200 {object} dto.ContainerPruneReport
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/prune [post]
 // @x-panel-log {"bodyKeys":["pruneType"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [pruneType]","formatEN":"clean container [pruneType]"}
 func (b *BaseApi) ContainerPrune(c *gin.Context) {
@@ -286,11 +287,11 @@ func (b *BaseApi) ContainerPrune(c *gin.Context) {
 
 // @Tags Container
 // @Summary Clean container log
-// @Description 清理容器日志
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/clean/log [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理容器 [name] 日志","formatEN":"clean container [name] logs"}
 func (b *BaseApi) CleanContainerLog(c *gin.Context) {
@@ -308,11 +309,11 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 
 // @Tags Container
 // @Summary Load container log
-// @Description 获取容器操作日志
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/load/log [post]
 func (b *BaseApi) LoadContainerLog(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -326,11 +327,11 @@ func (b *BaseApi) LoadContainerLog(c *gin.Context) {
 
 // @Tags Container
 // @Summary Rename Container
-// @Description 容器重命名
 // @Accept json
 // @Param request body dto.ContainerRename true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/rename [post]
 // @x-panel-log {"bodyKeys":["name","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器重命名 [name] => [newName]","formatEN":"rename container [name] => [newName]"}
 func (b *BaseApi) ContainerRename(c *gin.Context) {
@@ -346,13 +347,32 @@ func (b *BaseApi) ContainerRename(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Container
+// @Summary Commit Container
+// @Accept json
+// @Param request body dto.ContainerCommit true "request"
+// @Success 200
+// @Router /containers/commit [post]
+func (b *BaseApi) ContainerCommit(c *gin.Context) {
+	var req dto.ContainerCommit
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := containerService.ContainerCommit(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Container
 // @Summary Operate Container
-// @Description 容器操作
 // @Accept json
 // @Param request body dto.ContainerOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/operate [post]
 // @x-panel-log {"bodyKeys":["names","operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"容器 [names] 执行 [operation]","formatEN":"container [operation] [names]"}
 func (b *BaseApi) ContainerOperation(c *gin.Context) {
@@ -370,10 +390,10 @@ func (b *BaseApi) ContainerOperation(c *gin.Context) {
 
 // @Tags Container
 // @Summary Container stats
-// @Description 容器监控信息
-// @Param id path integer true "容器id"
+// @Param id path integer true "container id"
 // @Success 200 {object} dto.ContainerStats
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/stats/:id [get]
 func (b *BaseApi) ContainerStats(c *gin.Context) {
 	containerID, ok := c.Params.Get("id")
@@ -392,11 +412,11 @@ func (b *BaseApi) ContainerStats(c *gin.Context) {
 
 // @Tags Container
 // @Summary Container inspect
-// @Description 容器详情
 // @Accept json
 // @Param request body dto.InspectReq true "request"
 // @Success 200 {string} result
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/inspect [post]
 func (b *BaseApi) Inspect(c *gin.Context) {
 	var req dto.InspectReq
@@ -414,12 +434,12 @@ func (b *BaseApi) Inspect(c *gin.Context) {
 
 // @Tags Container
 // @Summary Container logs
-// @Description 容器日志
-// @Param container query string false "容器名称"
-// @Param since query string false "时间筛选"
-// @Param follow query string false "是否追踪"
-// @Param tail query string false "显示行号"
+// @Param container query string false "container name"
+// @Param since query string false "since"
+// @Param follow query string false "follow"
+// @Param tail query string false "tail"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/search/log [post]
 func (b *BaseApi) ContainerLogs(c *gin.Context) {
 	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
@@ -440,14 +460,32 @@ func (b *BaseApi) ContainerLogs(c *gin.Context) {
 	}
 }
 
+// @Tags Container
+// @Summary Download Container logs
+// @Accept json
+// @Param request body dto.ContainerLog true "request"
+// @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)), c)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+	}
+}
+
 // @Tags Container Network
 // @Summary Page networks
-// @Description 获取容器网络列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network/search [post]
 func (b *BaseApi) SearchNetwork(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -468,11 +506,11 @@ func (b *BaseApi) SearchNetwork(c *gin.Context) {
 
 // @Tags Container Network
 // @Summary List networks
-// @Description 获取容器网络列表
 // @Accept json
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network [get]
 func (b *BaseApi) ListNetwork(c *gin.Context) {
 	list, err := containerService.ListNetwork()
@@ -485,11 +523,11 @@ func (b *BaseApi) ListNetwork(c *gin.Context) {
 
 // @Tags Container Network
 // @Summary Delete network
-// @Description 删除容器网络
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network/del [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器网络 [names]","formatEN":"delete container network [names]"}
 func (b *BaseApi) DeleteNetwork(c *gin.Context) {
@@ -507,11 +545,11 @@ func (b *BaseApi) DeleteNetwork(c *gin.Context) {
 
 // @Tags Container Network
 // @Summary Create network
-// @Description 创建容器网络
 // @Accept json
 // @Param request body dto.NetworkCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/network [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器网络 name","formatEN":"create container network [name]"}
 func (b *BaseApi) CreateNetwork(c *gin.Context) {
@@ -528,13 +566,13 @@ func (b *BaseApi) CreateNetwork(c *gin.Context) {
 }
 
 // @Tags Container Volume
-// @Summary Page volumes
-// @Description 获取容器存储卷分页
+// @Summary Page Container Volumes
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume/search [post]
 func (b *BaseApi) SearchVolume(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -554,12 +592,12 @@ func (b *BaseApi) SearchVolume(c *gin.Context) {
 }
 
 // @Tags Container Volume
-// @Summary List volumes
-// @Description 获取容器存储卷列表
+// @Summary List Container Volumes
 // @Accept json
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume [get]
 func (b *BaseApi) ListVolume(c *gin.Context) {
 	list, err := containerService.ListVolume()
@@ -571,12 +609,12 @@ func (b *BaseApi) ListVolume(c *gin.Context) {
 }
 
 // @Tags Container Volume
-// @Summary Delete volume
-// @Description 删除容器存储卷
+// @Summary Delete Container Volume
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume/del [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除容器存储卷 [names]","formatEN":"delete container volume [names]"}
 func (b *BaseApi) DeleteVolume(c *gin.Context) {
@@ -593,12 +631,12 @@ func (b *BaseApi) DeleteVolume(c *gin.Context) {
 }
 
 // @Tags Container Volume
-// @Summary Create volume
-// @Description 创建容器存储卷
+// @Summary Create Container Volume
 // @Accept json
 // @Param request body dto.VolumeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/volume [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建容器存储卷 [name]","formatEN":"create container volume [name]"}
 func (b *BaseApi) CreateVolume(c *gin.Context) {
@@ -615,12 +653,12 @@ func (b *BaseApi) CreateVolume(c *gin.Context) {
 }
 
 // @Tags Container Compose
-// @Summary Update compose
-// @Description 更新容器编排
+// @Summary Update Container Compose
 // @Accept json
 // @Param request body dto.ComposeUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 compose [name]","formatEN":"update compose information [name]"}
 func (b *BaseApi) ComposeUpdate(c *gin.Context) {
@@ -638,12 +676,12 @@ func (b *BaseApi) ComposeUpdate(c *gin.Context) {
 
 // @Tags Container Compose
 // @Summary Container Compose logs
-// @Description docker-compose 日志
-// @Param compose query string false "compose 文件地址"
-// @Param since query string false "时间筛选"
-// @Param follow query string false "是否追踪"
-// @Param tail query string false "显示行号"
+// @Param compose query string false "compose file address"
+// @Param since query string false "date"
+// @Param follow query string false "follow"
+// @Param tail query string false "tail"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/compose/search/log [get]
 func (b *BaseApi) ComposeLogs(c *gin.Context) {
 	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)

backend/app/api/v1/cronjob.go

@@ -12,11 +12,11 @@ import (
 
 // @Tags Cronjob
 // @Summary Create cronjob
-// @Description 创建计划任务
 // @Accept json
 // @Param request body dto.CronjobCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs [post]
 // @x-panel-log {"bodyKeys":["type","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建计划任务 [type][name]","formatEN":"create cronjob [type][name]"}
 func (b *BaseApi) CreateCronjob(c *gin.Context) {
@@ -34,14 +34,14 @@ func (b *BaseApi) CreateCronjob(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Page cronjobs
-// @Description 获取计划任务分页
 // @Accept json
-// @Param request body dto.SearchWithPage true "request"
+// @Param request body dto.PageCronjob true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/search [post]
 func (b *BaseApi) SearchCronjob(c *gin.Context) {
-	var req dto.SearchWithPage
+	var req dto.PageCronjob
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -60,11 +60,11 @@ func (b *BaseApi) SearchCronjob(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Page job records
-// @Description 获取计划任务记录
 // @Accept json
 // @Param request body dto.SearchRecord true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/search/records [post]
 func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 	var req dto.SearchRecord
@@ -72,7 +72,7 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZone())
+	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 
@@ -90,11 +90,11 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Load Cronjob record log
-// @Description 获取计划任务记录日志
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/records/log [post]
 func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 	var req dto.OperateByID
@@ -107,11 +107,11 @@ func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Clean job records
-// @Description 清空计划任务记录
 // @Accept json
 // @Param request body dto.CronjobClean true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/records/clean [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"清空计划任务记录 [name]","formatEN":"clean cronjob [name] records"}
 func (b *BaseApi) CleanRecord(c *gin.Context) {
@@ -130,11 +130,11 @@ func (b *BaseApi) CleanRecord(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Delete cronjob
-// @Description 删除计划任务
 // @Accept json
 // @Param request body dto.CronjobBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"cronjobs","output_column":"name","output_value":"names"}],"formatZH":"删除计划任务 [names]","formatEN":"delete cronjob [names]"}
 func (b *BaseApi) DeleteCronjob(c *gin.Context) {
@@ -152,11 +152,11 @@ func (b *BaseApi) DeleteCronjob(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Update cronjob
-// @Description 更新计划任务
 // @Accept json
 // @Param request body dto.CronjobUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"更新计划任务 [name]","formatEN":"update cronjob [name]"}
 func (b *BaseApi) UpdateCronjob(c *gin.Context) {
@@ -174,11 +174,11 @@ func (b *BaseApi) UpdateCronjob(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Update cronjob status
-// @Description 更新计划任务状态
 // @Accept json
 // @Param request body dto.CronjobUpdateStatus true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/status [post]
 // @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"修改计划任务 [name] 状态为 [status]","formatEN":"change the status of cronjob [name] to [status]."}
 func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
@@ -196,11 +196,11 @@ func (b *BaseApi) UpdateCronjobStatus(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Download cronjob records
-// @Description 下载计划任务记录
 // @Accept json
 // @Param request body dto.CronjobDownload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/download [post]
 // @x-panel-log {"bodyKeys":["recordID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"recordID","isList":false,"db":"job_records","output_column":"file","output_value":"file"}],"formatZH":"下载计划任务记录 [file]","formatEN":"download the cronjob record [file]"}
 func (b *BaseApi) TargetDownload(c *gin.Context) {
@@ -220,11 +220,11 @@ func (b *BaseApi) TargetDownload(c *gin.Context) {
 
 // @Tags Cronjob
 // @Summary Handle cronjob once
-// @Description 手动执行计划任务
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /cronjobs/handle [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"cronjobs","output_column":"name","output_value":"name"}],"formatZH":"手动执行计划任务 [name]","formatEN":"manually execute the cronjob [name]"}
 func (b *BaseApi) HandleOnce(c *gin.Context) {

backend/app/api/v1/dashboard.go

@@ -3,6 +3,8 @@ package v1
 import (
 	"errors"
 
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/gin-gonic/gin"
@@ -10,10 +12,10 @@ import (
 
 // @Tags Dashboard
 // @Summary Load os info
-// @Description 获取服务器基础数据
 // @Accept json
 // @Success 200 {object} dto.OsInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /dashboard/base/os [get]
 func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
 	data, err := dashboardService.LoadOsInfo()
@@ -26,12 +28,12 @@ func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
 
 // @Tags Dashboard
 // @Summary Load dashboard base info
-// @Description 获取首页基础数据
 // @Accept json
 // @Param ioOption path string true "request"
 // @Param netOption path string true "request"
 // @Success 200 {object} dto.DashboardBase
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /dashboard/base/:ioOption/:netOption [get]
 func (b *BaseApi) LoadDashboardBaseInfo(c *gin.Context) {
 	ioOption, ok := c.Params.Get("ioOption")
@@ -54,36 +56,28 @@ func (b *BaseApi) LoadDashboardBaseInfo(c *gin.Context) {
 
 // @Tags Dashboard
 // @Summary Load dashboard current info
-// @Description 获取首页实时数据
 // @Accept json
-// @Param ioOption path string true "request"
-// @Param netOption path string true "request"
+// @Param request body dto.DashboardReq true "request"
 // @Success 200 {object} dto.DashboardCurrent
 // @Security ApiKeyAuth
-// @Router /dashboard/current/:ioOption/:netOption [get]
+// @Security Timestamp
+// @Router /dashboard/current [post]
 func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
-	ioOption, ok := c.Params.Get("ioOption")
-	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error ioOption in path"))
+	var req dto.DashboardReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	netOption, ok := c.Params.Get("netOption")
-	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error netOption in path"))
-		return
-	}
-
-	data := dashboardService.LoadCurrentInfo(ioOption, netOption)
+	data := dashboardService.LoadCurrentInfo(req)
 	helper.SuccessWithData(c, data)
 }
 
 // @Tags Dashboard
-// @Summary System restart
-// @Description 重启服务器/面板
+// @Summary System restart panel
 // @Accept json
 // @Param operation path string true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /dashboard/system/restart/:operation [post]
 func (b *BaseApi) SystemRestart(c *gin.Context) {
 	operation, ok := c.Params.Get("operation")

backend/app/api/v1/database.go

@@ -11,11 +11,11 @@ import (
 
 // @Tags Database
 // @Summary Create database
-// @Description 创建远程数据库
 // @Accept json
 // @Param request body dto.DatabaseCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db [post]
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建远程数据库 [name][type]","formatEN":"create database [name][type]"}
 func (b *BaseApi) CreateDatabase(c *gin.Context) {
@@ -41,11 +41,11 @@ func (b *BaseApi) CreateDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Check database
-// @Description 检测远程数据库连接性
 // @Accept json
 // @Param request body dto.DatabaseCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/check [post]
 // @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"检测远程数据库 [name][type] 连接性","formatEN":"check if database [name][type] is connectable"}
 func (b *BaseApi) CheckDatabase(c *gin.Context) {
@@ -67,11 +67,11 @@ func (b *BaseApi) CheckDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Page databases
-// @Description 获取远程数据库列表分页
 // @Accept json
 // @Param request body dto.DatabaseSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/search [post]
 func (b *BaseApi) SearchDatabase(c *gin.Context) {
 	var req dto.DatabaseSearch
@@ -93,9 +93,9 @@ func (b *BaseApi) SearchDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary List databases
-// @Description 获取远程数据库列表
 // @Success 200 {array} dto.DatabaseOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/list/:type [get]
 func (b *BaseApi) ListDatabase(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
@@ -113,10 +113,10 @@ func (b *BaseApi) ListDatabase(c *gin.Context) {
 }
 
 // @Tags Database
-// @Summary List databases
-// @Description 获取数据库列表
+// @Summary Retrieve database list based on type
 // @Success 200 {array} dto.DatabaseItem
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/item/:type [get]
 func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 	dbType, err := helper.GetStrParamByKey(c, "type")
@@ -135,9 +135,9 @@ func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
 
 // @Tags Database
 // @Summary Get databases
-// @Description 获取远程数据库
 // @Success 200 {object} dto.DatabaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/:name [get]
 func (b *BaseApi) GetDatabase(c *gin.Context) {
 	name, err := helper.GetStrParamByKey(c, "name")
@@ -156,11 +156,11 @@ func (b *BaseApi) GetDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Check before delete remote database
-// @Description Mysql 远程数据库删除前检查
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /db/remote/del/check [post]
 func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 	var req dto.OperateByID
@@ -178,11 +178,11 @@ func (b *BaseApi) DeleteCheckDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Delete database
-// @Description 删除远程数据库
 // @Accept json
 // @Param request body dto.DatabaseDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"databases","output_column":"name","output_value":"names"}],"formatZH":"删除远程数据库 [names]","formatEN":"delete database [names]"}
 func (b *BaseApi) DeleteDatabase(c *gin.Context) {
@@ -200,11 +200,11 @@ func (b *BaseApi) DeleteDatabase(c *gin.Context) {
 
 // @Tags Database
 // @Summary Update database
-// @Description 更新远程数据库
 // @Accept json
 // @Param request body dto.DatabaseUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/db/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新远程数据库 [name]","formatEN":"update database [name]"}
 func (b *BaseApi) UpdateDatabase(c *gin.Context) {

backend/app/api/v1/database_common.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags Database Common
 // @Summary Load base info
-// @Description 获取数据库基础信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.DBBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/info [post]
 func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -32,11 +32,11 @@ func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
 
 // @Tags Database Common
 // @Summary Load Database conf
-// @Description 获取数据库配置文件
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/load/file [post]
 func (b *BaseApi) LoadDBFile(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -53,11 +53,11 @@ func (b *BaseApi) LoadDBFile(c *gin.Context) {
 
 // @Tags Database Common
 // @Summary Update conf by upload file
-// @Description 上传替换配置文件
 // @Accept json
 // @Param request body dto.DBConfUpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/common/update/conf [post]
 // @x-panel-log {"bodyKeys":["type","database"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 [type] 数据库 [database] 配置信息","formatEN":"update the [type] [database] database configuration information"}
 func (b *BaseApi) UpdateDBConfByFile(c *gin.Context) {

backend/app/api/v1/database_mysql.go

@@ -12,11 +12,11 @@ import (
 
 // @Tags Database Mysql
 // @Summary Create mysql database
-// @Description 创建 mysql 数据库
 // @Accept json
 // @Param request body dto.MysqlDBCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 mysql 数据库 [name]","formatEN":"create mysql database [name]"}
 func (b *BaseApi) CreateMysql(c *gin.Context) {
@@ -43,11 +43,11 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Bind user of mysql database
-// @Description 绑定 mysql 数据库用户
 // @Accept json
 // @Param request body dto.BindUser true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/bind [post]
 // @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 mysql 数据库名 [database] [username]","formatEN":"bind mysql database [database] [username]"}
 func (b *BaseApi) BindUser(c *gin.Context) {
@@ -74,11 +74,11 @@ func (b *BaseApi) BindUser(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Update mysql database description
-// @Description 更新 mysql 数据库库描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/description/update [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"mysql 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the mysql database [name] is modified => [description]"}
 func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
@@ -96,11 +96,11 @@ func (b *BaseApi) UpdateMysqlDescription(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Change mysql password
-// @Description 修改 mysql 密码
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/change/password [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
@@ -127,11 +127,11 @@ func (b *BaseApi) ChangeMysqlPassword(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Change mysql access
-// @Description 修改 mysql 访问权限
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/change/access [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 访问权限","formatEN":"Update database [name] access"}
 func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
@@ -149,11 +149,11 @@ func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Update mysql variables
-// @Description mysql 性能调优
 // @Accept json
 // @Param request body dto.MysqlVariablesUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/variables/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"调整 mysql 数据库性能参数","formatEN":"adjust mysql database performance parameters"}
 func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
@@ -171,11 +171,11 @@ func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Page mysql databases
-// @Description 获取 mysql 数据库列表分页
 // @Accept json
 // @Param request body dto.MysqlDBSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/search [post]
 func (b *BaseApi) SearchMysql(c *gin.Context) {
 	var req dto.MysqlDBSearch
@@ -197,11 +197,11 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary List mysql database names
-// @Description 获取 mysql 数据库列表
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {array} dto.MysqlOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/options [get]
 func (b *BaseApi) ListDBName(c *gin.Context) {
 	list, err := mysqlService.ListDBOption()
@@ -215,10 +215,10 @@ func (b *BaseApi) ListDBName(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql database from remote
-// @Description 从服务器获取
 // @Accept json
 // @Param request body dto.MysqlLoadDB true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/load [post]
 func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 	var req dto.MysqlLoadDB
@@ -236,11 +236,11 @@ func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Check before delete mysql database
-// @Description Mysql 数据库删除前检查
 // @Accept json
 // @Param request body dto.MysqlDBDeleteCheck true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/del/check [post]
 func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 	var req dto.MysqlDBDeleteCheck
@@ -258,11 +258,11 @@ func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Delete mysql database
-// @Description 删除 mysql 数据库
 // @Accept json
 // @Param request body dto.MysqlDBDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_mysqls","output_column":"name","output_value":"name"}],"formatZH":"删除 mysql 数据库 [name]","formatEN":"delete mysql database [name]"}
 func (b *BaseApi) DeleteMysql(c *gin.Context) {
@@ -283,11 +283,11 @@ func (b *BaseApi) DeleteMysql(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql remote access
-// @Description 获取 mysql 远程访问权限
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {boolean} isRemote
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/remote [post]
 func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -305,11 +305,11 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql status info
-// @Description 获取 mysql 状态信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/status [post]
 func (b *BaseApi) LoadStatus(c *gin.Context) {
 	var req dto.OperationWithNameAndType
@@ -328,11 +328,11 @@ func (b *BaseApi) LoadStatus(c *gin.Context) {
 
 // @Tags Database Mysql
 // @Summary Load mysql variables info
-// @Description 获取 mysql 性能参数信息
 // @Accept json
 // @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlVariables
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/variables [post]
 func (b *BaseApi) LoadVariables(c *gin.Context) {
 	var req dto.OperationWithNameAndType

backend/app/api/v1/database_postgresql.go

@@ -12,11 +12,11 @@ import (
 
 // @Tags Database Postgresql
 // @Summary Create postgresql database
-// @Description 创建 postgresql 数据库
 // @Accept json
 // @Param request body dto.PostgresqlDBCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 postgresql 数据库 [name]","formatEN":"create postgresql database [name]"}
 func (b *BaseApi) CreatePostgresql(c *gin.Context) {
@@ -43,11 +43,11 @@ func (b *BaseApi) CreatePostgresql(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Bind postgresql user
-// @Description 绑定 postgresql 数据库用户
 // @Accept json
 // @Param request body dto.PostgresqlBindUser true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/bind [post]
 // @x-panel-log {"bodyKeys":["name", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 postgresql 数据库 [name] 用户 [username]","formatEN":"bind postgresql database [name] user [username]"}
 func (b *BaseApi) BindPostgresqlUser(c *gin.Context) {
@@ -65,11 +65,11 @@ func (b *BaseApi) BindPostgresqlUser(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Update postgresql database description
-// @Description 更新 postgresql 数据库库描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/description [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"postgresql 数据库 [name] 描述信息修改 [description]","formatEN":"The description of the postgresql database [name] is modified => [description]"}
 func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
@@ -87,11 +87,11 @@ func (b *BaseApi) UpdatePostgresqlDescription(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Change postgresql privileges
-// @Description 修改 postgresql 用户权限
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/privileges [post]
 // @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新数据库 [database] 用户 [username] 权限","formatEN":"Update [user] privileges of database [database]"}
 func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
@@ -109,11 +109,11 @@ func (b *BaseApi) ChangePostgresqlPrivileges(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Change postgresql password
-// @Description 修改 postgresql 密码
 // @Accept json
 // @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/password [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"更新数据库 [name] 密码","formatEN":"Update database [name] password"}
 func (b *BaseApi) ChangePostgresqlPassword(c *gin.Context) {
@@ -140,11 +140,11 @@ func (b *BaseApi) ChangePostgresqlPassword(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Page postgresql databases
-// @Description 获取 postgresql 数据库列表分页
 // @Accept json
 // @Param request body dto.PostgresqlDBSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/search [post]
 func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 	var req dto.PostgresqlDBSearch
@@ -166,10 +166,10 @@ func (b *BaseApi) SearchPostgresql(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Load postgresql database from remote
-// @Description 从服务器获取
 // @Accept json
 // @Param request body dto.PostgresqlLoadDB true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/:database/load [post]
 func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
 	database, err := helper.GetStrParamByKey(c, "database")
@@ -188,11 +188,11 @@ func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Check before delete postgresql database
-// @Description Postgresql 数据库删除前检查
 // @Accept json
 // @Param request body dto.PostgresqlDBDeleteCheck true "request"
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/del/check [post]
 func (b *BaseApi) DeleteCheckPostgresql(c *gin.Context) {
 	var req dto.PostgresqlDBDeleteCheck
@@ -210,11 +210,11 @@ func (b *BaseApi) DeleteCheckPostgresql(c *gin.Context) {
 
 // @Tags Database Postgresql
 // @Summary Delete postgresql database
-// @Description 删除 postgresql 数据库
 // @Accept json
 // @Param request body dto.PostgresqlDBDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/pg/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"database_postgresqls","output_column":"name","output_value":"name"}],"formatZH":"删除 postgresql 数据库 [name]","formatEN":"delete postgresql database [name]"}
 func (b *BaseApi) DeletePostgresql(c *gin.Context) {

backend/app/api/v1/database_redis.go

@@ -11,12 +11,18 @@ import (
 
 // @Tags Database Redis
 // @Summary Load redis status info
-// @Description 获取 redis 状态信息
+// @Accept json
+// @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.RedisStatus
 // @Security ApiKeyAuth
-// @Router /databases/redis/status [get]
+// @Security Timestamp
+// @Router /databases/redis/status [post]
 func (b *BaseApi) LoadRedisStatus(c *gin.Context) {
-	data, err := redisService.LoadStatus()
+	var req dto.OperationWithName
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+	data, err := redisService.LoadStatus(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -27,12 +33,18 @@ func (b *BaseApi) LoadRedisStatus(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Load redis conf
-// @Description 获取 redis 配置信息
+// @Accept json
+// @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.RedisConf
 // @Security ApiKeyAuth
-// @Router /databases/redis/conf [get]
+// @Security Timestamp
+// @Router /databases/redis/conf [post]
 func (b *BaseApi) LoadRedisConf(c *gin.Context) {
-	data, err := redisService.LoadConf()
+	var req dto.OperationWithName
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+	data, err := redisService.LoadConf(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -43,12 +55,18 @@ func (b *BaseApi) LoadRedisConf(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Load redis persistence conf
-// @Description 获取 redis 持久化配置
+// @Accept json
+// @Param request body dto.OperationWithName true "request"
 // @Success 200 {object} dto.RedisPersistence
 // @Security ApiKeyAuth
-// @Router /databases/redis/persistence/conf [get]
+// @Security Timestamp
+// @Router /databases/redis/persistence/conf [post]
 func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
-	data, err := redisService.LoadPersistenceConf()
+	var req dto.OperationWithName
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+	data, err := redisService.LoadPersistenceConf(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -57,13 +75,32 @@ func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
+func (b *BaseApi) CheckHasCli(c *gin.Context) {
+	helper.SuccessWithData(c, redisService.CheckHasCli())
+}
+
+// @Tags Database Redis
+// @Summary Install redis-cli
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /databases/redis/install/cli [post]
+func (b *BaseApi) InstallCli(c *gin.Context) {
+	if err := redisService.InstallCli(); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithOutData(c)
+}
+
 // @Tags Database Redis
 // @Summary Update redis conf
-// @Description 更新 redis 配置信息
 // @Accept json
 // @Param request body dto.RedisConfUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/conf/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 redis 数据库配置信息","formatEN":"update the redis database configuration information"}
 func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
@@ -81,11 +118,11 @@ func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Change redis password
-// @Description 更新 redis 密码
 // @Accept json
 // @Param request body dto.ChangeRedisPass true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/password [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 redis 数据库密码","formatEN":"change the password of the redis database"}
 func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
@@ -112,11 +149,11 @@ func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
 
 // @Tags Database Redis
 // @Summary Update redis persistence conf
-// @Description 更新 redis 持久化配置
 // @Accept json
 // @Param request body dto.RedisConfPersistenceUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /databases/redis/persistence/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"redis 数据库持久化配置更新","formatEN":"redis database persistence configuration update"}
 func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
@@ -131,29 +168,3 @@ func (b *BaseApi) UpdateRedisPersistenceConf(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, nil)
 }
-
-// @Tags Database Redis
-// @Summary Page redis backups
-// @Description 获取 redis 备份记录分页
-// @Accept json
-// @Param request body dto.PageInfo true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Router /databases/redis/backup/search [post]
-func (b *BaseApi) RedisBackupList(c *gin.Context) {
-	var req dto.PageInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := redisService.SearchBackupListWithPage(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}

backend/app/api/v1/device.go

@@ -11,9 +11,9 @@ import (
 
 // @Tags Device
 // @Summary Load device base info
-// @Description 获取设备基础信息
 // @Success 200 {object} dto.DeviceBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/base [post]
 func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 	data, err := deviceService.LoadBaseInfo()
@@ -27,10 +27,10 @@ func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
 
 // @Tags Device
 // @Summary list time zone options
-// @Description 获取系统可用时区选项
 // @Accept json
 // @Success 200 {Array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/zone/options [get]
 func (b *BaseApi) LoadTimeOption(c *gin.Context) {
 	list, err := deviceService.LoadTimeZone()
@@ -44,11 +44,11 @@ func (b *BaseApi) LoadTimeOption(c *gin.Context) {
 
 // @Tags Device
 // @Summary load conf
-// @Description 获取系统配置文件
 // @Accept json
 // @Param request body dto.OperationWithName true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/conf [post]
 func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
 	var req dto.OperationWithName
@@ -67,11 +67,11 @@ func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device conf by file
-// @Description 通过文件修改配置
 // @Accept json
 // @Param request body dto.UpdateByNameAndFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/byconf [post]
 func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
 	var req dto.UpdateByNameAndFile
@@ -88,11 +88,11 @@ func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device
-// @Description 修改系统参数
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/conf [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机参数 [key] => [value]","formatEN":"update device conf [key] => [value]"}
 func (b *BaseApi) UpdateDeviceConf(c *gin.Context) {
@@ -111,9 +111,9 @@ func (b *BaseApi) UpdateDeviceConf(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device hosts
-// @Description 修改系统 hosts
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/host [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改主机 Host [key] => [value]","formatEN":"update device host [key] => [value]"}
 func (b *BaseApi) UpdateDeviceHost(c *gin.Context) {
@@ -132,11 +132,11 @@ func (b *BaseApi) UpdateDeviceHost(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device passwd
-// @Description 修改系统密码
 // @Accept json
 // @Param request body dto.ChangePasswd true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/passwd [post]
 func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
 	var req dto.ChangePasswd
@@ -161,11 +161,11 @@ func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
 
 // @Tags Device
 // @Summary Update device swap
-// @Description 修改系统 Swap
 // @Accept json
 // @Param request body dto.SwapHelper true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/update/swap [post]
 // @x-panel-log {"bodyKeys":["operate","path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机 swap [path]","formatEN":"[operate] device swap [path]"}
 func (b *BaseApi) UpdateDeviceSwap(c *gin.Context) {
@@ -183,11 +183,11 @@ func (b *BaseApi) UpdateDeviceSwap(c *gin.Context) {
 
 // @Tags Device
 // @Summary Check device DNS conf
-// @Description 检查系统 DNS 配置可用性
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/device/check/dns [post]
 func (b *BaseApi) CheckDNS(c *gin.Context) {
 	var req dto.SettingUpdate
@@ -206,9 +206,9 @@ func (b *BaseApi) CheckDNS(c *gin.Context) {
 
 // @Tags Device
 // @Summary Scan system
-// @Description 扫描系统垃圾文件
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/scan [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
 func (b *BaseApi) ScanSystem(c *gin.Context) {
@@ -217,11 +217,11 @@ func (b *BaseApi) ScanSystem(c *gin.Context) {
 
 // @Tags Device
 // @Summary Clean system
-// @Description 清理系统垃圾文件
 // @Accept json
 // @Param request body []dto.Clean true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/clean [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
 func (b *BaseApi) SystemClean(c *gin.Context) {

backend/app/api/v1/docker.go

@@ -11,10 +11,10 @@ import (
 
 // @Tags Container Docker
 // @Summary Load docker status
-// @Description 获取 docker 服务状态
 // @Produce json
 // @Success 200 {string} status
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/docker/status [get]
 func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 	status := dockerService.LoadDockerStatus()
@@ -23,10 +23,10 @@ func (b *BaseApi) LoadDockerStatus(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Load docker daemon.json
-// @Description 获取 docker 配置信息(表单)
 // @Produce json
 // @Success 200 {object} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/file [get]
 func (b *BaseApi) LoadDaemonJsonFile(c *gin.Context) {
 	if _, err := os.Stat(constant.DaemonJsonPath); err != nil {
@@ -43,10 +43,10 @@ func (b *BaseApi) LoadDaemonJsonFile(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Load docker daemon.json
-// @Description 获取 docker 配置信息
 // @Produce json
 // @Success 200 {object} dto.DaemonJsonConf
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson [get]
 func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
 	conf := dockerService.LoadDockerConf()
@@ -55,11 +55,11 @@ func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json
-// @Description 修改 docker 配置信息
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/update [post]
 // @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置 [key]","formatEN":"Updated configuration [key]"}
 func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
@@ -78,11 +78,11 @@ func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json log option
-// @Description 修改 docker 日志配置
 // @Accept json
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/logoption/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新日志配置","formatEN":"Updated the log option"}
 func (b *BaseApi) UpdateLogOption(c *gin.Context) {
@@ -101,11 +101,11 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json ipv6 option
-// @Description 修改 docker ipv6 配置
 // @Accept json
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/ipv6option/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 ipv6 配置","formatEN":"Updated the ipv6 option"}
 func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
@@ -124,11 +124,11 @@ func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Update docker daemon.json by upload file
-// @Description 上传替换 docker 配置文件
 // @Accept json
 // @Param request body dto.DaemonJsonUpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/daemonjson/update/byfile [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置文件","formatEN":"Updated configuration file"}
 func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
@@ -147,11 +147,11 @@ func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 
 // @Tags Container Docker
 // @Summary Operate docker
-// @Description Docker 操作
 // @Accept json
 // @Param request body dto.DockerOperation true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/docker/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"docker 服务 [operation]","formatEN":"[operation] docker service"}
 func (b *BaseApi) OperateDocker(c *gin.Context) {

backend/app/api/v1/entry.go

@@ -37,6 +37,8 @@ var (
 
 	deviceService   = service.NewIDeviceService()
 	fail2banService = service.NewIFail2BanService()
+	ftpService      = service.NewIFtpService()
+	clamService     = service.NewIClamService()
 
 	settingService = service.NewISettingService()
 	backupService  = service.NewIBackupService()

backend/app/api/v1/fail2ban.go

@@ -11,9 +11,9 @@ import (
 
 // @Tags Fail2ban
 // @Summary Load fail2ban base info
-// @Description 获取 Fail2ban 基础信息
 // @Success 200 {object} dto.Fail2BanBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/base [get]
 func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
 	data, err := fail2banService.LoadBaseInfo()
@@ -27,11 +27,11 @@ func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Page fail2ban ip list
-// @Description 获取 Fail2ban ip
 // @Accept json
 // @Param request body dto.Fail2BanSearch true "request"
 // @Success 200 {Array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/search [post]
 func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
 	var req dto.Fail2BanSearch
@@ -50,10 +50,10 @@ func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Operate fail2ban
-// @Description 修改 Fail2ban 状态
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] Fail2ban","formatEN":"[operation] Fail2ban"}
 func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
@@ -72,10 +72,10 @@ func (b *BaseApi) OperateFail2Ban(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Operate sshd of fail2ban
-// @Description 配置 sshd
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/operate/sshd [post]
 func (b *BaseApi) OperateSSHD(c *gin.Context) {
 	var req dto.Fail2BanSet
@@ -93,11 +93,11 @@ func (b *BaseApi) OperateSSHD(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Update fail2ban conf
-// @Description 修改 Fail2ban 配置
 // @Accept json
 // @Param request body dto.Fail2BanUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/update [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 Fail2ban 配置 [key] => [value]","formatEN":"update fail2ban conf [key] => [value]"}
 func (b *BaseApi) UpdateFail2BanConf(c *gin.Context) {
@@ -115,10 +115,10 @@ func (b *BaseApi) UpdateFail2BanConf(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Load fail2ban conf
-// @Description 获取 fail2ban 配置文件
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/load/conf [get]
 func (b *BaseApi) LoadFail2BanConf(c *gin.Context) {
 	path := "/etc/fail2ban/jail.local"
@@ -133,11 +133,11 @@ func (b *BaseApi) LoadFail2BanConf(c *gin.Context) {
 
 // @Tags Fail2ban
 // @Summary Update fail2ban conf by file
-// @Description 通过文件修改 fail2ban 配置
 // @Accept json
 // @Param request body dto.UpdateByFile true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /toolbox/fail2ban/update/byconf [post]
 func (b *BaseApi) UpdateFail2BanConfByFile(c *gin.Context) {
 	var req dto.UpdateByFile

backend/app/api/v1/favorite.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags File
 // @Summary List favorites
-// @Description 获取收藏列表
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite/search [post]
 func (b *BaseApi) SearchFavorite(c *gin.Context) {
 	var req dto.PageInfo
@@ -34,11 +34,11 @@ func (b *BaseApi) SearchFavorite(c *gin.Context) {
 
 // @Tags File
 // @Summary Create favorite
-// @Description 创建收藏
 // @Accept json
 // @Param request body request.FavoriteCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"收藏文件/文件夹 [path]","formatEN":"收藏文件/文件夹 [path]"}
 func (b *BaseApi) CreateFavorite(c *gin.Context) {
@@ -56,11 +56,11 @@ func (b *BaseApi) CreateFavorite(c *gin.Context) {
 
 // @Tags File
 // @Summary Delete favorite
-// @Description 删除收藏
 // @Accept json
 // @Param request body request.FavoriteDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/favorite/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"favorites","output_column":"path","output_value":"path"}],"formatZH":"删除收藏 [path]","formatEN":"delete avorite [path]"}
 func (b *BaseApi) DeleteFavorite(c *gin.Context) {

backend/app/api/v1/file.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -27,11 +28,11 @@ import (
 
 // @Tags File
 // @Summary List files
-// @Description 获取文件列表
 // @Accept json
 // @Param request body request.FileOption true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/search [post]
 func (b *BaseApi) ListFiles(c *gin.Context) {
 	var req request.FileOption
@@ -48,11 +49,11 @@ func (b *BaseApi) ListFiles(c *gin.Context) {
 
 // @Tags File
 // @Summary Page file
-// @Description 分页获取上传文件
 // @Accept json
 // @Param request body request.SearchUploadWithPage true "request"
 // @Success 200 {array} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/upload/search [post]
 func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 	var req request.SearchUploadWithPage
@@ -72,11 +73,11 @@ func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 
 // @Tags File
 // @Summary Load files tree
-// @Description 加载文件树
 // @Accept json
 // @Param request body request.FileOption true "request"
 // @Success 200 {array} response.FileTree
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/tree [post]
 func (b *BaseApi) GetFileTree(c *gin.Context) {
 	var req request.FileOption
@@ -93,11 +94,11 @@ func (b *BaseApi) GetFileTree(c *gin.Context) {
 
 // @Tags File
 // @Summary Create file
-// @Description 创建文件/文件夹
 // @Accept json
 // @Param request body request.FileCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建文件/文件夹 [path]","formatEN":"Create dir or file [path]"}
 func (b *BaseApi) CreateFile(c *gin.Context) {
@@ -115,11 +116,11 @@ func (b *BaseApi) CreateFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Delete file
-// @Description 删除文件/文件夹
 // @Accept json
 // @Param request body request.FileDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/del [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除文件/文件夹 [path]","formatEN":"Delete dir or file [path]"}
 func (b *BaseApi) DeleteFile(c *gin.Context) {
@@ -137,11 +138,11 @@ func (b *BaseApi) DeleteFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Batch delete file
-// @Description 批量删除文件/文件夹
 // @Accept json
 // @Param request body request.FileBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/batch/del [post]
 // @x-panel-log {"bodyKeys":["paths"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量删除文件/文件夹 [paths]","formatEN":"Batch delete dir or file [paths]"}
 func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
@@ -159,11 +160,11 @@ func (b *BaseApi) BatchDeleteFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Change file mode
-// @Description 修改文件权限
 // @Accept json
 // @Param request body request.FileCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/mode [post]
 // @x-panel-log {"bodyKeys":["path","mode"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改权限 [paths] => [mode]","formatEN":"Change mode [paths] => [mode]"}
 func (b *BaseApi) ChangeFileMode(c *gin.Context) {
@@ -181,11 +182,11 @@ func (b *BaseApi) ChangeFileMode(c *gin.Context) {
 
 // @Tags File
 // @Summary Change file owner
-// @Description 修改文件用户/组
 // @Accept json
 // @Param request body request.FileRoleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/owner [post]
 // @x-panel-log {"bodyKeys":["path","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改用户/组 [paths] => [user]/[group]","formatEN":"Change owner [paths] => [user]/[group]"}
 func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
@@ -202,11 +203,11 @@ func (b *BaseApi) ChangeFileOwner(c *gin.Context) {
 
 // @Tags File
 // @Summary Compress file
-// @Description 压缩文件
 // @Accept json
 // @Param request body request.FileCompress true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/compress [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"压缩文件 [name]","formatEN":"Compress file [name]"}
 func (b *BaseApi) CompressFile(c *gin.Context) {
@@ -224,11 +225,11 @@ func (b *BaseApi) CompressFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Decompress file
-// @Description 解压文件
 // @Accept json
 // @Param request body request.FileDeCompress true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/decompress [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"解压 [path]","formatEN":"Decompress file [path]"}
 func (b *BaseApi) DeCompressFile(c *gin.Context) {
@@ -246,11 +247,11 @@ func (b *BaseApi) DeCompressFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Load file content
-// @Description 获取文件内容
 // @Accept json
 // @Param request body request.FileContentReq true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/content [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件内容 [path]","formatEN":"Load file content [path]"}
 func (b *BaseApi) GetContent(c *gin.Context) {
@@ -268,11 +269,11 @@ func (b *BaseApi) GetContent(c *gin.Context) {
 
 // @Tags File
 // @Summary Update file content
-// @Description 更新文件内容
 // @Accept json
 // @Param request body request.FileEdit true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/save [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新文件内容 [path]","formatEN":"Update file content [path]"}
 func (b *BaseApi) SaveContent(c *gin.Context) {
@@ -289,10 +290,10 @@ func (b *BaseApi) SaveContent(c *gin.Context) {
 
 // @Tags File
 // @Summary Upload file
-// @Description 上传文件
 // @Param file formData file true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/upload [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传文件 [path]","formatEN":"Upload file [path]"}
 func (b *BaseApi) UploadFiles(c *gin.Context) {
@@ -336,8 +337,12 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		return
 	}
 	mode := info.Mode()
-
 	fileOp := files.NewFileOp()
+	stat, ok := info.Sys().(*syscall.Stat_t)
+	uid, gid := -1, -1
+	if ok {
+		uid, gid = int(stat.Uid), int(stat.Gid)
+	}
 
 	success := 0
 	failures := make(buserr.MultiErr)
@@ -351,6 +356,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 				global.LOG.Error(e)
 				continue
 			}
+			_ = os.Chown(dstDir, uid, gid)
 		}
 		tmpFilename := dstFilename + ".tmp"
 		if err := c.SaveUploadedFile(file, tmpFilename); err != nil {
@@ -378,6 +384,9 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		} else {
 			_ = os.Chmod(dstFilename, mode)
 		}
+		if uid != -1 && gid != -1 {
+			_ = os.Chown(dstFilename, uid, gid)
+		}
 		success++
 	}
 	if success == 0 {
@@ -389,11 +398,11 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 
 // @Tags File
 // @Summary Check file exist
-// @Description 检测文件是否存在
 // @Accept json
 // @Param request body request.FilePathCheck true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/check [post]
 func (b *BaseApi) CheckFile(c *gin.Context) {
 	var req request.FilePathCheck
@@ -409,11 +418,11 @@ func (b *BaseApi) CheckFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Change file name
-// @Description 修改文件名称
 // @Accept json
 // @Param request body request.FileRename true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/rename [post]
 // @x-panel-log {"bodyKeys":["oldName","newName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重命名 [oldName] => [newName]","formatEN":"Rename [oldName] => [newName]"}
 func (b *BaseApi) ChangeFileName(c *gin.Context) {
@@ -430,11 +439,11 @@ func (b *BaseApi) ChangeFileName(c *gin.Context) {
 
 // @Tags File
 // @Summary Wget file
-// @Description 下载远端文件
 // @Accept json
 // @Param request body request.FileWget true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/wget [post]
 // @x-panel-log {"bodyKeys":["url","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载 url => [path]/[name]","formatEN":"Download url => [path]/[name]"}
 func (b *BaseApi) WgetFile(c *gin.Context) {
@@ -454,11 +463,11 @@ func (b *BaseApi) WgetFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Move file
-// @Description 移动文件
 // @Accept json
 // @Param request body request.FileMove true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/move [post]
 // @x-panel-log {"bodyKeys":["oldPaths","newPath"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移动文件 [oldPaths] => [newPath]","formatEN":"Move [oldPaths] => [newPath]"}
 func (b *BaseApi) MoveFile(c *gin.Context) {
@@ -475,10 +484,10 @@ func (b *BaseApi) MoveFile(c *gin.Context) {
 
 // @Tags File
 // @Summary Download file
-// @Description 下载文件
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/download [get]
 func (b *BaseApi) Download(c *gin.Context) {
 	filePath := c.Query("path")
@@ -495,11 +504,11 @@ func (b *BaseApi) Download(c *gin.Context) {
 
 // @Tags File
 // @Summary Chunk Download file
-// @Description 分片下载下载文件
 // @Accept json
 // @Param request body request.FileDownload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/chunkdownload [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载文件 [name]","formatEN":"Download file [name]"}
 func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
@@ -572,11 +581,11 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 
 // @Tags File
 // @Summary Load file size
-// @Description 获取文件夹大小
 // @Accept json
 // @Param request body request.DirSizeReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/size [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"获取文件夹大小 [path]","formatEN":"Load file size [path]"}
 func (b *BaseApi) Size(c *gin.Context) {
@@ -592,24 +601,46 @@ func (b *BaseApi) Size(c *gin.Context) {
 	helper.SuccessWithData(c, res)
 }
 
-func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int) error {
+func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int, overwrite bool) error {
+	defer func() {
+		_ = os.RemoveAll(fileDir)
+	}()
+
 	op := files.NewFileOp()
 	dstDir = strings.TrimSpace(dstDir)
 	mode, _ := files.GetParentMode(dstDir)
 	if mode == 0 {
 		mode = 0755
 	}
-	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
-		if err = op.CreateDir(dstDir, mode); err != nil {
-			return err
+	uid, gid := -1, -1
+	if info, err := os.Stat(dstDir); err != nil {
+		if os.IsNotExist(err) {
+			if err = op.CreateDir(dstDir, mode); err != nil {
+				return err
+			}
+		}
+	} else {
+		stat, ok := info.Sys().(*syscall.Stat_t)
+		if ok {
+			uid, gid = int(stat.Uid), int(stat.Gid)
 		}
 	}
+	dstFileName := filepath.Join(dstDir, fileName)
+	dstInfo, statErr := os.Stat(dstFileName)
+	if statErr == nil {
+		mode = dstInfo.Mode()
+	} else {
+		mode = 0644
+	}
 
-	targetFile, err := os.OpenFile(filepath.Join(dstDir, fileName), os.O_RDWR|os.O_CREATE, mode)
+	if overwrite {
+		_ = os.Remove(dstFileName)
+	}
+	targetFile, err := os.OpenFile(dstFileName, os.O_RDWR|os.O_CREATE, mode)
 	if err != nil {
 		return err
 	}
-
+	defer targetFile.Close()
 	for i := 0; i < chunkCount; i++ {
 		chunkPath := filepath.Join(fileDir, fmt.Sprintf("%s.%d", fileName, i))
 		chunkData, err := os.ReadFile(chunkPath)
@@ -620,17 +651,21 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int)
 		if err != nil {
 			return err
 		}
+		_ = os.Remove(chunkPath)
+	}
+	if uid != -1 && gid != -1 {
+		_ = os.Chown(dstFileName, uid, gid)
 	}
 
-	return files.NewFileOp().DeleteDir(fileDir)
+	return nil
 }
 
 // @Tags File
-// @Summary ChunkUpload file
-// @Description 分片上传文件
+// @Summary Chunk upload file
 // @Param file formData file true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/chunkupload [post]
 func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 	var err error
@@ -704,7 +739,11 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 	}
 
 	if chunkIndex+1 == chunkCount {
-		err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount)
+		overwrite := true
+		if ow := c.PostForm("overwrite"); ow != "" {
+			overwrite, _ = strconv.ParseBool(ow)
+		}
+		err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount, overwrite)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, buserr.WithMap(constant.ErrFileUpload, map[string]interface{}{"name": filename, "detail": err.Error()}, err))
 			return
@@ -744,10 +783,10 @@ func (b *BaseApi) Keys(c *gin.Context) {
 
 // @Tags File
 // @Summary Read file by Line
-// @Description 按行读取日志文件
 // @Param request body request.FileReadByLineReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/read [post]
 func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 	var req request.FileReadByLineReq
@@ -764,11 +803,11 @@ func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 
 // @Tags File
 // @Summary Batch change file mode and owner
-// @Description 批量修改文件权限和用户/组
 // @Accept json
 // @Param request body request.FileRoleReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/batch/role [post]
 // @x-panel-log {"bodyKeys":["paths","mode","user","group"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"批量修改文件权限和用户/组 [paths] => [mode]/[user]/[group]","formatEN":"Batch change file mode and owner [paths] => [mode]/[user]/[group]"}
 func (b *BaseApi) BatchChangeModeAndOwner(c *gin.Context) {

backend/app/api/v1/firewall.go

@@ -9,9 +9,9 @@ import (
 
 // @Tags Firewall
 // @Summary Load firewall base info
-// @Description 获取防火墙基础信息
 // @Success 200 {object} dto.FirewallBaseInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/base [get]
 func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 	data, err := firewallService.LoadBaseInfo()
@@ -25,11 +25,11 @@ func (b *BaseApi) LoadFirewallBaseInfo(c *gin.Context) {
 
 // @Tags Firewall
 // @Summary Page firewall rules
-// @Description 获取防火墙规则列表分页
 // @Accept json
 // @Param request body dto.RuleSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/search [post]
 func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 	var req dto.RuleSearch
@@ -51,11 +51,11 @@ func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 
 // @Tags Firewall
 // @Summary Page firewall status
-// @Description 修改防火墙状态
 // @Accept json
 // @Param request body dto.FirewallOperation true "request"
 // @Success 200 {object} dto.PageResult
 // @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) {
@@ -73,12 +73,12 @@ func (b *BaseApi) OperateFirewall(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Create group
-// @Description 创建防火墙端口规则
+// @Summary Create firewall port group
 // @Accept json
 // @Param request body dto.PortRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/port [post]
 // @x-panel-log {"bodyKeys":["port","strategy"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加端口规则 [strategy] [port]","formatEN":"create port rules [strategy][port]"}
 func (b *BaseApi) OperatePortRule(c *gin.Context) {
@@ -94,13 +94,36 @@ func (b *BaseApi) OperatePortRule(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// OperateForwardRule
 // @Tags Firewall
-// @Summary Create group
-// @Description 创建防火墙 IP 规则
+// @Summary Update firewall port group
+// @Accept json
+// @Param request body dto.ForwardRuleOperate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /hosts/firewall/forward [post]
+// @x-panel-log {"bodyKeys":["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 := firewallService.OperateForwardRule(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Firewall
+// @Summary Create firewall group
 // @Accept json
 // @Param request body dto.AddrRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/ip [post]
 // @x-panel-log {"bodyKeys":["strategy","address"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"添加 ip 规则 [strategy] [address]","formatEN":"create address rules [strategy][address]"}
 func (b *BaseApi) OperateIPRule(c *gin.Context) {
@@ -117,12 +140,12 @@ func (b *BaseApi) OperateIPRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Create group
-// @Description 批量删除防火墙规则
+// @Summary Batch create group
 // @Accept json
 // @Param request body dto.BatchRuleOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/batch [post]
 func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 	var req dto.BatchRuleOperate
@@ -139,11 +162,11 @@ func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 
 // @Tags Firewall
 // @Summary Update rule description
-// @Description 更新防火墙描述
 // @Accept json
 // @Param request body dto.UpdateFirewallDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/description [post]
 func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 	var req dto.UpdateFirewallDescription
@@ -159,12 +182,12 @@ func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Create group
-// @Description 更新端口防火墙规则
+// @Summary Update firewall group
 // @Accept json
 // @Param request body dto.PortRuleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/port [post]
 func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 	var req dto.PortRuleUpdate
@@ -180,12 +203,12 @@ func (b *BaseApi) UpdatePortRule(c *gin.Context) {
 }
 
 // @Tags Firewall
-// @Summary Create group
-// @Description 更新 ip 防火墙规则
+// @Summary Uodate address group
 // @Accept json
 // @Param request body dto.AddrRuleUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/firewall/update/addr [post]
 func (b *BaseApi) UpdateAddrRule(c *gin.Context) {
 	var req dto.AddrRuleUpdate

backend/app/api/v1/ftp.go

@@ -0,0 +1,199 @@
+package v1
+
+import (
+	"encoding/base64"
+
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags FTP
+// @Summary Load FTP base info
+// @Success 200 {object} dto.FtpBaseInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/base [get]
+func (b *BaseApi) LoadFtpBaseInfo(c *gin.Context) {
+	data, err := ftpService.LoadBaseInfo()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags FTP
+// @Summary Load FTP operation log
+// @Accept json
+// @Param request body dto.FtpLogSearch true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/log/search [post]
+func (b *BaseApi) LoadFtpLogInfo(c *gin.Context) {
+	var req dto.FtpLogSearch
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := ftpService.LoadLog(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags FTP
+// @Summary Operate FTP
+// @Accept json
+// @Param request body dto.Operate true "request"
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/operate [post]
+// @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] FTP","formatEN":"[operation] FTP"}
+func (b *BaseApi) OperateFtp(c *gin.Context) {
+	var req dto.Operate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := ftpService.Operate(req.Operation); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags FTP
+// @Summary Page FTP user
+// @Accept json
+// @Param request body dto.SearchWithPage true "request"
+// @Success 200 {object} dto.PageResult
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/search [post]
+func (b *BaseApi) SearchFtp(c *gin.Context) {
+	var req dto.SearchWithPage
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	total, list, err := ftpService.SearchWithPage(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, dto.PageResult{
+		Items: list,
+		Total: total,
+	})
+}
+
+// @Tags FTP
+// @Summary Create FTP user
+// @Accept json
+// @Param request body dto.FtpCreate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp [post]
+// @x-panel-log {"bodyKeys":["user", "path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 FTP 账户 [user][path]","formatEN":"create FTP [user][path]"}
+func (b *BaseApi) CreateFtp(c *gin.Context) {
+	var req dto.FtpCreate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if len(req.Password) != 0 {
+		pass, err := base64.StdEncoding.DecodeString(req.Password)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.Password = string(pass)
+	}
+	if _, err := ftpService.Create(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags FTP
+// @Summary Delete FTP user
+// @Accept json
+// @Param request body dto.BatchDeleteReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/del [post]
+// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"ftps","output_column":"user","output_value":"users"}],"formatZH":"删除 FTP 账户 [users]","formatEN":"delete FTP users [users]"}
+func (b *BaseApi) DeleteFtp(c *gin.Context) {
+	var req dto.BatchDeleteReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := ftpService.Delete(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags FTP
+// @Summary Sync FTP user
+// @Accept json
+// @Param request body dto.BatchDeleteReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/sync [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"同步 FTP 账户","formatEN":"sync FTP users"}
+func (b *BaseApi) SyncFtp(c *gin.Context) {
+	if err := ftpService.Sync(); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}
+
+// @Tags FTP
+// @Summary Update FTP user
+// @Accept json
+// @Param request body dto.FtpUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /toolbox/ftp/update [post]
+// @x-panel-log {"bodyKeys":["user", "path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 FTP 账户 [user][path]","formatEN":"update FTP [user][path]"}
+func (b *BaseApi) UpdateFtp(c *gin.Context) {
+	var req dto.FtpUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if len(req.Password) != 0 {
+		pass, err := base64.StdEncoding.DecodeString(req.Password)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.Password = string(pass)
+	}
+	if err := ftpService.Update(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}

backend/app/api/v1/group.go

@@ -8,12 +8,12 @@ import (
 )
 
 // @Tags System Group
-// @Summary Create group
-// @Description 创建系统组
+// @Summary Create system group
 // @Accept json
 // @Param request body dto.GroupCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /groups [post]
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建组 [name][type]","formatEN":"create group [name][type]"}
 func (b *BaseApi) CreateGroup(c *gin.Context) {
@@ -30,12 +30,12 @@ func (b *BaseApi) CreateGroup(c *gin.Context) {
 }
 
 // @Tags System Group
-// @Summary Delete group
-// @Description 删除系统组
+// @Summary Delete system group
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /groups/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"name","output_value":"name"},{"input_column":"id","input_value":"id","isList":false,"db":"groups","output_column":"type","output_value":"type"}],"formatZH":"删除组 [type][name]","formatEN":"delete group [type][name]"}
 func (b *BaseApi) DeleteGroup(c *gin.Context) {
@@ -52,12 +52,12 @@ func (b *BaseApi) DeleteGroup(c *gin.Context) {
 }
 
 // @Tags System Group
-// @Summary Update group
-// @Description 更新系统组
+// @Summary Update system group
 // @Accept json
 // @Param request body dto.GroupUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /groups/update [post]
 // @x-panel-log {"bodyKeys":["name","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新组 [name][type]","formatEN":"update group [name][type]"}
 func (b *BaseApi) UpdateGroup(c *gin.Context) {
@@ -74,12 +74,12 @@ func (b *BaseApi) UpdateGroup(c *gin.Context) {
 }
 
 // @Tags System Group
-// @Summary List groups
-// @Description 查询系统组
+// @Summary List system groups
 // @Accept json
 // @Param request body dto.GroupSearch true "request"
 // @Success 200 {array} dto.GroupInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /groups/search [post]
 func (b *BaseApi) ListGroup(c *gin.Context) {
 	var req dto.GroupSearch

backend/app/api/v1/helper/helper.go

@@ -3,6 +3,7 @@ package helper
 import (
 	"context"
 	"fmt"
+	"github.com/1Panel-dev/1Panel/cmd/server/res"
 	"net/http"
 	"strconv"
 
@@ -133,3 +134,23 @@ func CheckBind(req interface{}, c *gin.Context) error {
 	}
 	return nil
 }
+
+func ErrWithHtml(ctx *gin.Context, code int, scope string) {
+	if code == 444 {
+		ctx.String(444, "")
+		ctx.Abort()
+		return
+	}
+	file := fmt.Sprintf("html/%d.html", code)
+	if code == 200 && scope != "" {
+		file = fmt.Sprintf("html/200_%s.html", scope)
+	}
+	data, err := res.ErrorMsg.ReadFile(file)
+	if err != nil {
+		ctx.String(http.StatusInternalServerError, "Internal Server Error")
+		ctx.Abort()
+		return
+	}
+	ctx.Data(code, "text/html; charset=utf-8", data)
+	ctx.Abort()
+}

backend/app/api/v1/host.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags Host
 // @Summary Create host
-// @Description 创建主机
 // @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) {
@@ -33,11 +33,11 @@ func (b *BaseApi) CreateHost(c *gin.Context) {
 
 // @Tags Host
 // @Summary Test host conn by info
-// @Description 测试主机连接
 // @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
@@ -51,11 +51,11 @@ func (b *BaseApi) TestByInfo(c *gin.Context) {
 
 // @Tags Host
 // @Summary Test host conn by host id
-// @Description 测试主机连接
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200 {boolean} connStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/test/byid/:id [post]
 func (b *BaseApi) TestByID(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -70,11 +70,11 @@ func (b *BaseApi) TestByID(c *gin.Context) {
 
 // @Tags Host
 // @Summary Load host tree
-// @Description 加载主机树
 // @Accept json
 // @Param request body dto.SearchForTree true "request"
 // @Success 200 {array} dto.HostTree
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/tree [post]
 func (b *BaseApi) HostTree(c *gin.Context) {
 	var req dto.SearchForTree
@@ -93,11 +93,11 @@ func (b *BaseApi) HostTree(c *gin.Context) {
 
 // @Tags Host
 // @Summary Page host
-// @Description 获取主机列表分页
 // @Accept json
 // @Param request body dto.SearchHostWithPage true "request"
 // @Success 200 {array} dto.HostTree
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/search [post]
 func (b *BaseApi) SearchHost(c *gin.Context) {
 	var req dto.SearchHostWithPage
@@ -119,11 +119,11 @@ func (b *BaseApi) SearchHost(c *gin.Context) {
 
 // @Tags Host
 // @Summary Delete host
-// @Description 删除主机
 // @Accept json
 // @Param request body dto.BatchDeleteReq 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":"addr","output_value":"addrs"}],"formatZH":"删除主机 [addrs]","formatEN":"delete host [addrs]"}
 func (b *BaseApi) DeleteHost(c *gin.Context) {
@@ -141,11 +141,11 @@ func (b *BaseApi) DeleteHost(c *gin.Context) {
 
 // @Tags Host
 // @Summary Update host
-// @Description 更新主机
 // @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) {
@@ -207,11 +207,11 @@ func (b *BaseApi) UpdateHost(c *gin.Context) {
 
 // @Tags Host
 // @Summary Update host group
-// @Description 切换分组
 // @Accept json
 // @Param request body dto.ChangeHostGroup true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/update/group [post]
 // @x-panel-log {"bodyKeys":["id","group"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"hosts","output_column":"addr","output_value":"addr"}],"formatZH":"切换主机[addr]分组 => [group]","formatEN":"change host [addr] group => [group]"}
 func (b *BaseApi) UpdateHostGroup(c *gin.Context) {

backend/app/api/v1/host_tool.go

@@ -8,12 +8,12 @@ import (
 )
 
 // @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具状态
+// @Summary Get tool status
 // @Accept json
 // @Param request body request.HostToolReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool [post]
 func (b *BaseApi) GetToolStatus(c *gin.Context) {
 	var req request.HostToolReq
@@ -31,11 +31,11 @@ func (b *BaseApi) GetToolStatus(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Create Host tool Config
-// @Description 创建主机工具配置
 // @Accept json
 // @Param request body request.HostToolCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/create [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建 [type] 配置","formatEN":"create [type] config"}
 func (b *BaseApi) InitToolConfig(c *gin.Context) {
@@ -53,11 +53,11 @@ func (b *BaseApi) InitToolConfig(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Operate tool
-// @Description 操作主机工具
 // @Accept json
 // @Param request body request.HostToolReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/operate [post]
 // @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
 func (b *BaseApi) OperateTool(c *gin.Context) {
@@ -75,11 +75,11 @@ func (b *BaseApi) OperateTool(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Get tool config
-// @Description 操作主机工具配置文件
 // @Accept json
 // @Param request body request.HostToolConfig true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/config [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 主机工具配置文件 ","formatEN":"[operate] tool config"}
 func (b *BaseApi) OperateToolConfig(c *gin.Context) {
@@ -97,12 +97,12 @@ func (b *BaseApi) OperateToolConfig(c *gin.Context) {
 }
 
 // @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具日志
+// @Summary Get tool logs
 // @Accept json
 // @Param request body request.HostToolLogReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/log [post]
 func (b *BaseApi) GetToolLog(c *gin.Context) {
 	var req request.HostToolLogReq
@@ -120,11 +120,11 @@ func (b *BaseApi) GetToolLog(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Create Supervisor process
-// @Description 操作守护进程
 // @Accept json
 // @Param request body request.SupervisorProcessConfig true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/supervisor/process [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] 守护进程 ","formatEN":"[operate] process"}
 func (b *BaseApi) OperateProcess(c *gin.Context) {
@@ -143,10 +143,10 @@ func (b *BaseApi) OperateProcess(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Get Supervisor process config
-// @Description 获取 Supervisor 进程配置
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/supervisor/process [get]
 func (b *BaseApi) GetProcess(c *gin.Context) {
 	configs, err := hostToolService.GetSupervisorProcessConfig()
@@ -159,11 +159,11 @@ func (b *BaseApi) GetProcess(c *gin.Context) {
 
 // @Tags Host tool
 // @Summary Get Supervisor process config
-// @Description 操作 Supervisor 进程文件
 // @Accept json
 // @Param request body request.SupervisorProcessFileReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/tool/supervisor/process/file [post]
 // @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
 func (b *BaseApi) GetProcessFile(c *gin.Context) {

backend/app/api/v1/image.go

@@ -9,12 +9,12 @@ import (
 
 // @Tags Container Image
 // @Summary Page images
-// @Description 获取镜像列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/search [post]
 func (b *BaseApi) SearchImage(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -36,10 +36,10 @@ func (b *BaseApi) SearchImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary List all images
-// @Description 获取所有镜像列表
 // @Produce json
 // @Success 200 {array} dto.ImageInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/all [get]
 func (b *BaseApi) ListAllImage(c *gin.Context) {
 	list, err := imageService.ListAll()
@@ -52,10 +52,10 @@ func (b *BaseApi) ListAllImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary load images options
-// @Description 获取镜像名称列表
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image [get]
 func (b *BaseApi) ListImage(c *gin.Context) {
 	list, err := imageService.List()
@@ -68,11 +68,11 @@ func (b *BaseApi) ListImage(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Build image
-// @Description 构建镜像
 // @Accept json
 // @Param request body dto.ImageBuild true "request"
 // @Success 200 {string} log
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/build [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"构建镜像 [name]","formatEN":"build image [name]"}
 func (b *BaseApi) ImageBuild(c *gin.Context) {
@@ -92,11 +92,11 @@ func (b *BaseApi) ImageBuild(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Pull image
-// @Description 拉取镜像
 // @Accept json
 // @Param request body dto.ImagePull true "request"
 // @Success 200 {string} log
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/pull [post]
 // @x-panel-log {"bodyKeys":["repoID","imageName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"镜像拉取 [reponame][imageName]","formatEN":"image pull [reponame][imageName]"}
 func (b *BaseApi) ImagePull(c *gin.Context) {
@@ -116,11 +116,11 @@ func (b *BaseApi) ImagePull(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Push image
-// @Description 推送镜像
 // @Accept json
 // @Param request body dto.ImagePush true "request"
 // @Success 200 {string} log
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/push [post]
 // @x-panel-log {"bodyKeys":["repoID","tagName","name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"[tagName] 推送到 [reponame][name]","formatEN":"push [tagName] to [reponame][name]"}
 func (b *BaseApi) ImagePush(c *gin.Context) {
@@ -140,11 +140,11 @@ func (b *BaseApi) ImagePush(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Delete image
-// @Description 删除镜像
 // @Accept json
 // @Param request body dto.BatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/remove [post]
 // @x-panel-log {"bodyKeys":["names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"移除镜像 [names]","formatEN":"remove image [names]"}
 func (b *BaseApi) ImageRemove(c *gin.Context) {
@@ -163,11 +163,11 @@ func (b *BaseApi) ImageRemove(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Save image
-// @Description 导出镜像
 // @Accept json
 // @Param request body dto.ImageSave true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/save [post]
 // @x-panel-log {"bodyKeys":["tagName","path","name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"保留 [tagName] 为 [path]/[name]","formatEN":"save [tagName] as [path]/[name]"}
 func (b *BaseApi) ImageSave(c *gin.Context) {
@@ -186,11 +186,11 @@ func (b *BaseApi) ImageSave(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Tag image
-// @Description Tag 镜像
 // @Accept json
 // @Param request body dto.ImageTag true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/tag [post]
 // @x-panel-log {"bodyKeys":["repoID","targetName"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"repoID","isList":false,"db":"image_repos","output_column":"name","output_value":"reponame"}],"formatZH":"tag 镜像 [reponame][targetName]","formatEN":"tag image [reponame][targetName]"}
 func (b *BaseApi) ImageTag(c *gin.Context) {
@@ -209,11 +209,11 @@ func (b *BaseApi) ImageTag(c *gin.Context) {
 
 // @Tags Container Image
 // @Summary Load image
-// @Description 导入镜像
 // @Accept json
 // @Param request body dto.ImageLoad true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/image/load [post]
 // @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [path] 加载镜像","formatEN":"load image from [path]"}
 func (b *BaseApi) ImageLoad(c *gin.Context) {

backend/app/api/v1/image_repo.go

@@ -9,12 +9,12 @@ import (
 
 // @Tags Container Image-repo
 // @Summary Page image repos
-// @Description 获取镜像仓库列表分页
 // @Accept json
 // @Param request body dto.SearchWithPage true "request"
 // @Produce json
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/search [post]
 func (b *BaseApi) SearchRepo(c *gin.Context) {
 	var req dto.SearchWithPage
@@ -36,10 +36,10 @@ func (b *BaseApi) SearchRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary List image repos
-// @Description 获取镜像仓库列表
 // @Produce json
 // @Success 200 {array} dto.ImageRepoOption
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo [get]
 func (b *BaseApi) ListRepo(c *gin.Context) {
 	list, err := imageRepoService.List()
@@ -53,12 +53,12 @@ func (b *BaseApi) ListRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary Load repo status
-// @Description 获取 docker 仓库状态
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/status [get]
 func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 	var req dto.OperateByID
@@ -75,12 +75,12 @@ func (b *BaseApi) CheckRepoStatus(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary Create image repo
-// @Description 创建镜像仓库
 // @Accept json
 // @Param request body dto.ImageRepoDelete true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建镜像仓库 [name]","formatEN":"create image repo [name]"}
 func (b *BaseApi) CreateRepo(c *gin.Context) {
@@ -98,12 +98,12 @@ func (b *BaseApi) CreateRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary Delete image repo
-// @Description 删除镜像仓库
 // @Accept json
 // @Param request body dto.ImageRepoDelete true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"image_repos","output_column":"name","output_value":"names"}],"formatZH":"删除镜像仓库 [names]","formatEN":"delete image repo [names]"}
 func (b *BaseApi) DeleteRepo(c *gin.Context) {
@@ -121,12 +121,12 @@ func (b *BaseApi) DeleteRepo(c *gin.Context) {
 
 // @Tags Container Image-repo
 // @Summary Update image repo
-// @Description 更新镜像仓库
 // @Accept json
 // @Param request body dto.ImageRepoUpdate true "request"
 // @Produce json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /containers/repo/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"image_repos","output_column":"name","output_value":"name"}],"formatZH":"更新镜像仓库 [name]","formatEN":"update image repo information [name]"}
 func (b *BaseApi) UpdateRepo(c *gin.Context) {

backend/app/api/v1/logs.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags Logs
 // @Summary Page login logs
-// @Description 获取系统登录日志列表分页
 // @Accept json
 // @Param request body dto.SearchLgLogWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /logs/login [post]
 func (b *BaseApi) GetLoginLogs(c *gin.Context) {
 	var req dto.SearchLgLogWithPage
@@ -35,11 +35,11 @@ func (b *BaseApi) GetLoginLogs(c *gin.Context) {
 
 // @Tags Logs
 // @Summary Page operation logs
-// @Description 获取系统操作日志列表分页
 // @Accept json
 // @Param request body dto.SearchOpLogWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /logs/operation [post]
 func (b *BaseApi) GetOperationLogs(c *gin.Context) {
 	var req dto.SearchOpLogWithPage
@@ -61,11 +61,11 @@ func (b *BaseApi) GetOperationLogs(c *gin.Context) {
 
 // @Tags Logs
 // @Summary Clean operation logs
-// @Description 清空操作日志
 // @Accept json
 // @Param request body dto.CleanLog true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /logs/clean [post]
 // @x-panel-log {"bodyKeys":["logType"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空 [logType] 日志信息","formatEN":"Clean the [logType] log information"}
 func (b *BaseApi) CleanLogs(c *gin.Context) {
@@ -84,9 +84,9 @@ func (b *BaseApi) CleanLogs(c *gin.Context) {
 
 // @Tags Logs
 // @Summary Load system log files
-// @Description 获取系统日志文件列表
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /logs/system/files [get]
 func (b *BaseApi) GetSystemFiles(c *gin.Context) {
 	data, err := logService.ListSystemLogFile()
@@ -100,9 +100,9 @@ func (b *BaseApi) GetSystemFiles(c *gin.Context) {
 
 // @Tags Logs
 // @Summary Load system logs
-// @Description 获取系统日志
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /logs/system [post]
 func (b *BaseApi) GetSystemLogs(c *gin.Context) {
 	var req dto.OperationWithName

backend/app/api/v1/monitor.go

@@ -17,10 +17,10 @@ import (
 
 // @Tags Monitor
 // @Summary Load monitor datas
-// @Description 获取监控数据
 // @Param request body dto.MonitorSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/monitor/search [post]
 func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	var req dto.MonitorSearch
@@ -28,7 +28,7 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZone())
+	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 
@@ -89,9 +89,9 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 
 // @Tags Monitor
 // @Summary Clean monitor datas
-// @Description 清空监控数据
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /hosts/monitor/clean [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空监控数据","formatEN":"clean monitor datas"}
 func (b *BaseApi) CleanMonitor(c *gin.Context) {

backend/app/api/v1/nginx.go

@@ -9,9 +9,9 @@ import (
 
 // @Tags OpenResty
 // @Summary Load OpenResty conf
-// @Description 获取 OpenResty 配置信息
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty [get]
 func (b *BaseApi) GetNginx(c *gin.Context) {
 	fileInfo, err := nginxService.GetNginxConfig()
@@ -24,11 +24,11 @@ func (b *BaseApi) GetNginx(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Load partial OpenResty conf
-// @Description 获取部分 OpenResty 配置信息
 // @Accept json
 // @Param request body request.NginxScopeReq true "request"
 // @Success 200 {array} response.NginxParam
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/scope [post]
 func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 	var req request.NginxScopeReq
@@ -46,11 +46,11 @@ func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Update OpenResty conf
-// @Description 更新 OpenResty 配置信息
 // @Accept json
 // @Param request body request.NginxConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/update [post]
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新 nginx 配置 [domain]","formatEN":"Update nginx conf [domain]"}
 func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
@@ -67,9 +67,9 @@ func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Load OpenResty status info
-// @Description 获取 OpenResty 状态信息
 // @Success 200 {object} response.NginxStatus
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/status [get]
 func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 	res, err := nginxService.GetStatus()
@@ -82,11 +82,11 @@ func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Update OpenResty conf by upload file
-// @Description 上传更新 OpenResty 配置文件
 // @Accept json
 // @Param request body request.NginxConfigFileUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/file [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 nginx 配置","formatEN":"Update nginx conf"}
 func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
@@ -104,9 +104,9 @@ func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
 
 // @Tags OpenResty
 // @Summary Clear OpenResty proxy cache
-// @Description 清理 OpenResty 代理缓存
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /openresty/clear [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理 Openresty 代理缓存","formatEN":"Clear nginx proxy cache"}
 func (b *BaseApi) ClearNginxProxyCache(c *gin.Context) {

backend/app/api/v1/php_extensions.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags PHP Extensions
 // @Summary Page Extensions
-// @Description Page Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsSearch true "request"
 // @Success 200 {array} response.PHPExtensionsDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/search [post]
 func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsSearch
@@ -44,11 +44,11 @@ func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
 
 // @Tags PHP Extensions
 // @Summary Create Extensions
-// @Description Create Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions [post]
 func (b *BaseApi) CreatePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsCreate
@@ -64,11 +64,11 @@ func (b *BaseApi) CreatePHPExtensions(c *gin.Context) {
 
 // @Tags PHP Extensions
 // @Summary Update Extensions
-// @Description Update Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/update [post]
 func (b *BaseApi) UpdatePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsUpdate
@@ -84,11 +84,11 @@ func (b *BaseApi) UpdatePHPExtensions(c *gin.Context) {
 
 // @Tags PHP Extensions
 // @Summary Delete Extensions
-// @Description Delete Extensions
 // @Accept json
 // @Param request body request.PHPExtensionsDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/php/extensions/del [post]
 func (b *BaseApi) DeletePHPExtensions(c *gin.Context) {
 	var req request.PHPExtensionsDelete

backend/app/api/v1/process.go

@@ -20,10 +20,10 @@ func (b *BaseApi) ProcessWs(c *gin.Context) {
 
 // @Tags Process
 // @Summary Stop Process
-// @Description 停止进程
 // @Param request body request.ProcessReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /process/stop [post]
 // @x-panel-log {"bodyKeys":["PID"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"结束进程 [PID]","formatEN":"结束进程 [PID]"}
 func (b *BaseApi) StopProcess(c *gin.Context) {

backend/app/api/v1/recycle_bin.go

@@ -9,12 +9,12 @@ import (
 )
 
 // @Tags File
-// @Summary List RecycleBin files
-// @Description 获取回收站文件列表
+// @Summary List Recycle Bin files
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/recycle/search [post]
 func (b *BaseApi) SearchRecycleBinFile(c *gin.Context) {
 	var req dto.PageInfo
@@ -33,12 +33,12 @@ func (b *BaseApi) SearchRecycleBinFile(c *gin.Context) {
 }
 
 // @Tags File
-// @Summary Reduce RecycleBin files
-// @Description 还原回收站文件
+// @Summary Reduce Recycle Bin files
 // @Accept json
 // @Param request body request.RecycleBinReduce true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/recycle/reduce [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"还原回收站文件 [name]","formatEN":"Reduce RecycleBin file [name]"}
 func (b *BaseApi) ReduceRecycleBinFile(c *gin.Context) {
@@ -54,11 +54,11 @@ func (b *BaseApi) ReduceRecycleBinFile(c *gin.Context) {
 }
 
 // @Tags File
-// @Summary Clear RecycleBin files
-// @Description 清空回收站文件
+// @Summary Clear Recycle Bin files
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/recycle/clear [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空回收站","formatEN":"清空回收站"}
 func (b *BaseApi) ClearRecycleBinFile(c *gin.Context) {
@@ -70,11 +70,11 @@ func (b *BaseApi) ClearRecycleBinFile(c *gin.Context) {
 }
 
 // @Tags File
-// @Summary Get RecycleBin status
-// @Description 获取回收站状态
+// @Summary Get Recycle Bin status
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /files/recycle/status [get]
 func (b *BaseApi) GetRecycleStatus(c *gin.Context) {
 	settingInfo, err := settingService.GetSettingInfo()

backend/app/api/v1/runtime.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags Runtime
 // @Summary List runtimes
-// @Description 获取运行环境列表
 // @Accept json
 // @Param request body request.RuntimeSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/search [post]
 func (b *BaseApi) SearchRuntimes(c *gin.Context) {
 	var req request.RuntimeSearch
@@ -34,11 +34,11 @@ func (b *BaseApi) SearchRuntimes(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Create runtime
-// @Description 创建运行环境
 // @Accept json
 // @Param request body request.RuntimeCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建运行环境 [name]","formatEN":"Create runtime [name]"}
 func (b *BaseApi) CreateRuntime(c *gin.Context) {
@@ -56,13 +56,13 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
 
 // @Tags Website
 // @Summary Delete runtime
-// @Description 删除运行环境
 // @Accept json
 // @Param request body request.RuntimeDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除网站 [name]","formatEN":"Delete website [name]"}
+// @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 {
@@ -92,11 +92,11 @@ func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Update runtime
-// @Description 更新运行环境
 // @Accept json
 // @Param request body request.RuntimeUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新运行环境 [name]","formatEN":"Update runtime [name]"}
 func (b *BaseApi) UpdateRuntime(c *gin.Context) {
@@ -113,11 +113,11 @@ func (b *BaseApi) UpdateRuntime(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Get runtime
-// @Description 获取运行环境
 // @Accept json
 // @Param id path string true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/:id [get]
 func (b *BaseApi) GetRuntime(c *gin.Context) {
 	id, err := helper.GetIntParamByKey(c, "id")
@@ -135,11 +135,11 @@ func (b *BaseApi) GetRuntime(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Get Node package scripts
-// @Description 获取 Node 项目的 scripts
 // @Accept json
 // @Param request body request.NodePackageReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/node/package [post]
 func (b *BaseApi) GetNodePackageRunScript(c *gin.Context) {
 	var req request.NodePackageReq
@@ -156,11 +156,11 @@ func (b *BaseApi) GetNodePackageRunScript(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Operate runtime
-// @Description 操作运行环境
 // @Accept json
 // @Param request body request.RuntimeOperate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/operate [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"操作运行环境 [name]","formatEN":"Operate runtime [name]"}
 func (b *BaseApi) OperateRuntime(c *gin.Context) {
@@ -178,11 +178,11 @@ func (b *BaseApi) OperateRuntime(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Get Node modules
-// @Description 获取 Node 项目的 modules
 // @Accept json
 // @Param request body request.NodeModuleReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/node/modules [post]
 func (b *BaseApi) GetNodeModules(c *gin.Context) {
 	var req request.NodeModuleReq
@@ -199,11 +199,11 @@ func (b *BaseApi) GetNodeModules(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Operate Node modules
-// @Description 操作 Node 项目 modules
 // @Accept json
 // @Param request body request.NodeModuleReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/node/modules/operate [post]
 func (b *BaseApi) OperateNodeModules(c *gin.Context) {
 	var req request.NodeModuleOperateReq
@@ -220,10 +220,10 @@ func (b *BaseApi) OperateNodeModules(c *gin.Context) {
 
 // @Tags Runtime
 // @Summary Sync runtime status
-// @Description 同步运行环境状态
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /runtimes/sync [post]
 func (b *BaseApi) SyncStatus(c *gin.Context) {
 	err := runtimeService.SyncRuntimeStatus()

backend/app/api/v1/setting.go

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"encoding/base64"
 	"errors"
 	"os"
 	"path"
@@ -15,9 +16,9 @@ import (
 
 // @Tags System Setting
 // @Summary Load system setting info
-// @Description 加载系统配置信息
 // @Success 200 {object} dto.SettingInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/search [post]
 func (b *BaseApi) GetSettingInfo(c *gin.Context) {
 	setting, err := settingService.GetSettingInfo()
@@ -30,9 +31,9 @@ func (b *BaseApi) GetSettingInfo(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load system available status
-// @Description 获取系统可用状态
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/search/available [get]
 func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
@@ -40,11 +41,11 @@ func (b *BaseApi) GetSystemAvailable(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update system setting
-// @Description 更新系统配置
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/update [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统配置 [key] => [value]","formatEN":"update system setting [key] => [value]"}
 func (b *BaseApi) UpdateSetting(c *gin.Context) {
@@ -60,13 +61,44 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags System Setting
+// @Summary Update proxy setting
+// @Accept json
+// @Param request body dto.ProxyUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/proxy/update [post]
+// @x-panel-log {"bodyKeys":["proxyUrl","proxyPort"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"服务器代理配置 [proxyPort]:[proxyPort]","formatEN":"set proxy [proxyPort]:[proxyPort]."}
+func (b *BaseApi) UpdateProxy(c *gin.Context) {
+	var req dto.ProxyUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if len(req.ProxyPasswd) != 0 && len(req.ProxyType) != 0 {
+		pass, err := base64.StdEncoding.DecodeString(req.ProxyPasswd)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.ProxyPasswd = string(pass)
+	}
+
+	if err := settingService.UpdateProxy(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags System Setting
 // @Summary Update system setting
-// @Description 隐藏高级功能菜单
 // @Accept json
 // @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/menu/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"隐藏高级功能菜单","formatEN":"Hide advanced feature menu."}
 func (b *BaseApi) UpdateMenu(c *gin.Context) {
@@ -84,11 +116,11 @@ func (b *BaseApi) UpdateMenu(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update system password
-// @Description 更新系统登录密码
 // @Accept json
 // @Param request body dto.PasswordUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/password/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统密码","formatEN":"update system password"}
 func (b *BaseApi) UpdatePassword(c *gin.Context) {
@@ -106,11 +138,11 @@ func (b *BaseApi) UpdatePassword(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update system ssl
-// @Description 修改系统 ssl 登录
 // @Accept json
 // @Param request body dto.SSLUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/ssl/update [post]
 // @x-panel-log {"bodyKeys":["ssl"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统 ssl => [ssl]","formatEN":"update system ssl => [ssl]"}
 func (b *BaseApi) UpdateSSL(c *gin.Context) {
@@ -128,9 +160,9 @@ func (b *BaseApi) UpdateSSL(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load system cert info
-// @Description 获取证书信息
 // @Success 200 {object} dto.SettingInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/ssl/info [get]
 func (b *BaseApi) LoadFromCert(c *gin.Context) {
 	info, err := settingService.LoadFromCert()
@@ -143,9 +175,9 @@ func (b *BaseApi) LoadFromCert(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Download system cert
-// @Description 下载证书
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/ssl/download [post]
 func (b *BaseApi) DownloadSSL(c *gin.Context) {
 	pathItem := path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt")
@@ -159,10 +191,10 @@ func (b *BaseApi) DownloadSSL(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load system address
-// @Description 获取系统地址信息
 // @Accept json
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/interface [get]
 func (b *BaseApi) LoadInterfaceAddr(c *gin.Context) {
 	data, err := settingService.LoadInterfaceAddr()
@@ -175,11 +207,11 @@ func (b *BaseApi) LoadInterfaceAddr(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update system bind info
-// @Description 更新系统监听信息
 // @Accept json
 // @Param request body dto.BindInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/bind/update [post]
 // @x-panel-log {"bodyKeys":["ipv6", "bindAddress"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统监听信息 => ipv6: [ipv6], 监听 IP: [bindAddress]","formatEN":"update system bind info => ipv6: [ipv6], 监听 IP: [bindAddress]"}
 func (b *BaseApi) UpdateBindInfo(c *gin.Context) {
@@ -197,11 +229,11 @@ func (b *BaseApi) UpdateBindInfo(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update system port
-// @Description 更新系统端口
 // @Accept json
 // @Param request body dto.PortUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/port/update [post]
 // @x-panel-log {"bodyKeys":["serverPort"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改系统端口 => [serverPort]","formatEN":"update system port => [serverPort]"}
 func (b *BaseApi) UpdatePort(c *gin.Context) {
@@ -219,11 +251,11 @@ func (b *BaseApi) UpdatePort(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Reset system password expired
-// @Description 重置过期系统登录密码
 // @Accept json
 // @Param request body dto.PasswordUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/expired/handle [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重置过期密码","formatEN":"reset an expired Password"}
 func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
@@ -240,10 +272,10 @@ func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
 }
 
 // @Tags System Setting
-// @Summary Load local backup dir
-// @Description 获取安装根目录
+// @Summary Load local base dir
 // @Success 200 {string} path
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/basedir [get]
 func (b *BaseApi) LoadBaseDir(c *gin.Context) {
 	helper.SuccessWithData(c, global.CONF.System.DataDir)
@@ -251,11 +283,11 @@ func (b *BaseApi) LoadBaseDir(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load mfa info
-// @Description 获取 mfa 信息
 // @Accept json
 // @Param request body dto.MfaCredential true "request"
 // @Success 200 {object} mfa.Otp
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/mfa [post]
 func (b *BaseApi) LoadMFA(c *gin.Context) {
 	var req dto.MfaRequest
@@ -274,11 +306,11 @@ func (b *BaseApi) LoadMFA(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Bind mfa
-// @Description Mfa 绑定
 // @Accept json
 // @Param request body dto.MfaCredential true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/mfa/bind [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"mfa 绑定","formatEN":"bind mfa"}
 func (b *BaseApi) MFABind(c *gin.Context) {
@@ -310,3 +342,52 @@ func (b *BaseApi) MFABind(c *gin.Context) {
 
 	helper.SuccessWithData(c, nil)
 }
+
+// @Tags System Setting
+// @Summary Generate api key
+// @Accept json
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/api/config/generate/key [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 API 接口密钥","formatEN":"generate api key"}
+func (b *BaseApi) GenerateApiKey(c *gin.Context) {
+	panelToken := c.GetHeader("1Panel-Token")
+	if panelToken != "" {
+		helper.ErrorWithDetail(c, constant.CodeErrUnauthorized, constant.ErrApiConfigDisable, nil)
+		return
+	}
+	apiKey, err := settingService.GenerateApiKey()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, apiKey)
+}
+
+// @Tags System Setting
+// @Summary Update api config
+// @Accept json
+// @Param request body dto.ApiInterfaceConfig true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/api/config/update [post]
+// @x-panel-log {"bodyKeys":["ipWhiteList"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 API 接口配置 => IP 白名单: [ipWhiteList]","formatEN":"update api config => IP White List: [ipWhiteList]"}
+func (b *BaseApi) UpdateApiConfig(c *gin.Context) {
+	panelToken := c.GetHeader("1Panel-Token")
+	if panelToken != "" {
+		helper.ErrorWithDetail(c, constant.CodeErrUnauthorized, constant.ErrApiConfigDisable, nil)
+		return
+	}
+	var req dto.ApiInterfaceConfig
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := settingService.UpdateApiConfig(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/snapshot.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags System Setting
 // @Summary Create system snapshot
-// @Description 创建系统快照
 // @Accept json
 // @Param request body dto.SnapshotCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot [post]
 // @x-panel-log {"bodyKeys":["from", "description"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建系统快照 [description] 到 [from]","formatEN":"Create system backup [description] to [from]"}
 func (b *BaseApi) CreateSnapshot(c *gin.Context) {
@@ -31,11 +31,11 @@ func (b *BaseApi) CreateSnapshot(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Import system snapshot
-// @Description 导入已有快照
 // @Accept json
 // @Param request body dto.SnapshotImport true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/import [post]
 // @x-panel-log {"bodyKeys":["from", "names"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"从 [from] 同步系统快照 [names]","formatEN":"Sync system snapshots [names] from [from]"}
 func (b *BaseApi) ImportSnapshot(c *gin.Context) {
@@ -53,11 +53,11 @@ func (b *BaseApi) ImportSnapshot(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load Snapshot status
-// @Description 获取快照状态
 // @Accept json
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/status [post]
 func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
 	var req dto.OperateByID
@@ -75,11 +75,11 @@ func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Update snapshot description
-// @Description 更新快照描述信息
 // @Accept json
 // @Param request body dto.UpdateDescription true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/description/update [post]
 // @x-panel-log {"bodyKeys":["id","description"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"快照 [name] 描述信息修改 [description]","formatEN":"The description of the snapshot [name] is modified => [description]"}
 func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
@@ -97,14 +97,14 @@ func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Page system snapshot
-// @Description 获取系统快照列表分页
 // @Accept json
-// @Param request body dto.SearchWithPage true "request"
+// @Param request body dto.PageSnapshot true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/search [post]
 func (b *BaseApi) SearchSnapshot(c *gin.Context) {
-	var req dto.SearchWithPage
+	var req dto.PageSnapshot
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -120,13 +120,35 @@ func (b *BaseApi) SearchSnapshot(c *gin.Context) {
 	})
 }
 
+// @Tags System Setting
+// @Summary Load system snapshot size
+// @Accept json
+// @Param request body dto.PageSnapshot true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /settings/snapshot/size [post]
+func (b *BaseApi) LoadSnapshotSize(c *gin.Context) {
+	var req dto.PageSnapshot
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := snapshotService.LoadSize(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
 // @Tags System Setting
 // @Summary Recover system backup
-// @Description 从系统快照恢复
 // @Accept json
 // @Param request body dto.SnapshotRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/recover [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 恢复","formatEN":"Recover from system backup [name]"}
 func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
@@ -144,11 +166,11 @@ func (b *BaseApi) RecoverSnapshot(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Rollback system backup
-// @Description 从系统快照回滚
 // @Accept json
 // @Param request body dto.SnapshotRecover true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/rollback [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"从系统快照 [name] 回滚","formatEN":"Rollback from system backup [name]"}
 func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
@@ -166,15 +188,15 @@ func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Delete system backup
-// @Description 删除系统快照
 // @Accept json
-// @Param request body dto.BatchDeleteReq true "request"
+// @Param request body dto.SnapshotBatchDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/snapshot/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"snapshots","output_column":"name","output_value":"name"}],"formatZH":"删除系统快照 [name]","formatEN":"Delete system backup [name]"}
 func (b *BaseApi) DeleteSnapshot(c *gin.Context) {
-	var req dto.BatchDeleteReq
+	var req dto.SnapshotBatchDelete
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

backend/app/api/v1/ssh.go

@@ -9,9 +9,9 @@ import (
 
 // @Tags SSH
 // @Summary Load host SSH setting info
-// @Description 加载 SSH 配置信息
 // @Success 200 {object} dto.SSHInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/search [post]
 func (b *BaseApi) GetSSHInfo(c *gin.Context) {
 	info, err := sshService.GetSSHInfo()
@@ -24,10 +24,10 @@ func (b *BaseApi) GetSSHInfo(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Operate SSH
-// @Description 修改 SSH 服务状态
 // @Accept json
 // @Param request body dto.Operate true "request"
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/operate [post]
 // @x-panel-log {"bodyKeys":["operation"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"[operation] SSH ","formatEN":"[operation] SSH"}
 func (b *BaseApi) OperateSSH(c *gin.Context) {
@@ -45,11 +45,11 @@ func (b *BaseApi) OperateSSH(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Update host SSH setting
-// @Description 更新 SSH 配置
 // @Accept json
 // @Param request body dto.SSHUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/update [post]
 // @x-panel-log {"bodyKeys":["key","value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置 [key] => [value]","formatEN":"update SSH setting [key] => [value]"}
 func (b *BaseApi) UpdateSSH(c *gin.Context) {
@@ -67,11 +67,11 @@ func (b *BaseApi) UpdateSSH(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Update host SSH setting by file
-// @Description 上传文件更新 SSH 配置
 // @Accept json
 // @Param request body dto.SSHConf true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/conffile/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"修改 SSH 配置文件","formatEN":"update SSH conf"}
 func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
@@ -89,11 +89,11 @@ func (b *BaseApi) UpdateSSHByfile(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Generate host SSH secret
-// @Description 生成 SSH 密钥
 // @Accept json
 // @Param request body dto.GenerateSSH true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/generate [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"生成 SSH 密钥 ","formatEN":"generate SSH secret"}
 func (b *BaseApi) GenerateSSH(c *gin.Context) {
@@ -111,11 +111,11 @@ func (b *BaseApi) GenerateSSH(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Load host SSH secret
-// @Description 获取 SSH 密钥
 // @Accept json
 // @Param request body dto.GenerateLoad true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/secret [post]
 func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 	var req dto.GenerateLoad
@@ -133,11 +133,11 @@ func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Load host SSH logs
-// @Description 获取 SSH 登录日志
 // @Accept json
 // @Param request body dto.SearchSSHLog true "request"
 // @Success 200 {object} dto.SSHLog
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/log [post]
 func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 	var req dto.SearchSSHLog
@@ -145,7 +145,7 @@ func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 		return
 	}
 
-	data, err := sshService.LoadLog(req)
+	data, err := sshService.LoadLog(c, req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -155,9 +155,9 @@ func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 
 // @Tags SSH
 // @Summary Load host SSH conf
-// @Description 获取 SSH 配置文件
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /host/ssh/conf [get]
 func (b *BaseApi) LoadSSHConf(c *gin.Context) {
 	data, err := sshService.LoadSSHConf()

backend/app/api/v1/terminal.go

@@ -3,11 +3,13 @@ package v1
 import (
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/copier"
@@ -77,6 +79,13 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 		global.LOG.Errorf("gin context http handler failed, err: %v", err)
 		return
 	}
+	defer wsConn.Close()
+
+	if global.CONF.System.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")) {
@@ -86,23 +95,38 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
 		return
 	}
-	redisConf, err := redisService.LoadConf()
-	if wshandleError(wsConn, errors.WithMessage(err, "load redis container failed")) {
+	name := c.Query("name")
+	from := c.Query("from")
+	commands := []string{"redis-cli"}
+	database, err := databaseService.Get(name)
+	if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
 		return
 	}
-
-	defer wsConn.Close()
-	commands := []string{"redis-cli"}
-	if len(redisConf.Requirepass) != 0 {
-		commands = []string{"redis-cli", "-a", redisConf.Requirepass, "--no-auth-warning"}
+	if from == "local" {
+		redisInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: name, Type: "redis"})
+		if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
+			return
+		}
+		name = redisInfo.ContainerName
+		if len(database.Password) != 0 {
+			commands = []string{"redis-cli", "-a", database.Password, "--no-auth-warning"}
+		}
+	} else {
+		itemPort := fmt.Sprintf("%v", database.Port)
+		commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort}
+		if len(database.Password) != 0 {
+			commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort, "-a", database.Password, "--no-auth-warning"}
+		}
+		name = "1Panel-redis-cli-tools"
 	}
-	pidMap := loadMapFromDockerTop(redisConf.ContainerName)
-	itemCmds := append([]string{"exec", "-it", redisConf.ContainerName}, commands...)
+
+	pidMap := loadMapFromDockerTop(name)
+	itemCmds := append([]string{"exec", "-it", name}, commands...)
 	slave, err := terminal.NewCommand(itemCmds)
 	if wshandleError(wsConn, err) {
 		return
 	}
-	defer killBash(redisConf.ContainerName, strings.Join(commands, " "), pidMap)
+	defer killBash(name, strings.Join(commands, " "), pidMap)
 	defer slave.Close()
 
 	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
@@ -130,6 +154,12 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
 	}
 	defer wsConn.Close()
 
+	if global.CONF.System.IsDemo {
+		if wshandleError(wsConn, errors.New("   demo server, prohibit this operation!")) {
+			return
+		}
+	}
+
 	containerID := c.Query("containerid")
 	command := c.Query("command")
 	user := c.Query("user")

backend/app/api/v1/upgrade.go

@@ -9,9 +9,9 @@ import (
 
 // @Tags System Setting
 // @Summary Load upgrade info
-// @Description 系统更新信息
 // @Success 200 {object} dto.UpgradeInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/upgrade [get]
 func (b *BaseApi) GetUpgradeInfo(c *gin.Context) {
 	info, err := upgradeService.SearchUpgrade()
@@ -24,11 +24,11 @@ func (b *BaseApi) GetUpgradeInfo(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Load release notes by version
-// @Description 获取版本 release notes
 // @Accept json
 // @Param request body dto.Upgrade true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/upgrade [get]
 func (b *BaseApi) GetNotesByVersion(c *gin.Context) {
 	var req dto.Upgrade
@@ -46,11 +46,11 @@ func (b *BaseApi) GetNotesByVersion(c *gin.Context) {
 
 // @Tags System Setting
 // @Summary Upgrade
-// @Description 系统更新
 // @Accept json
 // @Param request body dto.Upgrade true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /settings/upgrade [post]
 // @x-panel-log {"bodyKeys":["version"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新系统 => [version]","formatEN":"upgrade system => [version]"}
 func (b *BaseApi) Upgrade(c *gin.Context) {

backend/app/api/v1/website.go

@@ -1,6 +1,8 @@
 package v1
 
 import (
+	"encoding/base64"
+
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
@@ -10,11 +12,11 @@ import (
 
 // @Tags Website
 // @Summary Page websites
-// @Description 获取网站列表分页
 // @Accept json
 // @Param request body request.WebsiteSearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/search [post]
 func (b *BaseApi) PageWebsite(c *gin.Context) {
 	var req request.WebsiteSearch
@@ -34,9 +36,9 @@ func (b *BaseApi) PageWebsite(c *gin.Context) {
 
 // @Tags Website
 // @Summary List websites
-// @Description 获取网站列表
 // @Success 200 {array} response.WebsiteDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/list [get]
 func (b *BaseApi) GetWebsites(c *gin.Context) {
 	websites, err := websiteService.GetWebsites()
@@ -49,9 +51,9 @@ func (b *BaseApi) GetWebsites(c *gin.Context) {
 
 // @Tags Website
 // @Summary List website names
-// @Description 获取网站列表
 // @Success 200 {array} string
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/options [get]
 func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
 	websites, err := websiteService.GetWebsiteOptions()
@@ -64,11 +66,11 @@ func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
 
 // @Tags Website
 // @Summary Create website
-// @Description 创建网站
 // @Accept json
 // @Param request body request.WebsiteCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites [post]
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 [primaryDomain]","formatEN":"Create website [primaryDomain]"}
 func (b *BaseApi) CreateWebsite(c *gin.Context) {
@@ -76,6 +78,14 @@ func (b *BaseApi) CreateWebsite(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+	if len(req.FtpPassword) != 0 {
+		pass, err := base64.StdEncoding.DecodeString(req.FtpPassword)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.FtpPassword = string(pass)
+	}
 	err := websiteService.CreateWebsite(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -86,11 +96,11 @@ func (b *BaseApi) CreateWebsite(c *gin.Context) {
 
 // @Tags Website
 // @Summary Operate website
-// @Description 操作网站
 // @Accept json
 // @Param request body request.WebsiteOp true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/operate [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":"[operate] 网站 [domain]","formatEN":"[operate] website [domain]"}
 func (b *BaseApi) OpWebsite(c *gin.Context) {
@@ -108,11 +118,11 @@ func (b *BaseApi) OpWebsite(c *gin.Context) {
 
 // @Tags Website
 // @Summary Delete website
-// @Description 删除网站
 // @Accept json
 // @Param request body request.WebsiteDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除网站 [domain]","formatEN":"Delete website [domain]"}
 func (b *BaseApi) DeleteWebsite(c *gin.Context) {
@@ -130,11 +140,11 @@ func (b *BaseApi) DeleteWebsite(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update website
-// @Description 更新网站
 // @Accept json
 // @Param request body request.WebsiteUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/update [post]
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站 [primaryDomain]","formatEN":"Update website [primaryDomain]"}
 func (b *BaseApi) UpdateWebsite(c *gin.Context) {
@@ -151,11 +161,11 @@ func (b *BaseApi) UpdateWebsite(c *gin.Context) {
 
 // @Tags Website
 // @Summary Search website by id
-// @Description 通过 id 查询网站
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200 {object} response.WebsiteDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/:id [get]
 func (b *BaseApi) GetWebsite(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -173,11 +183,11 @@ func (b *BaseApi) GetWebsite(c *gin.Context) {
 
 // @Tags Website Nginx
 // @Summary Search website nginx by id
-// @Description 通过 id 查询网站 nginx
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/:id/config/:type [get]
 func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -197,11 +207,11 @@ func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
 
 // @Tags Website Nginx
 // @Summary Load nginx conf
-// @Description 获取 nginx 配置
 // @Accept json
 // @Param request body request.NginxScopeReq true "request"
 // @Success 200 {object} response.WebsiteNginxConfig
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/config [post]
 func (b *BaseApi) GetNginxConfig(c *gin.Context) {
 	var req request.NginxScopeReq
@@ -218,11 +228,11 @@ func (b *BaseApi) GetNginxConfig(c *gin.Context) {
 
 // @Tags Website Nginx
 // @Summary Update nginx conf
-// @Description 更新 nginx 配置
 // @Accept json
 // @Param request body request.NginxConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/config/update [post]
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"nginx 配置修改 [domain]","formatEN":"Nginx conf update [domain]"}
 func (b *BaseApi) UpdateNginxConfig(c *gin.Context) {
@@ -239,11 +249,11 @@ func (b *BaseApi) UpdateNginxConfig(c *gin.Context) {
 
 // @Tags Website HTTPS
 // @Summary Load https conf
-// @Description 获取 https 配置
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200 {object} response.WebsiteHTTPS
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/:id/https [get]
 func (b *BaseApi) GetHTTPSConfig(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -261,11 +271,11 @@ func (b *BaseApi) GetHTTPSConfig(c *gin.Context) {
 
 // @Tags Website HTTPS
 // @Summary Update https conf
-// @Description 更新 https 配置
 // @Accept json
 // @Param request body request.WebsiteHTTPSOp true "request"
 // @Success 200 {object} response.WebsiteHTTPS
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @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) {
@@ -286,11 +296,11 @@ func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Check before create website
-// @Description 网站创建前检查
 // @Accept json
 // @Param request body request.WebsiteInstallCheckReq true "request"
 // @Success 200 {array} response.WebsitePreInstallCheck
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/check [post]
 func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
 	var req request.WebsiteInstallCheckReq
@@ -307,11 +317,11 @@ func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
 
 // @Tags Website Nginx
 // @Summary Update website nginx conf
-// @Description 更新 网站 nginx 配置
 // @Accept json
 // @Param request body request.WebsiteNginxUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/nginx/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain] Nginx 配置修改","formatEN":"[domain] Nginx conf update"}
 func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
@@ -328,11 +338,11 @@ func (b *BaseApi) UpdateWebsiteNginxConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Operate website log
-// @Description 操作网站日志
 // @Accept json
 // @Param request body request.WebsiteLogReq true "request"
 // @Success 200 {object} response.WebsiteLog
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @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) {
@@ -350,11 +360,11 @@ func (b *BaseApi) OpWebsiteLog(c *gin.Context) {
 
 // @Tags Website
 // @Summary Change default server
-// @Description 操作网站日志
 // @Accept json
 // @Param request body request.WebsiteDefaultUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/default/server [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":"修改默认 server => [domain]","formatEN":"Change default server => [domain]"}
 func (b *BaseApi) ChangeDefaultServer(c *gin.Context) {
@@ -371,11 +381,11 @@ func (b *BaseApi) ChangeDefaultServer(c *gin.Context) {
 
 // @Tags Website
 // @Summary Load website php conf
-// @Description 获取网站 php 配置
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200 {object} response.PHPConfig
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/php/config/:id [get]
 func (b *BaseApi) GetWebsitePHPConfig(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -393,11 +403,11 @@ func (b *BaseApi) GetWebsitePHPConfig(c *gin.Context) {
 
 // @Tags Website PHP
 // @Summary Update website php conf
-// @Description 更新 网站 PHP 配置
 // @Accept json
 // @Param request body request.WebsitePHPConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/php/config [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"[domain] PHP 配置修改","formatEN":"[domain] PHP conf update"}
 func (b *BaseApi) UpdateWebsitePHPConfig(c *gin.Context) {
@@ -414,11 +424,11 @@ func (b *BaseApi) UpdateWebsitePHPConfig(c *gin.Context) {
 
 // @Tags Website PHP
 // @Summary Update php conf
-// @Description 更新 php 配置文件
 // @Accept json
 // @Param request body request.WebsitePHPFileUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/php/update [post]
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 配置修改 [domain]","formatEN":"Nginx conf update [domain]"}
 func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
@@ -435,11 +445,11 @@ func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
 
 // @Tags Website PHP
 // @Summary Update php version
-// @Description 变更 php 版本
 // @Accept json
 // @Param request body request.WebsitePHPVersionReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/php/version [post]
 // @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 版本变更 [domain]","formatEN":"php version update [domain]"}
 func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
@@ -456,11 +466,11 @@ func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get rewrite conf
-// @Description 获取伪静态配置
 // @Accept json
 // @Param request body request.NginxRewriteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/rewrite [post]
 func (b *BaseApi) GetRewriteConfig(c *gin.Context) {
 	var req request.NginxRewriteReq
@@ -477,11 +487,11 @@ func (b *BaseApi) GetRewriteConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update rewrite conf
-// @Description 更新伪静态配置
 // @Accept json
 // @Param request body request.NginxRewriteUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/rewrite/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":"Nginx conf rewrite update [domain]"}
 func (b *BaseApi) UpdateRewriteConfig(c *gin.Context) {
@@ -498,11 +508,11 @@ func (b *BaseApi) UpdateRewriteConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update Site Dir
-// @Description 更新网站目录
 // @Accept json
 // @Param request body request.WebsiteUpdateDir true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dir/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] 目录","formatEN":"Update  domain [domain] dir"}
 func (b *BaseApi) UpdateSiteDir(c *gin.Context) {
@@ -519,11 +529,11 @@ func (b *BaseApi) UpdateSiteDir(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update Site Dir permission
-// @Description 更新网站目录权限
 // @Accept json
 // @Param request body request.WebsiteUpdateDirPermission true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dir/permission [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新网站 [domain] 目录权限","formatEN":"Update  domain [domain] dir permission"}
 func (b *BaseApi) UpdateSiteDirPermission(c *gin.Context) {
@@ -540,11 +550,11 @@ func (b *BaseApi) UpdateSiteDirPermission(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get proxy conf
-// @Description 获取反向代理配置
 // @Accept json
 // @Param request body request.WebsiteProxyReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/proxies [post]
 func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 	var req request.WebsiteProxyReq
@@ -561,11 +571,11 @@ func (b *BaseApi) GetProxyConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update proxy conf
-// @Description 修改反向代理配置
 // @Accept json
 // @Param request body request.WebsiteProxyConfig true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/proxies/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 反向代理配置 ","formatEN":"Update domain [domain] proxy config"}
 func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
@@ -583,11 +593,11 @@ func (b *BaseApi) UpdateProxyConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update proxy file
-// @Description 更新反向代理文件
 // @Accept json
 // @Param request body request.NginxProxyUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/proxy/file [post]
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新反向代理文件 [domain]","formatEN":"Nginx conf proxy file update [domain]"}
 func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
@@ -604,11 +614,11 @@ func (b *BaseApi) UpdateProxyConfigFile(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get AuthBasic conf
-// @Description 获取密码访问配置
 // @Accept json
 // @Param request body request.NginxAuthReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/auths [post]
 func (b *BaseApi) GetAuthConfig(c *gin.Context) {
 	var req request.NginxAuthReq
@@ -625,11 +635,11 @@ func (b *BaseApi) GetAuthConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get AuthBasic conf
-// @Description 更新密码访问配置
 // @Accept json
 // @Param request body request.NginxAuthUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/auths/update [post]
 func (b *BaseApi) UpdateAuthConfig(c *gin.Context) {
 	var req request.NginxAuthUpdate
@@ -645,11 +655,11 @@ func (b *BaseApi) UpdateAuthConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get AntiLeech conf
-// @Description 获取防盗链配置
 // @Accept json
 // @Param request body request.NginxCommonReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/leech [post]
 func (b *BaseApi) GetAntiLeech(c *gin.Context) {
 	var req request.NginxCommonReq
@@ -665,12 +675,12 @@ func (b *BaseApi) GetAntiLeech(c *gin.Context) {
 }
 
 // @Tags Website
-// @Summary Update AntiLeech
-// @Description 更新防盗链配置
+// @Summary Update AntiLeech conf
 // @Accept json
 // @Param request body request.NginxAntiLeechUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/leech/update [post]
 func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 	var req request.NginxAntiLeechUpdate
@@ -686,11 +696,11 @@ func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update redirect conf
-// @Description 修改重定向配置
 // @Accept json
 // @Param request body request.NginxRedirectReq true "request"
 // @Success 200
 // @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"}
 func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
@@ -708,11 +718,11 @@ func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get redirect conf
-// @Description 获取重定向配置
 // @Accept json
 // @Param request body request.WebsiteProxyReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/redirect [post]
 func (b *BaseApi) GetRedirectConfig(c *gin.Context) {
 	var req request.WebsiteRedirectReq
@@ -729,11 +739,11 @@ func (b *BaseApi) GetRedirectConfig(c *gin.Context) {
 
 // @Tags Website
 // @Summary Update redirect file
-// @Description 更新重定向文件
 // @Accept json
 // @Param request body request.NginxRedirectUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/redirect/file [post]
 // @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新重定向文件 [domain]","formatEN":"Nginx conf redirect file update [domain]"}
 func (b *BaseApi) UpdateRedirectConfigFile(c *gin.Context) {
@@ -750,11 +760,11 @@ func (b *BaseApi) UpdateRedirectConfigFile(c *gin.Context) {
 
 // @Tags Website
 // @Summary Get website dir
-// @Description 获取网站目录配置
 // @Accept json
 // @Param request body request.WebsiteCommonReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dir [post]
 func (b *BaseApi) GetDirConfig(c *gin.Context) {
 	var req request.WebsiteCommonReq
@@ -768,3 +778,45 @@ func (b *BaseApi) GetDirConfig(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, res)
 }
+
+// @Tags Website
+// @Summary Get default html
+// @Accept json
+// @Success 200 {object} response.FileInfo
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /websites/default/html/:type [get]
+func (b *BaseApi) GetDefaultHtml(c *gin.Context) {
+	resourceType, err := helper.GetStrParamByKey(c, "type")
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		return
+	}
+	fileInfo, err := websiteService.GetDefaultHtml(resourceType)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, fileInfo)
+}
+
+// @Tags Website
+// @Summary Update default html
+// @Accept json
+// @Param request body request.WebsiteHtmlUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /websites/default/html/update [post]
+// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新默认 html","formatEN":"Update default html"}
+func (b *BaseApi) UpdateDefaultHtml(c *gin.Context) {
+	var req request.WebsiteHtmlUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteService.UpdateDefaultHtml(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithOutData(c)
+}

backend/app/api/v1/website_acme_account.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags Website Acme
 // @Summary Page website acme accounts
-// @Description 获取网站 acme 列表分页
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme/search [post]
 func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 	var req dto.PageInfo
@@ -34,11 +34,11 @@ func (b *BaseApi) PageWebsiteAcmeAccount(c *gin.Context) {
 
 // @Tags Website Acme
 // @Summary Create website acme account
-// @Description 创建网站 acme
 // @Accept json
 // @Param request body request.WebsiteAcmeAccountCreate true "request"
 // @Success 200 {object} response.WebsiteAcmeAccountDTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme [post]
 // @x-panel-log {"bodyKeys":["email"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 acme [email]","formatEN":"Create website acme [email]"}
 func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
@@ -56,11 +56,11 @@ func (b *BaseApi) CreateWebsiteAcmeAccount(c *gin.Context) {
 
 // @Tags Website Acme
 // @Summary Delete website acme account
-// @Description 删除网站 acme
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/acme/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_acme_accounts","output_column":"email","output_value":"email"}],"formatZH":"删除网站 acme [email]","formatEN":"Delete website acme [email]"}
 func (b *BaseApi) DeleteWebsiteAcmeAccount(c *gin.Context) {

backend/app/api/v1/website_ca.go

@@ -6,15 +6,18 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/gin-gonic/gin"
+	"net/http"
+	"net/url"
+	"strconv"
 )
 
 // @Tags Website CA
 // @Summary Page website ca
-// @Description 获取网站 ca 列表分页
 // @Accept json
 // @Param request body request.WebsiteCASearch true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/search [post]
 func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
 	var req request.WebsiteCASearch
@@ -34,11 +37,11 @@ func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Create website ca
-// @Description 创建网站 ca
 // @Accept json
 // @Param request body request.WebsiteCACreate true "request"
 // @Success 200 {object} request.WebsiteCACreate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ca [name]","formatEN":"Create website ca [name]"}
 func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
@@ -56,11 +59,11 @@ func (b *BaseApi) CreateWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Get website ca
-// @Description 获取网站 ca
 // @Accept json
 // @Param id path int true "id"
 // @Success 200 {object} response.WebsiteCADTO
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/{id} [get]
 func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -77,11 +80,11 @@ func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Delete website ca
-// @Description 删除网站 ca
 // @Accept json
 // @Param request body request.WebsiteCommonReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"删除网站 ca [name]","formatEN":"Delete website ca [name]"}
 func (b *BaseApi) DeleteWebsiteCA(c *gin.Context) {
@@ -98,11 +101,11 @@ func (b *BaseApi) DeleteWebsiteCA(c *gin.Context) {
 
 // @Tags Website CA
 // @Summary Obtain SSL
-// @Description 自签 SSL 证书
 // @Accept json
 // @Param request body request.WebsiteCAObtain true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/obtain [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
 func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) {
@@ -118,12 +121,12 @@ func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) {
 }
 
 // @Tags Website CA
-// @Summary Obtain SSL
-// @Description 续签 SSL 证书
+// @Summary Renew Obtain SSL
 // @Accept json
 // @Param request body request.WebsiteCAObtain true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ca/renew [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"}
 func (b *BaseApi) RenewWebsiteCA(c *gin.Context) {
@@ -142,3 +145,33 @@ func (b *BaseApi) RenewWebsiteCA(c *gin.Context) {
 	}
 	helper.SuccessWithOutData(c)
 }
+
+// @Tags Website CA
+// @Summary Download CA file
+// @Accept json
+// @Param request body request.WebsiteResourceReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router  /websites/ca/download [post]
+// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"下载 CA 证书文件 [name]","formatEN":"download ca file [name]"}
+func (b *BaseApi) DownloadCAFile(c *gin.Context) {
+	var req request.WebsiteResourceReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	file, err := websiteCAService.DownloadFile(req.ID)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	defer file.Close()
+	info, err := file.Stat()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
+	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
+	http.ServeContent(c.Writer, c.Request, info.Name(), info.ModTime(), file)
+}

backend/app/api/v1/website_dns_account.go

@@ -10,11 +10,11 @@ import (
 
 // @Tags Website DNS
 // @Summary Page website dns accounts
-// @Description 获取网站 dns 列表分页
 // @Accept json
 // @Param request body dto.PageInfo true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/search [post]
 func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 	var req dto.PageInfo
@@ -34,11 +34,11 @@ func (b *BaseApi) PageWebsiteDnsAccount(c *gin.Context) {
 
 // @Tags Website DNS
 // @Summary Create website dns account
-// @Description 创建网站 dns
 // @Accept json
 // @Param request body request.WebsiteDnsAccountCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 dns [name]","formatEN":"Create website dns [name]"}
 func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
@@ -55,11 +55,11 @@ func (b *BaseApi) CreateWebsiteDnsAccount(c *gin.Context) {
 
 // @Tags Website DNS
 // @Summary Update website dns account
-// @Description 更新网站 dns
 // @Accept json
 // @Param request body request.WebsiteDnsAccountUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/update [post]
 // @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新网站 dns [name]","formatEN":"Update website dns [name]"}
 func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
@@ -76,11 +76,11 @@ func (b *BaseApi) UpdateWebsiteDnsAccount(c *gin.Context) {
 
 // @Tags Website DNS
 // @Summary Delete website dns account
-// @Description 删除网站 dns
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/dns/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_dns_accounts","output_column":"name","output_value":"name"}],"formatZH":"删除网站 dns [name]","formatEN":"Delete website dns [name]"}
 func (b *BaseApi) DeleteWebsiteDnsAccount(c *gin.Context) {

backend/app/api/v1/website_domain.go

@@ -9,11 +9,11 @@ import (
 
 // @Tags Website Domain
 // @Summary Delete website domain
-// @Description 删除网站域名
 // @Accept json
 // @Param request body request.WebsiteDomainDelete true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/domains/del [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_domains","output_column":"domain","output_value":"domain"}],"formatZH":"删除域名 [domain]","formatEN":"Delete domain [domain]"}
 func (b *BaseApi) DeleteWebDomain(c *gin.Context) {
@@ -30,11 +30,11 @@ func (b *BaseApi) DeleteWebDomain(c *gin.Context) {
 
 // @Tags Website Domain
 // @Summary Create website domain
-// @Description 创建网站域名
 // @Accept json
 // @Param request body request.WebsiteDomainCreate true "request"
 // @Success 200 {object} model.WebsiteDomain
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/domains [post]
 // @x-panel-log {"bodyKeys":["domain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建域名 [domain]","formatEN":"Create domain [domain]"}
 func (b *BaseApi) CreateWebDomain(c *gin.Context) {
@@ -52,11 +52,11 @@ func (b *BaseApi) CreateWebDomain(c *gin.Context) {
 
 // @Tags Website Domain
 // @Summary Search website domains by websiteId
-// @Description 通过网站 id 查询域名
 // @Accept json
 // @Param websiteId path integer true "request"
 // @Success 200 {array} model.WebsiteDomain
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/domains/:websiteId [get]
 func (b *BaseApi) GetWebDomains(c *gin.Context) {
 	websiteId, err := helper.GetIntParamByKey(c, "websiteId")

backend/app/api/v1/website_ssl.go

@@ -15,11 +15,11 @@ import (
 
 // @Tags Website SSL
 // @Summary Page website ssl
-// @Description 获取网站 ssl 列表分页
 // @Accept json
 // @Param request body request.WebsiteSSLSearch true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/search [post]
 func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 	var req request.WebsiteSSLSearch
@@ -48,11 +48,11 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Create website ssl
-// @Description 创建网站 ssl
 // @Accept json
 // @Param request body request.WebsiteSSLCreate true "request"
 // @Success 200 {object} request.WebsiteSSLCreate
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl [post]
 // @x-panel-log {"bodyKeys":["primaryDomain"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"创建网站 ssl [primaryDomain]","formatEN":"Create website ssl [primaryDomain]"}
 func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
@@ -70,11 +70,11 @@ func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Apply  ssl
-// @Description 申请证书
 // @Accept json
 // @Param request body request.WebsiteSSLApply true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/obtain [post]
 // @x-panel-log {"bodyKeys":["ID"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ID","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"申请证书  [domain]","formatEN":"apply ssl [domain]"}
 func (b *BaseApi) ApplyWebsiteSSL(c *gin.Context) {
@@ -91,11 +91,11 @@ func (b *BaseApi) ApplyWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Resolve website ssl
-// @Description 解析网站 ssl
 // @Accept json
 // @Param request body request.WebsiteDNSReq true "request"
 // @Success 200 {array} response.WebsiteDNSRes
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/resolve [post]
 func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 	var req request.WebsiteDNSReq
@@ -112,11 +112,11 @@ func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Delete website ssl
-// @Description 删除网站 ssl
 // @Accept json
 // @Param request body request.WebsiteBatchDelReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/del [post]
 // @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"删除 ssl [domain]","formatEN":"Delete ssl [domain]"}
 func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
@@ -133,11 +133,11 @@ func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Search website ssl by website id
-// @Description 通过网站 id 查询 ssl
 // @Accept json
 // @Param websiteId path integer true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/website/:websiteId [get]
 func (b *BaseApi) GetWebsiteSSLByWebsiteId(c *gin.Context) {
 	websiteId, err := helper.GetIntParamByKey(c, "websiteId")
@@ -155,11 +155,11 @@ func (b *BaseApi) GetWebsiteSSLByWebsiteId(c *gin.Context) {
 
 // @Tags Website SSL
 // @Summary Search website ssl by id
-// @Description 通过 id 查询 ssl
 // @Accept json
 // @Param id path integer true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/:id [get]
 func (b *BaseApi) GetWebsiteSSLById(c *gin.Context) {
 	id, err := helper.GetParamID(c)
@@ -176,12 +176,12 @@ func (b *BaseApi) GetWebsiteSSLById(c *gin.Context) {
 }
 
 // @Tags Website SSL
-// @Summary Update ssl
-// @Description 更新 ssl
+// @Summary Update Website ssl
 // @Accept json
 // @Param request body request.WebsiteSSLUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/update [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新证书设置 [domain]","formatEN":"Update ssl config [domain]"}
 func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
@@ -197,12 +197,12 @@ func (b *BaseApi) UpdateWebsiteSSL(c *gin.Context) {
 }
 
 // @Tags Website SSL
-// @Summary Upload ssl
-// @Description 上传 ssl
+// @Summary Upload Website ssl
 // @Accept json
 // @Param request body request.WebsiteSSLUpload true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router /websites/ssl/upload [post]
 // @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"上传 ssl [type]","formatEN":"Upload ssl [type]"}
 func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
@@ -218,12 +218,12 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 }
 
 // @Tags Website SSL
-// @Summary Download SSL  file
-// @Description 下载证书文件
+// @Summary Download SSL file
 // @Accept json
 // @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
+// @Security Timestamp
 // @Router  /websites/ssl/download [post]
 // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"下载证书文件 [domain]","formatEN":"download ssl file [domain]"}
 func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
@@ -236,6 +236,7 @@ func (b *BaseApi) DownloadWebsiteSSL(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
+	defer file.Close()
 	info, err := file.Stat()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/dto/alert.go

@@ -0,0 +1,20 @@
+package dto
+
+type CreateOrUpdateAlert struct {
+	AlertTitle string `json:"alertTitle"`
+	AlertType  string `json:"alertType"`
+	AlertCount uint   `json:"alertCount"`
+	EntryID    uint   `json:"entryID"`
+}
+
+type AlertBase struct {
+	AlertType string `json:"alertType"`
+	EntryID   uint   `json:"entryID"`
+}
+
+type PushAlert struct {
+	TaskName  string `json:"taskName"`
+	AlertType string `json:"alertType"`
+	EntryID   uint   `json:"entryID"`
+	Param     string `json:"param"`
+}

backend/app/dto/app.go

@@ -37,8 +37,9 @@ type AppOssConfig struct {
 }
 
 type AppVersion struct {
-	Version  string `json:"version"`
-	DetailId uint   `json:"detailId"`
+	Version       string `json:"version"`
+	DetailId      uint   `json:"detailId"`
+	DockerCompose string `json:"dockerCompose"`
 }
 
 type AppList struct {
@@ -91,6 +92,7 @@ type AppProperty struct {
 	Website            string   `json:"website"`
 	Github             string   `json:"github"`
 	Document           string   `json:"document"`
+	Version            float64  `json:"version"`
 }
 
 type AppConfigVersion struct {
@@ -108,7 +110,8 @@ type Tag struct {
 }
 
 type AppForm struct {
-	FormFields []AppFormFields `json:"formFields"`
+	FormFields     []AppFormFields `json:"formFields"`
+	SupportVersion float64         `json:"supportVersion"`
 }
 
 type AppFormFields struct {

backend/app/dto/backup.go

@@ -35,6 +35,8 @@ type CommonBackup struct {
 	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql"`
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
+	Secret     string `json:"secret"`
+	FileName   string `json:"fileName"`
 }
 type CommonRecover struct {
 	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive WebDAV"`
@@ -42,6 +44,7 @@ type CommonRecover struct {
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 	File       string `json:"file"`
+	Secret     string `json:"secret"`
 }
 
 type RecordSearch struct {

backend/app/dto/clam.go

@@ -0,0 +1,101 @@
+package dto
+
+import (
+	"time"
+)
+
+type SearchClamWithPage struct {
+	PageInfo
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name status created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+}
+
+type ClamBaseInfo struct {
+	Version  string `json:"version"`
+	IsActive bool   `json:"isActive"`
+	IsExist  bool   `json:"isExist"`
+
+	FreshVersion  string `json:"freshVersion"`
+	FreshIsActive bool   `json:"freshIsActive"`
+	FreshIsExist  bool   `json:"freshIsExist"`
+}
+
+type ClamInfo struct {
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+
+	Name             string `json:"name"`
+	Status           string `json:"status"`
+	Path             string `json:"path"`
+	InfectedStrategy string `json:"infectedStrategy"`
+	InfectedDir      string `json:"infectedDir"`
+	LastHandleDate   string `json:"lastHandleDate"`
+	Spec             string `json:"spec"`
+	Description      string `json:"description"`
+	AlertCount       uint   `json:"alertCount"`
+}
+
+type ClamLogSearch struct {
+	PageInfo
+
+	ClamID    uint      `json:"clamID"`
+	StartTime time.Time `json:"startTime"`
+	EndTime   time.Time `json:"endTime"`
+}
+
+type ClamLogReq struct {
+	Tail       string `json:"tail"`
+	ClamName   string `json:"clamName"`
+	RecordName string `json:"recordName"`
+}
+
+type ClamFileReq struct {
+	Tail string `json:"tail"`
+	Name string `json:"name" validate:"required"`
+}
+
+type ClamLog struct {
+	Name          string `json:"name"`
+	ScanDate      string `json:"scanDate"`
+	ScanTime      string `json:"scanTime"`
+	InfectedFiles string `json:"infectedFiles"`
+	TotalError    string `json:"totalError"`
+	Status        string `json:"status"`
+}
+
+type ClamCreate struct {
+	Name             string `json:"name"`
+	Status           string `json:"status"`
+	Path             string `json:"path"`
+	InfectedStrategy string `json:"infectedStrategy"`
+	InfectedDir      string `json:"infectedDir"`
+	Spec             string `json:"spec"`
+	Description      string `json:"description"`
+	AlertCount       uint   `json:"alertCount"`
+	AlertTitle       string `json:"alertTitle"`
+}
+
+type ClamUpdate struct {
+	ID uint `json:"id"`
+
+	Name             string `json:"name"`
+	Path             string `json:"path"`
+	InfectedStrategy string `json:"infectedStrategy"`
+	InfectedDir      string `json:"infectedDir"`
+	Spec             string `json:"spec"`
+	Description      string `json:"description"`
+	AlertCount       uint   `json:"alertCount"`
+	AlertTitle       string `json:"alertTitle"`
+}
+
+type ClamUpdateStatus struct {
+	ID     uint   `json:"id"`
+	Status string `json:"status"`
+}
+
+type ClamDelete struct {
+	RemoveRecord   bool   `json:"removeRecord"`
+	RemoveInfected bool   `json:"removeInfected"`
+	Ids            []uint `json:"ids" validate:"required"`
+}

backend/app/dto/command.go

@@ -1,9 +1,9 @@
 package dto
 
 type SearchCommandWithPage struct {
-	SearchWithPage
-	OrderBy string `json:"orderBy"`
-	Order   string `json:"order"`
+	PageInfo
+	OrderBy string `json:"orderBy" validate:"required,oneof=name command created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
 	GroupID uint   `json:"groupID"`
 	Info    string `json:"info"`
 	Name    string `json:"name"`
@@ -30,3 +30,9 @@ type CommandTree struct {
 	Label    string        `json:"label"`
 	Children []CommandInfo `json:"children"`
 }
+
+type RedisCommand struct {
+	ID      uint   `json:"id"`
+	Name    string `json:"name"`
+	Command string `json:"command"`
+}

backend/app/dto/common_req.go

@@ -2,9 +2,7 @@ package dto
 
 type SearchWithPage struct {
 	PageInfo
-	Info    string `json:"info"`
-	OrderBy string `json:"orderBy"`
-	Order   string `json:"order"`
+	Info string `json:"info"`
 }
 
 type PageInfo struct {

backend/app/dto/container.go

@@ -1,13 +1,15 @@
 package dto
 
-import "time"
+import (
+	"time"
+)
 
 type PageContainer struct {
 	PageInfo
 	Name            string `json:"name"`
 	State           string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"`
-	OrderBy         string `json:"orderBy"`
-	Order           string `json:"order"`
+	OrderBy         string `json:"orderBy" validate:"required,oneof=name state created_at"`
+	Order           string `json:"order" validate:"required,oneof=null ascending descending"`
 	Filters         string `json:"filters"`
 	ExcludeAppStore bool   `json:"excludeAppStore"`
 }
@@ -114,7 +116,7 @@ type PortHelper struct {
 
 type ContainerOperation struct {
 	Names     []string `json:"names" validate:"required"`
-	Operation string   `json:"operation" validate:"required,oneof=start stop restart kill pause unpause remove"`
+	Operation string   `json:"operation" validate:"required,oneof=up start stop restart kill pause unpause remove"`
 }
 
 type ContainerRename struct {
@@ -122,8 +124,17 @@ type ContainerRename struct {
 	NewName string `json:"newName" validate:"required"`
 }
 
+type ContainerCommit struct {
+	ContainerId   string `json:"containerID" validate:"required"`
+	ContainerName string `json:"containerName"`
+	NewImageName  string `json:"newImageName"`
+	Comment       string `json:"comment"`
+	Author        string `json:"author"`
+	Pause         bool   `json:"pause"`
+}
+
 type ContainerPrune struct {
-	PruneType  string `json:"pruneType" validate:"required,oneof=container image volume network"`
+	PruneType  string `json:"pruneType" validate:"required,oneof=container image volume network buildcache"`
 	WithTagAll bool   `json:"withTagAll"`
 }
 
@@ -189,6 +200,7 @@ type ComposeInfo struct {
 	Workdir         string             `json:"workdir"`
 	Path            string             `json:"path"`
 	Containers      []ComposeContainer `json:"containers"`
+	Env             []string           `json:"env"`
 }
 type ComposeContainer struct {
 	ContainerID string `json:"containerID"`
@@ -197,20 +209,29 @@ type ComposeContainer struct {
 	State       string `json:"state"`
 }
 type ComposeCreate struct {
-	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"`
+	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" validate:"required"`
-	Operation string `json:"operation" validate:"required,oneof=start stop down"`
+	Path      string `json:"path"`
+	Operation string `json:"operation" validate:"required,oneof=up start stop down delete"`
 	WithFile  bool   `json:"withFile"`
 }
 type ComposeUpdate struct {
-	Name    string `json:"name" validate:"required"`
-	Path    string `json:"path" validate:"required"`
-	Content string `json:"content" validate:"required"`
+	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"`
+	ContainerType string `json:"containerType"`
 }

backend/app/dto/cronjob.go

@@ -1,6 +1,15 @@
 package dto
 
-import "time"
+import (
+	"time"
+)
+
+type PageCronjob struct {
+	PageInfo
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name status created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+}
 
 type CronjobCreate struct {
 	Name string `json:"name" validate:"required"`
@@ -21,10 +30,14 @@ type CronjobCreate struct {
 	BackupAccounts  string `json:"backupAccounts"`
 	DefaultDownload string `json:"defaultDownload"`
 	RetainCopies    int    `json:"retainCopies" validate:"number,min=1"`
+	Secret          string `json:"secret"`
+	AlertCount      uint   `json:"alertCount"`
+	AlertTitle      string `json:"alertTitle"`
 }
 
 type CronjobUpdate struct {
 	ID   uint   `json:"id" validate:"required"`
+	Type string `json:"type" validate:"required"`
 	Name string `json:"name" validate:"required"`
 	Spec string `json:"spec" validate:"required"`
 
@@ -42,6 +55,9 @@ type CronjobUpdate struct {
 	BackupAccounts  string `json:"backupAccounts"`
 	DefaultDownload string `json:"defaultDownload"`
 	RetainCopies    int    `json:"retainCopies" validate:"number,min=1"`
+	Secret          string `json:"secret"`
+	AlertCount      uint   `json:"alertCount"`
+	AlertTitle      string `json:"alertTitle"`
 }
 
 type CronjobUpdateStatus struct {
@@ -87,6 +103,8 @@ type CronjobInfo struct {
 
 	LastRecordTime string `json:"lastRecordTime"`
 	Status         string `json:"status"`
+	Secret         string `json:"secret"`
+	AlertCount     uint   `json:"alertCount"`
 }
 
 type SearchRecord struct {
@@ -98,12 +116,12 @@ type SearchRecord struct {
 }
 
 type Record struct {
-	ID         uint      `json:"id"`
-	StartTime  time.Time `json:"startTime"`
-	Records    string    `json:"records"`
-	Status     string    `json:"status"`
-	Message    string    `json:"message"`
-	TargetPath string    `json:"targetPath"`
-	Interval   int       `json:"interval"`
-	File       string    `json:"file"`
+	ID         uint   `json:"id"`
+	StartTime  string `json:"startTime"`
+	Records    string `json:"records"`
+	Status     string `json:"status"`
+	Message    string `json:"message"`
+	TargetPath string `json:"targetPath"`
+	Interval   int    `json:"interval"`
+	File       string `json:"file"`
 }

backend/app/dto/dashboard.go

@@ -16,10 +16,11 @@ type DashboardBase struct {
 	KernelArch           string `json:"kernelArch"`
 	KernelVersion        string `json:"kernelVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
-
-	CPUCores        int    `json:"cpuCores"`
-	CPULogicalCores int    `json:"cpuLogicalCores"`
-	CPUModelName    string `json:"cpuModelName"`
+	IpV4Addr             string `json:"ipv4Addr"`
+	SystemProxy          string `json:"SystemProxy"`
+	CPUCores             int    `json:"cpuCores"`
+	CPULogicalCores      int    `json:"cpuLogicalCores"`
+	CPUModelName         string `json:"cpuModelName"`
 
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
 }
@@ -30,6 +31,14 @@ type OsInfo struct {
 	PlatformFamily string `json:"platformFamily"`
 	KernelArch     string `json:"kernelArch"`
 	KernelVersion  string `json:"kernelVersion"`
+
+	DiskSize int64 `json:"diskSize"`
+}
+
+type DashboardReq struct {
+	Scope     string `json:"scope"`
+	IoOption  string `json:"ioOption"`
+	NetOption string `json:"netOption"`
 }
 
 type DashboardCurrent struct {
@@ -70,6 +79,7 @@ type DashboardCurrent struct {
 	NetBytesRecv uint64 `json:"netBytesRecv"`
 
 	GPUData []GPUInfo `json:"gpuData"`
+	XPUData []XPUInfo `json:"xpuData"`
 
 	ShotTime time.Time `json:"shotTime"`
 }
@@ -103,3 +113,13 @@ type GPUInfo struct {
 	MemTotal         string `json:"memTotal"`
 	FanSpeed         string `json:"fanSpeed"`
 }
+
+type XPUInfo struct {
+	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"`
+}

backend/app/dto/database.go

@@ -27,8 +27,8 @@ type MysqlDBSearch struct {
 	PageInfo
 	Info     string `json:"info"`
 	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy"`
-	Order    string `json:"order"`
+	OrderBy  string `json:"orderBy" validate:"required,oneof=name created_at"`
+	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
 type MysqlDBInfo struct {
@@ -131,7 +131,7 @@ type MysqlStatus struct {
 }
 
 type MysqlVariables struct {
-	BinlogCacheSize       string `json:"binlog_cache_size"`
+	BinlogCacheSize      string `json:"binlog_cache_size"`
 	InnodbBufferPoolSize string `json:"innodb_buffer_pool_size"`
 	InnodbLogBufferSize  string `json:"innodb_log_buffer_size"`
 	JoinBufferSize       string `json:"join_buffer_size"`
@@ -139,7 +139,7 @@ type MysqlVariables struct {
 	MaxConnections       string `json:"max_connections"`
 	MaxHeapTableSize     string `json:"max_heap_table_size"`
 	QueryCacheSize       string `json:"query_cache_size"`
-	QueryCache_type      string `json:"query_cache_type"`
+	QueryCacheType       string `json:"query_cache_type"`
 	ReadBufferSize       string `json:"read_buffer_size"`
 	ReadRndBufferSize    string `json:"read_rnd_buffer_size"`
 	SortBufferSize       string `json:"sort_buffer_size"`
@@ -165,26 +165,26 @@ type MysqlVariablesUpdateHelper struct {
 
 // redis
 type ChangeRedisPass struct {
-	Value string `json:"value" validate:"required"`
+	Database string `json:"database" validate:"required"`
+	Value    string `json:"value"`
 }
 
 type RedisConfUpdate struct {
+	Database   string `json:"database" validate:"required"`
 	Timeout    string `json:"timeout"`
 	Maxclients string `json:"maxclients"`
 	Maxmemory  string `json:"maxmemory"`
 }
 type RedisConfPersistenceUpdate struct {
+	Database    string `json:"database" validate:"required"`
 	Type        string `json:"type" validate:"required,oneof=aof rbd"`
 	Appendonly  string `json:"appendonly"`
 	Appendfsync string `json:"appendfsync"`
 	Save        string `json:"save"`
 }
-type RedisConfUpdateByFile struct {
-	File       string `json:"file" validate:"required"`
-	RestartNow bool   `json:"restartNow"`
-}
 
 type RedisConf struct {
+	Database      string `json:"database" validate:"required"`
 	Name          string `json:"name"`
 	Port          int64  `json:"port"`
 	ContainerName string `json:"containerName"`
@@ -195,18 +195,20 @@ type RedisConf struct {
 }
 
 type RedisPersistence struct {
+	Database    string `json:"database" validate:"required"`
 	Appendonly  string `json:"appendonly"`
 	Appendfsync string `json:"appendfsync"`
 	Save        string `json:"save"`
 }
 
 type RedisStatus struct {
+	Database                 string `json:"database" validate:"required"`
 	TcpPort                  string `json:"tcp_port"`
 	UptimeInDays             string `json:"uptime_in_days"`
 	ConnectedClients         string `json:"connected_clients"`
 	UsedMemory               string `json:"used_memory"`
-	UsedMemory_rss           string `json:"used_memory_rss"`
-	UsedMemory_peak          string `json:"used_memory_peak"`
+	UsedMemoryRss            string `json:"used_memory_rss"`
+	UsedMemoryPeak           string `json:"used_memory_peak"`
 	MemFragmentationRatio    string `json:"mem_fragmentation_ratio"`
 	TotalConnectionsReceived string `json:"total_connections_received"`
 	TotalCommandsProcessed   string `json:"total_commands_processed"`
@@ -217,12 +219,14 @@ type RedisStatus struct {
 }
 
 type DatabaseFileRecords struct {
+	Database  string `json:"database" validate:"required"`
 	FileName  string `json:"fileName"`
 	FileDir   string `json:"fileDir"`
 	CreatedAt string `json:"createdAt"`
 	Size      int    `json:"size"`
 }
 type RedisBackupRecover struct {
+	Database string `json:"database" validate:"required"`
 	FileName string `json:"fileName"`
 	FileDir  string `json:"fileDir"`
 }
@@ -232,8 +236,8 @@ type DatabaseSearch struct {
 	PageInfo
 	Info    string `json:"info"`
 	Type    string `json:"type"`
-	OrderBy string `json:"orderBy"`
-	Order   string `json:"order"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
 }
 
 type DatabaseInfo struct {
@@ -281,7 +285,7 @@ type DatabaseCreate struct {
 	Address  string `json:"address"`
 	Port     uint   `json:"port"`
 	Username string `json:"username" validate:"required"`
-	Password string `json:"password" validate:"required"`
+	Password string `json:"password"`
 
 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`
@@ -299,7 +303,7 @@ type DatabaseUpdate struct {
 	Address  string `json:"address"`
 	Port     uint   `json:"port"`
 	Username string `json:"username" validate:"required"`
-	Password string `json:"password" validate:"required"`
+	Password string `json:"password"`
 
 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`

backend/app/dto/database_postgresql.go

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

backend/app/dto/firewall.go

@@ -29,6 +29,17 @@ type PortRuleOperate struct {
 	Description string `json:"description"`
 }
 
+type ForwardRuleOperate struct {
+	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"`
+		Port       string `json:"port" validate:"required"`
+		TargetIP   string `json:"targetIP"`
+		TargetPort string `json:"targetPort" validate:"required"`
+	} `json:"rules"`
+}
+
 type UpdateFirewallDescription struct {
 	Type     string `json:"type"`
 	Address  string `json:"address"`

backend/app/dto/ftp.go

@@ -0,0 +1,43 @@
+package dto
+
+import (
+	"time"
+)
+
+type FtpInfo struct {
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+
+	User        string `json:"user"`
+	Password    string `json:"password"`
+	Path        string `json:"path"`
+	Status      string `json:"status"`
+	Description string `json:"description"`
+}
+
+type FtpBaseInfo struct {
+	IsActive bool `json:"isActive"`
+	IsExist  bool `json:"isExist"`
+}
+
+type FtpLogSearch struct {
+	PageInfo
+	User      string `json:"user"`
+	Operation string `json:"operation"`
+}
+
+type FtpCreate struct {
+	User        string `json:"user" validate:"required"`
+	Password    string `json:"password" validate:"required"`
+	Path        string `json:"path" validate:"required"`
+	Description string `json:"description"`
+}
+
+type FtpUpdate struct {
+	ID uint `json:"id"`
+
+	Password    string `json:"password" validate:"required"`
+	Path        string `json:"path" validate:"required"`
+	Status      string `json:"status"`
+	Description string `json:"description"`
+}

backend/app/dto/request/app.go

@@ -43,6 +43,7 @@ type AppInstalledSearch struct {
 	Update bool     `json:"update"`
 	Unused bool     `json:"unused"`
 	All    bool     `json:"all"`
+	Sync   bool     `json:"sync"`
 }
 
 type AppInstalledInfo struct {
@@ -60,15 +61,24 @@ type AppBackupDelete struct {
 }
 
 type AppInstalledOperate struct {
-	InstallId    uint                `json:"installId" validate:"required"`
-	BackupId     uint                `json:"backupId"`
-	DetailId     uint                `json:"detailId"`
-	Operate      constant.AppOperate `json:"operate" validate:"required"`
-	ForceDelete  bool                `json:"forceDelete"`
-	DeleteBackup bool                `json:"deleteBackup"`
-	DeleteDB     bool                `json:"deleteDB"`
-	Backup       bool                `json:"backup"`
-	PullImage    bool                `json:"pullImage"`
+	InstallId     uint                `json:"installId" validate:"required"`
+	BackupId      uint                `json:"backupId"`
+	DetailId      uint                `json:"detailId"`
+	Operate       constant.AppOperate `json:"operate" validate:"required"`
+	ForceDelete   bool                `json:"forceDelete"`
+	DeleteBackup  bool                `json:"deleteBackup"`
+	DeleteDB      bool                `json:"deleteDB"`
+	Backup        bool                `json:"backup"`
+	PullImage     bool                `json:"pullImage"`
+	DockerCompose string              `json:"dockerCompose"`
+}
+
+type AppInstallUpgrade struct {
+	InstallID     uint   `json:"installId"`
+	DetailID      uint   `json:"detailId"`
+	Backup        bool   `json:"backup"`
+	PullImage     bool   `json:"pullImage"`
+	DockerCompose string `json:"dockerCompose"`
 }
 
 type AppInstalledUpdate struct {
@@ -87,3 +97,8 @@ type PortUpdate struct {
 	Name string `json:"name"`
 	Port int64  `json:"port"`
 }
+
+type AppUpdateVersion struct {
+	AppInstallID  uint   `json:"appInstallID" validate:"required"`
+	UpdateVersion string `json:"updateVersion"`
+}

backend/app/dto/request/file.go

@@ -10,7 +10,8 @@ type FileOption struct {
 }
 
 type FileContentReq struct {
-	Path string `json:"path" validate:"required"`
+	Path     string `json:"path" validate:"required"`
+	IsDetail bool   `json:"isDetail"`
 }
 
 type SearchUploadWithPage struct {
@@ -54,12 +55,14 @@ type FileCompress struct {
 	Type    string   `json:"type" validate:"required"`
 	Name    string   `json:"name" validate:"required"`
 	Replace bool     `json:"replace"`
+	Secret  string   `json:"secret"`
 }
 
 type FileDeCompress struct {
-	Dst  string `json:"dst"  validate:"required"`
-	Type string `json:"type"  validate:"required"`
-	Path string `json:"path" validate:"required"`
+	Dst    string `json:"dst"  validate:"required"`
+	Type   string `json:"type"  validate:"required"`
+	Path   string `json:"path" validate:"required"`
+	Secret string `json:"secret"`
 }
 
 type FileEdit struct {
@@ -124,6 +127,7 @@ type FileReadByLineReq struct {
 	Type     string `json:"type" validate:"required"`
 	ID       uint   `json:"ID"`
 	Name     string `json:"name"`
+	Latest   bool   `json:"latest"`
 }
 
 type FileExistReq struct {

backend/app/dto/request/nginx.go

@@ -27,7 +27,7 @@ type NginxRewriteReq struct {
 type NginxRewriteUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Name      string `json:"name" validate:"required"`
-	Content   string `json:"content" validate:"required"`
+	Content   string `json:"content"`
 }
 
 type NginxProxyUpdate struct {

backend/app/dto/request/website.go

@@ -7,8 +7,8 @@ import (
 type WebsiteSearch struct {
 	dto.PageInfo
 	Name           string `json:"name"`
-	OrderBy        string `json:"orderBy"`
-	Order          string `json:"order"`
+	OrderBy        string `json:"orderBy" validate:"required,oneof=primary_domain type status created_at expire_date"`
+	Order          string `json:"order" validate:"required,oneof=null ascending descending"`
 	WebsiteGroupID uint   `json:"websiteGroupId"`
 }
 
@@ -27,6 +27,9 @@ type WebsiteCreate struct {
 	AppID        uint          `json:"appID"`
 	AppInstallID uint          `json:"appInstallID"`
 
+	FtpUser     string `json:"ftpUser"`
+	FtpPassword string `json:"ftpPassword"`
+
 	RuntimeID uint `json:"runtimeID"`
 	RuntimeConfig
 }
@@ -52,7 +55,7 @@ type WebsiteUpdate struct {
 	ID             uint   `json:"id" validate:"required"`
 	PrimaryDomain  string `json:"primaryDomain" validate:"required"`
 	Remark         string `json:"remark"`
-	WebsiteGroupID uint   `json:"webSiteGroupID" validate:"required"`
+	WebsiteGroupID uint   `json:"webSiteGroupID"`
 	ExpireDate     string `json:"expireDate"`
 	IPV6           bool   `json:"IPV6"`
 }
@@ -120,6 +123,7 @@ type WebsiteHTTPSOp struct {
 	HttpConfig      string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
 	SSLProtocol     []string `json:"SSLProtocol"`
 	Algorithm       string   `json:"algorithm"`
+	Hsts            bool     `json:"hsts"`
 }
 
 type WebsiteNginxUpdate struct {
@@ -171,20 +175,22 @@ type WebsiteUpdateDirPermission struct {
 }
 
 type WebsiteProxyConfig struct {
-	ID        uint              `json:"id" validate:"required"`
-	Operate   string            `json:"operate" validate:"required"`
-	Enable    bool              `json:"enable" `
-	Cache     bool              `json:"cache" `
-	CacheTime int               `json:"cacheTime"  `
-	CacheUnit string            `json:"cacheUnit"`
-	Name      string            `json:"name" validate:"required"`
-	Modifier  string            `json:"modifier"`
-	Match     string            `json:"match" validate:"required"`
-	ProxyPass string            `json:"proxyPass" validate:"required"`
-	ProxyHost string            `json:"proxyHost" validate:"required"`
-	Content   string            `json:"content"`
-	FilePath  string            `json:"filePath"`
-	Replaces  map[string]string `json:"replaces"`
+	ID           uint              `json:"id" validate:"required"`
+	Operate      string            `json:"operate" validate:"required"`
+	Enable       bool              `json:"enable" `
+	Cache        bool              `json:"cache" `
+	CacheTime    int               `json:"cacheTime"  `
+	CacheUnit    string            `json:"cacheUnit"`
+	Name         string            `json:"name" validate:"required"`
+	Modifier     string            `json:"modifier"`
+	Match        string            `json:"match" validate:"required"`
+	ProxyPass    string            `json:"proxyPass" validate:"required"`
+	ProxyHost    string            `json:"proxyHost" validate:"required"`
+	Content      string            `json:"content"`
+	FilePath     string            `json:"filePath"`
+	Replaces     map[string]string `json:"replaces"`
+	SNI          bool              `json:"sni"`
+	ProxySSLName string            `json:"proxySSLName"`
 }
 
 type WebsiteProxyReq struct {
@@ -204,3 +210,12 @@ type WafWebsite struct {
 	Domains []string `json:"domains"`
 	Host    []string `json:"host"`
 }
+
+type WebsiteHtmlReq struct {
+	Type string `json:"type" validate:"required"`
+}
+
+type WebsiteHtmlUpdate struct {
+	Type    string `json:"type" validate:"required"`
+	Content string `json:"content" validate:"required"`
+}

backend/app/dto/request/website_ssl.go

@@ -24,6 +24,8 @@ type WebsiteSSLCreate struct {
 	SkipDNS       bool   `json:"skipDNS"`
 	Nameserver1   string `json:"nameserver1"`
 	Nameserver2   string `json:"nameserver2"`
+	ExecShell     bool   `json:"execShell"`
+	Shell         string `json:"shell"`
 }
 
 type WebsiteDNSReq struct {
@@ -39,6 +41,7 @@ type WebsiteSSLApply struct {
 	ID           uint     `json:"ID" validate:"required"`
 	SkipDNSCheck bool     `json:"skipDNSCheck"`
 	Nameservers  []string `json:"nameservers"`
+	DisableLog   bool     `json:"disableLog"`
 }
 
 type WebsiteAcmeAccountCreate struct {
@@ -77,7 +80,7 @@ type WebsiteSSLUpdate struct {
 	PrimaryDomain string `json:"primaryDomain" validate:"required"`
 	OtherDomains  string `json:"otherDomains"`
 	Provider      string `json:"provider" validate:"required"`
-	AcmeAccountID uint   `json:"acmeAccountId" validate:"required"`
+	AcmeAccountID uint   `json:"acmeAccountId"`
 	DnsAccountID  uint   `json:"dnsAccountId"`
 	KeyType       string `json:"keyType"`
 	Apply         bool   `json:"apply"`
@@ -87,6 +90,8 @@ type WebsiteSSLUpdate struct {
 	SkipDNS       bool   `json:"skipDNS"`
 	Nameserver1   string `json:"nameserver1"`
 	Nameserver2   string `json:"nameserver2"`
+	ExecShell     bool   `json:"execShell"`
+	Shell         string `json:"shell"`
 }
 
 type WebsiteSSLUpload struct {
@@ -126,6 +131,8 @@ type WebsiteCAObtain struct {
 	Renew       bool   `json:"renew"`
 	SSLID       uint   `json:"sslID"`
 	Description string `json:"description"`
+	ExecShell   bool   `json:"execShell"`
+	Shell       string `json:"shell"`
 }
 
 type WebsiteCARenew struct {

backend/app/dto/response/app.go

@@ -10,7 +10,7 @@ import (
 )
 
 type AppRes struct {
-	Items []*AppDTO `json:"items"`
+	Items []*AppDto `json:"items"`
 	Total int64     `json:"total"`
 }
 
@@ -28,6 +28,22 @@ type AppDTO struct {
 	Tags      []model.Tag `json:"tags"`
 }
 
+type AppDto struct {
+	Name        string      `json:"name"`
+	Key         string      `json:"key"`
+	ID          uint        `json:"id"`
+	ShortDescZh string      `json:"shortDescZh"`
+	ShortDescEn string      `json:"shortDescEn"`
+	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        []model.Tag `json:"tags"`
+}
+
 type TagDTO struct {
 	model.Tag
 }
@@ -72,7 +88,38 @@ type AppInstalledDTO struct {
 	Path      string `json:"path"`
 }
 
+type AppDetail struct {
+	Website  string `json:"website"`
+	Document string `json:"document"`
+	Github   string `json:"github"`
+}
+
+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"`
+	CreatedAt     time.Time `json:"createdAt"`
+	App           AppDetail `json:"app"`
+}
+
 type DatabaseConn struct {
+	Status        string `json:"status"`
 	Username      string `json:"username"`
 	Password      string `json:"password"`
 	ContainerName string `json:"containerName"`

backend/app/dto/response/file.go

@@ -15,10 +15,12 @@ type UploadInfo struct {
 }
 
 type FileTree struct {
-	ID       string     `json:"id"`
-	Name     string     `json:"name"`
-	Path     string     `json:"path"`
-	Children []FileTree `json:"children"`
+	ID        string     `json:"id"`
+	Name      string     `json:"name"`
+	Path      string     `json:"path"`
+	IsDir     bool       `json:"isDir"`
+	Extension string     `json:"extension"`
+	Children  []FileTree `json:"children"`
 }
 
 type DirSizeRes struct {
@@ -34,9 +36,11 @@ type FileWgetRes struct {
 }
 
 type FileLineContent struct {
-	Content string `json:"content"`
-	End     bool   `json:"end"`
-	Path    string `json:"path"`
+	Content string   `json:"content"`
+	End     bool     `json:"end"`
+	Path    string   `json:"path"`
+	Total   int      `json:"total"`
+	Lines   []string `json:"lines"`
 }
 
 type FileExist struct {

backend/app/dto/response/website.go

@@ -2,6 +2,7 @@ package response
 
 import (
 	"github.com/1Panel-dev/1Panel/backend/app/model"
+	"time"
 )
 
 type WebsiteDTO struct {
@@ -11,6 +12,26 @@ type WebsiteDTO struct {
 	SitePath      string `json:"sitePath"`
 	AppName       string `json:"appName"`
 	RuntimeName   string `json:"runtimeName"`
+	SiteDir       string `gorm:"type:varchar;" json:"siteDir"`
+}
+
+type WebsiteRes struct {
+	ID            uint      `json:"id"`
+	CreatedAt     time.Time `json:"createdAt"`
+	Protocol      string    `json:"protocol"`
+	PrimaryDomain string    `json:"primaryDomain"`
+	Type          string    `json:"type"`
+	Alias         string    `json:"alias"`
+	Remark        string    `json:"remark"`
+	Status        string    `json:"status"`
+	ExpireDate    time.Time `json:"expireDate"`
+	SitePath      string    `json:"sitePath"`
+	AppName       string    `json:"appName"`
+	RuntimeName   string    `json:"runtimeName"`
+	SSLExpireDate time.Time `json:"sslExpireDate"`
+	SSLStatus     string    `json:"sslStatus"`
+	AppInstallID  uint      `json:"appInstallId"`
+	RuntimeType   string    `json:"runtimeType"`
 }
 
 type WebsiteOption struct {
@@ -37,6 +58,7 @@ type WebsiteHTTPS struct {
 	SSL         model.WebsiteSSL `json:"SSL"`
 	SSLProtocol []string         `json:"SSLProtocol"`
 	Algorithm   string           `json:"algorithm"`
+	Hsts        bool             `json:"hsts"`
 }
 
 type WebsiteLog struct {
@@ -62,3 +84,7 @@ type WebsiteDirConfig struct {
 	UserGroup string   `json:"userGroup"`
 	Msg       string   `json:"msg"`
 }
+
+type WebsiteHtmlRes struct {
+	Content string `json:"content"`
+}

backend/app/dto/setting.go

@@ -30,6 +30,7 @@ type SettingInfo struct {
 	ServerPort             string `json:"serverPort"`
 	SSL                    string `json:"ssl"`
 	SSLType                string `json:"sslType"`
+	AutoRestart            string `json:"autoRestart"`
 	BindDomain             string `json:"bindDomain"`
 	AllowIPs               string `json:"allowIPs"`
 	SecurityEntrance       string `json:"securityEntrance"`
@@ -58,6 +59,17 @@ type SettingInfo struct {
 	SnapshotIgnore string `json:"snapshotIgnore"`
 	XpackHideMenu  string `json:"xpackHideMenu"`
 	NoAuthSetting  string `json:"noAuthSetting"`
+
+	ProxyUrl        string `json:"proxyUrl"`
+	ProxyType       string `json:"proxyType"`
+	ProxyPort       string `json:"proxyPort"`
+	ProxyUser       string `json:"proxyUser"`
+	ProxyPasswd     string `json:"proxyPasswd"`
+	ProxyPasswdKeep string `json:"proxyPasswdKeep"`
+
+	ApiInterfaceStatus string `json:"apiInterfaceStatus"`
+	ApiKey             string `json:"apiKey"`
+	IpWhiteList        string `json:"ipWhiteList"`
 }
 
 type SettingUpdate struct {
@@ -66,12 +78,13 @@ type SettingUpdate struct {
 }
 
 type SSLUpdate struct {
-	SSLType string `json:"sslType" validate:"required,oneof=self select import import-paste import-local"`
-	Domain  string `json:"domain"`
-	SSL     string `json:"ssl" validate:"required,oneof=enable disable"`
-	Cert    string `json:"cert"`
-	Key     string `json:"key"`
-	SSLID   uint   `json:"sslID"`
+	SSLType     string `json:"sslType" validate:"required,oneof=self select import import-paste import-local"`
+	Domain      string `json:"domain"`
+	SSL         string `json:"ssl" validate:"required,oneof=enable disable"`
+	Cert        string `json:"cert"`
+	Key         string `json:"key"`
+	SSLID       uint   `json:"sslID"`
+	AutoRestart string `json:"autoRestart"`
 }
 type SSLInfo struct {
 	Domain   string `json:"domain"`
@@ -91,6 +104,12 @@ type PortUpdate struct {
 	ServerPort uint `json:"serverPort" validate:"required,number,max=65535,min=1"`
 }
 
+type PageSnapshot struct {
+	PageInfo
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+}
 type SnapshotStatus struct {
 	Panel      string `json:"panel"`
 	PanelInfo  string `json:"panelInfo"`
@@ -109,11 +128,17 @@ type SnapshotCreate struct {
 	From            string `json:"from" validate:"required"`
 	DefaultDownload string `json:"defaultDownload" validate:"required"`
 	Description     string `json:"description" validate:"max=256"`
+	Secret          string `json:"secret"`
 }
 type SnapshotRecover struct {
-	IsNew      bool `json:"isNew"`
-	ReDownload bool `json:"reDownload"`
-	ID         uint `json:"id" validate:"required"`
+	IsNew      bool   `json:"isNew"`
+	ReDownload bool   `json:"reDownload"`
+	ID         uint   `json:"id" validate:"required"`
+	Secret     string `json:"secret"`
+}
+type SnapshotBatchDelete struct {
+	DeleteWithFile bool   `json:"deleteWithFile"`
+	Ids            []uint `json:"ids" validate:"required"`
 }
 type SnapshotImport struct {
 	From        string   `json:"from"`
@@ -128,7 +153,7 @@ type SnapshotInfo struct {
 	DefaultDownload string    `json:"defaultDownload"`
 	Status          string    `json:"status"`
 	Message         string    `json:"message"`
-	CreatedAt       time.Time `json:"createdAt"`
+	CreatedAt       time.Time `json:"created_at"`
 	Version         string    `json:"version"`
 
 	InterruptStep    string `json:"interruptStep"`
@@ -140,6 +165,12 @@ type SnapshotInfo struct {
 	LastRollbackedAt string `json:"lastRollbackedAt"`
 }
 
+type SnapshotFile struct {
+	ID   uint   `json:"id"`
+	Name string `json:"name"`
+	Size int64  `json:"size"`
+}
+
 type UpgradeInfo struct {
 	TestVersion   string `json:"testVersion"`
 	NewVersion    string `json:"newVersion"`
@@ -160,11 +191,21 @@ type Upgrade struct {
 	Version string `json:"version" validate:"required"`
 }
 
+type ProxyUpdate struct {
+	ProxyUrl        string `json:"proxyUrl"`
+	ProxyType       string `json:"proxyType"`
+	ProxyPort       string `json:"proxyPort"`
+	ProxyUser       string `json:"proxyUser"`
+	ProxyPasswd     string `json:"proxyPasswd"`
+	ProxyPasswdKeep string `json:"proxyPasswdKeep"`
+}
+
 type CleanData struct {
 	SystemClean    []CleanTree `json:"systemClean"`
 	UploadClean    []CleanTree `json:"uploadClean"`
 	DownloadClean  []CleanTree `json:"downloadClean"`
 	SystemLogClean []CleanTree `json:"systemLogClean"`
+	ContainerClean []CleanTree `json:"containerClean"`
 }
 
 type CleanTree struct {
@@ -185,3 +226,18 @@ type Clean struct {
 	Name     string `json:"name"`
 	Size     uint64 `json:"size"`
 }
+
+type XpackHideMenu struct {
+	ID       string          `json:"id"`
+	Label    string          `json:"label"`
+	IsCheck  bool            `json:"isCheck"`
+	Title    string          `json:"title"`
+	Path     string          `json:"path,omitempty"`
+	Children []XpackHideMenu `json:"children,omitempty"`
+}
+
+type ApiInterfaceConfig struct {
+	ApiInterfaceStatus string `json:"apiInterfaceStatus"`
+	ApiKey             string `json:"apiKey"`
+	IpWhiteList        string `json:"ipWhiteList"`
+}

backend/app/model/app.go

@@ -16,7 +16,7 @@ type App struct {
 	Type               string `json:"type" gorm:"type:varchar(64);not null"`
 	Status             string `json:"status" gorm:"type:varchar(64);not null"`
 	Required           string `json:"required" gorm:"type:varchar(64);"`
-	CrossVersionUpdate bool   `json:"crossVersionUpdate"`
+	CrossVersionUpdate bool   `json:"crossVersionUpdate" yaml:"crossVersionUpdate"`
 	Limit              int    `json:"limit" gorm:"type:Integer;not null"`
 	Website            string `json:"website" gorm:"type:varchar(64);not null"`
 	Github             string `json:"github" gorm:"type:varchar(64);not null"`

backend/app/model/clam.go

@@ -0,0 +1,14 @@
+package model
+
+type Clam struct {
+	BaseModel
+
+	Name             string `gorm:"type:varchar(64);not null" json:"name"`
+	Status           string `gorm:"type:varchar(64)" json:"status"`
+	Path             string `gorm:"type:varchar(64);not null" json:"path"`
+	InfectedStrategy string `gorm:"type:varchar(64)" json:"infectedStrategy"`
+	InfectedDir      string `gorm:"type:varchar(64)" json:"infectedDir"`
+	Spec             string `gorm:"type:varchar(64)" json:"spec"`
+	EntryID          int    `gorm:"type:varchar(64)" json:"entryID"`
+	Description      string `gorm:"type:varchar(64)" json:"description"`
+}

backend/app/model/command.go

@@ -6,3 +6,9 @@ type Command struct {
 	GroupID uint   `gorm:"type:decimal" json:"groupID"`
 	Command string `gorm:"type:varchar(256);not null" json:"command"`
 }
+
+type RedisCommand struct {
+	BaseModel
+	Name    string `gorm:"type:varchar(64);unique;not null" json:"name"`
+	Command string `gorm:"type:varchar(256);not null" json:"command"`
+}