fix: 概览页磁盘信息获取增加锁 (#3100)

Refs #2825

.gitattributes

@@ -1,5 +1 @@
-*.ts linguist-language=Go
-*.js linguist-language=Go
-*.css linguist-language=Go
-*.scss linguist-language=Go
-*.html linguist-language=Go
+*.ts linguist-language=Go

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - 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 有其他想要提问的，我们欢迎到我们的官方社区进行提问。
+    url: https://1panel.cn
+    about: 如果想要进一步了解 1Panel 项目，欢迎发送邮件到 support@fit2cloud.com 进行提问。
+  - name: 反馈安全问题 (Report Security Bug)
+    url: mailto://support@fit2cloud.com
+    about: 请通过邮箱 support@fit2cloud.com 反馈安全问题 (Please report security vulnerabilities to support@fit2cloud.com)

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,12 @@
+name: 问题咨询
+description: 提出针对本项目安装部署、使用及其他方面的相关问题
+title: "[QUESTION]"
+labels: question
+assignees: wanghe-fit2cloud
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "请描述您的问题"
+    validations:
+      required: true

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

@@ -10,7 +10,7 @@ jobs:
     name: 为 PR 添加标签
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-ecosystem/action-add-labels@v1
         with:
           github_token: ${{ secrets.GITHUBTOKEN }}

.github/workflows/build-test.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: '20.2'
+          node-version: '18.14'
       - name: Build Web
         id: build_frontend
         run: |
@@ -25,10 +25,10 @@ jobs:
         env:
           NODE_OPTIONS: --max-old-space-size=8192
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.22'
+          go-version: '1.20.x'
       - name: Build Server
-        uses: goreleaser/goreleaser-action@v6
+        uses: goreleaser/goreleaser-action@v4
         with:
           args: release --snapshot --clean

.github/workflows/release-drafter.yml

@@ -11,26 +11,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: '20.2'
+          node-version: '18.14'
       - 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
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.22'
+          go-version: '1.20.x'
       - name: Build Release
-        uses: goreleaser/goreleaser-action@v6
+        uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser
           version: latest
-          args: release --skip=publish --clean
+          args: release --skip-publish --clean
       - name: Upload Assets
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/sync2gitee.yml

@@ -9,7 +9,7 @@ jobs:
         uses: Yikun/hub-mirror-action@master
         with:
           src: 'github/1Panel-dev'
-          dst: 'gitee/fit2cloud-feizhiyun'
+          dst: 'gitee/fit2cloud-xlab'
           dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
           dst_token:  ${{ secrets.GITEE_TOKEN }}
           static_list: "1Panel"

.github/workflows/tyops-check.yml

@@ -1,13 +0,0 @@
-name: Typos Check
-on: pull_request
-
-jobs:
-  run:
-    name: Spell Check with Typos
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout Actions Repository
-      uses: actions/checkout@v2
-
-    - name: Check spelling
-      uses: crate-ci/typos@master

.gitignore

@@ -16,12 +16,18 @@ build/1panel
 *.factorypath
 
 # IntelliJ IDEA
-.idea/*
-!.idea/icon.png
+.idea
 *.iws
 *.iml
 *.ipr
 
+# NetBeans
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
 
 # Test binary, built with `go test -c`
 *.test
@@ -29,7 +35,6 @@ build/1panel
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-
 # Dependency directories
 /pkg/
 backend/__debug_bin
@@ -39,9 +44,6 @@ cmd/server/web/monacoeditorwork
 cmd/server/web/index.html
 frontend/auto-imports.d.ts
 frontend/components.d.ts
-frontend/src/xpack
-backend/xpack
-*_xpack.go
 
 .history/
 dist/
@@ -51,4 +53,3 @@ install.sh
 quick_start.sh
 cmd/server/fileList.txt
 .fileList.txt
-1Panel.code-workspace

.goreleaser.yaml

@@ -13,7 +13,6 @@ builds:
   - main: ./cmd/server/main.go
     binary: 1panel
     flags:
-      - -tags=xpack
       - -trimpath
     ldflags:
       - -w -s
@@ -44,7 +43,7 @@ archives:
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  version_template: "{{ incpatch .Version }}-next"
+  name_template: "{{ incpatch .Version }}-next"
 release:
   draft: true
   mode: append

CONTRIBUTING.md

@@ -1,16 +1,11 @@
 # 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.
 
-Please submit a PR broken down into small changes bit by bit. A PR consisting of a lot of features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
+Please submit a PR broken down into small changes bit by bit. A PR consisting of a lot features and code changes may be hard to review. It is recommended to submit PRs in an incremental fashion.
 
-This [development guideline](https://1panel.cn/docs/dev_manual/dev_manual/) contains information about repository structure, how to set up development environment, how to run it, and more.
+This [development guideline](https://kubeoperator.io/docs/dev/dev_manual/) contains information about repository structure, how to setup development environment, how to run it, and more.
 
 Note: If you split your pull request to small changes, please make sure any of the changes goes to master will not break anything. Otherwise, it can not be merged until this feature complete.
 
@@ -27,4 +22,4 @@ When reporting issues, always include:
 * Snapshots or log files if needed
 
 Because the issues are open to the public, when submitting files, be sure to remove any sensitive information, e.g. user name, password, IP address, and company name. You can
-replace those parts with "REDACTED" or other strings like "****".
+replace those parts with "REDACTED" or other strings like "****".

README.md

@@ -1,34 +1,36 @@
 <p align="center"><a href="https://1panel.cn"><img src="http://1panel.oss-cn-hangzhou.aliyuncs.com/img/1panel-logo.png" alt="1Panel" width="300" /></a></p>
-<p align="center"><b>Web-based linux server management control panel</b></p>
 <p align="center"><b>现代化、开源的 Linux 服务器运维管理面板</b></p>
-<p align="center">
-  <a href="https://trendshift.io/repositories/2462" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2462" alt="1Panel-dev%2F1Panel | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-  <a href="https://hellogithub.com/repository/71791baf930149ac9b84e1acf186573f" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=71791baf930149ac9b84e1acf186573f&claim_uid=p8vB3kP5CMrthiL&theme=dark&theme=neutral" alt="Featured｜HelloGitHub" style="width: 250px; height: 55px;" width="250" height="55" /></a>
-</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="GitHub Stars"></a>
-  <a href="https://gitee.com/fit2cloud-feizhiyun/1Panel"><img src="https://gitee.com/fit2cloud-feizhiyun/1Panel/badge/star.svg?theme=gvp" alt="Gitee Stars"></a><br>
-  [<a href="docs/README_EN.md">English</a>] | [<a href="docs/README_TW.md">中文(繁體)</a>] | [<a href="docs/README_JP.md">日本語</a>]
+  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a>
+  <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>]
 </p>
 
-[![Watch the video](https://resource.fit2cloud.com/1panel/img/overview_video.png)](https://www.bilibili.com/video/BV1Mt421n7LZ/)
-
 ------------------------------
-## 什么是 1Panel？
 
-1Panel 是新一代的 Linux 服务器运维管理面板。
+1Panel 是一个现代化、开源的 Linux 服务器运维管理面板。1Panel 的功能和优势包括：
 
-- **高效管理**：用户可以通过 Web 界面轻松管理 Linux 服务器，如主机监控、文件管理、数据库管理、容器管理等；
-- **快速建站**：深度集成开源建站软件 WordPress 和 [Halo](https://github.com/halo-dev/halo/)，域名绑定、SSL 证书配置等操作一键搞定；
-- **应用商店**：精选上架各类高质量的开源工具和应用软件，协助用户轻松安装并升级；
-- **安全可靠**：基于容器管理并部署应用，实现最小的漏洞暴露面，同时提供病毒防护、防火墙和日志审计等功能；
-- **一键备份**：支持一键备份和恢复，用户可以将数据备份到各类云端存储介质，永不丢失。
+- **快速建站**：深度集成 Wordpress 和 [Halo](https://github.com/halo-dev/halo/)，域名绑定、SSL 证书配置等一键搞定；
+- **高效管理**：通过 Web 端轻松管理 Linux 服务器，包括主机监控、文件管理、数据库管理、容器管理等；
+- **安全可靠**：基于容器来管理和部署应用，最小漏洞暴露面，提供防火墙和日志审计等功能；
+- **一键备份**：支持一键备份和恢复，备份数据到各类云端存储，永不丢失；
+- **应用商店**：精选各类高质量开源工具和应用软件，助力您轻松安装和升级。
+
+## UI 展示
+
+![UI展示](https://resource.fit2cloud.com/1panel/img/overview.png)
 
 ## 快速开始
 
+**在线体验**
+
+- 环境地址：<https://demo.1panel.cn/>
+- 用户名：demo
+- 密码：1panel
+
 **一键安装**
 
 执行如下命令一键安装 1Panel:
@@ -37,26 +39,31 @@
 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://space.bilibili.com/510493147/channel/collectiondetail?sid=1199760)
 - [社区论坛](https://bbs.fit2cloud.com/c/1p/7)
 - [如何加入微信交流群?](https://bbs.fit2cloud.com/t/topic/2147)
 
-## 飞致云的其他明星项目
+## 安全说明
 
-- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - 基于 LLM 大语言模型的开源知识库问答系统
-- [JumpServer](https://github.com/jumpserver/jumpserver/) - 广受欢迎的开源堡垒机
-- [Halo](https://github.com/halo-dev/halo/) - 强大易用的开源建站工具
-- [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
-- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源持续测试工具
-- [KubePi](https://github.com/1Panel-dev/KubePi/) - 现代化、开源的 K8s 面板
+如果您在使用过程中发现任何安全问题，请通过以下方式直接联系我们：
+
+- 邮箱：support@fit2cloud.com
+- 电话：400-052-0755
+
+## 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)
+
+## FOSSA Status
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel?ref=badge_large)
 
 ## License
 
-Copyright (c) 2014-2024 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
+Copyright (c) 2014-2023 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
 
 Licensed under The GNU General Public License version 3 (GPLv3)  (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

SECURITY.md

@@ -3,6 +3,9 @@
 如果您发现安全问题，请直接联系我们：
 
 - wanghe@fit2cloud.com
+- zhengkun@fit2cloud.com
+- support@fit2cloud.com
+- 400-052-0755
 
 感谢您的支持！
 
@@ -11,5 +14,8 @@
 All security bugs should be reported to the contact as below:
 
 - wanghe@fit2cloud.com
+- zhengkun@fit2cloud.com
+- support@fit2cloud.com
+- 400-052-0755
 
 Thanks for your support!

backend/app/api/v1/app.go

@@ -137,7 +137,7 @@ func (b *BaseApi) GetAppDetailByID(c *gin.Context) {
 // @Accept json
 // @Success 200 {object} response.IgnoredApp
 // @Security ApiKeyAuth
-// @Router /apps/ignored [get]
+// @Router /apps/ingored [get]
 func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 	res, err := appService.GetIgnoredApp()
 	if err != nil {
@@ -155,7 +155,7 @@ func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 // @Success 200 {object} model.AppInstall
 // @Security ApiKeyAuth
 // @Router /apps/install [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"安装应用 [name]","formatEN":"Install app [name]"}
+// @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]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
 	var req request.AppInstallCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/app_install.go

@@ -6,6 +6,7 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 )
 
@@ -71,6 +72,10 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+	if err := global.VALID.Struct(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
 	checkData, err := appInstallService.CheckExist(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -205,13 +210,14 @@ func (b *BaseApi) GetServices(c *gin.Context) {
 // @Param appInstallId path integer true "request"
 // @Success 200 {array} dto.AppVersion
 // @Security ApiKeyAuth
-// @Router /apps/installed/update/versions [post]
+// @Router /apps/installed/:appInstallId/versions [get]
 func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
-	var req request.AppUpdateVersion
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+	appInstallId, err := helper.GetIntParamByKey(c, "appInstallId")
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
 		return
 	}
-	versions, err := appInstallService.GetUpdateVersions(req)
+	versions, err := appInstallService.GetUpdateVersions(appInstallId)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/auth.go

@@ -8,7 +8,6 @@ import (
 	"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/middleware"
 	"github.com/1Panel-dev/1Panel/backend/utils/captcha"
 	"github.com/1Panel-dev/1Panel/backend/utils/qqwry"
 	"github.com/gin-gonic/gin"
@@ -119,28 +118,7 @@ func (b *BaseApi) CheckIsSafety(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	if status == "disable" && len(code) != 0 {
-		helper.ErrorWithDetail(c, constant.CodeErrNotFound, constant.ErrTypeInternalServer, err)
-		return
-	}
-	if status == "unpass" {
-		if middleware.LoadErrCode("err-entrance") != 200 {
-			helper.ErrResponse(c, middleware.LoadErrCode("err-entrance"))
-			return
-		}
-		helper.ErrorWithDetail(c, constant.CodeErrEntrance, constant.ErrTypeInternalServer, nil)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-func (b *BaseApi) GetResponsePage(c *gin.Context) {
-	pageCode, err := authService.GetResponsePage()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, pageCode)
+	helper.SuccessWithData(c, status)
 }
 
 // @Tags Auth

backend/app/api/v1/backup.go

@@ -49,17 +49,6 @@ func (b *BaseApi) CreateBackup(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Backup Account
-// @Summary Refresh OneDrive token
-// @Description 刷新 OneDrive token
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/backup/refresh/onedrive [post]
-func (b *BaseApi) RefreshOneDriveToken(c *gin.Context) {
-	backupService.Run()
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Backup Account
 // @Summary List buckets
 // @Description 获取 bucket 列表
@@ -102,27 +91,27 @@ func (b *BaseApi) ListBuckets(c *gin.Context) {
 // @Summary Load OneDrive info
 // @Description 获取 OneDrive 信息
 // @Accept json
-// @Success 200 {object} dto.OneDriveInfo
+// @Success 200 string clientID
 // @Security ApiKeyAuth
 // @Router /settings/backup/onedrive [get]
 func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
-	data, err := backupService.LoadOneDriveInfo()
+	clientID, err := backupService.LoadOneDriveInfo()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithData(c, data)
+	helper.SuccessWithData(c, clientID)
 }
 
 // @Tags Backup Account
 // @Summary Delete backup account
 // @Description 删除备份账号
 // @Accept json
-// @Param request body dto.OperateByID true "request"
+// @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /settings/backup/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"backup_accounts","output_column":"type","output_value":"types"}],"formatZH":"删除备份账号 [types]","formatEN":"delete backup account [types]"}
+// @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]"}
 func (b *BaseApi) DeleteBackup(c *gin.Context) {
 	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -162,32 +151,6 @@ 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
-// @Router /settings/backup/record/search/bycronjob [post]
-func (b *BaseApi) SearchBackupRecordsByCronjob(c *gin.Context) {
-	var req dto.RecordSearchByCronjob
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := backupService.SearchRecordsByCronjobWithPage(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
 // @Tags Backup Account
 // @Summary Download backup record
 // @Description 下载备份记录
@@ -302,7 +265,12 @@ func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 		return
 	}
 
-	data := backupService.ListFiles(req)
+	data, err := backupService.ListFiles(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
 	helper.SuccessWithData(c, data)
 }
 
@@ -313,7 +281,7 @@ func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
 // @Param request body dto.CommonBackup true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /settings/backup/backup [post]
+// @Router /settings/backup/ [post]
 // @x-panel-log {"bodyKeys":["type","name","detailName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"备份 [type] 数据 [name][detailName]","formatEN":"backup [type] data [name][detailName]"}
 func (b *BaseApi) Backup(c *gin.Context) {
 	var req dto.CommonBackup
@@ -323,7 +291,7 @@ func (b *BaseApi) Backup(c *gin.Context) {
 
 	switch req.Type {
 	case "app":
-		if _, err := backupService.AppBackup(req); err != nil {
+		if err := backupService.AppBackup(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
@@ -332,18 +300,13 @@ func (b *BaseApi) Backup(c *gin.Context) {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
-	case constant.AppPostgresql:
-		if err := backupService.PostgresqlBackup(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
 	case "website":
 		if err := backupService.WebsiteBackup(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
 	case "redis":
-		if err := backupService.RedisBackup(req); err != nil {
+		if err := backupService.RedisBackup(); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
@@ -366,23 +329,20 @@ func (b *BaseApi) Recover(c *gin.Context) {
 		return
 	}
 
-	downloadPath, err := backupService.DownloadRecord(dto.DownloadRecord{Source: req.Source, FileDir: path.Dir(req.File), FileName: path.Base(req.File)})
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("download file failed, err: %v", err))
-		return
+	if req.Source != "LOCAL" {
+		downloadPath, err := backupService.DownloadRecord(dto.DownloadRecord{Source: req.Source, FileDir: path.Dir(req.File), FileName: path.Base(req.File)})
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("download file failed, err: %v", err))
+			return
+		}
+		req.File = downloadPath
 	}
-	req.File = downloadPath
 	switch req.Type {
 	case "mysql", "mariadb":
 		if err := backupService.MysqlRecover(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
-	case constant.AppPostgresql:
-		if err := backupService.PostgresqlRecover(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
 	case "website":
 		if err := backupService.WebsiteRecover(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -423,11 +383,6 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
-	case constant.AppPostgresql:
-		if err := backupService.PostgresqlRecoverByUpload(req); err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
 	case "app":
 		if err := backupService.AppRecover(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/clam.go

@@ -1,296 +0,0 @@
-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
-// @Description 创建扫描规则
-// @Accept json
-// @Param request body dto.ClamCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 修改扫描规则
-// @Accept json
-// @Param request body dto.ClamUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 修改扫描规则状态
-// @Accept json
-// @Param request body dto.ClamUpdateStatus true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 获取扫描规则列表分页
-// @Accept json
-// @Param request body dto.SearchClamWithPage true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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
-// @Description 获取 Clam 基础信息
-// @Accept json
-// @Success 200 {object} dto.ClamBaseInfo
-// @Security ApiKeyAuth
-// @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
-// @Description 修改 Clam 状态
-// @Accept json
-// @Param request body dto.Operate true "request"
-// @Security ApiKeyAuth
-// @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
-// @Description 清空扫描报告
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Security ApiKeyAuth
-// @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
-// @Description 获取扫描结果列表分页
-// @Accept json
-// @Param request body dto.ClamLogSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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
-// @Description 获取扫描结果详情
-// @Accept json
-// @Param request body dto.ClamLogReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 获取扫描文件
-// @Accept json
-// @Param request body dto.ClamFileReq true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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
-// @Description 更新病毒扫描配置文件
-// @Accept json
-// @Param request body dto.UpdateByNameAndFile true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 删除扫描规则
-// @Accept json
-// @Param request body dto.ClamDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 执行病毒扫描
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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

@@ -29,28 +29,6 @@ func (b *BaseApi) CreateCommand(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Redis Command
-// @Summary Save redis command
-// @Description 保存 Redis 快速命令
-// @Accept json
-// @Param request body dto.RedisCommand true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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 获取快速命令列表分页
@@ -77,32 +55,6 @@ func (b *BaseApi) SearchCommand(c *gin.Context) {
 	})
 }
 
-// @Tags Redis Command
-// @Summary Page redis commands
-// @Description 获取 redis 快速命令列表分页
-// @Accept json
-// @Param request body dto.SearchWithPage true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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 获取快速命令树
@@ -120,22 +72,6 @@ func (b *BaseApi) SearchCommandTree(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }
 
-// @Tags Redis Command
-// @Summary List redis commands
-// @Description 获取 redis 快速命令列表
-// @Success 200 {Array} dto.RedisCommand
-// @Security ApiKeyAuth
-// @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 获取快速命令列表
@@ -174,28 +110,6 @@ func (b *BaseApi) DeleteCommand(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Redis Command
-// @Summary Delete redis command
-// @Description 删除 redis 快速命令
-// @Accept json
-// @Param request body dto.BatchDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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 更新快速命令

backend/app/api/v1/container.go

@@ -7,7 +7,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
-	"strconv"
 )
 
 // @Tags Container
@@ -347,26 +346,6 @@ func (b *BaseApi) ContainerRename(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Container
-// @Summary Commit Container
-// @Description 容器提交生成新镜像
-// @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 容器操作
@@ -461,19 +440,6 @@ func (b *BaseApi) ContainerLogs(c *gin.Context) {
 	}
 }
 
-// @Description 下载容器日志
-// @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 获取容器网络列表分页

backend/app/api/v1/cronjob.go

@@ -36,12 +36,12 @@ func (b *BaseApi) CreateCronjob(c *gin.Context) {
 // @Summary Page cronjobs
 // @Description 获取计划任务分页
 // @Accept json
-// @Param request body dto.PageCronjob true "request"
+// @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
 // @Router /cronjobs/search [post]
 func (b *BaseApi) SearchCronjob(c *gin.Context) {
-	var req dto.PageCronjob
+	var req dto.SearchWithPage
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -72,7 +72,7 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
+	loc, _ := time.LoadLocation(common.LoadTimeZone())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 
@@ -95,13 +95,17 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 // @Param request body dto.OperateByID true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /cronjobs/records/log [post]
+// @Router /cronjob/record/log [post]
 func (b *BaseApi) LoadRecordLog(c *gin.Context) {
 	var req dto.OperateByID
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	content := cronjobService.LoadRecordLog(req)
+	content, err := cronjobService.LoadRecordLog(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
 	helper.SuccessWithData(c, content)
 }
 

backend/app/api/v1/dashboard.go

@@ -2,29 +2,12 @@ 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"
 )
 
-// @Tags Dashboard
-// @Summary Load os info
-// @Description 获取服务器基础数据
-// @Accept json
-// @Success 200 {object} dto.OsInfo
-// @Security ApiKeyAuth
-// @Router /dashboard/base/os [get]
-func (b *BaseApi) LoadDashboardOsInfo(c *gin.Context) {
-	data, err := dashboardService.LoadOsInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Dashboard
 // @Summary Load dashboard base info
 // @Description 获取首页基础数据
@@ -56,17 +39,25 @@ func (b *BaseApi) LoadDashboardBaseInfo(c *gin.Context) {
 // @Tags Dashboard
 // @Summary Load dashboard current info
 // @Description 获取首页实时数据
-// @Accept json、
-// @Param request body dto.DashboardReq true "request"
+// @Accept json
+// @Param ioOption path string true "request"
+// @Param netOption path string true "request"
 // @Success 200 {object} dto.DashboardCurrent
 // @Security ApiKeyAuth
-// @Router /dashboard/current [post]
+// @Router /dashboard/current/:ioOption/:netOption [get]
 func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
-	var req dto.DashboardReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+	ioOption, ok := c.Params.Get("ioOption")
+	if !ok {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error ioOption in path"))
 		return
 	}
-	data := dashboardService.LoadCurrentInfo(req)
+	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)
 	helper.SuccessWithData(c, data)
 }
 

backend/app/api/v1/database.go

@@ -1,8 +1,6 @@
 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"
@@ -23,14 +21,6 @@ func (b *BaseApi) CreateDatabase(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if req.SSL {
-		key, _ := base64.StdEncoding.DecodeString(req.ClientKey)
-		req.ClientKey = string(key)
-		cert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
-		req.ClientCert = string(cert)
-		ca, _ := base64.StdEncoding.DecodeString(req.RootCert)
-		req.RootCert = string(ca)
-	}
 
 	if err := databaseService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -53,14 +43,6 @@ func (b *BaseApi) CheckDatabase(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if req.SSL {
-		clientKey, _ := base64.StdEncoding.DecodeString(req.ClientKey)
-		req.ClientKey = string(clientKey)
-		clientCert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
-		req.ClientCert = string(clientCert)
-		rootCert, _ := base64.StdEncoding.DecodeString(req.RootCert)
-		req.RootCert = string(rootCert)
-	}
 
 	helper.SuccessWithData(c, databaseService.CheckDatabase(req))
 }
@@ -112,27 +94,6 @@ func (b *BaseApi) ListDatabase(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }
 
-// @Tags Database
-// @Summary List databases
-// @Description 获取数据库列表
-// @Success 200 {array} dto.DatabaseItem
-// @Security ApiKeyAuth
-// @Router /databases/db/item/:type [get]
-func (b *BaseApi) LoadDatabaseItems(c *gin.Context) {
-	dbType, err := helper.GetStrParamByKey(c, "type")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	list, err := databaseService.LoadItems(dbType)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, list)
-}
-
 // @Tags Database
 // @Summary Get databases
 // @Description 获取远程数据库
@@ -212,14 +173,6 @@ func (b *BaseApi) UpdateDatabase(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if req.SSL {
-		cKey, _ := base64.StdEncoding.DecodeString(req.ClientKey)
-		req.ClientKey = string(cKey)
-		cCert, _ := base64.StdEncoding.DecodeString(req.ClientCert)
-		req.ClientCert = string(cCert)
-		ca, _ := base64.StdEncoding.DecodeString(req.RootCert)
-		req.RootCert = string(ca)
-	}
 
 	if err := databaseService.Update(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/database_common.go

@@ -1,75 +0,0 @@
-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 Database Common
-// @Summary Load base info
-// @Description 获取数据库基础信息
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200 {object} dto.DBBaseInfo
-// @Security ApiKeyAuth
-// @Router /databases/common/info [post]
-func (b *BaseApi) LoadDBBaseInfo(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := dbCommonService.LoadBaseInfo(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Database Common
-// @Summary Load Database conf
-// @Description 获取数据库配置文件
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/common/load/file [post]
-func (b *BaseApi) LoadDBFile(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	content, err := dbCommonService.LoadDatabaseFile(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, content)
-}
-
-// @Tags Database Common
-// @Summary Update conf by upload file
-// @Description 上传替换配置文件
-// @Accept json
-// @Param request body dto.DBConfUpdateByFile true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.DBConfUpdateByFile
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := dbCommonService.UpdateConfByFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}

backend/app/api/v1/database_mysql.go

@@ -41,37 +41,6 @@ func (b *BaseApi) CreateMysql(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Database Mysql
-// @Summary Bind user of mysql database
-// @Description 绑定 mysql 数据库用户
-// @Accept json
-// @Param request body dto.BindUser true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/bind [post]
-// @x-panel-log {"bodyKeys":["database", "username"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"绑定 mysql 数据库名 [database] [username]","formatEN":"bind mysql database [database] [username]"}
-func (b *BaseApi) BindUser(c *gin.Context) {
-	var req dto.BindUser
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Password = string(password)
-	}
-
-	if err := mysqlService.BindUser(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Database Mysql
 // @Summary Update mysql database description
 // @Description 更新 mysql 数据库库描述信息
@@ -169,6 +138,29 @@ func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Database Mysql
+// @Summary Update mysql conf by upload file
+// @Description 上传替换 mysql 配置文件
+// @Accept json
+// @Param request body dto.MysqlConfUpdateByFile true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /databases/conffile/update [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 mysql 数据库配置信息","formatEN":"update the mysql database configuration information"}
+func (b *BaseApi) UpdateMysqlConfByFile(c *gin.Context) {
+	var req dto.MysqlConfUpdateByFile
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := mysqlService.UpdateConfByFile(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Database Mysql
 // @Summary Page mysql databases
 // @Description 获取 mysql 数据库列表分页
@@ -281,6 +273,51 @@ func (b *BaseApi) DeleteMysql(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags Database Mysql
+// @Summary Load mysql base info
+// @Description 获取 mysql 基础信息
+// @Accept json
+// @Param request body dto.OperationWithNameAndType true "request"
+// @Success 200 {object} dto.DBBaseInfo
+// @Security ApiKeyAuth
+// @Router /databases/baseinfo [post]
+func (b *BaseApi) LoadBaseinfo(c *gin.Context) {
+	var req dto.OperationWithNameAndType
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := mysqlService.LoadBaseInfo(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Database
+// @Summary Load Database file
+// @Description 获取数据库文件
+// @Accept json
+// @Param request body dto.OperationWithNameAndType true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /databases/load/file [post]
+func (b *BaseApi) LoadDatabaseFile(c *gin.Context) {
+	var req dto.OperationWithNameAndType
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	content, err := mysqlService.LoadDatabaseFile(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, content)
+}
+
 // @Tags Database Mysql
 // @Summary Load mysql remote access
 // @Description 获取 mysql 远程访问权限
@@ -294,6 +331,7 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
+
 	isRemote, err := mysqlService.LoadRemoteAccess(req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

backend/app/api/v1/database_postgresql.go

@@ -1,233 +0,0 @@
-package v1
-
-import (
-	"context"
-	"encoding/base64"
-
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Database Postgresql
-// @Summary Create postgresql database
-// @Description 创建 postgresql 数据库
-// @Accept json
-// @Param request body dto.PostgresqlDBCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.PostgresqlDBCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Password) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Password = string(password)
-	}
-
-	if _, err := postgresqlService.Create(context.Background(), req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database Postgresql
-// @Summary Bind postgresql user
-// @Description 绑定 postgresql 数据库用户
-// @Accept json
-// @Param request body dto.PostgresqlBindUser true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.PostgresqlBindUser
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := postgresqlService.BindUser(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database Postgresql
-// @Summary Update postgresql database description
-// @Description 更新 postgresql 数据库库描述信息
-// @Accept json
-// @Param request body dto.UpdateDescription true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.UpdateDescription
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := postgresqlService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database Postgresql
-// @Summary Change postgresql privileges
-// @Description 修改 postgresql 用户权限
-// @Accept json
-// @Param request body dto.ChangeDBInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.PostgresqlPrivileges
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := postgresqlService.ChangePrivileges(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database Postgresql
-// @Summary Change postgresql password
-// @Description 修改 postgresql 密码
-// @Accept json
-// @Param request body dto.ChangeDBInfo true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.ChangeDBInfo
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if len(req.Value) != 0 {
-		value, err := base64.StdEncoding.DecodeString(req.Value)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Value = string(value)
-	}
-
-	if err := postgresqlService.ChangePassword(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @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
-// @Router /databases/pg/search [post]
-func (b *BaseApi) SearchPostgresql(c *gin.Context) {
-	var req dto.PostgresqlDBSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	total, list, err := postgresqlService.SearchWithPage(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, dto.PageResult{
-		Items: list,
-		Total: total,
-	})
-}
-
-// @Tags Database Postgresql
-// @Summary Load postgresql database from remote
-// @Description 从服务器获取
-// @Accept json
-// @Param request body dto.PostgresqlLoadDB true "request"
-// @Security ApiKeyAuth
-// @Router /databases/pg/:database/load [post]
-func (b *BaseApi) LoadPostgresqlDBFromRemote(c *gin.Context) {
-	database, err := helper.GetStrParamByKey(c, "database")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	if err := postgresqlService.LoadFromRemote(database); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @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
-// @Router /databases/pg/del/check [post]
-func (b *BaseApi) DeleteCheckPostgresql(c *gin.Context) {
-	var req dto.PostgresqlDBDeleteCheck
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	apps, err := postgresqlService.DeleteCheck(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, apps)
-}
-
-// @Tags Database Postgresql
-// @Summary Delete postgresql database
-// @Description 删除 postgresql 数据库
-// @Accept json
-// @Param request body dto.PostgresqlDBDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.PostgresqlDBDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	tx, ctx := helper.GetTxAndContext()
-	if err := postgresqlService.Delete(ctx, req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		tx.Rollback()
-		return
-	}
-	tx.Commit()
-	helper.SuccessWithData(c, nil)
-}

backend/app/api/v1/database_redis.go

@@ -1,28 +1,26 @@
 package v1
 
 import (
+	"bufio"
 	"encoding/base64"
+	"fmt"
+	"os"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/backend/utils/compose"
 	"github.com/gin-gonic/gin"
 )
 
 // @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 [post]
+// @Router /databases/redis/status [get]
 func (b *BaseApi) LoadRedisStatus(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-	data, err := redisService.LoadStatus(req)
+	data, err := redisService.LoadStatus()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -34,17 +32,11 @@ 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 [post]
+// @Router /databases/redis/conf [get]
 func (b *BaseApi) LoadRedisConf(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-	data, err := redisService.LoadConf(req)
+	data, err := redisService.LoadConf()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -56,17 +48,11 @@ 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 [post]
+// @Router /databases/redis/persistence/conf [get]
 func (b *BaseApi) LoadPersistenceConf(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-	data, err := redisService.LoadPersistenceConf(req)
+	data, err := redisService.LoadPersistenceConf()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -75,25 +61,6 @@ 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
-// @Description 安装 redis cli
-// @Success 200
-// @Security ApiKeyAuth
-// @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 配置信息
@@ -168,3 +135,71 @@ 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,
+	})
+}
+
+// @Tags Database Redis
+// @Summary Update redis conf by file
+// @Description 上传更新 redis 配置信息
+// @Accept json
+// @Param request body dto.RedisConfUpdateByFile true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /databases/redis/conffile/update [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 redis 数据库配置信息","formatEN":"update the redis database configuration information"}
+func (b *BaseApi) UpdateRedisConfByFile(c *gin.Context) {
+	var req dto.RedisConfUpdateByFile
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	redisInfo, err := redisService.LoadConf()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	path := fmt.Sprintf("%s/redis/%s/conf/redis.conf", constant.AppInstallDir, redisInfo.Name)
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0640)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	defer file.Close()
+	write := bufio.NewWriter(file)
+	_, _ = write.WriteString(req.File)
+	write.Flush()
+
+	if req.RestartNow {
+		composeDir := fmt.Sprintf("%s/redis/%s/docker-compose.yml", constant.AppInstallDir, redisInfo.Name)
+		if _, err := compose.Restart(composeDir); err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+			return
+		}
+	}
+
+	helper.SuccessWithData(c, nil)
+}

backend/app/api/v1/device.go

@@ -1,236 +0,0 @@
-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 Device
-// @Summary Load device base info
-// @Description 获取设备基础信息
-// @Success 200 {object} dto.DeviceBaseInfo
-// @Security ApiKeyAuth
-// @Router /toolbox/device/base [post]
-func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) {
-	data, err := deviceService.LoadBaseInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Device
-// @Summary list time zone options
-// @Description 获取系统可用时区选项
-// @Accept json
-// @Success 200 {Array} string
-// @Security ApiKeyAuth
-// @Router /toolbox/device/zone/options [get]
-func (b *BaseApi) LoadTimeOption(c *gin.Context) {
-	list, err := deviceService.LoadTimeZone()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Device
-// @Summary load conf
-// @Description 获取系统配置文件
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/device/conf [post]
-func (b *BaseApi) LoadDeviceConf(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	list, err := deviceService.LoadConf(req.Name)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Device
-// @Summary Update device conf by file
-// @Description 通过文件修改配置
-// @Accept json
-// @Param request body dto.UpdateByNameAndFile true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/device/update/byconf [post]
-func (b *BaseApi) UpdateDeviceByFile(c *gin.Context) {
-	var req dto.UpdateByNameAndFile
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := deviceService.UpdateByConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Device
-// @Summary Update device
-// @Description 修改系统参数
-// @Accept json
-// @Param request body dto.SettingUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.SettingUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := deviceService.Update(req.Key, req.Value); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Device
-// @Summary Update device hosts
-// @Description 修改系统 hosts
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req []dto.HostHelper
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-
-	if err := deviceService.UpdateHosts(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Device
-// @Summary Update device passwd
-// @Description 修改系统密码
-// @Accept json
-// @Param request body dto.ChangePasswd true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/device/update/passwd [post]
-func (b *BaseApi) UpdateDevicePasswd(c *gin.Context) {
-	var req dto.ChangePasswd
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if len(req.Passwd) != 0 {
-		password, err := base64.StdEncoding.DecodeString(req.Passwd)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-			return
-		}
-		req.Passwd = string(password)
-	}
-	if err := deviceService.UpdatePasswd(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Device
-// @Summary Update device swap
-// @Description 修改系统 Swap
-// @Accept json
-// @Param request body dto.SwapHelper true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.SwapHelper
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := deviceService.UpdateSwap(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Device
-// @Summary Check device DNS conf
-// @Description 检查系统 DNS 配置可用性
-// @Accept json
-// @Param request body dto.SettingUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/device/check/dns [post]
-func (b *BaseApi) CheckDNS(c *gin.Context) {
-	var req dto.SettingUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	data, err := deviceService.CheckDNS(req.Key, req.Value)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Device
-// @Summary Scan system
-// @Description 扫描系统垃圾文件
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/scan [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
-func (b *BaseApi) ScanSystem(c *gin.Context) {
-	helper.SuccessWithData(c, deviceService.Scan())
-}
-
-// @Tags Device
-// @Summary Clean system
-// @Description 清理系统垃圾文件
-// @Accept json
-// @Param request body []dto.Clean true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/clean [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
-func (b *BaseApi) SystemClean(c *gin.Context) {
-	var req []dto.Clean
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-
-	deviceService.Clean(req)
-
-	helper.SuccessWithData(c, nil)
-}

backend/app/api/v1/docker.go

@@ -61,7 +61,7 @@ func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/daemonjson/update [post]
-// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置 [key]","formatEN":"Updated configuration [key]"}
+// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置 [key]=>[value]","formatEN":"Updated the docker daemon.json configuration [key]=>[value]"}
 func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 	var req dto.SettingUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -83,8 +83,8 @@ func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 // @Param request body dto.LogOption true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /containers/logoption/update [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新日志配置","formatEN":"Updated the log option"}
+// @Router /containers/daemonjson/update [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 日志配置","formatEN":"Updated the docker daemon.json log option"}
 func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	var req dto.LogOption
 	if err := helper.CheckBind(&req, c); err != nil {
@@ -99,29 +99,6 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @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
-// @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) {
-	var req dto.Ipv6Option
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-
-	if err := dockerService.UpdateIpv6Option(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Container Docker
 // @Summary Update docker daemon.json by upload file
 // @Description 上传替换 docker 配置文件
@@ -130,7 +107,7 @@ func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/daemonjson/update/byfile [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置文件","formatEN":"Updated configuration file"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置","formatEN":"Updated the docker daemon.json configuration"}
 func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 	var req dto.DaemonJsonUpdateByFile
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/entry.go

@@ -21,11 +21,9 @@ var (
 	imageService           = service.NewIImageService()
 	dockerService          = service.NewIDockerService()
 
-	dbCommonService   = service.NewIDBCommonService()
-	mysqlService      = service.NewIMysqlService()
-	postgresqlService = service.NewIPostgresqlService()
-	databaseService   = service.NewIDatabaseService()
-	redisService      = service.NewIRedisService()
+	mysqlService    = service.NewIMysqlService()
+	databaseService = service.NewIDatabaseService()
+	redisService    = service.NewIRedisService()
 
 	cronjobService = service.NewICronjobService()
 
@@ -35,11 +33,6 @@ var (
 	sshService      = service.NewISSHService()
 	firewallService = service.NewIFirewallService()
 
-	deviceService   = service.NewIDeviceService()
-	fail2banService = service.NewIFail2BanService()
-	ftpService      = service.NewIFtpService()
-	clamService     = service.NewIClamService()
-
 	settingService = service.NewISettingService()
 	backupService  = service.NewIBackupService()
 
@@ -56,14 +49,11 @@ var (
 	snapshotService = service.NewISnapshotService()
 	upgradeService  = service.NewIUpgradeService()
 
-	runtimeService       = service.NewRuntimeService()
-	processService       = service.NewIProcessService()
-	phpExtensionsService = service.NewIPHPExtensionsService()
+	runtimeService = service.NewRuntimeService()
+	processService = service.NewIProcessService()
 
 	hostToolService = service.NewIHostToolService()
 
 	recycleBinService = service.NewIRecycleBinService()
 	favoriteService   = service.NewIFavoriteService()
-
-	websiteCAService = service.NewIWebsiteCAService()
 )

backend/app/api/v1/fail2ban.go

@@ -1,153 +0,0 @@
-package v1
-
-import (
-	"os"
-
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Fail2ban
-// @Summary Load fail2ban base info
-// @Description 获取 Fail2ban 基础信息
-// @Success 200 {object} dto.Fail2BanBaseInfo
-// @Security ApiKeyAuth
-// @Router /toolbox/fail2ban/base [get]
-func (b *BaseApi) LoadFail2BanBaseInfo(c *gin.Context) {
-	data, err := fail2banService.LoadBaseInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}
-
-// @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
-// @Router /toolbox/fail2ban/search [post]
-func (b *BaseApi) SearchFail2Ban(c *gin.Context) {
-	var req dto.Fail2BanSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	list, err := fail2banService.Search(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Fail2ban
-// @Summary Operate fail2ban
-// @Description 修改 Fail2ban 状态
-// @Accept json
-// @Param request body dto.Operate true "request"
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.Operate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := fail2banService.Operate(req.Operation); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Fail2ban
-// @Summary Operate sshd of fail2ban
-// @Description 配置 sshd
-// @Accept json
-// @Param request body dto.Operate true "request"
-// @Security ApiKeyAuth
-// @Router /toolbox/fail2ban/operate/sshd [post]
-func (b *BaseApi) OperateSSHD(c *gin.Context) {
-	var req dto.Fail2BanSet
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := fail2banService.OperateSSHD(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Fail2ban
-// @Summary Update fail2ban conf
-// @Description 修改 Fail2ban 配置
-// @Accept json
-// @Param request body dto.Fail2BanUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req dto.Fail2BanUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := fail2banService.UpdateConf(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Fail2ban
-// @Summary Load fail2ban conf
-// @Description 获取 fail2ban 配置文件
-// @Accept json
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/fail2ban/load/conf [get]
-func (b *BaseApi) LoadFail2BanConf(c *gin.Context) {
-	path := "/etc/fail2ban/jail.local"
-	file, err := os.ReadFile(path)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, string(file))
-}
-
-// @Tags Fail2ban
-// @Summary Update fail2ban conf by file
-// @Description 通过文件修改 fail2ban 配置
-// @Accept json
-// @Param request body dto.UpdateByFile true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /toolbox/fail2ban/update/byconf [post]
-func (b *BaseApi) UpdateFail2BanConfByFile(c *gin.Context) {
-	var req dto.UpdateByFile
-	if err := helper.CheckBind(&req, c); err != nil {
-		return
-	}
-	if err := fail2banService.UpdateConfByFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}

backend/app/api/v1/file.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -302,91 +301,28 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	uploadFiles := form.File["file"]
+	files := form.File["file"]
 	paths := form.Value["path"]
-
-	overwrite := true
-	if ow, ok := form.Value["overwrite"]; ok {
-		if len(ow) != 0 {
-			parseBool, _ := strconv.ParseBool(ow[0])
-			overwrite = parseBool
-		}
-	}
-
 	if len(paths) == 0 || !strings.Contains(paths[0], "/") {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error paths in request"))
 		return
 	}
 	dir := path.Dir(paths[0])
-
-	_, err = os.Stat(dir)
-	if err != nil && os.IsNotExist(err) {
-		mode, err := files.GetParentMode(dir)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
-		if err = os.MkdirAll(dir, mode); err != nil {
+	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(dir, os.ModePerm); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("mkdir %s failed, err: %v", dir, err))
 			return
 		}
 	}
-	info, err := os.Stat(dir)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	mode := info.Mode()
-	fileOp := files.NewFileOp()
-	stat, ok := info.Sys().(*syscall.Stat_t)
-	uid, gid := -1, -1
-	if ok {
-		uid, gid = int(stat.Uid), int(stat.Gid)
-	}
-
 	success := 0
 	failures := make(buserr.MultiErr)
-	for _, file := range uploadFiles {
-		dstFilename := path.Join(paths[0], file.Filename)
-		dstDir := path.Dir(dstFilename)
-		if !fileOp.Stat(dstDir) {
-			if err = fileOp.CreateDir(dstDir, mode); err != nil {
-				e := fmt.Errorf("create dir [%s] failed, err: %v", path.Dir(dstFilename), err)
-				failures[file.Filename] = e
-				global.LOG.Error(e)
-				continue
-			}
-			_ = os.Chown(dstDir, uid, gid)
-		}
-		tmpFilename := dstFilename + ".tmp"
-		if err := c.SaveUploadedFile(file, tmpFilename); err != nil {
-			_ = os.Remove(tmpFilename)
+	for _, file := range files {
+		if err := c.SaveUploadedFile(file, path.Join(paths[0], file.Filename)); err != nil {
 			e := fmt.Errorf("upload [%s] file failed, err: %v", file.Filename, err)
 			failures[file.Filename] = e
 			global.LOG.Error(e)
 			continue
 		}
-		dstInfo, statErr := os.Stat(dstFilename)
-		if overwrite {
-			_ = os.Remove(dstFilename)
-		}
-
-		err = os.Rename(tmpFilename, dstFilename)
-		if err != nil {
-			_ = os.Remove(tmpFilename)
-			e := fmt.Errorf("upload [%s] file failed, err: %v", file.Filename, err)
-			failures[file.Filename] = e
-			global.LOG.Error(e)
-			continue
-		}
-		if statErr == nil {
-			_ = os.Chmod(dstFilename, dstInfo.Mode())
-		} else {
-			_ = os.Chmod(dstFilename, mode)
-		}
-		if uid != -1 && gid != -1 {
-			_ = os.Chown(dstFilename, uid, gid)
-		}
 		success++
 	}
 	if success == 0 {
@@ -486,16 +422,17 @@ func (b *BaseApi) MoveFile(c *gin.Context) {
 // @Summary Download file
 // @Description 下载文件
 // @Accept json
+// @Param request body request.FileDownload true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /files/download [get]
+// @Router /files/download [post]
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载文件 [name]","formatEN":"Download file [name]"}
 func (b *BaseApi) Download(c *gin.Context) {
 	filePath := c.Query("path")
 	file, err := os.Open(filePath)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 	}
-	defer file.Close()
 	info, _ := file.Stat()
 	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
 	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
@@ -601,46 +538,20 @@ func (b *BaseApi) Size(c *gin.Context) {
 	helper.SuccessWithData(c, res)
 }
 
-func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int, overwrite bool) error {
-	defer func() {
-		_ = os.RemoveAll(fileDir)
-	}()
-
+func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int) error {
 	op := files.NewFileOp()
 	dstDir = strings.TrimSpace(dstDir)
-	mode, _ := files.GetParentMode(dstDir)
-	if mode == 0 {
-		mode = 0755
-	}
-	uid, gid := -1, -1
-	if info, err := os.Stat(dstDir); err != nil {
-		if os.IsNotExist(err) {
-			if err = op.CreateDir(dstDir, mode); err != nil {
-				return err
-			}
-		}
-	} else {
-		stat, ok := info.Sys().(*syscall.Stat_t)
-		if ok {
-			uid, gid = int(stat.Uid), int(stat.Gid)
+	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
+		if err = op.CreateDir(dstDir, os.ModePerm); err != nil {
+			return err
 		}
 	}
-	dstFileName := filepath.Join(dstDir, fileName)
-	dstInfo, statErr := os.Stat(dstFileName)
-	if statErr == nil {
-		mode = dstInfo.Mode()
-	} else {
-		mode = 0644
-	}
-
-	if overwrite {
-		_ = os.Remove(dstFileName)
-	}
-	targetFile, err := os.OpenFile(dstFileName, os.O_RDWR|os.O_CREATE, mode)
+	targetFile, err := os.Create(filepath.Join(dstDir, fileName))
 	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)
@@ -651,13 +562,9 @@ 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 nil
+	return files.NewFileOp().DeleteDir(fileDir)
 }
 
 // @Tags File
@@ -679,7 +586,6 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	defer uploadFile.Close()
 	chunkIndex, err := strconv.Atoi(c.PostForm("chunkIndex"))
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
@@ -739,11 +645,7 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 	}
 
 	if chunkIndex+1 == chunkCount {
-		overwrite := true
-		if ow := c.PostForm("overwrite"); ow != "" {
-			overwrite, _ = strconv.ParseBool(ow)
-		}
-		err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount, overwrite)
+		err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, buserr.WithMap(constant.ErrFileUpload, map[string]interface{}{"name": filename, "detail": err.Error()}, err))
 			return
@@ -783,7 +685,7 @@ func (b *BaseApi) Keys(c *gin.Context) {
 
 // @Tags File
 // @Summary Read file by Line
-// @Description 按行读取日志文件
+// @Description 按行读取文件
 // @Param request body request.FileReadByLineReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
@@ -793,11 +695,15 @@ func (b *BaseApi) ReadFileByLine(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	res, err := fileService.ReadLogByLine(req)
+	lines, end, err := files.ReadFileByLine(req.Path, req.Page, req.PageSize)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
 	}
+	res := response.FileLineContent{
+		End: end,
+	}
+	res.Path = req.Path
+	res.Content = strings.Join(lines, "\n")
 	helper.SuccessWithData(c, res)
 }
 

backend/app/api/v1/firewall.go

@@ -94,29 +94,6 @@ func (b *BaseApi) OperatePortRule(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// OperateForwardRule
-// @Tags Firewall
-// @Summary Create group
-// @Description 更新防火墙端口转发规则
-// @Accept json
-// @Param request body dto.ForwardRuleOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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 group
 // @Description 创建防火墙 IP 规则

backend/app/api/v1/ftp.go

@@ -1,199 +0,0 @@
-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
-// @Description 获取 FTP 基础信息
-// @Success 200 {object} dto.FtpBaseInfo
-// @Security ApiKeyAuth
-// @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
-// @Description 获取 FTP 操作日志
-// @Accept json
-// @Param request body dto.FtpLogSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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
-// @Description 修改 FTP 状态
-// @Accept json
-// @Param request body dto.Operate true "request"
-// @Security ApiKeyAuth
-// @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
-// @Description 获取 FTP 账户列表分页
-// @Accept json
-// @Param request body dto.SearchWithPage true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @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
-// @Description 创建 FTP 账户
-// @Accept json
-// @Param request body dto.FtpCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 删除 FTP 账户
-// @Accept json
-// @Param request body dto.BatchDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 同步 FTP 账户
-// @Accept json
-// @Param request body dto.BatchDeleteReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Description 修改 FTP 账户
-// @Accept json
-// @Param request body dto.FtpUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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/helper/helper.go

@@ -133,8 +133,3 @@ func CheckBind(req interface{}, c *gin.Context) error {
 	}
 	return nil
 }
-
-func ErrResponse(ctx *gin.Context, code int) {
-	ctx.JSON(code, nil)
-	ctx.Abort()
-}

backend/app/api/v1/image.go

@@ -35,24 +35,8 @@ func (b *BaseApi) SearchImage(c *gin.Context) {
 }
 
 // @Tags Container Image
-// @Summary List all images
-// @Description 获取所有镜像列表
-// @Produce json
-// @Success 200 {array} dto.ImageInfo
-// @Security ApiKeyAuth
-// @Router /containers/image/all [get]
-func (b *BaseApi) ListAllImage(c *gin.Context) {
-	list, err := imageService.ListAll()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Container Image
-// @Summary load images options
-// @Description 获取镜像名称列表
+// @Summary List images
+// @Description 获取镜像列表
 // @Produce json
 // @Success 200 {array} dto.Options
 // @Security ApiKeyAuth

backend/app/api/v1/monitor.go

@@ -15,27 +15,20 @@ import (
 	"github.com/shirou/gopsutil/v3/net"
 )
 
-// @Tags Monitor
-// @Summary Load monitor datas
-// @Description 获取监控数据
-// @Param request body dto.MonitorSearch true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /hosts/monitor/search [post]
 func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	var req dto.MonitorSearch
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
+	loc, _ := time.LoadLocation(common.LoadTimeZone())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 
 	var backdatas []dto.MonitorData
 	if req.Param == "all" || req.Param == "cpu" || req.Param == "memory" || req.Param == "load" {
 		var bases []model.MonitorBase
-		if err := global.MonitorDB.
+		if err := global.DB.
 			Where("created_at > ? AND created_at < ?", req.StartTime, req.EndTime).
 			Find(&bases).Error; err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -52,7 +45,7 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	}
 	if req.Param == "all" || req.Param == "io" {
 		var bases []model.MonitorIO
-		if err := global.MonitorDB.
+		if err := global.DB.
 			Where("created_at > ? AND created_at < ?", req.StartTime, req.EndTime).
 			Find(&bases).Error; err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -69,7 +62,7 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	}
 	if req.Param == "all" || req.Param == "network" {
 		var bases []model.MonitorNetwork
-		if err := global.MonitorDB.
+		if err := global.DB.
 			Where("name = ? AND created_at > ? AND created_at < ?", req.Info, req.StartTime, req.EndTime).
 			Find(&bases).Error; err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -87,30 +80,6 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 	helper.SuccessWithData(c, backdatas)
 }
 
-// @Tags Monitor
-// @Summary Clean monitor datas
-// @Description 清空监控数据
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /hosts/monitor/clean [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空监控数据","formatEN":"clean monitor datas"}
-func (b *BaseApi) CleanMonitor(c *gin.Context) {
-	if err := global.MonitorDB.Exec("DELETE FROM monitor_bases").Error; err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	if err := global.MonitorDB.Exec("DELETE FROM monitor_ios").Error; err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	if err := global.MonitorDB.Exec("DELETE FROM monitor_networks").Error; err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
 func (b *BaseApi) GetNetworkOptions(c *gin.Context) {
 	netStat, _ := net.IOCounters(true)
 	var options []string

backend/app/api/v1/nginx.go

@@ -12,7 +12,7 @@ import (
 // @Description 获取 OpenResty 配置信息
 // @Success 200 {object} response.FileInfo
 // @Security ApiKeyAuth
-// @Router /openresty [get]
+// @Router /openResty [get]
 func (b *BaseApi) GetNginx(c *gin.Context) {
 	fileInfo, err := nginxService.GetNginxConfig()
 	if err != nil {
@@ -29,7 +29,7 @@ func (b *BaseApi) GetNginx(c *gin.Context) {
 // @Param request body request.NginxScopeReq true "request"
 // @Success 200 {array} response.NginxParam
 // @Security ApiKeyAuth
-// @Router /openresty/scope [post]
+// @Router /openResty/scope [post]
 func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 	var req request.NginxScopeReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -51,7 +51,7 @@ func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {
 // @Param request body request.NginxConfigUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /openresty/update [post]
+// @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) {
 	var req request.NginxConfigUpdate
@@ -70,7 +70,7 @@ func (b *BaseApi) UpdateNginxConfigByScope(c *gin.Context) {
 // @Description 获取 OpenResty 状态信息
 // @Success 200 {object} response.NginxStatus
 // @Security ApiKeyAuth
-// @Router /openresty/status [get]
+// @Router /openResty/status [get]
 func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 	res, err := nginxService.GetStatus()
 	if err != nil {
@@ -87,7 +87,7 @@ func (b *BaseApi) GetNginxStatus(c *gin.Context) {
 // @Param request body request.NginxConfigFileUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @Router /openresty/file [post]
+// @Router /openResty/file [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 nginx 配置","formatEN":"Update nginx conf"}
 func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
 	var req request.NginxConfigFileUpdate
@@ -101,18 +101,3 @@ func (b *BaseApi) UpdateNginxFile(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, nil)
 }
-
-// @Tags OpenResty
-// @Summary Clear OpenResty proxy cache
-// @Description 清理 OpenResty 代理缓存
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /openresty/clear [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理 Openresty 代理缓存","formatEN":"Clear nginx proxy cache"}
-func (b *BaseApi) ClearNginxProxyCache(c *gin.Context) {
-	if err := nginxService.ClearProxyCache(); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}

backend/app/api/v1/php_extensions.go

@@ -1,103 +0,0 @@
-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/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags PHP Extensions
-// @Summary Page Extensions
-// @Description Page Extensions
-// @Accept json
-// @Param request body request.PHPExtensionsSearch true "request"
-// @Success 200 {array} response.PHPExtensionsDTO
-// @Security ApiKeyAuth
-// @Router /runtimes/php/extensions/search [post]
-func (b *BaseApi) PagePHPExtensions(c *gin.Context) {
-	var req request.PHPExtensionsSearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if req.All {
-		list, err := phpExtensionsService.List()
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
-		helper.SuccessWithData(c, list)
-	} else {
-		total, list, err := phpExtensionsService.Page(req)
-		if err != nil {
-			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-			return
-		}
-		helper.SuccessWithData(c, dto.PageResult{
-			Total: total,
-			Items: list,
-		})
-	}
-
-}
-
-// @Tags PHP Extensions
-// @Summary Create Extensions
-// @Description Create Extensions
-// @Accept json
-// @Param request body request.PHPExtensionsCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /runtimes/php/extensions [post]
-func (b *BaseApi) CreatePHPExtensions(c *gin.Context) {
-	var req request.PHPExtensionsCreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := phpExtensionsService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags PHP Extensions
-// @Summary Update Extensions
-// @Description Update Extensions
-// @Accept json
-// @Param request body request.PHPExtensionsUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /runtimes/php/extensions/update [post]
-func (b *BaseApi) UpdatePHPExtensions(c *gin.Context) {
-	var req request.PHPExtensionsUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := phpExtensionsService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags PHP Extensions
-// @Summary Delete Extensions
-// @Description Delete Extensions
-// @Accept json
-// @Param request body request.PHPExtensionsDelete true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /runtimes/php/extensions/del [post]
-func (b *BaseApi) DeletePHPExtensions(c *gin.Context) {
-	var req request.PHPExtensionsDelete
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := phpExtensionsService.Delete(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}

backend/app/api/v1/recycle_bin.go

@@ -68,19 +68,3 @@ func (b *BaseApi) ClearRecycleBinFile(c *gin.Context) {
 	}
 	helper.SuccessWithOutData(c)
 }
-
-// @Tags File
-// @Summary Get RecycleBin status
-// @Description 获取回收站状态
-// @Accept json
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /files/recycle/status [get]
-func (b *BaseApi) GetRecycleStatus(c *gin.Context) {
-	settingInfo, err := settingService.GetSettingInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, settingInfo.FileRecycleBin)
-}

backend/app/api/v1/runtime.go

@@ -46,12 +46,11 @@ func (b *BaseApi) CreateRuntime(c *gin.Context) {
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	ssl, err := runtimeService.Create(req)
-	if err != nil {
+	if err := runtimeService.Create(req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithData(c, ssl)
+	helper.SuccessWithOutData(c)
 }
 
 // @Tags Website
@@ -76,20 +75,6 @@ func (b *BaseApi) DeleteRuntime(c *gin.Context) {
 	helper.SuccessWithOutData(c)
 }
 
-func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
-	runTimeId, err := helper.GetIntParamByKey(c, "runTimeId")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
-		return
-	}
-	checkData, err := runtimeService.DeleteCheck(runTimeId)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, checkData)
-}
-
 // @Tags Runtime
 // @Summary Update runtime
 // @Description 更新运行环境
@@ -217,19 +202,3 @@ func (b *BaseApi) OperateNodeModules(c *gin.Context) {
 	}
 	helper.SuccessWithOutData(c)
 }
-
-// @Tags Runtime
-// @Summary Sync runtime status
-// @Description 同步运行环境状态
-// @Accept json
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /runtimes/sync [post]
-func (b *BaseApi) SyncStatus(c *gin.Context) {
-	err := runtimeService.SyncRuntimeStatus()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}

backend/app/api/v1/setting.go

@@ -1,7 +1,6 @@
 package v1
 
 import (
-	"encoding/base64"
 	"errors"
 	"os"
 	"path"
@@ -61,59 +60,6 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags System Setting
-// @Summary Update proxy setting
-// @Description 服务器代理配置
-// @Accept json
-// @Param request body dto.ProxyUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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
-// @Router /settings/menu/update [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"隐藏高级功能菜单","formatEN":"Hide advanced feature menu."}
-func (b *BaseApi) UpdateMenu(c *gin.Context) {
-	var req dto.SettingUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := settingService.Update(req.Key, req.Value); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags System Setting
 // @Summary Update system password
 // @Description 更新系统登录密码
@@ -271,6 +217,43 @@ func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
+// @Tags System Setting
+// @Summary Load time zone options
+// @Description 加载系统可用时区
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/time/option [get]
+func (b *BaseApi) LoadTimeZone(c *gin.Context) {
+	zones, err := settingService.LoadTimeZone()
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, zones)
+}
+
+// @Tags System Setting
+// @Summary Sync system time
+// @Description 系统时间同步
+// @Accept json
+// @Param request body dto.SyncTime true "request"
+// @Success 200 {string} ntime
+// @Security ApiKeyAuth
+// @Router /settings/time/sync [post]
+// @x-panel-log {"bodyKeys":["ntpSite"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"系统时间同步[ntpSite]","formatEN":"sync system time [ntpSite]"}
+func (b *BaseApi) SyncTime(c *gin.Context) {
+	var req dto.SyncTime
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := settingService.SyncTime(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags System Setting
 // @Summary Load local backup dir
 // @Description 获取安装根目录
@@ -281,6 +264,61 @@ func (b *BaseApi) LoadBaseDir(c *gin.Context) {
 	helper.SuccessWithData(c, global.CONF.System.DataDir)
 }
 
+// @Tags System Setting
+// @Summary Clean monitor datas
+// @Description 清空监控数据
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/monitor/clean [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清空监控数据","formatEN":"clean monitor datas"}
+func (b *BaseApi) CleanMonitor(c *gin.Context) {
+	if err := global.DB.Exec("DELETE FROM monitor_bases").Error; err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	if err := global.DB.Exec("DELETE FROM monitor_ios").Error; err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	if err := global.DB.Exec("DELETE FROM monitor_networks").Error; err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags System Setting
+// @Summary Scan system
+// @Description 扫描系统垃圾文件
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/scan [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"扫描系统垃圾文件","formatEN":"scan System Junk Files"}
+func (b *BaseApi) ScanSystem(c *gin.Context) {
+	helper.SuccessWithData(c, settingService.SystemScan())
+}
+
+// @Tags System Setting
+// @Summary System clean
+// @Description 清理系统垃圾文件
+// @Accept json
+// @Param request body []dto.Clean true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /settings/clean [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"清理系统垃圾文件","formatEN":"Clean system junk files"}
+func (b *BaseApi) SystemClean(c *gin.Context) {
+	var req []dto.Clean
+	if err := helper.CheckBind(&req, c); err != nil {
+		return
+	}
+
+	settingService.SystemClean(req)
+
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags System Setting
 // @Summary Load mfa info
 // @Description 获取 mfa 信息

backend/app/api/v1/snapshot.go

@@ -99,12 +99,12 @@ func (b *BaseApi) UpdateSnapDescription(c *gin.Context) {
 // @Summary Page system snapshot
 // @Description 获取系统快照列表分页
 // @Accept json
-// @Param request body dto.PageSnapshot true "request"
+// @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
 // @Router /settings/snapshot/search [post]
 func (b *BaseApi) SearchSnapshot(c *gin.Context) {
-	var req dto.PageSnapshot
+	var req dto.SearchWithPage
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
@@ -168,13 +168,13 @@ func (b *BaseApi) RollbackSnapshot(c *gin.Context) {
 // @Summary Delete system backup
 // @Description 删除系统快照
 // @Accept json
-// @Param request body dto.SnapshotBatchDelete true "request"
+// @Param request body dto.BatchDeleteReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @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.SnapshotBatchDelete
+	var req dto.BatchDeleteReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}

backend/app/api/v1/ssh.go

@@ -131,6 +131,28 @@ func (b *BaseApi) LoadSSHSecret(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
+// @Tags SSH
+// @Summary Analysis host SSH logs
+// @Description 分析 SSH 登录日志
+// @Accept json
+// @Param request body dto.SearchForAnalysis true "request"
+// @Success 200 {array} dto.SSHLogAnalysis
+// @Security ApiKeyAuth
+// @Router /host/ssh/log/analysis [post]
+func (b *BaseApi) AnalysisLog(c *gin.Context) {
+	var req dto.SearchForAnalysis
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	data, err := sshService.AnalysisLog(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
 // @Tags SSH
 // @Summary Load host SSH logs
 // @Description 获取 SSH 登录日志

backend/app/api/v1/terminal.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/copier"
@@ -56,6 +55,7 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
 		return
 	}
 	defer client.Close()
+	
 	sws, err := terminal.NewLogicSshWsSession(cols, rows, true, connInfo.Client, wsConn)
 	if wshandleError(wsConn, err) {
 		return
@@ -79,13 +79,6 @@ 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")) {
@@ -95,41 +88,25 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
 		return
 	}
-	name := c.Query("name")
-	from := c.Query("from")
-	commands := []string{"redis-cli"}
-	database, err := databaseService.Get(name)
-	if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
+	redisConf, err := redisService.LoadConf()
+	if wshandleError(wsConn, errors.WithMessage(err, "load redis container failed")) {
 		return
 	}
-	if from == "local" {
-		redisInfo, err := appInstallService.LoadConnInfo(dto.OperationWithNameAndType{Name: name, Type: "redis"})
-		if wshandleError(wsConn, errors.WithMessage(err, "no such database in db")) {
-			return
-		}
-		name = redisInfo.ContainerName
-		if len(database.Password) != 0 {
-			commands = []string{"redis-cli", "-a", database.Password, "--no-auth-warning"}
-		}
-	} else {
-		itemPort := fmt.Sprintf("%v", database.Port)
-		commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort}
-		if len(database.Password) != 0 {
-			commands = []string{"redis-cli", "-h", database.Address, "-p", itemPort, "-a", database.Password, "--no-auth-warning"}
-		}
-		name = "1Panel-redis-cli-tools"
-	}
 
-	pidMap := loadMapFromDockerTop(name)
-	itemCmds := append([]string{"exec", "-it", name}, commands...)
-	slave, err := terminal.NewCommand(itemCmds)
+	defer wsConn.Close()
+	commands := "redis-cli"
+	if len(redisConf.Requirepass) != 0 {
+		commands = fmt.Sprintf("redis-cli -a %s --no-auth-warning", redisConf.Requirepass)
+	}
+	pidMap := loadMapFromDockerTop(redisConf.ContainerName)
+	slave, err := terminal.NewCommand(fmt.Sprintf("docker exec -it %s %s", redisConf.ContainerName, commands))
 	if wshandleError(wsConn, err) {
 		return
 	}
-	defer killBash(name, strings.Join(commands, " "), pidMap)
+	defer killBash(redisConf.ContainerName, commands, pidMap)
 	defer slave.Close()
 
-	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
+	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave)
 	if wshandleError(wsConn, err) {
 		return
 	}
@@ -154,12 +131,6 @@ 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")
@@ -191,9 +162,9 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
 		return
 	}
 
-	commands := []string{"exec", "-it", containerID, command}
+	commands := fmt.Sprintf("docker exec -it %s %s", containerID, command)
 	if len(user) != 0 {
-		commands = []string{"exec", "-it", "-u", user, containerID, command}
+		commands = fmt.Sprintf("docker exec -it -u %s %s %s", user, containerID, command)
 	}
 	pidMap := loadMapFromDockerTop(containerID)
 	slave, err := terminal.NewCommand(commands)
@@ -203,7 +174,7 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
 	defer killBash(containerID, command, pidMap)
 	defer slave.Close()
 
-	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true)
+	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave)
 	if wshandleError(wsConn, err) {
 		return
 	}
@@ -251,10 +222,10 @@ func loadMapFromDockerTop(containerID string) map[string]string {
 	lines := strings.Split(stdout, "\n")
 	for _, line := range lines {
 		parts := strings.Fields(line)
-		if len(parts) < 2 {
+		if len(parts) != 2 {
 			continue
 		}
-		pidMap[parts[0]] = strings.Join(parts[1:], " ")
+		pidMap[parts[0]] = parts[1]
 	}
 	return pidMap
 }

backend/app/api/v1/upgrade.go

@@ -52,7 +52,7 @@ func (b *BaseApi) GetNotesByVersion(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /settings/upgrade [post]
-// @x-panel-log {"bodyKeys":["version"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新系统 => [version]","formatEN":"upgrade system => [version]"}
+// @x-panel-log {"bodyKeys":["version"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新系统 => [version]","formatEN":"upgrade service => [version]"}
 func (b *BaseApi) Upgrade(c *gin.Context) {
 	var req dto.Upgrade
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/website.go

@@ -1,8 +1,6 @@
 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"
@@ -78,14 +76,6 @@ 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)
@@ -315,6 +305,69 @@ func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
 	helper.SuccessWithData(c, data)
 }
 
+// @Tags Website WAF
+// @Summary Load websit waf conf
+// @Description 获取网站 waf 配置
+// @Accept json
+// @Param request body request.WebsiteWafReq true "request"
+// @Success 200 {object} response.WebsiteWafConfig
+// @Security ApiKeyAuth
+// @Router /websites/waf/config [post]
+func (b *BaseApi) GetWebsiteWafConfig(c *gin.Context) {
+	var req request.WebsiteWafReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	data, err := websiteService.GetWafConfig(req)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, data)
+}
+
+// @Tags Website WAF
+// @Summary Update website waf conf
+// @Description 更新 网站 waf 配置
+// @Accept json
+// @Param request body request.WebsiteWafUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/waf/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":"WAF 配置修改 [domain]","formatEN":"WAF conf update [domain]"}
+func (b *BaseApi) UpdateWebsiteWafConfig(c *gin.Context) {
+	var req request.WebsiteWafUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteService.UpdateWafConfig(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
+// @Tags Website WAF
+// @Summary Update website waf  file
+// @Description 更新 网站 waf 配置文件
+// @Accept json
+// @Param request body request.WebsiteWafUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /websites/waf/file/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":"WAF 配置文件修改 [domain]","formatEN":"WAF conf file update [domain]"}
+func (b *BaseApi) UpdateWebsiteWafFile(c *gin.Context) {
+	var req request.WebsiteWafFileUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteService.UpdateWafFile(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, nil)
+}
+
 // @Tags Website Nginx
 // @Summary Update website nginx conf
 // @Description 更新 网站 nginx 配置
@@ -380,7 +433,7 @@ func (b *BaseApi) ChangeDefaultServer(c *gin.Context) {
 }
 
 // @Tags Website
-// @Summary Load website php conf
+// @Summary Load websit php conf
 // @Description 获取网站 php 配置
 // @Accept json
 // @Param id path integer true "request"
@@ -778,45 +831,3 @@ func (b *BaseApi) GetDirConfig(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, res)
 }
-
-// @Tags Website
-// @Summary Get default html
-// @Description 获取默认 html
-// @Accept json
-// @Success 200 {object} response.FileInfo
-// @Security ApiKeyAuth
-// @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
-// @Description 更新默认 html
-// @Accept json
-// @Param request body request.WebsiteHtmlUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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_ca.go

@@ -1,177 +0,0 @@
-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/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
-// @Router /websites/ca/search [post]
-func (b *BaseApi) PageWebsiteCA(c *gin.Context) {
-	var req request.WebsiteCASearch
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	total, cas, err := websiteCAService.Page(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, dto.PageResult{
-		Total: total,
-		Items: cas,
-	})
-}
-
-// @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
-// @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) {
-	var req request.WebsiteCACreate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	res, err := websiteCAService.Create(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags Website CA
-// @Summary Get website ca
-// @Description 获取网站 ca
-// @Accept json
-// @Param id path int true "id"
-// @Success 200 {object} response.WebsiteCADTO
-// @Security ApiKeyAuth
-// @Router /websites/ca/{id} [get]
-func (b *BaseApi) GetWebsiteCA(c *gin.Context) {
-	id, err := helper.GetParamID(c)
-	if err != nil {
-		return
-	}
-	res, err := websiteCAService.GetCA(id)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags Website CA
-// @Summary Delete website ca
-// @Description 删除网站 ca
-// @Accept json
-// @Param request body request.WebsiteCommonReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req request.WebsiteCommonReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if err := websiteCAService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Website CA
-// @Summary Obtain SSL
-// @Description 自签 SSL 证书
-// @Accept json
-// @Param request body request.WebsiteCAObtain true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req request.WebsiteCAObtain
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if _, err := websiteCAService.ObtainSSL(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Website CA
-// @Summary Obtain SSL
-// @Description 续签 SSL 证书
-// @Accept json
-// @Param request body request.WebsiteCAObtain true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req request.WebsiteCARenew
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	if _, err := websiteCAService.ObtainSSL(request.WebsiteCAObtain{
-		SSLID: req.SSLID,
-		Renew: true,
-		Unit:  "year",
-		Time:  1,
-	}); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Website CA
-// @Summary Download CA file
-// @Description 下载 CA 证书文件
-// @Accept json
-// @Param request body request.WebsiteResourceReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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_ssl.go

@@ -1,10 +1,7 @@
 package v1
 
 import (
-	"net/http"
-	"net/url"
 	"reflect"
-	"strconv"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -69,24 +66,24 @@ func (b *BaseApi) CreateWebsiteSSL(c *gin.Context) {
 }
 
 // @Tags Website SSL
-// @Summary Apply  ssl
-// @Description 申请证书
+// @Summary Reset website ssl
+// @Description 重置网站 ssl
 // @Accept json
-// @Param request body request.WebsiteSSLApply true "request"
+// @Param request body request.WebsiteSSLRenew true "request"
 // @Success 200
 // @Security ApiKeyAuth
-// @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) {
-	var req request.WebsiteSSLApply
+// @Router /websites/ssl/renew [post]
+// @x-panel-log {"bodyKeys":["SSLId"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"SSLId","isList":false,"db":"website_ssls","output_column":"primary_domain","output_value":"domain"}],"formatZH":"重置 ssl [domain]","formatEN":"Renew ssl [domain]"}
+func (b *BaseApi) RenewWebsiteSSL(c *gin.Context) {
+	var req request.WebsiteSSLRenew
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := websiteSSLService.ObtainSSL(req); err != nil {
+	if err := websiteSSLService.Renew(req.SSLID); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-	helper.SuccessWithOutData(c)
+	helper.SuccessWithData(c, nil)
 }
 
 // @Tags Website SSL
@@ -114,17 +111,17 @@ func (b *BaseApi) GetDNSResolve(c *gin.Context) {
 // @Summary Delete website ssl
 // @Description 删除网站 ssl
 // @Accept json
-// @Param request body request.WebsiteBatchDelReq true "request"
+// @Param request body request.WebsiteResourceReq true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @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]"}
+// @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":"删除 ssl [domain]","formatEN":"Delete ssl [domain]"}
 func (b *BaseApi) DeleteWebsiteSSL(c *gin.Context) {
-	var req request.WebsiteBatchDelReq
+	var req request.WebsiteResourceReq
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := websiteSSLService.Delete(req.IDs); err != nil {
+	if err := websiteSSLService.Delete(req.ID); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
@@ -216,33 +213,3 @@ func (b *BaseApi) UploadWebsiteSSL(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, nil)
 }
-
-// @Tags Website SSL
-// @Summary Download SSL  file
-// @Description 下载证书文件
-// @Accept json
-// @Param request body request.WebsiteResourceReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @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) {
-	var req request.WebsiteResourceReq
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-	file, err := websiteSSLService.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/dto/app.go

@@ -13,18 +13,12 @@ type AppDatabase struct {
 
 type AuthParam struct {
 	RootPassword string `json:"PANEL_DB_ROOT_PASSWORD"`
-	RootUser     string `json:"PANEL_DB_ROOT_USER"`
 }
 
 type RedisAuthParam struct {
 	RootPassword string `json:"PANEL_REDIS_ROOT_PASSWORD"`
 }
 
-type MinioAuthParam struct {
-	RootPassword string `json:"PANEL_MINIO_ROOT_PASSWORD"`
-	RootUser     string `json:"PANEL_MINIO_ROOT_USER"`
-}
-
 type ContainerExec struct {
 	ContainerName string      `json:"containerName"`
 	DbParam       AppDatabase `json:"dbParam"`
@@ -37,9 +31,8 @@ type AppOssConfig struct {
 }
 
 type AppVersion struct {
-	Version       string `json:"version"`
-	DetailId      uint   `json:"detailId"`
-	DockerCompose string `json:"dockerCompose"`
+	Version  string `json:"version"`
+	DetailId uint   `json:"detailId"`
 }
 
 type AppList struct {

backend/app/dto/backup.go

@@ -21,30 +21,21 @@ type BackupInfo struct {
 	Vars       string    `json:"vars"`
 }
 
-type OneDriveInfo struct {
-	ClientID     string `json:"client_id"`
-	ClientSecret string `json:"client_secret"`
-	RedirectUri  string `json:"redirect_uri"`
-}
-
 type BackupSearchFile struct {
 	Type string `json:"type" validate:"required"`
 }
 
 type CommonBackup struct {
-	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql"`
+	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website"`
 	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"`
-	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website postgresql"`
+	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive"`
+	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website"`
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 	File       string `json:"file"`
-	Secret     string `json:"secret"`
 }
 
 type RecordSearch struct {
@@ -54,11 +45,6 @@ type RecordSearch struct {
 	DetailName string `json:"detailName"`
 }
 
-type RecordSearchByCronjob struct {
-	PageInfo
-	CronjobID uint `json:"cronjobID" validate:"required"`
-}
-
 type BackupRecords struct {
 	ID         uint      `json:"id"`
 	CreatedAt  time.Time `json:"createdAt"`
@@ -66,11 +52,10 @@ type BackupRecords struct {
 	BackupType string    `json:"backupType"`
 	FileDir    string    `json:"fileDir"`
 	FileName   string    `json:"fileName"`
-	Size       int64     `json:"size"`
 }
 
 type DownloadRecord struct {
-	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive WebDAV"`
+	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive"`
 	FileDir  string `json:"fileDir" validate:"required"`
 	FileName string `json:"fileName" validate:"required"`
 }

backend/app/dto/clam.go

@@ -1,96 +0,0 @@
-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"`
-}
-
-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"`
-}
-
-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"`
-}
-
-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,12 +1,9 @@
 package dto
 
 type SearchCommandWithPage struct {
-	PageInfo
-	OrderBy string `json:"orderBy" validate:"required,oneof=name command created_at"`
-	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+	SearchWithPage
 	GroupID uint   `json:"groupID"`
 	Info    string `json:"info"`
-	Name    string `json:"name"`
 }
 
 type CommandOperate struct {
@@ -30,9 +27,3 @@ 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,7 +2,9 @@ package dto
 
 type SearchWithPage struct {
 	PageInfo
-	Info string `json:"info"`
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy"`
+	Order   string `json:"order"`
 }
 
 type PageInfo struct {
@@ -39,15 +41,6 @@ type DeleteByName struct {
 	Name string `json:"name" validate:"required"`
 }
 
-type UpdateByFile struct {
-	File string `json:"file"`
-}
-
-type UpdateByNameAndFile struct {
-	Name string `json:"name"`
-	File string `json:"file"`
-}
-
 type OperationWithNameAndType struct {
 	Name string `json:"name"`
 	Type string `json:"type" validate:"required"`

backend/app/dto/container.go

@@ -1,17 +1,14 @@
 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" 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"`
+	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"`
+	Filters string `json:"filters"`
 }
 
 type InspectReq struct {
@@ -33,15 +30,11 @@ type ContainerInfo struct {
 
 	IsFromApp     bool `json:"isFromApp"`
 	IsFromCompose bool `json:"isFromCompose"`
-
-	AppName        string   `json:"appName"`
-	AppInstallName string   `json:"appInstallName"`
-	Websites       []string `json:"websites"`
 }
 
 type ResourceLimit struct {
-	CPU    int    `json:"cpu"`
-	Memory uint64 `json:"memory"`
+	CPU    int `json:"cpu"`
+	Memory int `json:"memory"`
 }
 
 type ContainerOperate struct {
@@ -50,8 +43,6 @@ type ContainerOperate struct {
 	Name            string         `json:"name" validate:"required"`
 	Image           string         `json:"image" validate:"required"`
 	Network         string         `json:"network"`
-	Ipv4            string         `json:"ipv4"`
-	Ipv6            string         `json:"ipv6"`
 	PublishAllPorts bool           `json:"publishAllPorts"`
 	ExposedPorts    []PortHelper   `json:"exposedPorts"`
 	Tty             bool           `json:"tty"`
@@ -61,7 +52,6 @@ type ContainerOperate struct {
 	CPUShares       int64          `json:"cpuShares"`
 	NanoCPUs        float64        `json:"nanoCPUs"`
 	Memory          float64        `json:"memory"`
-	Privileged      bool           `json:"privileged"`
 	AutoRemove      bool           `json:"autoRemove"`
 	Volumes         []VolumeHelper `json:"volumes"`
 	Labels          []string       `json:"labels"`
@@ -102,7 +92,6 @@ type ContainerStats struct {
 }
 
 type VolumeHelper struct {
-	Type         string `json:"type"`
 	SourceDir    string `json:"sourceDir"`
 	ContainerDir string `json:"containerDir"`
 	Mode         string `json:"mode"`
@@ -124,17 +113,8 @@ 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 buildcache"`
+	PruneType  string `json:"pruneType" validate:"required,oneof=container image volume network"`
 	WithTagAll bool   `json:"withTagAll"`
 }
 
@@ -155,21 +135,13 @@ type Network struct {
 	Attachable bool      `json:"attachable"`
 }
 type NetworkCreate struct {
-	Name       string          `json:"name" validate:"required"`
-	Driver     string          `json:"driver" validate:"required"`
-	Options    []string        `json:"options"`
-	Ipv4       bool            `json:"ipv4"`
-	Subnet     string          `json:"subnet"`
-	Gateway    string          `json:"gateway"`
-	IPRange    string          `json:"ipRange"`
-	AuxAddress []SettingUpdate `json:"auxAddress"`
-
-	Ipv6         bool            `json:"ipv6"`
-	SubnetV6     string          `json:"subnetV6"`
-	GatewayV6    string          `json:"gatewayV6"`
-	IPRangeV6    string          `json:"ipRangeV6"`
-	AuxAddressV6 []SettingUpdate `json:"auxAddressV6"`
-	Labels       []string        `json:"labels"`
+	Name    string   `json:"name" validate:"required"`
+	Driver  string   `json:"driver" validate:"required"`
+	Options []string `json:"options"`
+	Subnet  string   `json:"subnet"`
+	Gateway string   `json:"gateway"`
+	IPRange string   `json:"ipRange"`
+	Labels  []string `json:"labels"`
 }
 
 type Volume struct {
@@ -187,7 +159,6 @@ type VolumeCreate struct {
 }
 
 type BatchDelete struct {
-	Force bool     `json:"force"`
 	Names []string `json:"names" validate:"required"`
 }
 
@@ -225,10 +196,3 @@ type ComposeUpdate struct {
 	Path    string `json:"path" validate:"required"`
 	Content string `json:"content" validate:"required"`
 }
-
-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,58 +1,51 @@
 package dto
 
-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"`
-}
+import "time"
 
 type CronjobCreate struct {
-	Name string `json:"name" validate:"required"`
-	Type string `json:"type" validate:"required"`
-	Spec string `json:"spec" validate:"required"`
+	Name     string `json:"name" validate:"required"`
+	Type     string `json:"type" validate:"required"`
+	SpecType string `json:"specType" validate:"required"`
+	Week     int    `json:"week" validate:"number,max=6,min=0"`
+	Day      int    `json:"day" validate:"number"`
+	Hour     int    `json:"hour" validate:"number"`
+	Minute   int    `json:"minute" validate:"number"`
+	Second   int    `json:"second" validate:"number"`
 
 	Script         string `json:"script"`
-	Command        string `json:"command"`
 	ContainerName  string `json:"containerName"`
 	AppID          string `json:"appID"`
 	Website        string `json:"website"`
 	ExclusionRules string `json:"exclusionRules"`
-	DBType         string `json:"dbType"`
 	DBName         string `json:"dbName"`
 	URL            string `json:"url"`
 	SourceDir      string `json:"sourceDir"`
-
-	BackupAccounts  string `json:"backupAccounts"`
-	DefaultDownload string `json:"defaultDownload"`
-	RetainCopies    int    `json:"retainCopies" validate:"number,min=1"`
-	Secret          string `json:"secret"`
+	KeepLocal      bool   `json:"keepLocal"`
+	TargetDirID    int    `json:"targetDirID"`
+	RetainCopies   int    `json:"retainCopies" validate:"number,min=1"`
 }
 
 type CronjobUpdate struct {
-	ID   uint   `json:"id" validate:"required"`
-	Name string `json:"name" validate:"required"`
-	Spec string `json:"spec" validate:"required"`
+	ID       uint   `json:"id" validate:"required"`
+	Name     string `json:"name" validate:"required"`
+	SpecType string `json:"specType" validate:"required"`
+	Week     int    `json:"week" validate:"number,max=6,min=0"`
+	Day      int    `json:"day" validate:"number"`
+	Hour     int    `json:"hour" validate:"number"`
+	Minute   int    `json:"minute" validate:"number"`
+	Second   int    `json:"second" validate:"number"`
 
 	Script         string `json:"script"`
-	Command        string `json:"command"`
 	ContainerName  string `json:"containerName"`
 	AppID          string `json:"appID"`
 	Website        string `json:"website"`
 	ExclusionRules string `json:"exclusionRules"`
-	DBType         string `json:"dbType"`
 	DBName         string `json:"dbName"`
 	URL            string `json:"url"`
 	SourceDir      string `json:"sourceDir"`
-
-	BackupAccounts  string `json:"backupAccounts"`
-	DefaultDownload string `json:"defaultDownload"`
-	RetainCopies    int    `json:"retainCopies" validate:"number,min=1"`
-	Secret          string `json:"secret"`
+	KeepLocal      bool   `json:"keepLocal"`
+	TargetDirID    int    `json:"targetDirID"`
+	RetainCopies   int    `json:"retainCopies" validate:"number,min=1"`
 }
 
 type CronjobUpdateStatus struct {
@@ -66,7 +59,6 @@ type CronjobDownload struct {
 }
 
 type CronjobClean struct {
-	IsDelete  bool `json:"isDelete"`
 	CleanData bool `json:"cleanData"`
 	CronjobID uint `json:"cronjobID" validate:"required"`
 }
@@ -77,28 +69,31 @@ type CronjobBatchDelete struct {
 }
 
 type CronjobInfo struct {
-	ID   uint   `json:"id"`
-	Name string `json:"name"`
-	Type string `json:"type"`
-	Spec string `json:"spec"`
+	ID       uint   `json:"id"`
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+	SpecType string `json:"specType"`
+	Week     int    `json:"week"`
+	Day      int    `json:"day"`
+	Hour     int    `json:"hour"`
+	Minute   int    `json:"minute"`
+	Second   int    `json:"second"`
 
-	Script          string `json:"script"`
-	Command         string `json:"command"`
-	ContainerName   string `json:"containerName"`
-	AppID           string `json:"appID"`
-	Website         string `json:"website"`
-	ExclusionRules  string `json:"exclusionRules"`
-	DBType          string `json:"dbType"`
-	DBName          string `json:"dbName"`
-	URL             string `json:"url"`
-	SourceDir       string `json:"sourceDir"`
-	BackupAccounts  string `json:"backupAccounts"`
-	DefaultDownload string `json:"defaultDownload"`
-	RetainCopies    int    `json:"retainCopies"`
+	Script         string `json:"script"`
+	ContainerName  string `json:"containerName"`
+	AppID          string `json:"appID"`
+	Website        string `json:"website"`
+	ExclusionRules string `json:"exclusionRules"`
+	DBName         string `json:"dbName"`
+	URL            string `json:"url"`
+	SourceDir      string `json:"sourceDir"`
+	KeepLocal      bool   `json:"keepLocal"`
+	TargetDir      string `json:"targetDir"`
+	TargetDirID    int    `json:"targetDirID"`
+	RetainCopies   int    `json:"retainCopies"`
 
 	LastRecordTime string `json:"lastRecordTime"`
 	Status         string `json:"status"`
-	Secret         string `json:"secret"`
 }
 
 type SearchRecord struct {
@@ -110,12 +105,12 @@ type SearchRecord struct {
 }
 
 type Record struct {
-	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"`
+	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"`
 }

backend/app/dto/dashboard.go

@@ -16,31 +16,14 @@ type DashboardBase struct {
 	KernelArch           string `json:"kernelArch"`
 	KernelVersion        string `json:"kernelVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
-	IpV4Addr             string `json:"ipv4Addr"`
-	SystemProxy          string `json:"SystemProxy"`
-	CPUCores             int    `json:"cpuCores"`
-	CPULogicalCores      int    `json:"cpuLogicalCores"`
-	CPUModelName         string `json:"cpuModelName"`
+
+	CPUCores        int    `json:"cpuCores"`
+	CPULogicalCores int    `json:"cpuLogicalCores"`
+	CPUModelName    string `json:"cpuModelName"`
 
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
 }
 
-type OsInfo struct {
-	OS             string `json:"os"`
-	Platform       string `json:"platform"`
-	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 {
 	Uptime          uint64 `json:"uptime"`
 	TimeSinceUptime string `json:"timeSinceUptime"`
@@ -60,12 +43,7 @@ type DashboardCurrent struct {
 	MemoryTotal       uint64  `json:"memoryTotal"`
 	MemoryAvailable   uint64  `json:"memoryAvailable"`
 	MemoryUsed        uint64  `json:"memoryUsed"`
-	MemoryUsedPercent float64 `json:"memoryUsedPercent"`
-
-	SwapMemoryTotal       uint64  `json:"swapMemoryTotal"`
-	SwapMemoryAvailable   uint64  `json:"swapMemoryAvailable"`
-	SwapMemoryUsed        uint64  `json:"swapMemoryUsed"`
-	SwapMemoryUsedPercent float64 `json:"swapMemoryUsedPercent"`
+	MemoryUsedPercent float64 `json:"MemoryUsedPercent"`
 
 	IOReadBytes  uint64 `json:"ioReadBytes"`
 	IOWriteBytes uint64 `json:"ioWriteBytes"`
@@ -78,9 +56,6 @@ type DashboardCurrent struct {
 	NetBytesSent uint64 `json:"netBytesSent"`
 	NetBytesRecv uint64 `json:"netBytesRecv"`
 
-	GPUData []GPUInfo `json:"gpuData"`
-	XPUData []XPUInfo `json:"xpuData"`
-
 	ShotTime time.Time `json:"shotTime"`
 }
 
@@ -98,28 +73,3 @@ type DiskInfo struct {
 	InodesFree        uint64  `json:"inodesFree"`
 	InodesUsedPercent float64 `json:"inodesUsedPercent"`
 }
-
-type GPUInfo struct {
-	Index            uint   `json:"index"`
-	ProductName      string `json:"productName"`
-	GPUUtil          string `json:"gpuUtil"`
-	Temperature      string `json:"temperature"`
-	PerformanceState string `json:"performanceState"`
-	PowerUsage       string `json:"powerUsage"`
-	PowerDraw        string `json:"powerDraw"`
-	MaxPowerLimit    string `json:"maxPowerLimit"`
-	MemoryUsage      string `json:"memoryUsage"`
-	MemUsed          string `json:"memUsed"`
-	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

@@ -2,33 +2,12 @@ package dto
 
 import "time"
 
-// common
-type DBConfUpdateByFile struct {
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql redis"`
-	Database string `json:"database" validate:"required"`
-	File     string `json:"file"`
-}
-type ChangeDBInfo struct {
-	ID       uint   `json:"id"`
-	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb postgresql"`
-	Database string `json:"database" validate:"required"`
-	Value    string `json:"value" validate:"required"`
-}
-
-type DBBaseInfo struct {
-	Name          string `json:"name"`
-	ContainerName string `json:"containerName"`
-	Port          int64  `json:"port"`
-}
-
-// mysql
 type MysqlDBSearch struct {
 	PageInfo
 	Info     string `json:"info"`
 	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy" validate:"required,oneof=name created_at"`
-	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
+	OrderBy  string `json:"orderBy"`
+	Order    string `json:"order"`
 }
 
 type MysqlDBInfo struct {
@@ -41,7 +20,7 @@ type MysqlDBInfo struct {
 	Username    string    `json:"username"`
 	Password    string    `json:"password"`
 	Permission  string    `json:"permission"`
-	IsDelete    bool      `json:"isDelete"`
+	BackupCount int       `json:"backupCount"`
 	Description string    `json:"description"`
 }
 
@@ -64,14 +43,6 @@ type MysqlDBCreate struct {
 	Description string `json:"description"`
 }
 
-type BindUser struct {
-	Database   string `json:"database" validate:"required"`
-	DB         string `json:"db" validate:"required"`
-	Username   string `json:"username" validate:"required"`
-	Password   string `json:"password" validate:"required"`
-	Permission string `json:"permission" validate:"required"`
-}
-
 type MysqlLoadDB struct {
 	From     string `json:"from" validate:"required,oneof=local remote"`
 	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
@@ -131,7 +102,7 @@ type MysqlStatus struct {
 }
 
 type MysqlVariables struct {
-	BinlogCacheSize      string `json:"binlog_cache_size"`
+	BinlogCachSize       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 +110,7 @@ type MysqlVariables struct {
 	MaxConnections       string `json:"max_connections"`
 	MaxHeapTableSize     string `json:"max_heap_table_size"`
 	QueryCacheSize       string `json:"query_cache_size"`
-	QueryCacheType       string `json:"query_cache_type"`
+	QueryCache_type      string `json:"query_cache_type"`
 	ReadBufferSize       string `json:"read_buffer_size"`
 	ReadRndBufferSize    string `json:"read_rnd_buffer_size"`
 	SortBufferSize       string `json:"sort_buffer_size"`
@@ -162,29 +133,48 @@ type MysqlVariablesUpdateHelper struct {
 	Param string      `json:"param"`
 	Value interface{} `json:"value"`
 }
+type MysqlConfUpdateByFile struct {
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
+	Database string `json:"database" validate:"required"`
+	File     string `json:"file"`
+}
+
+type ChangeDBInfo struct {
+	ID       uint   `json:"id"`
+	From     string `json:"from" validate:"required,oneof=local remote"`
+	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
+	Database string `json:"database" validate:"required"`
+	Value    string `json:"value" validate:"required"`
+}
+
+type DBBaseInfo struct {
+	Name          string `json:"name"`
+	ContainerName string `json:"containerName"`
+	Port          int64  `json:"port"`
+}
 
 // redis
 type ChangeRedisPass struct {
-	Database string `json:"database" validate:"required"`
-	Value    string `json:"value"`
+	Value string `json:"value" validate:"required"`
 }
 
 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,20 +185,18 @@ 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"`
-	UsedMemoryRss            string `json:"used_memory_rss"`
-	UsedMemoryPeak           string `json:"used_memory_peak"`
+	UsedMemory_rss           string `json:"used_memory_rss"`
+	UsedMemory_peak          string `json:"used_memory_peak"`
 	MemFragmentationRatio    string `json:"mem_fragmentation_ratio"`
 	TotalConnectionsReceived string `json:"total_connections_received"`
 	TotalCommandsProcessed   string `json:"total_commands_processed"`
@@ -219,14 +207,12 @@ 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"`
 }
@@ -236,29 +222,22 @@ type DatabaseSearch struct {
 	PageInfo
 	Info    string `json:"info"`
 	Type    string `json:"type"`
-	OrderBy string `json:"orderBy" validate:"required,oneof=name created_at"`
-	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+	OrderBy string `json:"orderBy"`
+	Order   string `json:"order"`
 }
 
 type DatabaseInfo struct {
-	ID        uint      `json:"id"`
-	CreatedAt time.Time `json:"createdAt"`
-	Name      string    `json:"name" validate:"max=256"`
-	From      string    `json:"from"`
-	Type      string    `json:"type"`
-	Version   string    `json:"version"`
-	Address   string    `json:"address"`
-	Port      uint      `json:"port"`
-	Username  string    `json:"username"`
-	Password  string    `json:"password"`
-
-	SSL        bool   `json:"ssl"`
-	RootCert   string `json:"rootCert"`
-	ClientKey  string `json:"clientKey"`
-	ClientCert string `json:"clientCert"`
-	SkipVerify bool   `json:"skipVerify"`
-
-	Description string `json:"description"`
+	ID          uint      `json:"id"`
+	CreatedAt   time.Time `json:"createdAt"`
+	Name        string    `json:"name" validate:"max=256"`
+	From        string    `json:"from"`
+	Type        string    `json:"type"`
+	Version     string    `json:"version"`
+	Address     string    `json:"address"`
+	Port        uint      `json:"port"`
+	Username    string    `json:"username"`
+	Password    string    `json:"password"`
+	Description string    `json:"description"`
 }
 
 type DatabaseOption struct {
@@ -270,47 +249,26 @@ type DatabaseOption struct {
 	Address  string `json:"address"`
 }
 
-type DatabaseItem struct {
-	ID       uint   `json:"id"`
-	From     string `json:"from"`
-	Database string `json:"database"`
-	Name     string `json:"name"`
-}
-
 type DatabaseCreate struct {
-	Name     string `json:"name" validate:"required,max=256"`
-	Type     string `json:"type" validate:"required"`
-	From     string `json:"from" validate:"required,oneof=local remote"`
-	Version  string `json:"version" validate:"required"`
-	Address  string `json:"address"`
-	Port     uint   `json:"port"`
-	Username string `json:"username" validate:"required"`
-	Password string `json:"password"`
-
-	SSL        bool   `json:"ssl"`
-	RootCert   string `json:"rootCert"`
-	ClientKey  string `json:"clientKey"`
-	ClientCert string `json:"clientCert"`
-	SkipVerify bool   `json:"skipVerify"`
-
+	Name        string `json:"name" validate:"required,max=256"`
+	Type        string `json:"type" validate:"required"`
+	From        string `json:"from" validate:"required,oneof=local remote"`
+	Version     string `json:"version" validate:"required"`
+	Address     string `json:"address"`
+	Port        uint   `json:"port"`
+	Username    string `json:"username" validate:"required"`
+	Password    string `json:"password" validate:"required"`
 	Description string `json:"description"`
 }
 
 type DatabaseUpdate struct {
-	ID       uint   `json:"id"`
-	Type     string `json:"type" validate:"required"`
-	Version  string `json:"version" validate:"required"`
-	Address  string `json:"address"`
-	Port     uint   `json:"port"`
-	Username string `json:"username" validate:"required"`
-	Password string `json:"password"`
-
-	SSL        bool   `json:"ssl"`
-	RootCert   string `json:"rootCert"`
-	ClientKey  string `json:"clientKey"`
-	ClientCert string `json:"clientCert"`
-	SkipVerify bool   `json:"skipVerify"`
-
+	ID          uint   `json:"id"`
+	Type        string `json:"type" validate:"required"`
+	Version     string `json:"version" validate:"required"`
+	Address     string `json:"address"`
+	Port        uint   `json:"port"`
+	Username    string `json:"username" validate:"required"`
+	Password    string `json:"password" validate:"required"`
 	Description string `json:"description"`
 }
 

backend/app/dto/database_postgresql.go

@@ -1,85 +0,0 @@
-package dto
-
-import "time"
-
-type PostgresqlDBSearch struct {
-	PageInfo
-	Info     string `json:"info"`
-	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy" validate:"required,oneof=name created_at"`
-	Order    string `json:"order" validate:"required,oneof=null ascending descending"`
-}
-
-type PostgresqlDBInfo struct {
-	ID             uint      `json:"id"`
-	CreatedAt      time.Time `json:"createdAt"`
-	Name           string    `json:"name"`
-	From           string    `json:"from"`
-	PostgresqlName string    `json:"postgresqlName"`
-	Format         string    `json:"format"`
-	Username       string    `json:"username"`
-	Password       string    `json:"password"`
-	SuperUser      bool      `json:"superUser"`
-	IsDelete       bool      `json:"isDelete"`
-	Description    string    `json:"description"`
-}
-
-type PostgresqlOption struct {
-	ID       uint   `json:"id"`
-	From     string `json:"from"`
-	Type     string `json:"type"`
-	Database string `json:"database"`
-	Name     string `json:"name"`
-}
-
-type PostgresqlDBCreate struct {
-	Name        string `json:"name" validate:"required"`
-	From        string `json:"from" validate:"required,oneof=local remote"`
-	Database    string `json:"database" validate:"required"`
-	Format      string `json:"format"`
-	Username    string `json:"username" validate:"required"`
-	Password    string `json:"password" validate:"required"`
-	SuperUser   bool   `json:"superUser"`
-	Description string `json:"description"`
-}
-
-type PostgresqlBindUser struct {
-	Name      string `json:"name" validate:"required"`
-	Database  string `json:"database" validate:"required"`
-	Username  string `json:"username" validate:"required"`
-	Password  string `json:"password" validate:"required"`
-	SuperUser bool   `json:"superUser"`
-}
-
-type PostgresqlPrivileges struct {
-	Name      string `json:"name" validate:"required"`
-	Database  string `json:"database" validate:"required"`
-	Username  string `json:"username" validate:"required"`
-	SuperUser bool   `json:"superUser"`
-}
-
-type PostgresqlLoadDB struct {
-	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=postgresql"`
-	Database string `json:"database" validate:"required"`
-}
-
-type PostgresqlDBDeleteCheck struct {
-	ID       uint   `json:"id" validate:"required"`
-	Type     string `json:"type" validate:"required,oneof=postgresql"`
-	Database string `json:"database" validate:"required"`
-}
-
-type PostgresqlDBDelete struct {
-	ID           uint   `json:"id" validate:"required"`
-	Type         string `json:"type" validate:"required,oneof=postgresql"`
-	Database     string `json:"database" validate:"required"`
-	ForceDelete  bool   `json:"forceDelete"`
-	DeleteBackup bool   `json:"deleteBackup"`
-}
-
-type PostgresqlConfUpdateByFile struct {
-	Type     string `json:"type" validate:"required,oneof=postgresql mariadb"`
-	Database string `json:"database" validate:"required"`
-	File     string `json:"file"`
-}

backend/app/dto/device.go

@@ -1,41 +0,0 @@
-package dto
-
-type DeviceBaseInfo struct {
-	DNS       []string     `json:"dns"`
-	Hosts     []HostHelper `json:"hosts"`
-	Hostname  string       `json:"hostname"`
-	TimeZone  string       `json:"timeZone"`
-	LocalTime string       `json:"localTime"`
-	Ntp       string       `json:"ntp"`
-	User      string       `json:"user"`
-
-	SwapMemoryTotal     uint64 `json:"swapMemoryTotal"`
-	SwapMemoryAvailable uint64 `json:"swapMemoryAvailable"`
-	SwapMemoryUsed      uint64 `json:"swapMemoryUsed"`
-	MaxSize             uint64 `json:"maxSize"`
-
-	SwapDetails []SwapHelper `json:"swapDetails"`
-}
-
-type HostHelper struct {
-	IP   string `json:"ip"`
-	Host string `json:"host"`
-}
-
-type SwapHelper struct {
-	Path string `json:"path" validate:"required"`
-	Size uint64 `json:"size"`
-	Used string `json:"used"`
-
-	IsNew bool `json:"isNew"`
-}
-
-type TimeZoneOptions struct {
-	From  string   `json:"from"`
-	Zones []string `json:"zones"`
-}
-
-type ChangePasswd struct {
-	User   string `json:"user"`
-	Passwd string `json:"passwd"`
-}

backend/app/dto/docker.go

@@ -14,11 +14,6 @@ type DaemonJsonConf struct {
 	IPTables     bool     `json:"iptables"`
 	CgroupDriver string   `json:"cgroupDriver"`
 
-	Ipv6         bool   `json:"ipv6"`
-	FixedCidrV6  string `json:"fixedCidrV6"`
-	Ip6Tables    bool   `json:"ip6Tables"`
-	Experimental bool   `json:"experimental"`
-
 	LogMaxSize string `json:"logMaxSize"`
 	LogMaxFile string `json:"logMaxFile"`
 }
@@ -28,12 +23,6 @@ type LogOption struct {
 	LogMaxFile string `json:"logMaxFile"`
 }
 
-type Ipv6Option struct {
-	FixedCidrV6  string `json:"fixedCidrV6"`
-	Ip6Tables    bool   `json:"ip6Tables" validate:"required"`
-	Experimental bool   `json:"experimental"`
-}
-
 type DockerOperation struct {
 	Operation string `json:"operation" validate:"required,oneof=start restart stop"`
 }

backend/app/dto/fail2ban.go

@@ -1,29 +0,0 @@
-package dto
-
-type Fail2BanBaseInfo struct {
-	IsEnable bool   `json:"isEnable"`
-	IsActive bool   `json:"isActive"`
-	IsExist  bool   `json:"isExist"`
-	Version  string `json:"version"`
-
-	Port      int    `json:"port"`
-	MaxRetry  int    `json:"maxRetry"`
-	BanTime   string `json:"banTime"`
-	FindTime  string `json:"findTime"`
-	BanAction string `json:"banAction"`
-	LogPath   string `json:"logPath"`
-}
-
-type Fail2BanSearch struct {
-	Status string `json:"status" validate:"required,oneof=banned ignore"`
-}
-
-type Fail2BanUpdate struct {
-	Key   string `json:"key" validate:"required,oneof=port bantime findtime maxretry banaction logpath port"`
-	Value string `json:"value"`
-}
-
-type Fail2BanSet struct {
-	IPs     []string `json:"ips"`
-	Operate string   `json:"operate"  validate:"required,oneof=banned ignore"`
-}

backend/app/dto/firewall.go

@@ -16,7 +16,7 @@ type RuleSearch struct {
 }
 
 type FirewallOperation struct {
-	Operation string `json:"operation" validate:"required,oneof=start stop restart disablePing enablePing"`
+	Operation string `json:"operation" validate:"required,oneof=start stop disablePing enablePing"`
 }
 
 type PortRuleOperate struct {
@@ -29,17 +29,6 @@ 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

@@ -1,43 +0,0 @@
-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/image.go

@@ -27,6 +27,7 @@ type ImagePull struct {
 }
 
 type ImageTag struct {
+	RepoID     uint   `json:"repoID"`
 	SourceID   string `json:"sourceID" validate:"required"`
 	TargetName string `json:"targetName" validate:"required"`
 }

backend/app/dto/request/app.go

@@ -32,7 +32,6 @@ type AppContainerConfig struct {
 	EditCompose   bool    `json:"editCompose"`
 	DockerCompose string  `json:"dockerCompose"`
 	HostMode      bool    `json:"hostMode"`
-	PullImage     bool    `json:"pullImage"`
 }
 
 type AppInstalledSearch struct {
@@ -43,7 +42,6 @@ type AppInstalledSearch struct {
 	Update bool     `json:"update"`
 	Unused bool     `json:"unused"`
 	All    bool     `json:"all"`
-	Sync   bool     `json:"sync"`
 }
 
 type AppInstalledInfo struct {
@@ -61,24 +59,14 @@ 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"`
-	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"`
+	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"`
 }
 
 type AppInstalledUpdate struct {
@@ -97,8 +85,3 @@ 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,8 +10,7 @@ type FileOption struct {
 }
 
 type FileContentReq struct {
-	Path     string `json:"path" validate:"required"`
-	IsDetail bool   `json:"isDetail"`
+	Path string `json:"path" validate:"required"`
 }
 
 type SearchUploadWithPage struct {
@@ -23,7 +22,7 @@ type FileCreate struct {
 	Path      string `json:"path" validate:"required"`
 	Content   string `json:"content"`
 	IsDir     bool   `json:"isDir"`
-	Mode      int64  `json:"mode"`
+	Mode      int64  `json:"mode" validate:"required"`
 	IsLink    bool   `json:"isLink"`
 	IsSymlink bool   `json:"isSymlink"`
 	LinkPath  string `json:"linkPath"`
@@ -55,19 +54,17 @@ 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"`
-	Secret string `json:"secret"`
+	Dst  string `json:"dst"  validate:"required"`
+	Type string `json:"type"  validate:"required"`
+	Path string `json:"path" validate:"required"`
 }
 
 type FileEdit struct {
 	Path    string `json:"path"  validate:"required"`
-	Content string `json:"content"`
+	Content string `json:"content"  validate:"required"`
 }
 
 type FileRename struct {
@@ -80,10 +77,9 @@ type FilePathCheck struct {
 }
 
 type FileWget struct {
-	Url               string `json:"url" validate:"required"`
-	Path              string `json:"path" validate:"required"`
-	Name              string `json:"name" validate:"required"`
-	IgnoreCertificate bool   `json:"ignoreCertificate"`
+	Url  string `json:"url" validate:"required"`
+	Path string `json:"path" validate:"required"`
+	Name string `json:"name" validate:"required"`
 }
 
 type FileMove struct {
@@ -122,12 +118,9 @@ type FileRoleUpdate struct {
 }
 
 type FileReadByLineReq struct {
+	Path     string `json:"path" validate:"required"`
 	Page     int    `json:"page" validate:"required"`
 	PageSize int    `json:"pageSize" validate:"required"`
-	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"`
+	Content   string `json:"content" validate:"required"`
 }
 
 type NginxProxyUpdate struct {

backend/app/dto/request/php_extensions.go

@@ -1,22 +0,0 @@
-package request
-
-import "github.com/1Panel-dev/1Panel/backend/app/dto"
-
-type PHPExtensionsSearch struct {
-	dto.PageInfo
-	All bool `json:"all"`
-}
-
-type PHPExtensionsCreate struct {
-	Name       string `json:"name" validate:"required"`
-	Extensions string `json:"extensions" validate:"required"`
-}
-
-type PHPExtensionsUpdate struct {
-	ID         uint   `json:"id" validate:"required"`
-	Extensions string `json:"extensions" validate:"required"`
-}
-
-type PHPExtensionsDelete struct {
-	ID uint `json:"id" validate:"required"`
-}

backend/app/dto/request/website.go

@@ -7,8 +7,8 @@ import (
 type WebsiteSearch struct {
 	dto.PageInfo
 	Name           string `json:"name"`
-	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"`
+	OrderBy        string `json:"orderBy"`
+	Order          string `json:"order"`
 	WebsiteGroupID uint   `json:"websiteGroupId"`
 }
 
@@ -27,9 +27,6 @@ type WebsiteCreate struct {
 	AppID        uint          `json:"appID"`
 	AppInstallID uint          `json:"appInstallID"`
 
-	FtpUser     string `json:"ftpUser"`
-	FtpPassword string `json:"ftpPassword"`
-
 	RuntimeID uint `json:"runtimeID"`
 	RuntimeConfig
 }
@@ -55,7 +52,7 @@ type WebsiteUpdate struct {
 	ID             uint   `json:"id" validate:"required"`
 	PrimaryDomain  string `json:"primaryDomain" validate:"required"`
 	Remark         string `json:"remark"`
-	WebsiteGroupID uint   `json:"webSiteGroupID"`
+	WebsiteGroupID uint   `json:"webSiteGroupID" validate:"required"`
 	ExpireDate     string `json:"expireDate"`
 	IPV6           bool   `json:"IPV6"`
 }
@@ -72,12 +69,24 @@ type WebsiteOp struct {
 	Operate string `json:"operate"`
 }
 
+type WebsiteWafReq struct {
+	WebsiteID uint   `json:"websiteId" validate:"required"`
+	Key       string `json:"key" validate:"required"`
+	Rule      string `json:"rule" validate:"required"`
+}
+
 type WebsiteRedirectUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
 	Enable    bool   `json:"enable"`
 }
 
+type WebsiteWafUpdate struct {
+	WebsiteID uint   `json:"websiteId" validate:"required"`
+	Key       string `json:"key" validate:"required"`
+	Enable    bool   `json:"enable"`
+}
+
 type WebsiteRecover struct {
 	WebsiteName string `json:"websiteName" validate:"required"`
 	Type        string `json:"type" validate:"required"`
@@ -123,7 +132,6 @@ 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 {
@@ -182,14 +190,13 @@ type WebsiteProxyConfig struct {
 	CacheTime int               `json:"cacheTime"  `
 	CacheUnit string            `json:"cacheUnit"`
 	Name      string            `json:"name" validate:"required"`
-	Modifier  string            `json:"modifier"`
+	Modifier  string            `json:"modifier" validate:"required"`
 	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"`
 }
 
 type WebsiteProxyReq struct {
@@ -200,21 +207,12 @@ type WebsiteRedirectReq struct {
 	WebsiteID uint `json:"websiteId" validate:"required"`
 }
 
+type WebsiteWafFileUpdate struct {
+	WebsiteID uint   `json:"websiteID" validate:"required"`
+	Content   string `json:"content" validate:"required"`
+	Type      string `json:"type" validate:"required,oneof=cc ip_white ip_block url_white url_block cookie_block args_check post_check ua_check file_ext_block"`
+}
+
 type WebsiteCommonReq struct {
 	ID uint `json:"id" validate:"required"`
 }
-
-type WafWebsite struct {
-	Key     string   `json:"key"`
-	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

@@ -14,18 +14,6 @@ type WebsiteSSLCreate struct {
 	AcmeAccountID uint   `json:"acmeAccountId" validate:"required"`
 	DnsAccountID  uint   `json:"dnsAccountId"`
 	AutoRenew     bool   `json:"autoRenew"`
-	KeyType       string `json:"keyType"`
-	Apply         bool   `json:"apply"`
-	PushDir       bool   `json:"pushDir"`
-	Dir           string `json:"dir"`
-	ID            uint   `json:"id"`
-	Description   string `json:"description"`
-	DisableCNAME  bool   `json:"disableCNAME"`
-	SkipDNS       bool   `json:"skipDNS"`
-	Nameserver1   string `json:"nameserver1"`
-	Nameserver2   string `json:"nameserver2"`
-	ExecShell     bool   `json:"execShell"`
-	Shell         string `json:"shell"`
 }
 
 type WebsiteDNSReq struct {
@@ -37,18 +25,8 @@ type WebsiteSSLRenew struct {
 	SSLID uint `json:"SSLId" validate:"required"`
 }
 
-type WebsiteSSLApply struct {
-	ID           uint     `json:"ID" validate:"required"`
-	SkipDNSCheck bool     `json:"skipDNSCheck"`
-	Nameservers  []string `json:"nameservers"`
-}
-
 type WebsiteAcmeAccountCreate struct {
-	Email      string `json:"email" validate:"required"`
-	Type       string `json:"type" validate:"required,oneof=letsencrypt zerossl buypass google"`
-	KeyType    string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
-	EabKid     string `json:"eabKid"`
-	EabHmacKey string `json:"eabHmacKey"`
+	Email string `json:"email" validate:"required"`
 }
 
 type WebsiteDnsAccountCreate struct {
@@ -68,29 +46,9 @@ type WebsiteResourceReq struct {
 	ID uint `json:"id" validate:"required"`
 }
 
-type WebsiteBatchDelReq struct {
-	IDs []uint `json:"ids" validate:"required"`
-}
-
 type WebsiteSSLUpdate struct {
-	ID            uint   `json:"id" validate:"required"`
-	AutoRenew     bool   `json:"autoRenew"`
-	Description   string `json:"description"`
-	PrimaryDomain string `json:"primaryDomain" validate:"required"`
-	OtherDomains  string `json:"otherDomains"`
-	Provider      string `json:"provider" validate:"required"`
-	AcmeAccountID uint   `json:"acmeAccountId"`
-	DnsAccountID  uint   `json:"dnsAccountId"`
-	KeyType       string `json:"keyType"`
-	Apply         bool   `json:"apply"`
-	PushDir       bool   `json:"pushDir"`
-	Dir           string `json:"dir"`
-	DisableCNAME  bool   `json:"disableCNAME"`
-	SkipDNS       bool   `json:"skipDNS"`
-	Nameserver1   string `json:"nameserver1"`
-	Nameserver2   string `json:"nameserver2"`
-	ExecShell     bool   `json:"execShell"`
-	Shell         string `json:"shell"`
+	ID        uint `json:"id" validate:"required"`
+	AutoRenew bool `json:"autoRenew"`
 }
 
 type WebsiteSSLUpload struct {
@@ -99,41 +57,4 @@ type WebsiteSSLUpload struct {
 	PrivateKeyPath  string `json:"privateKeyPath"`
 	CertificatePath string `json:"certificatePath"`
 	Type            string `json:"type" validate:"required,oneof=paste local"`
-	SSLID           uint   `json:"sslID"`
-	Description     string `json:"description"`
-}
-
-type WebsiteCASearch struct {
-	dto.PageInfo
-}
-
-type WebsiteCACreate struct {
-	CommonName       string `json:"commonName" validate:"required"`
-	Country          string `json:"country" validate:"required"`
-	Organization     string `json:"organization" validate:"required"`
-	OrganizationUint string `json:"organizationUint"`
-	Name             string `json:"name" validate:"required"`
-	KeyType          string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
-	Province         string `json:"province" `
-	City             string `json:"city"`
-}
-
-type WebsiteCAObtain struct {
-	ID          uint   `json:"id" validate:"required"`
-	Domains     string `json:"domains" validate:"required"`
-	KeyType     string `json:"keyType" validate:"required,oneof=P256 P384 2048 3072 4096 8192"`
-	Time        int    `json:"time" validate:"required"`
-	Unit        string `json:"unit" validate:"required"`
-	PushDir     bool   `json:"pushDir"`
-	Dir         string `json:"dir"`
-	AutoRenew   bool   `json:"autoRenew"`
-	Renew       bool   `json:"renew"`
-	SSLID       uint   `json:"sslID"`
-	Description string `json:"description"`
-	ExecShell   bool   `json:"execShell"`
-	Shell       string `json:"shell"`
-}
-
-type WebsiteCARenew struct {
-	SSLID uint `json:"SSLID" validate:"required"`
 }

backend/app/dto/response/app.go

@@ -1,16 +1,15 @@
 package response
 
 import (
-	"time"
-
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 )
 
 type AppRes struct {
-	Items []*AppDto `json:"items"`
+	Items []*AppDTO `json:"items"`
 	Total int64     `json:"total"`
 }
 
@@ -28,22 +27,6 @@ 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
 }
@@ -88,43 +71,10 @@ 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"`
-	ServiceName   string `json:"serviceName"`
-	Port          int64  `json:"port"`
+	Password    string `json:"password"`
+	ServiceName string `json:"serviceName"`
+	Port        int64  `json:"port"`
 }
 
 type AppService struct {

backend/app/dto/response/file.go

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

backend/app/dto/response/php_extensions.go

@@ -1,7 +0,0 @@
-package response
-
-import "github.com/1Panel-dev/1Panel/backend/app/model"
-
-type PHPExtensionsDTO struct {
-	model.PHPExtensions
-}

backend/app/dto/response/website.go

@@ -2,7 +2,6 @@ package response
 
 import (
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"time"
 )
 
 type WebsiteDTO struct {
@@ -12,32 +11,6 @@ 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 {
-	ID            uint   `json:"id"`
-	PrimaryDomain string `json:"primaryDomain"`
-	Alias         string `json:"alias"`
 }
 
 type WebsitePreInstallCheck struct {
@@ -52,13 +25,17 @@ type WebsiteNginxConfig struct {
 	Params []NginxParam `json:"params"`
 }
 
+type WebsiteWafConfig struct {
+	Enable  bool   `json:"enable"`
+	Content string `json:"content"`
+}
+
 type WebsiteHTTPS struct {
 	Enable      bool             `json:"enable"`
 	HttpConfig  string           `json:"httpConfig"`
 	SSL         model.WebsiteSSL `json:"SSL"`
 	SSLProtocol []string         `json:"SSLProtocol"`
 	Algorithm   string           `json:"algorithm"`
-	Hsts        bool             `json:"hsts"`
 }
 
 type WebsiteLog struct {
@@ -84,7 +61,3 @@ type WebsiteDirConfig struct {
 	UserGroup string   `json:"userGroup"`
 	Msg       string   `json:"msg"`
 }
-
-type WebsiteHtmlRes struct {
-	Content string `json:"content"`
-}

backend/app/dto/response/website_ssl.go

@@ -4,7 +4,6 @@ import "github.com/1Panel-dev/1Panel/backend/app/model"
 
 type WebsiteSSLDTO struct {
 	model.WebsiteSSL
-	LogPath string `json:"logPath"`
 }
 
 type WebsiteDNSRes struct {
@@ -22,13 +21,3 @@ type WebsiteDnsAccountDTO struct {
 	model.WebsiteDnsAccount
 	Authorization map[string]string `json:"authorization"`
 }
-
-type WebsiteCADTO struct {
-	model.WebsiteCA
-	CommonName       string `json:"commonName" `
-	Country          string `json:"country"`
-	Organization     string `json:"organization"`
-	OrganizationUint string `json:"organizationUint"`
-	Province         string `json:"province" `
-	City             string `json:"city"`
-}

backend/app/dto/setting.go

@@ -3,12 +3,10 @@ package dto
 import "time"
 
 type SettingInfo struct {
-	UserName       string `json:"userName"`
-	Email          string `json:"email"`
-	SystemIP       string `json:"systemIP"`
-	SystemVersion  string `json:"systemVersion"`
-	DockerSockPath string `json:"dockerSockPath"`
-	DeveloperMode  string `json:"developerMode"`
+	UserName      string `json:"userName"`
+	Email         string `json:"email"`
+	SystemIP      string `json:"systemIP"`
+	SystemVersion string `json:"systemVersion"`
 
 	SessionTimeout string `json:"sessionTimeout"`
 	LocalTime      string `json:"localTime"`
@@ -20,7 +18,6 @@ type SettingInfo struct {
 	BindAddress    string `json:"bindAddress"`
 	PanelName      string `json:"panelName"`
 	Theme          string `json:"theme"`
-	MenuTabs       string `json:"menuTabs"`
 	Language       string `json:"language"`
 	DefaultNetwork string `json:"defaultNetwork"`
 	LastCleanTime  string `json:"lastCleanTime"`
@@ -52,19 +49,6 @@ type SettingInfo struct {
 	AppStoreVersion      string `json:"appStoreVersion"`
 	AppStoreLastModified string `json:"appStoreLastModified"`
 	AppStoreSyncStatus   string `json:"appStoreSyncStatus"`
-
-	FileRecycleBin string `json:"fileRecycleBin"`
-
-	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"`
 }
 
 type SettingUpdate struct {
@@ -73,7 +57,7 @@ type SettingUpdate struct {
 }
 
 type SSLUpdate struct {
-	SSLType string `json:"sslType" validate:"required,oneof=self select import import-paste import-local"`
+	SSLType string `json:"sslType"`
 	Domain  string `json:"domain"`
 	SSL     string `json:"ssl" validate:"required,oneof=enable disable"`
 	Cert    string `json:"cert"`
@@ -98,12 +82,6 @@ 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"`
@@ -118,21 +96,14 @@ type SnapshotStatus struct {
 }
 
 type SnapshotCreate struct {
-	ID              uint   `json:"id"`
-	From            string `json:"from" validate:"required"`
-	DefaultDownload string `json:"defaultDownload" validate:"required"`
-	Description     string `json:"description" validate:"max=256"`
-	Secret          string `json:"secret"`
+	ID          uint   `json:"id"`
+	From        string `json:"from" validate:"required,oneof=OSS S3 SFTP MINIO COS KODO OneDrive"`
+	Description string `json:"description" validate:"max=256"`
 }
 type SnapshotRecover struct {
-	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"`
+	IsNew      bool `json:"isNew"`
+	ReDownload bool `json:"reDownload"`
+	ID         uint `json:"id" validate:"required"`
 }
 type SnapshotImport struct {
 	From        string   `json:"from"`
@@ -140,16 +111,14 @@ type SnapshotImport struct {
 	Description string   `json:"description" validate:"max=256"`
 }
 type SnapshotInfo struct {
-	ID              uint      `json:"id"`
-	Name            string    `json:"name"`
-	Description     string    `json:"description" validate:"max=256"`
-	From            string    `json:"from"`
-	DefaultDownload string    `json:"defaultDownload"`
-	Status          string    `json:"status"`
-	Message         string    `json:"message"`
-	CreatedAt       time.Time `json:"createdAt"`
-	Version         string    `json:"version"`
-	Size            int64     `json:"size"`
+	ID          uint      `json:"id"`
+	Name        string    `json:"name"`
+	Description string    `json:"description" validate:"max=256"`
+	From        string    `json:"from"`
+	Status      string    `json:"status"`
+	Message     string    `json:"message"`
+	CreatedAt   time.Time `json:"createdAt"`
+	Version     string    `json:"version"`
 
 	InterruptStep    string `json:"interruptStep"`
 	RecoverStatus    string `json:"recoverStatus"`
@@ -161,7 +130,6 @@ type SnapshotInfo struct {
 }
 
 type UpgradeInfo struct {
-	TestVersion   string `json:"testVersion"`
 	NewVersion    string `json:"newVersion"`
 	LatestVersion string `json:"latestVersion"`
 	ReleaseNote   string `json:"releaseNote"`
@@ -180,21 +148,11 @@ 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 {
@@ -215,12 +173,3 @@ 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"`
-}

backend/app/dto/ssh.go

@@ -44,6 +44,26 @@ type SSHLog struct {
 	FailedCount     int          `json:"failedCount"`
 }
 
+type SearchForAnalysis struct {
+	PageInfo
+	OrderBy string `json:"orderBy" validate:"required,oneof=Success Failed"`
+}
+
+type AnalysisRes struct {
+	Total           int64            `json:"total"`
+	Items           []SSHLogAnalysis `json:"items"`
+	SuccessfulCount int              `json:"successfulCount"`
+	FailedCount     int              `json:"failedCount"`
+}
+
+type SSHLogAnalysis struct {
+	Address         string `json:"address"`
+	Area            string `json:"area"`
+	SuccessfulCount int    `json:"successfulCount"`
+	FailedCount     int    `json:"failedCount"`
+	Status          string `json:"status"`
+}
+
 type SSHHistory struct {
 	Date     time.Time `json:"date"`
 	DateStr  string    `json:"dateStr"`

backend/app/model/app.go

@@ -1,11 +1,5 @@
 package model
 
-import (
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"path/filepath"
-	"strings"
-)
-
 type App struct {
 	BaseModel
 	Name               string `json:"name" gorm:"type:varchar(64);not null"`
@@ -16,7 +10,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" yaml:"crossVersionUpdate"`
+	CrossVersionUpdate bool   `json:"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"`
@@ -30,14 +24,3 @@ type App struct {
 	TagsKey []string    `json:"tags" yaml:"tags" gorm:"-"`
 	AppTags []AppTag    `json:"-" gorm:"-:migration"`
 }
-
-func (i *App) IsLocalApp() bool {
-	return i.Resource == constant.ResourceLocal
-}
-func (i *App) GetAppResourcePath() string {
-	if i.IsLocalApp() {
-		//这里要去掉本地应用的local前缀
-		return filepath.Join(constant.LocalAppResourceDir, strings.TrimPrefix(i.Key, "local"))
-	}
-	return filepath.Join(constant.RemoteAppResourceDir, i.Key)
-}

backend/app/model/backup.go

@@ -12,8 +12,6 @@ type BackupAccount struct {
 
 type BackupRecord struct {
 	BaseModel
-	From       string `gorm:"type:varchar(64)" json:"from"`
-	CronjobID  uint   `gorm:"type:decimal" json:"cronjobID"`
 	Type       string `gorm:"type:varchar(64);not null" json:"type"`
 	Name       string `gorm:"type:varchar(64);not null" json:"name"`
 	DetailName string `gorm:"type:varchar(256)" json:"detailName"`

backend/app/model/clam.go

@@ -1,14 +0,0 @@
-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,9 +6,3 @@ 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"`
-}

backend/app/model/cronjob.go

@@ -1,39 +1,36 @@
 package model
 
-import (
-	"time"
-)
+import "time"
 
 type Cronjob struct {
 	BaseModel
 
-	Name string `gorm:"type:varchar(64);not null" json:"name"`
-	Type string `gorm:"type:varchar(64);not null" json:"type"`
-	Spec string `gorm:"type:varchar(64);not null" json:"spec"`
+	Name     string `gorm:"type:varchar(64);not null;unique" json:"name"`
+	Type     string `gorm:"type:varchar(64);not null" json:"type"`
+	SpecType string `gorm:"type:varchar(64);not null" json:"specType"`
+	Spec     string `gorm:"type:varchar(64);not null" json:"spec"`
+	Week     uint64 `gorm:"type:decimal" json:"week"`
+	Day      uint64 `gorm:"type:decimal" json:"day"`
+	Hour     uint64 `gorm:"type:decimal" json:"hour"`
+	Minute   uint64 `gorm:"type:decimal" json:"minute"`
+	Second   uint64 `gorm:"type:decimal" json:"second"`
 
-	Command        string `gorm:"type:varchar(64)" json:"command"`
 	ContainerName  string `gorm:"type:varchar(64)" json:"containerName"`
 	Script         string `gorm:"longtext" json:"script"`
 	Website        string `gorm:"type:varchar(64)" json:"website"`
 	AppID          string `gorm:"type:varchar(64)" json:"appID"`
-	DBType         string `gorm:"type:varchar(64)" json:"dbType"`
 	DBName         string `gorm:"type:varchar(64)" json:"dbName"`
 	URL            string `gorm:"type:varchar(256)" json:"url"`
 	SourceDir      string `gorm:"type:varchar(256)" json:"sourceDir"`
 	ExclusionRules string `gorm:"longtext" json:"exclusionRules"`
 
-	// 已废弃
-	KeepLocal   bool   `gorm:"type:varchar(64)" json:"keepLocal"`
-	TargetDirID uint64 `gorm:"type:decimal" json:"targetDirID"`
+	KeepLocal    bool   `gorm:"type:varchar(64)" json:"keepLocal"`
+	TargetDirID  uint64 `gorm:"type:decimal" json:"targetDirID"`
+	RetainCopies uint64 `gorm:"type:decimal" json:"retainCopies"`
 
-	BackupAccounts  string `gorm:"type:varchar(64)" json:"backupAccounts"`
-	DefaultDownload string `gorm:"type:varchar(64)" json:"defaultDownload"`
-	RetainCopies    uint64 `gorm:"type:decimal" json:"retainCopies"`
-
-	Status   string       `gorm:"type:varchar(64)" json:"status"`
-	EntryIDs string       `gorm:"type:varchar(64)" json:"entryIDs"`
-	Records  []JobRecords `json:"records"`
-	Secret   string       `gorm:"type:varchar(64)" json:"secret"`
+	Status  string       `gorm:"type:varchar(64)" json:"status"`
+	EntryID uint64       `gorm:"type:decimal" json:"entryID"`
+	Records []JobRecords `json:"records"`
 }
 
 type JobRecords struct {

backend/app/model/database.go

@@ -11,12 +11,5 @@ type Database struct {
 	Port         uint   `json:"port" gorm:"type:decimal;not null"`
 	Username     string `json:"username" gorm:"type:varchar(64)"`
 	Password     string `json:"password" gorm:"type:varchar(64)"`
-
-	SSL        bool   `json:"ssl"`
-	RootCert   string `json:"rootCert" gorm:"type:longText"`
-	ClientKey  string `json:"clientKey" gorm:"type:longText"`
-	ClientCert string `json:"clientCert" gorm:"type:longText"`
-	SkipVerify bool   `json:"skipVerify"`
-
-	Description string `json:"description" gorm:"type:varchar(256);"`
+	Description  string `json:"description" gorm:"type:varchar(256);"`
 }

backend/app/model/database_mysql.go

@@ -9,6 +9,5 @@ type DatabaseMysql struct {
 	Username    string `json:"username" gorm:"type:varchar(256);not null"`
 	Password    string `json:"password" gorm:"type:varchar(256);not null"`
 	Permission  string `json:"permission" gorm:"type:varchar(256);not null"`
-	IsDelete    bool   `json:"isDelete" gorm:"type:varchar(64)"`
 	Description string `json:"description" gorm:"type:varchar(256);"`
 }

backend/app/model/database_postgresql.go

@@ -1,14 +0,0 @@
-package model
-
-type DatabasePostgresql struct {
-	BaseModel
-	Name           string `json:"name" gorm:"type:varchar(256);not null"`
-	From           string `json:"from" gorm:"type:varchar(256);not null;default:local"`
-	PostgresqlName string `json:"postgresqlName" gorm:"type:varchar(64);not null"`
-	Format         string `json:"format" gorm:"type:varchar(64);not null"`
-	Username       string `json:"username" gorm:"type:varchar(256);not null"`
-	Password       string `json:"password" gorm:"type:varchar(256);not null"`
-	SuperUser      bool   `json:"superUser" gorm:"type:varchar(64)"`
-	IsDelete       bool   `json:"isDelete" gorm:"type:varchar(64)"`
-	Description    string `json:"description" gorm:"type:varchar(256);"`
-}

backend/app/model/firewall.go

@@ -10,12 +10,3 @@ type Firewall struct {
 	Strategy    string `gorm:"type:varchar(64);not null" json:"strategy"`
 	Description string `gorm:"type:varchar(64);not null" json:"description"`
 }
-
-type Forward struct {
-	BaseModel
-
-	Protocol   string `gorm:"type:varchar(64);not null" json:"protocol"`
-	Port       string `gorm:"type:varchar(64);not null" json:"port"`
-	TargetIP   string `gorm:"type:varchar(64);not null" json:"targetIP"`
-	TargetPort string `gorm:"type:varchar(64);not null" json:"targetPort"`
-}

backend/app/model/ftp.go

@@ -1,11 +0,0 @@
-package model
-
-type Ftp struct {
-	BaseModel
-
-	User        string `gorm:"type:varchar(64);not null" json:"user"`
-	Password    string `gorm:"type:varchar(64);not null" json:"password"`
-	Status      string `gorm:"type:varchar(64);not null" json:"status"`
-	Path        string `gorm:"type:varchar(64);not null" json:"path"`
-	Description string `gorm:"type:varchar(64);not null" json:"description"`
-}

backend/app/model/php_extensions.go

@@ -1,7 +0,0 @@
-package model
-
-type PHPExtensions struct {
-	BaseModel
-	Name       string ` json:"name" gorm:"not null"`
-	Extensions string `json:"extensions" gorm:"not null"`
-}

backend/app/model/snapshot.go

@@ -2,13 +2,12 @@ package model
 
 type Snapshot struct {
 	BaseModel
-	Name            string `json:"name" gorm:"type:varchar(64);not null;unique"`
-	Description     string `json:"description" gorm:"type:varchar(256)"`
-	From            string `json:"from"`
-	DefaultDownload string `json:"defaultDownload" gorm:"type:varchar(64)"`
-	Status          string `json:"status" gorm:"type:varchar(64)"`
-	Message         string `json:"message" gorm:"type:varchar(256)"`
-	Version         string `json:"version" gorm:"type:varchar(256)"`
+	Name        string `json:"name" gorm:"type:varchar(64);not null;unique"`
+	Description string `json:"description" gorm:"type:varchar(256)"`
+	From        string `json:"from"`
+	Status      string `json:"status" gorm:"type:varchar(64)"`
+	Message     string `json:"message" gorm:"type:varchar(256)"`
+	Version     string `json:"version" gorm:"type:varchar(256)"`
 
 	InterruptStep    string `json:"interruptStep" gorm:"type:varchar(64)"`
 	RecoverStatus    string `json:"recoverStatus" gorm:"type:varchar(64)"`

backend/app/model/website.go

@@ -26,7 +26,6 @@ type Website struct {
 	WebsiteSSLID   uint `gorm:"type:integer" json:"webSiteSSLId"`
 	RuntimeID      uint `gorm:"type:integer" json:"runtimeID"`
 	AppInstallID   uint `gorm:"type:integer" json:"appInstallId"`
-	FtpID          uint `gorm:"type:integer" json:"ftpId"`
 
 	User  string `gorm:"type:varchar;" json:"user"`
 	Group string `gorm:"type:varchar;" json:"group"`

backend/app/model/website_acme_account.go

@@ -2,13 +2,9 @@ package model
 
 type WebsiteAcmeAccount struct {
 	BaseModel
-	Email      string `gorm:"not null" json:"email"`
-	URL        string `gorm:"not null" json:"url"`
-	PrivateKey string `gorm:"not null" json:"-"`
-	Type       string `gorm:"not null;default:letsencrypt" json:"type"`
-	EabKid     string `gorm:"default:null;" json:"eabKid"`
-	EabHmacKey string `gorm:"default:null" json:"eabHmacKey"`
-	KeyType    string `gorm:"not null;default:2048" json:"keyType"`
+	Email      string `gorm:"type:varchar(256);not null" json:"email"`
+	URL        string `gorm:"type:varchar(256);not null" json:"url"`
+	PrivateKey string `gorm:"type:longtext;not null" json:"-"`
 }
 
 func (w WebsiteAcmeAccount) TableName() string {

backend/app/model/website_ca.go

@@ -1,9 +0,0 @@
-package model
-
-type WebsiteCA struct {
-	BaseModel
-	CSR        string `gorm:"not null;" json:"csr"`
-	Name       string `gorm:"not null;" json:"name"`
-	PrivateKey string `gorm:"not null" json:"privateKey"`
-	KeyType    string `gorm:"not null;default:2048" json:"keyType"`
-}

backend/app/model/website_ssl.go

@@ -1,50 +1,27 @@
 package model
 
-import (
-	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"path"
-	"time"
-)
+import "time"
 
 type WebsiteSSL struct {
 	BaseModel
-	PrimaryDomain string    `json:"primaryDomain"`
-	PrivateKey    string    `json:"privateKey"`
-	Pem           string    `json:"pem"`
-	Domains       string    `json:"domains"`
-	CertURL       string    `json:"certURL"`
-	Type          string    `json:"type"`
-	Provider      string    `json:"provider"`
-	Organization  string    `json:"organization"`
-	DnsAccountID  uint      `json:"dnsAccountId"`
-	AcmeAccountID uint      `gorm:"column:acme_account_id" json:"acmeAccountId" `
-	CaID          uint      `json:"caId"`
-	AutoRenew     bool      `json:"autoRenew"`
+	PrimaryDomain string    `gorm:"type:varchar(256);not null" json:"primaryDomain"`
+	PrivateKey    string    `gorm:"type:longtext;not null" json:"privateKey"`
+	Pem           string    `gorm:"type:longtext;not null" json:"pem"`
+	Domains       string    `gorm:"type:varchar(256);not null" json:"domains"`
+	CertURL       string    `gorm:"type:varchar(256);not null" json:"certURL"`
+	Type          string    `gorm:"type:varchar(64);not null" json:"type"`
+	Provider      string    `gorm:"type:varchar(64);not null" json:"provider"`
+	Organization  string    `gorm:"type:varchar(64);not null" json:"organization"`
+	DnsAccountID  uint      `gorm:"type:integer;not null" json:"dnsAccountId"`
+	AcmeAccountID uint      `gorm:"type:integer;not null" json:"acmeAccountId"`
+	AutoRenew     bool      `gorm:"type:varchar(64);not null" json:"autoRenew"`
 	ExpireDate    time.Time `json:"expireDate"`
 	StartDate     time.Time `json:"startDate"`
-	Status        string    `json:"status"`
-	Message       string    `json:"message"`
-	KeyType       string    `json:"keyType"`
-	PushDir       bool      `json:"pushDir"`
-	Dir           string    `json:"dir"`
-	Description   string    `json:"description"`
-	SkipDNS       bool      `json:"skipDNS"`
-	Nameserver1   string    `json:"nameserver1"`
-	Nameserver2   string    `json:"nameserver2"`
-	DisableCNAME  bool      `json:"disableCNAME"`
-	ExecShell     bool      `json:"execShell"`
-	Shell         string    `json:"shell"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
-	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`
 	Websites    []Website          `json:"websites" gorm:"-:migration"`
 }
 
 func (w WebsiteSSL) TableName() string {
 	return "website_ssls"
 }
-
-func (w WebsiteSSL) GetLogPath() string {
-	return path.Join(constant.SSLLogDir, fmt.Sprintf("%s-ssl-%d.log", w.PrimaryDomain, w.ID))
-}

backend/app/repo/app.go

@@ -17,7 +17,6 @@ type IAppRepo interface {
 	OrderByRecommend() DBOption
 	GetRecommend() DBOption
 	WithResource(resource string) DBOption
-	WithLikeName(name string) DBOption
 	Page(page, size int, opts ...DBOption) (int64, []model.App, error)
 	GetFirst(opts ...DBOption) (model.App, error)
 	GetBy(opts ...DBOption) ([]model.App, error)
@@ -32,15 +31,6 @@ func NewIAppRepo() IAppRepo {
 	return &AppRepo{}
 }
 
-func (a AppRepo) WithLikeName(name string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if len(name) == 0 {
-			return g
-		}
-		return g.Where("name like ? or short_desc_zh like ? or short_desc_en like ?", "%"+name+"%", "%"+name+"%", "%"+name+"%")
-	}
-}
-
 func (a AppRepo) WithKey(key string) DBOption {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.Where("key = ?", key)

backend/app/repo/app_install.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/1Panel-dev/1Panel/backend/constant"
-
 	"gorm.io/gorm/clause"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -161,7 +159,6 @@ func (a *AppInstallRepo) BatchUpdateBy(maps map[string]interface{}, opts ...DBOp
 type RootInfo struct {
 	ID            uint   `json:"id"`
 	Name          string `json:"name"`
-	Status        string `json:"status"`
 	Port          int64  `json:"port"`
 	HttpsPort     int64  `json:"httpsPort"`
 	UserName      string `json:"userName"`
@@ -173,7 +170,6 @@ type RootInfo struct {
 	Env           string `json:"env"`
 	Key           string `json:"key"`
 	Version       string `json:"version"`
-	AppPath       string `json:"app_path"`
 }
 
 func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error) {
@@ -209,7 +205,7 @@ func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error
 		if ok {
 			info.Password = password
 		}
-	case "mongodb", constant.AppPostgresql:
+	case "mongodb", "postgresql":
 		user, ok := envMap["PANEL_DB_ROOT_USER"].(string)
 		if ok {
 			info.UserName = user
@@ -234,8 +230,5 @@ func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error
 	info.Param = appInstall.Param
 	info.Version = appInstall.Version
 	info.Key = app.Key
-	appInstall.App = app
-	info.AppPath = appInstall.GetAppPath()
-	info.Status = appInstall.Status
 	return &info, nil
 }

backend/app/repo/backup.go

@@ -2,7 +2,6 @@ package repo
 
 import (
 	"context"
-
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"gorm.io/gorm"
@@ -20,12 +19,9 @@ type IBackupRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	DeleteRecord(ctx context.Context, opts ...DBOption) error
-	UpdateRecord(record *model.BackupRecord) error
 	WithByDetailName(detailName string) DBOption
 	WithByFileName(fileName string) DBOption
 	WithByType(backupType string) DBOption
-	WithByCronID(cronjobID uint) DBOption
-	WithFileNameStartWith(filePrefix string) DBOption
 }
 
 func NewIBackupRepo() IBackupRepo {
@@ -82,12 +78,6 @@ func (u *BackupRepo) WithByFileName(fileName string) DBOption {
 	}
 }
 
-func (u *BackupRepo) WithFileNameStartWith(filePrefix string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("file_name LIKE ?", filePrefix+"%")
-	}
-}
-
 func (u *BackupRepo) WithByType(backupType string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		if len(backupType) == 0 {
@@ -115,10 +105,6 @@ func (u *BackupRepo) CreateRecord(record *model.BackupRecord) error {
 	return global.DB.Create(record).Error
 }
 
-func (u *BackupRepo) UpdateRecord(record *model.BackupRecord) error {
-	return global.DB.Save(record).Error
-}
-
 func (u *BackupRepo) Update(id uint, vars map[string]interface{}) error {
 	return global.DB.Model(&model.BackupAccount{}).Where("id = ?", id).Updates(vars).Error
 }
@@ -134,9 +120,3 @@ func (u *BackupRepo) Delete(opts ...DBOption) error {
 func (u *BackupRepo) DeleteRecord(ctx context.Context, opts ...DBOption) error {
 	return getTx(ctx, opts...).Delete(&model.BackupRecord{}).Error
 }
-
-func (u *BackupRepo) WithByCronID(cronjobID uint) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("cronjob_id = ?", cronjobID)
-	}
-}

backend/app/repo/clam.go

@@ -1,69 +0,0 @@
-package repo
-
-import (
-	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/global"
-)
-
-type ClamRepo struct{}
-
-type IClamRepo interface {
-	Page(limit, offset int, opts ...DBOption) (int64, []model.Clam, error)
-	Create(clam *model.Clam) error
-	Update(id uint, vars map[string]interface{}) error
-	Delete(opts ...DBOption) error
-	Get(opts ...DBOption) (model.Clam, error)
-	List(opts ...DBOption) ([]model.Clam, error)
-}
-
-func NewIClamRepo() IClamRepo {
-	return &ClamRepo{}
-}
-
-func (u *ClamRepo) Get(opts ...DBOption) (model.Clam, error) {
-	var clam model.Clam
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&clam).Error
-	return clam, err
-}
-
-func (u *ClamRepo) List(opts ...DBOption) ([]model.Clam, error) {
-	var clam []model.Clam
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&clam).Error
-	return clam, err
-}
-
-func (u *ClamRepo) Page(page, size int, opts ...DBOption) (int64, []model.Clam, error) {
-	var users []model.Clam
-	db := global.DB.Model(&model.Clam{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&users).Error
-	return count, users, err
-}
-
-func (u *ClamRepo) Create(clam *model.Clam) error {
-	return global.DB.Create(clam).Error
-}
-
-func (u *ClamRepo) Update(id uint, vars map[string]interface{}) error {
-	return global.DB.Model(&model.Clam{}).Where("id = ?", id).Updates(vars).Error
-}
-
-func (u *ClamRepo) Delete(opts ...DBOption) error {
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	return db.Delete(&model.Clam{}).Error
-}

backend/app/repo/command.go

@@ -16,13 +16,6 @@ type ICommandRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	Get(opts ...DBOption) (model.Command, error)
-	WithLikeName(name string) DBOption
-
-	PageRedis(limit, offset int, opts ...DBOption) (int64, []model.RedisCommand, error)
-	GetRedis(opts ...DBOption) (model.RedisCommand, error)
-	GetRedisList(opts ...DBOption) ([]model.RedisCommand, error)
-	SaveRedis(command *model.RedisCommand) error
-	DeleteRedis(opts ...DBOption) error
 }
 
 func NewICommandRepo() ICommandRepo {
@@ -39,16 +32,6 @@ func (u *CommandRepo) Get(opts ...DBOption) (model.Command, error) {
 	return command, err
 }
 
-func (u *CommandRepo) GetRedis(opts ...DBOption) (model.RedisCommand, error) {
-	var command model.RedisCommand
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&command).Error
-	return command, err
-}
-
 func (u *CommandRepo) Page(page, size int, opts ...DBOption) (int64, []model.Command, error) {
 	var users []model.Command
 	db := global.DB.Model(&model.Command{})
@@ -61,18 +44,6 @@ func (u *CommandRepo) Page(page, size int, opts ...DBOption) (int64, []model.Com
 	return count, users, err
 }
 
-func (u *CommandRepo) PageRedis(page, size int, opts ...DBOption) (int64, []model.RedisCommand, error) {
-	var users []model.RedisCommand
-	db := global.DB.Model(&model.RedisCommand{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	count := int64(0)
-	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&users).Error
-	return count, users, err
-}
-
 func (u *CommandRepo) GetList(opts ...DBOption) ([]model.Command, error) {
 	var commands []model.Command
 	db := global.DB.Model(&model.Command{})
@@ -83,16 +54,6 @@ func (u *CommandRepo) GetList(opts ...DBOption) ([]model.Command, error) {
 	return commands, err
 }
 
-func (u *CommandRepo) GetRedisList(opts ...DBOption) ([]model.RedisCommand, error) {
-	var commands []model.RedisCommand
-	db := global.DB.Model(&model.RedisCommand{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&commands).Error
-	return commands, err
-}
-
 func (c *CommandRepo) WithByInfo(info string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		if len(info) == 0 {
@@ -107,10 +68,6 @@ func (u *CommandRepo) Create(command *model.Command) error {
 	return global.DB.Create(command).Error
 }
 
-func (u *CommandRepo) SaveRedis(command *model.RedisCommand) error {
-	return global.DB.Save(command).Error
-}
-
 func (u *CommandRepo) Update(id uint, vars map[string]interface{}) error {
 	return global.DB.Model(&model.Command{}).Where("id = ?", id).Updates(vars).Error
 }
@@ -122,20 +79,3 @@ func (u *CommandRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Command{}).Error
 }
-
-func (u *CommandRepo) DeleteRedis(opts ...DBOption) error {
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	return db.Delete(&model.RedisCommand{}).Error
-}
-
-func (a CommandRepo) WithLikeName(name string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if len(name) == 0 {
-			return g
-		}
-		return g.Where("name like ? or command like ?", "%"+name+"%", "%"+name+"%")
-	}
-}