feat: 文件列表行内权限支持修改用户和用户组 (#5093)

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

CONTRIBUTING.md

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

README.md

@@ -21,18 +21,8 @@
 
 1Panel 三分钟速览：https://www.bilibili.com/video/BV1Mt421n7LZ/
 
-## UI 展示
-
-![UI展示](https://resource.fit2cloud.com/1panel/img/overview.png)
-
 ## 快速开始
 
-**在线体验**
-
-- 环境地址：<https://demo.1panel.cn/>
-- 用户名：demo
-- 密码：1panel
-
 **一键安装**
 
 执行如下命令一键安装 1Panel:
@@ -44,30 +34,24 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
 **学习资料**
 
 - [在线文档](https://1panel.cn/docs/)
-- [教学视频](https://space.bilibili.com/510493147/channel/collectiondetail?sid=1199760)
 - [社区论坛](https://bbs.fit2cloud.com/c/1p/7)
 - [如何加入微信交流群?](https://bbs.fit2cloud.com/t/topic/2147)
 
-## 安全说明
+## UI 展示
 
-如果您在使用过程中发现任何安全问题，请通过以下方式直接联系我们：
-
-- 邮箱：wanghe@fit2cloud.com
+![UI展示](https://resource.fit2cloud.com/1panel/img/overview.png)
 
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=1Panel-dev/1Panel&type=Date)](https://star-history.com/#1Panel-dev/1Panel&Date)
 
 ## 我们的其他明星项目
+
+- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - 基于 LLM 大语言模型的开源知识库问答系统
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - 广受欢迎的开源堡垒机
-- [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
-- [MeterSphere](https://github.com/metersphere/metersphere/) - 一站式开源自动化测试平台
 - [Halo](https://github.com/halo-dev/halo/) - 强大易用的开源建站工具
-
-
-## FOSSA Status
-
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2F1Panel-dev%2F1Panel?ref=badge_large)
+- [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
+- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源自动化测试平台
 
 ## License
 

backend/app/api/v1/backup.go

@@ -323,7 +323,7 @@ func (b *BaseApi) Backup(c *gin.Context) {
 
 	switch req.Type {
 	case "app":
-		if err := backupService.AppBackup(req); err != nil {
+		if _, err := backupService.AppBackup(req); err != nil {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 			return
 		}

backend/app/api/v1/docker.go

@@ -61,7 +61,7 @@ func (b *BaseApi) LoadDaemonJson(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/daemonjson/update [post]
-// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置 [key]=>[value]","formatEN":"Updated the docker daemon.json configuration [key]=>[value]"}
+// @x-panel-log {"bodyKeys":["key", "value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置 [key]","formatEN":"Updated configuration [key]"}
 func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 	var req dto.SettingUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -84,7 +84,7 @@ func (b *BaseApi) UpdateDaemonJson(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/logoption/update [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 日志配置","formatEN":"Updated the docker daemon.json log option"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新日志配置","formatEN":"Updated the log option"}
 func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 	var req dto.LogOption
 	if err := helper.CheckBind(&req, c); err != nil {
@@ -107,7 +107,7 @@ func (b *BaseApi) UpdateLogOption(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/ipv6option/update [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json ipv6 配置","formatEN":"Updated the docker daemon.json ipv6 option"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 ipv6 配置","formatEN":"Updated the ipv6 option"}
 func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
 	var req dto.Ipv6Option
 	if err := helper.CheckBind(&req, c); err != nil {
@@ -130,7 +130,7 @@ func (b *BaseApi) UpdateIpv6Option(c *gin.Context) {
 // @Success 200
 // @Security ApiKeyAuth
 // @Router /containers/daemonjson/update/byfile [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新 docker daemon.json 配置","formatEN":"Updated the docker daemon.json configuration"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新配置文件","formatEN":"Updated configuration file"}
 func (b *BaseApi) UpdateDaemonJsonByFile(c *gin.Context) {
 	var req dto.DaemonJsonUpdateByFile
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/file.go

@@ -318,7 +318,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 	}
 	dir := path.Dir(paths[0])
 
-	info, err := os.Stat(dir)
+	_, err = os.Stat(dir)
 	if err != nil && os.IsNotExist(err) {
 		mode, err := files.GetParentMode(dir)
 		if err != nil {
@@ -330,7 +330,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 			return
 		}
 	}
-	info, err = os.Stat(dir)
+	info, err := os.Stat(dir)
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 		return
@@ -486,6 +486,7 @@ func (b *BaseApi) Download(c *gin.Context) {
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
 	}
+	defer file.Close()
 	info, _ := file.Stat()
 	c.Header("Content-Length", strconv.FormatInt(info.Size(), 10))
 	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(info.Name()))
@@ -643,6 +644,7 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
 		return
 	}
+	defer uploadFile.Close()
 	chunkIndex, err := strconv.Atoi(c.PostForm("chunkIndex"))
 	if err != nil {
 		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)

backend/app/api/v1/runtime.go

@@ -76,6 +76,20 @@ func (b *BaseApi) DeleteRuntime(c *gin.Context) {
 	helper.SuccessWithOutData(c)
 }
 
+func (b *BaseApi) DeleteRuntimeCheck(c *gin.Context) {
+	runTimeId, err := helper.GetIntParamByKey(c, "runTimeId")
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInternalServer, nil)
+		return
+	}
+	checkData, err := runtimeService.DeleteCheck(runTimeId)
+	if err != nil {
+		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		return
+	}
+	helper.SuccessWithData(c, checkData)
+}
+
 // @Tags Runtime
 // @Summary Update runtime
 // @Description 更新运行环境

backend/app/api/v1/terminal.go

@@ -3,7 +3,6 @@ package v1
 import (
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -93,16 +92,17 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) {
 	}
 
 	defer wsConn.Close()
-	commands := "redis-cli"
+	commands := []string{"redis-cli"}
 	if len(redisConf.Requirepass) != 0 {
-		commands = fmt.Sprintf("redis-cli -a %s --no-auth-warning", redisConf.Requirepass)
+		commands = []string{"redis-cli", "-a", redisConf.Requirepass, "--no-auth-warning"}
 	}
 	pidMap := loadMapFromDockerTop(redisConf.ContainerName)
-	slave, err := terminal.NewCommand(fmt.Sprintf("docker exec -it %s %s", redisConf.ContainerName, commands))
+	itemCmds := append([]string{"exec", "-it", redisConf.ContainerName}, commands...)
+	slave, err := terminal.NewCommand(itemCmds)
 	if wshandleError(wsConn, err) {
 		return
 	}
-	defer killBash(redisConf.ContainerName, pidMap)
+	defer killBash(redisConf.ContainerName, strings.Join(commands, " "), pidMap)
 	defer slave.Close()
 
 	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false)
@@ -161,16 +161,16 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) {
 		return
 	}
 
-	commands := fmt.Sprintf("docker exec -it %s %s", containerID, command)
+	commands := []string{"exec", "-it", containerID, command}
 	if len(user) != 0 {
-		commands = fmt.Sprintf("docker exec -it -u %s %s %s", user, containerID, command)
+		commands = []string{"exec", "-it", "-u", user, containerID, command}
 	}
 	pidMap := loadMapFromDockerTop(containerID)
 	slave, err := terminal.NewCommand(commands)
 	if wshandleError(wsConn, err) {
 		return
 	}
-	defer killBash(containerID, pidMap)
+	defer killBash(containerID, command, pidMap)
 	defer slave.Close()
 
 	tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true)
@@ -221,26 +221,26 @@ func loadMapFromDockerTop(containerID string) map[string]string {
 	lines := strings.Split(stdout, "\n")
 	for _, line := range lines {
 		parts := strings.Fields(line)
-		if len(parts) == 0 {
+		if len(parts) < 2 {
 			continue
 		}
-		pidMap[parts[0]] = strings.Join(parts, " ")
+		pidMap[parts[0]] = strings.Join(parts[1:], " ")
 	}
 	return pidMap
 }
 
-func killBash(containerID string, pidMap map[string]string) {
+func killBash(containerID, comm string, pidMap map[string]string) {
 	sudo := cmd.SudoHandleCmd()
 	newPidMap := loadMapFromDockerTop(containerID)
-	for pid, newCmd := range newPidMap {
+	for pid, command := range newPidMap {
 		isOld := false
-		for pid2, oldCmd := range pidMap {
-			if pid == pid2 && oldCmd == newCmd {
+		for pid2 := range pidMap {
+			if pid == pid2 {
 				isOld = true
 				break
 			}
 		}
-		if !isOld {
+		if !isOld && command == comm {
 			_, _ = cmd.Execf("%s kill -9 %s", sudo, pid)
 		}
 	}

backend/app/dto/command.go

@@ -6,6 +6,7 @@ type SearchCommandWithPage struct {
 	Order   string `json:"order"`
 	GroupID uint   `json:"groupID"`
 	Info    string `json:"info"`
+	Name    string `json:"name"`
 }
 
 type CommandOperate struct {

backend/app/dto/request/website.go

@@ -178,7 +178,7 @@ type WebsiteProxyConfig struct {
 	CacheTime int               `json:"cacheTime"  `
 	CacheUnit string            `json:"cacheUnit"`
 	Name      string            `json:"name" validate:"required"`
-	Modifier  string            `json:"modifier" validate:"required"`
+	Modifier  string            `json:"modifier"`
 	Match     string            `json:"match" validate:"required"`
 	ProxyPass string            `json:"proxyPass" validate:"required"`
 	ProxyHost string            `json:"proxyHost" validate:"required"`

backend/app/dto/request/website_ssl.go

@@ -20,6 +20,10 @@ type WebsiteSSLCreate struct {
 	Dir           string `json:"dir"`
 	ID            uint   `json:"id"`
 	Description   string `json:"description"`
+	DisableCNAME  bool   `json:"disableCNAME"`
+	SkipDNS       bool   `json:"skipDNS"`
+	Nameserver1   string `json:"nameserver1"`
+	Nameserver2   string `json:"nameserver2"`
 }
 
 type WebsiteDNSReq struct {
@@ -32,8 +36,9 @@ type WebsiteSSLRenew struct {
 }
 
 type WebsiteSSLApply struct {
-	ID           uint `json:"ID" validate:"required"`
-	SkipDNSCheck bool `json:"SkipDNSCheck"`
+	ID           uint     `json:"ID" validate:"required"`
+	SkipDNSCheck bool     `json:"skipDNSCheck"`
+	Nameservers  []string `json:"nameservers"`
 }
 
 type WebsiteAcmeAccountCreate struct {
@@ -66,9 +71,22 @@ type WebsiteBatchDelReq struct {
 }
 
 type WebsiteSSLUpdate struct {
-	ID          uint   `json:"id" validate:"required"`
-	AutoRenew   bool   `json:"autoRenew"`
-	Description string `json:"description"`
+	ID            uint   `json:"id" validate:"required"`
+	AutoRenew     bool   `json:"autoRenew"`
+	Description   string `json:"description"`
+	PrimaryDomain string `json:"primaryDomain" validate:"required"`
+	OtherDomains  string `json:"otherDomains"`
+	Provider      string `json:"provider" validate:"required"`
+	AcmeAccountID uint   `json:"acmeAccountId" validate:"required"`
+	DnsAccountID  uint   `json:"dnsAccountId"`
+	KeyType       string `json:"keyType"`
+	Apply         bool   `json:"apply"`
+	PushDir       bool   `json:"pushDir"`
+	Dir           string `json:"dir"`
+	DisableCNAME  bool   `json:"disableCNAME"`
+	SkipDNS       bool   `json:"skipDNS"`
+	Nameserver1   string `json:"nameserver1"`
+	Nameserver2   string `json:"nameserver2"`
 }
 
 type WebsiteSSLUpload struct {

backend/app/dto/setting.go

@@ -8,6 +8,7 @@ type SettingInfo struct {
 	SystemIP       string `json:"systemIP"`
 	SystemVersion  string `json:"systemVersion"`
 	DockerSockPath string `json:"dockerSockPath"`
+	DeveloperMode  string `json:"developerMode"`
 
 	SessionTimeout string `json:"sessionTimeout"`
 	LocalTime      string `json:"localTime"`
@@ -140,6 +141,7 @@ type SnapshotInfo struct {
 }
 
 type UpgradeInfo struct {
+	TestVersion   string `json:"testVersion"`
 	NewVersion    string `json:"newVersion"`
 	LatestVersion string `json:"latestVersion"`
 	ReleaseNote   string `json:"releaseNote"`

backend/app/model/website_ssl.go

@@ -9,26 +9,30 @@ import (
 
 type WebsiteSSL struct {
 	BaseModel
-	PrimaryDomain string    `gorm:"type:varchar(256);not null" json:"primaryDomain"`
-	PrivateKey    string    `gorm:"type:longtext;not null" json:"privateKey"`
-	Pem           string    `gorm:"type:longtext;not null" json:"pem"`
-	Domains       string    `gorm:"type:varchar(256);not null" json:"domains"`
-	CertURL       string    `gorm:"type:varchar(256);not null" json:"certURL"`
-	Type          string    `gorm:"type:varchar(64);not null" json:"type"`
-	Provider      string    `gorm:"type:varchar(64);not null" json:"provider"`
-	Organization  string    `gorm:"type:varchar(64);not null" json:"organization"`
-	DnsAccountID  uint      `gorm:"type:integer;not null" json:"dnsAccountId"`
-	AcmeAccountID uint      `gorm:"type:integer;not null" json:"acmeAccountId"`
-	CaID          uint      `gorm:"type:integer;not null;default:0" json:"caId"`
-	AutoRenew     bool      `gorm:"type:varchar(64);not null" json:"autoRenew"`
+	PrimaryDomain string    `json:"primaryDomain"`
+	PrivateKey    string    `json:"privateKey"`
+	Pem           string    `json:"pem"`
+	Domains       string    `json:"domains"`
+	CertURL       string    `json:"certURL"`
+	Type          string    `json:"type"`
+	Provider      string    `json:"provider"`
+	Organization  string    `json:"organization"`
+	DnsAccountID  uint      `json:"dnsAccountId"`
+	AcmeAccountID uint      `gorm:"column:acme_account_id" json:"acmeAccountId" `
+	CaID          uint      `json:"caId"`
+	AutoRenew     bool      `json:"autoRenew"`
 	ExpireDate    time.Time `json:"expireDate"`
 	StartDate     time.Time `json:"startDate"`
-	Status        string    `gorm:"not null;default:ready" json:"status"`
+	Status        string    `json:"status"`
 	Message       string    `json:"message"`
-	KeyType       string    `gorm:"not null;default:2048" json:"keyType"`
-	PushDir       bool      `gorm:"not null;default:0" json:"pushDir"`
+	KeyType       string    `json:"keyType"`
+	PushDir       bool      `json:"pushDir"`
 	Dir           string    `json:"dir"`
 	Description   string    `json:"description"`
+	SkipDNS       bool      `json:"skipDNS"`
+	Nameserver1   string    `json:"nameserver1"`
+	Nameserver2   string    `json:"nameserver2"`
+	DisableCNAME  bool      `json:"disableCNAME"`
 
 	AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"`
 	DnsAccount  WebsiteDnsAccount  `json:"dnsAccount" gorm:"-:migration"`

backend/app/repo/command.go

@@ -16,6 +16,7 @@ type ICommandRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	Get(opts ...DBOption) (model.Command, error)
+	WithLikeName(name string) DBOption
 }
 
 func NewICommandRepo() ICommandRepo {
@@ -79,3 +80,12 @@ func (u *CommandRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Command{}).Error
 }
+
+func (a CommandRepo) WithLikeName(name string) DBOption {
+	return func(g *gorm.DB) *gorm.DB {
+		if len(name) == 0 {
+			return g
+		}
+		return g.Where("name like ? or command like ?", "%"+name+"%", "%"+name+"%")
+	}
+}

backend/app/repo/website_ssl.go

@@ -21,6 +21,7 @@ type ISSLRepo interface {
 	Create(ctx context.Context, ssl *model.WebsiteSSL) error
 	Save(ssl *model.WebsiteSSL) error
 	DeleteBy(opts ...DBOption) error
+	SaveByMap(ssl *model.WebsiteSSL, params map[string]interface{}) error
 }
 
 type WebsiteSSLRepo struct {
@@ -82,7 +83,15 @@ func (w WebsiteSSLRepo) Create(ctx context.Context, ssl *model.WebsiteSSL) error
 }
 
 func (w WebsiteSSLRepo) Save(ssl *model.WebsiteSSL) error {
-	return getDb().Save(&ssl).Error
+	return getDb().Model(&model.WebsiteSSL{BaseModel: model.BaseModel{
+		ID: ssl.ID,
+	}}).Save(&ssl).Error
+}
+
+func (w WebsiteSSLRepo) SaveByMap(ssl *model.WebsiteSSL, params map[string]interface{}) error {
+	return getDb().Model(&model.WebsiteSSL{BaseModel: model.BaseModel{
+		ID: ssl.ID,
+	}}).Updates(params).Error
 }
 
 func (w WebsiteSSLRepo) DeleteBy(opts ...DBOption) error {

backend/app/service/app.go

@@ -230,6 +230,7 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 		if err != nil {
 			return appDetailDTO, buserr.WithDetail("ErrGetCompose", err.Error(), err)
 		}
+		defer composeRes.Body.Close()
 		bodyContent, err := io.ReadAll(composeRes.Body)
 		if err != nil {
 			return appDetailDTO, buserr.WithDetail("ErrGetCompose", err.Error(), err)
@@ -727,6 +728,14 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) {
 		res.CanUpdate = true
 		return res, err
 	}
+	apps, _ := appRepo.GetBy(appRepo.WithResource(constant.AppResourceRemote))
+	for _, app := range apps {
+		if app.Icon == "" {
+			res.CanUpdate = true
+			return res, err
+		}
+	}
+
 	list, err := getAppList()
 	if err != nil {
 		return res, err
@@ -839,7 +848,12 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 		if err != nil {
 			return err
 		}
-		iconStr := base64.StdEncoding.EncodeToString(body)
+		iconStr := ""
+		if !strings.Contains(string(body), "<xml>") {
+			iconStr = base64.StdEncoding.EncodeToString(body)
+		}
+		_ = iconRes.Body.Close()
+
 		app.Icon = iconStr
 		app.TagsKey = l.AppProperty.Tags
 		if l.AppProperty.Recommend > 0 {
@@ -862,6 +876,7 @@ func (a AppService) SyncAppListFromRemote() (err error) {
 				if err != nil {
 					return err
 				}
+				defer composeRes.Body.Close()
 				bodyContent, err := io.ReadAll(composeRes.Body)
 				if err != nil {
 					return err

backend/app/service/app_install.go

@@ -712,6 +712,7 @@ func syncAppInstallStatus(appInstall *model.AppInstall) error {
 	if err != nil {
 		return err
 	}
+	defer cli.Close()
 	containers, err := cli.ListContainersByName(containerNames)
 	if err != nil {
 		return err

backend/app/service/app_utils.go

@@ -5,8 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/utils/xpack"
-	"github.com/docker/docker/api/types/container"
 	"math"
 	"net/http"
 	"os"
@@ -17,6 +15,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/1Panel-dev/1Panel/backend/utils/xpack"
+	"github.com/docker/docker/api/types/container"
+
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
@@ -450,23 +451,40 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 	install.Status = constant.Upgrading
 
 	go func() {
+		var (
+			upErr      error
+			backupFile string
+		)
+		global.LOG.Infof(i18n.GetMsgWithName("UpgradeAppStart", install.Name, nil))
 		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()}))
+			backupRecord, err := NewIBackupService().AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name})
+			if err == nil {
+				localDir, err := loadLocalDir()
+				if err == nil {
+					backupFile = path.Join(localDir, backupRecord.FileDir, backupRecord.FileName)
+				} else {
+					global.LOG.Errorf(i18n.GetMsgWithName("ErrAppBackup", install.Name, err))
+				}
+			} else {
+				global.LOG.Errorf(i18n.GetMsgWithName("ErrAppBackup", install.Name, err))
 			}
 		}
-		var upErr error
 
 		defer func() {
 			if upErr != nil {
+				global.LOG.Infof(i18n.GetMsgWithName("ErrAppUpgrade", install.Name, upErr))
 				if backup {
-					if err := NewIBackupService().AppRecover(dto.CommonRecover{Name: install.App.Key, DetailName: install.Name, Type: "app", Source: constant.ResourceLocal}); err != nil {
+					global.LOG.Infof(i18n.GetMsgWithName("AppRecover", install.Name, nil))
+					if err := NewIBackupService().AppRecover(dto.CommonRecover{Name: install.App.Key, DetailName: install.Name, Type: "app", Source: constant.ResourceLocal, File: backupFile}); err != nil {
 						global.LOG.Errorf("recover app [%s] [%s] failed %v", install.App.Key, install.Name, err)
 					}
 				}
-				install.Status = constant.UpgradeErr
-				install.Message = upErr.Error()
-				_ = appInstallRepo.Save(context.Background(), &install)
+				existInstall, _ := appInstallRepo.GetFirst(commonRepo.WithByID(installID))
+				if existInstall.ID > 0 {
+					existInstall.Status = constant.UpgradeErr
+					existInstall.Message = upErr.Error()
+					_ = appInstallRepo.Save(context.Background(), &existInstall)
+				}
 			}
 		}()
 
@@ -546,13 +564,15 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 		if upErr = addDockerComposeCommonParam(composeMap, install.ServiceName, config, envs); upErr != nil {
 			return
 		}
-		paramByte, upErr := json.Marshal(envs)
-		if upErr != nil {
+		paramByte, err := json.Marshal(envs)
+		if err != nil {
+			upErr = err
 			return
 		}
 		install.Env = string(paramByte)
-		composeByte, upErr := yaml.Marshal(composeMap)
-		if upErr != nil {
+		composeByte, err := yaml.Marshal(composeMap)
+		if err != nil {
+			upErr = err
 			return
 		}
 
@@ -560,23 +580,6 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 		install.Version = detail.Version
 		install.AppDetailId = detailID
 
-		if out, err := compose.Down(install.GetComposePath()); err != nil {
-			if out != "" {
-				upErr = errors.New(out)
-				return
-			}
-			return
-		}
-		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
-		}
-
 		content, err := fileOp.GetContent(install.GetEnvPath())
 		if err != nil {
 			upErr = err
@@ -584,7 +587,8 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 		}
 
 		if pullImage {
-			images, err := composeV2.GetDockerComposeImages(install.Name, content, []byte(detail.DockerCompose))
+			projectName := strings.ToLower(install.Name)
+			images, err := composeV2.GetDockerComposeImages(projectName, content, []byte(detail.DockerCompose))
 			if err != nil {
 				upErr = err
 				return
@@ -594,14 +598,36 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 				upErr = err
 				return
 			}
+			defer dockerCli.Close()
 			for _, image := range images {
+				global.LOG.Infof(i18n.GetMsgWithName("PullImageStart", image, nil))
 				if err = dockerCli.PullImage(image, true); err != nil {
 					upErr = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
 					return
+				} else {
+					global.LOG.Infof(i18n.GetMsgByKey("PullImageSuccess"))
 				}
 			}
 		}
 
+		if out, err := compose.Down(install.GetComposePath()); err != nil {
+			if out != "" {
+				upErr = errors.New(out)
+				return
+			}
+			upErr = err
+			return
+		}
+		envParams := make(map[string]string, len(envs))
+		handleMap(envs, envParams)
+		if upErr = env.Write(envParams, install.GetEnvPath()); upErr != nil {
+			return
+		}
+
+		if upErr = runScript(&install, "upgrade"); upErr != nil {
+			return
+		}
+
 		if upErr = fileOp.WriteFile(install.GetComposePath(), strings.NewReader(install.DockerCompose), 0775); upErr != nil {
 			return
 		}
@@ -615,6 +641,7 @@ func upgradeInstall(installID uint, detailID uint, backup, pullImage bool) error
 		}
 		install.Status = constant.Running
 		_ = appInstallRepo.Save(context.Background(), &install)
+		global.LOG.Infof(i18n.GetMsgWithName("UpgradeAppSuccess", install.Name, nil))
 	}()
 
 	return appInstallRepo.Save(context.Background(), &install)
@@ -829,6 +856,7 @@ func checkContainerNameIsExist(containerName, appDir string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	defer client.Close()
 	var options container.ListOptions
 	list, err := client.ContainerList(context.Background(), options)
 	if err != nil {

backend/app/service/backup.go

@@ -55,7 +55,7 @@ type IBackupService interface {
 	WebsiteBackup(db dto.CommonBackup) error
 	WebsiteRecover(req dto.CommonRecover) error
 
-	AppBackup(db dto.CommonBackup) error
+	AppBackup(db dto.CommonBackup) (*model.BackupRecord, error)
 	AppRecover(req dto.CommonRecover) error
 
 	Run()

backend/app/service/backup_app.go

@@ -22,26 +22,26 @@ import (
 	"github.com/pkg/errors"
 )
 
-func (u *BackupService) AppBackup(req dto.CommonBackup) error {
+func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, error) {
 	localDir, err := loadLocalDir()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	app, err := appRepo.GetFirst(appRepo.WithKey(req.Name))
 	if err != nil {
-		return err
+		return nil, err
 	}
 	install, err := appInstallRepo.GetFirst(commonRepo.WithByName(req.DetailName), appInstallRepo.WithAppId(app.ID))
 	if err != nil {
-		return err
+		return nil, err
 	}
 	timeNow := time.Now().Format("20060102150405")
 	itemDir := fmt.Sprintf("app/%s/%s", req.Name, req.DetailName)
 	backupDir := path.Join(localDir, itemDir)
 
 	fileName := fmt.Sprintf("%s_%s.tar.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
-	if err := handleAppBackup(&install, backupDir, fileName); err != nil {
-		return err
+	if err := handleAppBackup(&install, backupDir, fileName, ""); err != nil {
+		return nil, err
 	}
 
 	record := &model.BackupRecord{
@@ -56,9 +56,9 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) error {
 
 	if err := backupRepo.CreateRecord(record); err != nil {
 		global.LOG.Errorf("save backup record failed, err: %v", err)
-		return err
+		return nil, err
 	}
-	return nil
+	return record, nil
 }
 
 func (u *BackupService) AppRecover(req dto.CommonRecover) error {
@@ -84,7 +84,7 @@ func (u *BackupService) AppRecover(req dto.CommonRecover) error {
 	return nil
 }
 
-func handleAppBackup(install *model.AppInstall, backupDir, fileName string) error {
+func handleAppBackup(install *model.AppInstall, backupDir, fileName string, excludes string) error {
 	fileOp := files.NewFileOp()
 	tmpDir := fmt.Sprintf("%s/%s", backupDir, strings.ReplaceAll(fileName, ".tar.gz", ""))
 	if !fileOp.Stat(tmpDir) {
@@ -103,7 +103,7 @@ func handleAppBackup(install *model.AppInstall, backupDir, fileName string) erro
 	}
 
 	appPath := install.GetPath()
-	if err := handleTar(appPath, tmpDir, "app.tar.gz", ""); err != nil {
+	if err := handleTar(appPath, tmpDir, "app.tar.gz", excludes); err != nil {
 		return err
 	}
 
@@ -164,7 +164,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")))
-		if err := handleAppBackup(install, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
+		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)
 		}
 		defer func() {

backend/app/service/backup_runtime.go

@@ -4,18 +4,19 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"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/files"
 	"io/fs"
 	"os"
 	"path"
 	"strings"
 	"time"
+
+	"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/files"
 )
 
-func handleRuntimeBackup(runtime *model.Runtime, backupDir, fileName string) error {
+func handleRuntimeBackup(runtime *model.Runtime, backupDir, fileName string, excludes string) error {
 	fileOp := files.NewFileOp()
 	tmpDir := fmt.Sprintf("%s/%s", backupDir, strings.ReplaceAll(fileName, ".tar.gz", ""))
 	if !fileOp.Stat(tmpDir) {
@@ -34,7 +35,7 @@ func handleRuntimeBackup(runtime *model.Runtime, backupDir, fileName string) err
 	}
 
 	appPath := runtime.GetPath()
-	if err := handleTar(appPath, tmpDir, "runtime.tar.gz", ""); err != nil {
+	if err := handleTar(appPath, tmpDir, "runtime.tar.gz", excludes); err != nil {
 		return err
 	}
 	if err := handleTar(tmpDir, backupDir, fileName, ""); err != nil {
@@ -72,7 +73,7 @@ func handleRuntimeRecover(runtime *model.Runtime, recoverFile string, isRollback
 
 	if !isRollback {
 		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("runtime/%s_%s.tar.gz", runtime.Name, time.Now().Format("20060102150405")))
-		if err := handleRuntimeBackup(runtime, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
+		if err := handleRuntimeBackup(runtime, path.Dir(rollbackFile), path.Base(rollbackFile), ""); err != nil {
 			return fmt.Errorf("backup runtime %s for rollback before recover failed, err: %v", runtime.Name, err)
 		}
 		defer func() {

backend/app/service/backup_website.go

@@ -35,7 +35,7 @@ func (u *BackupService) WebsiteBackup(req dto.CommonBackup) error {
 	itemDir := fmt.Sprintf("website/%s", req.Name)
 	backupDir := path.Join(localDir, itemDir)
 	fileName := fmt.Sprintf("%s_%s.tar.gz", website.PrimaryDomain, timeNow+common.RandStrAndNum(5))
-	if err := handleWebsiteBackup(&website, backupDir, fileName); err != nil {
+	if err := handleWebsiteBackup(&website, backupDir, fileName, ""); err != nil {
 		return err
 	}
 
@@ -107,7 +107,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
 	isOk := false
 	if !isRollback {
 		rollbackFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("website/%s_%s.tar.gz", website.Alias, time.Now().Format("20060102150405")))
-		if err := handleWebsiteBackup(website, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
+		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)
 		}
 		defer func() {
@@ -182,7 +182,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
 	return nil
 }
 
-func handleWebsiteBackup(website *model.Website, backupDir, fileName string) error {
+func handleWebsiteBackup(website *model.Website, backupDir, fileName string, excludes string) error {
 	fileOp := files.NewFileOp()
 	tmpDir := fmt.Sprintf("%s/%s", backupDir, strings.ReplaceAll(fileName, ".tar.gz", ""))
 	if !fileOp.Stat(tmpDir) {
@@ -216,7 +216,7 @@ func handleWebsiteBackup(website *model.Website, backupDir, fileName string) err
 		if err != nil {
 			return err
 		}
-		if err := handleAppBackup(&app, tmpDir, fmt.Sprintf("%s.app.tar.gz", website.Alias)); err != nil {
+		if err := handleAppBackup(&app, tmpDir, fmt.Sprintf("%s.app.tar.gz", website.Alias), excludes); err != nil {
 			return err
 		}
 		global.LOG.Info("put app.tar.gz into tmp dir successful")
@@ -226,7 +226,7 @@ func handleWebsiteBackup(website *model.Website, backupDir, fileName string) err
 			return err
 		}
 		if runtime.Type == constant.RuntimeNode {
-			if err := handleRuntimeBackup(runtime, tmpDir, fmt.Sprintf("%s.runtime.tar.gz", website.Alias)); err != nil {
+			if err := handleRuntimeBackup(runtime, tmpDir, fmt.Sprintf("%s.runtime.tar.gz", website.Alias), excludes); err != nil {
 				return err
 			}
 			global.LOG.Info("put runtime.tar.gz into tmp dir successful")
@@ -234,7 +234,7 @@ func handleWebsiteBackup(website *model.Website, backupDir, fileName string) err
 	}
 
 	websiteDir := fmt.Sprintf("%s/openresty/%s/www/sites/%s", constant.AppInstallDir, nginxInfo.Name, website.Alias)
-	if err := handleTar(websiteDir, tmpDir, fmt.Sprintf("%s.web.tar.gz", website.Alias), ""); err != nil {
+	if err := handleTar(websiteDir, tmpDir, fmt.Sprintf("%s.web.tar.gz", website.Alias), excludes); err != nil {
 		return err
 	}
 	global.LOG.Info("put web.tar.gz into tmp dir successful, now start to tar tmp dir")
@@ -250,18 +250,18 @@ func checkValidOfWebsite(oldWebsite, website *model.Website) error {
 		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))
+		_, err := appInstallRepo.GetFirst(commonRepo.WithByID(oldWebsite.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 {
+		if _, err := runtimeRepo.GetFirst(commonRepo.WithByID(oldWebsite.RuntimeID)); err != nil {
 			return buserr.WithDetail(constant.ErrBackupMatch, "runtime", nil)
 		}
 	}
 	if oldWebsite.WebsiteSSLID != 0 {
-		if _, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(website.WebsiteSSLID)); err != nil {
+		if _, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(oldWebsite.WebsiteSSLID)); err != nil {
 			return buserr.WithDetail(constant.ErrBackupMatch, "ssl", nil)
 		}
 	}

backend/app/service/command.go

@@ -65,7 +65,7 @@ func (u *CommandService) SearchForTree() ([]dto.CommandTree, error) {
 }
 
 func (u *CommandService) SearchWithPage(search dto.SearchCommandWithPage) (int64, interface{}, error) {
-	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info), commonRepo.WithByGroupID(search.GroupID), commonRepo.WithOrderRuleBy(search.OrderBy, search.Order))
+	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commandRepo.WithLikeName(search.Name), commonRepo.WithLikeName(search.Info), commonRepo.WithByGroupID(search.GroupID), commonRepo.WithOrderRuleBy(search.OrderBy, search.Order))
 	if err != nil {
 		return 0, nil, err
 	}

backend/app/service/container.go

@@ -88,6 +88,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 	if err != nil {
 		return 0, nil, err
 	}
+	defer client.Close()
 	options := container.ListOptions{
 		All: true,
 	}
@@ -219,6 +220,7 @@ func (u *ContainerService) List() ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	containers, err := client.ContainerList(context.Background(), container.ListOptions{All: true})
 	if err != nil {
 		return nil, err
@@ -240,6 +242,7 @@ func (u *ContainerService) ContainerListStats() ([]dto.ContainerListStats, error
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	list, err := client.ContainerList(context.Background(), container.ListOptions{All: true})
 	if err != nil {
 		return nil, err
@@ -262,6 +265,7 @@ func (u *ContainerService) Inspect(req dto.InspectReq) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer client.Close()
 	var inspectInfo interface{}
 	switch req.Type {
 	case "container":
@@ -289,6 +293,7 @@ func (u *ContainerService) Prune(req dto.ContainerPrune) (dto.ContainerPruneRepo
 	if err != nil {
 		return report, err
 	}
+	defer client.Close()
 	pruneFilters := filters.NewArgs()
 	if req.WithTagAll {
 		pruneFilters.Add("dangling", "false")
@@ -318,6 +323,13 @@ func (u *ContainerService) Prune(req dto.ContainerPrune) (dto.ContainerPruneRepo
 		}
 		report.DeletedNumber = len(rep.NetworksDeleted)
 	case "volume":
+		versions, err := client.ServerVersion(context.Background())
+		if err != nil {
+			return report, err
+		}
+		if common.ComparePanelVersion(versions.APIVersion, "1.42") {
+			pruneFilters.Add("all", "true")
+		}
 		rep, err := client.VolumesPrune(context.Background(), pruneFilters)
 		if err != nil {
 			return report, err
@@ -350,6 +362,7 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	ctx := context.Background()
 	newContainer, _ := client.ContainerInspect(ctx, req.Name)
 	if newContainer.ContainerJSONBase != nil {
@@ -397,6 +410,7 @@ func (u *ContainerService) ContainerInfo(req dto.OperationWithName) (*dto.Contai
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	ctx := context.Background()
 	oldContainer, err := client.ContainerInspect(ctx, req.Name)
 	if err != nil {
@@ -467,6 +481,7 @@ func (u *ContainerService) ContainerUpdate(req dto.ContainerOperate) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	ctx := context.Background()
 	newContainer, _ := client.ContainerInspect(ctx, req.Name)
 	if newContainer.ContainerJSONBase != nil && newContainer.ID != req.ContainerID {
@@ -515,6 +530,7 @@ func (u *ContainerService) ContainerUpgrade(req dto.ContainerUpgrade) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	ctx := context.Background()
 	oldContainer, err := client.ContainerInspect(ctx, req.Name)
 	if err != nil {
@@ -562,6 +578,7 @@ func (u *ContainerService) ContainerRename(req dto.ContainerRename) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 
 	newContainer, _ := client.ContainerInspect(ctx, req.NewName)
 	if newContainer.ContainerJSONBase != nil {
@@ -577,6 +594,7 @@ func (u *ContainerService) ContainerOperation(req dto.ContainerOperation) error
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	for _, item := range req.Names {
 		global.LOG.Infof("start container %s operation %s", item, req.Operation)
 		switch req.Operation {
@@ -604,6 +622,7 @@ func (u *ContainerService) ContainerLogClean(req dto.OperationWithName) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	ctx := context.Background()
 	containerItem, err := client.ContainerInspect(ctx, req.Name)
 	if err != nil {
@@ -701,7 +720,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
 						return
 					}
 					global.LOG.Errorf("read bytes from log failed, err: %v", err)
-					continue
+					return
 				}
 				if !utf8.Valid(buffer[:n]) {
 					continue
@@ -722,6 +741,7 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	res, err := client.ContainerStats(context.TODO(), id, false)
 	if err != nil {
 		return nil, err
@@ -757,6 +777,7 @@ func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) s
 		if err != nil {
 			return ""
 		}
+		defer cli.Close()
 		options := container.ListOptions{All: true}
 		options.Filters = filters.NewArgs()
 		options.Filters.Add("label", fmt.Sprintf("%s=%s", composeProjectLabel, req.Name))
@@ -897,12 +918,11 @@ func loadCpuAndMem(client *client.Client, container string) dto.ContainerListSta
 		return data
 	}
 
+	defer res.Body.Close()
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		res.Body.Close()
 		return data
 	}
-	res.Body.Close()
 	var stats *types.StatsJSON
 	if err := json.Unmarshal(body, &stats); err != nil {
 		return data

backend/app/service/container_compose.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/docker/docker/api/types/container"
 	"io"
 	"os"
 	"os/exec"
@@ -13,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/docker/api/types/container"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
@@ -39,6 +40,7 @@ func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface
 	if err != nil {
 		return 0, nil, err
 	}
+	defer client.Close()
 
 	options := container.ListOptions{All: true}
 	options.Filters = filters.NewArgs()

backend/app/service/container_network.go

@@ -19,6 +19,7 @@ func (u *ContainerService) PageNetwork(req dto.SearchWithPage) (int64, interface
 	if err != nil {
 		return 0, nil, err
 	}
+	defer client.Close()
 	list, err := client.NetworkList(context.TODO(), types.NetworkListOptions{})
 	if err != nil {
 		return 0, nil, err
@@ -81,6 +82,7 @@ func (u *ContainerService) ListNetwork() ([]dto.Options, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	list, err := client.NetworkList(context.TODO(), types.NetworkListOptions{})
 	if err != nil {
 		return nil, err
@@ -100,6 +102,7 @@ func (u *ContainerService) DeleteNetwork(req dto.BatchDelete) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	for _, id := range req.Names {
 		if err := client.NetworkRemove(context.TODO(), id); err != nil {
 			if strings.Contains(err.Error(), "has active endpoints") {
@@ -115,6 +118,7 @@ func (u *ContainerService) CreateNetwork(req dto.NetworkCreate) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	var (
 		ipams    []network.IPAMConfig
 		enableV6 bool

backend/app/service/container_volume.go

@@ -82,6 +82,7 @@ func (u *ContainerService) ListVolume() ([]dto.Options, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	list, err := client.VolumeList(context.TODO(), volume.ListOptions{})
 	if err != nil {
 		return nil, err
@@ -102,6 +103,7 @@ func (u *ContainerService) DeleteVolume(req dto.BatchDelete) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	for _, id := range req.Names {
 		if err := client.VolumeRemove(context.TODO(), id, true); err != nil {
 			if strings.Contains(err.Error(), "volume is in use") {
@@ -117,6 +119,7 @@ func (u *ContainerService) CreateVolume(req dto.VolumeCreate) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	arg := filters.NewArgs()
 	arg.Add("name", req.Name)
 	vos, _ := client.VolumeList(context.TODO(), volume.ListOptions{Filters: arg})

backend/app/service/cronjob_backup.go

@@ -41,7 +41,7 @@ func (u *CronjobService) handleApp(cronjob model.Cronjob, startTime time.Time) e
 		record.Source, record.BackupType = loadRecordPath(cronjob, accountMap)
 		backupDir := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("app/%s/%s", app.App.Key, app.Name))
 		record.FileName = fmt.Sprintf("app_%s_%s.tar.gz", app.Name, startTime.Format("20060102150405")+common.RandStrAndNum(5))
-		if err := handleAppBackup(&app, backupDir, record.FileName); err != nil {
+		if err := handleAppBackup(&app, backupDir, record.FileName, cronjob.ExclusionRules); err != nil {
 			return err
 		}
 		downloadPath, err := u.uploadCronjobBackFile(cronjob, accountMap, path.Join(backupDir, record.FileName))
@@ -74,7 +74,7 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, startTime time.Tim
 		record.Source, record.BackupType = loadRecordPath(cronjob, accountMap)
 		backupDir := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("website/%s", web.PrimaryDomain))
 		record.FileName = fmt.Sprintf("website_%s_%s.tar.gz", web.PrimaryDomain, startTime.Format("20060102150405")+common.RandStrAndNum(5))
-		if err := handleWebsiteBackup(&web, backupDir, record.FileName); err != nil {
+		if err := handleWebsiteBackup(&web, backupDir, record.FileName, cronjob.ExclusionRules); err != nil {
 			return err
 		}
 		downloadPath, err := u.uploadCronjobBackFile(cronjob, accountMap, path.Join(backupDir, record.FileName))

backend/app/service/cronjob_helper.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"path"
@@ -276,21 +275,6 @@ func loadClientMap(backupAccounts string) (map[string]cronjobUploadHelper, error
 				if account.BackupPath != "/" {
 					pathItem = strings.TrimPrefix(account.BackupPath, "/")
 				}
-				if target == constant.Local {
-					varMap := make(map[string]interface{})
-					if err := json.Unmarshal([]byte(account.Vars), &varMap); err != nil {
-						return nil, err
-					}
-					if _, ok := varMap["dir"]; !ok {
-						return nil, errors.New("load local backup dir failed")
-					}
-					baseDir, ok := varMap["dir"].(string)
-					if ok {
-						pathItem = baseDir
-					} else {
-						return nil, fmt.Errorf("error type dir: %T", varMap["dir"])
-					}
-				}
 				clients[target] = cronjobUploadHelper{
 					client:     client,
 					backupPath: pathItem,

backend/app/service/database_mysql.go

@@ -456,7 +456,7 @@ func (u *MysqlService) LoadRemoteAccess(req dto.OperationWithNameAndType) (bool,
 	if err != nil {
 		return false, err
 	}
-	hosts, err := executeSqlForRows(app.ContainerName, app.Password, "select host from mysql.user where user='root';")
+	hosts, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "select host from mysql.user where user='root';")
 	if err != nil {
 		return false, err
 	}
@@ -474,7 +474,7 @@ func (u *MysqlService) LoadVariables(req dto.OperationWithNameAndType) (*dto.Mys
 	if err != nil {
 		return nil, err
 	}
-	variableMap, err := executeSqlForMaps(app.ContainerName, app.Password, "show global variables;")
+	variableMap, err := executeSqlForMaps(app.ContainerName, app.Key, app.Password, "show global variables;")
 	if err != nil {
 		return nil, err
 	}
@@ -493,7 +493,7 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
 		return nil, err
 	}
 
-	statusMap, err := executeSqlForMaps(app.ContainerName, app.Password, "show global status;")
+	statusMap, err := executeSqlForMaps(app.ContainerName, app.Key, app.Password, "show global status;")
 	if err != nil {
 		return nil, err
 	}
@@ -517,7 +517,7 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
 
 	info.File = "OFF"
 	info.Position = "OFF"
-	rows, err := executeSqlForRows(app.ContainerName, app.Password, "show master status;")
+	rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
 	if err != nil {
 		return nil, err
 	}
@@ -532,8 +532,8 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
 	return &info, nil
 }
 
-func executeSqlForMaps(containerName, password, command string) (map[string]string, error) {
-	cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command)
+func executeSqlForMaps(containerName, dbType, password, command string) (map[string]string, error) {
+	cmd := exec.Command("docker", "exec", containerName, dbType, "-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 ") {
@@ -551,8 +551,8 @@ func executeSqlForMaps(containerName, password, command string) (map[string]stri
 	return rowMap, nil
 }
 
-func executeSqlForRows(containerName, password, command string) ([]string, error) {
-	cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command)
+func executeSqlForRows(containerName, dbType, password, command string) ([]string, error) {
+	cmd := exec.Command("docker", "exec", containerName, dbType, "-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 ") {
@@ -614,6 +614,7 @@ func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
 	if err != nil {
 		return nil, "", err
 	}
+	dbInfo.Type = databaseItem.Type
 	dbInfo.From = databaseItem.From
 	dbInfo.Database = database
 	if dbInfo.From != "local" {

backend/app/service/docker.go

@@ -55,6 +55,7 @@ func (u *DockerService) LoadDockerStatus() string {
 	if err != nil {
 		return constant.Stopped
 	}
+	defer client.Close()
 	if _, err := client.Ping(context.Background()); err != nil {
 		return constant.Stopped
 	}
@@ -72,6 +73,7 @@ func (u *DockerService) LoadDockerConf() *dto.DaemonJsonConf {
 	if err != nil {
 		data.Status = constant.Stopped
 	} else {
+		defer client.Close()
 		if _, err := client.Ping(ctx); err != nil {
 			data.Status = constant.Stopped
 		}

backend/app/service/file.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/fs"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -312,12 +313,32 @@ func (f *FileService) FileDownload(d request.FileDownload) (string, error) {
 }
 
 func (f *FileService) DirSize(req request.DirSizeReq) (response.DirSizeRes, error) {
+	var (
+		res response.DirSizeRes
+	)
+	if req.Path == "/proc" {
+		return res, nil
+	}
+	cmd := exec.Command("du", "-s", req.Path)
+	output, err := cmd.Output()
+	if err == nil {
+		fields := strings.Fields(string(output))
+		if len(fields) == 2 {
+			var cmdSize int64
+			_, err = fmt.Sscanf(fields[0], "%d", &cmdSize)
+			if err == nil {
+				res.Size = float64(cmdSize * 1024)
+				return res, nil
+			}
+		}
+	}
 	fo := files.NewFileOp()
 	size, err := fo.GetDirSize(req.Path)
 	if err != nil {
-		return response.DirSizeRes{}, err
+		return res, err
 	}
-	return response.DirSizeRes{Size: size}, nil
+	res.Size = size
+	return res, nil
 }
 
 func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.FileLineContent, error) {

backend/app/service/host_tool.go

@@ -307,7 +307,7 @@ func (h *HostToolService) OperateSupervisorProcess(req request.SupervisorProcess
 		if err != nil {
 			return err
 		}
-		_, _ = section.NewKey("command", req.Command)
+		_, _ = section.NewKey("command", strings.TrimSpace(req.Command))
 		_, _ = section.NewKey("directory", req.Dir)
 		_, _ = section.NewKey("autorestart", "true")
 		_, _ = section.NewKey("startsecs", "3")
@@ -338,7 +338,7 @@ func (h *HostToolService) OperateSupervisorProcess(req request.SupervisorProcess
 		}
 
 		commandKey := section.Key("command")
-		commandKey.SetValue(req.Command)
+		commandKey.SetValue(strings.TrimSpace(req.Command))
 		directoryKey := section.Key("directory")
 		directoryKey.SetValue(req.Dir)
 		userKey := section.Key("user")

backend/app/service/image.go

@@ -7,14 +7,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/image"
 	"io"
 	"os"
 	"path"
 	"strings"
 	"time"
 
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
@@ -53,6 +54,7 @@ func (u *ImageService) Page(req dto.SearchWithPage) (int64, interface{}, error)
 	if err != nil {
 		return 0, nil, err
 	}
+	defer client.Close()
 	list, err = client.ImageList(context.Background(), image.ListOptions{})
 	if err != nil {
 		return 0, nil, err
@@ -106,6 +108,7 @@ func (u *ImageService) ListAll() ([]dto.ImageInfo, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	list, err := client.ImageList(context.Background(), image.ListOptions{})
 	if err != nil {
 		return nil, err
@@ -133,6 +136,7 @@ func (u *ImageService) List() ([]dto.Options, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer client.Close()
 	list, err = client.ImageList(context.Background(), image.ListOptions{})
 	if err != nil {
 		return nil, err
@@ -152,6 +156,7 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer client.Close()
 	fileName := "Dockerfile"
 	if req.From == "edit" {
 		dir := fmt.Sprintf("%s/docker/build/%s", constant.DataDir, strings.ReplaceAll(req.Name, ":", "_"))
@@ -235,6 +240,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer client.Close()
 	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 {
@@ -265,7 +271,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	options := types.ImagePullOptions{}
+	options := image.PullOptions{}
 	if repo.Auth {
 		authConfig := registry.AuthConfig{
 			Username: repo.Username,
@@ -305,10 +311,12 @@ func (u *ImageService) ImageLoad(req dto.ImageLoad) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	res, err := client.ImageLoad(context.TODO(), file, true)
 	if err != nil {
 		return err
 	}
+	defer res.Body.Close()
 	content, err := io.ReadAll(res.Body)
 	if err != nil {
 		return err
@@ -324,6 +332,7 @@ func (u *ImageService) ImageSave(req dto.ImageSave) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 
 	out, err := client.ImageSave(context.TODO(), []string{req.TagName})
 	if err != nil {
@@ -346,6 +355,7 @@ func (u *ImageService) ImageTag(req dto.ImageTag) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 
 	if err := client.ImageTag(context.TODO(), req.SourceID, req.TargetName); err != nil {
 		return err
@@ -358,23 +368,22 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer client.Close()
 	repo, err := imageRepoRepo.Get(commonRepo.WithByID(req.RepoID))
 	if err != nil {
 		return "", err
 	}
-	options := types.ImagePushOptions{}
-	if repo.Auth {
-		authConfig := registry.AuthConfig{
-			Username: repo.Username,
-			Password: repo.Password,
-		}
-		encodedJSON, err := json.Marshal(authConfig)
-		if err != nil {
-			return "", err
-		}
-		authStr := base64.URLEncoding.EncodeToString(encodedJSON)
-		options.RegistryAuth = authStr
+	options := image.PushOptions{All: true}
+	authConfig := registry.AuthConfig{
+		Username: repo.Username,
+		Password: repo.Password,
 	}
+	encodedJSON, err := json.Marshal(authConfig)
+	if err != nil {
+		return "", err
+	}
+	authStr := base64.URLEncoding.EncodeToString(encodedJSON)
+	options.RegistryAuth = authStr
 	newName := fmt.Sprintf("%s/%s", repo.DownloadUrl, req.Name)
 	if newName != req.TagName {
 		if err := client.ImageTag(context.TODO(), req.TagName, newName); err != nil {
@@ -416,6 +425,7 @@ func (u *ImageService) ImageRemove(req dto.BatchDelete) error {
 	if err != nil {
 		return err
 	}
+	defer client.Close()
 	for _, id := range req.Names {
 		if _, err := client.ImageRemove(context.TODO(), id, types.ImageRemoveOptions{Force: req.Force, PruneChildren: true}); err != nil {
 			if strings.Contains(err.Error(), "image is being used") || strings.Contains(err.Error(), "is using") {

backend/app/service/nginx.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/utils/compose"
 	"io"
 	"net/http"
 	"os"
@@ -10,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/backend/utils/compose"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/response"
 
@@ -76,6 +77,7 @@ func (n NginxService) GetStatus() (response.NginxStatus, error) {
 	if err != nil {
 		return response.NginxStatus{}, err
 	}
+	defer res.Body.Close()
 	content, err := io.ReadAll(res.Body)
 	if err != nil {
 		return response.NginxStatus{}, err

backend/app/service/runtime.go

@@ -4,6 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
 	"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"
@@ -19,13 +27,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
 	"github.com/pkg/errors"
 	"github.com/subosito/gotenv"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type RuntimeService struct {
@@ -43,6 +44,7 @@ type IRuntimeService interface {
 	OperateNodeModules(req request.NodeModuleOperateReq) error
 	SyncForRestart() error
 	SyncRuntimeStatus() error
+	DeleteCheck(installID uint) ([]dto.AppResource, error)
 }
 
 func NewRuntimeService() IRuntimeService {
@@ -176,6 +178,18 @@ func (r *RuntimeService) Page(req request.RuntimeSearch) (int64, []response.Runt
 	return total, res, nil
 }
 
+func (r *RuntimeService) DeleteCheck(runTimeId uint) ([]dto.AppResource, error) {
+	var res []dto.AppResource
+	websites, _ := websiteRepo.GetBy(websiteRepo.WithRuntimeID(runTimeId))
+	for _, website := range websites {
+		res = append(res, dto.AppResource{
+			Type: "website",
+			Name: website.PrimaryDomain,
+		})
+	}
+	return res, nil
+}
+
 func (r *RuntimeService) Delete(runtimeDelete request.RuntimeDelete) error {
 	runtime, err := runtimeRepo.GetFirst(commonRepo.WithByID(runtimeDelete.ID))
 	if err != nil {
@@ -193,6 +207,7 @@ func (r *RuntimeService) Delete(runtimeDelete request.RuntimeDelete) error {
 			if err != nil {
 				return err
 			}
+			defer client.Close()
 			imageID, err := client.GetImageIDByName(runtime.Image)
 			if err != nil {
 				return err
@@ -420,6 +435,7 @@ func (r *RuntimeService) Update(req request.RuntimeUpdate) error {
 		if err != nil {
 			return err
 		}
+		defer client.Close()
 		imageID, err := client.GetImageIDByName(oldImage)
 		if err != nil {
 			return err

backend/app/service/runtime_utils.go

@@ -3,6 +3,15 @@ package service
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
@@ -13,14 +22,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/subosito/gotenv"
 	"gopkg.in/yaml.v3"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 func handleNode(create request.RuntimeCreate, runtime *model.Runtime, fileOp files.FileOp, appVersionDir string) (err error) {
@@ -53,7 +54,12 @@ func handleNode(create request.RuntimeCreate, runtime *model.Runtime, fileOp fil
 	}
 
 	go func() {
-		_, _ = http.Get(nodeDetail.DownloadCallBackUrl)
+		res, err := http.Get(nodeDetail.DownloadCallBackUrl)
+		if err != nil {
+			global.LOG.Errorf("http request failed(handleNode), err: %v", err)
+			return
+		}
+		res.Body.Close()
 	}()
 	go startRuntime(runtime)
 
@@ -172,6 +178,7 @@ func SyncRuntimeContainerStatus(runtime *model.Runtime) error {
 	if err != nil {
 		return err
 	}
+	defer cli.Close()
 	containers, err := cli.ListContainersByName(containerNames)
 	if err != nil {
 		return err
@@ -228,6 +235,7 @@ func buildRuntime(runtime *model.Runtime, oldImageID string, rebuild bool) {
 		if oldImageID != "" {
 			client, err := docker.NewClient()
 			if err == nil {
+				defer client.Close()
 				newImageID, err := client.GetImageIDByName(runtime.Image)
 				if err == nil && newImageID != oldImageID {
 					global.LOG.Infof("delete imageID [%s] ", oldImageID)
@@ -390,6 +398,7 @@ func checkContainerName(name string) error {
 	if err != nil {
 		return err
 	}
+	defer dockerCli.Close()
 	names, err := dockerCli.ListContainersByName([]string{name})
 	if err != nil {
 		return err

backend/app/service/upgrade.go

@@ -7,12 +7,11 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 	"time"
 
 	"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/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
@@ -37,45 +36,43 @@ func (u *UpgradeService) SearchUpgrade() (*dto.UpgradeInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	latestVersion, err := u.loadVersion(true, currentVersion.Value)
+	DeveloperMode, err := settingRepo.Get(settingRepo.WithByKey("DeveloperMode"))
 	if err != nil {
-		global.LOG.Infof("load latest version failed, err: %v", err)
 		return nil, err
 	}
-	if !common.ComparePanelVersion(string(latestVersion), currentVersion.Value) {
-		return nil, err
+
+	upgrade.TestVersion, upgrade.NewVersion, upgrade.LatestVersion = u.loadVersionByMode(DeveloperMode.Value, currentVersion.Value)
+	var itemVersion string
+	if len(upgrade.LatestVersion) != 0 {
+		itemVersion = upgrade.LatestVersion
 	}
-	upgrade.LatestVersion = latestVersion
-	if latestVersion[0:4] == currentVersion.Value[0:4] {
-		upgrade.NewVersion = ""
-	} else {
-		newerVersion, err := u.loadVersion(false, currentVersion.Value)
-		if err != nil {
-			global.LOG.Infof("load newer version failed, err: %v", err)
-			return nil, err
-		}
-		if newerVersion == currentVersion.Value {
-			upgrade.NewVersion = ""
-		} else {
-			upgrade.NewVersion = newerVersion
-		}
-	}
-	itemVersion := upgrade.LatestVersion
-	if upgrade.NewVersion != "" {
+	if len(upgrade.NewVersion) != 0 {
 		itemVersion = upgrade.NewVersion
 	}
-	notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.System.RepoUrl, global.CONF.System.Mode, itemVersion, itemVersion))
-
+	if (global.CONF.System.Mode == "dev" || DeveloperMode.Value == "enable") && len(upgrade.TestVersion) != 0 {
+		itemVersion = upgrade.TestVersion
+	}
+	if len(itemVersion) == 0 {
+		return &upgrade, nil
+	}
+	mode := global.CONF.System.Mode
+	if strings.Contains(itemVersion, "beta") {
+		mode = "beta"
+	}
+	notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.System.RepoUrl, mode, itemVersion, itemVersion))
 	if err != nil {
-		return nil, fmt.Errorf("load releases-notes of version %s failed, err: %v", latestVersion, err)
+		return nil, fmt.Errorf("load releases-notes of version %s failed, err: %v", itemVersion, err)
 	}
 	upgrade.ReleaseNote = notes
 	return &upgrade, nil
 }
 
 func (u *UpgradeService) LoadNotes(req dto.Upgrade) (string, error) {
-	notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.System.RepoUrl, global.CONF.System.Mode, req.Version, req.Version))
+	mode := global.CONF.System.Mode
+	if strings.Contains(req.Version, "beta") {
+		mode = "beta"
+	}
+	notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.System.RepoUrl, mode, req.Version, req.Version))
 	if err != nil {
 		return "", fmt.Errorf("load releases-notes of version %s failed, err: %v", req.Version, err)
 	}
@@ -99,7 +96,11 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
 		return err
 	}
 
-	downloadPath := fmt.Sprintf("%s/%s/%s/release", global.CONF.System.RepoUrl, global.CONF.System.Mode, req.Version)
+	mode := global.CONF.System.Mode
+	if strings.Contains(req.Version, "beta") {
+		mode = "beta"
+	}
+	downloadPath := fmt.Sprintf("%s/%s/%s/release", global.CONF.System.RepoUrl, mode, req.Version)
 	fileName := fmt.Sprintf("1panel-%s-%s-%s.tar.gz", req.Version, "linux", itemArch)
 	_ = settingRepo.Update("SystemStatus", "Upgrading")
 	go func() {
@@ -173,8 +174,8 @@ func (u *UpgradeService) handleBackup(fileOp files.FileOp, originalDir string) e
 	if err := fileOp.Copy("/etc/systemd/system/1panel.service", originalDir); err != nil {
 		return err
 	}
-	dbPath := global.CONF.System.DbPath + "/" + global.CONF.System.DbFile
-	if err := fileOp.Copy(dbPath, originalDir); err != nil {
+	checkPointOfWal()
+	if err := handleTar(path.Join(global.CONF.System.BaseDir, "1panel/db"), originalDir, "db.tar.gz", "./1Panel.db-*"); err != nil {
 		return err
 	}
 	return nil
@@ -182,8 +183,17 @@ func (u *UpgradeService) handleBackup(fileOp files.FileOp, originalDir string) e
 
 func (u *UpgradeService) handleRollback(originalDir string, errStep int) {
 	_ = settingRepo.Update("SystemStatus", "Free")
-	if err := common.CopyFile(path.Join(originalDir, "1Panel.db"), global.CONF.System.DbPath); err != nil {
-		global.LOG.Errorf("rollback 1panel failed, err: %v", err)
+
+	checkPointOfWal()
+	if _, err := os.Stat(path.Join(originalDir, "1Panel.db")); err == nil {
+		if err := common.CopyFile(path.Join(originalDir, "1Panel.db"), global.CONF.System.DbPath); err != nil {
+			global.LOG.Errorf("rollback 1panel db failed, err: %v", err)
+		}
+	}
+	if _, err := os.Stat(path.Join(originalDir, "db.tar.gz")); err == nil {
+		if err := handleUnTar(path.Join(originalDir, "db.tar.gz"), global.CONF.System.DbPath); err != nil {
+			global.LOG.Errorf("rollback 1panel db failed, err: %v", err)
+		}
 	}
 	if err := common.CopyFile(path.Join(originalDir, "1panel"), "/usr/local/bin"); err != nil {
 		global.LOG.Errorf("rollback 1pctl failed, err: %v", err)
@@ -202,36 +212,112 @@ func (u *UpgradeService) handleRollback(originalDir string, errStep int) {
 	}
 }
 
-func (u *UpgradeService) loadVersion(isLatest bool, currentVersion string) (string, error) {
-	path := fmt.Sprintf("%s/%s/latest", global.CONF.System.RepoUrl, global.CONF.System.Mode)
+func (u *UpgradeService) loadVersionByMode(developer, currentVersion string) (string, string, string) {
+	var current, latest string
+	if global.CONF.System.Mode == "dev" {
+		betaVersionLatest := u.loadVersion(true, currentVersion, "beta")
+		devVersionLatest := u.loadVersion(true, currentVersion, "dev")
+		if common.ComparePanelVersion(betaVersionLatest, devVersionLatest) {
+			return betaVersionLatest, "", ""
+		}
+		return devVersionLatest, "", ""
+	}
+
+	betaVersionLatest := ""
+	latest = u.loadVersion(true, currentVersion, "stable")
+	current = u.loadVersion(false, currentVersion, "stable")
+	if developer == "enable" {
+		betaVersionLatest = u.loadVersion(true, currentVersion, "beta")
+	}
+	if current != latest {
+		return betaVersionLatest, current, latest
+	}
+
+	versionPart := strings.Split(current, ".")
+	if len(versionPart) < 3 {
+		return betaVersionLatest, current, latest
+	}
+	num, _ := strconv.Atoi(versionPart[1])
+	if num == 0 {
+		return betaVersionLatest, current, latest
+	}
+	if num >= 10 {
+		if current[:6] == currentVersion[:6] {
+			return betaVersionLatest, current, ""
+		}
+		return betaVersionLatest, "", latest
+	}
+	if current[:5] == currentVersion[:5] {
+		return betaVersionLatest, current, ""
+	}
+	return betaVersionLatest, "", latest
+}
+
+func (u *UpgradeService) loadVersion(isLatest bool, currentVersion, mode string) string {
+	path := fmt.Sprintf("%s/%s/latest", global.CONF.System.RepoUrl, mode)
 	if !isLatest {
-		path = fmt.Sprintf("%s/%s/latest.current", global.CONF.System.RepoUrl, global.CONF.System.Mode)
+		path = fmt.Sprintf("%s/%s/latest.current", global.CONF.System.RepoUrl, mode)
 	}
 	latestVersionRes, err := http.Get(path)
 	if err != nil {
-		return "", buserr.New(constant.ErrOSSConn)
+		global.LOG.Errorf("load latest version from oss failed, err: %v", err)
+		return ""
 	}
 	defer latestVersionRes.Body.Close()
-	version, err := io.ReadAll(latestVersionRes.Body)
-	if err != nil {
-		return "", buserr.New(constant.ErrOSSConn)
+	versionByte, err := io.ReadAll(latestVersionRes.Body)
+	version := string(versionByte)
+	if err != nil || strings.Contains(version, "<") {
+		global.LOG.Errorf("load latest version from oss failed, err: %v", version)
+		return ""
 	}
 	if isLatest {
-		return string(version), nil
+		return u.checkVersion(version, currentVersion)
 	}
 
 	versionMap := make(map[string]string)
-	if err := json.Unmarshal(version, &versionMap); err != nil {
-		return "", buserr.New(constant.ErrOSSConn)
+	if err := json.Unmarshal(versionByte, &versionMap); err != nil {
+		global.LOG.Errorf("load latest version from oss failed (error unmarshal), err: %v", err)
+		return ""
 	}
 
-	if len(currentVersion) < 4 {
-		return "", fmt.Errorf("current version is error format: %s", currentVersion)
+	versionPart := strings.Split(currentVersion, ".")
+	if len(versionPart) < 3 {
+		global.LOG.Errorf("current version is error format: %s", currentVersion)
+		return ""
+	}
+	num, _ := strconv.Atoi(versionPart[1])
+	if num == 0 {
+		global.LOG.Errorf("current version is error format: %s", currentVersion)
+		return ""
+	}
+	if num >= 10 {
+		if version, ok := versionMap[currentVersion[0:5]]; ok {
+			return u.checkVersion(version, currentVersion)
+		}
+		return ""
 	}
 	if version, ok := versionMap[currentVersion[0:4]]; ok {
-		return version, nil
+		return u.checkVersion(version, currentVersion)
 	}
-	return "", buserr.New(constant.ErrOSSConn)
+	return ""
+}
+
+func (u *UpgradeService) checkVersion(v2, v1 string) string {
+	addSuffix := false
+	if !strings.Contains(v1, "-") {
+		v1 = v1 + "-lts"
+	}
+	if !strings.Contains(v2, "-") {
+		addSuffix = true
+		v2 = v2 + "-lts"
+	}
+	if common.ComparePanelVersion(v2, v1) {
+		if addSuffix {
+			return strings.TrimSuffix(v2, "-lts")
+		}
+		return v2
+	}
+	return ""
 }
 
 func (u *UpgradeService) loadReleaseNotes(path string) (string, error) {

backend/app/service/website.go

@@ -180,6 +180,9 @@ func (w WebsiteService) GetWebsites() ([]response.WebsiteDTO, error) {
 
 func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error) {
 	alias := create.Alias
+	if alias == "default" {
+		return buserr.New("ErrDefaultAlias")
+	}
 	if common.ContainsChinese(alias) {
 		alias, err = common.PunycodeEncode(alias)
 		if err != nil {
@@ -293,7 +296,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
 					install *model.AppInstall
 				)
 				reg, _ := regexp.Compile(`[^a-z0-9_-]+`)
-				req.Name = reg.ReplaceAllString(strings.ToLower(create.PrimaryDomain), "")
+				req.Name = reg.ReplaceAllString(strings.ToLower(alias), "")
 				req.AppDetailId = create.AppInstall.AppDetailId
 				req.Params = create.AppInstall.Params
 				req.Params["IMAGE_NAME"] = runtime.Image
@@ -1954,7 +1957,7 @@ func (w WebsiteService) UpdateAntiLeech(req request.NginxAntiLeechUpdate) (err e
 			Parameters: []string{"off"},
 		})
 		validDir := &components.Directive{
-			Name:       "valid_referrers",
+			Name:       "valid_referers",
 			Parameters: []string{},
 		}
 		if req.NoneRef {
@@ -2023,7 +2026,7 @@ func (w WebsiteService) GetAntiLeech(id uint) (*response.NginxAntiLeechRes, erro
 		}
 		lDirectives := location.GetBlock().GetDirectives()
 		for _, lDir := range lDirectives {
-			if lDir.GetName() == "valid_referrers" {
+			if lDir.GetName() == "valid_referers" {
 				res.Enable = true
 				params := lDir.GetParameters()
 				for _, param := range params {

backend/app/service/website_ca.go

@@ -82,7 +82,7 @@ func (w WebsiteCAService) Create(create request.WebsiteCACreate) (*request.Websi
 	}
 
 	rootCA := &x509.Certificate{
-		SerialNumber:          big.NewInt(time.Now().Unix()),
+		SerialNumber:          big.NewInt(time.Now().Unix() + 1),
 		Subject:               pkixName,
 		NotBefore:             time.Now(),
 		NotAfter:              time.Now().AddDate(10, 0, 0),
@@ -279,7 +279,7 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
 		notAfter = notAfter.AddDate(0, 0, req.Time)
 	}
 	interCsr := &x509.Certificate{
-		SerialNumber:          big.NewInt(time.Now().Unix()),
+		SerialNumber:          big.NewInt(time.Now().Unix() + 2),
 		Subject:               rootCsr.Subject,
 		NotBefore:             time.Now(),
 		NotAfter:              notAfter,
@@ -315,7 +315,7 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
 	subject := rootCsr.Subject
 	subject.CommonName = commonName
 	csr := &x509.Certificate{
-		SerialNumber:          big.NewInt(time.Now().Unix()),
+		SerialNumber:          big.NewInt(time.Now().Unix() + 3),
 		Subject:               subject,
 		NotBefore:             time.Now(),
 		NotAfter:              notAfter,
@@ -346,6 +346,7 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
 	websiteSSL.StartDate = cert.NotBefore
 	websiteSSL.Type = cert.Issuer.CommonName
 	websiteSSL.Organization = rootCsr.Subject.Organization[0]
+	websiteSSL.Status = constant.SSLReady
 
 	if req.Renew {
 		if err := websiteSSLRepo.Save(websiteSSL); err != nil {

backend/app/service/website_ssl.go

@@ -102,6 +102,12 @@ func (w WebsiteSSLService) Search(search request.WebsiteSSLSearch) ([]response.W
 }
 
 func (w WebsiteSSLService) Create(create request.WebsiteSSLCreate) (request.WebsiteSSLCreate, error) {
+	if create.Nameserver1 != "" && !common.IsValidIP(create.Nameserver1) {
+		return create, buserr.New("ErrParseIP")
+	}
+	if create.Nameserver2 != "" && !common.IsValidIP(create.Nameserver2) {
+		return create, buserr.New("ErrParseIP")
+	}
 	var res request.WebsiteSSLCreate
 	acmeAccount, err := websiteAcmeRepo.GetFirst(commonRepo.WithByID(create.AcmeAccountID))
 	if err != nil {
@@ -116,6 +122,10 @@ func (w WebsiteSSLService) Create(create request.WebsiteSSLCreate) (request.Webs
 		KeyType:       create.KeyType,
 		PushDir:       create.PushDir,
 		Description:   create.Description,
+		Nameserver1:   create.Nameserver1,
+		Nameserver2:   create.Nameserver2,
+		SkipDNS:       create.SkipDNS,
+		DisableCNAME:  create.DisableCNAME,
 	}
 	if create.PushDir {
 		if !files.NewFileOp().Stat(create.Dir) {
@@ -191,7 +201,7 @@ func (w WebsiteSSLService) ObtainSSL(apply request.WebsiteSSLApply) error {
 		if err != nil {
 			return err
 		}
-		if err = client.UseDns(ssl.DnsType(dnsAccount.Type), dnsAccount.Authorization, apply.SkipDNSCheck); err != nil {
+		if err = client.UseDns(ssl.DnsType(dnsAccount.Type), dnsAccount.Authorization, *websiteSSL); err != nil {
 			return err
 		}
 	case constant.Http:
@@ -368,15 +378,60 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error {
 	if err != nil {
 		return err
 	}
-	websiteSSL.AutoRenew = update.AutoRenew
-	websiteSSL.Description = update.Description
-	return websiteSSLRepo.Save(websiteSSL)
+	updateParams := make(map[string]interface{})
+	updateParams["primary_domain"] = update.PrimaryDomain
+	updateParams["description"] = update.Description
+	updateParams["provider"] = update.Provider
+	updateParams["key_type"] = update.KeyType
+	updateParams["push_dir"] = update.PushDir
+	updateParams["disable_cname"] = update.DisableCNAME
+	updateParams["skip_dns"] = update.SkipDNS
+	updateParams["nameserver1"] = update.Nameserver1
+	updateParams["nameserver2"] = update.Nameserver2
+
+	acmeAccount, err := websiteAcmeRepo.GetFirst(commonRepo.WithByID(update.AcmeAccountID))
+	if err != nil {
+		return err
+	}
+	updateParams["acme_account_id"] = acmeAccount.ID
+
+	if update.PushDir {
+		if !files.NewFileOp().Stat(update.Dir) {
+			return buserr.New(constant.ErrLinkPathNotFound)
+		}
+		updateParams["dir"] = update.Dir
+	}
+	var domains []string
+	if update.OtherDomains != "" {
+		otherDomainArray := strings.Split(update.OtherDomains, "\n")
+		for _, domain := range otherDomainArray {
+			if !common.IsValidDomain(domain) {
+				return buserr.WithName("ErrDomainFormat", domain)
+			}
+			domains = append(domains, domain)
+		}
+	}
+	updateParams["domains"] = strings.Join(domains, ",")
+	if update.Provider == constant.DNSAccount || update.Provider == constant.Http {
+		updateParams["auto_renew"] = update.AutoRenew
+	} else {
+		updateParams["auto_renew"] = false
+	}
+	if update.Provider == constant.DNSAccount {
+		dnsAccount, err := websiteDnsRepo.GetFirst(commonRepo.WithByID(update.DnsAccountID))
+		if err != nil {
+			return err
+		}
+		updateParams["dns_account_id"] = dnsAccount.ID
+	}
+	return websiteSSLRepo.SaveByMap(websiteSSL, updateParams)
 }
 
 func (w WebsiteSSLService) Upload(req request.WebsiteSSLUpload) error {
 	websiteSSL := &model.WebsiteSSL{
 		Provider:    constant.Manual,
 		Description: req.Description,
+		Status:      constant.SSLReady,
 	}
 	var err error
 	if req.SSLID > 0 {

backend/app/service/website_utils.go

@@ -288,6 +288,10 @@ func createWafConfig(website *model.Website, domains []model.WebsiteDomain) erro
 	if err != nil {
 		return err
 	}
+
+	if !common.CompareVersion(nginxInstall.Version, "1.21.4.3-2-0") {
+		return nil
+	}
 	wafDataPath := path.Join(nginxInstall.GetPath(), "1pwaf", "data")
 	fileOp := files.NewFileOp()
 	if !fileOp.Stat(wafDataPath) {
@@ -358,11 +362,11 @@ func createWafConfig(website *model.Website, domains []model.WebsiteDomain) erro
 			return err
 		}
 	}
-	defaultRulesName := []string{"acl", "args", "cookie", "defaultUaBlack", "defaultUrlBlack", "fileExt", "header", "methodWhite"}
+	defaultRulesName := []string{"acl", "args", "cookie", "defaultUaBlack", "defaultUrlBlack", "fileExt", "header", "methodWhite", "cdn"}
 	for _, ruleName := range defaultRulesName {
 		srcPath := path.Join(defaultRuleDir, ruleName+".json")
-		if err = fileOp.Copy(srcPath, websiteRuleDir); err != nil {
-			return err
+		if fileOp.Stat(srcPath) {
+			_ = fileOp.Copy(srcPath, websiteRuleDir)
 		}
 	}
 
@@ -419,6 +423,9 @@ func delWafConfig(website model.Website, force bool) error {
 	if err != nil {
 		return err
 	}
+	if !common.CompareVersion(nginxInstall.Version, "1.21.4.3-2-0") {
+		return nil
+	}
 	wafDataPath := path.Join(nginxInstall.GetPath(), "1pwaf", "data")
 	fileOp := files.NewFileOp()
 	if !fileOp.Stat(wafDataPath) {

backend/cron/cron.go

@@ -1,6 +1,8 @@
 package cron
 
 import (
+	"fmt"
+	mathRand "math/rand"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -41,7 +43,7 @@ func Run() {
 	if _, err := global.Cron.AddJob("@daily", job.NewSSLJob()); err != nil {
 		global.LOG.Errorf("can not add  ssl corn job: %s", err.Error())
 	}
-	if _, err := global.Cron.AddJob("@daily", job.NewAppStoreJob()); err != nil {
+	if _, err := global.Cron.AddJob(fmt.Sprintf("%v %v * * *", mathRand.Intn(60), mathRand.Intn(3)), job.NewAppStoreJob()); err != nil {
 		global.LOG.Errorf("can not add  appstore corn job: %s", err.Error())
 	}
 

backend/i18n/i18n.go

@@ -31,6 +31,27 @@ func GetMsgWithMap(key string, maps map[string]interface{}) string {
 	}
 }
 
+func GetMsgWithName(key string, name string, err error) string {
+	var (
+		content string
+		dataMap = make(map[string]interface{})
+	)
+	dataMap["name"] = name
+	if err != nil {
+		dataMap["err"] = err.Error()
+	}
+	content, _ = global.I18n.Localize(&i18n.LocalizeConfig{
+		MessageID:    key,
+		TemplateData: dataMap,
+	})
+	content = strings.ReplaceAll(content, "<no value>", "")
+	if content == "" {
+		return key
+	} else {
+		return content
+	}
+}
+
 func GetErrMsg(key string, maps map[string]interface{}) string {
 	var content string
 	if maps == nil {

backend/i18n/lang/en.yaml

@@ -61,6 +61,12 @@ AppStoreIsSyncing: 'The App Store is syncing, please try again later'
 ErrGetCompose: "Failed to obtain docker-compose.yml file! {{ .detail }}"
 ErrAppWarn: "Abnormal status, please check the log"
 ErrAppParamKey: "Parameter {{ .name }} field exception"
+ErrAppUpgrade: "Failed to upgrade application {{ .name }} {{ .err }}"
+AppRecover: "App {{ .name }} rolled back "
+PullImageStart: "Start pulling image {{ .name }}"
+PullImageSuccess: "Image pulled successfully"
+UpgradeAppStart: "Start upgrading application {{ .name }}"
+UpgradeAppSuccess: "App {{ .name }} upgraded successfully"
 
 #file
 ErrFileCanNotRead: "File can not read"
@@ -81,12 +87,13 @@ ErrDomainIsExist: "Domain is already exist"
 ErrAliasIsExist: "Alias is already exist"
 ErrAppDelete: 'Other Website use this App'
 ErrGroupIsUsed: 'The group is in use and cannot be deleted'
-ErrBackupMatch: 'the backup file does not match the current partial data of the website: {{ .detail}}"'
-ErrBackupExist: 'the backup file corresponds to a portion of the original data that does not exist: {{ .detail}}"'
+ErrBackupMatch: 'the backup file does not match the current partial data of the website: {{ .detail}}'
+ErrBackupExist: 'the backup file corresponds to a portion of the original data that does not exist: {{ .detail}}'
 ErrPHPResource: 'The local runtime does not support switching！'
-ErrPathPermission: 'A folder with non-1000:1000 permissions was detected in the index directory, which may cause Access denied errors when accessing the website.'
+ErrPathPermission: 'A folder with non-1000:1000 permissions was detected in the index directory, which may cause an Access denied error when accessing the website. Please click the save button above'
 ErrDomainIsUsed: "Domain is already used by website {{ .name }}"
 ErrDomainFormat: "{{ .name }} domain format error"
+ErrDefaultAlias: "default is a reserved code name, please use another code name"
 
 #ssl
 ErrSSLCannotDelete: "The certificate {{ .name }} is being used by the website and cannot be removed"
@@ -178,6 +185,7 @@ ErrDefaultIP: "default is a reserved name, please change it to another name"
 ErrGroupInUse: "The IP group is used by the black/white list and cannot be deleted"
 ErrGroupExist: "IP group name already exists"
 ErrIPRange: "Wrong IP range"
+ErrIPExist: "IP is exit"
 
 #license
 ErrLicense: "License format error, please check and try again!"

backend/i18n/lang/zh-Hant.yaml

@@ -62,6 +62,12 @@ AppStoreIsSyncing: '應用程式商店正在同步中，請稍後再試'
 ErrGetCompose: "docker-compose.yml 檔案取得失敗！{{ .detail }}"
 ErrAppWarn: "狀態異常，請查看日誌"
 ErrAppParamKey: "參數 {{ .name }} 欄位異常"
+ErrAppUpgrade: "應用程式 {{ .name }} 升級失敗 {{ .err }}"
+AppRecover: "應用程式 {{ .name }} 回滾 "
+PullImageStart: "開始拉取鏡像 {{ .name }}"
+PullImageSuccess: "鏡像拉取成功"
+UpgradeAppStart: "開始升級應用程式 {{ .name }}"
+UpgradeAppSuccess: "應用程式 {{ .name }} 升級成功"
 
 #file
 ErrFileCanNotRead: "此文件不支持預覽"
@@ -81,12 +87,13 @@ ErrDomainIsExist: "域名已存在"
 ErrAliasIsExist: "代號已存在"
 ErrAppDelete: '其他網站使用此應用,無法刪除'
 ErrGroupIsUsed: '分組正在使用中，無法刪除'
-ErrBackupMatch: '該備份文件與當前網站部分數據不匹配: {{ .detail}}"'
-ErrBackupExist: '該備份文件對應部分原數據不存在: {{ .detail}}"'
+ErrBackupMatch: '該備份文件與當前網站部分數據不匹配: {{ .detail}}'
+ErrBackupExist: '該備份文件對應部分原數據不存在: {{ .detail}}'
 ErrPHPResource: '本地運行環境不支持切換！'
-ErrPathPermission: 'index 目錄下檢測到非 1000:1000 權限文件夾，可能導致網站訪問 Access denied 錯誤'
+ErrPathPermission: 'index 目錄下偵測到非 1000:1000 權限資料夾，可能導致網站存取 Access denied 錯誤，請點擊上方儲存按鈕'
 ErrDomainIsUsed: "域名已被網站【{{ .name }}】使用"
 ErrDomainFormat: "{{ .name }} 域名格式不正確"
+ErrDefaultAlias: "default 為保留代號，請使用其他代號"
 
 #ssl
 ErrSSLCannotDelete: "{{ .name }} 證書正在被網站使用，無法刪除"
@@ -172,13 +179,15 @@ ErrBanAction: "設置失敗，當前 {{ .name }} 服務不可用，請檢查後
 #waf
 ErrScope: "不支援修改此配置"
 ErrStateChange: "狀態修改失敗"
-ErrRuleExist: "規則名稱已存在"
+ErrRuleExist: "規則已存在"
 ErrRuleNotExist: "規則不存在"
 ErrParseIP: "IP 格式錯誤"
 ErrDefaultIP: "default 為保留名稱，請更換其他名稱"
 ErrGroupInUse: "IP 群組被黑/白名單使用，無法刪除"
 ErrGroupExist: "IP 群組名稱已存在"
 ErrIPRange: "IP 範圍錯誤"
+ErrIPExist: "IP 已存在"
+
 
 #license
 ErrLicense: "許可證格式錯誤，請檢查後重試！"

backend/i18n/lang/zh.yaml

@@ -61,6 +61,12 @@ AppStoreIsSyncing: '应用商店正在同步中，请稍后再试'
 ErrGetCompose: "docker-compose.yml 文件获取失败！{{ .detail }}"
 ErrAppWarn: "状态异常，请查看日志"
 ErrAppParamKey: "参数 {{ .name }} 字段异常"
+ErrAppUpgrade: "应用 {{ .name }} 升级失败 {{ .err }}"
+AppRecover: "应用  {{ .name }} 回滚 "
+PullImageStart: "开始拉取镜像 {{ .name }}"
+PullImageSuccess: "镜像拉取成功"
+UpgradeAppStart: "开始升级应用 {{ .name }}"
+UpgradeAppSuccess: "应用  {{ .name }} 升级成功"
 
 #file
 ErrFileCanNotRead: "此文件不支持预览"
@@ -81,12 +87,13 @@ ErrDomainIsExist: "域名已存在"
 ErrAliasIsExist: "代号已存在"
 ErrAppDelete: '其他网站使用此应用,无法删除'
 ErrGroupIsUsed: '分组正在使用中，无法删除'
-ErrBackupMatch: '该备份文件与当前网站部分数据不匹配 {{ .detail}}"'
-ErrBackupExist: '该备份文件对应部分源数据不存在 {{ .detail}}"'
+ErrBackupMatch: '该备份文件与当前网站部分数据不匹配 {{ .detail}}'
+ErrBackupExist: '该备份文件对应部分源数据不存在 {{ .detail}}'
 ErrPHPResource: '本地运行环境不支持切换！'
-ErrPathPermission: 'index 目录下检测到非 1000:1000 权限文件夹，可能导致网站访问 Access denied 错误'
+ErrPathPermission: 'index 目录下检测到非 1000:1000 权限文件夹，可能导致网站访问 Access denied 错误，请点击上方保存按钮'
 ErrDomainIsUsed: "域名已被网站【{{ .name }}】使用"
 ErrDomainFormat: "{{ .name }} 域名格式不正确"
+ErrDefaultAlias: "default 为保留代号，请使用其他代号"
 
 #ssl
 ErrSSLCannotDelete: "{{ .name }} 证书正在被网站使用，无法删除"
@@ -171,13 +178,14 @@ ErrBanAction: "设置失败，当前 {{ .name }} 服务不可用，请检查后
 #waf
 ErrScope: "不支持修改此配置"
 ErrStateChange: "状态修改失败"
-ErrRuleExist: "规则名称已存在"
+ErrRuleExist: "规则已存在"
 ErrRuleNotExist: "规则不存在"
 ErrParseIP: "IP 格式错误"
 ErrDefaultIP: "default 为保留名称，请更换其他名称"
 ErrGroupInUse: "IP 组被黑/白名单使用，无法删除"
 ErrGroupExist: "IP 组名称已存在"
 ErrIPRange: "IP 范围错误"
+ErrIPExist: "IP 已存在"
 
 #license
 ErrLicense: "许可证格式错误，请检查后重试！"

backend/init/hook/hook.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"os"
+	"path"
 	"strings"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -63,6 +64,7 @@ func Init() {
 	handleCronjobStatus()
 	handleSnapStatus()
 	loadLocalDir()
+	initDir()
 }
 
 func handleSnapStatus() {
@@ -198,3 +200,13 @@ func handleUserInfo(tags string, settingRepo repo.ISettingRepo) {
 	sudo := cmd.SudoHandleCmd()
 	_, _ = cmd.Execf("%s sed -i '/CHANGE_USER_INFO=%v/d' /usr/local/bin/1pctl", sudo, global.CONF.System.ChangeUserInfo)
 }
+
+func initDir() {
+	composePath := path.Join(global.CONF.System.BaseDir, "1panel/docker/compose/")
+	if _, err := os.Stat(composePath); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(composePath, os.ModePerm); err != nil {
+			global.LOG.Errorf("mkdir %s failed, err: %v", composePath, err)
+			return
+		}
+	}
+}

backend/init/migration/migrate.go

@@ -81,6 +81,9 @@ func Init() {
 		migrations.AddNoAuthSetting,
 		migrations.UpdateXpackHideMenu,
 		migrations.AddMenuTabsSetting,
+		migrations.AddDeveloperSetting,
+
+		migrations.AddWebsiteSSLColumn,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)

backend/init/migration/migrations/v_1_10.go

@@ -144,3 +144,23 @@ var AddMenuTabsSetting = &gormigrate.Migration{
 		return nil
 	},
 }
+
+var AddDeveloperSetting = &gormigrate.Migration{
+	ID: "20240423-add-developer-setting",
+	Migrate: func(tx *gorm.DB) error {
+		if err := tx.Create(&model.Setting{Key: "DeveloperMode", Value: "disable"}).Error; err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
+var AddWebsiteSSLColumn = &gormigrate.Migration{
+	ID: "20240508-update-website-ssl",
+	Migrate: func(tx *gorm.DB) error {
+		if err := tx.AutoMigrate(&model.WebsiteSSL{}); err != nil {
+			return err
+		}
+		return nil
+	},
+}

backend/init/migration/migrations/v_1_9.go

@@ -124,6 +124,9 @@ var AddTablePHPExtensions = &gormigrate.Migration{
 		if err := tx.Create(&model.PHPExtensions{Name: "默认", Extensions: "bcmath,gd,gettext,intl,pcntl,shmop,soap,sockets,sysvsem,xmlrpc,zip"}).Error; err != nil {
 			return err
 		}
+		if err := tx.Create(&model.PHPExtensions{Name: "WordPress", Extensions: "exif,igbinary,imagick,intl,zip,apcu,memcached,opcache,redis,bc,image,shmop,mysqli,pdo_mysql"}).Error; err != nil {
+			return err
+		}
 		if err := tx.Create(&model.PHPExtensions{Name: "苹果CMS-V10", Extensions: "mysqli,pdo_mysql,zip,gd,redis,memcache,memcached"}).Error; err != nil {
 			return err
 		}

backend/middleware/demo_handle.go

@@ -27,6 +27,9 @@ var whiteUrlList = map[string]struct{}{
 	"/api/v1/databases/variables":     {},
 	"/api/v1/databases/status":        {},
 	"/api/v1/databases/baseinfo":      {},
+
+	"/api/v1/waf/attack/stat":    {},
+	"/api/v1/waf/config/website": {},
 }
 
 func DemoHandle() gin.HandlerFunc {

backend/router/ro_runtime.go

@@ -15,6 +15,7 @@ func (r *RuntimeRouter) InitRouter(Router *gin.RouterGroup) {
 
 	baseApi := v1.ApiGroupApp.BaseApi
 	{
+		groupRouter.GET("/installed/delete/check/:runTimeId", baseApi.DeleteRuntimeCheck)
 		groupRouter.POST("/search", baseApi.SearchRuntimes)
 		groupRouter.POST("", baseApi.CreateRuntime)
 		groupRouter.POST("/del", baseApi.DeleteRuntime)

backend/utils/cloud_storage/client/local.go

@@ -54,7 +54,7 @@ func (c localClient) Upload(src, target string) (bool, error) {
 		}
 	}
 
-	if err := common.CopyFile(src, target); err != nil {
+	if err := common.CopyFile(src, targetFilePath); err != nil {
 		return false, fmt.Errorf("cp file failed, err: %v", err)
 	}
 	return true, nil

backend/utils/cloud_storage/client/onedrive.go

@@ -223,11 +223,11 @@ func RefreshToken(grantType string, varMap map[string]interface{}) (string, stri
 	if err != nil {
 		return "", "", fmt.Errorf("request for access token failed, err: %v", err)
 	}
+	defer resp.Body.Close()
 	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()
 
 	tokenMap := map[string]interface{}{}
 	if err := json.Unmarshal(respBody, &tokenMap); err != nil {
@@ -387,9 +387,9 @@ func (o *oneDriveClient) upBig(ctx context.Context, srcPath, folderID string, fi
 		if err != nil {
 			return false, err
 		}
+		res.Body.Close()
 		if res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200 {
 			data, _ := io.ReadAll(res.Body)
-			res.Body.Close()
 			return false, errors.New(string(data))
 		}
 	}

backend/utils/cloud_storage/client/sftp.go

@@ -50,12 +50,12 @@ func (s sftpClient) Upload(src, target string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	defer sshClient.Close()
 	client, err := sftp.NewClient(sshClient)
 	if err != nil {
 		return false, err
 	}
 	defer client.Close()
-	defer sshClient.Close()
 
 	srcFile, err := os.Open(src)
 	if err != nil {

backend/utils/cmd/cmd.go

@@ -178,7 +178,7 @@ func CheckIllegal(args ...string) bool {
 		if strings.Contains(arg, "&") || strings.Contains(arg, "|") || strings.Contains(arg, ";") ||
 			strings.Contains(arg, "$") || strings.Contains(arg, "'") || strings.Contains(arg, "`") ||
 			strings.Contains(arg, "(") || strings.Contains(arg, ")") || strings.Contains(arg, "\"") ||
-			strings.Contains(arg, "\n") || strings.Contains(arg, "\r") || strings.Contains(arg, ">") {
+			strings.Contains(arg, "\n") || strings.Contains(arg, "\r") || strings.Contains(arg, ">") || strings.Contains(arg, "<") {
 			return true
 		}
 	}

backend/utils/common/common.go

@@ -49,8 +49,8 @@ func ComparePanelVersion(version1, version2 string) bool {
 	if version1 == version2 {
 		return false
 	}
-	version1s := strings.Split(version1, ".")
-	version2s := strings.Split(version2, ".")
+	version1s := SplitStr(version1, ".", "-")
+	version2s := SplitStr(version2, ".", "-")
 
 	if len(version2s) > len(version1s) {
 		for i := 0; i < len(version2s)-len(version1s); i++ {
@@ -68,7 +68,15 @@ func ComparePanelVersion(version1, version2 string) bool {
 		if version1s[i] == version2s[i] {
 			continue
 		} else {
-			return version1s[i] > version2s[i]
+			v1, err1 := strconv.Atoi(version1s[i])
+			if err1 != nil {
+				return version1s[i] > version2s[i]
+			}
+			v2, err2 := strconv.Atoi(version2s[i])
+			if err2 != nil {
+				return version1s[i] > version2s[i]
+			}
+			return v1 > v2
 		}
 	}
 	return true
@@ -296,3 +304,20 @@ func PunycodeEncode(text string) (string, error) {
 	}
 	return ascii, nil
 }
+
+func SplitStr(str string, spi ...string) []string {
+	lists := []string{str}
+	var results []string
+	for _, s := range spi {
+		results = []string{}
+		for _, list := range lists {
+			results = append(results, strings.Split(list, s)...)
+		}
+		lists = results
+	}
+	return results
+}
+
+func IsValidIP(ip string) bool {
+	return net.ParseIP(ip) != nil
+}

backend/utils/docker/docker.go

@@ -33,6 +33,10 @@ func NewClient() (Client, error) {
 	}, nil
 }
 
+func (c Client) Close() {
+	_ = c.cli.Close()
+}
+
 func NewDockerClient() (*client.Client, error) {
 	var settingItem model.Setting
 	_ = global.DB.Where("key = ?", "DockerSockPath").First(&settingItem).Error
@@ -150,6 +154,7 @@ func CreateDefaultDockerNetwork() error {
 		global.LOG.Errorf("init docker client error %s", err.Error())
 		return err
 	}
+	defer cli.Close()
 	if !cli.NetworkExist("1panel-network") {
 		if err := cli.CreateNetwork("1panel-network"); err != nil {
 			global.LOG.Errorf("create default docker network  error %s", err.Error())

backend/utils/files/file_op.go

@@ -15,7 +15,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
@@ -314,6 +313,7 @@ func (f FileOp) DownloadFile(url, dst string) error {
 	if err != nil {
 		return err
 	}
+	defer resp.Body.Close()
 
 	out, err := os.Create(dst)
 	if err != nil {
@@ -324,8 +324,6 @@ func (f FileOp) DownloadFile(url, dst string) error {
 	if _, err = io.Copy(out, resp.Body); err != nil {
 		return fmt.Errorf("save download file [%s] error, err %s", dst, err.Error())
 	}
-	out.Close()
-	resp.Body.Close()
 	return nil
 }
 
@@ -437,20 +435,20 @@ func (f FileOp) CopyFile(src, dst string) error {
 }
 
 func (f FileOp) GetDirSize(path string) (float64, error) {
-	var m sync.Map
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	go ScanDir(f.Fs, path, &m, &wg)
-	wg.Wait()
-
-	var dirSize float64
-	m.Range(func(k, v interface{}) bool {
-		dirSize = dirSize + v.(float64)
-		return true
+	var size int64
+	err := filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() {
+			size += info.Size()
+		}
+		return nil
 	})
-
-	return dirSize, nil
+	if err != nil {
+		return 0, err
+	}
+	return float64(size), nil
 }
 
 func getFormat(cType CompressType) archiver.CompressedArchive {

backend/utils/files/utils.go

@@ -3,7 +3,6 @@ package files
 import (
 	"bufio"
 	"fmt"
-	"github.com/spf13/afero"
 	"io"
 	"net/http"
 	"os"
@@ -11,7 +10,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
 )
 
 func IsSymlink(mode os.FileMode) bool {
@@ -62,22 +60,6 @@ func GetGroup(gid uint32) string {
 	return usr.Name
 }
 
-func ScanDir(fs afero.Fs, path string, dirMap *sync.Map, wg *sync.WaitGroup) {
-	afs := &afero.Afero{Fs: fs}
-	files, _ := afs.ReadDir(path)
-	for _, f := range files {
-		if f.IsDir() {
-			wg.Add(1)
-			go ScanDir(fs, filepath.Join(path, f.Name()), dirMap, wg)
-		} else {
-			if f.Size() > 0 {
-				dirMap.Store(filepath.Join(path, f.Name()), float64(f.Size()))
-			}
-		}
-	}
-	defer wg.Done()
-}
-
 const dotCharacter = 46
 
 func IsHidden(path string) bool {
@@ -144,8 +126,5 @@ func GetParentMode(path string) (os.FileMode, error) {
 }
 
 func IsInvalidChar(name string) bool {
-	if strings.Contains(name, "&") {
-		return true
-	}
-	return false
+	return strings.Contains(name, "&")
 }

backend/utils/http/get.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"crypto/tls"
 	"errors"
-	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"net"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/1Panel-dev/1Panel/backend/buserr"
 )
 
 func GetHttpRes(url string) (*http.Response, error) {

backend/utils/mysql/client.go

@@ -30,8 +30,8 @@ type MysqlClient interface {
 
 func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) {
 	if conn.From == "local" {
-		connArgs := []string{"exec", conn.Address, "mysql", "-u" + conn.Username, "-p" + conn.Password, "-e"}
-		return client.NewLocal(connArgs, conn.Address, conn.Password, conn.Database), nil
+		connArgs := []string{"exec", conn.Address, conn.Type, "-u" + conn.Username, "-p" + conn.Password, "-e"}
+		return client.NewLocal(connArgs, conn.Type, conn.Address, conn.Password, conn.Database), nil
 	}
 
 	if strings.Contains(conn.Address, ":") {
@@ -59,6 +59,7 @@ func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) {
 	}
 
 	return client.NewRemote(client.Remote{
+		Type:     conn.Type,
 		Client:   db,
 		Database: conn.Database,
 		User:     conn.Username,

backend/utils/mysql/client/info.go

@@ -10,6 +10,7 @@ import (
 )
 
 type DBInfo struct {
+	Type     string `json:"type"`
 	From     string `json:"from"`
 	Database string `json:"database"`
 	Address  string `json:"address"`

backend/utils/mysql/client/local.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"bytes"
 	"compress/gzip"
 	"context"
 	"errors"
@@ -18,14 +19,15 @@ import (
 )
 
 type Local struct {
+	Type          string
 	PrefixCommand []string
 	Database      string
 	Password      string
 	ContainerName string
 }
 
-func NewLocal(command []string, containerName, password, database string) *Local {
-	return &Local{PrefixCommand: command, ContainerName: containerName, Password: password, Database: database}
+func NewLocal(command []string, dbType, containerName, password, database string) *Local {
+	return &Local{Type: dbType, PrefixCommand: command, ContainerName: containerName, Password: password, Database: database}
 }
 
 func (r *Local) Create(info CreateInfo) error {
@@ -223,13 +225,23 @@ func (r *Local) Backup(info BackupInfo) error {
 		}
 	}
 	outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
-	global.LOG.Infof("start to mysqldump | gzip > %s.gzip", info.TargetDir+"/"+info.FileName)
-	cmd := exec.Command("docker", "exec", r.ContainerName, "mysqldump", "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
+	dumpCmd := "mysqldump"
+	if r.Type == constant.AppMariaDB {
+		dumpCmd = "mariadb-dump"
+	}
+	global.LOG.Infof("start to %s | gzip > %s.gzip", dumpCmd, info.TargetDir+"/"+info.FileName)
+	cmd := exec.Command("docker", "exec", r.ContainerName, dumpCmd, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
+
 	gzipCmd := exec.Command("gzip", "-cf")
 	gzipCmd.Stdin, _ = cmd.StdoutPipe()
 	gzipCmd.Stdout = outfile
 	_ = gzipCmd.Start()
-	_ = cmd.Run()
+
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("handle backup database failed, err: %v", stderr.String())
+	}
 	_ = gzipCmd.Wait()
 	return nil
 }
@@ -237,7 +249,7 @@ func (r *Local) Backup(info BackupInfo) error {
 func (r *Local) Recover(info RecoverInfo) error {
 	fi, _ := os.Open(info.SourceFile)
 	defer fi.Close()
-	cmd := exec.Command("docker", "exec", "-i", r.ContainerName, "mysql", "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
+	cmd := exec.Command("docker", "exec", "-i", r.ContainerName, r.Type, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
 	if strings.HasSuffix(info.SourceFile, ".gz") {
 		gzipFile, err := os.Open(info.SourceFile)
 		if err != nil {

backend/utils/mysql/client/remote.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"bytes"
 	"compress/gzip"
 	"context"
 	"database/sql"
@@ -21,6 +22,7 @@ import (
 )
 
 type Remote struct {
+	Type     string
 	Client   *sql.DB
 	Database string
 	User     string
@@ -234,22 +236,31 @@ func (r *Remote) Backup(info BackupInfo) error {
 		}
 	}
 	outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
-	global.LOG.Infof("start to mysqldump | gzip > %s.gzip", info.TargetDir+"/"+info.FileName)
+	dumpCmd := "mysqldump"
+	if r.Type == constant.AppMariaDB {
+		dumpCmd = "mariadb-dump"
+	}
+	global.LOG.Infof("start to %s | gzip > %s.gzip", dumpCmd, info.TargetDir+"/"+info.FileName)
 	image, err := loadImage(info.Type, info.Version)
 	if err != nil {
 		return err
 	}
-	backupCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c 'mysqldump -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
-		image, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version), info.Format, info.Name)
+	backupCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c '%s -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
+		image, dumpCmd, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version, r.Type), info.Format, info.Name)
 
 	global.LOG.Debug(backupCmd)
 	cmd := exec.Command("bash", "-c", backupCmd)
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 
 	gzipCmd := exec.Command("gzip", "-cf")
 	gzipCmd.Stdin, _ = cmd.StdoutPipe()
 	gzipCmd.Stdout = outfile
+
 	_ = gzipCmd.Start()
-	_ = cmd.Run()
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("handle backup database failed, err: %v", stderr.String())
+	}
 	_ = gzipCmd.Wait()
 	return nil
 }
@@ -263,8 +274,8 @@ func (r *Remote) Recover(info RecoverInfo) error {
 		return err
 	}
 
-	recoverCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c 'mysql -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
-		image, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version), info.Format, info.Name)
+	recoverCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c '%s -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
+		image, r.Type, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version, r.Type), info.Format, info.Name)
 
 	global.LOG.Debug(recoverCmd)
 	cmd := exec.Command("bash", "-c", recoverCmd)
@@ -436,8 +447,8 @@ func loadImage(dbType, version string) (string, error) {
 	return "mysql:" + version, nil
 }
 
-func sslSkip(version string) string {
-	if strings.HasPrefix(version, "5.6") || strings.HasPrefix(version, "5.7") {
+func sslSkip(version, dbType string) string {
+	if dbType == constant.AppMariaDB || strings.HasPrefix(version, "5.6") || strings.HasPrefix(version, "5.7") {
 		return "--skip-ssl"
 	}
 	return "--ssl-mode=DISABLED"

backend/utils/postgresql/client/remote.go

@@ -269,6 +269,7 @@ func loadImageTag() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer client.Close()
 	images, err := client.ImageList(context.Background(), types.ImageListOptions{})
 	if err != nil {
 		return "", err

backend/utils/ssl/client.go

@@ -3,6 +3,7 @@ package ssl
 import (
 	"crypto"
 	"encoding/json"
+	"os"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -84,7 +85,7 @@ type DNSParam struct {
 	SecretID  string `json:"secretID"`
 }
 
-func (c *AcmeClient) UseDns(dnsType DnsType, params string, skipDNSCheck bool) error {
+func (c *AcmeClient) UseDns(dnsType DnsType, params string, websiteSSL model.WebsiteSSL) error {
 	var (
 		param DNSParam
 		p     challenge.Provider
@@ -99,15 +100,15 @@ func (c *AcmeClient) UseDns(dnsType DnsType, params string, skipDNSCheck bool) e
 	case DnsPod:
 		dnsPodConfig := dnspod.NewDefaultConfig()
 		dnsPodConfig.LoginToken = param.ID + "," + param.Token
-		dnsPodConfig.PropagationTimeout = 60 * time.Minute
-		dnsPodConfig.PollingInterval = 5 * time.Second
+		dnsPodConfig.PropagationTimeout = 15 * time.Minute
+		dnsPodConfig.PollingInterval = 10 * time.Second
 		dnsPodConfig.TTL = 3600
 		p, err = dnspod.NewDNSProviderConfig(dnsPodConfig)
 	case AliYun:
 		alidnsConfig := alidns.NewDefaultConfig()
 		alidnsConfig.SecretKey = param.SecretKey
 		alidnsConfig.APIKey = param.AccessKey
-		alidnsConfig.PropagationTimeout = 60 * time.Minute
+		alidnsConfig.PropagationTimeout = 15 * time.Minute
 		alidnsConfig.PollingInterval = 5 * time.Second
 		alidnsConfig.TTL = 3600
 		p, err = alidns.NewDNSProviderConfig(alidnsConfig)
@@ -115,58 +116,73 @@ func (c *AcmeClient) UseDns(dnsType DnsType, params string, skipDNSCheck bool) e
 		cloudflareConfig := cloudflare.NewDefaultConfig()
 		cloudflareConfig.AuthEmail = param.Email
 		cloudflareConfig.AuthToken = param.APIkey
-		cloudflareConfig.PropagationTimeout = 60 * time.Minute
-		cloudflareConfig.PollingInterval = 5 * time.Second
+		cloudflareConfig.PropagationTimeout = 15 * time.Minute
+		cloudflareConfig.PollingInterval = 10 * time.Second
 		cloudflareConfig.TTL = 3600
 		p, err = cloudflare.NewDNSProviderConfig(cloudflareConfig)
 	case NameCheap:
 		namecheapConfig := namecheap.NewDefaultConfig()
 		namecheapConfig.APIKey = param.APIkey
 		namecheapConfig.APIUser = param.APIUser
-		namecheapConfig.PropagationTimeout = 60 * time.Minute
+		namecheapConfig.PropagationTimeout = 15 * time.Minute
 		namecheapConfig.PollingInterval = 5 * time.Second
 		namecheapConfig.TTL = 3600
 		p, err = namecheap.NewDNSProviderConfig(namecheapConfig)
 	case NameSilo:
 		nameSiloConfig := namesilo.NewDefaultConfig()
 		nameSiloConfig.APIKey = param.APIkey
-		nameSiloConfig.PropagationTimeout = 60 * time.Minute
-		nameSiloConfig.PollingInterval = 5 * time.Second
+		nameSiloConfig.PropagationTimeout = 15 * time.Minute
+		nameSiloConfig.PollingInterval = 10 * time.Second
 		nameSiloConfig.TTL = 3600
 		p, err = namesilo.NewDNSProviderConfig(nameSiloConfig)
 	case Godaddy:
 		godaddyConfig := godaddy.NewDefaultConfig()
 		godaddyConfig.APIKey = param.APIkey
 		godaddyConfig.APISecret = param.APISecret
-		godaddyConfig.PropagationTimeout = 60 * time.Minute
-		godaddyConfig.PollingInterval = 5 * time.Second
+		godaddyConfig.PropagationTimeout = 15 * time.Minute
+		godaddyConfig.PollingInterval = 10 * time.Second
 		godaddyConfig.TTL = 3600
 		p, err = godaddy.NewDNSProviderConfig(godaddyConfig)
 	case NameCom:
 		nameComConfig := namedotcom.NewDefaultConfig()
 		nameComConfig.APIToken = param.Token
 		nameComConfig.Username = param.APIUser
-		nameComConfig.PropagationTimeout = 30 * time.Minute
-		nameComConfig.PollingInterval = 30 * time.Second
+		nameComConfig.PropagationTimeout = 15 * time.Minute
+		nameComConfig.PollingInterval = 10 * time.Second
 		nameComConfig.TTL = 3600
 		p, err = namedotcom.NewDNSProviderConfig(nameComConfig)
 	case TencentCloud:
 		tencentCloudConfig := tencentcloud.NewDefaultConfig()
 		tencentCloudConfig.SecretID = param.SecretID
 		tencentCloudConfig.SecretKey = param.SecretKey
-		tencentCloudConfig.PropagationTimeout = 30 * time.Minute
-		tencentCloudConfig.PollingInterval = 30 * time.Second
+		tencentCloudConfig.PropagationTimeout = 15 * time.Minute
+		tencentCloudConfig.PollingInterval = 10 * time.Second
 		tencentCloudConfig.TTL = 3600
 		p, err = tencentcloud.NewDNSProviderConfig(tencentCloudConfig)
 	}
 	if err != nil {
 		return err
 	}
-	if skipDNSCheck {
-		return c.Client.Challenge.SetDNS01Provider(p, dns01.AddDNSTimeout(10*time.Minute), dns01.DisableCompletePropagationRequirement())
+	var nameservers []string
+	if websiteSSL.Nameserver1 != "" {
+		nameservers = append(nameservers, websiteSSL.Nameserver1)
+	}
+	if websiteSSL.Nameserver2 != "" {
+		nameservers = append(nameservers, websiteSSL.Nameserver2)
+	}
+	if websiteSSL.DisableCNAME {
+		_ = os.Setenv("LEGO_DISABLE_CNAME_SUPPORT", "true")
+	} else {
+		_ = os.Setenv("LEGO_DISABLE_CNAME_SUPPORT", "false")
 	}
 
-	return c.Client.Challenge.SetDNS01Provider(p, dns01.AddDNSTimeout(10*time.Minute))
+	return c.Client.Challenge.SetDNS01Provider(p,
+		dns01.CondOption(len(nameservers) > 0,
+			dns01.AddRecursiveNameservers(nameservers)),
+		dns01.CondOption(websiteSSL.SkipDNS,
+			dns01.DisableCompletePropagationRequirement()),
+		dns01.AddDNSTimeout(10*time.Minute),
+	)
 }
 
 func (c *AcmeClient) UseManualDns() error {

backend/utils/terminal/local_cmd.go

@@ -25,8 +25,8 @@ type LocalCommand struct {
 	pty *os.File
 }
 
-func NewCommand(commands string) (*LocalCommand, error) {
-	cmd := exec.Command("sh", "-c", commands)
+func NewCommand(commands []string) (*LocalCommand, error) {
+	cmd := exec.Command("docker", commands...)
 
 	pty, err := pty.Start(cmd)
 	if err != nil {

backend/utils/terminal/ws_local_session.go

@@ -70,6 +70,11 @@ func (sws *LocalWsSession) masterWrite(data []byte) error {
 }
 
 func (sws *LocalWsSession) receiveWsMsg(exitCh chan bool) {
+	defer func() {
+		if r := recover(); r != nil {
+			global.LOG.Errorf("[xpack] A panic occurred during receive ws message, error message: %v", r)
+		}
+	}()
 	wsConn := sws.wsConn
 	defer setQuit(exitCh)
 	defer global.LOG.Debug("thread of receive ws msg has exited now")

backend/utils/terminal/ws_session.go

@@ -116,6 +116,11 @@ func (sws *LogicSshWsSession) Start(quitChan chan bool) {
 }
 
 func (sws *LogicSshWsSession) receiveWsMsg(exitCh chan bool) {
+	defer func() {
+		if r := recover(); r != nil {
+			global.LOG.Errorf("[xpack] A panic occurred during receive ws message, error message: %v", r)
+		}
+	}()
 	wsConn := sws.wsConn
 	defer setQuit(exitCh)
 	for {

cmd/server/cmd/restore.go

@@ -6,9 +6,11 @@ import (
 	"path"
 	"sort"
 	"strings"
+	"time"
 
 	cmdUtils "github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
+	"github.com/pkg/errors"
 
 	"github.com/spf13/cobra"
 )
@@ -55,8 +57,16 @@ var restoreCmd = &cobra.Command{
 			return err
 		}
 		fmt.Println("(3/4) 1panel 服务回滚成功")
-		if err := common.CopyFile(path.Join(tmpPath, "1Panel.db"), path.Join(baseDir, "1panel", "db")); err != nil {
-			return err
+		checkPointOfWal()
+		if _, err := os.Stat(path.Join(tmpPath, "1Panel.db")); err == nil {
+			if err := common.CopyFile(path.Join(tmpPath, "1Panel.db"), path.Join(baseDir, "1panel/db")); err != nil {
+				return err
+			}
+		}
+		if _, err := os.Stat(path.Join(tmpPath, "db.tar.gz")); err == nil {
+			if err := handleUnTar(path.Join(tmpPath, "db.tar.gz"), path.Join(baseDir, "1panel")); err != nil {
+				return err
+			}
 		}
 		fmt.Printf("(4/4) 1panel 数据回滚成功 \n\n")
 
@@ -65,6 +75,14 @@ var restoreCmd = &cobra.Command{
 	},
 }
 
+func checkPointOfWal() {
+	db, err := loadDBConn()
+	if err != nil {
+		return
+	}
+	_ = db.Exec("PRAGMA wal_checkpoint(TRUNCATE);").Error
+}
+
 func loadRestorePath(upgradeDir string) (string, error) {
 	if _, err := os.Stat(upgradeDir); err != nil && os.IsNotExist(err) {
 		return "暂无可回滚文件", nil
@@ -87,3 +105,18 @@ func loadRestorePath(upgradeDir string) (string, error) {
 	})
 	return folders[0], nil
 }
+
+func handleUnTar(sourceFile, targetDir string) error {
+	if _, err := os.Stat(targetDir); err != nil && os.IsNotExist(err) {
+		if err = os.MkdirAll(targetDir, os.ModePerm); err != nil {
+			return err
+		}
+	}
+
+	commands := fmt.Sprintf("tar zxvfC %s %s", sourceFile, targetDir)
+	stdout, err := cmdUtils.ExecWithTimeOut(commands, 20*time.Second)
+	if err != nil {
+		return errors.New(stdout)
+	}
+	return nil
+}

cmd/server/docs/docs.go

@@ -1444,8 +1444,8 @@ const docTemplate = `{
                         "key",
                         "value"
                     ],
-                    "formatEN": "Updated the docker daemon.json configuration [key]=\u003e[value]",
-                    "formatZH": "更新 docker daemon.json 配置 [key]=\u003e[value]",
+                    "formatEN": "Updated configuration [key]",
+                    "formatZH": "更新配置 [key]",
                     "paramKeys": []
                 }
             }
@@ -1484,8 +1484,8 @@ const docTemplate = `{
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json configuration",
-                    "formatZH": "更新 docker daemon.json 配置",
+                    "formatEN": "Updated configuration file",
+                    "formatZH": "更新配置文件",
                     "paramKeys": []
                 }
             }
@@ -2094,8 +2094,8 @@ const docTemplate = `{
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json ipv6 option",
-                    "formatZH": "更新 docker daemon.json ipv6 配置",
+                    "formatEN": "Updated the ipv6 option",
+                    "formatZH": "更新 ipv6 配置",
                     "paramKeys": []
                 }
             }
@@ -2233,8 +2233,8 @@ const docTemplate = `{
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json log option",
-                    "formatZH": "更新 docker daemon.json 日志配置",
+                    "formatEN": "Updated the log option",
+                    "formatZH": "更新日志配置",
                     "paramKeys": []
                 }
             }
@@ -14675,6 +14675,12 @@ const docTemplate = `{
                 "image": {
                     "type": "string"
                 },
+                "ipv4": {
+                    "type": "string"
+                },
+                "ipv6": {
+                    "type": "string"
+                },
                 "labels": {
                     "type": "array",
                     "items": {
@@ -17775,6 +17781,9 @@ const docTemplate = `{
                 "defaultNetwork": {
                     "type": "string"
                 },
+                "developerMode": {
+                    "type": "string"
+                },
                 "dingVars": {
                     "type": "string"
                 },
@@ -17814,6 +17823,9 @@ const docTemplate = `{
                 "localTime": {
                     "type": "string"
                 },
+                "menuTabs": {
+                    "type": "string"
+                },
                 "messageType": {
                     "type": "string"
                 },
@@ -18076,6 +18088,9 @@ const docTemplate = `{
                 },
                 "releaseNote": {
                     "type": "string"
+                },
+                "testVersion": {
+                    "type": "string"
                 }
             }
         },

cmd/server/docs/swagger.json

@@ -1437,8 +1437,8 @@
                         "key",
                         "value"
                     ],
-                    "formatEN": "Updated the docker daemon.json configuration [key]=\u003e[value]",
-                    "formatZH": "更新 docker daemon.json 配置 [key]=\u003e[value]",
+                    "formatEN": "Updated configuration [key]",
+                    "formatZH": "更新配置 [key]",
                     "paramKeys": []
                 }
             }
@@ -1477,8 +1477,8 @@
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json configuration",
-                    "formatZH": "更新 docker daemon.json 配置",
+                    "formatEN": "Updated configuration file",
+                    "formatZH": "更新配置文件",
                     "paramKeys": []
                 }
             }
@@ -2087,8 +2087,8 @@
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json ipv6 option",
-                    "formatZH": "更新 docker daemon.json ipv6 配置",
+                    "formatEN": "Updated the ipv6 option",
+                    "formatZH": "更新 ipv6 配置",
                     "paramKeys": []
                 }
             }
@@ -2226,8 +2226,8 @@
                 "x-panel-log": {
                     "BeforeFunctions": [],
                     "bodyKeys": [],
-                    "formatEN": "Updated the docker daemon.json log option",
-                    "formatZH": "更新 docker daemon.json 日志配置",
+                    "formatEN": "Updated the log option",
+                    "formatZH": "更新日志配置",
                     "paramKeys": []
                 }
             }
@@ -14668,6 +14668,12 @@
                 "image": {
                     "type": "string"
                 },
+                "ipv4": {
+                    "type": "string"
+                },
+                "ipv6": {
+                    "type": "string"
+                },
                 "labels": {
                     "type": "array",
                     "items": {
@@ -17768,6 +17774,9 @@
                 "defaultNetwork": {
                     "type": "string"
                 },
+                "developerMode": {
+                    "type": "string"
+                },
                 "dingVars": {
                     "type": "string"
                 },
@@ -17807,6 +17816,9 @@
                 "localTime": {
                     "type": "string"
                 },
+                "menuTabs": {
+                    "type": "string"
+                },
                 "messageType": {
                     "type": "string"
                 },
@@ -18069,6 +18081,9 @@
                 },
                 "releaseNote": {
                     "type": "string"
+                },
+                "testVersion": {
+                    "type": "string"
                 }
             }
         },

cmd/server/docs/swagger.yaml

@@ -444,6 +444,10 @@ definitions:
         type: boolean
       image:
         type: string
+      ipv4:
+        type: string
+      ipv6:
+        type: string
       labels:
         items:
           type: string
@@ -2541,6 +2545,8 @@ definitions:
         type: string
       defaultNetwork:
         type: string
+      developerMode:
+        type: string
       dingVars:
         type: string
       dockerSockPath:
@@ -2567,6 +2573,8 @@ definitions:
         type: string
       localTime:
         type: string
+      menuTabs:
+        type: string
       messageType:
         type: string
       mfaInterval:
@@ -2740,6 +2748,8 @@ definitions:
         type: string
       releaseNote:
         type: string
+      testVersion:
+        type: string
     type: object
   dto.UserLoginInfo:
     properties:
@@ -5938,8 +5948,8 @@ paths:
         bodyKeys:
         - key
         - value
-        formatEN: Updated the docker daemon.json configuration [key]=>[value]
-        formatZH: 更新 docker daemon.json 配置 [key]=>[value]
+        formatEN: Updated configuration [key]
+        formatZH: 更新配置 [key]
         paramKeys: []
   /containers/daemonjson/update/byfile:
     post:
@@ -5964,8 +5974,8 @@ paths:
       x-panel-log:
         BeforeFunctions: []
         bodyKeys: []
-        formatEN: Updated the docker daemon.json configuration
-        formatZH: 更新 docker daemon.json 配置
+        formatEN: Updated configuration file
+        formatZH: 更新配置文件
         paramKeys: []
   /containers/docker/operate:
     post:
@@ -6353,8 +6363,8 @@ paths:
       x-panel-log:
         BeforeFunctions: []
         bodyKeys: []
-        formatEN: Updated the docker daemon.json ipv6 option
-        formatZH: 更新 docker daemon.json ipv6 配置
+        formatEN: Updated the ipv6 option
+        formatZH: 更新 ipv6 配置
         paramKeys: []
   /containers/limit:
     get:
@@ -6438,8 +6448,8 @@ paths:
       x-panel-log:
         BeforeFunctions: []
         bodyKeys: []
-        formatEN: Updated the docker daemon.json log option
-        formatZH: 更新 docker daemon.json 日志配置
+        formatEN: Updated the log option
+        formatZH: 更新日志配置
         paramKeys: []
   /containers/network:
     get:

cmd/server/nginx_conf/website_default.conf

@@ -13,7 +13,7 @@ server {
     proxy_set_header Connection "upgrade";
 
 
-    access_log /www/sites/domain/log/access.log;
+    access_log /www/sites/domain/log/access.log main;
     error_log /www/sites/domain/log/error.log;
 
     location ^~ /.well-known/acme-challenge {

docs/README_EN.md

@@ -51,17 +51,16 @@ If you have any questions or suggestions, please submit a GitHub Issue or join o
 
 If you discover any security issues, please contact us through:
 
-- Email: support@fit2cloud.com
-- Phone: 400-052-0755
+- email: wanghe@fit2cloud.com
 
 ## Our Other Star Projects
 
+- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - Open-Source Knowledge Base Question-Answering System Based on LLM Large Language Model
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - A popular open-source PAM system
 - [DataEase](https://github.com/dataease/dataease/) - An open-source data visualization and analysis tool for everyone
 - [MeterSphere](https://github.com/metersphere/metersphere/) - An all-in-one open-source automated testing platform
 - [Halo](https://github.com/halo-dev/halo/) - A powerful and user-friendly open-source website building tool
 
-
 ## 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)

docs/README_JP.md

@@ -51,11 +51,11 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
 
 セキュリティ上の問題を発見された場合は、下記までご連絡ください:
 
-- メール: support@fit2cloud.com
-- 電話番号: 400-052-0755
+- メール: wanghe@fit2cloud.com
 
 ## その他の主要プロジェクト
 
+- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - LLMベースのオープンソース知識ベースの質問応答システム
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - 人気のあるオープンソースのバスチョンホスト管理ツール
 - [DataEase](https://github.com/dataease/dataease/) - 誰でも利用できるオープンソースのデータ可視化および分析ツール
 - [MeterSphere](https://github.com/metersphere/metersphere/) - オールインワンのオープンソース自動化テストプラットフォーム

docs/README_TW.md

@@ -49,11 +49,11 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
 
 如果您在使用過程中發現任何安全問題，請通過以下方式直接聯繫我們：
 
-- 郵箱：support@fit2cloud.com
-- 電話：400-052-0755
+- 郵箱：wanghe@fit2cloud.com
 
 ## 我們的其他明星專案
 
+- [MaxKB](https://github.com/1Panel-dev/MaxKB/) - 基於 LLM 大語言模型的開源知識庫問答系統
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - 受歡迎的開源堡壘機管理工具
 - [DataEase](https://github.com/dataease/dataease/) - 開源的數據可視化和分析工具，適用於所有人
 - [MeterSphere](https://github.com/metersphere/metersphere/) - 一站式開源自動化測試平台

frontend/src/api/interface/index.ts

@@ -24,6 +24,7 @@ export interface SearchWithPage {
     pageSize: number;
     orderBy?: string;
     order?: string;
+    name?: string;
 }
 export interface CommonModel {
     id: number;

frontend/src/api/interface/setting.ts

@@ -8,6 +8,7 @@ export namespace Setting {
         systemIP: string;
         systemVersion: string;
         dockerSockPath: string;
+        developerMode: string;
 
         sessionTimeout: number;
         localTime: string;
@@ -139,6 +140,7 @@ export namespace Setting {
         upload: string;
     }
     export interface UpgradeInfo {
+        testVersion: string;
         newVersion: string;
         latestVersion: string;
         releaseNote: string;
@@ -150,5 +152,10 @@ export namespace Setting {
         productPro: string;
         trial: boolean;
         status: string;
+        message: string;
+    }
+    export interface LicenseStatus {
+        productPro: string;
+        status: string;
     }
 }

frontend/src/api/interface/website.ts

@@ -165,10 +165,18 @@ export namespace Website {
         provider: string;
         websites?: Website.Website[];
         autoRenew: boolean;
-        acmeAccountId?: number;
+        acmeAccountId: number;
         status: string;
         domains: string;
         description: string;
+        dnsAccountId?: number;
+        pushDir: boolean;
+        dir: string;
+        keyType: string;
+        nameserver1: string;
+        nameserver2: string;
+        disableCNAME: boolean;
+        skipDNS: boolean;
     }
 
     export interface SSLDTO extends SSL {
@@ -198,6 +206,14 @@ export namespace Website {
         id: number;
         autoRenew: boolean;
         description: string;
+        primaryDomain: string;
+        otherDomains: string;
+        acmeAccountId: number;
+        provider: string;
+        dnsAccountId?: number;
+        keyType: string;
+        pushDir: boolean;
+        dir: string;
     }
 
     export interface AcmeAccount extends CommonModel {
@@ -440,7 +456,6 @@ export namespace Website {
 
     export interface SSLObtain {
         ID: number;
-        skipDNSCheck: boolean;
     }
 
     export interface CA extends CommonModel {

frontend/src/api/modules/runtime.ts

@@ -2,6 +2,7 @@ import http from '@/api';
 import { ResPage, ReqPage } from '../interface';
 import { Runtime } from '../interface/runtime';
 import { TimeoutEnum } from '@/enums/http-enum';
+import { App } from '@/api/interface/app';
 
 export const SearchRuntimes = (req: Runtime.RuntimeReq) => {
     return http.post<ResPage<Runtime.RuntimeDTO>>(`/runtimes/search`, req);
@@ -15,6 +16,10 @@ export const DeleteRuntime = (req: Runtime.RuntimeDelete) => {
     return http.post<any>(`/runtimes/del`, req);
 };
 
+export const RuntimeDeleteCheck = (runTimeId: number) => {
+    return http.get<App.AppInstallResource[]>(`runtimes/installed/delete/check/${runTimeId}`);
+};
+
 export const GetRuntime = (id: number) => {
     return http.get<Runtime.RuntimeDTO>(`/runtimes/${id}`);
 };

frontend/src/api/modules/setting.ts

@@ -13,6 +13,9 @@ export const UploadFileData = (params: FormData) => {
 export const getLicense = () => {
     return http.get<Setting.License>(`/licenses/get`);
 };
+export const getLicenseStatus = () => {
+    return http.get<Setting.LicenseStatus>(`/licenses/get/status`);
+};
 
 export const syncLicense = () => {
     return http.post(`/licenses/sync`);

frontend/src/components/backup/index.vue

@@ -10,6 +10,19 @@
                 />
                 <DrawerHeader v-else :header="$t('commons.button.backup')" :resource="name" :back="handleClose" />
             </template>
+
+            <div class="mb-5" v-if="type === 'app'">
+                <el-alert :closable="false" type="warning">
+                    <div class="mt-2 text-xs">
+                        <span>{{ $t('setting.backupJump') }}</span>
+                        <span class="jump" @click="goFile()">
+                            <el-icon class="ml-2"><Position /></el-icon>
+                            {{ $t('firewall.quickJump') }}
+                        </span>
+                    </div>
+                </el-alert>
+            </div>
+
             <ComplexTable
                 v-loading="loading"
                 :pagination-config="paginationConfig"
@@ -18,7 +31,7 @@
                 :data="data"
             >
                 <template #toolbar>
-                    <el-button type="primary" @click="onBackup()">
+                    <el-button type="primary" :disabled="status && status != 'Running'" @click="onBackup()">
                         {{ $t('commons.button.backup') }}
                     </el-button>
                     <el-button type="primary" plain :disabled="selects.length === 0" @click="onBatchDelete(null)">
@@ -60,12 +73,13 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import { computeSize, dateFormat, downloadFile } from '@/utils/util';
-import { handleBackup, handleRecover } from '@/api/modules/setting';
+import { getBackupList, handleBackup, handleRecover } from '@/api/modules/setting';
 import i18n from '@/lang';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { deleteBackupRecord, downloadBackupRecord, searchBackupRecords } from '@/api/modules/setting';
 import { Backup } from '@/api/interface/backup';
 import { MsgSuccess } from '@/utils/message';
+import router from '@/routers';
 
 const selects = ref<any>([]);
 const loading = ref();
@@ -83,23 +97,50 @@ const backupVisible = ref(false);
 const type = ref();
 const name = ref();
 const detailName = ref();
+const backupPath = ref();
+const status = ref();
 
 interface DialogProps {
     type: string;
     name: string;
     detailName: string;
+    status: string;
 }
 const acceptParams = (params: DialogProps): void => {
     type.value = params.type;
+    if (type.value === 'app') {
+        loadBackupDir();
+    }
     name.value = params.name;
     detailName.value = params.detailName;
     backupVisible.value = true;
+    status.value = params.status;
     search();
 };
 const handleClose = () => {
     backupVisible.value = false;
 };
 
+const loadBackupDir = () => {
+    getBackupList().then((res) => {
+        let backupList = res.data || [];
+        for (const bac of backupList) {
+            if (bac.type !== 'LOCAL') {
+                continue;
+            }
+            if (bac.id !== 0) {
+                bac.varsJson = JSON.parse(bac.vars);
+            }
+            backupPath.value = bac.varsJson['dir'];
+            break;
+        }
+    });
+};
+
+const goFile = async () => {
+    router.push({ name: 'File', query: { path: `${backupPath.value}/app/${name.value}/${detailName.value}` } });
+};
+
 const search = async () => {
     let params = {
         page: paginationConfig.currentPage,
@@ -241,3 +282,13 @@ defineExpose({
     acceptParams,
 });
 </script>
+
+<style lang="scss" scoped>
+.jump {
+    color: $primary-color;
+    cursor: pointer;
+    &:hover {
+        color: #74a4f3;
+    }
+}
+</style>

frontend/src/components/compose-log/index.vue

@@ -53,7 +53,7 @@
 <script lang="ts" setup>
 import i18n from '@/lang';
 import { dateFormatForName, downloadWithContent } from '@/utils/util';
-import { computed, reactive, ref, shallowRef, watch } from 'vue';
+import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
@@ -128,6 +128,7 @@ const searchLogs = async () => {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
+    terminalSocket.value?.send('close conn');
     terminalSocket.value?.close();
     logInfo.value = '';
     const href = window.location.href;
@@ -180,6 +181,10 @@ const acceptParams = (props: DialogProps): void => {
     }
 };
 
+onBeforeUnmount(() => {
+    handleClose();
+});
+
 defineExpose({
     acceptParams,
 });

frontend/src/components/container-log/index.vue

@@ -102,6 +102,7 @@ const searchLogs = async () => {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
+    terminalSocket.value?.send('close conn');
     terminalSocket.value?.close();
     logInfo.value = '';
     const href = window.location.href;

frontend/src/components/system-upgrade/index.vue

@@ -16,9 +16,9 @@
         </span>
         <el-button type="primary" link @click="toHalo">
             {{ isProductPro ? $t('license.pro') : $t('license.community') }}
-            <span class="version">{{ version }}</span>
         </el-button>
-        <el-badge is-dot style="margin-left: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
+        <span class="version">{{ version }}</span>
+        <el-badge is-dot style="margin-top: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
             <el-button type="primary" link @click="onLoadUpgradeInfo">
                 <span>({{ $t('setting.hasNewVersion') }})</span>
             </el-button>
@@ -48,10 +48,13 @@
             </div>
             <el-radio-group class="inline-block tag" v-model="upgradeVersion" @change="changeOption">
                 <el-radio v-if="upgradeInfo.newVersion" :value="upgradeInfo.newVersion">
-                    {{ upgradeInfo.newVersion }} {{ $t('setting.newVersion') }}
+                    {{ upgradeInfo.newVersion }}
                 </el-radio>
-                <el-radio :value="upgradeInfo.latestVersion">
-                    {{ upgradeInfo.latestVersion }} {{ $t('setting.latestVersion') }}
+                <el-radio v-if="upgradeInfo.latestVersion" :value="upgradeInfo.latestVersion">
+                    {{ upgradeInfo.latestVersion }}
+                </el-radio>
+                <el-radio v-if="upgradeInfo.testVersion" :value="upgradeInfo.testVersion">
+                    {{ upgradeInfo.testVersion }}
                 </el-radio>
             </el-radio-group>
             <MdEditor
@@ -124,13 +127,25 @@ const onLoadUpgradeInfo = async () => {
     await loadUpgradeInfo()
         .then((res) => {
             loading.value = false;
-            if (!res.data) {
+            if (res.data.testVersion || res.data.newVersion || res.data.latestVersion) {
+                upgradeInfo.value = res.data;
+                drawerVisible.value = true;
+                if (upgradeInfo.value.newVersion) {
+                    upgradeVersion.value = upgradeInfo.value.newVersion;
+                    return;
+                }
+                if (upgradeInfo.value.latestVersion) {
+                    upgradeVersion.value = upgradeInfo.value.latestVersion;
+                    return;
+                }
+                if (upgradeInfo.value.testVersion) {
+                    upgradeVersion.value = upgradeInfo.value.testVersion;
+                    return;
+                }
+            } else {
                 MsgSuccess(i18n.global.t('setting.noUpgrade'));
                 return;
             }
-            upgradeInfo.value = res.data;
-            upgradeVersion.value = upgradeInfo.value.newVersion || upgradeInfo.value.latestVersion;
-            drawerVisible.value = true;
         })
         .catch(() => {
             loading.value = false;

frontend/src/components/upload/index.vue

@@ -8,6 +8,9 @@
                 <div class="mb-4" v-if="type === 'mysql' || type === 'mariadb'">
                     <el-alert type="error" :title="$t('database.formatHelper', [remark])" />
                 </div>
+                <div class="mb-4" v-if="type === 'website'">
+                    <el-alert :closable="false" type="warning" :title="$t('website.websiteBackupWarn')"></el-alert>
+                </div>
                 <el-upload ref="uploadRef" drag :on-change="fileOnChange" class="upload-demo" :auto-upload="false">
                     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                     <div class="el-upload__text">

frontend/src/components/v-charts/components/Line.vue

@@ -83,7 +83,8 @@ const seriesStyle = [
 
 function initChart() {
     let itemChart = echarts?.getInstanceByDom(document.getElementById(props.id) as HTMLElement);
-    // 如果不存在，就进行初始化
+    const optionItem = itemChart?.getOption();
+    const itemSelect = optionItem?.legend;
     if (itemChart == null) {
         itemChart = echarts.init(document.getElementById(props.id) as HTMLElement);
     }
@@ -109,10 +110,9 @@ function initChart() {
             yAxis.push({
                 splitLine: {
                     show: true,
-                    //分隔辅助线
                     lineStyle: {
-                        type: 'dashed', //线的类型 虚线0
-                        opacity: theme === 'dark' ? 0.1 : 1, //透明度
+                        type: 'dashed',
+                        opacity: theme === 'dark' ? 0.1 : 1,
                     },
                 },
                 ...item,
@@ -120,7 +120,6 @@ function initChart() {
         });
     }
 
-    // 把配置和数据放这里
     const option = {
         title: [
             {
@@ -168,7 +167,7 @@ function initChart() {
             },
         },
         grid: props.option.grid || { left: '7%', right: '7%', bottom: '20%' },
-        legend: {
+        legend: itemSelect || {
             right: 10,
             itemWidth: 8,
             textStyle: {

frontend/src/global/form-rules.ts

@@ -22,6 +22,20 @@ const checkIp = (rule: any, value: any, callback: any) => {
     }
 };
 
+const checkIpv4 = (rule: any, value: any, callback: any) => {
+    if (value === '' || typeof value === 'undefined' || value == null) {
+        callback();
+    } else {
+        const reg =
+            /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+        if (!reg.test(value) && value !== '') {
+            callback(new Error(i18n.global.t('commons.rule.ip')));
+        } else {
+            callback();
+        }
+    }
+};
+
 const checkIpV6 = (rule: any, value: any, callback: any) => {
     if (value === '' || typeof value === 'undefined' || value == null) {
         callback(new Error(i18n.global.t('commons.rule.requiredInput')));
@@ -223,7 +237,7 @@ const checkSupervisorName = (rule: any, value: any, callback: any) => {
     if (value === '' || typeof value === 'undefined' || value == null) {
         callback(new Error(i18n.global.t('commons.rule.supervisorName')));
     } else {
-        const reg = /^[a-zA-Z0-9]{1}[a-zA-Z0-9_-]{1,128}$/;
+        const reg = /^[a-zA-Z0-9]{1}[a-zA-Z0-9_-]{0,127}$/;
         if (!reg.test(value) && value !== '') {
             callback(new Error(i18n.global.t('commons.rule.supervisorName')));
         } else {
@@ -533,6 +547,7 @@ interface CommonRule {
     floatNumber: FormItemRule;
     ip: FormItemRule;
     ipV6: FormItemRule;
+    ipv4: FormItemRule;
     ipV4V6OrDomain: FormItemRule;
     host: FormItemRule;
     illegal: FormItemRule;
@@ -768,4 +783,8 @@ export const Rules: CommonRule = {
         validator: checkHttpOrHttps,
         trigger: 'blur',
     },
+    ipv4: {
+        validator: checkIpv4,
+        trigger: 'blur',
+    },
 };

frontend/src/global/mimetype.ts

@@ -161,7 +161,7 @@ export const DNSTypes = [
         value: 'DnsPod',
     },
     {
-        label: 'CloudFlare',
+        label: 'Cloudflare',
         value: 'CloudFlare',
     },
     {

frontend/src/lang/modules/en.ts

@@ -58,6 +58,8 @@ const message = {
             fullscreen: 'Fullscreen',
             quitFullscreen: 'Quit Fullscreen',
             update: 'Edit',
+            showAll: 'Show All',
+            hideSome: 'Hide Some',
         },
         search: {
             timeStart: 'Time start',
@@ -835,6 +837,7 @@ const message = {
         allOptionHelper:
             'The current task plan is to back up all [{0}]. Direct download is not supported at the moment. You can check the backup list of [{0}] menu.',
         exclusionRules: 'Exclusive rule',
+        exclusionRulesHelper: 'The exclusion rules will apply to all compression operations of this backup.',
         default_download_path: 'Default Download Link',
         saveLocal: 'Retain local backups (the same as the number of cloud storage copies)',
         url: 'URL Address',
@@ -1153,6 +1156,10 @@ const message = {
         clashDitNotSupport: 'File names are prohibited from containing .1panel_clash',
         clashDeleteAlert: 'The Recycle Bin folder cannot be deleted',
         clashOpenAlert: 'Please click the [Recycle Bin] button to open the recycle bin directory',
+        right: 'Forward',
+        back: 'Back',
+        top: 'Go Back',
+        refresh: 'Refresh',
     },
     ssh: {
         autoStart: 'Auto Start',
@@ -1266,6 +1273,8 @@ const message = {
         noSpace: 'Input information cannot include space characters',
         duplicatePassword: 'The new password cannot be the same as the original password, please re-enter!',
         diskClean: 'Cache Clean',
+        developerMode: 'Preview Experience Program',
+        developerModeHelper: 'Get a preview version of 1Panel to provide feedback on new features and updates',
 
         thirdParty: 'Third-party account',
         createBackupAccount: 'Add {0}',
@@ -1350,7 +1359,7 @@ const message = {
         showEntrance: 'Enable Home Page Notification Not Enabled',
         entranceHelper: 'Enabling secure entry will only allow logging in to the panel through specified secure entry.',
         entranceError:
-            'Please enter a secure login entry point of 6-10 characters, only numbers or letters are supported.',
+            'Please enter a secure login entry point of 5-116 characters, only numbers or letters are supported.',
         entranceInputHelper: 'When the security entry is set to blank, the security entry is cancelled.',
         randomGenerate: 'Random',
         expirationTime: 'Expiration Time',
@@ -1428,6 +1437,8 @@ const message = {
         rootCrtDownload: 'Root certificate download',
         primaryKey: 'Primary key',
         certificate: 'Certificate',
+        backupJump:
+            'Backup files not in the current backup list, please try downloading from the file directory and importing for backup.',
 
         snapshot: 'Snapshot',
         status: 'Snapshot status',
@@ -1466,8 +1477,6 @@ const message = {
             'Name rules: [major version].[functional version].[Bug fix version], as shown in the following example:',
         versionHelper1: 'v1.0.1 is a Bug fix after v1.0.0',
         versionHelper2: 'v1.1.0 is a feature release after v1.0.0',
-        newVersion: '(Bug fix version)',
-        latestVersion: '(Functional version)',
         upgradeCheck: 'Check for updates',
         upgradeNotes: 'Release note',
         upgradeNow: 'Upgrade now',
@@ -1479,7 +1488,7 @@ const message = {
         issue: 'Feedback',
         doc: 'Official document',
         star: 'Star',
-        description: 'Linux server operation and maintenance management panel',
+        description: 'Linux Server Panel',
         forum: 'Forum Help',
         doc2: 'User Manual',
         currentVersion: 'Version',
@@ -1686,6 +1695,8 @@ const message = {
             'The current application network mode is host mode. If you need to open the port, please open it manually on the firewall page.',
         showLocal: 'Show Local Application',
         reload: 'Reload',
+        upgradeWarn:
+            'Upgrading the application will replace the docker-compose.yml file. If there is any change, please replace it after upgrading',
     },
     website: {
         website: 'Website',
@@ -1934,6 +1945,11 @@ const message = {
         acmeAccountType: 'Account Type',
         keyType: 'Key algorithm',
         tencentCloud: 'Tencent Cloud',
+        containWarn: 'The domain name contains the main domain, please re-enter',
+        rewriteHelper2:
+            'Applications such as WordPress installed from the app store have pseudo-static configuration by default. Repeated configuration may result in errors',
+        websiteBackupWarn:
+            'Only supports importing local backups, importing backups from other machines may cause recovery failure',
     },
     php: {
         short_open_tag: 'Short tag support',
@@ -2043,6 +2059,11 @@ const message = {
         deprecated: 'will be deprecated',
         deprecatedHelper:
             'Maintenance has been stopped and may be abandoned in a future version. Please use Tencent Cloud method for analysis',
+        disableCNAME: 'Disable CNAME',
+        disableCNAMEHelper: 'Domain name with CNAME configuration, if the application fails, you can check here',
+        nameserver: 'DNS server',
+        nameserverHelper: 'Use a custom DNS server to verify domain names',
+        edit: 'Edit certificate',
     },
     firewall: {
         create: 'Create rule',

frontend/src/lang/modules/tw.ts

@@ -58,6 +58,8 @@ const message = {
             fullscreen: '全屏',
             quitFullscreen: '退出全屏',
             update: '編輯',
+            showAll: '顯示所有',
+            hideSome: '隱藏部分',
         },
         search: {
             timeStart: '開始時間',
@@ -795,6 +797,7 @@ const message = {
         snapshot: '系統快照',
         allOptionHelper: '當前計劃任務為備份所有【{0}】，暫不支持直接下載，可在【{0}】備份列表中查看',
         exclusionRules: '排除規則',
+        exclusionRulesHelper: '排除規則將對此次備份的所有壓縮操作生效',
         default_download_path: '默認下載地址',
         saveLocal: '同時保留本地備份（和雲存儲保留份數一致）',
         url: 'URL 地址',
@@ -1097,6 +1100,10 @@ const message = {
         clashDitNotSupport: '檔名禁止包含 .1panel_clash',
         clashDleteAlert: '回收站資料夾不能刪除',
         clashOpenAlert: '回收站目錄請點選【回收站】按鈕開啟',
+        right: '前進',
+        back: '後退',
+        top: '返回上一層',
+        refresh: '重新整理',
     },
     ssh: {
         autoStart: '開機自啟',
@@ -1189,6 +1196,8 @@ const message = {
         noSpace: '輸入信息不能包括空格符號',
         duplicatePassword: '新密碼不能與原始密碼一致，請重新輸入！',
         diskClean: '缓存清理',
+        developerMode: '預覽體驗計劃',
+        developerModeHelper: '獲取 1Panel 的預覽版本，以分享有關新功能和更新的反饋',
 
         thirdParty: '第三方賬號',
         createBackupAccount: '添加 {0}',
@@ -1258,6 +1267,7 @@ const message = {
         accountKey: '賬戶密鑰',
         address: '地址',
         path: '路徑',
+        backupJump: '未在當前備份列表中的備份檔案，請嘗試從檔案目錄中下載後導入備份。',
 
         snapshot: '快照',
         status: '快照狀態',
@@ -1294,8 +1304,6 @@ const message = {
         versionHelper: '1Panel 版本號命名規則為： [大版本].[功能版本].[Bug 修復版本]，例：',
         versionHelper1: 'v1.0.1 是 v1.0.0 之後的 Bug 修復版本',
         versionHelper2: 'v1.1.0 是 v1.0.0 之後的功能版本',
-        newVersion: '(Bug 修復版本)',
-        latestVersion: '(功能版本)',
         upgradeCheck: '檢查更新',
         upgradeNotes: '更新內容',
         upgradeNow: '立即更新',
@@ -1311,7 +1319,7 @@ const message = {
         entrance: '安全入口',
         showEntrance: '啟用概覽頁未開啟提醒',
         entranceHelper: '開啟安全入口後只能通過指定安全入口登錄面板',
-        entranceError: '請輸入 6-10 位安全登錄入口，僅支持輸入數字或字母',
+        entranceError: '請輸入 5-116 位安全登錄入口，僅支持輸入數字或字母',
         entranceInputHelper: '安全入口設置為空時，則取消安全入口',
         randomGenerate: '隨機生成',
         expirationTime: '密碼過期時間',
@@ -1573,6 +1581,7 @@ const message = {
         hostModeHelper: '目前應用網路模式為 host 模式，如需放開端口，請在防火牆頁面手動放開',
         showLocal: '顯示本機應用程式',
         reload: '重載',
+        upgradeWarn: '升級應用程式會取代 docker-compose.yml 文件，如有更改，請升級之後替換',
     },
     website: {
         website: '網站',
@@ -1810,6 +1819,9 @@ const message = {
         acmeAccountType: '賬號類型',
         keyType: '密鑰演算法',
         tencentCloud: '騰訊雲',
+        containWarn: '其他域名中包含主域名，请重新輸入',
+        rewriteHelper2: '從應用程式商店安裝的 WordPress 等應用，預設已經配置好偽靜態，重複配置可能會報錯',
+        websiteBackupWarn: '僅支援導入本機備份，導入其他機器備份可能會恢復失敗',
     },
     php: {
         short_open_tag: '短標簽支持',
@@ -1914,6 +1926,11 @@ const message = {
         cfHelper: '請勿使用 Global API Key',
         deprecated: '即將廢棄',
         deprecatedHelper: '已經停止維護，可能會在以後的某個版本廢棄，請使用騰訊雲方式解析',
+        disableCNAME: '停用 CNAME',
+        disableCNAMEHelper: '有 CNAME 配置的域名，如果申請失敗，可以勾選此處',
+        nameserver: 'DNS 伺服器',
+        nameserverHelper: '使用自訂的 DNS 伺服器來校驗網域名稱',
+        edit: '編輯證書',
     },
     firewall: {
         create: '創建規則',

frontend/src/lang/modules/zh.ts

@@ -58,6 +58,8 @@ const message = {
             fullscreen: '全屏',
             quitFullscreen: '退出全屏',
             update: '编辑',
+            showAll: '显示所有',
+            hideSome: '隐藏部分',
         },
         search: {
             timeStart: '开始时间',
@@ -796,6 +798,7 @@ const message = {
         snapshot: '系统快照',
         allOptionHelper: '当前计划任务为备份所有【{0}】，暂不支持直接下载，可在【{0}】备份列表中查看',
         exclusionRules: '排除规则',
+        exclusionRulesHelper: '排除规则将对此次备份的所有压缩操作生效',
         default_download_path: '默认下载地址',
         saveLocal: '同时保留本地备份（和云存储保留份数一致）',
         url: 'URL 地址',
@@ -1098,6 +1101,10 @@ const message = {
         clashDitNotSupport: '文件名禁止包含 .1panel_clash',
         clashDleteAlert: '回收站文件夹不能删除',
         clashOpenAlert: '回收站目录请点击【回收站】按钮打开',
+        right: '前进',
+        back: '后退',
+        top: '返回上一级',
+        refresh: '刷新',
     },
     ssh: {
         autoStart: '开机自启',
@@ -1190,6 +1197,8 @@ const message = {
         noSpace: '输入信息不能包含空格符',
         duplicatePassword: '新密码不能与原始密码一致，请重新输入！',
         diskClean: '缓存清理',
+        developerMode: '预览体验计划',
+        developerModeHelper: '获取 1Panel 的预览版本，以分享有关新功能和更新的反馈',
 
         thirdParty: '第三方账号',
         createBackupAccount: '添加 {0}',
@@ -1259,6 +1268,7 @@ const message = {
         accountKey: '账户密钥',
         address: '地址',
         path: '路径',
+        backupJump: '未在当前备份列表中的备份文件，请尝试从文件目录中下载后导入备份。',
 
         snapshot: '快照',
         ignoreRule: '排除规则',
@@ -1295,8 +1305,6 @@ const message = {
         versionHelper: '1Panel 版本号命名规则为： [大版本].[功能版本].[Bug 修复版本]，例：',
         versionHelper1: 'v1.0.1 是 v1.0.0 之后的 Bug 修复版本',
         versionHelper2: 'v1.1.0 是 v1.0.0 之后的功能版本',
-        newVersion: '(Bug 修复版本)',
-        latestVersion: '(功能版本)',
         upgradeCheck: '检查更新',
         upgradeNotes: '更新内容',
         upgradeNow: '立即更新',
@@ -1312,7 +1320,7 @@ const message = {
         entrance: '安全入口',
         showEntrance: '启用概览页未开启提醒',
         entranceHelper: '开启安全入口后只能通过指定安全入口登录面板',
-        entranceError: '请输入 6-10 位安全登录入口，仅支持输入数字或字母',
+        entranceError: '请输入 5-116 位安全登录入口，仅支持输入数字或字母',
         entranceInputHelper: '安全入口设置为空时，则取消安全入口',
         randomGenerate: '随机生成',
         expirationTime: '密码过期时间',
@@ -1573,6 +1581,7 @@ const message = {
         hostModeHelper: '当前应用网络模式为 host 模式，如需放开端口，请在防火墙页面手动放开',
         showLocal: '显示本地应用',
         reload: '重载',
+        upgradeWarn: '升级应用会替换 docker-compose.yml 文件，如有更改，请升级之后替换',
     },
     website: {
         website: '网站',
@@ -1810,6 +1819,9 @@ const message = {
         acmeAccountType: '账号类型',
         keyType: '密钥算法',
         tencentCloud: '腾讯云',
+        containWarn: '其他域名中包含主域名，请重新输入',
+        rewriteHelper2: '从应用商店安装的 WordPress 等应用，默认已经配置好伪静态，重复配置可能会报错',
+        websiteBackupWarn: '仅支持导入本机备份，导入其他机器备份可能会恢复失败',
     },
     php: {
         short_open_tag: '短标签支持',
@@ -1914,6 +1926,11 @@ const message = {
         cfHelper: '请勿使用 Global API Key',
         deprecated: '即将废弃',
         deprecatedHelper: '已经停止维护，可能会在以后的某个版本废弃，请使用腾讯云方式解析',
+        disableCNAME: '禁用 CNAME',
+        disableCNAMEHelper: '有 CNAME 配置的域名，如果申请失败，可以勾选此处',
+        nameserver: 'DNS 服务器',
+        nameserverHelper: '使用自定义的 DNS 服务器来校验域名',
+        edit: '编辑证书',
     },
     firewall: {
         create: '创建规则',

frontend/src/layout/index.vue

@@ -22,7 +22,7 @@ import { GlobalStore, MenuStore, TabsStore } from '@/store';
 import { DeviceType } from '@/enums/app';
 import { useI18n } from 'vue-i18n';
 import { useTheme } from '@/hooks/use-theme';
-import { getLicense, getSettingInfo, getSystemAvailable } from '@/api/modules/setting';
+import { getLicenseStatus, getSettingInfo, getSystemAvailable } from '@/api/modules/setting';
 import { useRoute, useRouter } from 'vue-router';
 import { initFavicon, resetXSetting } from '@/utils/xpack';
 useResize();
@@ -41,11 +41,6 @@ const { switchDark } = useTheme();
 
 let timer: NodeJS.Timer | null = null;
 
-onMounted(() => {
-    if (!tabsStore.activeTabPath) {
-        handleMenuClick('/');
-    }
-});
 const classObj = computed(() => {
     return {
         fullScreen: globalStore.isFullScreen,
@@ -109,7 +104,7 @@ const loadDataFromXDB = async () => {
 };
 
 const loadProductProFromDB = async () => {
-    const res = await getLicense();
+    const res = await getLicenseStatus();
     if (!res.data) {
         globalStore.isProductPro = false;
         return;
@@ -163,6 +158,10 @@ onBeforeUnmount(() => {
     timer = null;
 });
 onMounted(() => {
+    if (globalStore.openMenuTabs && !tabsStore.activeTabPath) {
+        handleMenuClick('/');
+    }
+
     loadStatus();
     initFavicon();
     loadDataFromDB();

frontend/src/utils/util.ts

@@ -518,3 +518,14 @@ export function getAction(action: string) {
 export function getLanguage() {
     return localStorage.getItem('lang') || 'zh';
 }
+
+export function emptyLineFilter(str: string, spilt: string) {
+    let list = str.split(spilt);
+    let results = [];
+    for (let i = 0; i < list.length; i++) {
+        if (list[i].trim() !== '') {
+            results.push(list[i]);
+        }
+    }
+    return results.join(spilt);
+}

frontend/src/views/app-store/installed/index.vue

@@ -125,12 +125,16 @@
                                                     :width="400"
                                                     trigger="hover"
                                                     :content="installed.message"
+                                                    :popper-options="options"
                                                 >
                                                     <template #reference>
                                                         <el-button link type="danger">
                                                             <el-icon><Warning /></el-icon>
                                                         </el-button>
                                                     </template>
+                                                    <div class="app-error">
+                                                        {{ installed.message }}
+                                                    </div>
                                                 </el-popover>
                                             </span>
                                             <span class="ml-1">
@@ -164,10 +168,6 @@
                                                 plain
                                                 round
                                                 size="small"
-                                                :disabled="
-                                                    installed.status !== 'Running' ||
-                                                    installed.app.status === 'TakeDown'
-                                                "
                                                 @click="openUploads(installed.app.key, installed.name)"
                                                 v-if="mode === 'installed'"
                                             >
@@ -178,11 +178,9 @@
                                                 plain
                                                 round
                                                 size="small"
-                                                :disabled="
-                                                    installed.status !== 'Running' ||
-                                                    installed.app.status === 'TakeDown'
+                                                @click="
+                                                    openBackups(installed.app.key, installed.name, installed.status)
                                                 "
-                                                @click="openBackups(installed.app.key, installed.name)"
                                                 v-if="mode === 'installed'"
                                             >
                                                 {{ $t('commons.button.backup') }}
@@ -362,6 +360,17 @@ const mode = ref('installed');
 const moreTag = ref('');
 const language = getLanguage();
 const appDetail = ref();
+const options = {
+    modifiers: [
+        {
+            name: 'flip',
+            options: {
+                padding: 5,
+                fallbackPlacements: ['bottom-start', 'top-start', 'right', 'left'],
+            },
+        },
+    ],
+};
 
 const sync = () => {
     ElMessageBox.confirm(i18n.global.t('app.syncAllAppHelper'), i18n.global.t('app.sync'), {
@@ -560,11 +569,12 @@ const buttons = [
     },
 ];
 
-const openBackups = (key: string, name: string) => {
+const openBackups = (key: string, name: string, status: string) => {
     let params = {
         type: 'app',
         name: key,
         detailName: name,
+        status: status,
     };
     backupRef.value.acceptParams(params);
 };
@@ -621,4 +631,9 @@ onUnmounted(() => {
         flex: 0 0 100%;
     }
 }
+
+.app-error {
+    max-height: 500px;
+    overflow-y: auto;
+}
 </style>

frontend/src/views/app-store/installed/upgrade/index.vue

@@ -35,6 +35,7 @@
                         <el-checkbox v-model="operateReq.pullImage" :label="$t('container.forcePull')" size="large" />
                         <span class="input-help">{{ $t('container.forcePullHelper') }}</span>
                     </el-form-item>
+                    <el-text type="warning">{{ $t('app.upgradeWarn') }}</el-text>
                 </el-form>
             </el-col>
             <el-col :span="22" :offset="1">

frontend/src/views/container/setting/mirror/index.vue

@@ -46,6 +46,7 @@ import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { updateDaemonJson } from '@/api/modules/container';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { FormInstance } from 'element-plus';
+import { emptyLineFilter } from '@/utils/util';
 
 const emit = defineEmits<{ (e: 'search'): void }>();
 
@@ -101,7 +102,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
 
 const onSubmit = async () => {
     loading.value = true;
-    await updateDaemonJson('Mirrors', form.mirrors.replaceAll('\n', ','))
+    await updateDaemonJson('Mirrors', emptyLineFilter(form.mirrors, '\n').replaceAll('\n', ','))
         .then(() => {
             loading.value = false;
             emit('search');