fix: 增加前端注入校验规则 (#1456)

Refs https://github.com/1Panel-dev/1Panel/issues/1445

.gitignore

@@ -33,5 +33,3 @@ install.sh
 quick_start.sh
 cmd/server/web/.DS_Store
 cmd/server/.DS_Store
-cmd/server/fileList.txt
-.fileList.txt

Makefile

@@ -29,6 +29,10 @@ build_backend_on_darwin:
 	cd $(SERVER_PATH) \
     && GOOS=linux GOARCH=amd64 $(GOBUILD) -trimpath -ldflags '-s -w'  -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
 
+build_backend_on_archlinux:
+	cd $(SERVER_PATH) \
+    && GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBUILD) -trimpath -ldflags '-s -w' -o $(BUILD_PATH)/$(APP_NAME) $(MAIN)
+
 build_all: build_frontend build_backend_on_linux
 
 build_on_local: clean_assets build_frontend build_backend_on_darwin upx_bin

README.md

@@ -1,12 +1,12 @@
+[README_EN.md](README_EN.md)
 <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>现代化、开源的 Linux 服务器运维管理面板</b></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://www.gnu.org/licenses/gpl-3.0.html"><img src="https://shields.io/github/license/1Panel-dev/1Panel" alt="License: GPL v3"></a>
   <a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
   <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a>
-  <a href="https://app.fossa.com/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel?ref=badge_shield"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel.svg?type=shield" alt="FOSSA Status"></a><br>
-  [<a href="README_EN.md">English</a>] | [<a href="README_JP.md">日本語</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>
 </p>
 
 ------------------------------

README_EN.md

@@ -1,11 +1,11 @@
+[中文 README.md](README.md)
 <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>Modern and Open-Source Linux Server Operation and Management Panel</b></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" alt="License: GPL v3"></a>
   <a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
-  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a><br>
-  [<a href="README.md">中文</a>] | [<a href="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>
 </p>
 
 ------------------------------

README_JP.md

@@ -1,72 +0,0 @@
-<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>モダンでオープンソースの Linux サーバー運用管理パネル</b></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" alt="License: GPL v3"></a>
-  <a href="https://app.codacy.com/gh/1Panel-dev/1Panel?utm_source=github.com&utm_medium=referral&utm_content=1Panel-dev/1Panel&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
-  <a href="https://github.com/1Panel-dev/1Panel/releases"><img src="https://img.shields.io/github/v/release/1Panel-dev/1Panel" alt="GitHub release"></a>
-  <a href="https://github.com/1Panel-dev/1Panel"><img src="https://img.shields.io/github/stars/1Panel-dev/1Panel?color=%231890FF&style=flat-square" alt="Stars"></a><br>
-  [<a href="README.md">中文</a>] | [<a href="README_EN.md">English</a>]
-</p>
-
-------------------------------
-
-1Panel はモダンでオープンソースの Linux サーバー操作と管理パネルです:
-
-- **素早いウェブサイト構築**: Wordpress および [Halo](https://github.com/halo-dev/halo/) と深く統合されており、ドメイン名のバインディング、SSL 証明書の設定など、ワンクリックで解決できます;
-- **効率的なマネジメント**: アプリケーション管理、ホスト監視、ファイル管理、データベース管理、コンテナ管理など、web インターフェイスを通じて Linux サーバーを簡単に管理できます;
-- **安全性と信頼性**: ファイアウォールとセキュリティ監査機能により、脆弱性の露出を最小限に抑えます;
-- **ワンクリックバックアップ**: ワンクリックでのバックアップと復元をサポートし、バックアップデータはクラウドに保存され、失われることはありません。
-
-## UI ディスプレイ
-
-![UI Display](https://resource.fit2cloud.com/1panel/img/overview_en.png)
-
-## クイックスタート
-
-**オンラインでも**
-
-- アドレス: <https://demo.1panel.cn/>
-- ユーザネーム: demo
-- パスワード: 1panel
-
-**ワンクリックインストール**
-
-ワンクリックで 1Panel をインストールするには、次のコマンドを実行します:
-
-```sh
-curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_start.sh && sudo bash quick_start.sh
-```
-
-**学習教材**
-
-- [オンラインドキュメント](https://1panel.cn/docs/)
-- [ビデオ教材](https://space.bilibili.com/510493147/channel/collectiondetail?sid=1199760)
-
-## コミュニティ
-
-ご質問やご提案がございましたら、GitHub Issue にご投稿いただくか、WeChat グループにご参加ください。
-
-**WeChat グループ**
-
-<img src="https://1panel.cn/img/wechat-group.jpg" width="156" height="156"/>
-
-## セキュリティ情報
-
-セキュリティ上の問題を発見された場合は、下記までご連絡ください:
-
-- メール: 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)
-
-## License
-
-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
-
-<https://www.gnu.org/licenses/gpl-3.0.html>
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

backend/app/api/v1/app.go

@@ -130,22 +130,6 @@ func (b *BaseApi) GetAppDetailByID(c *gin.Context) {
 	helper.SuccessWithData(c, appDetailDTO)
 }
 
-// @Tags App
-// @Summary Get Ignore App
-// @Description 获取忽略的应用版本
-// @Accept json
-// @Success 200 {object} response.IgnoredApp
-// @Security ApiKeyAuth
-// @Router /apps/ingored [get]
-func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
-	res, err := appService.GetIgnoredApp()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
 // @Tags App
 // @Summary Install app
 // @Description 安装应用

backend/app/api/v1/app_install.go

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"errors"
 	"reflect"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
@@ -13,8 +14,8 @@ import (
 )
 
 // @Tags App
-// @Summary Page app installed
-// @Description 分页获取已安装应用列表
+// @Summary List app installed
+// @Description 获取已安装应用列表
 // @Accept json
 // @Param request body request.AppInstalledSearch true "request"
 // @Success 200
@@ -46,41 +47,21 @@ func (b *BaseApi) SearchAppInstalled(c *gin.Context) {
 	}
 }
 
-// @Tags App
-// @Summary List app installed
-// @Description 获取已安装应用列表
-// @Accept json
-// @Success 200 array dto.AppInstallInfo
-// @Security ApiKeyAuth
-// @Router /apps/installed/list [get]
-func (b *BaseApi) ListAppInstalled(c *gin.Context) {
-	list, err := appInstallService.GetInstallList()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
 // @Tags App
 // @Summary Check app installed
 // @Description 检查应用安装情况
 // @Accept json
-// @Param request body request.AppInstalledInfo true "request"
+// @Param key path string true "request"
 // @Success 200 {object} response.AppInstalledCheck
 // @Security ApiKeyAuth
-// @Router /apps/installed/check [post]
+// @Router /apps/installed/check/:key [get]
 func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
-	var req request.AppInstalledInfo
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	key, ok := c.Params.Get("key")
+	if !ok {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error key in path"))
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	checkData, err := appInstallService.CheckExist(req)
+	checkData, err := appInstallService.CheckExist(key)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -92,17 +73,17 @@ func (b *BaseApi) CheckAppInstalled(c *gin.Context) {
 // @Summary Search app port by key
 // @Description 获取应用端口
 // @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
+// @Param key path string true "request"
 // @Success 200 {integer} port
 // @Security ApiKeyAuth
-// @Router /apps/installed/loadport [post]
+// @Router /apps/installed/loadport/:key [get]
 func (b *BaseApi) LoadPort(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	key, ok := c.Params.Get("key")
+	if !ok {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error key in path"))
 		return
 	}
-	port, err := appInstallService.LoadPort(req)
+	port, err := appInstallService.LoadPort(key)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -114,17 +95,17 @@ func (b *BaseApi) LoadPort(c *gin.Context) {
 // @Summary Search app password by key
 // @Description 获取应用连接信息
 // @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
+// @Param key path string true "request"
 // @Success 200 {string} response.DatabaseConn
 // @Security ApiKeyAuth
 // @Router /apps/installed/conninfo/:key [get]
 func (b *BaseApi) LoadConnInfo(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	key, ok := c.Params.Get("key")
+	if !ok {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error key in path"))
 		return
 	}
-	conn, err := appInstallService.LoadConnInfo(req)
+	conn, err := appInstallService.LoadConnInfo(key)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -137,7 +118,7 @@ func (b *BaseApi) LoadConnInfo(c *gin.Context) {
 // @Description 删除前检查
 // @Accept json
 // @Param appInstallId path integer true "App install id"
-// @Success 200 {array} dto.AppResource
+// @Success 200 {anrry} dto.AppResource
 // @Security ApiKeyAuth
 // @Router /apps/installed/delete/check/:appInstallId [get]
 func (b *BaseApi) DeleteCheck(c *gin.Context) {
@@ -197,7 +178,7 @@ func (b *BaseApi) OperateInstalled(c *gin.Context) {
 // @Description 通过 key 获取应用 service
 // @Accept json
 // @Param key path string true "request"
-// @Success 200 {array} response.AppService
+// @Success 200 {anrry} response.AppService
 // @Security ApiKeyAuth
 // @Router /apps/services/:key [get]
 func (b *BaseApi) GetServices(c *gin.Context) {
@@ -215,7 +196,7 @@ func (b *BaseApi) GetServices(c *gin.Context) {
 // @Description 通过 install id 获取应用更新版本
 // @Accept json
 // @Param appInstallId path integer true "request"
-// @Success 200 {array} dto.AppVersion
+// @Success 200 {anrry} dto.AppVersion
 // @Security ApiKeyAuth
 // @Router /apps/installed/:appInstallId/versions [get]
 func (b *BaseApi) GetUpdateVersions(c *gin.Context) {
@@ -262,17 +243,17 @@ func (b *BaseApi) ChangeAppPort(c *gin.Context) {
 // @Summary Search default config by key
 // @Description 通过 key 获取应用默认配置
 // @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
+// @Param key path string true "request"
 // @Success 200 {string} content
 // @Security ApiKeyAuth
-// @Router /apps/installed/conf [post]
+// @Router /apps/installed/conf/:key [get]
 func (b *BaseApi) GetDefaultConfig(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+	key := c.Param("key")
+	if key == "" {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
 		return
 	}
-	content, err := appInstallService.GetDefaultConfigByKey(req.Type, req.Name)
+	content, err := appInstallService.GetDefaultConfigByKey(key)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -324,25 +305,3 @@ func (b *BaseApi) UpdateInstalled(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, nil)
 }
-
-// @Tags App
-// @Summary ignore App Update
-// @Description 忽略应用升级版本
-// @Accept json
-// @Param request body request.AppInstalledIgnoreUpgrade true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /apps/installed/ignore [post]
-// @x-panel-log {"bodyKeys":["installId"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"忽略应用 [installId] 版本升级","formatEN":"Application param update [installId]"}
-func (b *BaseApi) IgnoreUpgrade(c *gin.Context) {
-	var req request.AppInstalledIgnoreUpgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := appInstallService.IgnoreUpgrade(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}

backend/app/api/v1/auth.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/model"
@@ -22,7 +20,6 @@ type BaseApi struct{}
 // @Param request body dto.Login true "request"
 // @Success 200 {object} dto.UserLoginInfo
 // @Router /auth/login [post]
-// @Header 200 {string} EntranceCode "安全入口"
 func (b *BaseApi) Login(c *gin.Context) {
 	var req dto.Login
 	if err := c.ShouldBindJSON(&req); err != nil {
@@ -35,13 +32,8 @@ func (b *BaseApi) Login(c *gin.Context) {
 			return
 		}
 	}
-	entranceItem := c.Request.Header.Get("EntranceCode")
-	var entrance []byte
-	if len(entranceItem) != 0 {
-		entrance, _ = base64.StdEncoding.DecodeString(entranceItem)
-	}
 
-	user, err := authService.Login(c, req, string(entrance))
+	user, err := authService.Login(c, req)
 	go saveLoginLogs(c, err)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
@@ -57,7 +49,6 @@ func (b *BaseApi) Login(c *gin.Context) {
 // @Param request body dto.MFALogin true "request"
 // @Success 200 {object} dto.UserLoginInfo
 // @Router /auth/mfalogin [post]
-// @Header 200 {string} EntranceCode "安全入口"
 func (b *BaseApi) MFALogin(c *gin.Context) {
 	var req dto.MFALogin
 	if err := c.ShouldBindJSON(&req); err != nil {
@@ -68,13 +59,8 @@ func (b *BaseApi) MFALogin(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	entranceItem := c.Request.Header.Get("EntranceCode")
-	var entrance []byte
-	if len(entranceItem) != 0 {
-		entrance, _ = base64.StdEncoding.DecodeString(entranceItem)
-	}
 
-	user, err := authService.MFALogin(c, req, string(entrance))
+	user, err := authService.MFALogin(c, req)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -134,20 +120,6 @@ func (b *BaseApi) CheckIsDemo(c *gin.Context) {
 	helper.SuccessWithData(c, global.CONF.System.IsDemo)
 }
 
-// @Tags Auth
-// @Summary Load System Language
-// @Description 获取系统语言设置
-// @Success 200
-// @Router /auth/language [get]
-func (b *BaseApi) GetLanguage(c *gin.Context) {
-	settingInfo, err := settingService.GetSettingInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, settingInfo.Language)
-}
-
 func saveLoginLogs(c *gin.Context, err error) {
 	var logs model.LoginLog
 	if err != nil {

backend/app/api/v1/backup.go

@@ -60,7 +60,7 @@ func (b *BaseApi) CreateBackup(c *gin.Context) {
 // @Description 获取 bucket 列表
 // @Accept json
 // @Param request body dto.ForBuckets true "request"
-// @Success 200 {array} string
+// @Success 200 {anrry} string
 // @Security ApiKeyAuth
 // @Router /settings/backup/search [post]
 func (b *BaseApi) ListBuckets(c *gin.Context) {
@@ -98,22 +98,6 @@ func (b *BaseApi) ListBuckets(c *gin.Context) {
 	helper.SuccessWithData(c, buckets)
 }
 
-// @Tags Backup Account
-// @Summary Load OneDrive info
-// @Description 获取 OneDrive 信息
-// @Accept json
-// @Success 200 string clientID
-// @Security ApiKeyAuth
-// @Router /settings/backup/onedrive [get]
-func (b *BaseApi) LoadOneDriveInfo(c *gin.Context) {
-	clientID, err := backupService.LoadOneDriveInfo()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, clientID)
-}
-
 // @Tags Backup Account
 // @Summary Delete backup account
 // @Description 删除备份账号
@@ -269,7 +253,7 @@ func (b *BaseApi) UpdateBackup(c *gin.Context) {
 // @Tags Backup Account
 // @Summary List backup accounts
 // @Description 获取备份账号列表
-// @Success 200 {array} dto.BackupInfo
+// @Success 200 {anrry} dto.BackupInfo
 // @Security ApiKeyAuth
 // @Router /settings/backup/search [get]
 func (b *BaseApi) ListBackup(c *gin.Context) {
@@ -287,7 +271,7 @@ func (b *BaseApi) ListBackup(c *gin.Context) {
 // @Description 获取备份账号内文件列表
 // @Accept json
 // @Param request body dto.BackupSearchFile true "request"
-// @Success 200 {array} string
+// @Success 200 {anrry} string
 // @Security ApiKeyAuth
 // @Router /settings/backup/search/files [post]
 func (b *BaseApi) LoadFilesFromBackup(c *gin.Context) {
@@ -335,7 +319,7 @@ func (b *BaseApi) Backup(c *gin.Context) {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}
-	case "mysql", "mariadb":
+	case "mysql":
 		if err := backupService.MysqlBackup(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
@@ -383,7 +367,7 @@ func (b *BaseApi) Recover(c *gin.Context) {
 		req.File = downloadPath
 	}
 	switch req.Type {
-	case "mysql", "mariadb":
+	case "mysql":
 		if err := backupService.MysqlRecover(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
@@ -428,7 +412,7 @@ func (b *BaseApi) RecoverByUpload(c *gin.Context) {
 	}
 
 	switch req.Type {
-	case "mysql", "mariadb":
+	case "mysql":
 		if err := backupService.MysqlRecoverByUpload(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return

backend/app/api/v1/compose_template.go

@@ -66,7 +66,7 @@ func (b *BaseApi) SearchComposeTemplate(c *gin.Context) {
 // @Summary List compose templates
 // @Description 获取容器编排模版列表
 // @Produce json
-// @Success 200 {array} dto.ComposeTemplateInfo
+// @Success 200 {anrry} dto.ComposeTemplateInfo
 // @Security ApiKeyAuth
 // @Router /containers/template [get]
 func (b *BaseApi) ListComposeTemplate(c *gin.Context) {

backend/app/api/v1/container.go

@@ -40,23 +40,6 @@ func (b *BaseApi) SearchContainer(c *gin.Context) {
 	})
 }
 
-// @Tags Container
-// @Summary List containers
-// @Description 获取容器名称
-// @Accept json
-// @Produce json
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /containers/list [post]
-func (b *BaseApi) ListContainer(c *gin.Context) {
-	list, err := containerService.List()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
 // @Tags Container Compose
 // @Summary Page composes
 // @Description 获取编排列表分页
@@ -170,97 +153,17 @@ func (b *BaseApi) OperatorCompose(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Container
-// @Summary Update container
-// @Description 更新容器
-// @Accept json
-// @Param request body dto.ContainerOperate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /containers/update [post]
-// @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"更新容器 [name][image]","formatEN":"update container [name][image]"}
-func (b *BaseApi) ContainerUpdate(c *gin.Context) {
-	var req dto.ContainerOperate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := containerService.ContainerUpdate(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Container
-// @Summary Load container info
-// @Description 获取容器表单信息
-// @Accept json
-// @Param request body dto.OperationWithName true "request"
-// @Success 200 {object} dto.ContainerOperate
-// @Security ApiKeyAuth
-// @Router /containers/info [post]
-func (b *BaseApi) ContainerInfo(c *gin.Context) {
-	var req dto.OperationWithName
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := containerService.ContainerInfo(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Summary Load container limis
-// @Description 获取容器限制
-// @Success 200 {object} dto.ResourceLimit
-// @Security ApiKeyAuth
-// @Router /containers/limit [get]
-func (b *BaseApi) LoadResouceLimit(c *gin.Context) {
-	data, err := containerService.LoadResouceLimit()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
-// @Summary Load container stats
-// @Description 获取容器列表资源占用
-// @Success 200 {array} dto.ContainerListStats
-// @Security ApiKeyAuth
-// @Router /containers/list/stats [get]
-func (b *BaseApi) ContainerListStats(c *gin.Context) {
-	datas, err := containerService.ContainerListStats()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, datas)
-}
-
 // @Tags Container
 // @Summary Create container
 // @Description 创建容器
 // @Accept json
-// @Param request body dto.ContainerOperate true "request"
+// @Param request body dto.ContainerCreate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers [post]
 // @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"创建容器 [name][image]","formatEN":"create container [name][image]"}
 func (b *BaseApi) ContainerCreate(c *gin.Context) {
-	var req dto.ContainerOperate
+	var req dto.ContainerCreate
 	if err := c.ShouldBindJSON(&req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
@@ -276,32 +179,6 @@ func (b *BaseApi) ContainerCreate(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Container
-// @Summary Upgrade container
-// @Description 更新容器镜像
-// @Accept json
-// @Param request body dto.ContainerUpgrade true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /containers/upgrade [post]
-// @x-panel-log {"bodyKeys":["name","image"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"更新容器镜像 [name][image]","formatEN":"upgrade container image [name][image]"}
-func (b *BaseApi) ContainerUpgrade(c *gin.Context) {
-	var req dto.ContainerUpgrade
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := containerService.ContainerUpgrade(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Container
 // @Summary Clean container
 // @Description 容器清理
@@ -355,24 +232,6 @@ func (b *BaseApi) CleanContainerLog(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Container
-// @Summary Load container log
-// @Description 获取容器操作日志
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /containers/load/log [post]
-func (b *BaseApi) LoadContainerLog(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	content := containerService.LoadContainerLogs(req)
-	helper.SuccessWithData(c, content)
-}
-
 // @Tags Container
 // @Summary Operate Container
 // @Description 容器操作
@@ -403,7 +262,7 @@ func (b *BaseApi) ContainerOperation(c *gin.Context) {
 // @Summary Container stats
 // @Description 容器监控信息
 // @Param id path integer true "容器id"
-// @Success 200 {object} dto.ContainerStats
+// @Success 200 {object} dto.ContainterStats
 // @Security ApiKeyAuth
 // @Router /containers/stats/:id [get]
 func (b *BaseApi) ContainerStats(c *gin.Context) {
@@ -451,29 +310,27 @@ func (b *BaseApi) Inspect(c *gin.Context) {
 // @Tags Container
 // @Summary Container logs
 // @Description 容器日志
-// @Param container query string false "容器名称"
-// @Param since query string false "时间筛选"
-// @Param follow query string false "是否追踪"
-// @Param tail query string false "显示行号"
+// @Accept json
+// @Param request body dto.ContainerLog true "request"
+// @Success 200 {string} logs
 // @Security ApiKeyAuth
 // @Router /containers/search/log [post]
 func (b *BaseApi) ContainerLogs(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
+	var req dto.ContainerLog
+	if err := c.ShouldBindJSON(&req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	if err := global.VALID.Struct(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	logs, err := containerService.ContainerLogs(req)
 	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
-	}
-	defer wsConn.Close()
-
-	container := c.Query("container")
-	since := c.Query("since")
-	follow := c.Query("follow") == "true"
-	tail := c.Query("tail")
-
-	if err := containerService.ContainerLogs(wsConn, container, since, tail, follow); err != nil {
-		_ = wsConn.WriteMessage(1, []byte(err.Error()))
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
+	helper.SuccessWithData(c, logs)
 }
 
 // @Tags Container Network
@@ -507,23 +364,6 @@ func (b *BaseApi) SearchNetwork(c *gin.Context) {
 	})
 }
 
-// @Tags Container Network
-// @Summary List networks
-// @Description 获取容器网络列表
-// @Accept json
-// @Produce json
-// @Success 200 {array} dto.Options
-// @Security ApiKeyAuth
-// @Router /containers/network [get]
-func (b *BaseApi) ListNetwork(c *gin.Context) {
-	list, err := containerService.ListNetwork()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, list)
-}
-
 // @Tags Container Network
 // @Summary Delete network
 // @Description 删除容器网络
@@ -613,10 +453,11 @@ func (b *BaseApi) SearchVolume(c *gin.Context) {
 // @Summary List volumes
 // @Description 获取容器存储卷列表
 // @Accept json
+// @Param request body dto.PageInfo true "request"
 // @Produce json
-// @Success 200 {array} dto.Options
+// @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
-// @Router /containers/volume [get]
+// @Router /containers/volume/search [get]
 func (b *BaseApi) ListVolume(c *gin.Context) {
 	list, err := containerService.ListVolume()
 	if err != nil {

backend/app/api/v1/cronjob.go

@@ -94,28 +94,6 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 	})
 }
 
-// @Tags Cronjob
-// @Summary Load Cronjob record log
-// @Description 获取计划任务记录日志
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /cronjob/record/log [post]
-func (b *BaseApi) LoadRecordLog(c *gin.Context) {
-	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	content, err := cronjobService.LoadRecordLog(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, content)
-}
-
 // @Tags Cronjob
 // @Summary Clean job records
 // @Description 清空计划任务记录
@@ -246,8 +224,7 @@ func (b *BaseApi) TargetDownload(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
 	}
-
-	c.File(filePath)
+	helper.SuccessWithData(c, filePath)
 }
 
 // @Tags Cronjob

backend/app/api/v1/database.go

@@ -1,180 +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/1Panel-dev/1Panel/backend/global"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Database
-// @Summary Create database
-// @Description 创建远程数据库
-// @Accept json
-// @Param request body dto.DatabaseCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/db [post]
-// @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"创建远程数据库 [name][type]","formatEN":"create database [name][type]"}
-func (b *BaseApi) CreateDatabase(c *gin.Context) {
-	var req dto.DatabaseCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := databaseService.Create(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database
-// @Summary Check database
-// @Description 检测远程数据库连接性
-// @Accept json
-// @Param request body dto.DatabaseCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/db/check [post]
-// @x-panel-log {"bodyKeys":["name", "type"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"检测远程数据库 [name][type] 连接性","formatEN":"check if database [name][type] is connectable"}
-func (b *BaseApi) CheckDatabase(c *gin.Context) {
-	var req dto.DatabaseCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	helper.SuccessWithData(c, databaseService.CheckDatabase(req))
-}
-
-// @Tags Database
-// @Summary Page databases
-// @Description 获取远程数据库列表分页
-// @Accept json
-// @Param request body dto.DatabaseSearch true "request"
-// @Success 200 {object} dto.PageResult
-// @Security ApiKeyAuth
-// @Router /databases/db/search [post]
-func (b *BaseApi) SearchDatabase(c *gin.Context) {
-	var req dto.DatabaseSearch
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	total, list, err := databaseService.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
-// @Summary List databases
-// @Description 获取远程数据库列表
-// @Success 200 {array} dto.DatabaseOption
-// @Security ApiKeyAuth
-// @Router /databases/db/list/:type [get]
-func (b *BaseApi) ListDatabase(c *gin.Context) {
-	dbType, err := helper.GetStrParamByKey(c, "type")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	list, err := databaseService.List(dbType)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, list)
-}
-
-// @Tags Database
-// @Summary Get databases
-// @Description 获取远程数据库
-// @Success 200 {object} dto.DatabaseInfo
-// @Security ApiKeyAuth
-// @Router /databases/db/:name [get]
-func (b *BaseApi) GetDatabase(c *gin.Context) {
-	name, err := helper.GetStrParamByKey(c, "name")
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := databaseService.Get(name)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}
-
-// @Tags Database
-// @Summary Delete database
-// @Description 删除远程数据库
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/db/del [post]
-// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFuntions":[{"input_column":"id","input_value":"ids","isList":true,"db":"databases","output_column":"name","output_value":"names"}],"formatZH":"删除远程数据库 [names]","formatEN":"delete database [names]"}
-func (b *BaseApi) DeleteDatabase(c *gin.Context) {
-	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	if err := databaseService.Delete(req.ID); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
-// @Tags Database
-// @Summary Update database
-// @Description 更新远程数据库
-// @Accept json
-// @Param request body dto.DatabaseUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /databases/db/update [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"更新远程数据库 [name]","formatEN":"update database [name]"}
-func (b *BaseApi) UpdateDatabase(c *gin.Context) {
-	var req dto.DatabaseUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	if err := databaseService.Update(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}

backend/app/api/v1/database_mysql.go

@@ -143,7 +143,7 @@ func (b *BaseApi) ChangeMysqlAccess(c *gin.Context) {
 // @Router /databases/variables/update [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFuntions":[],"formatZH":"调整 mysql 数据库性能参数","formatEN":"adjust mysql database performance parameters"}
 func (b *BaseApi) UpdateMysqlVariables(c *gin.Context) {
-	var req dto.MysqlVariablesUpdate
+	var req []dto.MysqlVariablesUpdate
 	if err := c.ShouldBindJSON(&req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
@@ -188,12 +188,12 @@ func (b *BaseApi) UpdateMysqlConfByFile(c *gin.Context) {
 // @Summary Page mysql databases
 // @Description 获取 mysql 数据库列表分页
 // @Accept json
-// @Param request body dto.MysqlDBSearch true "request"
+// @Param request body dto.SearchWithPage true "request"
 // @Success 200 {object} dto.PageResult
 // @Security ApiKeyAuth
 // @Router /databases/search [post]
 func (b *BaseApi) SearchMysql(c *gin.Context) {
-	var req dto.MysqlDBSearch
+	var req dto.SearchWithPage
 	if err := c.ShouldBindJSON(&req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
@@ -216,11 +216,11 @@ func (b *BaseApi) SearchMysql(c *gin.Context) {
 // @Description 获取 mysql 数据库列表
 // @Accept json
 // @Param request body dto.PageInfo true "request"
-// @Success 200 {array} dto.MysqlOption
+// @Success 200 {anrry} string
 // @Security ApiKeyAuth
 // @Router /databases/options [get]
 func (b *BaseApi) ListDBName(c *gin.Context) {
-	list, err := mysqlService.ListDBOption()
+	list, err := mysqlService.ListDBName()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -229,41 +229,16 @@ func (b *BaseApi) ListDBName(c *gin.Context) {
 	helper.SuccessWithData(c, list)
 }
 
-// @Tags Database Mysql
-// @Summary Load mysql database from remote
-// @Description 从服务器获取
-// @Accept json
-// @Param request body dto.MysqlLoadDB true "request"
-// @Security ApiKeyAuth
-// @Router /databases/load [post]
-func (b *BaseApi) LoadDBFromRemote(c *gin.Context) {
-	var req dto.MysqlLoadDB
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := mysqlService.LoadFromRemote(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Database Mysql
 // @Summary Check before delete mysql database
 // @Description Mysql 数据库删除前检查
 // @Accept json
-// @Param request body dto.MysqlDBDeleteCheck true "request"
-// @Success 200 {array} string
+// @Param request body dto.OperateByID true "request"
+// @Success 200 {anrry} string
 // @Security ApiKeyAuth
 // @Router /databases/del/check [post]
 func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
-	var req dto.MysqlDBDeleteCheck
+	var req dto.OperateByID
 	if err := c.ShouldBindJSON(&req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
@@ -273,7 +248,7 @@ func (b *BaseApi) DeleteCheckMysql(c *gin.Context) {
 		return
 	}
 
-	apps, err := mysqlService.DeleteCheck(req)
+	apps, err := mysqlService.DeleteCheck(req.ID)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -314,18 +289,11 @@ func (b *BaseApi) DeleteMysql(c *gin.Context) {
 // @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]
+// @Router /databases/baseinfo [get]
 func (b *BaseApi) LoadBaseinfo(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := mysqlService.LoadBaseInfo(req)
+	data, err := mysqlService.LoadBaseInfo()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -334,43 +302,14 @@ func (b *BaseApi) LoadBaseinfo(c *gin.Context) {
 	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 := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		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 远程访问权限
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {boolean} isRemote
 // @Security ApiKeyAuth
-// @Router /databases/remote [post]
+// @Router /databases/remote [get]
 func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	isRemote, err := mysqlService.LoadRemoteAccess(req)
+	isRemote, err := mysqlService.LoadRemoteAccess()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -382,18 +321,11 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
 // @Tags Database Mysql
 // @Summary Load mysql status info
 // @Description 获取 mysql 状态信息
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlStatus
 // @Security ApiKeyAuth
-// @Router /databases/status [post]
+// @Router /databases/status [get]
 func (b *BaseApi) LoadStatus(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := mysqlService.LoadStatus(req)
+	data, err := mysqlService.LoadStatus()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -405,18 +337,11 @@ func (b *BaseApi) LoadStatus(c *gin.Context) {
 // @Tags Database Mysql
 // @Summary Load mysql variables info
 // @Description 获取 mysql 性能参数信息
-// @Accept json
-// @Param request body dto.OperationWithNameAndType true "request"
 // @Success 200 {object} dto.MysqlVariables
 // @Security ApiKeyAuth
-// @Router /databases/variables [post]
+// @Router /databases/variables [get]
 func (b *BaseApi) LoadVariables(c *gin.Context) {
-	var req dto.OperationWithNameAndType
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := mysqlService.LoadVariables(req)
+	data, err := mysqlService.LoadVariables()
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/database_redis.go

@@ -92,13 +92,13 @@ func (b *BaseApi) UpdateRedisConf(c *gin.Context) {
 // @Summary Change redis password
 // @Description 更新 redis 密码
 // @Accept json
-// @Param request body dto.ChangeRedisPass true "request"
+// @Param request body dto.ChangeDBInfo true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /databases/redis/password [post]
 // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFuntions":[],"formatZH":"修改 redis 数据库密码","formatEN":"change the password of the redis database"}
 func (b *BaseApi) ChangeRedisPassword(c *gin.Context) {
-	var req dto.ChangeRedisPass
+	var req dto.ChangeDBInfo
 	if err := c.ShouldBindJSON(&req); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return

backend/app/api/v1/entry.go

@@ -21,9 +21,8 @@ var (
 	imageService           = service.NewIImageService()
 	dockerService          = service.NewIDockerService()
 
-	mysqlService    = service.NewIMysqlService()
-	databaseService = service.NewIDatabaseService()
-	redisService    = service.NewIRedisService()
+	mysqlService = service.NewIMysqlService()
+	redisService = service.NewIRedisService()
 
 	cronjobService = service.NewICronjobService()
 
@@ -50,7 +49,4 @@ var (
 	upgradeService  = service.NewIUpgradeService()
 
 	runtimeService = service.NewRuntimeService()
-	processService = service.NewIProcessService()
-
-	hostToolService = service.NewIHostToolService()
 )

backend/app/api/v1/file.go

@@ -52,7 +52,7 @@ func (b *BaseApi) ListFiles(c *gin.Context) {
 // @Description 分页获取上传文件
 // @Accept json
 // @Param request body request.SearchUploadWithPage true "request"
-// @Success 200 {array} response.FileInfo
+// @Success 200 {anrry} response.FileInfo
 // @Security ApiKeyAuth
 // @Router /files/upload/search [post]
 func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
@@ -81,7 +81,7 @@ func (b *BaseApi) SearchUploadWithPage(c *gin.Context) {
 // @Description 加载文件树
 // @Accept json
 // @Param request body request.FileOption true "request"
-// @Success 200 {array} response.FileTree
+// @Success 200 {anrry} response.FileTree
 // @Security ApiKeyAuth
 // @Router /files/tree [post]
 func (b *BaseApi) GetFileTree(c *gin.Context) {
@@ -532,7 +532,7 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 		}
 		defer file.Close()
 
-		_, _ = file.Seek(startPos, 0)
+		file.Seek(startPos, 0)
 		reader := io.LimitReader(file, endPos-startPos+1)
 		_, err = io.CopyBuffer(c.Writer, reader, buffer)
 		if err != nil {
@@ -544,6 +544,28 @@ func (b *BaseApi) DownloadChunkFiles(c *gin.Context) {
 	}
 }
 
+// @Tags File
+// @Summary Download file with path
+// @Description 下载指定文件
+// @Accept json
+// @Param request body dto.FilePath true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Router /files/download/bypath [post]
+// @x-panel-log {"bodyKeys":["path"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"下载文件 [path]","formatEN":"Download file [path]"}
+func (b *BaseApi) DownloadFile(c *gin.Context) {
+	var req dto.FilePath
+	if err := c.ShouldBindJSON(&req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	if err := global.VALID.Struct(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	c.File(req.Path)
+}
+
 // @Tags File
 // @Summary Load file size
 // @Description 获取文件夹大小
@@ -567,6 +589,33 @@ func (b *BaseApi) Size(c *gin.Context) {
 	helper.SuccessWithData(c, res)
 }
 
+// @Tags File
+// @Summary Read file
+// @Description 读取文件
+// @Accept json
+// @Param request body dto.FilePath true "request"
+// @Success 200 {string} content
+// @Security ApiKeyAuth
+// @Router /files/loadfile [post]
+func (b *BaseApi) LoadFromFile(c *gin.Context) {
+	var req dto.FilePath
+	if err := c.ShouldBindJSON(&req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	if err := global.VALID.Struct(req); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+
+	content, err := os.ReadFile(req.Path)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, string(content))
+}
+
 func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int) error {
 	if _, err := os.Stat(path.Dir(dstDir)); err != nil && os.IsNotExist(err) {
 		if err = os.MkdirAll(path.Dir(dstDir), os.ModePerm); err != nil {
@@ -634,12 +683,7 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 	}
 	filename := c.PostForm("filename")
 	fileDir := filepath.Join(tmpDir, filename)
-	if chunkIndex == 0 {
-		if fileOp.Stat(fileDir) {
-			_ = fileOp.DeleteDir(fileDir)
-		}
-		_ = os.MkdirAll(fileDir, 0755)
-	}
+	_ = os.MkdirAll(fileDir, 0755)
 	filePath := filepath.Join(fileDir, filename)
 
 	defer func() {
@@ -690,12 +734,19 @@ var wsUpgrade = websocket.Upgrader{
 	},
 }
 
+var WsManager = websocket2.Manager{
+	Group:       make(map[string]*websocket2.Client),
+	Register:    make(chan *websocket2.Client, 128),
+	UnRegister:  make(chan *websocket2.Client, 128),
+	ClientCount: 0,
+}
+
 func (b *BaseApi) Ws(c *gin.Context) {
 	ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		return
 	}
-	wsClient := websocket2.NewWsClient("fileClient", ws)
+	wsClient := websocket2.NewWsClient("wsClient", ws)
 	go wsClient.Read()
 	go wsClient.Write()
 }

backend/app/api/v1/firewall.go

@@ -38,10 +38,6 @@ func (b *BaseApi) SearchFirewallRule(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
 
 	total, list, err := firewallService.SearchWithPage(req)
 	if err != nil {
@@ -160,31 +156,6 @@ func (b *BaseApi) BatchOperateRule(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Firewall
-// @Summary Update rule description
-// @Description 更新防火墙描述
-// @Accept json
-// @Param request body dto.UpdateFirewallDescription true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /hosts/firewall/update/description [post]
-func (b *BaseApi) UpdateFirewallDescription(c *gin.Context) {
-	var req dto.UpdateFirewallDescription
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := firewallService.UpdateDescription(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, nil)
-}
-
 // @Tags Firewall
 // @Summary Create group
 // @Description 更新端口防火墙规则

backend/app/api/v1/host.go

@@ -1,11 +1,13 @@
 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/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
+	"github.com/1Panel-dev/1Panel/backend/utils/copier"
 	"github.com/gin-gonic/gin"
 )
 
@@ -28,6 +30,22 @@ func (b *BaseApi) CreateHost(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
+	if req.AuthMode == "password" && 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 req.AuthMode == "key" && len(req.PrivateKey) != 0 {
+		privateKey, err := base64.StdEncoding.DecodeString(req.PrivateKey)
+		if err != nil {
+			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+			return
+		}
+		req.PrivateKey = string(privateKey)
+	}
 
 	host, err := hostService.Create(req)
 	if err != nil {
@@ -84,7 +102,7 @@ func (b *BaseApi) TestByID(c *gin.Context) {
 // @Description 加载主机树
 // @Accept json
 // @Param request body dto.SearchForTree true "request"
-// @Success 200 {array} dto.HostTree
+// @Success 200 {anrry} dto.HostTree
 // @Security ApiKeyAuth
 // @Router /hosts/tree [post]
 func (b *BaseApi) HostTree(c *gin.Context) {
@@ -108,7 +126,7 @@ func (b *BaseApi) HostTree(c *gin.Context) {
 // @Description 获取主机列表分页
 // @Accept json
 // @Param request body dto.SearchHostWithPage true "request"
-// @Success 200 {array} dto.HostTree
+// @Success 200 {anrry} dto.HostTree
 // @Security ApiKeyAuth
 // @Router /hosts/search [post]
 func (b *BaseApi) SearchHost(c *gin.Context) {
@@ -130,6 +148,33 @@ func (b *BaseApi) SearchHost(c *gin.Context) {
 	})
 }
 
+// @Tags Host
+// @Summary Load host info
+// @Description 加载主机信息
+// @Accept json
+// @Param id path integer true "request"
+// @Success 200 {object} dto.HostInfo
+// @Security ApiKeyAuth
+// @Router /hosts/:id [get]
+func (b *BaseApi) GetHostInfo(c *gin.Context) {
+	id, err := helper.GetParamID(c)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	host, err := hostService.GetHostInfo(id)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	var hostDto dto.HostInfo
+	if err := copier.Copy(&hostDto, host); err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, hostDto)
+}
+
 // @Tags Host
 // @Summary Delete host
 // @Description 删除主机
@@ -176,30 +221,21 @@ func (b *BaseApi) UpdateHost(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	var err error
-	if len(req.Password) != 0 && req.AuthMode == "password" {
-		req.Password, err = hostService.EncryptHost(req.Password)
+	if req.AuthMode == "password" && len(req.Password) != 0 {
+		password, err := base64.StdEncoding.DecodeString(req.Password)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 			return
 		}
-		req.PrivateKey = ""
-		req.PassPhrase = ""
+		req.Password = string(password)
 	}
-	if len(req.PrivateKey) != 0 && req.AuthMode == "key" {
-		req.PrivateKey, err = hostService.EncryptHost(req.PrivateKey)
+	if req.AuthMode == "key" && len(req.PrivateKey) != 0 {
+		privateKey, err := base64.StdEncoding.DecodeString(req.PrivateKey)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 			return
 		}
-		if len(req.PassPhrase) != 0 {
-			req.PassPhrase, err = encrypt.StringEncrypt(req.PassPhrase)
-			if err != nil {
-				helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-				return
-			}
-		}
-		req.Password = ""
+		req.PrivateKey = string(privateKey)
 	}
 
 	upMap := make(map[string]interface{})
@@ -210,12 +246,10 @@ func (b *BaseApi) UpdateHost(c *gin.Context) {
 	upMap["user"] = req.User
 	upMap["auth_mode"] = req.AuthMode
 	upMap["remember_password"] = req.RememberPassword
-	if req.AuthMode == "password" {
+	if len(req.Password) != 0 {
 		upMap["password"] = req.Password
-		upMap["private_key"] = ""
-		upMap["pass_phrase"] = ""
-	} else {
-		upMap["password"] = ""
+	}
+	if len(req.PrivateKey) != 0 {
 		upMap["private_key"] = req.PrivateKey
 		upMap["pass_phrase"] = req.PassPhrase
 	}

backend/app/api/v1/host_tool.go

@@ -1,213 +0,0 @@
-package v1
-
-import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具状态
-// @Accept json
-// @Param request body request.HostToolReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool [post]
-func (b *BaseApi) GetToolStatus(c *gin.Context) {
-	var req request.HostToolReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	config, err := hostToolService.GetToolStatus(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, config)
-}
-
-// @Tags Host tool
-// @Summary Create Host tool Config
-// @Description 创建主机工具配置
-// @Accept json
-// @Param request body request.HostToolCreate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/create [post]
-// @x-panel-log {"bodyKeys":["type"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"创建 [type] 配置","formatEN":"create [type] config"}
-func (b *BaseApi) InitToolConfig(c *gin.Context) {
-	var req request.HostToolCreate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	if err := hostToolService.CreateToolConfig(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Host tool
-// @Summary Operate tool
-// @Description 操作主机工具
-// @Accept json
-// @Param request body request.HostToolReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/operate [post]
-// @x-panel-log {"bodyKeys":["operate","type"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"[operate] [type] ","formatEN":"[operate] [type]"}
-func (b *BaseApi) OperateTool(c *gin.Context) {
-	var req request.HostToolReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	err := hostToolService.OperateTool(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Host tool
-// @Summary Get tool config
-// @Description 操作主机工具配置文件
-// @Accept json
-// @Param request body request.HostToolConfig true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/config [post]
-// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"[operate] 主机工具配置文件 ","formatEN":"[operate] tool config"}
-func (b *BaseApi) OperateToolConfig(c *gin.Context) {
-	var req request.HostToolConfig
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	config, err := hostToolService.OperateToolConfig(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, config)
-}
-
-// @Tags Host tool
-// @Summary Get tool
-// @Description 获取主机工具日志
-// @Accept json
-// @Param request body request.HostToolLogReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/log [post]
-func (b *BaseApi) GetToolLog(c *gin.Context) {
-	var req request.HostToolLogReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	logContent, err := hostToolService.GetToolLog(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, logContent)
-}
-
-// @Tags Host tool
-// @Summary Create Supervisor process
-// @Description 操作守护进程
-// @Accept json
-// @Param request body request.SupervisorProcessConfig true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process [post]
-// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"[operate] 守护进程 ","formatEN":"[operate] process"}
-func (b *BaseApi) OperateProcess(c *gin.Context) {
-	var req request.SupervisorProcessConfig
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-
-	err := hostToolService.OperateSupervisorProcess(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Host tool
-// @Summary Get Supervisor process config
-// @Description 获取 Supervisor 进程配置
-// @Accept json
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process [get]
-func (b *BaseApi) GetProcess(c *gin.Context) {
-	configs, err := hostToolService.GetSupervisorProcessConfig()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, configs)
-}
-
-// @Tags Host tool
-// @Summary Get Supervisor process config
-// @Description 操作 Supervisor 进程文件
-// @Accept json
-// @Param request body request.SupervisorProcessFileReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/tool/supervisor/process/file [post]
-// @x-panel-log {"bodyKeys":["operate"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"[operate] Supervisor 进程文件 ","formatEN":"[operate] Supervisor Process Config file"}
-func (b *BaseApi) GetProcessFile(c *gin.Context) {
-	var req request.SupervisorProcessFileReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	content, err := hostToolService.OperateSupervisorProcessFile(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, content)
-}

backend/app/api/v1/image.go

@@ -44,7 +44,7 @@ func (b *BaseApi) SearchImage(c *gin.Context) {
 // @Summary List images
 // @Description 获取镜像列表
 // @Produce json
-// @Success 200 {array} dto.Options
+// @Success 200 {anrry} dto.Options
 // @Security ApiKeyAuth
 // @Router /containers/image [get]
 func (b *BaseApi) ListImage(c *gin.Context) {

backend/app/api/v1/image_repo.go

@@ -44,7 +44,7 @@ func (b *BaseApi) SearchRepo(c *gin.Context) {
 // @Summary List image repos
 // @Description 获取镜像仓库列表
 // @Produce json
-// @Success 200 {array} dto.ImageRepoOption
+// @Success 200 {anrry} dto.ImageRepoOption
 // @Security ApiKeyAuth
 // @Router /containers/repo [get]
 func (b *BaseApi) ListRepo(c *gin.Context) {

backend/app/api/v1/logs.go

@@ -89,19 +89,3 @@ func (b *BaseApi) CleanLogs(c *gin.Context) {
 
 	helper.SuccessWithData(c, nil)
 }
-
-// @Tags Logs
-// @Summary Load system logs
-// @Description 获取系统日志
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /logs/system [get]
-func (b *BaseApi) GetSystemLogs(c *gin.Context) {
-	data, err := logService.LoadSystemLog()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	helper.SuccessWithData(c, data)
-}

backend/app/api/v1/nginx.go

@@ -27,7 +27,7 @@ func (b *BaseApi) GetNginx(c *gin.Context) {
 // @Description 获取部分 OpenResty 配置信息
 // @Accept json
 // @Param request body request.NginxScopeReq true "request"
-// @Success 200 {array} response.NginxParam
+// @Success 200 {anrry} response.NginxParam
 // @Security ApiKeyAuth
 // @Router /openResty/scope [post]
 func (b *BaseApi) GetNginxConfigByScope(c *gin.Context) {

backend/app/api/v1/process.go

@@ -1,40 +0,0 @@
-package v1
-
-import (
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	websocket2 "github.com/1Panel-dev/1Panel/backend/utils/websocket"
-	"github.com/gin-gonic/gin"
-)
-
-func (b *BaseApi) ProcessWs(c *gin.Context) {
-	ws, err := wsUpgrade.Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		return
-	}
-	wsClient := websocket2.NewWsClient("processClient", ws)
-	go wsClient.Read()
-	go wsClient.Write()
-}
-
-// @Tags Process
-// @Summary Stop Process
-// @Description 停止进程
-// @Param request body request.ProcessReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /process/stop [post]
-// @x-panel-log {"bodyKeys":["PID"],"paramKeys":[],"BeforeFuntions":[],"formatZH":"结束进程 [PID]","formatEN":"结束进程 [PID]"}
-func (b *BaseApi) StopProcess(c *gin.Context) {
-	var req request.ProcessReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := processService.StopProcess(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}

backend/app/api/v1/setting.go

@@ -2,10 +2,6 @@ package v1
 
 import (
 	"errors"
-	"fmt"
-	"os"
-	"path"
-	"strconv"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -136,22 +132,6 @@ func (b *BaseApi) LoadFromCert(c *gin.Context) {
 	helper.SuccessWithData(c, info)
 }
 
-// @Tags System Setting
-// @Summary Download system cert
-// @Description 下载证书
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/ssl/download [post]
-func (b *BaseApi) DownloadSSL(c *gin.Context) {
-	pathItem := path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt")
-	if _, err := os.Stat(pathItem); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
-	c.File(pathItem)
-}
-
 // @Tags System Setting
 // @Summary Update system port
 // @Description 更新系统端口
@@ -280,23 +260,11 @@ func (b *BaseApi) CleanMonitor(c *gin.Context) {
 // @Tags System Setting
 // @Summary Load mfa info
 // @Description 获取 mfa 信息
-// @Param interval path string true "request"
 // @Success 200 {object} mfa.Otp
 // @Security ApiKeyAuth
-// @Router /settings/mfa/:interval [get]
+// @Router /settings/mfa [get]
 func (b *BaseApi) GetMFA(c *gin.Context) {
-	intervalStr, ok := c.Params.Get("interval")
-	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error interval in path"))
-		return
-	}
-	interval, err := strconv.Atoi(intervalStr)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, fmt.Errorf("type conversion failed, err: %v", err))
-		return
-	}
-
-	otp, err := mfa.GetOtp("admin", interval)
+	otp, err := mfa.GetOtp("admin")
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -320,17 +288,12 @@ func (b *BaseApi) MFABind(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
-	success := mfa.ValidCode(req.Code, req.Interval, req.Secret)
+	success := mfa.ValidCode(req.Code, req.Secret)
 	if !success {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, errors.New("code is not valid"))
 		return
 	}
 
-	if err := settingService.Update("MFAInterval", req.Interval); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-
 	if err := settingService.Update("MFAStatus", "enable"); err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return

backend/app/api/v1/snapshot.go

@@ -60,32 +60,6 @@ func (b *BaseApi) ImportSnapshot(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags System Setting
-// @Summary Load Snapshot status
-// @Description 获取快照状态
-// @Accept json
-// @Param request body dto.OperateByID true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /settings/snapshot/status [post]
-func (b *BaseApi) LoadSnapShotStatus(c *gin.Context) {
-	var req dto.OperateByID
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := global.VALID.Struct(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	data, err := snapshotService.LoadSnapShotStatus(req.ID)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags System Setting
 // @Summary Update snapshot description
 // @Description 更新快照描述信息

backend/app/api/v1/ssh.go

@@ -183,18 +183,3 @@ func (b *BaseApi) LoadSSHLogs(c *gin.Context) {
 	}
 	helper.SuccessWithData(c, data)
 }
-
-// @Tags SSH
-// @Summary Load host ssh conf
-// @Description 获取 ssh 配置文件
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /host/ssh/conf [get]
-func (b *BaseApi) LoadSSHConf(c *gin.Context) {
-	data, err := sshService.LoadSSHConf()
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}

backend/app/api/v1/terminal.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/copier"
@@ -20,27 +22,24 @@ import (
 )
 
 func (b *BaseApi) WsSsh(c *gin.Context) {
-	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
-	if err != nil {
-		global.LOG.Errorf("gin context http handler failed, err: %v", err)
-		return
-	}
-	defer wsConn.Close()
-
 	id, err := strconv.Atoi(c.Query("id"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param id in request")) {
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
 	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
 	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
 	host, err := hostService.GetHostInfo(uint(id))
-	if wshandleError(wsConn, errors.WithMessage(err, "load host info by id failed")) {
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
 	var connInfo ssh.ConnInfo
@@ -50,12 +49,24 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
 		connInfo.PassPhrase = []byte(host.PassPhrase)
 	}
 
+	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
+	if err != nil {
+		global.LOG.Errorf("gin context http handler failed, err: %v", err)
+		return
+	}
+	defer wsConn.Close()
+
 	client, err := connInfo.NewClient()
 	if wshandleError(wsConn, errors.WithMessage(err, "failed to set up the connection. Please check the host information")) {
 		return
 	}
 	defer client.Close()
-	
+	ssConn, err := connInfo.NewSshConn(cols, rows)
+	if wshandleError(wsConn, err) {
+		return
+	}
+	defer ssConn.Close()
+
 	sws, err := terminal.NewLogicSshWsSession(cols, rows, true, connInfo.Client, wsConn)
 	if wshandleError(wsConn, err) {
 		return
@@ -74,25 +85,28 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
 }
 
 func (b *BaseApi) RedisWsSsh(c *gin.Context) {
+	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	redisConf, err := redisService.LoadConf()
+	if err != nil {
+		global.LOG.Errorf("load redis container failed, err: %v", err)
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+
 	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		global.LOG.Errorf("gin context http handler failed, err: %v", err)
 		return
 	}
-
-	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
-		return
-	}
-	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
-		return
-	}
-	redisConf, err := redisService.LoadConf()
-	if wshandleError(wsConn, errors.WithMessage(err, "load redis container failed")) {
-		return
-	}
-
 	defer wsConn.Close()
 	commands := "redis-cli"
 	if len(redisConf.Requirepass) != 0 {
@@ -124,6 +138,24 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 }
 
 func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
+	containerID := c.Query("containerid")
+	command := c.Query("command")
+	user := c.Query("user")
+	if len(command) == 0 || len(containerID) == 0 {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error param of command or containerID"))
+		return
+	}
+	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
+		return
+	}
+
 	wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
 		global.LOG.Errorf("gin context http handler failed, err: %v", err)
@@ -131,23 +163,6 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
 	}
 	defer wsConn.Close()
 
-	containerID := c.Query("containerid")
-	command := c.Query("command")
-	user := c.Query("user")
-	if len(command) == 0 || len(containerID) == 0 {
-		if wshandleError(wsConn, errors.New("error param of command or containerID")) {
-			return
-		}
-	}
-	cols, err := strconv.Atoi(c.DefaultQuery("cols", "80"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param cols in request")) {
-		return
-	}
-	rows, err := strconv.Atoi(c.DefaultQuery("rows", "40"))
-	if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
-		return
-	}
-
 	cmds := []string{"exec", containerID, command}
 	if len(user) != 0 {
 		cmds = []string{"exec", "-u", user, containerID, command}

backend/app/api/v1/website.go

@@ -36,7 +36,7 @@ func (b *BaseApi) PageWebsite(c *gin.Context) {
 // @Tags Website
 // @Summary List websites
 // @Description 获取网站列表
-// @Success 200 {array} response.WebsiteDTO
+// @Success 200 {anrry} response.WebsiteDTO
 // @Security ApiKeyAuth
 // @Router /websites/list [get]
 func (b *BaseApi) GetWebsites(c *gin.Context) {
@@ -51,7 +51,7 @@ func (b *BaseApi) GetWebsites(c *gin.Context) {
 // @Tags Website
 // @Summary List website names
 // @Description 获取网站列表
-// @Success 200 {array} string
+// @Success 200 {anrry} string
 // @Security ApiKeyAuth
 // @Router /websites/options [get]
 func (b *BaseApi) GetWebsiteOptions(c *gin.Context) {
@@ -207,7 +207,7 @@ func (b *BaseApi) GetWebsiteNginx(c *gin.Context) {
 // @Description 通过网站 id 查询域名
 // @Accept json
 // @Param websiteId path integer true "request"
-// @Success 200 {array} model.WebsiteDomain
+// @Success 200 {anrry} model.WebsiteDomain
 // @Security ApiKeyAuth
 // @Router /websites/domains/:websiteId [get]
 func (b *BaseApi) GetWebDomains(c *gin.Context) {
@@ -367,7 +367,7 @@ func (b *BaseApi) UpdateHTTPSConfig(c *gin.Context) {
 // @Description 网站创建前检查
 // @Accept json
 // @Param request body request.WebsiteInstallCheckReq true "request"
-// @Success 200 {array} response.WebsitePreInstallCheck
+// @Success 200 {anrry} request.WebsitePreInstallCheck
 // @Security ApiKeyAuth
 // @Router /websites/check [post]
 func (b *BaseApi) CreateWebsiteCheck(c *gin.Context) {
@@ -428,28 +428,6 @@ func (b *BaseApi) UpdateWebsiteWafConfig(c *gin.Context) {
 	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":[],"BeforeFuntions":[{"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 := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		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 配置
@@ -563,7 +541,7 @@ func (b *BaseApi) UpdateWebsitePHPConfig(c *gin.Context) {
 
 // @Tags Website PHP
 // @Summary Update php conf
-// @Description 更新 php 配置文件
+// @Description 更新 php 配置
 // @Accept json
 // @Param request body request.WebsitePHPFileUpdate true "request"
 // @Success 200
@@ -583,28 +561,6 @@ func (b *BaseApi) UpdatePHPFile(c *gin.Context) {
 	helper.SuccessWithData(c, nil)
 }
 
-// @Tags Website PHP
-// @Summary Update php version
-// @Description 变更 php 版本
-// @Accept json
-// @Param request body request.WebsitePHPVersionReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/php/version [post]
-// @x-panel-log {"bodyKeys":["websiteId"],"paramKeys":[],"BeforeFuntions":[{"input_column":"id","input_value":"websiteId","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"php 版本变更 [domain]","formatEN":"php version update [domain]"}
-func (b *BaseApi) ChangePHPVersion(c *gin.Context) {
-	var req request.WebsitePHPVersionReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := websiteService.ChangePHPVersion(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
 // @Tags Website
 // @Summary Get rewrite conf
 // @Description 获取伪静态配置
@@ -845,92 +801,3 @@ func (b *BaseApi) UpdateAntiLeech(c *gin.Context) {
 	}
 	helper.SuccessWithOutData(c)
 }
-
-// @Tags Website
-// @Summary Update redirect conf
-// @Description 修改重定向配置
-// @Accept json
-// @Param request body request.NginxRedirectReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/redirect/update [post]
-// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFuntions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"修改网站 [domain] 重定向理配置 ","formatEN":"Update domain [domain] redirect config"}
-func (b *BaseApi) UpdateRedirectConfig(c *gin.Context) {
-	var req request.NginxRedirectReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	err := websiteService.OperateRedirect(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Website
-// @Summary Get redirect conf
-// @Description 获取重定向配置
-// @Accept json
-// @Param request body request.WebsiteProxyReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/redirect [post]
-func (b *BaseApi) GetRedirectConfig(c *gin.Context) {
-	var req request.WebsiteRedirectReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	res, err := websiteService.GetRedirect(req.WebsiteID)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}
-
-// @Tags Website
-// @Summary Update redirect file
-// @Description 更新重定向文件
-// @Accept json
-// @Param request body request.NginxRedirectUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/redirect/file [post]
-// @x-panel-log {"bodyKeys":["websiteID"],"paramKeys":[],"BeforeFuntions":[{"input_column":"id","input_value":"websiteID","isList":false,"db":"websites","output_column":"primary_domain","output_value":"domain"}],"formatZH":"更新重定向文件 [domain]","formatEN":"Nginx conf redirect file update [domain]"}
-func (b *BaseApi) UpdateRedirectConfigFile(c *gin.Context) {
-	var req request.NginxRedirectUpdate
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	if err := websiteService.UpdateRedirectFile(req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithOutData(c)
-}
-
-// @Tags Website
-// @Summary Get website dir
-// @Description 获取网站目录配置
-// @Accept json
-// @Param request body request.WebsiteCommonReq true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Router /websites/dir [post]
-func (b *BaseApi) GetDirConfig(c *gin.Context) {
-	var req request.WebsiteCommonReq
-	if err := c.ShouldBindJSON(&req); err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
-		return
-	}
-	res, err := websiteService.LoadWebsiteDirConfig(req)
-	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
-		return
-	}
-	helper.SuccessWithData(c, res)
-}

backend/app/api/v1/website_ssl.go

@@ -35,7 +35,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
 			Items: accounts,
 		})
 	} else {
-		list, err := websiteSSLService.Search(req)
+		list, err := websiteSSLService.Search()
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
@@ -94,7 +94,7 @@ func (b *BaseApi) RenewWebsiteSSL(c *gin.Context) {
 // @Description 解析网站 ssl
 // @Accept json
 // @Param request body request.WebsiteDNSReq true "request"
-// @Success 200 {array} response.WebsiteDNSRes
+// @Success 200 {anrry} response.WebsiteDNSRes
 // @Security ApiKeyAuth
 // @Router /websites/ssl/resolve [post]
 func (b *BaseApi) GetDNSResolve(c *gin.Context) {

backend/app/dto/app.go

@@ -15,10 +15,6 @@ type AuthParam struct {
 	RootPassword string `json:"PANEL_DB_ROOT_PASSWORD"`
 }
 
-type RedisAuthParam struct {
-	RootPassword string `json:"PANEL_REDIS_ROOT_PASSWORD"`
-}
-
 type ContainerExec struct {
 	ContainerName string      `json:"containerName"`
 	DbParam       AppDatabase `json:"dbParam"`
@@ -67,8 +63,7 @@ type LocalAppInstallDefine struct {
 }
 
 type ExtraProperties struct {
-	Tags    []Tag  `json:"tags"`
-	Version string `json:"version"`
+	Tags []Tag `json:"tags"`
 }
 
 type AppProperty struct {
@@ -133,9 +128,3 @@ var AppToolMap = map[string]string{
 	"mysql": "phpmyadmin",
 	"redis": "redis-commander",
 }
-
-type AppInstallInfo struct {
-	ID   uint   `json:"id"`
-	Key  string `json:"key"`
-	Name string `json:"name"`
-}

backend/app/dto/auth.go

@@ -12,9 +12,8 @@ type UserLoginInfo struct {
 }
 
 type MfaCredential struct {
-	Secret   string `json:"secret"`
-	Code     string `json:"code"`
-	Interval string `json:"interval"`
+	Secret string `json:"secret"`
+	Code   string `json:"code"`
 }
 
 type Login struct {
@@ -24,7 +23,6 @@ type Login struct {
 	Captcha       string `json:"captcha"`
 	CaptchaID     string `json:"captchaID"`
 	AuthMethod    string `json:"authMethod"`
-	Language      string `json:"language"`
 }
 
 type MFALogin struct {

backend/app/dto/backup.go

@@ -8,17 +8,22 @@ type BackupOperate struct {
 	Bucket     string `json:"bucket"`
 	AccessKey  string `json:"accessKey"`
 	Credential string `json:"credential"`
-	BackupPath string `json:"backupPath"`
 	Vars       string `json:"vars" validate:"required"`
 }
 
 type BackupInfo struct {
-	ID         uint      `json:"id"`
-	CreatedAt  time.Time `json:"createdAt"`
-	Type       string    `json:"type"`
-	Bucket     string    `json:"bucket"`
-	BackupPath string    `json:"backupPath"`
-	Vars       string    `json:"vars"`
+	ID        uint      `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+	Type      string    `json:"type"`
+	Bucket    string    `json:"bucket"`
+	Vars      string    `json:"vars"`
+}
+
+type BackupSearch struct {
+	PageInfo
+	Type       string `json:"type" validate:"required,oneof=website mysql"`
+	Name       string `json:"name" validate:"required"`
+	DetailName string `json:"detailName"`
 }
 
 type BackupSearchFile struct {
@@ -26,13 +31,13 @@ type BackupSearchFile struct {
 }
 
 type CommonBackup struct {
-	Type       string `json:"type" validate:"required,oneof=app mysql mariadb redis website"`
+	Type       string `json:"type" validate:"required,oneof=app mysql redis website"`
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 }
 type CommonRecover struct {
-	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"`
+	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO"`
+	Type       string `json:"type" validate:"required,oneof=app mysql redis website"`
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 	File       string `json:"file"`
@@ -55,7 +60,7 @@ type BackupRecords struct {
 }
 
 type DownloadRecord struct {
-	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive"`
+	Source   string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO"`
 	FileDir  string `json:"fileDir" validate:"required"`
 	FileName string `json:"fileName" validate:"required"`
 }

backend/app/dto/common_req.go

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

backend/app/dto/container.go

@@ -5,8 +5,6 @@ import "time"
 type PageContainer struct {
 	PageInfo
 	Name    string `json:"name"`
-	OrderBy string `json:"orderBy"`
-	Order   string `json:"order"`
 	Filters string `json:"filters"`
 }
 
@@ -24,31 +22,22 @@ type ContainerInfo struct {
 	State       string `json:"state"`
 	RunTime     string `json:"runTime"`
 
-	Network []string `json:"network"`
-	Ports   []string `json:"ports"`
+	CPUPercent    float64  `json:"cpuPercent"`
+	MemoryPercent float64  `json:"memoryPercent"`
+	Ports         []string `json:"ports"`
 
 	IsFromApp     bool `json:"isFromApp"`
 	IsFromCompose bool `json:"isFromCompose"`
 }
 
-type ResourceLimit struct {
-	CPU    int `json:"cpu"`
-	Memory int `json:"memory"`
-}
-
-type ContainerOperate struct {
-	ContainerID     string         `json:"containerID"`
-	ForcePull       bool           `json:"forcePull"`
+type ContainerCreate struct {
 	Name            string         `json:"name"`
 	Image           string         `json:"image"`
-	Network         string         `json:"network"`
 	PublishAllPorts bool           `json:"publishAllPorts"`
 	ExposedPorts    []PortHelper   `json:"exposedPorts"`
 	Cmd             []string       `json:"cmd"`
-	Entrypoint      []string       `json:"entrypoint"`
-	CPUShares       int64          `json:"cpuShares"`
-	NanoCPUs        float64        `json:"nanoCPUs"`
-	Memory          float64        `json:"memory"`
+	NanoCPUs        int64          `json:"nanoCPUs"`
+	Memory          int64          `json:"memory"`
 	AutoRemove      bool           `json:"autoRemove"`
 	Volumes         []VolumeHelper `json:"volumes"`
 	Labels          []string       `json:"labels"`
@@ -56,19 +45,7 @@ type ContainerOperate struct {
 	RestartPolicy   string         `json:"restartPolicy"`
 }
 
-type ContainerUpgrade struct {
-	Name      string `json:"name" validate:"required"`
-	Image     string `json:"image" validate:"required"`
-	ForcePull bool   `json:"forcePull"`
-}
-
-type ContainerListStats struct {
-	ContainerID   string  `json:"containerID"`
-	CPUPercent    float64 `json:"cpuPercent"`
-	MemoryPercent float64 `json:"memoryPercent"`
-}
-
-type ContainerStats struct {
+type ContainterStats struct {
 	CPUPercent float64 `json:"cpuPercent"`
 	Memory     float64 `json:"memory"`
 	Cache      float64 `json:"cache"`
@@ -92,6 +69,11 @@ type PortHelper struct {
 	Protocol      string `json:"protocol"`
 }
 
+type ContainerLog struct {
+	ContainerID string `json:"containerID" validate:"required"`
+	Mode        string `json:"mode" validate:"required"`
+}
+
 type ContainerOperation struct {
 	Name      string `json:"name" validate:"required"`
 	Operation string `json:"operation" validate:"required,oneof=start stop restart kill pause unpause rename remove"`
@@ -100,7 +82,7 @@ type ContainerOperation struct {
 
 type ContainerPrune struct {
 	PruneType  string `json:"pruneType" validate:"required,oneof=container image volume network"`
-	WithTagAll bool   `json:"withTagAll"`
+	WithTagAll bool   `josn:"withTagAll"`
 }
 
 type ContainerPruneReport struct {

backend/app/dto/cronjob.go

@@ -13,8 +13,6 @@ type CronjobCreate struct {
 	Second   int    `json:"second" validate:"number"`
 
 	Script         string `json:"script"`
-	ContainerName  string `json:"containerName"`
-	AppID          string `json:"appID"`
 	Website        string `json:"website"`
 	ExclusionRules string `json:"exclusionRules"`
 	DBName         string `json:"dbName"`
@@ -36,8 +34,6 @@ type CronjobUpdate struct {
 	Second   int    `json:"second" validate:"number"`
 
 	Script         string `json:"script"`
-	ContainerName  string `json:"containerName"`
-	AppID          string `json:"appID"`
 	Website        string `json:"website"`
 	ExclusionRules string `json:"exclusionRules"`
 	DBName         string `json:"dbName"`
@@ -80,8 +76,6 @@ type CronjobInfo struct {
 	Second   int    `json:"second"`
 
 	Script         string `json:"script"`
-	ContainerName  string `json:"containerName"`
-	AppID          string `json:"appID"`
 	Website        string `json:"website"`
 	ExclusionRules string `json:"exclusionRules"`
 	DBName         string `json:"dbName"`

backend/app/dto/database.go

@@ -2,20 +2,10 @@ package dto
 
 import "time"
 
-type MysqlDBSearch struct {
-	PageInfo
-	Info     string `json:"info"`
-	Database string `json:"database" validate:"required"`
-	OrderBy  string `json:"orderBy"`
-	Order    string `json:"order"`
-}
-
 type MysqlDBInfo struct {
 	ID          uint      `json:"id"`
 	CreatedAt   time.Time `json:"createdAt"`
 	Name        string    `json:"name"`
-	From        string    `json:"from"`
-	MysqlName   string    `json:"mysqlName"`
 	Format      string    `json:"format"`
 	Username    string    `json:"username"`
 	Password    string    `json:"password"`
@@ -24,18 +14,8 @@ type MysqlDBInfo struct {
 	Description string    `json:"description"`
 }
 
-type MysqlOption struct {
-	ID       uint   `json:"id"`
-	From     string `json:"from"`
-	Type     string `json:"type"`
-	Database string `json:"database"`
-	Name     string `json:"name"`
-}
-
 type MysqlDBCreate struct {
 	Name        string `json:"name" validate:"required"`
-	From        string `json:"from" validate:"required,oneof=local remote"`
-	Database    string `json:"database" validate:"required"`
 	Format      string `json:"format" validate:"required,oneof=utf8mb4 utf8 gbk big5"`
 	Username    string `json:"username" validate:"required"`
 	Password    string `json:"password" validate:"required"`
@@ -43,24 +23,10 @@ type MysqlDBCreate struct {
 	Description string `json:"description"`
 }
 
-type MysqlLoadDB struct {
-	From     string `json:"from" validate:"required,oneof=local remote"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
-	Database string `json:"database" validate:"required"`
-}
-
-type MysqlDBDeleteCheck struct {
-	ID       uint   `json:"id" validate:"required"`
-	Type     string `json:"type" validate:"required,oneof=mysql mariadb"`
-	Database string `json:"database" validate:"required"`
-}
-
 type MysqlDBDelete struct {
-	ID           uint   `json:"id" validate:"required"`
-	Type         string `json:"type" validate:"required,oneof=mysql mariadb"`
-	Database     string `json:"database" validate:"required"`
-	ForceDelete  bool   `json:"forceDelete"`
-	DeleteBackup bool   `json:"deleteBackup"`
+	ID           uint `json:"id" validate:"required"`
+	ForceDelete  bool `json:"forceDelete"`
+	DeleteBackup bool `json:"deleteBackup"`
 }
 
 type MysqlStatus struct {
@@ -124,27 +90,17 @@ type MysqlVariables struct {
 }
 
 type MysqlVariablesUpdate struct {
-	Type      string                       `json:"type" validate:"required,oneof=mysql mariadb"`
-	Database  string                       `json:"database" validate:"required"`
-	Variables []MysqlVariablesUpdateHelper `json:"variables"`
-}
-
-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"`
+	MysqlName string `json:"mysqlName" 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"`
+	ID    uint   `json:"id"`
+	Value string `json:"value" validate:"required"`
 }
 
 type DBBaseInfo struct {
@@ -153,11 +109,30 @@ type DBBaseInfo struct {
 	Port          int64  `json:"port"`
 }
 
-// redis
-type ChangeRedisPass struct {
-	Value string `json:"value" validate:"required"`
+type SearchDBWithPage struct {
+	PageInfo
+	MysqlName string `json:"mysqlName" validate:"required"`
 }
 
+type BackupDB struct {
+	MysqlName string `json:"mysqlName" validate:"required"`
+	DBName    string `json:"dbName" validate:"required"`
+}
+
+type RecoverDB struct {
+	MysqlName  string `json:"mysqlName" validate:"required"`
+	DBName     string `json:"dbName" validate:"required"`
+	BackupName string `json:"backupName" validate:"required"`
+}
+
+type UploadRecover struct {
+	MysqlName string `json:"mysqlName" validate:"required"`
+	DBName    string `json:"dbName" validate:"required"`
+	FileName  string `json:"fileName"`
+	FileDir   string `json:"fileDir"`
+}
+
+// redis
 type RedisConfUpdate struct {
 	Timeout    string `json:"timeout"`
 	Maxclients string `json:"maxclients"`
@@ -216,58 +191,3 @@ type RedisBackupRecover struct {
 	FileName string `json:"fileName"`
 	FileDir  string `json:"fileDir"`
 }
-
-// database
-type DatabaseSearch struct {
-	PageInfo
-	Info    string `json:"info"`
-	Type    string `json:"type"`
-	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"`
-	Description string    `json:"description"`
-}
-
-type DatabaseOption struct {
-	ID       uint   `json:"id"`
-	Type     string `json:"type"`
-	From     string `json:"from"`
-	Database string `json:"database"`
-	Version  string `json:"version"`
-	Address  string `json:"address"`
-}
-
-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" 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" validate:"required"`
-	Description string `json:"description"`
-}

backend/app/dto/firewall.go

@@ -9,10 +9,8 @@ type FirewallBaseInfo struct {
 
 type RuleSearch struct {
 	PageInfo
-	Info     string `json:"info"`
-	Status   string `json:"status"`
-	Strategy string `json:"strategy"`
-	Type     string `json:"type" validate:"required"`
+	Info string `json:"info"`
+	Type string `json:"type" validate:"required"`
 }
 
 type FirewallOperation struct {
@@ -25,26 +23,12 @@ type PortRuleOperate struct {
 	Port      string `json:"port" validate:"required"`
 	Protocol  string `json:"protocol" validate:"required,oneof=tcp udp tcp/udp"`
 	Strategy  string `json:"strategy" validate:"required,oneof=accept drop"`
-
-	Description string `json:"description"`
-}
-
-type UpdateFirewallDescription struct {
-	Type     string `json:"type"`
-	Address  string `json:"address"`
-	Port     string `json:"port"`
-	Protocol string `json:"protocol"`
-	Strategy string `json:"strategy" validate:"required,oneof=accept drop"`
-
-	Description string `json:"description"`
 }
 
 type AddrRuleOperate struct {
 	Operation string `json:"operation" validate:"required,oneof=add remove"`
 	Address   string `json:"address"  validate:"required"`
 	Strategy  string `json:"strategy" validate:"required,oneof=accept drop"`
-
-	Description string `json:"description"`
 }
 
 type PortRuleUpdate struct {

backend/app/dto/image.go

@@ -10,35 +10,35 @@ type ImageInfo struct {
 }
 
 type ImageLoad struct {
-	Path string `json:"path" validate:"required"`
+	Path string `josn:"path" validate:"required"`
 }
 
 type ImageBuild struct {
-	From       string   `json:"from" validate:"required"`
+	From       string   `josn:"from" validate:"required"`
 	Name       string   `json:"name" validate:"required"`
-	Dockerfile string   `json:"dockerfile" validate:"required"`
-	Tags       []string `json:"tags"`
+	Dockerfile string   `josn:"dockerfile" validate:"required"`
+	Tags       []string `josn:"tags"`
 }
 
 type ImagePull struct {
-	RepoID    uint   `json:"repoID"`
-	ImageName string `json:"imageName" validate:"required"`
+	RepoID    uint   `josn:"repoID"`
+	ImageName string `josn:"imageName" validate:"required"`
 }
 
 type ImageTag struct {
-	RepoID     uint   `json:"repoID"`
+	RepoID     uint   `josn:"repoID"`
 	SourceID   string `json:"sourceID" validate:"required"`
-	TargetName string `json:"targetName" validate:"required"`
+	TargetName string `josn:"targetName" validate:"required"`
 }
 
 type ImagePush struct {
-	RepoID  uint   `json:"repoID" validate:"required"`
+	RepoID  uint   `josn:"repoID" validate:"required"`
 	TagName string `json:"tagName" validate:"required"`
 	Name    string `json:"name" validate:"required"`
 }
 
 type ImageSave struct {
 	TagName string `json:"tagName" validate:"required"`
-	Path    string `json:"path" validate:"required"`
+	Path    string `josn:"path" validate:"required"`
 	Name    string `json:"name" validate:"required"`
 }

backend/app/dto/image_repo.go

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

backend/app/dto/request/app.go

@@ -41,11 +41,6 @@ type AppInstalledSearch struct {
 	Unused bool     `json:"unused"`
 }
 
-type AppInstalledInfo struct {
-	Key  string `json:"key" validate:"required"`
-	Name string `json:"name"`
-}
-
 type AppBackupSearch struct {
 	dto.PageInfo
 	AppInstallID uint `json:"appInstallID"`
@@ -63,7 +58,6 @@ type AppInstalledOperate struct {
 	ForceDelete  bool                `json:"forceDelete"`
 	DeleteBackup bool                `json:"deleteBackup"`
 	DeleteDB     bool                `json:"deleteDB"`
-	Backup       bool                `json:"backup"`
 }
 
 type AppInstalledUpdate struct {
@@ -72,11 +66,6 @@ type AppInstalledUpdate struct {
 	AppContainerConfig
 }
 
-type AppInstalledIgnoreUpgrade struct {
-	DetailID uint   `json:"detailID"  validate:"required"`
-	Operate  string `json:"operate"   validate:"required,oneof=cancel ignore"`
-}
-
 type PortUpdate struct {
 	Key  string `json:"key"`
 	Name string `json:"name"`

backend/app/dto/request/host_tool.go

@@ -1,41 +0,0 @@
-package request
-
-type HostToolReq struct {
-	Type    string `json:"type" validate:"required,oneof=supervisord"`
-	Operate string `json:"operate" validate:"oneof=status restart start stop"`
-}
-
-type HostToolCreate struct {
-	Type string `json:"type" validate:"required"`
-	SupervisorConfig
-}
-
-type SupervisorConfig struct {
-	ConfigPath  string `json:"configPath"`
-	ServiceName string `json:"serviceName"`
-}
-
-type HostToolLogReq struct {
-	Type string `json:"type" validate:"required,oneof=supervisord"`
-}
-
-type HostToolConfig struct {
-	Type    string `json:"type" validate:"required,oneof=supervisord"`
-	Operate string `json:"operate" validate:"oneof=get set"`
-	Content string `json:"content"`
-}
-
-type SupervisorProcessConfig struct {
-	Name     string `json:"name"`
-	Operate  string `json:"operate"`
-	Command  string `json:"command"`
-	User     string `json:"user"`
-	Dir      string `json:"dir"`
-	Numprocs string `json:"numprocs"`
-}
-type SupervisorProcessFileReq struct {
-	Name    string `json:"name" validate:"required"`
-	Operate string `json:"operate" validate:"required,oneof=get clear update" `
-	Content string `json:"content"`
-	File    string `json:"file" validate:"required,oneof=out.log err.log config"`
-}

backend/app/dto/request/nginx.go

@@ -3,8 +3,9 @@ package request
 import "github.com/1Panel-dev/1Panel/backend/app/dto"
 
 type NginxConfigFileUpdate struct {
-	Content string `json:"content" validate:"required"`
-	Backup  bool   `json:"backup" validate:"required"`
+	Content  string `json:"content" validate:"required"`
+	FilePath string `json:"filePath" validate:"required"`
+	Backup   bool   `json:"backup" validate:"required"`
 }
 
 type NginxScopeReq struct {
@@ -65,23 +66,3 @@ type NginxAntiLeechUpdate struct {
 	LogEnable   bool     `json:"logEnable"`
 	Blocked     bool     `json:"blocked"`
 }
-
-type NginxRedirectReq struct {
-	Name         string   `json:"name" validate:"required"`
-	WebsiteID    uint     `json:"websiteID" validate:"required"`
-	Domains      []string `json:"domains"`
-	KeepPath     bool     `json:"keepPath" validate:"required"`
-	Enable       bool     `json:"enable" validate:"required"`
-	Type         string   `json:"type" validate:"required"`
-	Redirect     string   `json:"redirect" validate:"required"`
-	Path         string   `json:"path"`
-	Target       string   `json:"target" validate:"required"`
-	Operate      string   `json:"operate" validate:"required"`
-	RedirectRoot bool     `json:"redirectRoot"`
-}
-
-type NginxRedirectUpdate struct {
-	WebsiteID uint   `json:"websiteID" validate:"required"`
-	Content   string `json:"content" validate:"required"`
-	Name      string `json:"name" validate:"required"`
-}

backend/app/dto/request/process.go

@@ -1,5 +0,0 @@
-package request
-
-type ProcessReq struct {
-	PID int32 `json:"PID"  validate:"required"`
-}

backend/app/dto/request/runtime.go

@@ -17,7 +17,6 @@ type RuntimeCreate struct {
 	Image       string                 `json:"image"`
 	Type        string                 `json:"type"`
 	Version     string                 `json:"version"`
-	Source      string                 `json:"source"`
 }
 
 type RuntimeDelete struct {
@@ -30,6 +29,4 @@ type RuntimeUpdate struct {
 	Params  map[string]interface{} `json:"params"`
 	Image   string                 `json:"image"`
 	Version string                 `json:"version"`
-	Rebuild bool                   `json:"rebuild"`
-	Source  string                 `json:"source"`
 }

backend/app/dto/request/website.go

@@ -7,8 +7,6 @@ import (
 type WebsiteSearch struct {
 	dto.PageInfo
 	Name           string `json:"name"`
-	OrderBy        string `json:"orderBy"`
-	Order          string `json:"order"`
 	WebsiteGroupID uint   `json:"websiteGroupId"`
 }
 
@@ -75,12 +73,6 @@ type WebsiteWafReq struct {
 	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" validate:"required"`
-}
-
 type WebsiteWafUpdate struct {
 	WebsiteID uint   `json:"websiteId" validate:"required"`
 	Key       string `json:"key" validate:"required"`
@@ -121,18 +113,15 @@ type WebsiteDomainDelete struct {
 }
 
 type WebsiteHTTPSOp struct {
-	WebsiteID       uint     `json:"websiteId" validate:"required"`
-	Enable          bool     `json:"enable" validate:"required"`
-	WebsiteSSLID    uint     `json:"websiteSSLId"`
-	Type            string   `json:"type"  validate:"oneof=existed auto manual"`
-	PrivateKey      string   `json:"privateKey"`
-	Certificate     string   `json:"certificate"`
-	PrivateKeyPath  string   `json:"privateKeyPath"`
-	CertificatePath string   `json:"certificatePath"`
-	ImportType      string   `json:"importType"`
-	HttpConfig      string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
-	SSLProtocol     []string `json:"SSLProtocol"`
-	Algorithm       string   `json:"algorithm"`
+	WebsiteID    uint     `json:"websiteId" validate:"required"`
+	Enable       bool     `json:"enable" validate:"required"`
+	WebsiteSSLID uint     `json:"websiteSSLId"`
+	Type         string   `json:"type"  validate:"oneof=existed auto manual"`
+	PrivateKey   string   `json:"privateKey"`
+	Certificate  string   `json:"certificate"`
+	HttpConfig   string   `json:"HttpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
+	SSLProtocol  []string `json:"SSLProtocol"`
+	Algorithm    string   `json:"algorithm"`
 }
 
 type WebsiteNginxUpdate struct {
@@ -141,11 +130,9 @@ type WebsiteNginxUpdate struct {
 }
 
 type WebsiteLogReq struct {
-	ID       uint   `json:"id" validate:"required"`
-	Operate  string `json:"operate" validate:"required"`
-	LogType  string `json:"logType" validate:"required"`
-	Page     int    `json:"page"`
-	PageSize int    `json:"pageSize"`
+	ID      uint   `json:"id" validate:"required"`
+	Operate string `json:"operate" validate:"required"`
+	LogType string `json:"logType" validate:"required"`
 }
 
 type WebsiteDefaultUpdate struct {
@@ -166,12 +153,6 @@ type WebsitePHPFileUpdate struct {
 	Content string `json:"content" validate:"required"`
 }
 
-type WebsitePHPVersionReq struct {
-	WebsiteID    uint `json:"websiteID" validate:"required"`
-	RuntimeID    uint `json:"runtimeID" validate:"required"`
-	RetainConfig bool `json:"retainConfig" validate:"required"`
-}
-
 type WebsiteUpdateDir struct {
 	ID      uint   `json:"id" validate:"required"`
 	SiteDir string `json:"siteDir" validate:"required"`
@@ -203,17 +184,3 @@ type WebsiteProxyConfig struct {
 type WebsiteProxyReq struct {
 	ID uint `json:"id" validate:"required"`
 }
-
-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"`
-}

backend/app/dto/request/website_ssl.go

@@ -4,7 +4,6 @@ import "github.com/1Panel-dev/1Panel/backend/app/dto"
 
 type WebsiteSSLSearch struct {
 	dto.PageInfo
-	AcmeAccountID string `json:"acmeAccountID"`
 }
 
 type WebsiteSSLCreate struct {

backend/app/dto/response/app.go

@@ -39,8 +39,6 @@ type AppInstalledCheck struct {
 	AppInstallID  uint      `json:"appInstallId"`
 	ContainerName string    `json:"containerName"`
 	InstallPath   string    `json:"installPath"`
-	HttpPort      int       `json:"httpPort"`
-	HttpsPort     int       `json:"httpsPort"`
 }
 
 type AppDetailDTO struct {
@@ -50,13 +48,6 @@ type AppDetailDTO struct {
 	Image  string      `json:"image"`
 }
 
-type IgnoredApp struct {
-	Icon     string `json:"icon"`
-	Name     string `json:"name"`
-	Version  string `json:"version"`
-	DetailID uint   `json:"detailID"`
-}
-
 type AppInstalledDTO struct {
 	model.AppInstall
 	Total     int    `json:"total"`

backend/app/dto/response/host_tool.go

@@ -1,41 +0,0 @@
-package response
-
-type HostToolRes struct {
-	Type   string      `json:"type"`
-	Config interface{} `json:"config"`
-}
-
-type Supervisor struct {
-	ConfigPath  string `json:"configPath"`
-	IncludeDir  string `json:"includeDir"`
-	LogPath     string `json:"logPath"`
-	IsExist     bool   `json:"isExist"`
-	Init        bool   `json:"init"`
-	Msg         string `json:"msg"`
-	Version     string `json:"version"`
-	Status      string `json:"status"`
-	CtlExist    bool   `json:"ctlExist"`
-	ServiceName string `json:"serviceName"`
-}
-
-type HostToolConfig struct {
-	Content string `json:"content"`
-}
-
-type SupervisorProcessConfig struct {
-	Name     string          `json:"name"`
-	Command  string          `json:"command"`
-	User     string          `json:"user"`
-	Dir      string          `json:"dir"`
-	Numprocs string          `json:"numprocs"`
-	Msg      string          `json:"msg"`
-	Status   []ProcessStatus `json:"status"`
-}
-
-type ProcessStatus struct {
-	Name   string `json:"name"`
-	Status string `json:"status"`
-	PID    string `json:"PID"`
-	Uptime string `json:"uptime"`
-	Msg    string `json:"msg"`
-}

backend/app/dto/response/nginx.go

@@ -34,22 +34,3 @@ type NginxAntiLeechRes struct {
 	LogEnable   bool     `json:"logEnable"`
 	Blocked     bool     `json:"blocked"`
 }
-
-type NginxRedirectConfig struct {
-	WebsiteID    uint     `json:"websiteID"`
-	Name         string   `json:"name"`
-	Domains      []string `json:"domains"`
-	KeepPath     bool     `json:"keepPath"`
-	Enable       bool     `json:"enable"`
-	Type         string   `json:"type"`
-	Redirect     string   `json:"redirect"`
-	Path         string   `json:"path"`
-	Target       string   `json:"target"`
-	FilePath     string   `json:"filePath"`
-	Content      string   `json:"content"`
-	RedirectRoot bool     `json:"redirectRoot"`
-}
-
-type NginxFile struct {
-	Content string `json:"content"`
-}

backend/app/dto/response/runtime.go

@@ -6,5 +6,4 @@ type RuntimeRes struct {
 	model.Runtime
 	AppParams []AppParam `json:"appParams"`
 	AppID     uint       `json:"appId"`
-	Source    string     `json:"source"`
 }

backend/app/dto/response/website.go

@@ -26,8 +26,9 @@ type WebsiteNginxConfig struct {
 }
 
 type WebsiteWafConfig struct {
-	Enable  bool   `json:"enable"`
-	Content string `json:"content"`
+	Enable   bool   `json:"enable"`
+	FilePath string `json:"filePath"`
+	Content  string `json:"content"`
 }
 
 type WebsiteHTTPS struct {
@@ -41,8 +42,6 @@ type WebsiteHTTPS struct {
 type WebsiteLog struct {
 	Enable  bool   `json:"enable"`
 	Content string `json:"content"`
-	End     bool   `json:"end"`
-	Path    string `json:"path"`
 }
 
 type PHPConfig struct {
@@ -54,10 +53,3 @@ type PHPConfig struct {
 type NginxRewriteRes struct {
 	Content string `json:"content"`
 }
-
-type WebsiteDirConfig struct {
-	Dirs      []string `json:"dirs"`
-	User      string   `json:"user"`
-	UserGroup string   `json:"userGroup"`
-	Msg       string   `json:"msg"`
-}

backend/app/dto/setting.go

@@ -5,7 +5,6 @@ import "time"
 type SettingInfo struct {
 	UserName      string `json:"userName"`
 	Email         string `json:"email"`
-	SystemIP      string `json:"systemIP"`
 	SystemVersion string `json:"systemVersion"`
 
 	SessionTimeout string `json:"sessionTimeout"`
@@ -29,7 +28,6 @@ type SettingInfo struct {
 	ComplexityVerification string `json:"complexityVerification"`
 	MFAStatus              string `json:"mfaStatus"`
 	MFASecret              string `json:"mfaSecret"`
-	MFAInterval            string `json:"mfaInterval"`
 
 	MonitorStatus    string `json:"monitorStatus"`
 	MonitorInterval  string `json:"monitorInterval"`
@@ -75,22 +73,8 @@ type PortUpdate struct {
 	ServerPort uint `json:"serverPort" validate:"required,number,max=65535,min=1"`
 }
 
-type SnapshotStatus struct {
-	Panel      string `json:"panel"`
-	PanelInfo  string `json:"panelInfo"`
-	DaemonJson string `json:"daemonJson"`
-	AppData    string `json:"appData"`
-	PanelData  string `json:"panelData"`
-	BackupData string `json:"backupData"`
-
-	Compress string `json:"compress"`
-	Size     string `json:"size"`
-	Upload   string `json:"upload"`
-}
-
 type SnapshotCreate struct {
-	ID          uint   `json:"id"`
-	From        string `json:"from" validate:"required,oneof=OSS S3 SFTP MINIO COS KODO OneDrive"`
+	From        string `json:"from" validate:"required,oneof=OSS S3 SFTP MINIO COS KODO"`
 	Description string `json:"description" validate:"max=256"`
 }
 type SnapshotRecover struct {

backend/app/model/app_detail.go

@@ -12,5 +12,4 @@ type AppDetail struct {
 	DownloadUrl         string `json:"downloadUrl"  gorm:"type:varchar;"`
 	DownloadCallBackUrl string `json:"downloadCallBackUrl" gorm:"type:longtext;"`
 	Update              bool   `json:"update"`
-	IgnoreUpgrade       bool   `json:"ignoreUpgrade"`
 }

backend/app/model/app_install_resource.go

@@ -6,5 +6,4 @@ type AppInstallResource struct {
 	LinkId       uint   `json:"linkId"  gorm:"type:integer;not null;"`
 	ResourceId   uint   `json:"resourceId" gorm:"type:integer;"`
 	Key          string `json:"key" gorm:"type:varchar(64);not null"`
-	From         string `json:"from" gorm:"type:varchar(64);not null;default:local"`
 }

backend/app/model/backup.go

@@ -6,7 +6,6 @@ type BackupAccount struct {
 	Bucket     string `gorm:"type:varchar(256)" json:"bucket"`
 	AccessKey  string `gorm:"type:varchar(256)" json:"accessKey"`
 	Credential string `gorm:"type:varchar(256)" json:"credential"`
-	BackupPath string `gorm:"type:varchar(256)" json:"backupPath"`
 	Vars       string `gorm:"type:longText" json:"vars"`
 }
 

backend/app/model/cronjob.go

@@ -15,10 +15,8 @@ type Cronjob struct {
 	Minute   uint64 `gorm:"type:decimal" json:"minute"`
 	Second   uint64 `gorm:"type:decimal" json:"second"`
 
-	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"`
 	DBName         string `gorm:"type:varchar(64)" json:"dbName"`
 	URL            string `gorm:"type:varchar(256)" json:"url"`
 	SourceDir      string `gorm:"type:varchar(256)" json:"sourceDir"`

backend/app/model/database.go

@@ -1,15 +0,0 @@
-package model
-
-type Database struct {
-	BaseModel
-	AppInstallID uint   `json:"appInstallID" gorm:"type:decimal"`
-	Name         string `json:"name" gorm:"type:varchar(64);not null;unique"`
-	Type         string `json:"type" gorm:"type:varchar(64);not null"`
-	Version      string `json:"version" gorm:"type:varchar(64);not null"`
-	From         string `json:"from" gorm:"type:varchar(64);not null"`
-	Address      string `json:"address" gorm:"type:varchar(64);not null"`
-	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)"`
-	Description  string `json:"description" gorm:"type:varchar(256);"`
-}

backend/app/model/database_mysql.go

@@ -3,7 +3,6 @@ package model
 type DatabaseMysql struct {
 	BaseModel
 	Name        string `json:"name" gorm:"type:varchar(256);not null"`
-	From        string `json:"from" gorm:"type:varchar(256);not null;default:local"`
 	MysqlName   string `json:"mysqlName" 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"`

backend/app/model/firewall.go

@@ -1,12 +0,0 @@
-package model
-
-type Firewall struct {
-	BaseModel
-
-	Type        string `gorm:"type:varchar(64);not null" json:"type"`
-	Port        string `gorm:"type:varchar(64);not null" json:"port"`
-	Protocol    string `gorm:"type:varchar(64);not null" json:"protocol"`
-	Address     string `gorm:"type:varchar(64);not null" json:"address"`
-	Strategy    string `gorm:"type:varchar(64);not null" json:"strategy"`
-	Description string `gorm:"type:varchar(64);not null" json:"description"`
-}

backend/app/model/snapshot.go

@@ -17,18 +17,3 @@ type Snapshot struct {
 	RollbackMessage  string `json:"rollbackMessage" gorm:"type:varchar(256)"`
 	LastRollbackedAt string `json:"lastRollbackedAt" gorm:"type:varchar(64)"`
 }
-
-type SnapshotStatus struct {
-	BaseModel
-	SnapID     uint   `gorm:"type:decimal" json:"snapID"`
-	Panel      string `json:"panel" gorm:"type:varchar(64);default:Running"`
-	PanelInfo  string `json:"panelInfo" gorm:"type:varchar(64);default:Running"`
-	DaemonJson string `json:"daemonJson" gorm:"type:varchar(64);default:Running"`
-	AppData    string `json:"appData" gorm:"type:varchar(64);default:Running"`
-	PanelData  string `json:"panelData" gorm:"type:varchar(64);default:Running"`
-	BackupData string `json:"backupData" gorm:"type:varchar(64);default:Running"`
-
-	Compress string `json:"compress" gorm:"type:varchar(64);default:Waiting"`
-	Size     string `json:"size" gorm:"type:varchar(64)"`
-	Upload   string `json:"upload" gorm:"type:varchar(64);default:Waiting"`
-}

backend/app/repo/app.go

@@ -66,7 +66,7 @@ func (a AppRepo) Page(page, size int, opts ...DBOption) (int64, []model.App, err
 	db := getDb(opts...).Model(&model.App{})
 	count := int64(0)
 	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Preload("AppTags").Find(&apps).Error
+	err := db.Debug().Limit(size).Offset(size * (page - 1)).Preload("AppTags").Find(&apps).Error
 	return count, apps, err
 }
 

backend/app/repo/app_detail.go

@@ -13,7 +13,6 @@ type AppDetailRepo struct {
 type IAppDetailRepo interface {
 	WithVersion(version string) DBOption
 	WithAppId(id uint) DBOption
-	WithIgnored() DBOption
 	GetFirst(opts ...DBOption) (model.AppDetail, error)
 	Update(ctx context.Context, detail model.AppDetail) error
 	BatchCreate(ctx context.Context, details []model.AppDetail) error
@@ -32,19 +31,12 @@ func (a AppDetailRepo) WithVersion(version string) DBOption {
 		return g.Where("version = ?", version)
 	}
 }
-
 func (a AppDetailRepo) WithAppId(id uint) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("app_id = ?", id)
 	}
 }
 
-func (a AppDetailRepo) WithIgnored() DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("ignore_upgrade = 1")
-	}
-}
-
 func (a AppDetailRepo) GetFirst(opts ...DBOption) (model.AppDetail, error) {
 	var detail model.AppDetail
 	err := getDb(opts...).Model(&model.AppDetail{}).Find(&detail).Error

backend/app/repo/app_install.go

@@ -3,7 +3,6 @@ package repo
 import (
 	"context"
 	"encoding/json"
-
 	"gorm.io/gorm/clause"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -127,7 +126,7 @@ func (a *AppInstallRepo) Create(ctx context.Context, install *model.AppInstall)
 }
 
 func (a *AppInstallRepo) Save(ctx context.Context, install *model.AppInstall) error {
-	return getTx(ctx).Save(&install).Error
+	return getTx(ctx).Omit(clause.Associations).Save(&install).Error
 }
 
 func (a *AppInstallRepo) DeleteBy(opts ...DBOption) error {
@@ -161,7 +160,6 @@ type RootInfo struct {
 	Name          string `json:"name"`
 	Port          int64  `json:"port"`
 	HttpsPort     int64  `json:"httpsPort"`
-	UserName      string `json:"userName"`
 	Password      string `json:"password"`
 	UserPassword  string `json:"userPassword"`
 	ContainerName string `json:"containerName"`
@@ -194,28 +192,10 @@ func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error
 	if err := json.Unmarshal([]byte(appInstall.Env), &envMap); err != nil {
 		return nil, err
 	}
-	switch app.Key {
-	case "mysql", "mariadb":
-		password, ok := envMap["PANEL_DB_ROOT_PASSWORD"].(string)
-		if ok {
-			info.Password = password
-		}
-	case "redis":
-		password, ok := envMap["PANEL_REDIS_ROOT_PASSWORD"].(string)
-		if ok {
-			info.Password = password
-		}
-	case "mongodb", "postgresql":
-		user, ok := envMap["PANEL_DB_ROOT_USER"].(string)
-		if ok {
-			info.UserName = user
-		}
-		password, ok := envMap["PANEL_DB_ROOT_PASSWORD"].(string)
-		if ok {
-			info.Password = password
-		}
+	password, ok := envMap["PANEL_DB_ROOT_PASSWORD"].(string)
+	if ok {
+		info.Password = password
 	}
-
 	userPassword, ok := envMap["PANEL_DB_USER_PASSWORD"].(string)
 	if ok {
 		info.UserPassword = userPassword
@@ -229,6 +209,5 @@ func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error
 	info.Env = appInstall.Env
 	info.Param = appInstall.Param
 	info.Version = appInstall.Version
-	info.Key = app.Key
 	return &info, nil
 }

backend/app/repo/common.go

@@ -2,7 +2,6 @@ package repo
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/constant"
@@ -17,7 +16,6 @@ type ICommonRepo interface {
 	WithByName(name string) DBOption
 	WithByType(tp string) DBOption
 	WithOrderBy(orderStr string) DBOption
-	WithOrderRuleBy(orderBy, order string) DBOption
 	WithByGroupID(groupID uint) DBOption
 	WithLikeName(name string) DBOption
 	WithIdsIn(ids []uint) DBOption
@@ -95,21 +93,6 @@ func (c *CommonRepo) WithOrderBy(orderStr string) DBOption {
 	}
 }
 
-func (c *CommonRepo) WithOrderRuleBy(orderBy, order string) DBOption {
-	switch order {
-	case constant.OrderDesc:
-		order = "desc"
-	case constant.OrderAsc:
-		order = "asc"
-	default:
-		orderBy = "created_at"
-		order = "desc"
-	}
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Order(fmt.Sprintf("%s %s", orderBy, order))
-	}
-}
-
 func (c *CommonRepo) WithIdsIn(ids []uint) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("id in (?)", ids)

backend/app/repo/compose_template.go

@@ -15,7 +15,6 @@ type IComposeTemplateRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 
-	GetRecord(opts ...DBOption) (model.Compose, error)
 	CreateRecord(compose *model.Compose) error
 	DeleteRecord(opts ...DBOption) error
 	ListRecord() ([]model.Compose, error)
@@ -73,16 +72,6 @@ func (u *ComposeTemplateRepo) Delete(opts ...DBOption) error {
 	return db.Delete(&model.ComposeTemplate{}).Error
 }
 
-func (u *ComposeTemplateRepo) GetRecord(opts ...DBOption) (model.Compose, error) {
-	var compose model.Compose
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&compose).Error
-	return compose, err
-}
-
 func (u *ComposeTemplateRepo) ListRecord() ([]model.Compose, error) {
 	var composes []model.Compose
 	if err := global.DB.Find(&composes).Error; err != nil {

backend/app/repo/cronjob.go

@@ -83,7 +83,7 @@ func (u *CronjobRepo) Page(page, size int, opts ...DBOption) (int64, []model.Cro
 	}
 	count := int64(0)
 	db = db.Count(&count)
-	err := db.Limit(size).Offset(size * (page - 1)).Find(&cronjobs).Error
+	err := db.Order("created_at desc").Limit(size).Offset(size * (page - 1)).Find(&cronjobs).Error
 	return count, cronjobs, err
 }
 

backend/app/repo/database.go

@@ -1,143 +0,0 @@
-package repo
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
-	"gorm.io/gorm"
-)
-
-type DatabaseRepo struct{}
-
-type IDatabaseRepo interface {
-	GetList(opts ...DBOption) ([]model.Database, error)
-	Page(limit, offset int, opts ...DBOption) (int64, []model.Database, error)
-	Create(ctx context.Context, database *model.Database) error
-	Update(id uint, vars map[string]interface{}) error
-	Delete(ctx context.Context, opts ...DBOption) error
-	Get(opts ...DBOption) (model.Database, error)
-	WithByFrom(from string) DBOption
-	WithoutByFrom(from string) DBOption
-	WithAppInstallID(appInstallID uint) DBOption
-	WithTypeList(dbType string) DBOption
-}
-
-func NewIDatabaseRepo() IDatabaseRepo {
-	return &DatabaseRepo{}
-}
-
-func (d *DatabaseRepo) Get(opts ...DBOption) (model.Database, error) {
-	var database model.Database
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	if err := db.First(&database).Error; err != nil {
-		return database, err
-	}
-	pass, err := encrypt.StringDecrypt(database.Password)
-	if err != nil {
-		global.LOG.Errorf("decrypt database %s password failed, err: %v", database.Name, err)
-	}
-	database.Password = pass
-	return database, nil
-}
-
-func (d *DatabaseRepo) Page(page, size int, opts ...DBOption) (int64, []model.Database, error) {
-	var databases []model.Database
-	db := global.DB.Model(&model.Database{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	count := int64(0)
-	db = db.Count(&count)
-	if err := db.Limit(size).Offset(size * (page - 1)).Find(&databases).Error; err != nil {
-		return count, databases, err
-	}
-	for i := 0; i < len(databases); i++ {
-		pass, err := encrypt.StringDecrypt(databases[i].Password)
-		if err != nil {
-			global.LOG.Errorf("decrypt database db %s password failed, err: %v", databases[i].Name, err)
-		}
-		databases[i].Password = pass
-	}
-	return count, databases, nil
-}
-
-func (d *DatabaseRepo) GetList(opts ...DBOption) ([]model.Database, error) {
-	var databases []model.Database
-	db := global.DB.Model(&model.Database{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	if err := db.Find(&databases).Error; err != nil {
-		return databases, err
-	}
-	for i := 0; i < len(databases); i++ {
-		pass, err := encrypt.StringDecrypt(databases[i].Password)
-		if err != nil {
-			global.LOG.Errorf("decrypt database db %s password failed, err: %v", databases[i].Name, err)
-		}
-		databases[i].Password = pass
-	}
-	return databases, nil
-}
-
-func (d *DatabaseRepo) WithByFrom(from string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("`from` = ?", from)
-	}
-}
-
-func (d *DatabaseRepo) WithoutByFrom(from string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("`from` != ?", from)
-	}
-}
-
-func (d *DatabaseRepo) WithTypeList(dbType string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if !strings.Contains(dbType, ",") {
-			return g.Where("`type` = ?", dbType)
-		}
-		types := strings.Split(dbType, ",")
-		var (
-			rules  []string
-			values []interface{}
-		)
-		for _, ty := range types {
-			if len(ty) != 0 {
-				rules = append(rules, "`type` = ?")
-				values = append(values, ty)
-			}
-		}
-		return g.Where(strings.Join(rules, " OR "), values...)
-	}
-}
-
-func (d *DatabaseRepo) WithAppInstallID(appInstallID uint) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		return g.Where("app_install_id = ?", appInstallID)
-	}
-}
-
-func (d *DatabaseRepo) Create(ctx context.Context, database *model.Database) error {
-	pass, err := encrypt.StringEncrypt(database.Password)
-	if err != nil {
-		return fmt.Errorf("decrypt database db %s password failed, err: %v", database.Name, err)
-	}
-	database.Password = pass
-	return getTx(ctx).Create(database).Error
-}
-
-func (d *DatabaseRepo) Update(id uint, vars map[string]interface{}) error {
-	return global.DB.Model(&model.Database{}).Where("id = ?", id).Updates(vars).Error
-}
-
-func (d *DatabaseRepo) Delete(ctx context.Context, opts ...DBOption) error {
-	return getTx(ctx, opts...).Delete(&model.Database{}).Error
-}

backend/app/repo/databse_mysql.go

@@ -2,11 +2,9 @@ package repo
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
 	"gorm.io/gorm"
 )
 
@@ -15,13 +13,13 @@ type MysqlRepo struct{}
 type IMysqlRepo interface {
 	Get(opts ...DBOption) (model.DatabaseMysql, error)
 	WithByMysqlName(mysqlName string) DBOption
-	WithByFrom(from string) DBOption
 	List(opts ...DBOption) ([]model.DatabaseMysql, error)
 	Page(limit, offset int, opts ...DBOption) (int64, []model.DatabaseMysql, error)
 	Create(ctx context.Context, mysql *model.DatabaseMysql) error
 	Delete(ctx context.Context, opts ...DBOption) error
 	Update(id uint, vars map[string]interface{}) error
-	DeleteLocal(ctx context.Context) error
+	UpdateDatabaseInfo(id uint, vars map[string]interface{}) error
+	DeleteAll(ctx context.Context) error
 }
 
 func NewIMysqlRepo() IMysqlRepo {
@@ -34,64 +32,33 @@ func (u *MysqlRepo) Get(opts ...DBOption) (model.DatabaseMysql, error) {
 	for _, opt := range opts {
 		db = opt(db)
 	}
-	if err := db.First(&mysql).Error; err != nil {
-		return mysql, err
-	}
-
-	pass, err := encrypt.StringDecrypt(mysql.Password)
-	if err != nil {
-		global.LOG.Errorf("decrypt database db %s password failed, err: %v", mysql.Name, err)
-	}
-	mysql.Password = pass
+	err := db.First(&mysql).Error
 	return mysql, err
 }
 
 func (u *MysqlRepo) List(opts ...DBOption) ([]model.DatabaseMysql, error) {
-	var mysqls []model.DatabaseMysql
+	var users []model.DatabaseMysql
 	db := global.DB.Model(&model.DatabaseMysql{})
 	for _, opt := range opts {
 		db = opt(db)
 	}
-	if err := db.Find(&mysqls).Error; err != nil {
-		return mysqls, err
-	}
-	for i := 0; i < len(mysqls); i++ {
-		pass, err := encrypt.StringDecrypt(mysqls[i].Password)
-		if err != nil {
-			global.LOG.Errorf("decrypt database db %s password failed, err: %v", mysqls[i].Name, err)
-		}
-		mysqls[i].Password = pass
-	}
-	return mysqls, nil
+	err := db.Find(&users).Error
+	return users, err
 }
 
 func (u *MysqlRepo) Page(page, size int, opts ...DBOption) (int64, []model.DatabaseMysql, error) {
-	var mysqls []model.DatabaseMysql
+	var users []model.DatabaseMysql
 	db := global.DB.Model(&model.DatabaseMysql{})
 	for _, opt := range opts {
 		db = opt(db)
 	}
 	count := int64(0)
 	db = db.Count(&count)
-	if err := db.Limit(size).Offset(size * (page - 1)).Find(&mysqls).Error; err != nil {
-		return count, mysqls, err
-	}
-	for i := 0; i < len(mysqls); i++ {
-		pass, err := encrypt.StringDecrypt(mysqls[i].Password)
-		if err != nil {
-			global.LOG.Errorf("decrypt database db %s password failed, err: %v", mysqls[i].Name, err)
-		}
-		mysqls[i].Password = pass
-	}
-	return count, mysqls, nil
+	err := db.Limit(size).Offset(size * (page - 1)).Find(&users).Error
+	return count, users, err
 }
 
 func (u *MysqlRepo) Create(ctx context.Context, mysql *model.DatabaseMysql) error {
-	pass, err := encrypt.StringEncrypt(mysql.Password)
-	if err != nil {
-		return fmt.Errorf("decrypt database db %s password failed, err: %v", mysql.Name, err)
-	}
-	mysql.Password = pass
 	return getTx(ctx).Create(mysql).Error
 }
 
@@ -99,25 +66,23 @@ func (u *MysqlRepo) Delete(ctx context.Context, opts ...DBOption) error {
 	return getTx(ctx, opts...).Delete(&model.DatabaseMysql{}).Error
 }
 
-func (u *MysqlRepo) DeleteLocal(ctx context.Context) error {
-	return getTx(ctx).Where("`from` = ?", "local").Delete(&model.DatabaseMysql{}).Error
+func (u *MysqlRepo) DeleteAll(ctx context.Context) error {
+	return getTx(ctx).Where("1 = 1").Delete(&model.DatabaseMysql{}).Error
 }
 
 func (u *MysqlRepo) Update(id uint, vars map[string]interface{}) error {
 	return global.DB.Model(&model.DatabaseMysql{}).Where("id = ?", id).Updates(vars).Error
 }
 
+func (u *MysqlRepo) UpdateDatabaseInfo(id uint, vars map[string]interface{}) error {
+	if err := global.DB.Model(&model.AppInstall{}).Where("id = ?", id).Updates(vars).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
 func (u *MysqlRepo) WithByMysqlName(mysqlName string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		return g.Where("mysql_name = ?", mysqlName)
 	}
 }
-
-func (u *MysqlRepo) WithByFrom(from string) DBOption {
-	return func(g *gorm.DB) *gorm.DB {
-		if len(from) != 0 {
-			return g.Where("`from` = ?", from)
-		}
-		return g
-	}
-}

backend/app/repo/host.go

@@ -19,12 +19,6 @@ type IHostRepo interface {
 	Create(host *model.Host) error
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
-
-	GetFirewallRecord(opts ...DBOption) (model.Firewall, error)
-	ListFirewallRecord() ([]model.Firewall, error)
-	SaveFirewallRecord(firewall *model.Firewall) error
-	DeleteFirewallRecordByID(id uint) error
-	DeleteFirewallRecord(fType, port, protocol, address, strategy string) error
 }
 
 func NewIHostRepo() IHostRepo {
@@ -112,48 +106,3 @@ func (h *HostRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Host{}).Error
 }
-
-func (h *HostRepo) GetFirewallRecord(opts ...DBOption) (model.Firewall, error) {
-	var firewall model.Firewall
-	db := global.DB
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.First(&firewall).Error
-	return firewall, err
-}
-
-func (h *HostRepo) ListFirewallRecord() ([]model.Firewall, error) {
-	var datas []model.Firewall
-	if err := global.DB.Find(&datas).Error; err != nil {
-		return datas, nil
-	}
-	return datas, nil
-}
-
-func (h *HostRepo) SaveFirewallRecord(firewall *model.Firewall) error {
-	if firewall.ID != 0 {
-		return global.DB.Save(firewall).Error
-	}
-	var data model.Firewall
-	if firewall.Type == "port" {
-		_ = global.DB.Where("type = ? AND port = ? AND protocol = ? AND address = ? AND strategy = ?", "port", firewall.Port, firewall.Protocol, firewall.Address, firewall.Strategy).First(&data)
-		if data.ID != 0 {
-			firewall.ID = data.ID
-		}
-	} else {
-		_ = global.DB.Where("type = ? AND address = ? AND strategy = ?", "address", firewall.Address, firewall.Strategy).First(&data)
-		if data.ID != 0 {
-			firewall.ID = data.ID
-		}
-	}
-	return global.DB.Save(firewall).Error
-}
-
-func (h *HostRepo) DeleteFirewallRecordByID(id uint) error {
-	return global.DB.Where("id = ?", id).Delete(&model.Firewall{}).Error
-}
-
-func (h *HostRepo) DeleteFirewallRecord(fType, port, protocol, address, strategy string) error {
-	return global.DB.Where("type = ? AND port = ? AND protocol = ? AND address = ? AND strategy = ?", fType, port, protocol, address, strategy).Delete(&model.Firewall{}).Error
-}

backend/app/repo/runtime.go

@@ -2,9 +2,7 @@ package repo
 
 import (
 	"context"
-
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"gorm.io/gorm"
 )
 
@@ -22,7 +20,6 @@ type IRuntimeRepo interface {
 	Save(runtime *model.Runtime) error
 	DeleteBy(opts ...DBOption) error
 	GetFirst(opts ...DBOption) (*model.Runtime, error)
-	List(opts ...DBOption) ([]model.Runtime, error)
 }
 
 func NewIRunTimeRepo() IRuntimeRepo {
@@ -68,16 +65,6 @@ func (r *RuntimeRepo) Page(page, size int, opts ...DBOption) (int64, []model.Run
 	return count, runtimes, err
 }
 
-func (r *RuntimeRepo) List(opts ...DBOption) ([]model.Runtime, error) {
-	var runtimes []model.Runtime
-	db := global.DB.Model(&model.Runtime{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&runtimes).Error
-	return runtimes, err
-}
-
 func (r *RuntimeRepo) Create(ctx context.Context, runtime *model.Runtime) error {
 	db := getTx(ctx).Model(&model.Runtime{})
 	return db.Create(&runtime).Error

backend/app/repo/snapshot.go

@@ -12,12 +12,6 @@ type ISnapshotRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Page(limit, offset int, opts ...DBOption) (int64, []model.Snapshot, error)
 	Delete(opts ...DBOption) error
-
-	GetStatus(snapID uint) (model.SnapshotStatus, error)
-	GetStatusList(opts ...DBOption) ([]model.SnapshotStatus, error)
-	CreateStatus(snap *model.SnapshotStatus) error
-	DeleteStatus(snapID uint) error
-	UpdateStatus(id uint, vars map[string]interface{}) error
 }
 
 func NewISnapshotRepo() ISnapshotRepo {
@@ -73,33 +67,3 @@ func (u *SnapshotRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Snapshot{}).Error
 }
-
-func (u *SnapshotRepo) GetStatus(snapID uint) (model.SnapshotStatus, error) {
-	var data model.SnapshotStatus
-	if err := global.DB.Where("snap_id = ?", snapID).First(&data).Error; err != nil {
-		return data, err
-	}
-	return data, nil
-}
-
-func (u *SnapshotRepo) GetStatusList(opts ...DBOption) ([]model.SnapshotStatus, error) {
-	var status []model.SnapshotStatus
-	db := global.DB.Model(&model.SnapshotStatus{})
-	for _, opt := range opts {
-		db = opt(db)
-	}
-	err := db.Find(&status).Error
-	return status, err
-}
-
-func (u *SnapshotRepo) CreateStatus(snap *model.SnapshotStatus) error {
-	return global.DB.Create(snap).Error
-}
-
-func (u *SnapshotRepo) DeleteStatus(snapID uint) error {
-	return global.DB.Where("snap_id = ?", snapID).Delete(&model.SnapshotStatus{}).Error
-}
-
-func (u *SnapshotRepo) UpdateStatus(id uint, vars map[string]interface{}) error {
-	return global.DB.Model(&model.SnapshotStatus{}).Where("id = ?", id).Updates(vars).Error
-}

backend/app/repo/website.go

@@ -26,7 +26,6 @@ type IWebsiteRepo interface {
 	SaveWithoutCtx(app *model.Website) error
 	DeleteBy(ctx context.Context, opts ...DBOption) error
 	Create(ctx context.Context, app *model.Website) error
-	DeleteAll(ctx context.Context) error
 }
 
 func NewIWebsiteRepo() IWebsiteRepo {
@@ -132,7 +131,3 @@ func (w *WebsiteRepo) SaveWithoutCtx(website *model.Website) error {
 func (w *WebsiteRepo) DeleteBy(ctx context.Context, opts ...DBOption) error {
 	return getTx(ctx, opts...).Delete(&model.Website{}).Error
 }
-
-func (w *WebsiteRepo) DeleteAll(ctx context.Context) error {
-	return getTx(ctx).Where("1 = 1 ").Delete(&model.Website{}).Error
-}

backend/app/repo/website_domain.go

@@ -21,7 +21,6 @@ type IWebsiteDomainRepo interface {
 	Create(ctx context.Context, app *model.WebsiteDomain) error
 	Save(ctx context.Context, app *model.WebsiteDomain) error
 	DeleteBy(ctx context.Context, opts ...DBOption) error
-	DeleteAll(ctx context.Context) error
 }
 
 func NewIWebsiteDomainRepo() IWebsiteDomainRepo {
@@ -86,7 +85,3 @@ func (w WebsiteDomainRepo) Save(ctx context.Context, app *model.WebsiteDomain) e
 func (w WebsiteDomainRepo) DeleteBy(ctx context.Context, opts ...DBOption) error {
 	return getTx(ctx, opts...).Delete(&model.WebsiteDomain{}).Error
 }
-
-func (w WebsiteDomainRepo) DeleteAll(ctx context.Context) error {
-	return getTx(ctx).Where("1 = 1 ").Delete(&model.WebsiteDomain{}).Error
-}

backend/app/service/app.go

@@ -5,14 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path"
-	"reflect"
-	"strconv"
-	"strings"
-
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/response"
@@ -27,6 +19,11 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
 	http2 "github.com/1Panel-dev/1Panel/backend/utils/http"
 	"gopkg.in/yaml.v3"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"strconv"
 )
 
 type AppService struct {
@@ -42,7 +39,6 @@ type IAppService interface {
 	GetAppUpdate() (*response.AppUpdateRes, error)
 	GetAppDetailByID(id uint) (*response.AppDetailDTO, error)
 	SyncAppListFromLocal()
-	GetIgnoredApp() ([]response.IgnoredApp, error)
 }
 
 func NewIAppService() IAppService {
@@ -86,16 +82,12 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
 		return nil, err
 	}
 	var appDTOs []*response.AppDTO
-	for _, ap := range apps {
-		ap.ReadMe = ""
-		ap.Website = ""
-		ap.Document = ""
-		ap.Github = ""
+	for _, a := range apps {
 		appDTO := &response.AppDTO{
-			App: ap,
+			App: a,
 		}
 		appDTOs = append(appDTOs, appDTO)
-		appTags, err := appTagRepo.GetByAppId(ap.ID)
+		appTags, err := appTagRepo.GetByAppId(a.ID)
 		if err != nil {
 			continue
 		}
@@ -108,7 +100,7 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
 			continue
 		}
 		appDTO.Tags = tags
-		installs, _ := appInstallRepo.ListBy(appInstallRepo.WithAppId(ap.ID))
+		installs, _ := appInstallRepo.ListBy(appInstallRepo.WithAppId(a.ID))
 		appDTO.Installed = len(installs) > 0
 	}
 	res.Items = appDTOs
@@ -171,7 +163,7 @@ func (a AppService) GetAppDetail(appId uint, version, appType string) (response.
 		}
 		fileOp := files.NewFileOp()
 		versionPath := path.Join(constant.AppResourceDir, app.Resource, app.Key, detail.Version)
-		if !fileOp.Stat(versionPath) || detail.Update {
+		if !fileOp.Stat(versionPath) {
 			if err = downloadApp(app, detail, nil); err != nil {
 				return appDetailDTO, err
 			}
@@ -240,27 +232,6 @@ func (a AppService) GetAppDetailByID(id uint) (*response.AppDetailDTO, error) {
 	return res, nil
 }
 
-func (a AppService) GetIgnoredApp() ([]response.IgnoredApp, error) {
-	var res []response.IgnoredApp
-	details, _ := appDetailRepo.GetBy(appDetailRepo.WithIgnored())
-	if len(details) == 0 {
-		return res, nil
-	}
-	for _, detail := range details {
-		app, err := appRepo.GetFirst(commonRepo.WithByID(detail.AppId))
-		if err != nil {
-			return nil, err
-		}
-		res = append(res, response.IgnoredApp{
-			Name:     app.Name,
-			Version:  detail.Version,
-			DetailID: detail.ID,
-			Icon:     app.Icon,
-		})
-	}
-	return res, nil
-}
-
 func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (appInstall *model.AppInstall, err error) {
 	if err = docker.CreateDefaultDockerNetwork(); err != nil {
 		err = buserr.WithDetail(constant.Err1PanelNetworkFailed, err.Error(), nil)
@@ -276,6 +247,14 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 		appDetail model.AppDetail
 		app       model.App
 	)
+	httpPort, err = checkPort("PANEL_APP_PORT_HTTP", req.Params)
+	if err != nil {
+		return
+	}
+	httpsPort, err = checkPort("PANEL_APP_PORT_HTTPS", req.Params)
+	if err != nil {
+		return
+	}
 	appDetail, err = appDetailRepo.GetFirst(commonRepo.WithByID(req.AppDetailId))
 	if err != nil {
 		return
@@ -284,29 +263,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 	if err != nil {
 		return
 	}
-	if DatabaseKeys[app.Key] > 0 {
-		if existDatabases, _ := databaseRepo.GetList(commonRepo.WithByName(req.Name)); len(existDatabases) > 0 {
-			err = buserr.New(constant.ErrRemoteExist)
-			return
-		}
-	}
-	for key := range req.Params {
-		if !strings.Contains(key, "PANEL_APP_PORT") {
-			continue
-		}
-		var port int
-		if port, err = checkPort(key, req.Params); err == nil {
-			if key == "PANEL_APP_PORT_HTTP" {
-				httpPort = port
-			}
-			if key == "PANEL_APP_PORT_HTTPS" {
-				httpsPort = port
-			}
-		} else {
-			return
-		}
-	}
-
 	if err = checkRequiredAndLimit(app); err != nil {
 		return
 	}
@@ -360,20 +316,13 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 	appInstall.ContainerName = containerName
 
 	index := 0
-	serviceName := ""
 	for k := range servicesMap {
-		serviceName = k
+		appInstall.ServiceName = k
 		if index > 0 {
 			continue
 		}
 		index++
 	}
-	if app.Limit == 0 && appInstall.Name != serviceName {
-		servicesMap[appInstall.Name] = servicesMap[serviceName]
-		delete(servicesMap, serviceName)
-		serviceName = appInstall.Name
-	}
-	appInstall.ServiceName = serviceName
 
 	if err = addDockerComposeCommonParam(composeMap, appInstall.ServiceName, req.AppContainerConfig, req.Params); err != nil {
 		return
@@ -397,14 +346,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 			}
 		}
 	}()
-	if hostName, ok := req.Params["PANEL_DB_HOST"]; ok {
-		database, _ := databaseRepo.Get(commonRepo.WithByName(hostName.(string)))
-		if !reflect.DeepEqual(database, model.Database{}) {
-			req.Params["PANEL_DB_HOST"] = database.Address
-			req.Params["PANEL_DB_PORT"] = database.Port
-			req.Params["PANEL_DB_HOST_NAME"] = hostName
-		}
-	}
 	paramByte, err = json.Marshal(req.Params)
 	if err != nil {
 		return
@@ -417,17 +358,15 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 		return
 	}
 	go func() {
-		defer func() {
-			if err != nil {
+		if err = copyData(app, appDetail, appInstall, req); err != nil {
+			if appInstall.Status == constant.Installing {
 				appInstall.Status = constant.Error
 				appInstall.Message = err.Error()
-				_ = appInstallRepo.Save(context.Background(), appInstall)
 			}
-		}()
-		if err = copyData(app, appDetail, appInstall, req); err != nil {
+			_ = appInstallRepo.Save(context.Background(), appInstall)
 			return
 		}
-		if err = runScript(appInstall, "init"); err != nil {
+		if err = upAppPre(app, appInstall); err != nil {
 			return
 		}
 		upApp(appInstall)
@@ -531,13 +470,9 @@ func (a AppService) SyncAppListFromLocal() {
 				oldDetail, exist := appDetails[version]
 				if exist {
 					newDetail.ID = oldDetail.ID
-					delete(appDetails, version)
 				}
 				app.Details[i] = newDetail
 			}
-			for _, v := range appDetails {
-				app.Details = append(app.Details, v)
-			}
 		}
 		app.TagsKey = append(app.TagsKey, constant.AppResourceLocal)
 		apps[app.Key] = app
@@ -688,26 +623,10 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
 		return nil, err
 	}
 	appStoreLastModified, _ := strconv.Atoi(setting.AppStoreLastModified)
-	res.AppStoreLastModified = appStoreLastModified
 	if setting.AppStoreLastModified == "" || lastModified != appStoreLastModified {
 		res.CanUpdate = true
 		return res, err
 	}
-	if err = getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.CONF.System.AppRepo, global.CONF.System.Mode)); err != nil {
-		return nil, err
-	}
-	listFile := path.Join(constant.ResourceDir, "1panel.json")
-	content, err := os.ReadFile(listFile)
-	if err != nil {
-		return nil, err
-	}
-	list := &dto.AppList{}
-	if err = json.Unmarshal(content, list); err != nil {
-		return nil, err
-	}
-	if list.Extra.Version != "" && setting.SystemVersion != list.Extra.Version && !common.CompareVersion(setting.SystemVersion, list.Extra.Version) {
-		return nil, buserr.New("ErrVersionTooLow")
-	}
 	return res, nil
 }
 
@@ -728,13 +647,13 @@ func getAppFromRepo(downloadPath string) error {
 	return nil
 }
 
-func (a AppService) SyncAppListFromRemote() (err error) {
+func (a AppService) SyncAppListFromRemote() error {
 	updateRes, err := a.GetAppUpdate()
 	if err != nil {
 		return err
 	}
 	if !updateRes.CanUpdate {
-		return
+		return nil
 	}
 	if err = getAppFromRepo(fmt.Sprintf("%s/%s/1panel.json.zip", global.CONF.System.AppRepo, global.CONF.System.Mode)); err != nil {
 		return err
@@ -745,20 +664,10 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		return err
 	}
 	list := &dto.AppList{}
-	if err = json.Unmarshal(content, list); err != nil {
-		return
-	}
-
-	if err = NewISettingService().Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
+	if err := json.Unmarshal(content, list); err != nil {
 		return err
 	}
 
-	defer func() {
-		if err != nil {
-			_ = NewISettingService().Update("AppStoreLastModified", strconv.Itoa(updateRes.AppStoreLastModified))
-		}
-	}()
-
 	var (
 		tags      []*model.Tag
 		appTags   []*model.AppTag
@@ -772,7 +681,7 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 	}
 	oldApps, err := appRepo.GetBy(appRepo.WithResource(constant.AppResourceRemote))
 	if err != nil {
-		return
+		return err
 	}
 	for _, old := range oldApps {
 		oldAppIds = append(oldAppIds, old.ID)
@@ -805,8 +714,8 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		for _, v := range versions {
 			version := v.Name
 			detail := detailsMap[version]
-			versionUrl := fmt.Sprintf("%s/%s/%s", baseRemoteUrl, app.Key, version)
-			dockerComposeUrl := fmt.Sprintf("%s/%s", versionUrl, "docker-compose.yml")
+
+			dockerComposeUrl := fmt.Sprintf("%s/%s/%s/%s", baseRemoteUrl, app.Key, version, "docker-compose.yml")
 			composeRes, err := http.Get(dockerComposeUrl)
 			if err != nil {
 				return err
@@ -819,10 +728,12 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 
 			paramByte, _ := json.Marshal(v.AppForm)
 			detail.Params = string(paramByte)
-			detail.DownloadUrl = fmt.Sprintf("%s/%s", versionUrl, app.Key+"-"+version+".tar.gz")
+			detail.DownloadUrl = v.DownloadUrl
 			detail.DownloadCallBackUrl = v.DownloadCallBackUrl
-			detail.Update = true
-			detail.LastModified = v.LastModified
+			if v.LastModified > detail.LastModified {
+				detail.Update = true
+				detail.LastModified = v.LastModified
+			}
 			detailsMap[version] = detail
 		}
 		var newDetails []model.AppDetail
@@ -861,32 +772,32 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 	tx, ctx := getTxAndContext()
 	defer tx.Rollback()
 	if len(addAppArray) > 0 {
-		if err = appRepo.BatchCreate(ctx, addAppArray); err != nil {
-			return
+		if err := appRepo.BatchCreate(ctx, addAppArray); err != nil {
+			return err
 		}
 	}
 	if len(deleteAppArray) > 0 {
-		if err = appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
-			return
+		if err := appRepo.BatchDelete(ctx, deleteAppArray); err != nil {
+			return err
 		}
-		if err = appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
-			return
+		if err := appDetailRepo.DeleteByAppIds(ctx, deleteIds); err != nil {
+			return err
 		}
 	}
-	if err = tagRepo.DeleteAll(ctx); err != nil {
-		return
+	if err := tagRepo.DeleteAll(ctx); err != nil {
+		return err
 	}
 	if len(tags) > 0 {
-		if err = tagRepo.BatchCreate(ctx, tags); err != nil {
-			return
+		if err := tagRepo.BatchCreate(ctx, tags); err != nil {
+			return err
 		}
 		for _, t := range tags {
 			tagMap[t.Key] = t.ID
 		}
 	}
 	for _, update := range updateAppArray {
-		if err = appRepo.Save(ctx, &update); err != nil {
-			return
+		if err := appRepo.Save(ctx, &update); err != nil {
+			return err
 		}
 	}
 	apps := append(addAppArray, updateAppArray...)
@@ -930,32 +841,35 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		}
 	}
 	if len(addDetails) > 0 {
-		if err = appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
-			return
+		if err := appDetailRepo.BatchCreate(ctx, addDetails); err != nil {
+			return err
 		}
 	}
 	if len(deleteDetails) > 0 {
-		if err = appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
-			return
+		if err := appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
+			return err
 		}
 	}
 	for _, u := range updateDetails {
-		if err = appDetailRepo.Update(ctx, u); err != nil {
-			return
+		if err := appDetailRepo.Update(ctx, u); err != nil {
+			return err
 		}
 	}
 
 	if len(oldAppIds) > 0 {
-		if err = appTagRepo.DeleteByAppIds(ctx, oldAppIds); err != nil {
-			return
+		if err := appTagRepo.DeleteByAppIds(ctx, oldAppIds); err != nil {
+			return err
 		}
 	}
 
 	if len(appTags) > 0 {
-		if err = appTagRepo.BatchCreate(ctx, appTags); err != nil {
-			return
+		if err := appTagRepo.BatchCreate(ctx, appTags); err != nil {
+			return err
 		}
 	}
 	tx.Commit()
-	return
+	if err := NewISettingService().Update("AppStoreLastModified", strconv.Itoa(list.LastModified)); err != nil {
+		return err
+	}
+	return nil
 }

backend/app/service/app_install.go

@@ -11,8 +11,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/1Panel-dev/1Panel/backend/i18n"
-
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
 	"gopkg.in/yaml.v3"
 
@@ -41,47 +39,27 @@ type AppInstallService struct {
 
 type IAppInstallService interface {
 	Page(req request.AppInstalledSearch) (int64, []response.AppInstalledDTO, error)
-	CheckExist(req request.AppInstalledInfo) (*response.AppInstalledCheck, error)
-	LoadPort(req dto.OperationWithNameAndType) (int64, error)
-	LoadConnInfo(req dto.OperationWithNameAndType) (response.DatabaseConn, error)
+	CheckExist(key string) (*response.AppInstalledCheck, error)
+	LoadPort(key string) (int64, error)
+	LoadConnInfo(key string) (response.DatabaseConn, error)
 	SearchForWebsite(req request.AppInstalledSearch) ([]response.AppInstalledDTO, error)
 	Operate(req request.AppInstalledOperate) error
 	Update(req request.AppInstalledUpdate) error
-	IgnoreUpgrade(req request.AppInstalledIgnoreUpgrade) error
 	SyncAll(systemInit bool) error
 	GetServices(key string) ([]response.AppService, error)
 	GetUpdateVersions(installId uint) ([]dto.AppVersion, error)
 	GetParams(id uint) (*response.AppConfig, error)
 	ChangeAppPort(req request.PortUpdate) error
-	GetDefaultConfigByKey(key, name string) (string, error)
+	GetDefaultConfigByKey(key string) (string, error)
 	DeleteCheck(installId uint) ([]dto.AppResource, error)
-
-	GetInstallList() ([]dto.AppInstallInfo, error)
 }
 
 func NewIAppInstalledService() IAppInstallService {
 	return &AppInstallService{}
 }
 
-func (a *AppInstallService) GetInstallList() ([]dto.AppInstallInfo, error) {
-	var datas []dto.AppInstallInfo
-	appInstalls, err := appInstallRepo.ListBy()
-	if err != nil {
-		return nil, err
-	}
-	for _, install := range appInstalls {
-		datas = append(datas, dto.AppInstallInfo{ID: install.ID, Key: install.App.Key, Name: install.Name})
-	}
-	return datas, nil
-}
-
 func (a *AppInstallService) Page(req request.AppInstalledSearch) (int64, []response.AppInstalledDTO, error) {
-	var (
-		opts     []repo.DBOption
-		total    int64
-		installs []model.AppInstall
-		err      error
-	)
+	var opts []repo.DBOption
 
 	if req.Name != "" {
 		opts = append(opts, commonRepo.WithLikeName(req.Name))
@@ -107,53 +85,36 @@ func (a *AppInstallService) Page(req request.AppInstalledSearch) (int64, []respo
 		opts = append(opts, appInstallRepo.WithAppIdsIn(appIds))
 	}
 
-	if req.Update {
-		installs, err = appInstallRepo.ListBy(opts...)
-		if err != nil {
-			return 0, nil, err
-		}
-	} else {
-		total, installs, err = appInstallRepo.Page(req.Page, req.PageSize, opts...)
-		if err != nil {
-			return 0, nil, err
-		}
+	total, installs, err := appInstallRepo.Page(req.Page, req.PageSize, opts...)
+	if err != nil {
+		return 0, nil, err
 	}
 
 	installDTOs, err := handleInstalled(installs, req.Update)
 	if err != nil {
 		return 0, nil, err
 	}
-	if req.Update {
-		total = int64(len(installDTOs))
-	}
 
 	return total, installDTOs, nil
 }
 
-func (a *AppInstallService) CheckExist(req request.AppInstalledInfo) (*response.AppInstalledCheck, error) {
+func (a *AppInstallService) CheckExist(key string) (*response.AppInstalledCheck, error) {
 	res := &response.AppInstalledCheck{
 		IsExist: false,
 	}
-
-	app, err := appRepo.GetFirst(appRepo.WithKey(req.Key))
+	app, err := appRepo.GetFirst(appRepo.WithKey(key))
 	if err != nil {
 		return res, nil
 	}
 	res.App = app.Name
-
-	var appInstall model.AppInstall
-	if len(req.Name) == 0 {
-		appInstall, _ = appInstallRepo.GetFirst(appInstallRepo.WithAppId(app.ID))
-	} else {
-		appInstall, _ = appInstallRepo.GetFirst(appInstallRepo.WithAppId(app.ID), commonRepo.WithByName(req.Name))
-	}
-
+	appInstall, _ := appInstallRepo.GetFirst(appInstallRepo.WithAppId(app.ID))
 	if reflect.DeepEqual(appInstall, model.AppInstall{}) {
 		return res, nil
 	}
-	if err = syncByID(appInstall.ID); err != nil {
+	if err := syncById(appInstall.ID); err != nil {
 		return nil, err
 	}
+	appInstall, _ = appInstallRepo.GetFirst(commonRepo.WithByID(appInstall.ID))
 
 	res.ContainerName = appInstall.ContainerName
 	res.Name = appInstall.Name
@@ -162,24 +123,22 @@ func (a *AppInstallService) CheckExist(req request.AppInstalledInfo) (*response.
 	res.Status = appInstall.Status
 	res.AppInstallID = appInstall.ID
 	res.IsExist = true
-	res.InstallPath = path.Join(constant.AppInstallDir, appInstall.App.Key, appInstall.Name)
-	res.HttpPort = appInstall.HttpPort
-	res.HttpsPort = appInstall.HttpsPort
+	res.InstallPath = path.Join(constant.AppInstallDir, app.Key, appInstall.Name)
 
 	return res, nil
 }
 
-func (a *AppInstallService) LoadPort(req dto.OperationWithNameAndType) (int64, error) {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+func (a *AppInstallService) LoadPort(key string) (int64, error) {
+	app, err := appInstallRepo.LoadBaseInfo(key, "")
 	if err != nil {
 		return int64(0), nil
 	}
 	return app.Port, nil
 }
 
-func (a *AppInstallService) LoadConnInfo(req dto.OperationWithNameAndType) (response.DatabaseConn, error) {
+func (a *AppInstallService) LoadConnInfo(key string) (response.DatabaseConn, error) {
 	var data response.DatabaseConn
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+	app, err := appInstallRepo.LoadBaseInfo(key, "")
 	if err != nil {
 		return data, nil
 	}
@@ -239,28 +198,28 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
 		if err != nil {
 			return handleErr(install, err, out)
 		}
-		return syncByID(install.ID)
+		return syncById(install.ID)
 	case constant.Stop:
 		out, err := compose.Stop(dockerComposePath)
 		if err != nil {
 			return handleErr(install, err, out)
 		}
-		return syncByID(install.ID)
+		return syncById(install.ID)
 	case constant.Restart:
 		out, err := compose.Restart(dockerComposePath)
 		if err != nil {
 			return handleErr(install, err, out)
 		}
-		return syncByID(install.ID)
+		return syncById(install.ID)
 	case constant.Delete:
 		if err := deleteAppInstall(install, req.DeleteBackup, req.ForceDelete, req.DeleteDB); err != nil && !req.ForceDelete {
 			return err
 		}
 		return nil
 	case constant.Sync:
-		return syncByID(install.ID)
+		return syncById(install.ID)
 	case constant.Upgrade:
-		return upgradeInstall(install.ID, req.DetailId, req.Backup)
+		return upgradeInstall(install.ID, req.DetailId)
 	default:
 		return errors.New("operate not support")
 	}
@@ -393,15 +352,6 @@ func (a *AppInstallService) Update(req request.AppInstalledUpdate) error {
 	return nil
 }
 
-func (a *AppInstallService) IgnoreUpgrade(req request.AppInstalledIgnoreUpgrade) error {
-	appDetail, err := appDetailRepo.GetFirst(commonRepo.WithByID(req.DetailID))
-	if err != nil {
-		return err
-	}
-	appDetail.IgnoreUpgrade = req.Operate == "ignore"
-	return appDetailRepo.Update(context.Background(), appDetail)
-}
-
 func (a *AppInstallService) SyncAll(systemInit bool) error {
 	allList, err := appInstallRepo.ListBy()
 	if err != nil {
@@ -416,60 +366,33 @@ func (a *AppInstallService) SyncAll(systemInit bool) error {
 			}
 			continue
 		}
-		if !systemInit {
-			if err := syncByID(i.ID); err != nil {
-				global.LOG.Errorf("sync install app[%s] error,mgs: %s", i.Name, err.Error())
-			}
+		if err := syncById(i.ID); err != nil {
+			global.LOG.Errorf("sync install app[%s] error,mgs: %s", i.Name, err.Error())
 		}
 	}
 	return nil
 }
 
 func (a *AppInstallService) GetServices(key string) ([]response.AppService, error) {
+	app, err := appRepo.GetFirst(appRepo.WithKey(key))
+	if err != nil {
+		return nil, err
+	}
+	installs, err := appInstallRepo.ListBy(appInstallRepo.WithAppId(app.ID), appInstallRepo.WithStatus(constant.Running))
+	if err != nil {
+		return nil, err
+	}
 	var res []response.AppService
-	if DatabaseKeys[key] > 0 {
-		dbs, _ := databaseRepo.GetList(databaseRepo.WithByFrom("local"), commonRepo.WithByType(key))
-		if len(dbs) == 0 {
-			return res, nil
-		}
-		for _, db := range dbs {
-			service := response.AppService{
-				Label: db.Name,
-				Value: db.Name,
-			}
-			if db.AppInstallID > 0 {
-				install, err := appInstallRepo.GetFirst(commonRepo.WithByID(db.AppInstallID))
-				if err != nil {
-					return nil, err
-				}
-				paramMap := make(map[string]string)
-				if install.Param != "" {
-					_ = json.Unmarshal([]byte(install.Param), &paramMap)
-				}
-				service.Config = paramMap
-			}
-			res = append(res, service)
-		}
-	} else {
-		app, err := appRepo.GetFirst(appRepo.WithKey(key))
-		if err != nil {
-			return nil, err
-		}
-		installs, err := appInstallRepo.ListBy(appInstallRepo.WithAppId(app.ID), appInstallRepo.WithStatus(constant.Running))
-		if err != nil {
-			return nil, err
-		}
-		for _, install := range installs {
-			paramMap := make(map[string]string)
-			if install.Param != "" {
-				_ = json.Unmarshal([]byte(install.Param), &paramMap)
-			}
-			res = append(res, response.AppService{
-				Label:  install.Name,
-				Value:  install.ServiceName,
-				Config: paramMap,
-			})
+	for _, install := range installs {
+		paramMap := make(map[string]string)
+		if install.Param != "" {
+			_ = json.Unmarshal([]byte(install.Param), &paramMap)
 		}
+		res = append(res, response.AppService{
+			Label:  install.Name,
+			Value:  install.ServiceName,
+			Config: paramMap,
+		})
 	}
 	return res, nil
 }
@@ -489,9 +412,6 @@ func (a *AppInstallService) GetUpdateVersions(installId uint) ([]dto.AppVersion,
 		return versions, err
 	}
 	for _, detail := range details {
-		if detail.IgnoreUpgrade {
-			continue
-		}
 		if common.IsCrossVersion(install.Version, detail.Version) && !app.CrossVersionUpdate {
 			continue
 		}
@@ -572,22 +492,22 @@ func (a *AppInstallService) DeleteCheck(installId uint) ([]dto.AppResource, erro
 	return res, nil
 }
 
-func (a *AppInstallService) GetDefaultConfigByKey(key, name string) (string, error) {
-	baseInfo, err := appInstallRepo.LoadBaseInfo(key, name)
+func (a *AppInstallService) GetDefaultConfigByKey(key string) (string, error) {
+	appInstall, err := getAppInstallByKey(key)
 	if err != nil {
 		return "", err
 	}
 
 	fileOp := files.NewFileOp()
-	filePath := path.Join(constant.AppResourceDir, "remote", baseInfo.Key, baseInfo.Version, "conf")
+	filePath := path.Join(constant.AppResourceDir, "remote", appInstall.App.Key, appInstall.Version, "conf")
 	if !fileOp.Stat(filePath) {
-		filePath = path.Join(constant.AppResourceDir, baseInfo.Key, "versions", baseInfo.Version, "conf")
+		filePath = path.Join(constant.AppResourceDir, appInstall.App.Key, "versions", appInstall.Version, "conf")
 	}
 	if !fileOp.Stat(filePath) {
 		return "", buserr.New(constant.ErrPathNotFound)
 	}
 
-	if key == constant.AppMysql || key == constant.AppMariaDB {
+	if key == constant.AppMysql {
 		filePath = path.Join(filePath, "my.cnf")
 	}
 	if key == constant.AppRedis {
@@ -618,10 +538,10 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err = json.Unmarshal([]byte(detail.Params), &appForm); err != nil {
+	if err := json.Unmarshal([]byte(detail.Params), &appForm); err != nil {
 		return nil, err
 	}
-	if err = json.Unmarshal([]byte(install.Env), &envs); err != nil {
+	if err := json.Unmarshal([]byte(install.Env), &envs); err != nil {
 		return nil, err
 	}
 	for _, form := range appForm.FormFields {
@@ -651,42 +571,30 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 				appParam.Values = form.Values
 			}
 			params = append(params, appParam)
-		} else {
-			params = append(params, response.AppParam{
-				Edit:    form.Edit,
-				Key:     form.EnvKey,
-				Rule:    form.Rule,
-				Type:    form.Type,
-				LabelZh: form.LabelZh,
-				LabelEn: form.LabelEn,
-				Value:   form.Default,
-				Values:  form.Values,
-			})
 		}
 	}
 
 	config := getAppCommonConfig(envs)
 	config.DockerCompose = install.DockerCompose
 	res.Params = params
-	if config.ContainerName == "" {
-		config.ContainerName = install.ContainerName
-	}
 	res.AppContainerConfig = config
 	return &res, nil
 }
 
-func syncByID(installID uint) error {
-	appInstall, err := appInstallRepo.GetFirst(commonRepo.WithByID(installID))
+func syncById(installId uint) error {
+	appInstall, err := appInstallRepo.GetFirst(commonRepo.WithByID(installId))
 	if err != nil {
 		return err
 	}
 	if appInstall.Status == constant.Installing {
 		return nil
 	}
+
 	containerNames, err := getContainerNames(appInstall)
 	if err != nil {
 		return err
 	}
+
 	cli, err := docker.NewClient()
 	if err != nil {
 		return err
@@ -712,16 +620,16 @@ func syncByID(installID uint) error {
 			errorContainers = append(errorContainers, n.Names[0])
 		}
 	}
-	for _, name := range containerNames {
+	for _, old := range containerNames {
 		exist := false
-		for _, container := range containers {
-			if common.ExistWithStrArray(name, container.Names) {
+		for _, new := range containers {
+			if common.ExistWithStrArray(old, new.Names) {
 				exist = true
 				break
 			}
 		}
 		if !exist {
-			notFoundContainers = append(notFoundContainers, name)
+			notFoundContainers = append(notFoundContainers, old)
 		}
 	}
 
@@ -734,10 +642,10 @@ func syncByID(installID uint) error {
 
 	if containerCount == 0 {
 		appInstall.Status = constant.Error
-		appInstall.Message = i18n.GetMsgWithMap("ErrContainerNotFound", map[string]interface{}{"name": strings.Join(containerNames, ",")})
+		appInstall.Message = "container is not found"
 		return appInstallRepo.Save(context.Background(), &appInstall)
 	}
-	if errCount == 0 && existedCount == 0 && notFoundCount == 0 {
+	if errCount == 0 && existedCount == 0 {
 		appInstall.Status = constant.Running
 		return appInstallRepo.Save(context.Background(), &appInstall)
 	}
@@ -752,14 +660,22 @@ func syncByID(installID uint) error {
 		appInstall.Status = constant.UnHealthy
 	}
 
-	var errMsg string
+	var errMsg strings.Builder
 	if errCount > 0 {
-		errMsg += i18n.GetMsgWithMap("ErrContainerMsg", map[string]interface{}{"name": strings.Join(errorContainers, ",")})
+		errMsg.Write([]byte(string(rune(errCount)) + " error containers:"))
+		for _, e := range errorContainers {
+			errMsg.Write([]byte(e))
+		}
+		errMsg.Write([]byte("\n"))
 	}
 	if notFoundCount > 0 {
-		errMsg += i18n.GetMsgWithMap("ErrContainerNotFound", map[string]interface{}{"name": strings.Join(notFoundContainers, ",")})
+		errMsg.Write([]byte(string(rune(notFoundCount)) + " not found containers:"))
+		for _, e := range notFoundContainers {
+			errMsg.Write([]byte(e))
+		}
+		errMsg.Write([]byte("\n"))
 	}
-	appInstall.Message = errMsg
+	appInstall.Message = errMsg.String()
 	return appInstallRepo.Save(context.Background(), &appInstall)
 }
 
@@ -780,11 +696,7 @@ func updateInstallInfoInDB(appKey, appName, param string, isRestart bool, value
 	envKey := ""
 	switch param {
 	case "password":
-		if appKey == "mysql" || appKey == "mariadb" {
-			envKey = "PANEL_DB_ROOT_PASSWORD="
-		} else {
-			envKey = "PANEL_REDIS_ROOT_PASSWORD="
-		}
+		envKey = "PANEL_DB_ROOT_PASSWORD="
 	case "port":
 		envKey = "PANEL_APP_PORT_HTTP="
 	case "user-password":
@@ -813,10 +725,6 @@ func updateInstallInfoInDB(appKey, appName, param string, isRestart bool, value
 	if param == "password" {
 		oldVal = fmt.Sprintf("\"PANEL_DB_ROOT_PASSWORD\":\"%v\"", appInstall.Password)
 		newVal = fmt.Sprintf("\"PANEL_DB_ROOT_PASSWORD\":\"%v\"", value)
-		if appKey == "redis" {
-			oldVal = fmt.Sprintf("\"PANEL_REDIS_ROOT_PASSWORD\":\"%v\"", appInstall.Password)
-			newVal = fmt.Sprintf("\"PANEL_REDIS_ROOT_PASSWORD\":\"%v\"", value)
-		}
 		_ = appInstallRepo.BatchUpdateBy(map[string]interface{}{
 			"param": strings.ReplaceAll(appInstall.Param, oldVal, newVal),
 			"env":   strings.ReplaceAll(appInstall.Env, oldVal, newVal),

backend/app/service/app_utils.go

@@ -5,6 +5,12 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
+	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
+	"github.com/1Panel-dev/1Panel/backend/i18n"
+	"github.com/compose-spec/compose-go/types"
+	"github.com/subosito/gotenv"
+	"gopkg.in/yaml.v3"
 	"math"
 	"net/http"
 	"os"
@@ -15,14 +21,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
-
-	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/i18n"
-	"github.com/subosito/gotenv"
-	"gopkg.in/yaml.v3"
-
 	"github.com/1Panel-dev/1Panel/backend/app/repo"
 	"github.com/1Panel-dev/1Panel/backend/utils/env"
 
@@ -51,20 +49,7 @@ var (
 func checkPort(key string, params map[string]interface{}) (int, error) {
 	port, ok := params[key]
 	if ok {
-		portN := 0
-		var err error
-		switch p := port.(type) {
-		case string:
-			portN, err = strconv.Atoi(p)
-			if err != nil {
-				return portN, nil
-			}
-		case float64:
-			portN = int(math.Ceil(p))
-		case int:
-			portN = p
-		}
-
+		portN := int(math.Ceil(port.(float64)))
 		oldInstalled, _ := appInstallRepo.ListBy(appInstallRepo.WithPort(portN))
 		if len(oldInstalled) > 0 {
 			var apps []string
@@ -82,84 +67,23 @@ func checkPort(key string, params map[string]interface{}) (int, error) {
 	return 0, nil
 }
 
-var DatabaseKeys = map[string]uint{
-	"mysql":      3306,
-	"mariadb":    3306,
-	"postgresql": 5432,
-	"mongodb":    27017,
-	"redis":      6379,
-	"memcached":  11211,
-}
-
 func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall, params map[string]interface{}) error {
 	var dbConfig dto.AppDatabase
-	if app.Type == "runtime" && DatabaseKeys[app.Key] > 0 {
-		database := &model.Database{
-			AppInstallID: appInstall.ID,
-			Name:         appInstall.Name,
-			Type:         app.Key,
-			Version:      appInstall.Version,
-			From:         "local",
-			Address:      appInstall.ServiceName,
-			Port:         DatabaseKeys[app.Key],
-		}
-		detail, err := appDetailRepo.GetFirst(commonRepo.WithByID(appInstall.AppDetailId))
+	if app.Type == "runtime" {
+		var authParam dto.AuthParam
+		paramByte, err := json.Marshal(params)
 		if err != nil {
 			return err
 		}
-
-		formFields := &dto.AppForm{}
-		if err := json.Unmarshal([]byte(detail.Params), formFields); err != nil {
+		if err := json.Unmarshal(paramByte, &authParam); err != nil {
 			return err
 		}
-		for _, form := range formFields.FormFields {
-			if form.EnvKey == "PANEL_APP_PORT_HTTP" {
-				portFloat, ok := form.Default.(float64)
-				if ok {
-					database.Port = uint(int(portFloat))
-				}
-				break
+		if authParam.RootPassword != "" {
+			authByte, err := json.Marshal(authParam)
+			if err != nil {
+				return err
 			}
-		}
-
-		switch app.Key {
-		case "mysql", "mariadb", "postgresql", "mongodb":
-			if password, ok := params["PANEL_DB_ROOT_PASSWORD"]; ok {
-				if password != "" {
-					authParam := dto.AuthParam{
-						RootPassword: password.(string),
-					}
-					authByte, err := json.Marshal(authParam)
-					if err != nil {
-						return err
-					}
-					appInstall.Param = string(authByte)
-					database.Password = password.(string)
-					if app.Key == "mysql" || app.Key == "mariadb" {
-						database.Username = "root"
-					}
-					if rootUser, ok := params["PANEL_DB_ROOT_USER"]; ok {
-						database.Username = rootUser.(string)
-					}
-				}
-			}
-		case "redis":
-			if password, ok := params["PANEL_REDIS_ROOT_PASSWORD"]; ok {
-				if password != "" {
-					authParam := dto.RedisAuthParam{
-						RootPassword: password.(string),
-					}
-					authByte, err := json.Marshal(authParam)
-					if err != nil {
-						return err
-					}
-					appInstall.Param = string(authByte)
-				}
-				database.Password = password.(string)
-			}
-		}
-		if err := databaseRepo.Create(ctx, database); err != nil {
-			return err
+			appInstall.Param = string(authByte)
 		}
 	}
 	if app.Type == "website" || app.Type == "tool" {
@@ -167,7 +91,7 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 		if err != nil {
 			return err
 		}
-		if err = json.Unmarshal(paramByte, &dbConfig); err != nil {
+		if err := json.Unmarshal(paramByte, &dbConfig); err != nil {
 			return err
 		}
 	}
@@ -180,7 +104,7 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 		var resourceId uint
 		if dbConfig.DbName != "" && dbConfig.DbUser != "" && dbConfig.Password != "" {
 			iMysqlRepo := repo.NewIMysqlRepo()
-			oldMysqlDb, _ := iMysqlRepo.Get(commonRepo.WithByName(dbConfig.DbName), iMysqlRepo.WithByFrom(constant.ResourceLocal))
+			oldMysqlDb, _ := iMysqlRepo.Get(commonRepo.WithByName(dbConfig.DbName))
 			resourceId = oldMysqlDb.ID
 			if oldMysqlDb.ID > 0 {
 				if oldMysqlDb.Username != dbConfig.DbUser || oldMysqlDb.Password != dbConfig.Password {
@@ -190,11 +114,9 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 				var createMysql dto.MysqlDBCreate
 				createMysql.Name = dbConfig.DbName
 				createMysql.Username = dbConfig.DbUser
-				createMysql.Database = dbInstall.Name
 				createMysql.Format = "utf8mb4"
 				createMysql.Permission = "%"
 				createMysql.Password = dbConfig.Password
-				createMysql.From = "local"
 				mysqldb, err := NewIMysqlService().Create(ctx, createMysql)
 				if err != nil {
 					return err
@@ -224,7 +146,7 @@ func handleAppInstallErr(ctx context.Context, install *model.AppInstall) error {
 			return err
 		}
 	}
-	if err := deleteLink(ctx, install, true, true, true); err != nil {
+	if err := deleteLink(ctx, install, true, true); err != nil {
 		return err
 	}
 	return nil
@@ -239,40 +161,27 @@ func deleteAppInstall(install model.AppInstall, deleteBackup bool, forceDelete b
 		if err != nil && !forceDelete {
 			return handleErr(install, err, out)
 		}
-		if err = runScript(&install, "uninstall"); err != nil {
-			_, _ = compose.Up(install.GetComposePath())
-			return err
-		}
 	}
 	tx, ctx := helper.GetTxAndContext()
 	defer tx.Rollback()
 	if err := appInstallRepo.Delete(ctx, install); err != nil {
 		return err
 	}
-	if err := deleteLink(ctx, &install, deleteDB, forceDelete, deleteBackup); err != nil && !forceDelete {
+	if err := deleteLink(ctx, &install, deleteDB, forceDelete); err != nil && !forceDelete {
 		return err
 	}
-
-	if DatabaseKeys[install.App.Key] > 0 {
-		_ = databaseRepo.Delete(ctx, databaseRepo.WithAppInstallID(install.ID))
-	}
-
-	switch install.App.Key {
-	case constant.AppOpenresty:
-		_ = websiteRepo.DeleteAll(ctx)
-		_ = websiteDomainRepo.DeleteAll(ctx)
-	case constant.AppMysql, constant.AppMariaDB:
-		_ = mysqlRepo.Delete(ctx, mysqlRepo.WithByMysqlName(install.Name))
-	}
-
 	_ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType("app"), commonRepo.WithByName(install.App.Key), backupRepo.WithByDetailName(install.Name))
-	uploadDir := path.Join(global.CONF.System.BaseDir, fmt.Sprintf("1panel/uploads/app/%s/%s", install.App.Key, install.Name))
+	_ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType(install.App.Key))
+	if install.App.Key == constant.AppMysql {
+		_ = mysqlRepo.DeleteAll(ctx)
+	}
+	uploadDir := fmt.Sprintf("%s/1panel/uploads/app/%s/%s", global.CONF.System.BaseDir, install.App.Key, install.Name)
 	if _, err := os.Stat(uploadDir); err == nil {
 		_ = os.RemoveAll(uploadDir)
 	}
 	if deleteBackup {
 		localDir, _ := loadLocalDir()
-		backupDir := path.Join(localDir, fmt.Sprintf("app/%s/%s", install.App.Key, install.Name))
+		backupDir := fmt.Sprintf("%s/app/%s/%s", localDir, install.App.Key, install.Name)
 		if _, err := os.Stat(backupDir); err == nil {
 			_ = os.RemoveAll(backupDir)
 		}
@@ -283,25 +192,21 @@ func deleteAppInstall(install model.AppInstall, deleteBackup bool, forceDelete b
 	return nil
 }
 
-func deleteLink(ctx context.Context, install *model.AppInstall, deleteDB bool, forceDelete bool, deleteBackup bool) error {
-
+func deleteLink(ctx context.Context, install *model.AppInstall, deleteDB bool, forceDelete bool) error {
 	resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
 	if len(resources) == 0 {
 		return nil
 	}
 	for _, re := range resources {
 		mysqlService := NewIMysqlService()
-		if (re.Key == constant.AppMysql || re.Key == constant.AppMariaDB) && deleteDB {
+		if re.Key == "mysql" && deleteDB {
 			database, _ := mysqlRepo.Get(commonRepo.WithByID(re.ResourceId))
 			if reflect.DeepEqual(database, model.DatabaseMysql{}) {
 				continue
 			}
 			if err := mysqlService.Delete(ctx, dto.MysqlDBDelete{
-				ID:           database.ID,
-				ForceDelete:  forceDelete,
-				DeleteBackup: deleteBackup,
-				Type:         re.Key,
-				Database:     database.MysqlName,
+				ID:          database.ID,
+				ForceDelete: forceDelete,
 			}); err != nil && !forceDelete {
 				return err
 			}
@@ -310,7 +215,7 @@ func deleteLink(ctx context.Context, install *model.AppInstall, deleteDB bool, f
 	return appInstallResourceRepo.DeleteBy(ctx, appInstallResourceRepo.WithAppInstallId(install.ID))
 }
 
-func upgradeInstall(installId uint, detailId uint, backup bool) error {
+func upgradeInstall(installId uint, detailId uint) error {
 	install, err := appInstallRepo.GetFirst(commonRepo.WithByID(installId))
 	if err != nil {
 		return err
@@ -322,14 +227,13 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 	if install.Version == detail.Version {
 		return errors.New("two version is same")
 	}
+	if err := NewIBackupService().AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name}); err != nil {
+		return err
+	}
+
 	install.Status = constant.Upgrading
 
 	go func() {
-		if backup {
-			if err = NewIBackupService().AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name}); err != nil {
-				global.LOG.Errorf(i18n.GetMsgWithMap("ErrAppBackup", map[string]interface{}{"name": install.Name, "err": err.Error()}))
-			}
-		}
 		var upErr error
 		defer func() {
 			if upErr != nil {
@@ -352,19 +256,15 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 			detailDir = path.Join(constant.ResourceDir, "apps", "local", strings.TrimPrefix(install.App.Key, "local"), detail.Version)
 		}
 
-		command := exec.Command("/bin/bash", "-c", fmt.Sprintf("cp -rn %s/* %s || true", detailDir, install.GetPath()))
-		stdout, _ := command.CombinedOutput()
-		if stdout != nil {
-			global.LOG.Infof("upgrade app [%s] [%s] cp file log : %s ", install.App.Key, install.Name, string(stdout))
-		}
-		fileOp := files.NewFileOp()
-		sourceScripts := path.Join(detailDir, "scripts")
-		if fileOp.Stat(sourceScripts) {
-			dstScripts := path.Join(install.GetPath(), "scripts")
-			_ = fileOp.DeleteDir(dstScripts)
-			_ = fileOp.CreateDir(dstScripts, 0755)
-			scriptCmd := exec.Command("cp", "-rf", sourceScripts+"/.", dstScripts+"/")
-			_, _ = scriptCmd.CombinedOutput()
+		cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("cp -rf %s/* %s", detailDir, install.GetPath()))
+		stdout, err := cmd.CombinedOutput()
+		if err != nil {
+			if stdout != nil {
+				upErr = errors.New(string(stdout))
+				return
+			}
+			upErr = err
+			return
 		}
 
 		composeMap := make(map[string]interface{})
@@ -377,21 +277,20 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 			return
 		}
 		servicesMap := value.(map[string]interface{})
-		if len(servicesMap) == 1 {
-			index := 0
-			oldServiceName := ""
-			for k := range servicesMap {
-				oldServiceName = k
-				index++
-				if index > 0 {
-					break
-				}
-			}
-			servicesMap[install.ServiceName] = servicesMap[oldServiceName]
-			if install.ServiceName != oldServiceName {
-				delete(servicesMap, oldServiceName)
+		index := 0
+		oldServiceName := ""
+		for k := range servicesMap {
+			oldServiceName = k
+			index++
+			if index > 0 {
+				break
 			}
 		}
+		servicesMap[install.ServiceName] = servicesMap[oldServiceName]
+		if install.ServiceName != oldServiceName {
+			delete(servicesMap, oldServiceName)
+		}
+
 		envs := make(map[string]interface{})
 		if upErr = json.Unmarshal([]byte(install.Env), &envs); upErr != nil {
 			return
@@ -419,24 +318,6 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 		install.Version = detail.Version
 		install.AppDetailId = detailId
 
-		images, err := getImages(install)
-		if err != nil {
-			upErr = err
-			return
-		}
-		dockerCli, err := composeV2.NewClient()
-		if err != nil {
-			upErr = err
-			return
-		}
-
-		for _, image := range images {
-			if err = dockerCli.PullImage(image, true); err != nil {
-				upErr = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
-				return
-			}
-		}
-
 		if out, err := compose.Down(install.GetComposePath()); err != nil {
 			if out != "" {
 				upErr = errors.New(out)
@@ -444,16 +325,12 @@ func upgradeInstall(installId uint, detailId uint, backup bool) error {
 			}
 			return
 		}
+		fileOp := files.NewFileOp()
 		envParams := make(map[string]string, len(envs))
 		handleMap(envs, envParams)
 		if err = env.Write(envParams, install.GetEnvPath()); err != nil {
 			return
 		}
-
-		if err = runScript(&install, "upgrade"); err != nil {
-			return
-		}
-
 		if upErr = fileOp.WriteFile(install.GetComposePath(), strings.NewReader(install.DockerCompose), 0775); upErr != nil {
 			return
 		}
@@ -482,6 +359,7 @@ func getContainerNames(install model.AppInstall) ([]string, error) {
 		return nil, err
 	}
 	containerMap := make(map[string]struct{})
+	containerMap[install.ContainerName] = struct{}{}
 	for _, service := range project.AllServices() {
 		if service.ContainerName == "${CONTAINER_NAME}" || service.ContainerName == "" {
 			continue
@@ -492,32 +370,9 @@ func getContainerNames(install model.AppInstall) ([]string, error) {
 	for k := range containerMap {
 		containerNames = append(containerNames, k)
 	}
-	if len(containerNames) == 0 {
-		containerNames = append(containerNames, install.ContainerName)
-	}
 	return containerNames, nil
 }
 
-func getImages(install model.AppInstall) ([]string, error) {
-	envStr, err := coverEnvJsonToStr(install.Env)
-	if err != nil {
-		return nil, err
-	}
-	project, err := composeV2.GetComposeProject(install.Name, install.GetPath(), []byte(install.DockerCompose), []byte(envStr), true)
-	if err != nil {
-		return nil, err
-	}
-	imagesMap := make(map[string]struct{})
-	for _, service := range project.AllServices() {
-		imagesMap[service.Image] = struct{}{}
-	}
-	var images []string
-	for k := range imagesMap {
-		images = append(images, k)
-	}
-	return images, nil
-}
-
 func coverEnvJsonToStr(envJson string) (string, error) {
 	envMap := make(map[string]interface{})
 	_ = json.Unmarshal([]byte(envJson), &envMap)
@@ -557,8 +412,6 @@ func handleMap(params map[string]interface{}, envParams map[string]string) {
 			envParams[k] = t
 		case float64:
 			envParams[k] = strconv.FormatFloat(t, 'f', -1, 32)
-		case uint:
-			envParams[k] = strconv.Itoa(int(t))
 		default:
 			envParams[k] = t.(string)
 		}
@@ -580,7 +433,7 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 		_ = fileOp.CreateDir(appVersionDir, 0755)
 	}
 	global.LOG.Infof("download app[%s] from %s", app.Name, appDetail.DownloadUrl)
-	filePath := path.Join(appVersionDir, app.Key+"-"+appDetail.Version+".tar.gz")
+	filePath := path.Join(appVersionDir, appDetail.Version+".tar.gz")
 
 	defer func() {
 		if err != nil {
@@ -595,7 +448,7 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
 		global.LOG.Errorf("download app[%s] error %v", app.Name, err)
 		return
 	}
-	if err = fileOp.Decompress(filePath, appResourceDir, files.TarGz); err != nil {
+	if err = fileOp.Decompress(filePath, appVersionDir, files.TarGz); err != nil {
 		global.LOG.Errorf("decompress app[%s] error %v", app.Name, err)
 		return
 	}
@@ -658,32 +511,38 @@ func copyData(app model.App, appDetail model.AppDetail, appInstall *model.AppIns
 	return
 }
 
-func runScript(appInstall *model.AppInstall, operate string) error {
-	workDir := appInstall.GetPath()
-	scriptPath := ""
-	switch operate {
-	case "init":
-		scriptPath = path.Join(workDir, "scripts", "init.sh")
-	case "upgrade":
-		scriptPath = path.Join(workDir, "scripts", "upgrade.sh")
-	case "uninstall":
-		scriptPath = path.Join(workDir, "scripts", "uninstall.sh")
-	}
-	if !files.NewFileOp().Stat(scriptPath) {
-		return nil
-	}
-	out, err := cmd.ExecScript(scriptPath, workDir)
-	if err != nil {
-		if out != "" {
-			errMsg := fmt.Sprintf("run script %s error %s", scriptPath, out)
-			global.LOG.Error(errMsg)
-			return errors.New(errMsg)
+// 处理文件夹权限等问题
+func upAppPre(app model.App, appInstall *model.AppInstall) error {
+	if app.Key == "nexus" {
+		dataPath := path.Join(appInstall.GetPath(), "data")
+		if err := files.NewFileOp().Chown(dataPath, 200, 0); err != nil {
+			return err
 		}
-		return err
 	}
 	return nil
 }
 
+func getServiceFromInstall(appInstall *model.AppInstall) (service *composeV2.ComposeService, err error) {
+	var (
+		project *types.Project
+		envStr  string
+	)
+	envStr, err = coverEnvJsonToStr(appInstall.Env)
+	if err != nil {
+		return
+	}
+	project, err = composeV2.GetComposeProject(appInstall.Name, appInstall.GetPath(), []byte(appInstall.DockerCompose), []byte(envStr), true)
+	if err != nil {
+		return
+	}
+	service, err = composeV2.NewComposeService()
+	if err != nil {
+		return
+	}
+	service.SetProject(project)
+	return
+}
+
 func checkContainerNameIsExist(containerName, appDir string) (bool, error) {
 	client, err := composeV2.NewDockerClient()
 	if err != nil {
@@ -712,30 +571,13 @@ func checkContainerNameIsExist(containerName, appDir string) (bool, error) {
 func upApp(appInstall *model.AppInstall) {
 	upProject := func(appInstall *model.AppInstall) (err error) {
 		if err == nil {
-			var (
-				out    string
-				errMsg string
-			)
-			if appInstall.App.Type != "php" {
-				out, err = compose.Pull(appInstall.GetComposePath())
-				if err != nil {
-					if out != "" {
-						if strings.Contains(out, "no such host") {
-							errMsg = i18n.GetMsgByKey("ErrNoSuchHost") + ":"
-						}
-						if strings.Contains(out, "timeout") {
-							errMsg = i18n.GetMsgByKey("ErrImagePullTimeOut") + ":"
-						}
-						appInstall.Message = errMsg + out
-					}
-					return err
-				}
+			var composeService *composeV2.ComposeService
+			composeService, err = getServiceFromInstall(appInstall)
+			if err != nil {
+				return err
 			}
-			out, err = compose.Up(appInstall.GetComposePath())
+			err = composeService.ComposeUp()
 			if err != nil {
-				if out != "" {
-					appInstall.Message = errMsg + out
-				}
 				return err
 			}
 			return
@@ -745,6 +587,7 @@ func upApp(appInstall *model.AppInstall) {
 	}
 	if err := upProject(appInstall); err != nil {
 		appInstall.Status = constant.Error
+		appInstall.Message = err.Error()
 	} else {
 		appInstall.Status = constant.Running
 	}
@@ -755,24 +598,16 @@ func upApp(appInstall *model.AppInstall) {
 }
 
 func rebuildApp(appInstall model.AppInstall) error {
-	appInstall.Status = constant.Rebuilding
-	_ = appInstallRepo.Save(context.Background(), &appInstall)
-	go func() {
-		dockerComposePath := appInstall.GetComposePath()
-		out, err := compose.Down(dockerComposePath)
-		if err != nil {
-			_ = handleErr(appInstall, err, out)
-			return
-		}
-		out, err = compose.Up(dockerComposePath)
-		if err != nil {
-			_ = handleErr(appInstall, err, out)
-			return
-		}
-		appInstall.Status = constant.Running
-		_ = appInstallRepo.Save(context.Background(), &appInstall)
-	}()
-	return nil
+	dockerComposePath := appInstall.GetComposePath()
+	out, err := compose.Down(dockerComposePath)
+	if err != nil {
+		return handleErr(appInstall, err, out)
+	}
+	out, err = compose.Up(dockerComposePath)
+	if err != nil {
+		return handleErr(appInstall, err, out)
+	}
+	return syncById(appInstall.ID)
 }
 
 func getAppDetails(details []model.AppDetail, versions []dto.AppConfigVersion) map[string]model.AppDetail {
@@ -916,7 +751,7 @@ func handleErr(install model.AppInstall, err error, out string) error {
 func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]response.AppInstalledDTO, error) {
 	var res []response.AppInstalledDTO
 	for _, installed := range appInstallList {
-		if updated && (installed.App.Type == "php" || installed.Status == constant.Installing || (installed.App.Key == constant.AppMysql && installed.Version == "5.6.51")) {
+		if updated && installed.App.Type == "php" {
 			continue
 		}
 		installDTO := response.AppInstalledDTO{
@@ -933,22 +768,12 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]respons
 		}
 		var versions []string
 		for _, detail := range details {
-			if detail.IgnoreUpgrade {
-				continue
-			}
 			if common.IsCrossVersion(installed.Version, detail.Version) && !app.CrossVersionUpdate {
 				continue
 			}
 			versions = append(versions, detail.Version)
 		}
 		versions = common.GetSortedVersions(versions)
-		if len(versions) == 0 {
-			if !updated {
-				installDTO.CanUpdate = false
-				res = append(res, installDTO)
-			}
-			continue
-		}
 		lastVersion := versions[0]
 		if common.IsCrossVersion(installed.Version, lastVersion) {
 			installDTO.CanUpdate = app.CrossVersionUpdate
@@ -978,16 +803,6 @@ func getAppInstallByKey(key string) (model.AppInstall, error) {
 	return appInstall, nil
 }
 
-func getAppInstallPort(key string) (httpPort, httpsPort int, err error) {
-	install, err := getAppInstallByKey(key)
-	if err != nil {
-		return
-	}
-	httpPort = install.HttpPort
-	httpsPort = install.HttpsPort
-	return
-}
-
 func updateToolApp(installed *model.AppInstall) {
 	tooKey, ok := dto.AppToolMap[installed.App.Key]
 	if !ok {

backend/app/service/auth.go

@@ -4,7 +4,6 @@ import (
 	"strconv"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
@@ -20,16 +19,16 @@ type AuthService struct{}
 type IAuthService interface {
 	CheckIsSafety(code string) (string, error)
 	VerifyCode(code string) (bool, error)
-	Login(c *gin.Context, info dto.Login, entrance string) (*dto.UserLoginInfo, error)
+	Login(c *gin.Context, info dto.Login) (*dto.UserLoginInfo, error)
 	LogOut(c *gin.Context) error
-	MFALogin(c *gin.Context, info dto.MFALogin, entrance string) (*dto.UserLoginInfo, error)
+	MFALogin(c *gin.Context, info dto.MFALogin) (*dto.UserLoginInfo, error)
 }
 
 func NewIAuthService() IAuthService {
 	return &AuthService{}
 }
 
-func (u *AuthService) Login(c *gin.Context, info dto.Login, entrance string) (*dto.UserLoginInfo, error) {
+func (u *AuthService) Login(c *gin.Context, info dto.Login) (*dto.UserLoginInfo, error) {
 	nameSetting, err := settingRepo.Get(settingRepo.WithByKey("UserName"))
 	if err != nil {
 		return nil, errors.WithMessage(constant.ErrRecordNotFound, err.Error())
@@ -45,27 +44,18 @@ func (u *AuthService) Login(c *gin.Context, info dto.Login, entrance string) (*d
 	if info.Password != pass || nameSetting.Value != info.Name {
 		return nil, constant.ErrAuth
 	}
-	entranceSetting, err := settingRepo.Get(settingRepo.WithByKey("SecurityEntrance"))
-	if err != nil {
-		return nil, err
-	}
-	if len(entranceSetting.Value) != 0 && entranceSetting.Value != entrance {
-		return nil, buserr.New(constant.ErrEntrance)
-	}
 	mfa, err := settingRepo.Get(settingRepo.WithByKey("MFAStatus"))
 	if err != nil {
 		return nil, err
 	}
-	if err = settingRepo.Update("Language", info.Language); err != nil {
-		return nil, err
-	}
 	if mfa.Value == "enable" {
 		return &dto.UserLoginInfo{Name: nameSetting.Value, MfaStatus: mfa.Value}, nil
 	}
+
 	return u.generateSession(c, info.Name, info.AuthMethod)
 }
 
-func (u *AuthService) MFALogin(c *gin.Context, info dto.MFALogin, entrance string) (*dto.UserLoginInfo, error) {
+func (u *AuthService) MFALogin(c *gin.Context, info dto.MFALogin) (*dto.UserLoginInfo, error) {
 	nameSetting, err := settingRepo.Get(settingRepo.WithByKey("UserName"))
 	if err != nil {
 		return nil, errors.WithMessage(constant.ErrRecordNotFound, err.Error())
@@ -81,22 +71,12 @@ func (u *AuthService) MFALogin(c *gin.Context, info dto.MFALogin, entrance strin
 	if info.Password != pass || nameSetting.Value != info.Name {
 		return nil, constant.ErrAuth
 	}
-	entranceSetting, err := settingRepo.Get(settingRepo.WithByKey("SecurityEntrance"))
-	if err != nil {
-		return nil, err
-	}
-	if len(entranceSetting.Value) != 0 && entranceSetting.Value != entrance {
-		return nil, buserr.New(constant.ErrEntrance)
-	}
+
 	mfaSecret, err := settingRepo.Get(settingRepo.WithByKey("MFASecret"))
 	if err != nil {
 		return nil, err
 	}
-	mfaInterval, err := settingRepo.Get(settingRepo.WithByKey("MFAInterval"))
-	if err != nil {
-		return nil, err
-	}
-	success := mfa.ValidCode(info.Code, mfaInterval.Value, mfaSecret.Value)
+	success := mfa.ValidCode(info.Code, mfaSecret.Value)
 	if !success {
 		return nil, constant.ErrAuth
 	}

backend/app/service/backup.go

@@ -2,12 +2,8 @@ package service
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
-	"net/url"
 	"os"
 	"path"
 	"strings"
@@ -28,7 +24,6 @@ type BackupService struct{}
 type IBackupService interface {
 	List() ([]dto.BackupInfo, error)
 	SearchRecordsWithPage(search dto.RecordSearch) (int64, []dto.BackupRecords, error)
-	LoadOneDriveInfo() (string, error)
 	DownloadRecord(info dto.DownloadRecord) (string, error)
 	Create(backupDto dto.BackupOperate) error
 	GetBuckets(backupDto dto.ForBuckets) ([]interface{}, error)
@@ -37,7 +32,7 @@ type IBackupService interface {
 	BatchDeleteRecord(ids []uint) error
 	NewClient(backup *model.BackupAccount) (cloud_storage.CloudStorageClient, error)
 
-	ListFiles(req dto.BackupSearchFile) ([]string, error)
+	ListFiles(req dto.BackupSearchFile) ([]interface{}, error)
 
 	MysqlBackup(db dto.CommonBackup) error
 	MysqlRecover(db dto.CommonRecover) error
@@ -67,7 +62,6 @@ func (u *BackupService) List() ([]dto.BackupInfo, error) {
 	dtobas = append(dtobas, u.loadByType("MINIO", ops))
 	dtobas = append(dtobas, u.loadByType("COS", ops))
 	dtobas = append(dtobas, u.loadByType("KODO", ops))
-	dtobas = append(dtobas, u.loadByType("OneDrive", ops))
 	return dtobas, err
 }
 
@@ -90,18 +84,6 @@ func (u *BackupService) SearchRecordsWithPage(search dto.RecordSearch) (int64, [
 	return total, dtobas, err
 }
 
-func (u *BackupService) LoadOneDriveInfo() (string, error) {
-	OneDriveID, err := settingRepo.Get(settingRepo.WithByKey("OneDriveID"))
-	if err != nil {
-		return "", err
-	}
-	idItem, err := base64.StdEncoding.DecodeString(OneDriveID.Value)
-	if err != nil {
-		return "", err
-	}
-	return string(idItem), err
-}
-
 func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error) {
 	if info.Source == "LOCAL" {
 		return info.FileDir + "/" + info.FileName, nil
@@ -114,6 +96,7 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
 		return "", err
 	}
+	varMap["type"] = backup.Type
 	varMap["bucket"] = backup.Bucket
 	switch backup.Type {
 	case constant.Sftp:
@@ -122,10 +105,8 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
 		varMap["accessKey"] = backup.AccessKey
 		varMap["secretKey"] = backup.Credential
-	case constant.OneDrive:
-		varMap["accessToken"] = backup.Credential
 	}
-	backClient, err := cloud_storage.NewCloudStorageClient(backup.Type, varMap)
+	backClient, err := cloud_storage.NewCloudStorageClient(varMap)
 	if err != nil {
 		return "", fmt.Errorf("new cloud storage client failed, err: %v", err)
 	}
@@ -136,11 +117,6 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error)
 		}
 	}
 	srcPath := fmt.Sprintf("%s/%s", info.FileDir, info.FileName)
-	if len(backup.BackupPath) != 0 {
-		itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-		itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-		srcPath = itemPath + srcPath
-	}
 	if exist, _ := backClient.Exist(srcPath); exist {
 		isOK, err := backClient.Download(srcPath, targetPath)
 		if !isOK {
@@ -158,12 +134,6 @@ func (u *BackupService) Create(backupDto dto.BackupOperate) error {
 	if err := copier.Copy(&backup, &backupDto); err != nil {
 		return errors.WithMessage(constant.ErrStructTransform, err.Error())
 	}
-
-	if backupDto.Type == constant.OneDrive {
-		if err := u.loadAccessToken(&backup); err != nil {
-			return err
-		}
-	}
 	if err := backupRepo.Create(&backup); err != nil {
 		return err
 	}
@@ -175,6 +145,7 @@ func (u *BackupService) GetBuckets(backupDto dto.ForBuckets) ([]interface{}, err
 	if err := json.Unmarshal([]byte(backupDto.Vars), &varMap); err != nil {
 		return nil, err
 	}
+	varMap["type"] = backupDto.Type
 	switch backupDto.Type {
 	case constant.Sftp:
 		varMap["username"] = backupDto.AccessKey
@@ -183,7 +154,7 @@ func (u *BackupService) GetBuckets(backupDto dto.ForBuckets) ([]interface{}, err
 		varMap["accessKey"] = backupDto.AccessKey
 		varMap["secretKey"] = backupDto.Credential
 	}
-	client, err := cloud_storage.NewCloudStorageClient(backupDto.Type, varMap)
+	client, err := cloud_storage.NewCloudStorageClient(varMap)
 	if err != nil {
 		return nil, err
 	}
@@ -243,17 +214,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 	upMap := make(map[string]interface{})
 	upMap["bucket"] = req.Bucket
 	upMap["credential"] = req.Credential
-	upMap["backup_path"] = req.BackupPath
 	upMap["vars"] = req.Vars
-	backup.Vars = req.Vars
-
-	if req.Type == constant.OneDrive {
-		if err := u.loadAccessToken(&backup); err != nil {
-			return err
-		}
-		upMap["credential"] = backup.Credential
-		upMap["vars"] = backup.Vars
-	}
 	if err := backupRepo.Update(req.ID, upMap); err != nil {
 		return err
 	}
@@ -273,7 +234,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 	return nil
 }
 
-func (u *BackupService) ListFiles(req dto.BackupSearchFile) ([]string, error) {
+func (u *BackupService) ListFiles(req dto.BackupSearchFile) ([]interface{}, error) {
 	backup, err := backupRepo.Get(backupRepo.WithByType(req.Type))
 	if err != nil {
 		return nil, err
@@ -282,21 +243,7 @@ func (u *BackupService) ListFiles(req dto.BackupSearchFile) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	prefix := "system_snapshot"
-	if len(backup.BackupPath) != 0 {
-		prefix = path.Join(strings.TrimPrefix(backup.BackupPath, "/"), prefix)
-	}
-	files, err := client.ListObjects(prefix)
-	if err != nil {
-		return nil, err
-	}
-	var datas []string
-	for _, file := range files {
-		if len(file) != 0 {
-			datas = append(datas, path.Base(file))
-		}
-	}
-	return datas, nil
+	return client.ListObjects("system_snapshot/")
 }
 
 func (u *BackupService) NewClient(backup *model.BackupAccount) (cloud_storage.CloudStorageClient, error) {
@@ -304,6 +251,7 @@ func (u *BackupService) NewClient(backup *model.BackupAccount) (cloud_storage.Cl
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
 		return nil, err
 	}
+	varMap["type"] = backup.Type
 	if backup.Type == "LOCAL" {
 		return nil, errors.New("not support")
 	}
@@ -315,11 +263,9 @@ func (u *BackupService) NewClient(backup *model.BackupAccount) (cloud_storage.Cl
 	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
 		varMap["accessKey"] = backup.AccessKey
 		varMap["secretKey"] = backup.Credential
-	case constant.OneDrive:
-		varMap["accessToken"] = backup.Credential
 	}
 
-	backClient, err := cloud_storage.NewCloudStorageClient(backup.Type, varMap)
+	backClient, err := cloud_storage.NewCloudStorageClient(varMap)
 	if err != nil {
 		return nil, err
 	}
@@ -340,53 +286,6 @@ func (u *BackupService) loadByType(accountType string, accounts []model.BackupAc
 	return dto.BackupInfo{Type: accountType}
 }
 
-func (u *BackupService) loadAccessToken(backup *model.BackupAccount) error {
-	varMap := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
-		return fmt.Errorf("unmarshal backup vars failed, err: %v", err)
-	}
-
-	data := url.Values{}
-	data.Set("client_id", global.CONF.System.OneDriveID)
-	data.Set("client_secret", global.CONF.System.OneDriveSc)
-	data.Set("grant_type", "authorization_code")
-	data.Set("code", varMap["code"].(string))
-	data.Set("redirect_uri", constant.OneDriveRedirectURI)
-	client := &http.Client{}
-	req, err := http.NewRequest("POST", "https://login.microsoftonline.com/common/oauth2/v2.0/token", strings.NewReader(data.Encode()))
-	if err != nil {
-		return fmt.Errorf("new http post client for access token failed, err: %v", err)
-	}
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	resp, err := client.Do(req)
-	if err != nil {
-		return fmt.Errorf("request for access token failed, err: %v", err)
-	}
-	delete(varMap, "code")
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("read data from response body failed, err: %v", err)
-	}
-	defer resp.Body.Close()
-
-	token := map[string]interface{}{}
-	if err := json.Unmarshal(respBody, &token); err != nil {
-		return fmt.Errorf("unmarshal data from response body failed, err: %v", err)
-	}
-	accessToken, ok := token["refresh_token"].(string)
-	if !ok {
-		return errors.New("no such access token in response")
-	}
-
-	itemVars, err := json.Marshal(varMap)
-	if err != nil {
-		return fmt.Errorf("json marshal var map failed, err: %v", err)
-	}
-	backup.Credential = accessToken
-	backup.Vars = string(itemVars)
-	return nil
-}
-
 func loadLocalDir() (string, error) {
 	backup, err := backupRepo.Get(commonRepo.WithByType("LOCAL"))
 	if err != nil {

backend/app/service/backup_app.go

@@ -34,7 +34,7 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) error {
 	}
 	timeNow := time.Now().Format("20060102150405")
 
-	backupDir := path.Join(localDir, fmt.Sprintf("app/%s/%s", req.Name, req.DetailName))
+	backupDir := fmt.Sprintf("%s/app/%s/%s", localDir, req.Name, req.DetailName)
 
 	fileName := fmt.Sprintf("%s_%s.tar.gz", req.DetailName, timeNow)
 	if err := handleAppBackup(&install, backupDir, fileName); err != nil {
@@ -104,16 +104,18 @@ func handleAppBackup(install *model.AppInstall, backupDir, fileName string) erro
 		return err
 	}
 
-	resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
-	for _, resource := range resources {
-		if resource.Key == "mysql" || resource.Key == "mariadb" {
-			db, err := mysqlRepo.Get(commonRepo.WithByID(resource.ResourceId))
-			if err != nil {
-				return err
-			}
-			if err := handleMysqlBackup(db.MysqlName, db.Name, tmpDir, fmt.Sprintf("%s.sql.gz", install.Name)); err != nil {
-				return err
-			}
+	resource, _ := appInstallResourceRepo.GetFirst(appInstallResourceRepo.WithAppInstallId(install.ID))
+	if resource.ID != 0 && resource.ResourceId != 0 {
+		mysqlInfo, err := appInstallRepo.LoadBaseInfo(constant.AppMysql, "")
+		if err != nil {
+			return err
+		}
+		db, err := mysqlRepo.Get(commonRepo.WithByID(resource.ResourceId))
+		if err != nil {
+			return err
+		}
+		if err := handleMysqlBackup(mysqlInfo, tmpDir, db.Name, fmt.Sprintf("%s.sql.gz", install.Name)); err != nil {
+			return err
 		}
 	}
 
@@ -151,7 +153,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 	}
 
 	if !isRollback {
-		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("app/%s_%s.tar.gz", install.Name, time.Now().Format("20060102150405")))
+		rollbackFile := fmt.Sprintf("%s/original/app/%s_%s.tar.gz", global.CONF.System.BaseDir, install.Name, time.Now().Format("20060102150405"))
 		if err := handleAppBackup(install, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
 			return fmt.Errorf("backup app %s for rollback before recover failed, err: %v", install.Name, err)
 		}
@@ -171,62 +173,41 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 	}
 
 	newEnvFile := ""
-	resources, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithAppInstallId(install.ID))
-	for _, resource := range resources {
-		if resource.From != "local" {
-			continue
+	resource, _ := appInstallResourceRepo.GetFirst(appInstallResourceRepo.WithAppInstallId(install.ID))
+	if resource.ID != 0 && install.App.Key != "mysql" {
+		mysqlInfo, err := appInstallRepo.LoadBaseInfo(resource.Key, "")
+		if err != nil {
+			return err
 		}
-		resourceApp, err := appInstallRepo.GetFirst(commonRepo.WithByID(resource.LinkId))
+		db, err := mysqlRepo.Get(commonRepo.WithByID(resource.ResourceId))
 		if err != nil {
 			return err
 		}
-		if resource.Key == "mysql" || resource.Key == "mariadb" {
-			mysqlInfo, err := appInstallRepo.LoadBaseInfo(resource.Key, resourceApp.Name)
-			if err != nil {
-				return err
-			}
-			db, err := mysqlRepo.Get(commonRepo.WithByID(resource.ResourceId))
-			if err != nil {
-				return err
-			}
 
-			newDB, envMap, err := reCreateDB(db.ID, resourceApp, oldInstall.Env)
-			if err != nil {
-				return err
-			}
-			oldHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", envMap["PANEL_DB_HOST"].(string))
-			newHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", mysqlInfo.ServiceName)
-			oldInstall.Env = strings.ReplaceAll(oldInstall.Env, oldHost, newHost)
-			envMap["PANEL_DB_HOST"] = mysqlInfo.ServiceName
-			newEnvFile, err = coverEnvJsonToStr(oldInstall.Env)
-			if err != nil {
-				return err
-			}
-			_ = appInstallResourceRepo.BatchUpdateBy(map[string]interface{}{"resource_id": newDB.ID}, commonRepo.WithByID(resource.ID))
+		newDB, envMap, err := reCreateDB(db.ID, oldInstall.Env)
+		if err != nil {
+			return err
+		}
+		oldHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", envMap["PANEL_DB_HOST"].(string))
+		newHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", mysqlInfo.ServiceName)
+		oldInstall.Env = strings.ReplaceAll(oldInstall.Env, oldHost, newHost)
+		envMap["PANEL_DB_HOST"] = mysqlInfo.ServiceName
+		newEnvFile, err = coverEnvJsonToStr(oldInstall.Env)
+		if err != nil {
+			return err
+		}
+		_ = appInstallResourceRepo.BatchUpdateBy(map[string]interface{}{"resource_id": newDB.ID}, commonRepo.WithByID(resource.ID))
 
-			if err := handleMysqlRecover(dto.CommonRecover{
-				Name:       newDB.MysqlName,
-				DetailName: newDB.Name,
-				File:       fmt.Sprintf("%s/%s.sql.gz", tmpPath, install.Name),
-			}, true); err != nil {
-				global.LOG.Errorf("handle recover from sql.gz failed, err: %v", err)
-				return err
-			}
+		if err := handleMysqlRecover(mysqlInfo, tmpPath, newDB.Name, fmt.Sprintf("%s.sql.gz", install.Name), true); err != nil {
+			global.LOG.Errorf("handle recover from sql.gz failed, err: %v", err)
+			return err
 		}
 	}
 
-	appDir := install.GetPath()
-	backPath := fmt.Sprintf("%s_bak", appDir)
-	_ = fileOp.Rename(appDir, backPath)
-	_ = fileOp.CreateDir(appDir, 0755)
-
 	if err := handleUnTar(tmpPath+"/app.tar.gz", fmt.Sprintf("%s/%s", constant.AppInstallDir, install.App.Key)); err != nil {
 		global.LOG.Errorf("handle recover from app.tar.gz failed, err: %v", err)
-		_ = fileOp.DeleteDir(appDir)
-		_ = fileOp.Rename(backPath, appDir)
 		return err
 	}
-	_ = fileOp.DeleteDir(backPath)
 
 	if len(newEnvFile) != 0 {
 		envPath := fmt.Sprintf("%s/%s/%s/.env", constant.AppInstallDir, install.App.Key, install.Name)
@@ -242,20 +223,18 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 	oldInstall.Status = constant.StatusRunning
 	oldInstall.AppId = install.AppId
 	oldInstall.AppDetailId = install.AppDetailId
-	oldInstall.App.ID = install.AppId
 	if err := appInstallRepo.Save(context.Background(), &oldInstall); err != nil {
 		global.LOG.Errorf("save db app install failed, err: %v", err)
 		return err
 	}
 	isOk = true
-
 	return nil
 }
 
-func reCreateDB(dbID uint, app model.AppInstall, oldEnv string) (*model.DatabaseMysql, map[string]interface{}, error) {
+func reCreateDB(dbID uint, oldEnv string) (*model.DatabaseMysql, map[string]interface{}, error) {
 	mysqlService := NewIMysqlService()
 	ctx := context.Background()
-	_ = mysqlService.Delete(ctx, dto.MysqlDBDelete{ID: dbID, Database: app.Name, Type: app.App.Key, DeleteBackup: false, ForceDelete: true})
+	_ = mysqlService.Delete(ctx, dto.MysqlDBDelete{ID: dbID, DeleteBackup: true, ForceDelete: true})
 
 	envMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(oldEnv), &envMap); err != nil {
@@ -266,8 +245,6 @@ func reCreateDB(dbID uint, app model.AppInstall, oldEnv string) (*model.Database
 	oldPassword, _ := envMap["PANEL_DB_USER_PASSWORD"].(string)
 	createDB, err := mysqlService.Create(context.Background(), dto.MysqlDBCreate{
 		Name:       oldName,
-		From:       "local",
-		Database:   app.Name,
 		Format:     "utf8mb4",
 		Username:   oldUser,
 		Password:   oldPassword,

backend/app/service/backup_mysql.go

@@ -1,8 +1,10 @@
 package service
 
 import (
+	"compress/gzip"
 	"fmt"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -10,9 +12,9 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
+	"github.com/1Panel-dev/1Panel/backend/app/repo"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
-	"github.com/1Panel-dev/1Panel/backend/utils/mysql/client"
 	"github.com/pkg/errors"
 )
 
@@ -21,22 +23,24 @@ func (u *BackupService) MysqlBackup(req dto.CommonBackup) error {
 	if err != nil {
 		return err
 	}
-
-	timeNow := time.Now().Format("20060102150405")
-	targetDir := path.Join(localDir, fmt.Sprintf("database/%s/%s/%s", req.Type, req.Name, req.DetailName))
-	fileName := fmt.Sprintf("%s_%s.sql.gz", req.DetailName, timeNow)
-
-	if err := handleMysqlBackup(req.Name, req.DetailName, targetDir, fileName); err != nil {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil {
 		return err
 	}
 
+	timeNow := time.Now().Format("20060102150405")
+	backupDir := fmt.Sprintf("%s/database/mysql/%s/%s", localDir, req.Name, req.DetailName)
+	fileName := fmt.Sprintf("%s_%s.sql.gz", req.DetailName, timeNow)
+	if err := handleMysqlBackup(app, backupDir, req.DetailName, fileName); err != nil {
+		return err
+	}
 	record := &model.BackupRecord{
-		Type:       req.Type,
-		Name:       req.Name,
+		Type:       "mysql",
+		Name:       app.Name,
 		DetailName: req.DetailName,
 		Source:     "LOCAL",
 		BackupType: "LOCAL",
-		FileDir:    targetDir,
+		FileDir:    backupDir,
 		FileName:   fileName,
 	}
 	if err := backupRepo.CreateRecord(record); err != nil {
@@ -46,13 +50,26 @@ func (u *BackupService) MysqlBackup(req dto.CommonBackup) error {
 }
 
 func (u *BackupService) MysqlRecover(req dto.CommonRecover) error {
-	if err := handleMysqlRecover(req, false); err != nil {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil {
+		return err
+	}
+	fileOp := files.NewFileOp()
+	if !fileOp.Stat(req.File) {
+		return errors.New(fmt.Sprintf("%s file is not exist", req.File))
+	}
+	global.LOG.Infof("recover database %s-%s from backup file %s", req.Name, req.DetailName, req.File)
+	if err := handleMysqlRecover(app, path.Dir(req.File), req.DetailName, path.Base(req.File), false); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil {
+		return err
+	}
 	file := req.File
 	fileName := path.Base(req.File)
 	if strings.HasSuffix(fileName, ".tar.gz") {
@@ -89,92 +106,77 @@ func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error {
 		}()
 	}
 
-	req.File = path.Dir(file) + "/" + fileName
-	if err := handleMysqlRecover(req, false); err != nil {
+	if err := handleMysqlRecover(app, path.Dir(file), req.DetailName, fileName, false); err != nil {
 		return err
 	}
 	global.LOG.Info("recover from uploads successful!")
 	return nil
 }
 
-func handleMysqlBackup(database, dbName, targetDir, fileName string) error {
-	dbInfo, err := mysqlRepo.Get(commonRepo.WithByName(dbName), mysqlRepo.WithByMysqlName(database))
-	if err != nil {
-		return err
-	}
-	cli, _, err := LoadMysqlClientByFrom(database)
-	if err != nil {
-		return err
+func handleMysqlBackup(app *repo.RootInfo, backupDir, dbName, fileName string) error {
+	fileOp := files.NewFileOp()
+	if !fileOp.Stat(backupDir) {
+		if err := os.MkdirAll(backupDir, os.ModePerm); err != nil {
+			return fmt.Errorf("mkdir %s failed, err: %v", backupDir, err)
+		}
 	}
+	outfile, _ := os.OpenFile(backupDir+"/"+fileName, os.O_RDWR|os.O_CREATE, 0755)
+	global.LOG.Infof("start to mysqldump | gzip > %s.gzip", backupDir+"/"+fileName)
+	cmd := exec.Command("docker", "exec", app.ContainerName, "mysqldump", "-uroot", "-p"+app.Password, dbName)
+	gzipCmd := exec.Command("gzip", "-cf")
+	gzipCmd.Stdin, _ = cmd.StdoutPipe()
+	gzipCmd.Stdout = outfile
+	_ = gzipCmd.Start()
+	_ = cmd.Run()
+	_ = gzipCmd.Wait()
 
-	backupInfo := client.BackupInfo{
-		Name:      dbName,
-		Format:    dbInfo.Format,
-		TargetDir: targetDir,
-		FileName:  fileName,
-
-		Timeout: 300,
-	}
-	if err := cli.Backup(backupInfo); err != nil {
-		return err
-	}
 	return nil
 }
 
-func handleMysqlRecover(req dto.CommonRecover, isRollback bool) error {
+func handleMysqlRecover(mysqlInfo *repo.RootInfo, recoverDir, dbName, fileName string, isRollback bool) error {
 	isOk := false
-	fileOp := files.NewFileOp()
-	if !fileOp.Stat(req.File) {
-		return errors.New(fmt.Sprintf("%s file is not exist", req.File))
-	}
-	dbInfo, err := mysqlRepo.Get(commonRepo.WithByName(req.DetailName), mysqlRepo.WithByMysqlName(req.Name))
-	if err != nil {
-		return err
-	}
-	cli, _, err := LoadMysqlClientByFrom(req.Name)
-	if err != nil {
-		return err
-	}
-
 	if !isRollback {
-		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("database/%s/%s_%s.sql.gz", req.Type, req.DetailName, time.Now().Format("20060102150405")))
-		if err := cli.Backup(client.BackupInfo{
-			Name:      req.DetailName,
-			Format:    dbInfo.Format,
-			TargetDir: path.Dir(rollbackFile),
-			FileName:  path.Base(rollbackFile),
-
-			Timeout: 300,
-		}); err != nil {
-			return fmt.Errorf("backup mysql db %s for rollback before recover failed, err: %v", req.DetailName, err)
+		rollbackFile := fmt.Sprintf("%s/original/database/%s_%s.sql.gz", global.CONF.System.BaseDir, mysqlInfo.Name, time.Now().Format("20060102150405"))
+		if err := handleMysqlBackup(mysqlInfo, path.Dir(rollbackFile), dbName, path.Base(rollbackFile)); err != nil {
+			return fmt.Errorf("backup mysql db %s for rollback before recover failed, err: %v", mysqlInfo.Name, err)
 		}
 		defer func() {
 			if !isOk {
 				global.LOG.Info("recover failed, start to rollback now")
-				if err := cli.Recover(client.RecoverInfo{
-					Name:       req.DetailName,
-					Format:     dbInfo.Format,
-					SourceFile: rollbackFile,
-
-					Timeout: 300,
-				}); err != nil {
-					global.LOG.Errorf("rollback mysql db %s from %s failed, err: %v", req.DetailName, rollbackFile, err)
+				if err := handleMysqlRecover(mysqlInfo, path.Dir(rollbackFile), dbName, path.Base(rollbackFile), true); err != nil {
+					global.LOG.Errorf("rollback mysql db %s from %s failed, err: %v", dbName, rollbackFile, err)
+					return
 				}
-				global.LOG.Infof("rollback mysql db %s from %s successful", req.DetailName, rollbackFile)
+				global.LOG.Infof("rollback mysql db %s from %s successful", dbName, rollbackFile)
 				_ = os.RemoveAll(rollbackFile)
 			} else {
 				_ = os.RemoveAll(rollbackFile)
 			}
 		}()
 	}
-	if err := cli.Recover(client.RecoverInfo{
-		Name:       req.DetailName,
-		Format:     dbInfo.Format,
-		SourceFile: req.File,
-
-		Timeout: 300,
-	}); err != nil {
-		return err
+	file := recoverDir + "/" + fileName
+	fi, _ := os.Open(file)
+	defer fi.Close()
+	cmd := exec.Command("docker", "exec", "-i", mysqlInfo.ContainerName, "mysql", "-uroot", "-p"+mysqlInfo.Password, dbName)
+	if strings.HasSuffix(fileName, ".gz") {
+		gzipFile, err := os.Open(file)
+		if err != nil {
+			return err
+		}
+		defer gzipFile.Close()
+		gzipReader, err := gzip.NewReader(gzipFile)
+		if err != nil {
+			return err
+		}
+		defer gzipReader.Close()
+		cmd.Stdin = gzipReader
+	} else {
+		cmd.Stdin = fi
+	}
+	stdout, err := cmd.CombinedOutput()
+	stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
+	if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") {
+		return errors.New(stdStr)
 	}
 	isOk = true
 	return nil

backend/app/service/backup_redis.go

@@ -43,7 +43,7 @@ func (u *BackupService) RedisBackup() error {
 			fileName = fmt.Sprintf("%s.tar.gz", timeNow)
 		}
 	}
-	backupDir := path.Join(localDir, fmt.Sprintf("database/redis/%s", redisInfo.Name))
+	backupDir := fmt.Sprintf("%s/database/redis/%s", localDir, redisInfo.Name)
 	if err := handleRedisBackup(redisInfo, backupDir, fileName); err != nil {
 		return err
 	}
@@ -143,7 +143,7 @@ func handleRedisRecover(redisInfo *repo.RootInfo, recoverFile string, isRollback
 				suffix = "tar.gz"
 			}
 		}
-		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("database/redis/%s_%s.%s", redisInfo.Name, time.Now().Format("20060102150405"), suffix))
+		rollbackFile := fmt.Sprintf("%s/original/database/redis/%s_%s.%s", global.CONF.System.BaseDir, redisInfo.Name, time.Now().Format("20060102150405"), suffix)
 		if err := handleRedisBackup(redisInfo, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
 			return fmt.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err)
 		}

backend/app/service/backup_website.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
@@ -31,7 +30,7 @@ func (u *BackupService) WebsiteBackup(req dto.CommonBackup) error {
 	}
 
 	timeNow := time.Now().Format("20060102150405")
-	backupDir := path.Join(localDir, fmt.Sprintf("website/%s", req.Name))
+	backupDir := fmt.Sprintf("%s/website/%s", localDir, req.Name)
 	fileName := fmt.Sprintf("%s_%s.tar.gz", website.PrimaryDomain, timeNow)
 	if err := handleWebsiteBackup(&website, backupDir, fileName); err != nil {
 		return err
@@ -81,11 +80,11 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
 
 	temPathWithName := tmpPath + "/" + website.Alias
 	if !fileOp.Stat(tmpPath+"/website.json") || !fileOp.Stat(temPathWithName+".conf") || !fileOp.Stat(temPathWithName+".web.tar.gz") {
-		return buserr.WithDetail(constant.ErrBackupExist, ".conf or .web.tar.gz", nil)
+		return errors.New("the wrong recovery package does not have .conf or .web.tar.gz files")
 	}
 	if website.Type == constant.Deployment {
 		if !fileOp.Stat(temPathWithName + ".app.tar.gz") {
-			return buserr.WithDetail(constant.ErrBackupExist, ".app.tar.gz", nil)
+			return errors.New("the wrong recovery package does not have .app.tar.gz files")
 		}
 	}
 	var oldWebsite model.Website
@@ -96,14 +95,13 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
 	if err := json.Unmarshal(websiteJson, &oldWebsite); err != nil {
 		return fmt.Errorf("unmarshal app.json failed, err: %v", err)
 	}
-
-	if err := checkValidOfWebsite(&oldWebsite, website); err != nil {
-		return err
+	if oldWebsite.Alias != website.Alias || oldWebsite.Type != website.Type || oldWebsite.ID != website.ID {
+		return errors.New("the current backup file does not match the application")
 	}
 
 	isOk := false
 	if !isRollback {
-		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("website/%s_%s.tar.gz", website.Alias, time.Now().Format("20060102150405")))
+		rollbackFile := fmt.Sprintf("%s/original/website/%s_%s.tar.gz", global.CONF.System.BaseDir, website.Alias, time.Now().Format("20060102150405"))
 		if err := handleWebsiteBackup(website, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
 			return fmt.Errorf("backup website %s for rollback before recover failed, err: %v", website.Alias, err)
 		}
@@ -157,7 +155,6 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
 		return errors.New(string(stdout))
 	}
 
-	oldWebsite.ID = website.ID
 	if err := websiteRepo.SaveWithoutCtx(&oldWebsite); err != nil {
 		global.LOG.Errorf("handle save website data failed, err: %v", err)
 		return err
@@ -215,26 +212,3 @@ func handleWebsiteBackup(website *model.Website, backupDir, fileName string) err
 
 	return nil
 }
-
-func checkValidOfWebsite(oldWebsite, website *model.Website) error {
-	if oldWebsite.Alias != website.Alias || oldWebsite.Type != website.Type {
-		return buserr.WithDetail(constant.ErrBackupMatch, fmt.Sprintf("oldName: %s, oldType: %v", oldWebsite.Alias, oldWebsite.Type), nil)
-	}
-	if oldWebsite.AppInstallID != 0 {
-		_, err := appInstallRepo.GetFirst(commonRepo.WithByID(website.AppInstallID))
-		if err != nil {
-			return buserr.WithDetail(constant.ErrBackupMatch, "app", nil)
-		}
-	}
-	if oldWebsite.RuntimeID != 0 {
-		if _, err := runtimeRepo.GetFirst(commonRepo.WithByID(website.RuntimeID)); err != nil {
-			return buserr.WithDetail(constant.ErrBackupMatch, "runtime", nil)
-		}
-	}
-	if oldWebsite.WebsiteSSLID != 0 {
-		if _, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(website.WebsiteSSLID)); err != nil {
-			return buserr.WithDetail(constant.ErrBackupMatch, "ssl", nil)
-		}
-	}
-	return nil
-}

backend/app/service/container.go

@@ -3,12 +3,11 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"os/exec"
-	"path"
-	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -19,7 +18,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/docker"
 	"github.com/docker/docker/api/types"
@@ -28,34 +26,24 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
-	"github.com/gorilla/websocket"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/shirou/gopsutil/v3/cpu"
-	"github.com/shirou/gopsutil/v3/mem"
 )
 
 type ContainerService struct{}
 
 type IContainerService interface {
 	Page(req dto.PageContainer) (int64, interface{}, error)
-	List() ([]string, error)
 	PageNetwork(req dto.SearchWithPage) (int64, interface{}, error)
-	ListNetwork() ([]dto.Options, error)
 	PageVolume(req dto.SearchWithPage) (int64, interface{}, error)
 	ListVolume() ([]dto.Options, error)
 	PageCompose(req dto.SearchWithPage) (int64, interface{}, error)
 	CreateCompose(req dto.ComposeCreate) (string, error)
 	ComposeOperation(req dto.ComposeOperation) error
-	ContainerCreate(req dto.ContainerOperate) error
-	ContainerUpdate(req dto.ContainerOperate) error
-	ContainerUpgrade(req dto.ContainerUpgrade) error
-	ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error)
-	ContainerListStats() ([]dto.ContainerListStats, error)
-	LoadResouceLimit() (*dto.ResourceLimit, error)
+	ContainerCreate(req dto.ContainerCreate) error
 	ContainerLogClean(req dto.OperationWithName) error
 	ContainerOperation(req dto.ContainerOperation) error
-	ContainerLogs(wsConn *websocket.Conn, container, since, tail string, follow bool) error
-	ContainerStats(id string) (*dto.ContainerStats, error)
+	ContainerLogs(param dto.ContainerLog) (string, error)
+	ContainerStats(id string) (*dto.ContainterStats, error)
 	Inspect(req dto.InspectReq) (string, error)
 	DeleteNetwork(req dto.BatchDelete) error
 	CreateNetwork(req dto.NetworkCreate) error
@@ -64,8 +52,6 @@ type IContainerService interface {
 	TestCompose(req dto.ComposeCreate) (bool, error)
 	ComposeUpdate(req dto.ComposeUpdate) error
 	Prune(req dto.ContainerPrune) (dto.ContainerPruneReport, error)
-
-	LoadContainerLogs(req dto.OperationWithNameAndType) string
 }
 
 func NewIContainerService() IContainerService {
@@ -74,8 +60,9 @@ func NewIContainerService() IContainerService {
 
 func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, error) {
 	var (
-		records []types.Container
-		list    []types.Container
+		records   []types.Container
+		list      []types.Container
+		backDatas []dto.ContainerInfo
 	)
 	client, err := docker.NewDockerClient()
 	if err != nil {
@@ -101,30 +88,9 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 			}
 		}
 	}
-	switch req.OrderBy {
-	case "name":
-		sort.Slice(list, func(i, j int) bool {
-			if req.Order == constant.OrderAsc {
-				return list[i].Names[0][1:] < list[j].Names[0][1:]
-			}
-			return list[i].Names[0][1:] > list[j].Names[0][1:]
-		})
-	case "state":
-		sort.Slice(list, func(i, j int) bool {
-			if req.Order == constant.OrderAsc {
-				return list[i].State < list[j].State
-			}
-			return list[i].State > list[j].State
-		})
-	default:
-		sort.Slice(list, func(i, j int) bool {
-			if req.Order == constant.OrderAsc {
-				return list[i].Created < list[j].Created
-			}
-			return list[i].Created > list[j].Created
-		})
-	}
-
+	sort.Slice(list, func(i, j int) bool {
+		return list[i].Created > list[j].Created
+	})
 	total, start, end := len(list), (req.Page-1)*req.PageSize, req.Page*req.PageSize
 	if start > total {
 		records = make([]types.Container, 0)
@@ -135,86 +101,47 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 		records = list[start:end]
 	}
 
-	backDatas := make([]dto.ContainerInfo, len(records))
-	for i := 0; i < len(records); i++ {
-		item := records[i]
-		IsFromCompose := false
-		if _, ok := item.Labels[composeProjectLabel]; ok {
-			IsFromCompose = true
-		}
-		IsFromApp := false
-		if created, ok := item.Labels[composeCreatedBy]; ok && created == "Apps" {
-			IsFromApp = true
-		}
-
-		ports := simplifyPort(item.Ports)
-		backDatas[i] = dto.ContainerInfo{
-			ContainerID:   item.ID,
-			CreateTime:    time.Unix(item.Created, 0).Format("2006-01-02 15:04:05"),
-			Name:          item.Names[0][1:],
-			ImageId:       strings.Split(item.ImageID, ":")[1],
-			ImageName:     item.Image,
-			State:         item.State,
-			RunTime:       item.Status,
-			Ports:         ports,
-			IsFromApp:     IsFromApp,
-			IsFromCompose: IsFromCompose,
-		}
-		if item.NetworkSettings != nil && len(item.NetworkSettings.Networks) > 0 {
-			networks := make([]string, 0, len(item.NetworkSettings.Networks))
-			for key := range item.NetworkSettings.Networks {
-				networks = append(networks, item.NetworkSettings.Networks[key].IPAddress)
-			}
-			sort.Strings(networks)
-			backDatas[i].Network = networks
-		}
-	}
-
-	return int64(total), backDatas, nil
-}
-
-func (u *ContainerService) List() ([]string, error) {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return nil, err
-	}
-	containers, err := client.ContainerList(context.Background(), types.ContainerListOptions{All: true})
-	if err != nil {
-		return nil, err
-	}
-	var datas []string
-	for _, container := range containers {
-		for _, name := range container.Names {
-			if len(name) != 0 {
-				datas = append(datas, strings.TrimPrefix(name, "/"))
-			}
-		}
-	}
-
-	return datas, nil
-}
-
-func (u *ContainerService) ContainerListStats() ([]dto.ContainerListStats, error) {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return nil, err
-	}
-	list, err := client.ContainerList(context.Background(), types.ContainerListOptions{All: true})
-	if err != nil {
-		return nil, err
-	}
-	var datas []dto.ContainerListStats
 	var wg sync.WaitGroup
-	wg.Add(len(list))
-	for i := 0; i < len(list); i++ {
+	wg.Add(len(records))
+	for _, container := range records {
 		go func(item types.Container) {
+			IsFromCompose := false
+			if _, ok := item.Labels[composeProjectLabel]; ok {
+				IsFromCompose = true
+			}
+			IsFromApp := false
+			if created, ok := item.Labels[composeCreatedBy]; ok && created == "Apps" {
+				IsFromApp = true
+			}
+
+			var ports []string
+			for _, port := range item.Ports {
+				if port.IP == "::" || port.PublicPort == 0 {
+					continue
+				}
+				ports = append(ports, fmt.Sprintf("%v:%v/%s", port.PublicPort, port.PrivatePort, port.Type))
+			}
 			cpu, mem := loadCpuAndMem(client, item.ID)
-			datas = append(datas, dto.ContainerListStats{CPUPercent: cpu, MemoryPercent: mem, ContainerID: item.ID})
+			backDatas = append(backDatas, dto.ContainerInfo{
+				ContainerID:   item.ID,
+				CreateTime:    time.Unix(item.Created, 0).Format("2006-01-02 15:04:05"),
+				Name:          item.Names[0][1:],
+				ImageId:       strings.Split(item.ImageID, ":")[1],
+				ImageName:     item.Image,
+				State:         item.State,
+				RunTime:       item.Status,
+				CPUPercent:    cpu,
+				MemoryPercent: mem,
+				Ports:         ports,
+				IsFromApp:     IsFromApp,
+				IsFromCompose: IsFromCompose,
+			})
 			wg.Done()
-		}(list[i])
+		}(container)
 	}
 	wg.Wait()
-	return datas, nil
+
+	return int64(total), backDatas, nil
 }
 
 func (u *ContainerService) Inspect(req dto.InspectReq) (string, error) {
@@ -286,52 +213,63 @@ func (u *ContainerService) Prune(req dto.ContainerPrune) (dto.ContainerPruneRepo
 	return report, nil
 }
 
-func (u *ContainerService) LoadResouceLimit() (*dto.ResourceLimit, error) {
-	cpuCounts, err := cpu.Counts(true)
+func (u *ContainerService) ContainerCreate(req dto.ContainerCreate) error {
+	portMap, err := checkPortStats(req.ExposedPorts)
 	if err != nil {
-		return nil, fmt.Errorf("load cpu limit failed, err: %v", err)
+		return err
 	}
-	memoryInfo, err := mem.VirtualMemory()
-	if err != nil {
-		return nil, fmt.Errorf("load memory limit failed, err: %v", err)
-	}
-
-	data := dto.ResourceLimit{
-		CPU:    cpuCounts,
-		Memory: int(memoryInfo.Total),
-	}
-	return &data, nil
-}
-
-func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
 	client, err := docker.NewDockerClient()
 	if err != nil {
 		return err
 	}
-	ctx := context.Background()
-	newContainer, _ := client.ContainerInspect(ctx, req.Name)
-	if newContainer.ContainerJSONBase != nil {
-		return buserr.New(constant.ErrContainerName)
-	}
 
-	var config container.Config
-	var hostConf container.HostConfig
-	var networkConf network.NetworkingConfig
-	if err := loadConfigInfo(req, &config, &hostConf, &networkConf); err != nil {
-		return err
+	exposeds := make(nat.PortSet)
+	for port := range portMap {
+		exposeds[port] = struct{}{}
+	}
+	config := &container.Config{
+		Image:        req.Image,
+		Cmd:          req.Cmd,
+		Env:          req.Env,
+		Labels:       stringsToMap(req.Labels),
+		Tty:          true,
+		OpenStdin:    true,
+		ExposedPorts: exposeds,
+	}
+	hostConf := &container.HostConfig{
+		AutoRemove:      req.AutoRemove,
+		PublishAllPorts: req.PublishAllPorts,
+		RestartPolicy:   container.RestartPolicy{Name: req.RestartPolicy},
+	}
+	if req.RestartPolicy == "on-failure" {
+		hostConf.RestartPolicy.MaximumRetryCount = 5
+	}
+	if req.NanoCPUs != 0 {
+		hostConf.NanoCPUs = req.NanoCPUs * 1000000000
+	}
+	if req.Memory != 0 {
+		hostConf.Memory = req.Memory
+	}
+	if len(req.ExposedPorts) != 0 {
+		hostConf.PortBindings = portMap
+	}
+	if len(req.Volumes) != 0 {
+		config.Volumes = make(map[string]struct{})
+		for _, volume := range req.Volumes {
+			config.Volumes[volume.ContainerDir] = struct{}{}
+			hostConf.Binds = append(hostConf.Binds, fmt.Sprintf("%s:%s:%s", volume.SourceDir, volume.ContainerDir, volume.Mode))
+		}
 	}
 
 	global.LOG.Infof("new container info %s has been made, now start to create", req.Name)
 
-	if !checkImageExist(client, req.Image) || req.ForcePull {
+	ctx := context.Background()
+	if !checkImageExist(client, req.Image) {
 		if err := pullImages(ctx, client, req.Image); err != nil {
-			if !req.ForcePull {
-				return err
-			}
-			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
+			return err
 		}
 	}
-	container, err := client.ContainerCreate(ctx, &config, &hostConf, &networkConf, &v1.Platform{}, req.Name)
+	container, err := client.ContainerCreate(ctx, config, hostConf, &network.NetworkingConfig{}, &v1.Platform{}, req.Name)
 	if err != nil {
 		_ = client.ContainerRemove(ctx, req.Name, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
 		return err
@@ -344,157 +282,6 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
 	return nil
 }
 
-func (u *ContainerService) ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error) {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return nil, err
-	}
-	ctx := context.Background()
-	oldContainer, err := client.ContainerInspect(ctx, req.Name)
-	if err != nil {
-		return nil, err
-	}
-
-	var data dto.ContainerOperate
-	data.ContainerID = oldContainer.ID
-	data.Name = strings.ReplaceAll(oldContainer.Name, "/", "")
-	data.Image = oldContainer.Config.Image
-	if oldContainer.NetworkSettings != nil {
-		for network := range oldContainer.NetworkSettings.Networks {
-			data.Network = network
-			break
-		}
-	}
-	data.Cmd = oldContainer.Config.Cmd
-	data.Entrypoint = oldContainer.Config.Entrypoint
-	data.Env = oldContainer.Config.Env
-	data.CPUShares = oldContainer.HostConfig.CPUShares
-	for key, val := range oldContainer.Config.Labels {
-		data.Labels = append(data.Labels, fmt.Sprintf("%s=%s", key, val))
-	}
-	for key, val := range oldContainer.HostConfig.PortBindings {
-		var itemPort dto.PortHelper
-		if !strings.Contains(string(key), "/") {
-			continue
-		}
-		itemPort.ContainerPort = strings.Split(string(key), "/")[0]
-		itemPort.Protocol = strings.Split(string(key), "/")[1]
-		for _, binds := range val {
-			itemPort.HostIP = binds.HostIP
-			itemPort.HostPort = binds.HostPort
-			data.ExposedPorts = append(data.ExposedPorts, itemPort)
-		}
-	}
-	data.AutoRemove = oldContainer.HostConfig.AutoRemove
-	data.PublishAllPorts = oldContainer.HostConfig.PublishAllPorts
-	data.RestartPolicy = oldContainer.HostConfig.RestartPolicy.Name
-	if oldContainer.HostConfig.NanoCPUs != 0 {
-		data.NanoCPUs = float64(oldContainer.HostConfig.NanoCPUs) / 1000000000
-	}
-	if oldContainer.HostConfig.Memory != 0 {
-		data.Memory = float64(oldContainer.HostConfig.Memory) / 1024 / 1024
-	}
-	data.Volumes = loadVolumeBinds(oldContainer.HostConfig.Binds)
-
-	return &data, nil
-}
-
-func (u *ContainerService) ContainerUpdate(req dto.ContainerOperate) error {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return err
-	}
-	ctx := context.Background()
-	newContainer, _ := client.ContainerInspect(ctx, req.Name)
-	if newContainer.ContainerJSONBase != nil && newContainer.ID != req.ContainerID {
-		return buserr.New(constant.ErrContainerName)
-	}
-
-	oldContainer, err := client.ContainerInspect(ctx, req.ContainerID)
-	if err != nil {
-		return err
-	}
-	if !checkImageExist(client, req.Image) || req.ForcePull {
-		if err := pullImages(ctx, client, req.Image); err != nil {
-			if !req.ForcePull {
-				return err
-			}
-			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
-		}
-	}
-
-	if err := client.ContainerRemove(ctx, req.ContainerID, types.ContainerRemoveOptions{Force: true}); err != nil {
-		return err
-	}
-
-	config := oldContainer.Config
-	hostConf := oldContainer.HostConfig
-	var networkConf network.NetworkingConfig
-	if err := loadConfigInfo(req, config, hostConf, &networkConf); err != nil {
-		reCreateAfterUpdate(req.Name, client, oldContainer.Config, oldContainer.HostConfig, oldContainer.NetworkSettings)
-		return err
-	}
-
-	global.LOG.Infof("new container info %s has been update, now start to recreate", req.Name)
-	container, err := client.ContainerCreate(ctx, config, hostConf, &networkConf, &v1.Platform{}, req.Name)
-	if err != nil {
-		reCreateAfterUpdate(req.Name, client, oldContainer.Config, oldContainer.HostConfig, oldContainer.NetworkSettings)
-		return fmt.Errorf("update contianer failed, err: %v", err)
-	}
-	global.LOG.Infof("update container %s successful! now check if the container is started.", req.Name)
-	if err := client.ContainerStart(ctx, container.ID, types.ContainerStartOptions{}); err != nil {
-		return fmt.Errorf("update successful but start failed, err: %v", err)
-	}
-
-	return nil
-}
-
-func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return err
-	}
-	ctx := context.Background()
-	oldContainer, err := client.ContainerInspect(ctx, req.Name)
-	if err != nil {
-		return err
-	}
-	if !checkImageExist(client, req.Image) || req.ForcePull {
-		if err := pullImages(ctx, client, req.Image); err != nil {
-			if !req.ForcePull {
-				return err
-			}
-			global.LOG.Errorf("force pull image %s failed, err: %v", req.Image, err)
-		}
-	}
-	config := oldContainer.Config
-	config.Image = req.Image
-	hostConf := oldContainer.HostConfig
-	var networkConf network.NetworkingConfig
-	if oldContainer.NetworkSettings != nil {
-		for networkKey := range oldContainer.NetworkSettings.Networks {
-			networkConf.EndpointsConfig = map[string]*network.EndpointSettings{networkKey: {}}
-			break
-		}
-	}
-	if err := client.ContainerRemove(ctx, req.Name, types.ContainerRemoveOptions{Force: true}); err != nil {
-		return err
-	}
-
-	global.LOG.Infof("new container info %s has been update, now start to recreate", req.Name)
-	container, err := client.ContainerCreate(ctx, config, hostConf, &networkConf, &v1.Platform{}, req.Name)
-	if err != nil {
-		reCreateAfterUpdate(req.Name, client, oldContainer.Config, oldContainer.HostConfig, oldContainer.NetworkSettings)
-		return fmt.Errorf("upgrade contianer failed, err: %v", err)
-	}
-	global.LOG.Infof("upgrade container %s successful! now check if the container is started.", req.Name)
-	if err := client.ContainerStart(ctx, container.ID, types.ContainerStartOptions{}); err != nil {
-		return fmt.Errorf("upgrade successful but start failed, err: %v", err)
-	}
-
-	return nil
-}
-
 func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error {
 	var err error
 	ctx := context.Background()
@@ -517,10 +304,6 @@ func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error
 	case constant.ContainerOpUnpause:
 		err = client.ContainerUnpause(ctx, req.Name)
 	case constant.ContainerOpRename:
-		newContainer, _ := client.ContainerInspect(ctx, req.NewName)
-		if newContainer.ContainerJSONBase != nil {
-			return buserr.New(constant.ErrContainerName)
-		}
 		err = client.ContainerRename(ctx, req.Name, req.NewName)
 	case constant.ContainerOpRemove:
 		err = client.ContainerRemove(ctx, req.Name, types.ContainerRemoveOptions{RemoveVolumes: true, Force: true})
@@ -533,15 +316,11 @@ func (u *ContainerService) ContainerLogClean(req dto.OperationWithName) error {
 	if err != nil {
 		return err
 	}
-	ctx := context.Background()
-	containerItem, err := client.ContainerInspect(ctx, req.Name)
+	container, err := client.ContainerInspect(context.Background(), req.Name)
 	if err != nil {
 		return err
 	}
-	if err := client.ContainerStop(ctx, containerItem.ID, container.StopOptions{}); err != nil {
-		return err
-	}
-	file, err := os.OpenFile(containerItem.LogPath, os.O_RDWR|os.O_CREATE, 0666)
+	file, err := os.OpenFile(container.LogPath, os.O_RDWR|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
@@ -550,61 +329,22 @@ func (u *ContainerService) ContainerLogClean(req dto.OperationWithName) error {
 		return err
 	}
 	_, _ = file.Seek(0, 0)
-
-	files, _ := filepath.Glob(fmt.Sprintf("%s.*", containerItem.LogPath))
-	for _, file := range files {
-		_ = os.Remove(file)
-	}
-
-	if err := client.ContainerStart(ctx, containerItem.ID, types.ContainerStartOptions{}); err != nil {
-		return err
-	}
 	return nil
 }
 
-func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, container, since, tail string, follow bool) error {
-	if cmd.CheckIllegal(container, since, tail) {
-		return buserr.New(constant.ErrCmdIllegal)
+func (u *ContainerService) ContainerLogs(req dto.ContainerLog) (string, error) {
+	cmd := exec.Command("docker", "logs", req.ContainerID)
+	if req.Mode != "all" {
+		cmd = exec.Command("docker", "logs", req.ContainerID, "--since", req.Mode)
 	}
-	command := fmt.Sprintf("docker logs %s", container)
-	if tail != "0" {
-		command += " --tail " + tail
-	}
-	if since != "all" {
-		command += " --since " + since
-	}
-	if follow {
-		command += " -f"
-	}
-	command += " 2>&1"
-	cmd := exec.Command("bash", "-c", command)
-	stdout, err := cmd.StdoutPipe()
+	stdout, err := cmd.CombinedOutput()
 	if err != nil {
-		return err
+		return "", errors.New(string(stdout))
 	}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	buffer := make([]byte, 1024)
-	for {
-		n, err := stdout.Read(buffer)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			global.LOG.Errorf("read bytes from container log failed, err: %v", err)
-			continue
-		}
-		if err = wsConn.WriteMessage(websocket.TextMessage, buffer[:n]); err != nil {
-			global.LOG.Errorf("send message with container log to ws failed, err: %v", err)
-			break
-		}
-	}
-	return nil
+	return string(stdout), nil
 }
 
-func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error) {
+func (u *ContainerService) ContainerStats(id string) (*dto.ContainterStats, error) {
 	client, err := docker.NewDockerClient()
 	if err != nil {
 		return nil, err
@@ -625,7 +365,7 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
 	if err := json.Unmarshal(body, &stats); err != nil {
 		return nil, err
 	}
-	var data dto.ContainerStats
+	var data dto.ContainterStats
 	data.CPUPercent = calculateCPUPercentUnix(stats)
 	data.IORead, data.IOWrite = calculateBlockIO(stats.BlkioStats)
 	data.Memory = float64(stats.MemoryStats.Usage) / 1024 / 1024
@@ -638,48 +378,6 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
 	return &data, nil
 }
 
-func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) string {
-	filePath := ""
-	switch req.Type {
-	case "image-pull", "image-push", "image-build", "compose-create":
-		filePath = path.Join(global.CONF.System.TmpDir, fmt.Sprintf("docker_logs/%s", req.Name))
-	case "compose-detail":
-		client, err := docker.NewDockerClient()
-		if err != nil {
-			return ""
-		}
-		options := types.ContainerListOptions{All: true}
-		options.Filters = filters.NewArgs()
-		options.Filters.Add("label", fmt.Sprintf("%s=%s", composeProjectLabel, req.Name))
-		containers, err := client.ContainerList(context.Background(), options)
-		if err != nil {
-			return ""
-		}
-		for _, container := range containers {
-			config := container.Labels[composeConfigLabel]
-			workdir := container.Labels[composeWorkdirLabel]
-			if len(config) != 0 && len(workdir) != 0 && strings.Contains(config, workdir) {
-				filePath = config
-				break
-			} else {
-				filePath = workdir
-				break
-			}
-		}
-		if req.Type == "compose-create" {
-			filePath = path.Join(path.Dir(filePath), "compose.log")
-		}
-	}
-	if _, err := os.Stat(filePath); err != nil {
-		return ""
-	}
-	content, err := os.ReadFile(filePath)
-	if err != nil {
-		return ""
-	}
-	return string(content)
-}
-
 func stringsToMap(list []string) map[string]string {
 	var lableMap = make(map[string]string)
 	for _, label := range list {
@@ -831,158 +529,3 @@ func checkPortStats(ports []dto.PortHelper) (nat.PortMap, error) {
 	}
 	return portMap, nil
 }
-
-func loadConfigInfo(req dto.ContainerOperate, config *container.Config, hostConf *container.HostConfig, networkConf *network.NetworkingConfig) error {
-	portMap, err := checkPortStats(req.ExposedPorts)
-	if err != nil {
-		return err
-	}
-	exposeds := make(nat.PortSet)
-	for port := range portMap {
-		exposeds[port] = struct{}{}
-	}
-	config.Image = req.Image
-	config.Cmd = req.Cmd
-	config.Entrypoint = req.Entrypoint
-	config.Env = req.Env
-	config.Labels = stringsToMap(req.Labels)
-	config.ExposedPorts = exposeds
-
-	if len(req.Network) != 0 {
-		networkConf.EndpointsConfig = map[string]*network.EndpointSettings{req.Network: {}}
-	} else {
-		networkConf = &network.NetworkingConfig{}
-	}
-
-	hostConf.AutoRemove = req.AutoRemove
-	hostConf.CPUShares = req.CPUShares
-	hostConf.PublishAllPorts = req.PublishAllPorts
-	hostConf.RestartPolicy = container.RestartPolicy{Name: req.RestartPolicy}
-	if req.RestartPolicy == "on-failure" {
-		hostConf.RestartPolicy.MaximumRetryCount = 5
-	}
-	hostConf.NanoCPUs = int64(req.NanoCPUs * 1000000000)
-	hostConf.Memory = int64(req.Memory * 1024 * 1024)
-	hostConf.PortBindings = portMap
-	hostConf.Binds = []string{}
-	config.Volumes = make(map[string]struct{})
-	for _, volume := range req.Volumes {
-		config.Volumes[volume.ContainerDir] = struct{}{}
-		hostConf.Binds = append(hostConf.Binds, fmt.Sprintf("%s:%s:%s", volume.SourceDir, volume.ContainerDir, volume.Mode))
-	}
-	return nil
-}
-
-func reCreateAfterUpdate(name string, client *client.Client, config *container.Config, hostConf *container.HostConfig, networkConf *types.NetworkSettings) {
-	ctx := context.Background()
-
-	var oldNetworkConf network.NetworkingConfig
-	if networkConf != nil {
-		for networkKey := range networkConf.Networks {
-			oldNetworkConf.EndpointsConfig = map[string]*network.EndpointSettings{networkKey: {}}
-			break
-		}
-	}
-
-	oldContainer, err := client.ContainerCreate(ctx, config, hostConf, &oldNetworkConf, &v1.Platform{}, name)
-	if err != nil {
-		global.LOG.Errorf("recreate after container update failed, err: %v", err)
-		return
-	}
-	if err := client.ContainerStart(ctx, oldContainer.ID, types.ContainerStartOptions{}); err != nil {
-		global.LOG.Errorf("restart after container update failed, err: %v", err)
-	}
-}
-
-func loadVolumeBinds(binds []string) []dto.VolumeHelper {
-	var datas []dto.VolumeHelper
-	for _, bind := range binds {
-		parts := strings.Split(bind, ":")
-		var volumeItem dto.VolumeHelper
-		if len(parts) > 3 {
-			continue
-		}
-		volumeItem.SourceDir = parts[0]
-		if len(parts) == 1 {
-			volumeItem.ContainerDir = parts[0]
-			volumeItem.Mode = "rw"
-		}
-		if len(parts) == 2 {
-			switch parts[1] {
-			case "r", "ro":
-				volumeItem.ContainerDir = parts[0]
-				volumeItem.Mode = "ro"
-			case "rw":
-				volumeItem.ContainerDir = parts[0]
-				volumeItem.Mode = "rw"
-			default:
-				volumeItem.ContainerDir = parts[1]
-				volumeItem.Mode = "rw"
-			}
-		}
-		if len(parts) == 3 {
-			volumeItem.ContainerDir = parts[1]
-			if parts[2] == "r" {
-				volumeItem.Mode = "ro"
-			} else {
-				volumeItem.Mode = parts[2]
-			}
-		}
-		datas = append(datas, volumeItem)
-	}
-	return datas
-}
-
-func simplifyPort(ports []types.Port) []string {
-	var datas []string
-	if len(ports) == 0 {
-		return datas
-	}
-	if len(ports) == 1 {
-		itemPortStr := fmt.Sprintf("%s:%v/%s", ports[0].IP, ports[0].PrivatePort, ports[0].Type)
-		if ports[0].PublicPort != 0 {
-			itemPortStr = fmt.Sprintf("%s:%v->%v/%s", ports[0].IP, ports[0].PublicPort, ports[0].PrivatePort, ports[0].Type)
-		}
-		datas = append(datas, itemPortStr)
-		return datas
-	}
-
-	sort.Slice(ports, func(i, j int) bool {
-		return ports[i].PrivatePort < ports[j].PrivatePort
-	})
-	start := ports[0]
-
-	for i := 1; i < len(ports); i++ {
-		if ports[i].PrivatePort != ports[i-1].PrivatePort+1 || ports[i].IP != ports[i-1].IP || ports[i].PublicPort != ports[i-1].PublicPort+1 || ports[i].Type != ports[i-1].Type {
-			if ports[i-1].PrivatePort == start.PrivatePort {
-				itemPortStr := fmt.Sprintf("%s:%v/%s", start.IP, start.PrivatePort, start.Type)
-				if start.PublicPort != 0 {
-					itemPortStr = fmt.Sprintf("%s:%v->%v/%s", start.IP, start.PublicPort, start.PrivatePort, start.Type)
-				}
-				datas = append(datas, itemPortStr)
-			} else {
-				itemPortStr := fmt.Sprintf("%s:%v-%v/%s", start.IP, start.PrivatePort, ports[i-1].PrivatePort, start.Type)
-				if start.PublicPort != 0 {
-					itemPortStr = fmt.Sprintf("%s:%v-%v->%v-%v/%s", start.IP, start.PublicPort, ports[i-1].PublicPort, start.PrivatePort, ports[i-1].PrivatePort, start.Type)
-				}
-				datas = append(datas, itemPortStr)
-			}
-			start = ports[i]
-		} else if i == len(ports)-1 {
-			if ports[i].PrivatePort == start.PrivatePort {
-				itemPortStr := fmt.Sprintf("%s:%v/%s", start.IP, start.PrivatePort, start.Type)
-				if start.PublicPort != 0 {
-					itemPortStr = fmt.Sprintf("%s:%v->%v/%s", start.IP, start.PublicPort, start.PrivatePort, start.Type)
-				}
-				datas = append(datas, itemPortStr)
-			} else {
-				itemPortStr := fmt.Sprintf("%s:%v-%v/%s", start.IP, start.PrivatePort, ports[i].PrivatePort, start.Type)
-				if start.PublicPort != 0 {
-					itemPortStr = fmt.Sprintf("%s:%v-%v->%v-%v/%s", start.IP, start.PublicPort, ports[i].PublicPort, start.PrivatePort, ports[i].PrivatePort, start.Type)
-				}
-				datas = append(datas, itemPortStr)
-			}
-		}
-	}
-	return datas
-}

backend/app/service/container_compose.go

@@ -14,10 +14,8 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/compose"
 	"github.com/1Panel-dev/1Panel/backend/utils/docker"
 	"github.com/docker/docker/api/types"
@@ -94,7 +92,7 @@ func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface
 		}
 	}
 	for _, item := range composeCreatedByLocal {
-		if err := composeRepo.DeleteRecord(commonRepo.WithByID(item.ID)); err != nil {
+		if err := composeRepo.DeleteRecord(commonRepo.WithByName(item.Name)); err != nil {
 			global.LOG.Error(err)
 		}
 	}
@@ -129,13 +127,6 @@ func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface
 }
 
 func (u *ContainerService) TestCompose(req dto.ComposeCreate) (bool, error) {
-	if cmd.CheckIllegal(req.Path) {
-		return false, buserr.New(constant.ErrCmdIllegal)
-	}
-	composeItem, _ := composeRepo.GetRecord(commonRepo.WithByName(req.Name))
-	if composeItem.ID != 0 {
-		return false, constant.ErrRecordExist
-	}
 	if err := u.loadPath(&req); err != nil {
 		return false, err
 	}
@@ -148,26 +139,16 @@ func (u *ContainerService) TestCompose(req dto.ComposeCreate) (bool, error) {
 }
 
 func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error) {
-	if cmd.CheckIllegal(req.Name, req.Path) {
-		return "", buserr.New(constant.ErrCmdIllegal)
-	}
 	if err := u.loadPath(&req); err != nil {
 		return "", err
 	}
 	global.LOG.Infof("docker-compose.yml %s create successful, start to docker-compose up", req.Name)
 
 	if req.From == "path" {
-		req.Name = path.Base(path.Dir(req.Path))
+		req.Name = path.Base(strings.ReplaceAll(req.Path, "/"+path.Base(req.Path), ""))
 	}
-
-	dockerLogDir := path.Join(global.CONF.System.TmpDir, "docker_logs")
-	if _, err := os.Stat(dockerLogDir); err != nil && os.IsNotExist(err) {
-		if err = os.MkdirAll(dockerLogDir, os.ModePerm); err != nil {
-			return "", err
-		}
-	}
-	logItem := fmt.Sprintf("%s/compose_create_%s_%s.log", dockerLogDir, req.Name, time.Now().Format("20060102150405"))
-	file, err := os.OpenFile(logItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	logName := path.Dir(req.Path) + "/compose.log"
+	file, err := os.OpenFile(logName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 	if err != nil {
 		return "", err
 	}
@@ -188,13 +169,10 @@ func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error)
 		_, _ = file.WriteString("docker-compose up successful!")
 	}()
 
-	return path.Base(logItem), nil
+	return logName, nil
 }
 
 func (u *ContainerService) ComposeOperation(req dto.ComposeOperation) error {
-	if cmd.CheckIllegal(req.Path, req.Operation) {
-		return buserr.New(constant.ErrCmdIllegal)
-	}
 	if _, err := os.Stat(req.Path); err != nil {
 		return fmt.Errorf("load file with path %s failed, %v", req.Path, err)
 	}
@@ -213,9 +191,6 @@ func (u *ContainerService) ComposeOperation(req dto.ComposeOperation) error {
 }
 
 func (u *ContainerService) ComposeUpdate(req dto.ComposeUpdate) error {
-	if cmd.CheckIllegal(req.Name, req.Path) {
-		return buserr.New(constant.ErrCmdIllegal)
-	}
 	if _, err := os.Stat(req.Path); err != nil {
 		return fmt.Errorf("load file with path %s failed, %v", req.Path, err)
 	}

backend/app/service/container_network.go

@@ -75,26 +75,6 @@ func (u *ContainerService) PageNetwork(req dto.SearchWithPage) (int64, interface
 
 	return int64(total), data, nil
 }
-
-func (u *ContainerService) ListNetwork() ([]dto.Options, error) {
-	client, err := docker.NewDockerClient()
-	if err != nil {
-		return nil, err
-	}
-	list, err := client.NetworkList(context.TODO(), types.NetworkListOptions{})
-	if err != nil {
-		return nil, err
-	}
-	var datas []dto.Options
-	for _, item := range list {
-		datas = append(datas, dto.Options{Option: item.Name})
-	}
-	sort.Slice(datas, func(i, j int) bool {
-		return datas[i].Option < datas[j].Option
-	})
-	return datas, nil
-}
-
 func (u *ContainerService) DeleteNetwork(req dto.BatchDelete) error {
 	client, err := docker.NewDockerClient()
 	if err != nil {

backend/app/service/container_volume.go

@@ -80,16 +80,13 @@ func (u *ContainerService) ListVolume() ([]dto.Options, error) {
 	if err != nil {
 		return nil, err
 	}
-	var datas []dto.Options
+	var data []dto.Options
 	for _, item := range list.Volumes {
-		datas = append(datas, dto.Options{
+		data = append(data, dto.Options{
 			Option: item.Name,
 		})
 	}
-	sort.Slice(datas, func(i, j int) bool {
-		return datas[i].Option < datas[j].Option
-	})
-	return datas, nil
+	return data, nil
 }
 func (u *ContainerService) DeleteVolume(req dto.BatchDelete) error {
 	client, err := docker.NewDockerClient()

backend/app/service/cornjob.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/jinzhu/copier"
@@ -30,8 +29,6 @@ type ICronjobService interface {
 	Download(down dto.CronjobDownload) (string, error)
 	StartJob(cronjob *model.Cronjob) (int, error)
 	CleanRecord(req dto.CronjobClean) error
-
-	LoadRecordLog(req dto.OperateByID) (string, error)
 }
 
 func NewICronjobService() ICronjobService {
@@ -39,14 +36,14 @@ func NewICronjobService() ICronjobService {
 }
 
 func (u *CronjobService) SearchWithPage(search dto.SearchWithPage) (int64, interface{}, error) {
-	total, cronjobs, err := cronjobRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info), commonRepo.WithOrderRuleBy(search.OrderBy, search.Order))
+	total, cronjobs, err := cronjobRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info))
 	var dtoCronjobs []dto.CronjobInfo
 	for _, cronjob := range cronjobs {
 		var item dto.CronjobInfo
 		if err := copier.Copy(&item, &cronjob); err != nil {
 			return 0, nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
 		}
-		if item.Type == "app" || item.Type == "website" || item.Type == "database" || item.Type == "directory" || item.Type == "snapshot" {
+		if item.Type == "website" || item.Type == "database" || item.Type == "directory" {
 			backup, _ := backupRepo.Get(commonRepo.WithByID(uint(item.TargetDirID)))
 			if len(backup.Type) != 0 {
 				item.TargetDir = backup.Type
@@ -83,27 +80,12 @@ func (u *CronjobService) SearchRecords(search dto.SearchRecord) (int64, interfac
 	return total, dtoCronjobs, err
 }
 
-func (u *CronjobService) LoadRecordLog(req dto.OperateByID) (string, error) {
-	record, err := cronjobRepo.GetRecord(commonRepo.WithByID(req.ID))
-	if err != nil {
-		return "", err
-	}
-	if _, err := os.Stat(record.Records); err != nil {
-		return "", buserr.New("ErrHttpReqNotFound")
-	}
-	content, err := os.ReadFile(record.Records)
-	if err != nil {
-		return "", err
-	}
-	return string(content), nil
-}
-
 func (u *CronjobService) CleanRecord(req dto.CronjobClean) error {
 	cronjob, err := cronjobRepo.Get(commonRepo.WithByID(req.CronjobID))
 	if err != nil {
 		return err
 	}
-	if req.CleanData && (cronjob.Type == "app" || cronjob.Type == "database" || cronjob.Type == "website" || cronjob.Type == "directory" || cronjob.Type == "snapshot") {
+	if req.CleanData && (cronjob.Type == "database" || cronjob.Type == "website" || cronjob.Type == "directory") {
 		cronjob.RetainCopies = 0
 		backup, err := backupRepo.Get(commonRepo.WithByID(uint(cronjob.TargetDirID)))
 		if err != nil {
@@ -118,9 +100,9 @@ func (u *CronjobService) CleanRecord(req dto.CronjobClean) error {
 			if err != nil {
 				return err
 			}
-			u.HandleRmExpired(backup.Type, backup.BackupPath, localDir, &cronjob, client)
+			u.HandleRmExpired(backup.Type, localDir, &cronjob, client)
 		} else {
-			u.HandleRmExpired(backup.Type, backup.BackupPath, "", &cronjob, nil)
+			u.HandleRmExpired(backup.Type, "", &cronjob, nil)
 		}
 	}
 	delRecords, err := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(req.CronjobID)))
@@ -141,27 +123,29 @@ func (u *CronjobService) Download(down dto.CronjobDownload) (string, error) {
 	if record.ID == 0 {
 		return "", constant.ErrRecordNotFound
 	}
+	cronjob, _ := cronjobRepo.Get(commonRepo.WithByID(record.CronjobID))
+	if cronjob.ID == 0 {
+		return "", constant.ErrRecordNotFound
+	}
 	backup, _ := backupRepo.Get(commonRepo.WithByID(down.BackupAccountID))
-	if backup.ID == 0 {
+	if cronjob.ID == 0 {
 		return "", constant.ErrRecordNotFound
 	}
 	if backup.Type == "LOCAL" || record.FromLocal {
 		if _, err := os.Stat(record.File); err != nil && os.IsNotExist(err) {
-			return "", err
+			return "", constant.ErrRecordNotFound
 		}
 		return record.File, nil
 	}
+	client, err := NewIBackupService().NewClient(&backup)
+	if err != nil {
+		return "", err
+	}
 	tempPath := fmt.Sprintf("%s/download/%s", constant.DataDir, record.File)
-	if _, err := os.Stat(tempPath); err != nil && os.IsNotExist(err) {
-		client, err := NewIBackupService().NewClient(&backup)
-		if err != nil {
-			return "", err
-		}
-		_ = os.MkdirAll(path.Dir(tempPath), os.ModePerm)
-		isOK, err := client.Download(record.File, tempPath)
-		if !isOK || err != nil {
-			return "", err
-		}
+	_ = os.MkdirAll(path.Dir(tempPath), os.ModePerm)
+	isOK, err := client.Download(record.File, tempPath)
+	if !isOK || err != nil {
+		return "", constant.ErrRecordNotFound
 	}
 	return tempPath, nil
 }
@@ -254,14 +238,12 @@ func (u *CronjobService) Update(id uint, req dto.CronjobUpdate) error {
 	upMap["name"] = req.Name
 	upMap["spec"] = cronjob.Spec
 	upMap["script"] = req.Script
-	upMap["container_name"] = req.ContainerName
 	upMap["spec_type"] = req.SpecType
 	upMap["week"] = req.Week
 	upMap["day"] = req.Day
 	upMap["hour"] = req.Hour
 	upMap["minute"] = req.Minute
 	upMap["second"] = req.Second
-	upMap["app_id"] = req.AppID
 	upMap["website"] = req.Website
 	upMap["exclusion_rules"] = req.ExclusionRules
 	upMap["db_name"] = req.DBName

backend/app/service/cronjob_helper.go

@@ -5,13 +5,12 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
+	"github.com/1Panel-dev/1Panel/backend/app/repo"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cloud_storage"
@@ -33,26 +32,20 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 			if len(cronjob.Script) == 0 {
 				return
 			}
-			if len(cronjob.ContainerName) != 0 {
-				message, err = u.handleShell(cronjob.Type, cronjob.Name, fmt.Sprintf("docker exec %s %s", cronjob.ContainerName, cronjob.Script))
-			} else {
-				message, err = u.handleShell(cronjob.Type, cronjob.Name, cronjob.Script)
-			}
-			u.HandleRmExpired("LOCAL", "", "", cronjob, nil)
-		case "snapshot":
-			messageItem := ""
-			messageItem, record.File, err = u.handleSnapshot(cronjob, record.StartTime)
-			message = []byte(messageItem)
+			message, err = u.handleShell(cronjob.Type, cronjob.Name, cronjob.Script)
+			u.HandleRmExpired("LOCAL", "", cronjob, nil)
 		case "curl":
 			if len(cronjob.URL) == 0 {
 				return
 			}
 			message, err = u.handleShell(cronjob.Type, cronjob.Name, fmt.Sprintf("curl '%s'", cronjob.URL))
-			u.HandleRmExpired("LOCAL", "", "", cronjob, nil)
+			u.HandleRmExpired("LOCAL", "", cronjob, nil)
 		case "ntp":
 			err = u.handleNtpSync()
-			u.HandleRmExpired("LOCAL", "", "", cronjob, nil)
-		case "website", "database", "app":
+			u.HandleRmExpired("LOCAL", "", cronjob, nil)
+		case "website":
+			record.File, err = u.handleBackup(cronjob, record.StartTime)
+		case "database":
 			record.File, err = u.handleBackup(cronjob, record.StartTime)
 		case "directory":
 			if len(cronjob.SourceDir) == 0 {
@@ -65,7 +58,6 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 				global.LOG.Errorf("cut website log file failed, err: %v", err)
 			}
 		}
-
 		if err != nil {
 			cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), string(message))
 			return
@@ -89,7 +81,7 @@ func (u *CronjobService) handleShell(cronType, cornName, script string) ([]byte,
 	}
 	stdout, err := cmd.ExecCronjobWithTimeOut(script, handleDir, 24*time.Hour)
 	if err != nil {
-		return []byte(stdout), err
+		return nil, err
 	}
 	return []byte(stdout), nil
 }
@@ -122,17 +114,18 @@ func (u *CronjobService) handleBackup(cronjob *model.Cronjob, startTime time.Tim
 
 	switch cronjob.Type {
 	case "database":
-		paths, err := u.handleDatabase(*cronjob, backup, startTime)
-		return strings.Join(paths, ","), err
-	case "app":
-		paths, err := u.handleApp(*cronjob, backup, startTime)
+		app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+		if err != nil {
+			return "", err
+		}
+		paths, err := u.handleDatabase(*cronjob, app, backup, startTime)
 		return strings.Join(paths, ","), err
 	case "website":
 		paths, err := u.handleWebsite(*cronjob, backup, startTime)
 		return strings.Join(paths, ","), err
 	default:
 		fileName := fmt.Sprintf("directory%s_%s.tar.gz", strings.ReplaceAll(cronjob.SourceDir, "/", "_"), startTime.Format("20060102150405"))
-		backupDir := path.Join(localDir, fmt.Sprintf("%s/%s", cronjob.Type, cronjob.Name))
+		backupDir := fmt.Sprintf("%s/%s/%s", localDir, cronjob.Type, cronjob.Name)
 		itemFileDir := fmt.Sprintf("%s/%s", cronjob.Type, cronjob.Name)
 		global.LOG.Infof("handle tar %s to %s", backupDir, fileName)
 		if err := handleTar(cronjob.SourceDir, backupDir, fileName, cronjob.ExclusionRules); err != nil {
@@ -149,59 +142,39 @@ func (u *CronjobService) handleBackup(cronjob *model.Cronjob, startTime time.Tim
 			if err != nil {
 				return "", err
 			}
-			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
-			}
 			if _, err = client.Upload(backupDir+"/"+fileName, itemFileDir+"/"+fileName); err != nil {
 				return "", err
 			}
 		}
-		u.HandleRmExpired(backup.Type, backup.BackupPath, localDir, cronjob, client)
+		u.HandleRmExpired(backup.Type, localDir, cronjob, client)
 		if backup.Type == "LOCAL" || cronjob.KeepLocal {
-			return fmt.Sprintf("%s/%s", backupDir, fileName), nil
-		} else {
-			return fmt.Sprintf("%s/%s", itemFileDir, fileName), nil
+			return fmt.Sprintf("%s/%s/%s/%s", localDir, cronjob.Type, cronjob.Name, fileName), nil
 		}
+		return fmt.Sprintf("%s/%s/%s", cronjob.Type, cronjob.Name, fileName), nil
 	}
 }
 
-func (u *CronjobService) HandleRmExpired(backType, backupPath, localDir string, cronjob *model.Cronjob, backClient cloud_storage.CloudStorageClient) {
+func (u *CronjobService) HandleRmExpired(backType, localDir string, cronjob *model.Cronjob, backClient cloud_storage.CloudStorageClient) {
 	global.LOG.Infof("start to handle remove expired, retain copies: %d", cronjob.RetainCopies)
 	records, _ := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(cronjob.ID)), commonRepo.WithOrderBy("created_at desc"))
-	if len(records) <= int(cronjob.RetainCopies) {
-		return
-	}
-	for i := int(cronjob.RetainCopies); i < len(records); i++ {
-		if len(records[i].File) != 0 {
-			files := strings.Split(records[i].File, ",")
-			for _, file := range files {
-				_ = os.Remove(file)
-				_ = backupRepo.DeleteRecord(context.TODO(), backupRepo.WithByFileName(path.Base(file)))
-				if backType == "LOCAL" {
-					continue
-				}
-
-				fileItem := file
-				if cronjob.KeepLocal {
-					if len(backupPath) != 0 {
-						itemPath := strings.TrimPrefix(backupPath, "/")
-						itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-						fileItem = itemPath + strings.TrimPrefix(file, localDir+"/")
+	if len(records) > int(cronjob.RetainCopies) {
+		for i := int(cronjob.RetainCopies); i < len(records); i++ {
+			if len(records[i].File) != 0 {
+				files := strings.Split(records[i].File, ",")
+				for _, file := range files {
+					if backType != "LOCAL" {
+						_, _ = backClient.Delete(strings.ReplaceAll(file, localDir+"/", ""))
+						_ = os.Remove(file)
 					} else {
-						fileItem = strings.TrimPrefix(file, localDir+"/")
+						_ = os.Remove(file)
 					}
+					_ = backupRepo.DeleteRecord(context.TODO(), backupRepo.WithByFileName(path.Base(file)))
 				}
-
-				if cronjob.Type == "snapshot" {
-					_ = snapshotRepo.Delete(commonRepo.WithByName(strings.TrimSuffix(path.Base(fileItem), ".tar.gz")))
-				}
-				_, _ = backClient.Delete(fileItem)
 			}
+
+			_ = cronjobRepo.DeleteRecord(commonRepo.WithByID(uint(records[i].ID)))
+			_ = os.Remove(records[i].Records)
 		}
-		_ = cronjobRepo.DeleteRecord(commonRepo.WithByID(uint(records[i].ID)))
-		_ = os.Remove(records[i].Records)
 	}
 }
 
@@ -232,14 +205,12 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string) error {
 		path = sourceDir
 	}
 
-	commands := fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s", targetDir+"/"+name, excludeRules, path)
+	commands := fmt.Sprintf("tar zcvf %s %s %s", targetDir+"/"+name, excludeRules, path)
 	global.LOG.Debug(commands)
-	stdout, err := cmd.ExecWithTimeOut(commands, 24*time.Hour)
+	stdout, err := cmd.ExecWithTimeOut(commands, 5*time.Minute)
 	if err != nil {
-		if len(stdout) != 0 {
-			global.LOG.Errorf("do handle tar failed, stdout: %s, err: %v", stdout, err)
-			return fmt.Errorf("do handle tar failed, stdout: %s, err: %v", stdout, err)
-		}
+		global.LOG.Errorf("do handle tar failed, stdout: %s, err: %v", stdout, err)
+		return errors.New(stdout)
 	}
 	return nil
 }
@@ -253,7 +224,7 @@ func handleUnTar(sourceFile, targetDir string) error {
 
 	commands := fmt.Sprintf("tar zxvfC %s %s", sourceFile, targetDir)
 	global.LOG.Debug(commands)
-	stdout, err := cmd.ExecWithTimeOut(commands, 24*time.Hour)
+	stdout, err := cmd.ExecWithTimeOut(commands, 5*time.Minute)
 	if err != nil {
 		global.LOG.Errorf("do handle untar failed, stdout: %s, err: %v", stdout, err)
 		return errors.New(stdout)
@@ -261,25 +232,22 @@ func handleUnTar(sourceFile, targetDir string) error {
 	return nil
 }
 
-func (u *CronjobService) handleDatabase(cronjob model.Cronjob, backup model.BackupAccount, startTime time.Time) ([]string, error) {
+func (u *CronjobService) handleDatabase(cronjob model.Cronjob, app *repo.RootInfo, backup model.BackupAccount, startTime time.Time) ([]string, error) {
 	var paths []string
 	localDir, err := loadLocalDir()
 	if err != nil {
 		return paths, err
 	}
 
-	var dbs []model.DatabaseMysql
+	var dblist []string
 	if cronjob.DBName == "all" {
-		dbs, err = mysqlRepo.List()
+		mysqlService := NewIMysqlService()
+		dblist, err = mysqlService.ListDBName()
 		if err != nil {
 			return paths, err
 		}
 	} else {
-		itemID, _ := (strconv.Atoi(cronjob.DBName))
-		dbs, err = mysqlRepo.List(commonRepo.WithByID(uint(itemID)))
-		if err != nil {
-			return paths, err
-		}
+		dblist = append(dblist, cronjob.DBName)
 	}
 
 	var client cloud_storage.CloudStorageClient
@@ -290,28 +258,27 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, backup model.Back
 		}
 	}
 
-	for _, dbInfo := range dbs {
+	for _, dbName := range dblist {
 		var record model.BackupRecord
 
-		database, _ := databaseRepo.Get(commonRepo.WithByName(dbInfo.MysqlName))
-		record.Type = database.Type
+		record.Type = "mysql"
+		record.Name = app.Name
 		record.Source = "LOCAL"
 		record.BackupType = backup.Type
 
-		record.Name = dbInfo.MysqlName
-		backupDir := path.Join(localDir, fmt.Sprintf("database/%s/%s/%s", database.Type, record.Name, dbInfo.Name))
-		record.FileName = fmt.Sprintf("db_%s_%s.sql.gz", dbInfo.Name, startTime.Format("20060102150405"))
-		if err = handleMysqlBackup(dbInfo.MysqlName, dbInfo.Name, backupDir, record.FileName); err != nil {
+		backupDir := fmt.Sprintf("%s/database/mysql/%s/%s", localDir, app.Name, dbName)
+		record.FileName = fmt.Sprintf("db_%s_%s.sql.gz", dbName, startTime.Format("20060102150405"))
+		if err = handleMysqlBackup(app, backupDir, dbName, record.FileName); err != nil {
 			return paths, err
 		}
-
-		record.DetailName = dbInfo.Name
+		record.DetailName = dbName
 		record.FileDir = backupDir
-		itemFileDir := strings.TrimPrefix(backupDir, localDir+"/")
+		itemFileDir := strings.ReplaceAll(backupDir, localDir+"/", "")
 		if !cronjob.KeepLocal && backup.Type != "LOCAL" {
 			record.Source = backup.Type
 			record.FileDir = itemFileDir
 		}
+		paths = append(paths, fmt.Sprintf("%s/%s", record.FileDir, record.FileName))
 
 		if err := backupRepo.CreateRecord(&record); err != nil {
 			global.LOG.Errorf("save backup record failed, err: %v", err)
@@ -323,22 +290,12 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, backup model.Back
 					_ = os.RemoveAll(fmt.Sprintf("%s/%s", backupDir, record.FileName))
 				}()
 			}
-			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
-			}
 			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
 				return paths, err
 			}
 		}
-		if backup.Type == "LOCAL" || cronjob.KeepLocal {
-			paths = append(paths, fmt.Sprintf("%s/%s", record.FileDir, record.FileName))
-		} else {
-			paths = append(paths, fmt.Sprintf("%s/%s", itemFileDir, record.FileName))
-		}
 	}
-	u.HandleRmExpired(backup.Type, backup.BackupPath, localDir, &cronjob, client)
+	u.HandleRmExpired(backup.Type, localDir, &cronjob, client)
 	return paths, nil
 }
 
@@ -373,10 +330,10 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t
 				wg.Done()
 				return
 			}
-			websiteLogDir := path.Join(baseDir, website.Alias, "log")
+			websiteLogDir := path.Join(baseDir, website.PrimaryDomain, "log")
 			srcAccessLogPath := path.Join(websiteLogDir, "access.log")
 			srcErrorLogPath := path.Join(websiteLogDir, "error.log")
-			dstLogDir := path.Join(global.CONF.System.Backup, "log", "website", website.Alias)
+			dstLogDir := path.Join(global.CONF.System.Backup, "log", "website", website.PrimaryDomain)
 			if !fileOp.Stat(dstLogDir) {
 				_ = os.MkdirAll(dstLogDir, 0755)
 			}
@@ -384,7 +341,7 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t
 			dstName := fmt.Sprintf("%s_log_%s.gz", website.PrimaryDomain, startTime.Format("20060102150405"))
 			filePaths = append(filePaths, path.Join(dstLogDir, dstName))
 			if err = fileOp.Compress([]string{srcAccessLogPath, srcErrorLogPath}, dstLogDir, dstName, files.Gz); err != nil {
-				global.LOG.Errorf("There was an error in compressing the website[%s] access.log, err: %v", website.PrimaryDomain, err)
+				global.LOG.Errorf("There was an error in compressing the website[%s] access.log", website.PrimaryDomain)
 			} else {
 				_ = fileOp.WriteFile(srcAccessLogPath, strings.NewReader(""), 0755)
 				_ = fileOp.WriteFile(srcErrorLogPath, strings.NewReader(""), 0755)
@@ -404,87 +361,10 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t
 		}()
 	}
 	wg.Wait()
-	u.HandleRmExpired("LOCAL", "", "", cronjob, nil)
+	u.HandleRmExpired("LOCAL", "", cronjob, nil)
 	return strings.Join(filePaths, ","), nil
 }
 
-func (u *CronjobService) handleApp(cronjob model.Cronjob, backup model.BackupAccount, startTime time.Time) ([]string, error) {
-	var paths []string
-	localDir, err := loadLocalDir()
-	if err != nil {
-		return paths, err
-	}
-
-	var applist []model.AppInstall
-	if cronjob.AppID == "all" {
-		applist, err = appInstallRepo.ListBy()
-		if err != nil {
-			return paths, err
-		}
-	} else {
-		itemID, _ := (strconv.Atoi(cronjob.AppID))
-		app, err := appInstallRepo.GetFirst(commonRepo.WithByID(uint(itemID)))
-		if err != nil {
-			return paths, err
-		}
-		applist = append(applist, app)
-	}
-
-	var client cloud_storage.CloudStorageClient
-	if backup.Type != "LOCAL" {
-		client, err = NewIBackupService().NewClient(&backup)
-		if err != nil {
-			return paths, err
-		}
-	}
-
-	for _, app := range applist {
-		var record model.BackupRecord
-		record.Type = "app"
-		record.Name = app.App.Key
-		record.DetailName = app.Name
-		record.Source = "LOCAL"
-		record.BackupType = backup.Type
-		backupDir := path.Join(localDir, fmt.Sprintf("app/%s/%s", app.App.Key, app.Name))
-		record.FileDir = backupDir
-		itemFileDir := strings.TrimPrefix(backupDir, localDir+"/")
-		if !cronjob.KeepLocal && backup.Type != "LOCAL" {
-			record.Source = backup.Type
-			record.FileDir = strings.TrimPrefix(backupDir, localDir+"/")
-		}
-		record.FileName = fmt.Sprintf("app_%s_%s.tar.gz", app.Name, startTime.Format("20060102150405"))
-		if err := handleAppBackup(&app, backupDir, record.FileName); err != nil {
-			return paths, err
-		}
-		if err := backupRepo.CreateRecord(&record); err != nil {
-			global.LOG.Errorf("save backup record failed, err: %v", err)
-			return paths, err
-		}
-		if backup.Type != "LOCAL" {
-			if !cronjob.KeepLocal {
-				defer func() {
-					_ = os.RemoveAll(fmt.Sprintf("%s/%s", backupDir, record.FileName))
-				}()
-			}
-			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
-			}
-			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
-				return paths, err
-			}
-		}
-		if backup.Type == "LOCAL" || cronjob.KeepLocal {
-			paths = append(paths, fmt.Sprintf("%s/%s", record.FileDir, record.FileName))
-		} else {
-			paths = append(paths, fmt.Sprintf("%s/%s", itemFileDir, record.FileName))
-		}
-	}
-	u.HandleRmExpired(backup.Type, backup.BackupPath, localDir, &cronjob, client)
-	return paths, nil
-}
-
 func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.BackupAccount, startTime time.Time) ([]string, error) {
 	var paths []string
 	localDir, err := loadLocalDir()
@@ -520,14 +400,15 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.Backu
 		if err != nil {
 			return paths, err
 		}
-		backupDir := path.Join(localDir, fmt.Sprintf("website/%s", website.PrimaryDomain))
+		backupDir := fmt.Sprintf("%s/website/%s", localDir, website.PrimaryDomain)
 		record.FileDir = backupDir
-		itemFileDir := strings.TrimPrefix(backupDir, localDir+"/")
+		itemFileDir := strings.ReplaceAll(backupDir, localDir+"/", "")
 		if !cronjob.KeepLocal && backup.Type != "LOCAL" {
 			record.Source = backup.Type
-			record.FileDir = strings.TrimPrefix(backupDir, localDir+"/")
+			record.FileDir = strings.ReplaceAll(backupDir, localDir+"/", "")
 		}
 		record.FileName = fmt.Sprintf("website_%s_%s.tar.gz", website.PrimaryDomain, startTime.Format("20060102150405"))
+		paths = append(paths, fmt.Sprintf("%s/%s", record.FileDir, record.FileName))
 		if err := handleWebsiteBackup(&website, backupDir, record.FileName); err != nil {
 			return paths, err
 		}
@@ -542,45 +423,11 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.Backu
 					_ = os.RemoveAll(fmt.Sprintf("%s/%s", backupDir, record.FileName))
 				}()
 			}
-			if len(backup.BackupPath) != 0 {
-				itemPath := strings.TrimPrefix(backup.BackupPath, "/")
-				itemPath = strings.TrimSuffix(itemPath, "/") + "/"
-				itemFileDir = itemPath + itemFileDir
-			}
 			if _, err = client.Upload(backupDir+"/"+record.FileName, itemFileDir+"/"+record.FileName); err != nil {
 				return paths, err
 			}
 		}
-		if backup.Type == "LOCAL" || cronjob.KeepLocal {
-			paths = append(paths, fmt.Sprintf("%s/%s", record.FileDir, record.FileName))
-		} else {
-			paths = append(paths, fmt.Sprintf("%s/%s", itemFileDir, record.FileName))
-		}
 	}
-	u.HandleRmExpired(backup.Type, backup.BackupPath, localDir, &cronjob, client)
+	u.HandleRmExpired(backup.Type, localDir, &cronjob, client)
 	return paths, nil
 }
-
-func (u *CronjobService) handleSnapshot(cronjob *model.Cronjob, startTime time.Time) (string, string, error) {
-	backup, err := backupRepo.Get(commonRepo.WithByID(uint(cronjob.TargetDirID)))
-	if err != nil {
-		return "", "", err
-	}
-	client, err := NewIBackupService().NewClient(&backup)
-	if err != nil {
-		return "", "", err
-	}
-
-	req := dto.SnapshotCreate{
-		From: backup.Type,
-	}
-	message, name, err := NewISnapshotService().HandleSnapshot(true, req, startTime.Format("20060102150405"))
-	if err != nil {
-		return message, "", err
-	}
-
-	path := path.Join(strings.TrimPrefix(backup.BackupPath, "/"), "system_snapshot", name+".tar.gz")
-
-	u.HandleRmExpired(backup.Type, backup.BackupPath, "", cronjob, client)
-	return message, path, nil
-}

backend/app/service/database.go

@@ -1,159 +0,0 @@
-package service
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
-	"github.com/1Panel-dev/1Panel/backend/utils/mysql"
-	"github.com/1Panel-dev/1Panel/backend/utils/mysql/client"
-	"github.com/jinzhu/copier"
-	"github.com/pkg/errors"
-)
-
-type DatabaseService struct{}
-
-type IDatabaseService interface {
-	Get(name string) (dto.DatabaseInfo, error)
-	SearchWithPage(search dto.DatabaseSearch) (int64, interface{}, error)
-	CheckDatabase(req dto.DatabaseCreate) bool
-	Create(req dto.DatabaseCreate) error
-	Update(req dto.DatabaseUpdate) error
-	Delete(id uint) error
-	List(dbType string) ([]dto.DatabaseOption, error)
-}
-
-func NewIDatabaseService() IDatabaseService {
-	return &DatabaseService{}
-}
-
-func (u *DatabaseService) SearchWithPage(search dto.DatabaseSearch) (int64, interface{}, error) {
-	total, dbs, err := databaseRepo.Page(search.Page, search.PageSize,
-		databaseRepo.WithTypeList(search.Type),
-		commonRepo.WithLikeName(search.Info),
-		databaseRepo.WithoutByFrom("local"),
-	)
-	var datas []dto.DatabaseInfo
-	for _, db := range dbs {
-		var item dto.DatabaseInfo
-		if err := copier.Copy(&item, &db); err != nil {
-			return 0, nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
-		}
-		datas = append(datas, item)
-	}
-	return total, datas, err
-}
-
-func (u *DatabaseService) Get(name string) (dto.DatabaseInfo, error) {
-	var data dto.DatabaseInfo
-	remote, err := databaseRepo.Get(commonRepo.WithByName(name))
-	if err != nil {
-		return data, err
-	}
-	if err := copier.Copy(&data, &remote); err != nil {
-		return data, errors.WithMessage(constant.ErrStructTransform, err.Error())
-	}
-	return data, nil
-}
-
-func (u *DatabaseService) List(dbType string) ([]dto.DatabaseOption, error) {
-	dbs, err := databaseRepo.GetList(databaseRepo.WithTypeList(dbType))
-	var datas []dto.DatabaseOption
-	for _, db := range dbs {
-		var item dto.DatabaseOption
-		if err := copier.Copy(&item, &db); err != nil {
-			return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
-		}
-		item.Database = db.Name
-		datas = append(datas, item)
-	}
-	return datas, err
-}
-
-func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
-	if _, err := mysql.NewMysqlClient(client.DBInfo{
-		From:     "remote",
-		Address:  req.Address,
-		Port:     req.Port,
-		Username: req.Username,
-		Password: req.Password,
-		Timeout:  6,
-	}); err != nil {
-		return false
-	}
-	return true
-}
-
-func (u *DatabaseService) Create(req dto.DatabaseCreate) error {
-	db, _ := databaseRepo.Get(commonRepo.WithByName(req.Name))
-	if db.ID != 0 {
-		if db.From == "local" {
-			return buserr.New(constant.ErrLocalExist)
-		}
-		return constant.ErrRecordExist
-	}
-	if _, err := mysql.NewMysqlClient(client.DBInfo{
-		From:     "remote",
-		Address:  req.Address,
-		Port:     req.Port,
-		Username: req.Username,
-		Password: req.Password,
-		Timeout:  6,
-	}); err != nil {
-		return err
-	}
-	if err := copier.Copy(&db, &req); err != nil {
-		return errors.WithMessage(constant.ErrStructTransform, err.Error())
-	}
-	if err := databaseRepo.Create(context.Background(), &db); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (u *DatabaseService) Delete(id uint) error {
-	db, _ := databaseRepo.Get(commonRepo.WithByID(id))
-	if db.ID == 0 {
-		return constant.ErrRecordNotFound
-	}
-	if err := databaseRepo.Delete(context.Background(), commonRepo.WithByID(id)); err != nil {
-		return err
-	}
-	if db.From != "local" {
-		if err := mysqlRepo.Delete(context.Background(), mysqlRepo.WithByMysqlName(db.Name)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (u *DatabaseService) Update(req dto.DatabaseUpdate) error {
-	if _, err := mysql.NewMysqlClient(client.DBInfo{
-		From:     "remote",
-		Address:  req.Address,
-		Port:     req.Port,
-		Username: req.Username,
-		Password: req.Password,
-		Timeout:  300,
-	}); err != nil {
-		return err
-	}
-
-	pass, err := encrypt.StringEncrypt(req.Password)
-	if err != nil {
-		return fmt.Errorf("decrypt database password failed, err: %v", err)
-	}
-
-	upMap := make(map[string]interface{})
-	upMap["type"] = req.Type
-	upMap["version"] = req.Version
-	upMap["address"] = req.Address
-	upMap["port"] = req.Port
-	upMap["username"] = req.Username
-	upMap["password"] = pass
-	upMap["description"] = req.Description
-	return databaseRepo.Update(req.ID, upMap)
-}

backend/app/service/database_mysql.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -18,12 +17,8 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/compose"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
-	"github.com/1Panel-dev/1Panel/backend/utils/mysql"
-	"github.com/1Panel-dev/1Panel/backend/utils/mysql/client"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
@@ -32,36 +27,28 @@ import (
 type MysqlService struct{}
 
 type IMysqlService interface {
-	SearchWithPage(search dto.MysqlDBSearch) (int64, interface{}, error)
-	ListDBOption() ([]dto.MysqlOption, error)
+	SearchWithPage(search dto.SearchWithPage) (int64, interface{}, error)
+	ListDBName() ([]string, error)
 	Create(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error)
-	LoadFromRemote(req dto.MysqlLoadDB) error
 	ChangeAccess(info dto.ChangeDBInfo) error
 	ChangePassword(info dto.ChangeDBInfo) error
-	UpdateVariables(req dto.MysqlVariablesUpdate) error
+	UpdateVariables(updates []dto.MysqlVariablesUpdate) error
 	UpdateConfByFile(info dto.MysqlConfUpdateByFile) error
 	UpdateDescription(req dto.UpdateDescription) error
-	DeleteCheck(req dto.MysqlDBDeleteCheck) ([]string, error)
+	DeleteCheck(id uint) ([]string, error)
 	Delete(ctx context.Context, req dto.MysqlDBDelete) error
-
-	LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlStatus, error)
-	LoadVariables(req dto.OperationWithNameAndType) (*dto.MysqlVariables, error)
-	LoadBaseInfo(req dto.OperationWithNameAndType) (*dto.DBBaseInfo, error)
-	LoadRemoteAccess(req dto.OperationWithNameAndType) (bool, error)
-
-	LoadDatabaseFile(req dto.OperationWithNameAndType) (string, error)
+	LoadStatus() (*dto.MysqlStatus, error)
+	LoadVariables() (*dto.MysqlVariables, error)
+	LoadBaseInfo() (*dto.DBBaseInfo, error)
+	LoadRemoteAccess() (bool, error)
 }
 
 func NewIMysqlService() IMysqlService {
 	return &MysqlService{}
 }
 
-func (u *MysqlService) SearchWithPage(search dto.MysqlDBSearch) (int64, interface{}, error) {
-	total, mysqls, err := mysqlRepo.Page(search.Page, search.PageSize,
-		mysqlRepo.WithByMysqlName(search.Database),
-		commonRepo.WithLikeName(search.Info),
-		commonRepo.WithOrderRuleBy(search.OrderBy, search.Order),
-	)
+func (u *MysqlService) SearchWithPage(search dto.SearchWithPage) (int64, interface{}, error) {
+	total, mysqls, err := mysqlRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info))
 	var dtoMysqls []dto.MysqlDBInfo
 	for _, mysql := range mysqls {
 		var item dto.MysqlDBInfo
@@ -73,232 +60,145 @@ func (u *MysqlService) SearchWithPage(search dto.MysqlDBSearch) (int64, interfac
 	return total, dtoMysqls, err
 }
 
-func (u *MysqlService) ListDBOption() ([]dto.MysqlOption, error) {
+func (u *MysqlService) ListDBName() ([]string, error) {
 	mysqls, err := mysqlRepo.List()
-	if err != nil {
-		return nil, err
-	}
-
-	databases, err := databaseRepo.GetList(databaseRepo.WithTypeList("mysql,mariadb"))
-	if err != nil {
-		return nil, err
-	}
-	var dbs []dto.MysqlOption
+	var dbNames []string
 	for _, mysql := range mysqls {
-		var item dto.MysqlOption
-		if err := copier.Copy(&item, &mysql); err != nil {
-			return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
-		}
-		item.Database = mysql.MysqlName
-		for _, database := range databases {
-			if database.Name == item.Database {
-				item.Type = database.Type
-			}
-		}
-		dbs = append(dbs, item)
+		dbNames = append(dbNames, mysql.Name)
 	}
-	return dbs, err
+	return dbNames, err
+}
+
+var formatMap = map[string]string{
+	"utf8":    "utf8_general_ci",
+	"utf8mb4": "utf8mb4_general_ci",
+	"gbk":     "gbk_chinese_ci",
+	"big5":    "big5_chinese_ci",
 }
 
 func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
-	if cmd.CheckIllegal(req.Name, req.Username, req.Password, req.Format, req.Permission) {
-		return nil, buserr.New(constant.ErrCmdIllegal)
-	}
-
-	mysql, _ := mysqlRepo.Get(commonRepo.WithByName(req.Name), mysqlRepo.WithByMysqlName(req.Database), databaseRepo.WithByFrom(req.From))
-	if mysql.ID != 0 {
-		return nil, constant.ErrRecordExist
-	}
-
-	var createItem model.DatabaseMysql
-	if err := copier.Copy(&createItem, &req); err != nil {
-		return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
-	}
-
-	if req.From == "local" && req.Username == "root" {
+	if req.Username == "root" {
 		return nil, errors.New("Cannot set root as user name")
 	}
-
-	cli, version, err := LoadMysqlClientByFrom(req.Database)
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return nil, err
 	}
-	createItem.MysqlName = req.Database
-	defer cli.Close()
-	if err := cli.Create(client.CreateInfo{
-		Name:       req.Name,
-		Format:     req.Format,
-		Username:   req.Username,
-		Password:   req.Password,
-		Permission: req.Permission,
-		Version:    version,
-		Timeout:    300,
-	}); err != nil {
+	mysql, _ := mysqlRepo.Get(commonRepo.WithByName(req.Name))
+	if mysql.ID != 0 {
+		return nil, constant.ErrRecordExist
+	}
+	if err := copier.Copy(&mysql, &req); err != nil {
+		return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
+	}
+
+	createSql := fmt.Sprintf("create database `%s` default character set %s collate %s", req.Name, req.Format, formatMap[req.Format])
+	if err := excSQL(app.ContainerName, app.Password, createSql); err != nil {
+		if strings.Contains(err.Error(), "ERROR 1007") {
+			return nil, buserr.New(constant.ErrDatabaseIsExist)
+		}
+		return nil, err
+	}
+	if err := u.createUser(app.ContainerName, app.Password, app.Version, req); err != nil {
 		return nil, err
 	}
 
 	global.LOG.Infof("create database %s successful!", req.Name)
-	if err := mysqlRepo.Create(ctx, &createItem); err != nil {
+	mysql.MysqlName = app.Name
+	if err := mysqlRepo.Create(ctx, &mysql); err != nil {
 		return nil, err
 	}
-	return &createItem, nil
-}
-
-func (u *MysqlService) LoadFromRemote(req dto.MysqlLoadDB) error {
-	client, version, err := LoadMysqlClientByFrom(req.Database)
-	if err != nil {
-		return err
-	}
-
-	databases, err := mysqlRepo.List(mysqlRepo.WithByMysqlName(req.Database))
-	if err != nil {
-		return err
-	}
-	datas, err := client.SyncDB(version)
-	if err != nil {
-		return err
-	}
-	for _, data := range datas {
-		hasOld := false
-		for _, oldData := range databases {
-			if strings.EqualFold(oldData.Name, data.Name) && strings.EqualFold(oldData.MysqlName, data.MysqlName) {
-				hasOld = true
-				break
-			}
-		}
-		if !hasOld {
-			var createItem model.DatabaseMysql
-			if err := copier.Copy(&createItem, &data); err != nil {
-				return errors.WithMessage(constant.ErrStructTransform, err.Error())
-			}
-			if err := mysqlRepo.Create(context.Background(), &createItem); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
+	return &mysql, nil
 }
 
 func (u *MysqlService) UpdateDescription(req dto.UpdateDescription) error {
 	return mysqlRepo.Update(req.ID, map[string]interface{}{"description": req.Description})
 }
 
-func (u *MysqlService) DeleteCheck(req dto.MysqlDBDeleteCheck) ([]string, error) {
+func (u *MysqlService) DeleteCheck(id uint) ([]string, error) {
 	var appInUsed []string
-	db, err := mysqlRepo.Get(commonRepo.WithByID(req.ID))
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return appInUsed, err
 	}
 
-	if db.From == "local" {
-		app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Database)
-		if err != nil {
-			return appInUsed, err
-		}
-		apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithLinkId(app.ID), appInstallResourceRepo.WithResourceId(db.ID))
-		for _, app := range apps {
-			appInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(app.AppInstallId))
-			if appInstall.ID != 0 {
-				appInUsed = append(appInUsed, appInstall.Name)
-			}
-		}
-	} else {
-		apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(db.ID))
-		for _, app := range apps {
-			appInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(app.AppInstallId))
-			if appInstall.ID != 0 {
-				appInUsed = append(appInUsed, appInstall.Name)
-			}
-		}
+	db, err := mysqlRepo.Get(commonRepo.WithByID(id))
+	if err != nil {
+		return appInUsed, err
 	}
 
+	apps, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithLinkId(app.ID), appInstallResourceRepo.WithResourceId(db.ID))
+	for _, app := range apps {
+		appInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(app.AppInstallId))
+		if appInstall.ID != 0 {
+			appInUsed = append(appInUsed, appInstall.Name)
+		}
+	}
 	return appInUsed, nil
 }
 
 func (u *MysqlService) Delete(ctx context.Context, req dto.MysqlDBDelete) error {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil && !req.ForceDelete {
+		return err
+	}
+
 	db, err := mysqlRepo.Get(commonRepo.WithByID(req.ID))
 	if err != nil && !req.ForceDelete {
 		return err
 	}
-	cli, version, err := LoadMysqlClientByFrom(req.Database)
-	if err != nil {
-		return err
-	}
-	defer cli.Close()
-	if err := cli.Delete(client.DeleteInfo{
-		Name:       db.Name,
-		Version:    version,
-		Username:   db.Username,
-		Permission: db.Permission,
-		Timeout:    300,
-	}); err != nil && !req.ForceDelete {
-		return err
-	}
 
+	if err := excSQL(app.ContainerName, app.Password, fmt.Sprintf("drop user if exists '%s'@'%s'", db.Username, db.Permission)); err != nil && !req.ForceDelete {
+		return err
+	}
+	if err := excSQL(app.ContainerName, app.Password, fmt.Sprintf("drop database if exists `%s`", db.Name)); err != nil && !req.ForceDelete {
+		return err
+	}
+	global.LOG.Info("execute delete database sql successful, now start to drop uploads and records")
+
+	uploadDir := fmt.Sprintf("%s/1panel/uploads/database/mysql/%s/%s", global.CONF.System.BaseDir, app.Name, db.Name)
+	if _, err := os.Stat(uploadDir); err == nil {
+		_ = os.RemoveAll(uploadDir)
+	}
 	if req.DeleteBackup {
-		uploadDir := path.Join(global.CONF.System.BaseDir, fmt.Sprintf("1panel/uploads/database/%s/%s/%s", req.Type, req.Database, db.Name))
-		if _, err := os.Stat(uploadDir); err == nil {
-			_ = os.RemoveAll(uploadDir)
-		}
 		localDir, err := loadLocalDir()
 		if err != nil && !req.ForceDelete {
 			return err
 		}
-		backupDir := path.Join(localDir, fmt.Sprintf("database/%s/%s/%s", req.Type, db.MysqlName, db.Name))
+		backupDir := fmt.Sprintf("%s/database/mysql/%s/%s", localDir, db.MysqlName, db.Name)
 		if _, err := os.Stat(backupDir); err == nil {
 			_ = os.RemoveAll(backupDir)
 		}
-		_ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType(req.Type), commonRepo.WithByName(req.Database), backupRepo.WithByDetailName(db.Name))
-		global.LOG.Infof("delete database %s-%s backups successful", req.Database, db.Name)
+		global.LOG.Infof("delete database %s-%s backups successful", app.Name, db.Name)
 	}
+	_ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType("mysql"), commonRepo.WithByName(app.Name), backupRepo.WithByDetailName(db.Name))
 
 	_ = mysqlRepo.Delete(ctx, commonRepo.WithByID(db.ID))
 	return nil
 }
 
-func (u *MysqlService) ChangePassword(req dto.ChangeDBInfo) error {
-	if cmd.CheckIllegal(req.Value) {
-		return buserr.New(constant.ErrCmdIllegal)
-	}
-	cli, version, err := LoadMysqlClientByFrom(req.Database)
-	if err != nil {
-		return err
-	}
-	defer cli.Close()
+func (u *MysqlService) ChangePassword(info dto.ChangeDBInfo) error {
 	var (
-		mysqlData    model.DatabaseMysql
-		passwordInfo client.PasswordChangeInfo
+		mysql model.DatabaseMysql
+		err   error
 	)
-	passwordInfo.Password = req.Value
-	passwordInfo.Timeout = 300
-	passwordInfo.Version = version
-
-	if req.ID != 0 {
-		mysqlData, err = mysqlRepo.Get(commonRepo.WithByID(req.ID))
+	if info.ID != 0 {
+		mysql, err = mysqlRepo.Get(commonRepo.WithByID(info.ID))
 		if err != nil {
 			return err
 		}
-		passwordInfo.Name = mysqlData.Name
-		passwordInfo.Username = mysqlData.Username
-		passwordInfo.Permission = mysqlData.Permission
-	} else {
-		passwordInfo.Username = "root"
 	}
-	if err := cli.ChangePassword(passwordInfo); err != nil {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil {
 		return err
 	}
 
-	if req.ID != 0 {
-		var appRess []model.AppInstallResource
-		if req.From == "local" {
-			app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Database)
-			if err != nil {
-				return err
-			}
-			appRess, _ = appInstallResourceRepo.GetBy(appInstallResourceRepo.WithLinkId(app.ID), appInstallResourceRepo.WithResourceId(mysqlData.ID))
-		} else {
-			appRess, _ = appInstallResourceRepo.GetBy(appInstallResourceRepo.WithResourceId(mysqlData.ID))
-		}
+	passwordChangeCMD := fmt.Sprintf("set password for '%s'@'%s' = password('%s')", mysql.Username, mysql.Permission, info.Value)
+	if !strings.HasPrefix(app.Version, "5.7") {
+		passwordChangeCMD = fmt.Sprintf("ALTER USER '%s'@'%s' IDENTIFIED WITH mysql_native_password BY '%s';", mysql.Username, mysql.Permission, info.Value)
+	}
+	if info.ID != 0 {
+		appRess, _ := appInstallResourceRepo.GetBy(appInstallResourceRepo.WithLinkId(app.ID), appInstallResourceRepo.WithResourceId(mysql.ID))
 		for _, appRes := range appRess {
 			appInstall, err := appInstallRepo.GetFirst(commonRepo.WithByID(appRes.AppInstallId))
 			if err != nil {
@@ -310,93 +210,134 @@ func (u *MysqlService) ChangePassword(req dto.ChangeDBInfo) error {
 			}
 
 			global.LOG.Infof("start to update mysql password used by app %s-%s", appModel.Key, appInstall.Name)
-			if err := updateInstallInfoInDB(appModel.Key, appInstall.Name, "user-password", true, req.Value); err != nil {
+			if err := updateInstallInfoInDB(appModel.Key, appInstall.Name, "user-password", true, info.Value); err != nil {
 				return err
 			}
 		}
-		global.LOG.Info("execute password change sql successful")
-		pass, err := encrypt.StringEncrypt(req.Value)
-		if err != nil {
-			return fmt.Errorf("decrypt database db password failed, err: %v", err)
+		if err := excuteSql(app.ContainerName, app.Password, passwordChangeCMD); err != nil {
+			return err
 		}
-		_ = mysqlRepo.Update(mysqlData.ID, map[string]interface{}{"password": pass})
+		global.LOG.Info("excute password change sql successful")
+		_ = mysqlRepo.Update(mysql.ID, map[string]interface{}{"password": info.Value})
 		return nil
 	}
 
-	if err := updateInstallInfoInDB(req.Type, req.Database, "password", false, req.Value); err != nil {
+	hosts, err := excuteSqlForRows(app.ContainerName, app.Password, "select host from mysql.user where user='root';")
+	if err != nil {
+		return err
+	}
+	for _, host := range hosts {
+		if host == "%" || host == "localhost" {
+			passwordRootChangeCMD := fmt.Sprintf("set password for 'root'@'%s' = password('%s')", host, info.Value)
+			if !strings.HasPrefix(app.Version, "5.7") {
+				passwordRootChangeCMD = fmt.Sprintf("alter user 'root'@'%s' identified with mysql_native_password BY '%s';", host, info.Value)
+			}
+			if err := excuteSql(app.ContainerName, app.Password, passwordRootChangeCMD); err != nil {
+				return err
+			}
+		}
+	}
+	if err := updateInstallInfoInDB("mysql", "", "password", false, info.Value); err != nil {
+		return err
+	}
+	if err := updateInstallInfoInDB("phpmyadmin", "", "password", true, info.Value); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (u *MysqlService) ChangeAccess(req dto.ChangeDBInfo) error {
-	if cmd.CheckIllegal(req.Value) {
-		return buserr.New(constant.ErrCmdIllegal)
-	}
-	cli, version, err := LoadMysqlClientByFrom(req.Database)
-	if err != nil {
-		return err
-	}
-	defer cli.Close()
+func (u *MysqlService) ChangeAccess(info dto.ChangeDBInfo) error {
 	var (
-		mysqlData  model.DatabaseMysql
-		accessInfo client.AccessChangeInfo
+		mysql model.DatabaseMysql
+		err   error
 	)
-	accessInfo.Permission = req.Value
-	accessInfo.Timeout = 300
-	accessInfo.Version = version
-
-	if req.ID != 0 {
-		mysqlData, err = mysqlRepo.Get(commonRepo.WithByID(req.ID))
+	if info.ID != 0 {
+		mysql, err = mysqlRepo.Get(commonRepo.WithByID(info.ID))
 		if err != nil {
 			return err
 		}
-		accessInfo.Name = mysqlData.Name
-		accessInfo.Username = mysqlData.Username
-		accessInfo.Password = mysqlData.Password
-		accessInfo.OldPermission = mysqlData.Permission
-	} else {
-		accessInfo.Username = "root"
+		if info.Value == mysql.Permission {
+			return nil
+		}
 	}
-	if err := cli.ChangeAccess(accessInfo); err != nil {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
+	if err != nil {
 		return err
 	}
-
-	if mysqlData.ID != 0 {
-		_ = mysqlRepo.Update(mysqlData.ID, map[string]interface{}{"permission": req.Value})
+	if info.ID == 0 {
+		mysql.Name = "*"
+		mysql.Username = "root"
+		mysql.Permission = "%"
+		mysql.Password = app.Password
 	}
 
+	if info.Value != mysql.Permission {
+		var userlist []string
+		if strings.Contains(mysql.Permission, ",") {
+			userlist = strings.Split(mysql.Permission, ",")
+		} else {
+			userlist = append(userlist, mysql.Permission)
+		}
+		for _, user := range userlist {
+			if len(user) != 0 {
+				if err := excuteSql(app.ContainerName, app.Password, fmt.Sprintf("drop user if exists '%s'@'%s'", mysql.Username, user)); err != nil {
+					return err
+				}
+			}
+		}
+		if info.ID == 0 {
+			return nil
+		}
+	}
+
+	if err := u.createUser(app.ContainerName, app.Password, app.Version, dto.MysqlDBCreate{
+		Username:   mysql.Username,
+		Name:       mysql.Name,
+		Permission: info.Value,
+		Password:   mysql.Password,
+	}); err != nil {
+		return err
+	}
+	if err := excuteSql(app.ContainerName, app.Password, "flush privileges"); err != nil {
+		return err
+	}
+	if info.ID == 0 {
+		return nil
+	}
+
+	_ = mysqlRepo.Update(mysql.ID, map[string]interface{}{"permission": info.Value})
+
 	return nil
 }
 
-func (u *MysqlService) UpdateConfByFile(req dto.MysqlConfUpdateByFile) error {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Database)
+func (u *MysqlService) UpdateConfByFile(info dto.MysqlConfUpdateByFile) error {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return err
 	}
-	path := fmt.Sprintf("%s/%s/%s/conf/my.cnf", constant.AppInstallDir, req.Type, app.Name)
+	path := fmt.Sprintf("%s/mysql/%s/conf/my.cnf", constant.AppInstallDir, app.Name)
 	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0640)
 	if err != nil {
 		return err
 	}
 	defer file.Close()
 	write := bufio.NewWriter(file)
-	_, _ = write.WriteString(req.File)
+	_, _ = write.WriteString(info.File)
 	write.Flush()
-	if _, err := compose.Restart(fmt.Sprintf("%s/%s/%s/docker-compose.yml", constant.AppInstallDir, req.Type, app.Name)); err != nil {
+	if _, err := compose.Restart(fmt.Sprintf("%s/mysql/%s/docker-compose.yml", constant.AppInstallDir, app.Name)); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (u *MysqlService) UpdateVariables(req dto.MysqlVariablesUpdate) error {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Database)
+func (u *MysqlService) UpdateVariables(updates []dto.MysqlVariablesUpdate) error {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return err
 	}
 	var files []string
 
-	path := fmt.Sprintf("%s/%s/%s/conf/my.cnf", constant.AppInstallDir, req.Type, app.Name)
+	path := fmt.Sprintf("%s/mysql/%s/conf/my.cnf", constant.AppInstallDir, app.Name)
 	lineBytes, err := os.ReadFile(path)
 	if err != nil {
 		return err
@@ -404,8 +345,8 @@ func (u *MysqlService) UpdateVariables(req dto.MysqlVariablesUpdate) error {
 	files = strings.Split(string(lineBytes), "\n")
 
 	group := "[mysqld]"
-	for _, info := range req.Variables {
-		if !strings.HasPrefix(app.Version, "5.7") && !strings.HasPrefix(app.Version, "5.6") {
+	for _, info := range updates {
+		if !strings.HasPrefix(app.Version, "5.7") {
 			if info.Param == "query_cache_size" {
 				continue
 			}
@@ -427,16 +368,16 @@ func (u *MysqlService) UpdateVariables(req dto.MysqlVariablesUpdate) error {
 		return err
 	}
 
-	if _, err := compose.Restart(fmt.Sprintf("%s/%s/%s/docker-compose.yml", constant.AppInstallDir, req.Type, app.Name)); err != nil {
+	if _, err := compose.Restart(fmt.Sprintf("%s/mysql/%s/docker-compose.yml", constant.AppInstallDir, app.Name)); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (u *MysqlService) LoadBaseInfo(req dto.OperationWithNameAndType) (*dto.DBBaseInfo, error) {
+func (u *MysqlService) LoadBaseInfo() (*dto.DBBaseInfo, error) {
 	var data dto.DBBaseInfo
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return nil, err
 	}
@@ -447,8 +388,8 @@ func (u *MysqlService) LoadBaseInfo(req dto.OperationWithNameAndType) (*dto.DBBa
 	return &data, nil
 }
 
-func (u *MysqlService) LoadRemoteAccess(req dto.OperationWithNameAndType) (bool, error) {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+func (u *MysqlService) LoadRemoteAccess() (bool, error) {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return false, err
 	}
@@ -465,8 +406,8 @@ func (u *MysqlService) LoadRemoteAccess(req dto.OperationWithNameAndType) (bool,
 	return false, nil
 }
 
-func (u *MysqlService) LoadVariables(req dto.OperationWithNameAndType) (*dto.MysqlVariables, error) {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+func (u *MysqlService) LoadVariables() (*dto.MysqlVariables, error) {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return nil, err
 	}
@@ -483,8 +424,8 @@ func (u *MysqlService) LoadVariables(req dto.OperationWithNameAndType) (*dto.Mys
 	return &info, nil
 }
 
-func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlStatus, error) {
-	app, err := appInstallRepo.LoadBaseInfo(req.Type, req.Name)
+func (u *MysqlService) LoadStatus() (*dto.MysqlStatus, error) {
+	app, err := appInstallRepo.LoadBaseInfo("mysql", "")
 	if err != nil {
 		return nil, err
 	}
@@ -528,28 +469,51 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
 	return &info, nil
 }
 
-func (u *MysqlService) LoadDatabaseFile(req dto.OperationWithNameAndType) (string, error) {
-	filePath := ""
-	switch req.Type {
-	case "mysql-conf":
-		filePath = path.Join(global.CONF.System.DataDir, fmt.Sprintf("apps/mysql/%s/conf/my.cnf", req.Name))
-	case "mariadb-conf":
-		filePath = path.Join(global.CONF.System.DataDir, fmt.Sprintf("apps/mariadb/%s/conf/my.cnf", req.Name))
-	case "redis-conf":
-		filePath = path.Join(global.CONF.System.DataDir, fmt.Sprintf("apps/redis/%s/conf/redis.conf", req.Name))
-	case "mysql-slow-logs":
-		filePath = path.Join(global.CONF.System.DataDir, fmt.Sprintf("apps/mysql/%s/data/1Panel-slow.log", req.Name))
-	case "mariadb-slow-logs":
-		filePath = path.Join(global.CONF.System.DataDir, fmt.Sprintf("apps/mariadb/%s/db/data/1Panel-slow.log", req.Name))
+func (u *MysqlService) createUser(container, password, version string, req dto.MysqlDBCreate) error {
+	var userlist []string
+	if strings.Contains(req.Permission, ",") {
+		ips := strings.Split(req.Permission, ",")
+		for _, ip := range ips {
+			if len(ip) != 0 {
+				userlist = append(userlist, fmt.Sprintf("'%s'@'%s'", req.Username, ip))
+			}
+		}
+	} else {
+		userlist = append(userlist, fmt.Sprintf("'%s'@'%s'", req.Username, req.Permission))
 	}
-	if _, err := os.Stat(filePath); err != nil {
-		return "", buserr.New("ErrHttpReqNotFound")
+
+	for _, user := range userlist {
+		if err := excSQL(container, password, fmt.Sprintf("create user %s identified by '%s';", user, req.Password)); err != nil {
+			if strings.Contains(err.Error(), "ERROR 1396") {
+				handleCreateError(container, password, req.Name, userlist, false)
+				return buserr.New(constant.ErrUserIsExist)
+			}
+			handleCreateError(container, password, req.Name, userlist, true)
+			return err
+		}
+		grantStr := fmt.Sprintf("grant all privileges on `%s`.* to %s", req.Name, user)
+		if req.Name == "*" {
+			grantStr = fmt.Sprintf("grant all privileges on *.* to %s", user)
+		}
+		if strings.HasPrefix(version, "5.7") {
+			grantStr = fmt.Sprintf("%s identified by '%s' with grant option;", grantStr, req.Password)
+		}
+		if err := excSQL(container, password, grantStr); err != nil {
+			handleCreateError(container, password, req.Name, userlist, true)
+			return err
+		}
 	}
-	content, err := os.ReadFile(filePath)
-	if err != nil {
-		return "", err
+	return nil
+}
+func handleCreateError(contaienr, password, dbName string, userlist []string, dropUser bool) {
+	_ = excSQL(contaienr, password, fmt.Sprintf("drop database `%s`", dbName))
+	if dropUser {
+		for _, user := range userlist {
+			if err := excSQL(contaienr, password, fmt.Sprintf("drop user if exists %s", user)); err != nil {
+				global.LOG.Errorf("drop user failed, err: %v", err)
+			}
+		}
 	}
-	return string(content), nil
 }
 
 func excuteSqlForMaps(containerName, password, command string) (map[string]string, error) {
@@ -581,6 +545,31 @@ func excuteSqlForRows(containerName, password, command string) ([]string, error)
 	return strings.Split(stdStr, "\n"), nil
 }
 
+func excuteSql(containerName, password, command string) error {
+	cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command)
+	stdout, err := cmd.CombinedOutput()
+	stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
+	if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") {
+		return errors.New(stdStr)
+	}
+	return nil
+}
+
+func excSQL(containerName, password, command string) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	cmd := exec.CommandContext(ctx, "docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command)
+	stdout, err := cmd.CombinedOutput()
+	if ctx.Err() == context.DeadlineExceeded {
+		return buserr.WithDetail(constant.ErrExecTimeOut, containerName, nil)
+	}
+	stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
+	if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") {
+		return errors.New(stdStr)
+	}
+	return nil
+}
+
 func updateMyCnf(oldFiles []string, group string, param string, value interface{}) []string {
 	isOn := false
 	hasGroup := false
@@ -621,42 +610,3 @@ func updateMyCnf(oldFiles []string, group string, param string, value interface{
 	}
 	return newFiles
 }
-
-func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
-	var (
-		dbInfo  client.DBInfo
-		version string
-		err     error
-	)
-
-	dbInfo.Timeout = 300
-	databaseItem, err := databaseRepo.Get(commonRepo.WithByName(database))
-	if err != nil {
-		return nil, "", err
-	}
-	dbInfo.From = databaseItem.From
-	dbInfo.Database = database
-	if dbInfo.From != "local" {
-		dbInfo.Address = databaseItem.Address
-		dbInfo.Port = databaseItem.Port
-		dbInfo.Username = databaseItem.Username
-		dbInfo.Password = databaseItem.Password
-		version = databaseItem.Version
-
-	} else {
-		app, err := appInstallRepo.LoadBaseInfo(databaseItem.Type, database)
-		if err != nil {
-			return nil, "", err
-		}
-		dbInfo.Address = app.ContainerName
-		dbInfo.Username = "root"
-		dbInfo.Password = app.Password
-		version = app.Version
-	}
-
-	cli, err := mysql.NewMysqlClient(dbInfo)
-	if err != nil {
-		return nil, "", err
-	}
-	return cli, version, nil
-}

backend/app/service/database_redis.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -21,7 +20,7 @@ type RedisService struct{}
 type IRedisService interface {
 	UpdateConf(req dto.RedisConfUpdate) error
 	UpdatePersistenceConf(req dto.RedisConfPersistenceUpdate) error
-	ChangePassword(info dto.ChangeRedisPass) error
+	ChangePassword(info dto.ChangeDBInfo) error
 
 	LoadStatus() (*dto.RedisStatus, error)
 	LoadConf() (*dto.RedisConf, error)
@@ -54,7 +53,7 @@ func (u *RedisService) UpdateConf(req dto.RedisConfUpdate) error {
 	return nil
 }
 
-func (u *RedisService) ChangePassword(req dto.ChangeRedisPass) error {
+func (u *RedisService) ChangePassword(req dto.ChangeDBInfo) error {
 	if err := updateInstallInfoInDB("redis", "", "password", true, req.Value); err != nil {
 		return err
 	}
@@ -164,7 +163,7 @@ func (u *RedisService) SearchBackupListWithPage(req dto.PageInfo) (int64, interf
 	if err != nil {
 		return 0, nil, err
 	}
-	backupDir := path.Join(localDir, fmt.Sprintf("database/redis/%s", redisInfo.Name))
+	backupDir := fmt.Sprintf("%s/database/redis/%s", localDir, redisInfo.Name)
 	_ = filepath.Walk(backupDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return nil

backend/app/service/docker.go

@@ -136,14 +136,14 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error {
 
 	switch req.Key {
 	case "Registries":
-		req.Value = strings.TrimSuffix(req.Value, ",")
+		req.Value = strings.TrimRight(req.Value, ",")
 		if len(req.Value) == 0 {
 			delete(daemonMap, "insecure-registries")
 		} else {
 			daemonMap["insecure-registries"] = strings.Split(req.Value, ",")
 		}
 	case "Mirrors":
-		req.Value = strings.TrimSuffix(req.Value, ",")
+		req.Value = strings.TrimRight(req.Value, ",")
 		if len(req.Value) == 0 {
 			delete(daemonMap, "registry-mirrors")
 		} else {

backend/app/service/entry.go

@@ -12,8 +12,7 @@ var (
 	appInstallRepo         = repo.NewIAppInstallRepo()
 	appInstallResourceRepo = repo.NewIAppInstallResourceRpo()
 
-	mysqlRepo    = repo.NewIMysqlRepo()
-	databaseRepo = repo.NewIDatabaseRepo()
+	mysqlRepo = repo.NewIMysqlRepo()
 
 	imageRepoRepo = repo.NewIImageRepoRepo()
 	composeRepo   = repo.NewIComposeTemplateRepo()

backend/app/service/firewall.go

@@ -5,18 +5,14 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/firewall"
 	fireClient "github.com/1Panel-dev/1Panel/backend/utils/firewall/client"
 	"github.com/jinzhu/copier"
-	"github.com/pkg/errors"
 )
 
 const confPath = "/etc/sysctl.conf"
@@ -31,7 +27,6 @@ type IFirewallService interface {
 	OperateAddressRule(req dto.AddrRuleOperate, reload bool) error
 	UpdatePortRule(req dto.PortRuleUpdate) error
 	UpdateAddrRule(req dto.AddrRuleUpdate) error
-	UpdateDescription(req dto.UpdateFirewallDescription) error
 	BatchOperateRule(req dto.BatchRuleOperate) error
 }
 
@@ -41,6 +36,7 @@ func NewIFirewallService() IFirewallService {
 
 func (u *FirewallService) LoadBaseInfo() (dto.FirewallBaseInfo, error) {
 	var baseInfo dto.FirewallBaseInfo
+	baseInfo.PingStatus = u.pingStatus()
 	baseInfo.Status = "not running"
 	baseInfo.Version = "-"
 	baseInfo.Name = "-"
@@ -52,22 +48,17 @@ func (u *FirewallService) LoadBaseInfo() (dto.FirewallBaseInfo, error) {
 		return baseInfo, err
 	}
 	baseInfo.Name = client.Name()
-
-	var wg sync.WaitGroup
-	wg.Add(3)
-	go func() {
-		defer wg.Done()
-		baseInfo.PingStatus = u.pingStatus()
-	}()
-	go func() {
-		defer wg.Done()
-		baseInfo.Status, _ = client.Status()
-	}()
-	go func() {
-		defer wg.Done()
-		baseInfo.Version, _ = client.Version()
-	}()
-	wg.Wait()
+	baseInfo.Status, err = client.Status()
+	if err != nil {
+		return baseInfo, err
+	}
+	if baseInfo.Status == "not running" {
+		return baseInfo, err
+	}
+	baseInfo.Version, err = client.Version()
+	if err != nil {
+		return baseInfo, err
+	}
 	return baseInfo, nil
 }
 
@@ -76,7 +67,6 @@ func (u *FirewallService) SearchWithPage(req dto.RuleSearch) (int64, interface{}
 		datas     []fireClient.FireInfo
 		backDatas []fireClient.FireInfo
 	)
-
 	client, err := firewall.NewFirewallClient()
 	if err != nil {
 		return 0, nil, err
@@ -110,61 +100,14 @@ func (u *FirewallService) SearchWithPage(req dto.RuleSearch) (int64, interface{}
 			datas = addrs
 		}
 	}
-
-	var datasFilterStatus []fireClient.FireInfo
-	if len(req.Status) != 0 {
-		for _, data := range datas {
-			portItem, _ := strconv.Atoi(data.Port)
-			if req.Status == "free" && !common.ScanPortWithProto(portItem, data.Protocol) {
-				datasFilterStatus = append(datasFilterStatus, data)
-			}
-			if req.Status == "used" && common.ScanPortWithProto(portItem, data.Protocol) {
-				datasFilterStatus = append(datasFilterStatus, data)
-			}
-		}
-	} else {
-		datasFilterStatus = datas
-	}
-	var datasFilterStrategy []fireClient.FireInfo
-	if len(req.Strategy) != 0 {
-		for _, data := range datasFilterStatus {
-			if req.Strategy == data.Strategy {
-				datasFilterStrategy = append(datasFilterStrategy, data)
-			}
-		}
-	} else {
-		datasFilterStrategy = datasFilterStatus
-	}
-
-	total, start, end := len(datasFilterStrategy), (req.Page-1)*req.PageSize, req.Page*req.PageSize
+	total, start, end := len(datas), (req.Page-1)*req.PageSize, req.Page*req.PageSize
 	if start > total {
 		backDatas = make([]fireClient.FireInfo, 0)
 	} else {
 		if end >= total {
 			end = total
 		}
-		backDatas = datasFilterStrategy[start:end]
-	}
-
-	datasFromDB, _ := hostRepo.ListFirewallRecord()
-	for i := 0; i < len(backDatas); i++ {
-		for _, des := range datasFromDB {
-			if req.Type != des.Type {
-				continue
-			}
-			if backDatas[i].Port == des.Port &&
-				req.Type == "port" &&
-				backDatas[i].Protocol == des.Protocol &&
-				backDatas[i].Strategy == des.Strategy &&
-				backDatas[i].Address == des.Address {
-				backDatas[i].Description = des.Description
-				break
-			}
-			if req.Type == "address" && backDatas[i].Strategy == des.Strategy && backDatas[i].Address == des.Address {
-				backDatas[i].Description = des.Description
-				break
-			}
-		}
+		backDatas = datas[start:end]
 	}
 
 	if req.Type == "port" {
@@ -184,7 +127,6 @@ func (u *FirewallService) SearchWithPage(req dto.RuleSearch) (int64, interface{}
 			}
 		}
 	}
-	go u.cleanUnUsedData(client)
 
 	return int64(total), backDatas, nil
 }
@@ -224,92 +166,55 @@ func (u *FirewallService) OperatePortRule(req dto.PortRuleOperate, reload bool)
 	if err != nil {
 		return err
 	}
-	protos := strings.Split(req.Protocol, "/")
-	itemAddress := strings.Split(strings.TrimSuffix(req.Address, ","), ",")
-
-	var wg sync.WaitGroup
 	if client.Name() == "ufw" {
-		if strings.Contains(req.Port, ",") || strings.Contains(req.Port, "-") {
-			for _, proto := range protos {
-				for _, addr := range itemAddress {
-					if len(addr) == 0 {
-						addr = "Anywhere"
-					}
-					req.Address = addr
-					req.Port = strings.ReplaceAll(req.Port, "-", ":")
-					req.Protocol = proto
-					wg.Add(1)
-					go func(req dto.PortRuleOperate) {
-						defer wg.Done()
-						if err := u.operatePort(client, req); err != nil {
-							global.LOG.Errorf("%s port %s/%s failed (strategy: %s, address: %s), err: %v", req.Operation, req.Port, req.Protocol, req.Strategy, req.Address, err)
-						}
-						_ = u.addPortRecord(req)
-					}(req)
-				}
-			}
-			return nil
-		}
-		if req.Protocol == "tcp/udp" {
+		req.Port = strings.ReplaceAll(req.Port, "-", ":")
+		if req.Operation == "remove" && req.Protocol == "tcp/udp" {
 			req.Protocol = ""
+			return u.operatePort(client, req)
 		}
-		for _, addr := range itemAddress {
-			if len(addr) == 0 {
-				addr = "Anywhere"
-			}
-			req.Address = addr
-			wg.Add(1)
-			go func(req dto.PortRuleOperate) {
-				defer wg.Done()
-				if err := u.operatePort(client, req); err != nil {
-					global.LOG.Errorf("%s port %s/%s failed (strategy: %s, address: %s), err: %v", req.Operation, req.Port, req.Protocol, req.Strategy, req.Address, err)
-				}
-				_ = u.addPortRecord(req)
-			}(req)
-		}
-		wg.Wait()
-		return nil
 	}
-
-	itemPorts := req.Port
-	for _, proto := range protos {
-		if strings.Contains(req.Port, "-") {
-			for _, addr := range itemAddress {
-				req.Protocol = proto
-				req.Address = addr
-				wg.Add(1)
-				go func(req dto.PortRuleOperate) {
-					defer wg.Done()
-					if err := u.operatePort(client, req); err != nil {
-						global.LOG.Errorf("%s port %s/%s failed (strategy: %s, address: %s), err: %v", req.Operation, req.Port, req.Protocol, req.Strategy, req.Address, err)
-					}
-					_ = u.addPortRecord(req)
-				}(req)
-			}
-		} else {
-			ports := strings.Split(itemPorts, ",")
+	if req.Protocol == "tcp/udp" {
+		if client.Name() == "firewalld" && strings.Contains(req.Port, ",") {
+			ports := strings.Split(req.Port, ",")
 			for _, port := range ports {
 				if len(port) == 0 {
 					continue
 				}
-				for _, addr := range itemAddress {
-					req.Address = addr
-					req.Port = port
-					req.Protocol = proto
-					wg.Add(1)
-					go func(req dto.PortRuleOperate) {
-						defer wg.Done()
-						if err := u.operatePort(client, req); err != nil {
-							global.LOG.Errorf("%s port %s/%s failed (strategy: %s, address: %s), err: %v", req.Operation, req.Port, req.Protocol, req.Strategy, req.Address, err)
-						}
-						_ = u.addPortRecord(req)
-					}(req)
+				req.Port = port
+				req.Protocol = "tcp"
+				if err := u.operatePort(client, req); err != nil {
+					return err
 				}
+				req.Protocol = "udp"
+				if err := u.operatePort(client, req); err != nil {
+					return err
+				}
+			}
+		} else {
+			req.Protocol = "tcp"
+			if err := u.operatePort(client, req); err != nil {
+				return err
+			}
+			req.Protocol = "udp"
+			if err := u.operatePort(client, req); err != nil {
+				return err
+			}
+		}
+	} else {
+		if strings.Contains(req.Port, ",") {
+			ports := strings.Split(req.Port, ",")
+			for _, port := range ports {
+				req.Port = port
+				if err := u.operatePort(client, req); err != nil {
+					return err
+				}
+			}
+		} else {
+			if err := u.operatePort(client, req); err != nil {
+				return err
 			}
 		}
 	}
-
-	wg.Wait()
 	if reload {
 		return client.Reload()
 	}
@@ -327,24 +232,16 @@ func (u *FirewallService) OperateAddressRule(req dto.AddrRuleOperate, reload boo
 		return err
 	}
 
-	var wg sync.WaitGroup
 	addressList := strings.Split(req.Address, ",")
 	for _, addr := range addressList {
 		if len(addr) == 0 {
 			continue
 		}
 		fireInfo.Address = addr
-		wg.Add(1)
-		go func(req dto.AddrRuleOperate) {
-			defer wg.Done()
-			if err := client.RichRules(fireInfo, req.Operation); err != nil {
-				global.LOG.Errorf("%s address %s failed (strategy: %s), err: %v", req.Operation, req.Address, req.Strategy, err)
-			}
-			req.Address = fireInfo.Address
-			_ = u.addAddressRecord(req)
-		}(req)
+		if err := client.RichRules(fireInfo, req.Operation); err != nil {
+			return err
+		}
 	}
-	wg.Wait()
 	if reload {
 		return client.Reload()
 	}
@@ -379,38 +276,24 @@ func (u *FirewallService) UpdateAddrRule(req dto.AddrRuleUpdate) error {
 	return client.Reload()
 }
 
-func (u *FirewallService) UpdateDescription(req dto.UpdateFirewallDescription) error {
-	var firewall model.Firewall
-	if err := copier.Copy(&firewall, &req); err != nil {
-		return errors.WithMessage(constant.ErrStructTransform, err.Error())
-	}
-	return hostRepo.SaveFirewallRecord(&firewall)
-}
-
 func (u *FirewallService) BatchOperateRule(req dto.BatchRuleOperate) error {
 	client, err := firewall.NewFirewallClient()
 	if err != nil {
 		return err
 	}
-	var wgBatch sync.WaitGroup
 	if req.Type == "port" {
 		for _, rule := range req.Rules {
-			wgBatch.Add(1)
-			go func(item dto.PortRuleOperate) {
-				defer wgBatch.Done()
-				_ = u.OperatePortRule(item, false)
-			}(rule)
+			if err := u.OperatePortRule(rule, false); err != nil {
+				return err
+			}
 		}
-		wgBatch.Wait()
 		return client.Reload()
 	}
 	for _, rule := range req.Rules {
 		itemRule := dto.AddrRuleOperate{Operation: rule.Operation, Address: rule.Address, Strategy: rule.Strategy}
-		wgBatch.Add(1)
-		go func(item dto.AddrRuleOperate) {
-			defer wgBatch.Done()
-			_ = u.OperateAddressRule(item, false)
-		}(itemRule)
+		if err := u.OperateAddressRule(itemRule, false); err != nil {
+			return err
+		}
 	}
 	return client.Reload()
 }
@@ -421,6 +304,7 @@ func OperateFirewallPort(oldPorts, newPorts []int) error {
 		return err
 	}
 	for _, port := range newPorts {
+
 		if err := client.Port(fireClient.FireInfo{Port: strconv.Itoa(port), Protocol: "tcp", Strategy: "accept"}, "add"); err != nil {
 			return err
 		}
@@ -440,7 +324,7 @@ func (u *FirewallService) operatePort(client firewall.FirewallClient, req dto.Po
 	}
 
 	if client.Name() == "ufw" {
-		if len(fireInfo.Address) != 0 && !strings.EqualFold(fireInfo.Address, "Anywhere") {
+		if len(fireInfo.Address) != 0 && fireInfo.Address != "Anywhere" {
 			return client.RichRules(fireInfo, req.Operation)
 		}
 		return client.Port(fireInfo, req.Operation)
@@ -480,29 +364,6 @@ func (u *FirewallService) loadPortByApp() []portOfApp {
 	return datas
 }
 
-func (u *FirewallService) cleanUnUsedData(client firewall.FirewallClient) {
-	list, _ := client.ListPort()
-	addressList, _ := client.ListAddress()
-	list = append(list, addressList...)
-	if len(list) == 0 {
-		return
-	}
-	records, _ := hostRepo.ListFirewallRecord()
-	if len(records) == 0 {
-		return
-	}
-	for _, item := range list {
-		for i := 0; i < len(records); i++ {
-			if records[i].Port == item.Port && records[i].Protocol == item.Protocol && records[i].Strategy == item.Strategy && records[i].Address == item.Address {
-				records = append(records[:i], records[i+1:]...)
-			}
-		}
-	}
-
-	for _, record := range records {
-		_ = hostRepo.DeleteFirewallRecordByID(record.ID)
-	}
-}
 func (u *FirewallService) pingStatus() string {
 	if _, err := os.Stat("/etc/sysctl.conf"); err != nil {
 		return constant.StatusNone
@@ -581,30 +442,3 @@ func (u *FirewallService) addPortsBeforeStart(client firewall.FirewallClient) er
 
 	return client.Reload()
 }
-
-func (u *FirewallService) addPortRecord(req dto.PortRuleOperate) error {
-	if req.Operation == "remove" {
-		return hostRepo.DeleteFirewallRecord("port", req.Port, req.Protocol, req.Address, req.Strategy)
-	}
-
-	return hostRepo.SaveFirewallRecord(&model.Firewall{
-		Type:        "port",
-		Port:        req.Port,
-		Protocol:    req.Protocol,
-		Address:     req.Address,
-		Strategy:    req.Strategy,
-		Description: req.Description,
-	})
-}
-
-func (u *FirewallService) addAddressRecord(req dto.AddrRuleOperate) error {
-	if req.Operation == "remove" {
-		return hostRepo.DeleteFirewallRecord("address", "", "", req.Address, req.Strategy)
-	}
-	return hostRepo.SaveFirewallRecord(&model.Firewall{
-		Type:        "address",
-		Address:     req.Address,
-		Strategy:    req.Strategy,
-		Description: req.Description,
-	})
-}

backend/app/service/host.go

@@ -7,7 +7,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
 	"github.com/1Panel-dev/1Panel/backend/utils/ssh"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
@@ -24,8 +23,6 @@ type IHostService interface {
 	Create(hostDto dto.HostOperate) (*dto.HostInfo, error)
 	Update(id uint, upMap map[string]interface{}) error
 	Delete(id []uint) error
-
-	EncryptHost(itemVal string) (string, error)
 }
 
 func NewIHostService() IHostService {
@@ -92,25 +89,8 @@ func (u *HostService) TestLocalConn(id uint) bool {
 	if err := copier.Copy(&connInfo, &host); err != nil {
 		return false
 	}
-	if len(host.Password) != 0 {
-		host.Password, err = encrypt.StringDecrypt(host.Password)
-		if err != nil {
-			return false
-		}
-		connInfo.Password = host.Password
-	}
-	if len(host.PrivateKey) != 0 {
-		host.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
-		if err != nil {
-			return false
-		}
-		connInfo.PrivateKey = []byte(host.PrivateKey)
-	}
+	connInfo.PrivateKey = []byte(host.PrivateKey)
 	if len(host.PassPhrase) != 0 {
-		host.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
-		if err != nil {
-			return false
-		}
 		connInfo.PassPhrase = []byte(host.PassPhrase)
 	}
 	client, err := connInfo.NewClient()
@@ -127,25 +107,6 @@ func (u *HostService) GetHostInfo(id uint) (*model.Host, error) {
 	if err != nil {
 		return nil, constant.ErrRecordNotFound
 	}
-	if len(host.Password) != 0 {
-		host.Password, err = encrypt.StringDecrypt(host.Password)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(host.PrivateKey) != 0 {
-		host.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if len(host.PassPhrase) != 0 {
-		host.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
-		if err != nil {
-			return nil, err
-		}
-	}
 	return &host, err
 }
 
@@ -166,25 +127,6 @@ func (u *HostService) SearchWithPage(search dto.SearchHostWithPage) (int64, inte
 			item.Password = ""
 			item.PrivateKey = ""
 			item.PassPhrase = ""
-		} else {
-			if len(host.Password) != 0 {
-				item.Password, err = encrypt.StringDecrypt(host.Password)
-				if err != nil {
-					return 0, nil, err
-				}
-			}
-			if len(host.PrivateKey) != 0 {
-				item.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
-				if err != nil {
-					return 0, nil, err
-				}
-			}
-			if len(host.PassPhrase) != 0 {
-				item.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
-				if err != nil {
-					return 0, nil, err
-				}
-			}
 		}
 		dtoHosts = append(dtoHosts, item)
 	}
@@ -222,28 +164,6 @@ func (u *HostService) SearchForTree(search dto.SearchForTree) ([]dto.HostTree, e
 }
 
 func (u *HostService) Create(req dto.HostOperate) (*dto.HostInfo, error) {
-	var err error
-	if len(req.Password) != 0 && req.AuthMode == "password" {
-		req.Password, err = u.EncryptHost(req.Password)
-		if err != nil {
-			return nil, err
-		}
-		req.PrivateKey = ""
-		req.PassPhrase = ""
-	}
-	if len(req.PrivateKey) != 0 && req.AuthMode == "key" {
-		req.PrivateKey, err = u.EncryptHost(req.PrivateKey)
-		if err != nil {
-			return nil, err
-		}
-		if len(req.PassPhrase) != 0 {
-			req.PassPhrase, err = encrypt.StringEncrypt(req.PassPhrase)
-			if err != nil {
-				return nil, err
-			}
-		}
-		req.Password = ""
-	}
 	var host model.Host
 	if err := copier.Copy(&host, &req); err != nil {
 		return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
@@ -314,12 +234,3 @@ func (u *HostService) Delete(ids []uint) error {
 func (u *HostService) Update(id uint, upMap map[string]interface{}) error {
 	return hostRepo.Update(id, upMap)
 }
-
-func (u *HostService) EncryptHost(itemVal string) (string, error) {
-	privateKey, err := base64.StdEncoding.DecodeString(itemVal)
-	if err != nil {
-		return "", err
-	}
-	keyItem, err := encrypt.StringEncrypt(string(privateKey))
-	return keyItem, err
-}

backend/app/service/host_tool.go

@@ -1,565 +0,0 @@
-package service
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
-	"github.com/1Panel-dev/1Panel/backend/app/dto/response"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
-	"github.com/1Panel-dev/1Panel/backend/utils/files"
-	"github.com/1Panel-dev/1Panel/backend/utils/ini_conf"
-	"github.com/1Panel-dev/1Panel/backend/utils/systemctl"
-	"github.com/pkg/errors"
-	"gopkg.in/ini.v1"
-	"os/exec"
-	"os/user"
-	"path"
-	"strconv"
-	"strings"
-)
-
-type HostToolService struct{}
-
-type IHostToolService interface {
-	GetToolStatus(req request.HostToolReq) (*response.HostToolRes, error)
-	CreateToolConfig(req request.HostToolCreate) error
-	OperateTool(req request.HostToolReq) error
-	OperateToolConfig(req request.HostToolConfig) (*response.HostToolConfig, error)
-	GetToolLog(req request.HostToolLogReq) (string, error)
-	OperateSupervisorProcess(req request.SupervisorProcessConfig) error
-	GetSupervisorProcessConfig() ([]response.SupervisorProcessConfig, error)
-	OperateSupervisorProcessFile(req request.SupervisorProcessFileReq) (string, error)
-}
-
-func NewIHostToolService() IHostToolService {
-	return &HostToolService{}
-}
-
-func (h *HostToolService) GetToolStatus(req request.HostToolReq) (*response.HostToolRes, error) {
-	res := &response.HostToolRes{}
-	res.Type = req.Type
-	switch req.Type {
-	case constant.Supervisord:
-		supervisorConfig := &response.Supervisor{}
-		if !cmd.Which(constant.Supervisord) {
-			supervisorConfig.IsExist = false
-			res.Config = supervisorConfig
-			return res, nil
-		}
-		supervisorConfig.IsExist = true
-		serviceExist, _ := systemctl.IsExist(constant.Supervisord)
-		if !serviceExist {
-			serviceExist, _ = systemctl.IsExist(constant.Supervisor)
-			if !serviceExist {
-				supervisorConfig.IsExist = false
-				res.Config = supervisorConfig
-				return res, nil
-			} else {
-				supervisorConfig.ServiceName = constant.Supervisor
-			}
-		} else {
-			supervisorConfig.ServiceName = constant.Supervisord
-		}
-
-		serviceNameSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorServiceName))
-		if serviceNameSet.ID != 0 || serviceNameSet.Value != "" {
-			supervisorConfig.ServiceName = serviceNameSet.Value
-		}
-
-		versionRes, _ := cmd.Exec("supervisord -v")
-		supervisorConfig.Version = strings.TrimSuffix(versionRes, "\n")
-		_, ctlRrr := exec.LookPath("supervisorctl")
-		supervisorConfig.CtlExist = ctlRrr == nil
-
-		active, _ := systemctl.IsActive(supervisorConfig.ServiceName)
-		if active {
-			supervisorConfig.Status = "running"
-		} else {
-			supervisorConfig.Status = "stopped"
-		}
-
-		pathSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorConfigPath))
-		if pathSet.ID != 0 || pathSet.Value != "" {
-			supervisorConfig.ConfigPath = pathSet.Value
-			res.Config = supervisorConfig
-			return res, nil
-		} else {
-			supervisorConfig.Init = true
-		}
-
-		servicePath := "/usr/lib/systemd/system/supervisor.service"
-		fileOp := files.NewFileOp()
-		if !fileOp.Stat(servicePath) {
-			servicePath = "/usr/lib/systemd/system/supervisord.service"
-		}
-		if fileOp.Stat(servicePath) {
-			startCmd, _ := ini_conf.GetIniValue(servicePath, "Service", "ExecStart")
-			if startCmd != "" {
-				args := strings.Fields(startCmd)
-				cIndex := -1
-				for i, arg := range args {
-					if arg == "-c" {
-						cIndex = i
-						break
-					}
-				}
-				if cIndex != -1 && cIndex+1 < len(args) {
-					supervisorConfig.ConfigPath = args[cIndex+1]
-				}
-			}
-		}
-		if supervisorConfig.ConfigPath == "" {
-			configPath := "/etc/supervisord.conf"
-			if !fileOp.Stat(configPath) {
-				configPath = "/etc/supervisor/supervisord.conf"
-				if fileOp.Stat(configPath) {
-					supervisorConfig.ConfigPath = configPath
-				}
-			}
-		}
-
-		res.Config = supervisorConfig
-	}
-	return res, nil
-}
-
-func (h *HostToolService) CreateToolConfig(req request.HostToolCreate) error {
-	switch req.Type {
-	case constant.Supervisord:
-		fileOp := files.NewFileOp()
-		if !fileOp.Stat(req.ConfigPath) {
-			return buserr.New("ErrConfigNotFound")
-		}
-		cfg, err := ini.Load(req.ConfigPath)
-		if err != nil {
-			return err
-		}
-		service, err := cfg.GetSection("include")
-		if err != nil {
-			return err
-		}
-		targetKey, err := service.GetKey("files")
-		if err != nil {
-			return err
-		}
-		if targetKey != nil {
-			_, err = service.NewKey(";files", targetKey.Value())
-			if err != nil {
-				return err
-			}
-		}
-		supervisorDir := path.Join(global.CONF.System.BaseDir, "1panel", "tools", "supervisord")
-		includeDir := path.Join(supervisorDir, "supervisor.d")
-		if !fileOp.Stat(includeDir) {
-			if err = fileOp.CreateDir(includeDir, 0755); err != nil {
-				return err
-			}
-		}
-		logDir := path.Join(supervisorDir, "log")
-		if !fileOp.Stat(logDir) {
-			if err = fileOp.CreateDir(logDir, 0755); err != nil {
-				return err
-			}
-		}
-		includePath := path.Join(includeDir, "*.ini")
-		targetKey.SetValue(includePath)
-		if err = cfg.SaveTo(req.ConfigPath); err != nil {
-			return err
-		}
-
-		serviceNameSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorServiceName))
-		if serviceNameSet.ID != 0 {
-			if err = settingRepo.Update(constant.SupervisorServiceName, req.ServiceName); err != nil {
-				return err
-			}
-		} else {
-			if err = settingRepo.Create(constant.SupervisorServiceName, req.ServiceName); err != nil {
-				return err
-			}
-		}
-
-		configPathSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorConfigPath))
-		if configPathSet.ID != 0 {
-			if err = settingRepo.Update(constant.SupervisorConfigPath, req.ConfigPath); err != nil {
-				return err
-			}
-		} else {
-			if err = settingRepo.Create(constant.SupervisorConfigPath, req.ConfigPath); err != nil {
-				return err
-			}
-		}
-		if err = systemctl.Restart(req.ServiceName); err != nil {
-			global.LOG.Errorf("[init] restart %s failed err %s", req.ServiceName, err.Error())
-			return err
-		}
-	}
-	return nil
-}
-
-func (h *HostToolService) OperateTool(req request.HostToolReq) error {
-	serviceName := req.Type
-	if req.Type == constant.Supervisord {
-		serviceNameSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorServiceName))
-		if serviceNameSet.ID != 0 || serviceNameSet.Value != "" {
-			serviceName = serviceNameSet.Value
-		}
-	}
-	return systemctl.Operate(req.Operate, serviceName)
-}
-
-func (h *HostToolService) OperateToolConfig(req request.HostToolConfig) (*response.HostToolConfig, error) {
-	fileOp := files.NewFileOp()
-	res := &response.HostToolConfig{}
-	configPath := ""
-	serviceName := "supervisord"
-	switch req.Type {
-	case constant.Supervisord:
-		pathSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorConfigPath))
-		if pathSet.ID != 0 || pathSet.Value != "" {
-			configPath = pathSet.Value
-		}
-		serviceNameSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorServiceName))
-		if serviceNameSet.ID != 0 || serviceNameSet.Value != "" {
-			serviceName = serviceNameSet.Value
-		}
-	}
-	switch req.Operate {
-	case "get":
-		content, err := fileOp.GetContent(configPath)
-		if err != nil {
-			return nil, err
-		}
-		res.Content = string(content)
-	case "set":
-		file, err := fileOp.OpenFile(configPath)
-		if err != nil {
-			return nil, err
-		}
-		oldContent, err := fileOp.GetContent(configPath)
-		if err != nil {
-			return nil, err
-		}
-		fileInfo, err := file.Stat()
-		if err != nil {
-			return nil, err
-		}
-		if err = fileOp.WriteFile(configPath, strings.NewReader(req.Content), fileInfo.Mode()); err != nil {
-			return nil, err
-		}
-		if err = systemctl.Restart(serviceName); err != nil {
-			_ = fileOp.WriteFile(configPath, bytes.NewReader(oldContent), fileInfo.Mode())
-			return nil, err
-		}
-	}
-
-	return res, nil
-}
-
-func (h *HostToolService) GetToolLog(req request.HostToolLogReq) (string, error) {
-	fileOp := files.NewFileOp()
-	logfilePath := ""
-	switch req.Type {
-	case constant.Supervisord:
-		configPath := "/etc/supervisord.conf"
-		pathSet, _ := settingRepo.Get(settingRepo.WithByKey(constant.SupervisorConfigPath))
-		if pathSet.ID != 0 || pathSet.Value != "" {
-			configPath = pathSet.Value
-		}
-		logfilePath, _ = ini_conf.GetIniValue(configPath, "supervisord", "logfile")
-	}
-	oldContent, err := fileOp.GetContent(logfilePath)
-	if err != nil {
-		return "", err
-	}
-	return string(oldContent), nil
-}
-
-func (h *HostToolService) OperateSupervisorProcess(req request.SupervisorProcessConfig) error {
-	var (
-		supervisordDir = path.Join(global.CONF.System.BaseDir, "1panel", "tools", "supervisord")
-		logDir         = path.Join(supervisordDir, "log")
-		includeDir     = path.Join(supervisordDir, "supervisor.d")
-		outLog         = path.Join(logDir, fmt.Sprintf("%s.out.log", req.Name))
-		errLog         = path.Join(logDir, fmt.Sprintf("%s.err.log", req.Name))
-		iniPath        = path.Join(includeDir, fmt.Sprintf("%s.ini", req.Name))
-		fileOp         = files.NewFileOp()
-	)
-	if req.Operate == "update" || req.Operate == "create" {
-		if !fileOp.Stat(req.Dir) {
-			return buserr.New("ErrConfigDirNotFound")
-		}
-		_, err := user.Lookup(req.User)
-		if err != nil {
-			return buserr.WithMap("ErrUserFindErr", map[string]interface{}{"name": req.User, "err": err.Error()}, err)
-		}
-	}
-
-	switch req.Operate {
-	case "create":
-		if fileOp.Stat(iniPath) {
-			return buserr.New("ErrConfigAlreadyExist")
-		}
-		configFile := ini.Empty()
-		section, err := configFile.NewSection(fmt.Sprintf("program:%s", req.Name))
-		if err != nil {
-			return err
-		}
-		_, _ = section.NewKey("command", req.Command)
-		_, _ = section.NewKey("directory", req.Dir)
-		_, _ = section.NewKey("autorestart", "true")
-		_, _ = section.NewKey("startsecs", "3")
-		_, _ = section.NewKey("stdout_logfile", outLog)
-		_, _ = section.NewKey("stderr_logfile", errLog)
-		_, _ = section.NewKey("stdout_logfile_maxbytes", "2MB")
-		_, _ = section.NewKey("stderr_logfile_maxbytes", "2MB")
-		_, _ = section.NewKey("user", req.User)
-		_, _ = section.NewKey("priority", "999")
-		_, _ = section.NewKey("numprocs", req.Numprocs)
-		_, _ = section.NewKey("process_name", "%(program_name)s_%(process_num)02d")
-
-		if err = configFile.SaveTo(iniPath); err != nil {
-			return err
-		}
-		if err := operateSupervisorCtl("reread", "", ""); err != nil {
-			return err
-		}
-		return operateSupervisorCtl("update", "", "")
-	case "update":
-		configFile, err := ini.Load(iniPath)
-		if err != nil {
-			return err
-		}
-		section, err := configFile.GetSection(fmt.Sprintf("program:%s", req.Name))
-		if err != nil {
-			return err
-		}
-
-		commandKey := section.Key("command")
-		commandKey.SetValue(req.Command)
-		directoryKey := section.Key("directory")
-		directoryKey.SetValue(req.Dir)
-		userKey := section.Key("user")
-		userKey.SetValue(req.User)
-		numprocsKey := section.Key("numprocs")
-		numprocsKey.SetValue(req.Numprocs)
-
-		if err = configFile.SaveTo(iniPath); err != nil {
-			return err
-		}
-		if err := operateSupervisorCtl("reread", "", ""); err != nil {
-			return err
-		}
-		return operateSupervisorCtl("update", "", "")
-	case "restart":
-		return operateSupervisorCtl("restart", req.Name, "")
-	case "start":
-		return operateSupervisorCtl("start", req.Name, "")
-	case "stop":
-		return operateSupervisorCtl("stop", req.Name, "")
-	case "delete":
-		_ = operateSupervisorCtl("remove", "", req.Name)
-		_ = files.NewFileOp().DeleteFile(iniPath)
-		_ = files.NewFileOp().DeleteFile(outLog)
-		_ = files.NewFileOp().DeleteFile(errLog)
-		if err := operateSupervisorCtl("reread", "", ""); err != nil {
-			return err
-		}
-		return operateSupervisorCtl("update", "", "")
-	}
-
-	return nil
-}
-
-func (h *HostToolService) GetSupervisorProcessConfig() ([]response.SupervisorProcessConfig, error) {
-	var (
-		result []response.SupervisorProcessConfig
-	)
-	configDir := path.Join(global.CONF.System.BaseDir, "1panel", "tools", "supervisord", "supervisor.d")
-	fileList, _ := NewIFileService().GetFileList(request.FileOption{FileOption: files.FileOption{Path: configDir, Expand: true, Page: 1, PageSize: 100}})
-	if len(fileList.Items) == 0 {
-		return result, nil
-	}
-	for _, configFile := range fileList.Items {
-		f, err := ini.Load(configFile.Path)
-		if err != nil {
-			global.LOG.Errorf("get %s file err %s", configFile.Name, err.Error())
-			continue
-		}
-		if strings.HasSuffix(configFile.Name, ".ini") {
-			config := response.SupervisorProcessConfig{}
-			name := strings.TrimSuffix(configFile.Name, ".ini")
-			config.Name = name
-			section, err := f.GetSection(fmt.Sprintf("program:%s", name))
-			if err != nil {
-				global.LOG.Errorf("get %s file section err %s", configFile.Name, err.Error())
-				continue
-			}
-			if command, _ := section.GetKey("command"); command != nil {
-				config.Command = command.Value()
-			}
-			if directory, _ := section.GetKey("directory"); directory != nil {
-				config.Dir = directory.Value()
-			}
-			if user, _ := section.GetKey("user"); user != nil {
-				config.User = user.Value()
-			}
-			if numprocs, _ := section.GetKey("numprocs"); numprocs != nil {
-				config.Numprocs = numprocs.Value()
-			}
-			_ = getProcessStatus(&config)
-			result = append(result, config)
-		}
-	}
-	return result, nil
-}
-
-func (h *HostToolService) OperateSupervisorProcessFile(req request.SupervisorProcessFileReq) (string, error) {
-	var (
-		fileOp     = files.NewFileOp()
-		group      = fmt.Sprintf("program:%s", req.Name)
-		configPath = path.Join(global.CONF.System.BaseDir, "1panel", "tools", "supervisord", "supervisor.d", fmt.Sprintf("%s.ini", req.Name))
-	)
-	switch req.File {
-	case "err.log":
-		logPath, err := ini_conf.GetIniValue(configPath, group, "stderr_logfile")
-		if err != nil {
-			return "", err
-		}
-		switch req.Operate {
-		case "get":
-			content, err := fileOp.GetContent(logPath)
-			if err != nil {
-				return "", err
-			}
-			return string(content), nil
-		case "clear":
-			if err = fileOp.WriteFile(logPath, strings.NewReader(""), 0755); err != nil {
-				return "", err
-			}
-		}
-
-	case "out.log":
-		logPath, err := ini_conf.GetIniValue(configPath, group, "stdout_logfile")
-		if err != nil {
-			return "", err
-		}
-		switch req.Operate {
-		case "get":
-			content, err := fileOp.GetContent(logPath)
-			if err != nil {
-				return "", err
-			}
-			return string(content), nil
-		case "clear":
-			if err = fileOp.WriteFile(logPath, strings.NewReader(""), 0755); err != nil {
-				return "", err
-			}
-		}
-
-	case "config":
-		switch req.Operate {
-		case "get":
-			content, err := fileOp.GetContent(configPath)
-			if err != nil {
-				return "", err
-			}
-			return string(content), nil
-		case "update":
-			if req.Content == "" {
-				return "", buserr.New("ErrConfigIsNull")
-			}
-			if err := fileOp.WriteFile(configPath, strings.NewReader(req.Content), 0755); err != nil {
-				return "", err
-			}
-			return "", operateSupervisorCtl("update", "", req.Name)
-		}
-
-	}
-	return "", nil
-}
-
-func operateSupervisorCtl(operate, name, group string) error {
-	processNames := []string{operate}
-	if name != "" {
-		includeDir := path.Join(global.CONF.System.BaseDir, "1panel", "tools", "supervisord", "supervisor.d")
-		f, err := ini.Load(path.Join(includeDir, fmt.Sprintf("%s.ini", name)))
-		if err != nil {
-			return err
-		}
-		section, err := f.GetSection(fmt.Sprintf("program:%s", name))
-		if err != nil {
-			return err
-		}
-		numprocsNum := ""
-		if numprocs, _ := section.GetKey("numprocs"); numprocs != nil {
-			numprocsNum = numprocs.Value()
-		}
-		if numprocsNum == "" {
-			return buserr.New("ErrConfigParse")
-		}
-		processNames = append(processNames, getProcessName(name, numprocsNum)...)
-	}
-	if group != "" {
-		processNames = append(processNames, group)
-	}
-
-	output, err := exec.Command("supervisorctl", processNames...).Output()
-	if err != nil {
-		if output != nil {
-			return errors.New(string(output))
-		}
-		return err
-	}
-	return nil
-}
-
-func getProcessName(name, numprocs string) []string {
-	var (
-		processNames []string
-	)
-	num, err := strconv.Atoi(numprocs)
-	if err != nil {
-		return processNames
-	}
-	if num == 1 {
-		processNames = append(processNames, fmt.Sprintf("%s:%s_00", name, name))
-	} else {
-		for i := 0; i < num; i++ {
-			processName := fmt.Sprintf("%s:%s_0%s", name, name, strconv.Itoa(i))
-			if i >= 10 {
-				processName = fmt.Sprintf("%s:%s_%s", name, name, strconv.Itoa(i))
-			}
-			processNames = append(processNames, processName)
-		}
-	}
-	return processNames
-}
-
-func getProcessStatus(config *response.SupervisorProcessConfig) error {
-	var (
-		processNames = []string{"status"}
-	)
-	processNames = append(processNames, getProcessName(config.Name, config.Numprocs)...)
-	output, _ := exec.Command("supervisorctl", processNames...).Output()
-	lines := strings.Split(string(output), "\n")
-	for _, line := range lines {
-		fields := strings.Fields(line)
-		if len(fields) >= 5 {
-			status := response.ProcessStatus{
-				Name:   fields[0],
-				Status: fields[1],
-			}
-			if fields[1] == "RUNNING" {
-				status.PID = strings.TrimSuffix(fields[3], ",")
-				status.Uptime = fields[5]
-			} else {
-				status.Msg = strings.Join(fields[2:], " ")
-			}
-			config.Status = append(config.Status, status)
-		}
-	}
-	return nil
-}

backend/app/service/image.go

@@ -156,15 +156,10 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) {
 		Remove:     true,
 		Labels:     stringsToMap(req.Tags),
 	}
+	logName := fmt.Sprintf("%s/build.log", req.Dockerfile)
 
-	dockerLogDir := path.Join(global.CONF.System.TmpDir, "docker_logs")
-	if _, err := os.Stat(dockerLogDir); err != nil && os.IsNotExist(err) {
-		if err = os.MkdirAll(dockerLogDir, os.ModePerm); err != nil {
-			return "", err
-		}
-	}
-	logItem := fmt.Sprintf("%s/image_build_%s_%s.log", dockerLogDir, strings.ReplaceAll(req.Name, ":", "_"), time.Now().Format("20060102150405"))
-	file, err := os.OpenFile(logItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	pathItem := logName
+	file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 	if err != nil {
 		return "", err
 	}
@@ -197,7 +192,7 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) {
 		_, _ = file.WriteString("image build successful!")
 	}()
 
-	return path.Base(logItem), nil
+	return logName, nil
 }
 
 func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
@@ -205,15 +200,15 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	dockerLogDir := path.Join(global.CONF.System.TmpDir, "docker_logs")
+	dockerLogDir := global.CONF.System.TmpDir + "/docker_logs"
 	if _, err := os.Stat(dockerLogDir); err != nil && os.IsNotExist(err) {
 		if err = os.MkdirAll(dockerLogDir, os.ModePerm); err != nil {
 			return "", err
 		}
 	}
 	imageItemName := strings.ReplaceAll(path.Base(req.ImageName), ":", "_")
-	logItem := fmt.Sprintf("%s/image_pull_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405"))
-	file, err := os.OpenFile(logItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	pathItem := fmt.Sprintf("%s/image_pull_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405"))
+	file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 	if err != nil {
 		return "", err
 	}
@@ -229,7 +224,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 			global.LOG.Infof("pull image %s successful!", req.ImageName)
 			_, _ = io.Copy(file, out)
 		}()
-		return path.Base(logItem), nil
+		return pathItem, nil
 	}
 	repo, err := imageRepoRepo.Get(commonRepo.WithByID(req.RepoID))
 	if err != nil {
@@ -262,7 +257,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 		_, _ = io.Copy(file, out)
 		_, _ = file.WriteString("image pull successful!")
 	}()
-	return path.Base(logItem), nil
+	return pathItem, nil
 }
 
 func (u *ImageService) ImageLoad(req dto.ImageLoad) error {
@@ -359,8 +354,8 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) {
 		}
 	}
 	imageItemName := strings.ReplaceAll(path.Base(req.Name), ":", "_")
-	logItem := fmt.Sprintf("%s/image_push_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405"))
-	file, err := os.OpenFile(logItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	pathItem := fmt.Sprintf("%s/image_push_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405"))
+	file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 	if err != nil {
 		return "", err
 	}
@@ -378,7 +373,7 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) {
 		_, _ = file.WriteString("image push successful!")
 	}()
 
-	return path.Base(logItem), nil
+	return pathItem, nil
 }
 
 func (u *ImageService) ImageRemove(req dto.BatchDelete) error {

backend/app/service/image_repo.go

@@ -79,7 +79,7 @@ func (u *ImageRepoService) List() ([]dto.ImageRepoOption, error) {
 
 func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error {
 	if cmd.CheckIllegal(req.Username, req.Password, req.DownloadUrl) {
-		return buserr.New(constant.ErrCmdIllegal)
+		return buserr.New(constant.ErrRepoConn)
 	}
 	imageRepo, _ := imageRepoRepo.Get(commonRepo.WithByName(req.Name))
 	if imageRepo.ID != 0 {
@@ -148,7 +148,7 @@ func (u *ImageRepoService) Update(req dto.ImageRepoUpdate) error {
 		return errors.New("The default value cannot be deleted !")
 	}
 	if cmd.CheckIllegal(req.Username, req.Password, req.DownloadUrl) {
-		return buserr.New(constant.ErrCmdIllegal)
+		return buserr.New(constant.ErrRepoConn)
 	}
 	repo, err := imageRepoRepo.Get(commonRepo.WithByID(req.ID))
 	if err != nil {