fix: 添加国际化及样式修改 (#6555)

Refs #6524

.gitignore

@@ -29,6 +29,7 @@ build/1panel
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+
 # Dependency directories
 /pkg/
 backend/__debug_bin
@@ -40,9 +41,7 @@ frontend/auto-imports.d.ts
 frontend/components.d.ts
 frontend/src/xpack
 backend/xpack
-backend/router/entry_xpack.go
-backend/server/init_xpack.go
-backend/utils/xpack/xpack_xpack.go
+*_xpack.go
 
 .history/
 dist/

.goreleaser.yaml

@@ -44,7 +44,7 @@ archives:
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 release:
   draft: true
   mode: append

README.md

@@ -51,7 +51,8 @@ curl -sSL https://resource.fit2cloud.com/1panel/package/quick_start.sh -o quick_
 - [JumpServer](https://github.com/jumpserver/jumpserver/) - 广受欢迎的开源堡垒机
 - [Halo](https://github.com/halo-dev/halo/) - 强大易用的开源建站工具
 - [DataEase](https://github.com/dataease/dataease/) - 人人可用的开源数据可视化分析工具
-- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源自动化测试平台
+- [MeterSphere](https://github.com/metersphere/metersphere/) - 开源持续测试工具
+- [KubePi](https://github.com/1Panel-dev/KubePi/) - 现代化、开源的 K8s 面板
 
 ## License
 

backend/app/api/v1/app.go

@@ -155,7 +155,7 @@ func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 // @Success 200 {object} model.AppInstall
 // @Security ApiKeyAuth
 // @Router /apps/install [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"name","input_value":"name","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"info":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"安装应用 [appKey]-[name]","formatEN":"Install app [appKey]-[name]"}
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"安装应用 [name]","formatEN":"Install app [name]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
 	var req request.AppInstallCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/cronjob.go

@@ -72,7 +72,7 @@ func (b *BaseApi) SearchJobRecords(c *gin.Context) {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZone())
+	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 

backend/app/api/v1/dashboard.go

@@ -2,6 +2,7 @@ package v1
 
 import (
 	"errors"
+	"github.com/1Panel-dev/1Panel/backend/app/dto"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/constant"
@@ -55,25 +56,17 @@ func (b *BaseApi) LoadDashboardBaseInfo(c *gin.Context) {
 // @Tags Dashboard
 // @Summary Load dashboard current info
 // @Description 获取首页实时数据
-// @Accept json
-// @Param ioOption path string true "request"
-// @Param netOption path string true "request"
+// @Accept json、
+// @Param request body dto.DashboardReq true "request"
 // @Success 200 {object} dto.DashboardCurrent
 // @Security ApiKeyAuth
-// @Router /dashboard/current/:ioOption/:netOption [get]
+// @Router /dashboard/current [post]
 func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
-	ioOption, ok := c.Params.Get("ioOption")
-	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error ioOption in path"))
+	var req dto.DashboardReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	netOption, ok := c.Params.Get("netOption")
-	if !ok {
-		helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, errors.New("error netOption in path"))
-		return
-	}
-
-	data := dashboardService.LoadCurrentInfo(ioOption, netOption)
+	data := dashboardService.LoadCurrentInfo(req)
 	helper.SuccessWithData(c, data)
 }
 

backend/app/api/v1/file.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -336,8 +337,12 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		return
 	}
 	mode := info.Mode()
-
 	fileOp := files.NewFileOp()
+	stat, ok := info.Sys().(*syscall.Stat_t)
+	uid, gid := -1, -1
+	if ok {
+		uid, gid = int(stat.Uid), int(stat.Gid)
+	}
 
 	success := 0
 	failures := make(buserr.MultiErr)
@@ -351,6 +356,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 				global.LOG.Error(e)
 				continue
 			}
+			_ = os.Chown(dstDir, uid, gid)
 		}
 		tmpFilename := dstFilename + ".tmp"
 		if err := c.SaveUploadedFile(file, tmpFilename); err != nil {
@@ -378,6 +384,9 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		} else {
 			_ = os.Chmod(dstFilename, mode)
 		}
+		if uid != -1 && gid != -1 {
+			_ = os.Chown(dstFilename, uid, gid)
+		}
 		success++
 	}
 	if success == 0 {
@@ -603,9 +612,17 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	if mode == 0 {
 		mode = 0755
 	}
-	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
-		if err = op.CreateDir(dstDir, mode); err != nil {
-			return err
+	uid, gid := -1, -1
+	if info, err := os.Stat(dstDir); err != nil {
+		if os.IsNotExist(err) {
+			if err = op.CreateDir(dstDir, mode); err != nil {
+				return err
+			}
+		}
+	} else {
+		stat, ok := info.Sys().(*syscall.Stat_t)
+		if ok {
+			uid, gid = int(stat.Uid), int(stat.Gid)
 		}
 	}
 	dstFileName := filepath.Join(dstDir, fileName)
@@ -615,6 +632,7 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	} else {
 		mode = 0644
 	}
+
 	if overwrite {
 		_ = os.Remove(dstFileName)
 	}
@@ -635,6 +653,9 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 		}
 		_ = os.Remove(chunkPath)
 	}
+	if uid != -1 && gid != -1 {
+		_ = os.Chown(dstFileName, uid, gid)
+	}
 
 	return nil
 }

backend/app/api/v1/monitor.go

@@ -28,7 +28,7 @@ func (b *BaseApi) LoadMonitor(c *gin.Context) {
 		return
 	}
 
-	loc, _ := time.LoadLocation(common.LoadTimeZone())
+	loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	req.StartTime = req.StartTime.In(loc)
 	req.EndTime = req.EndTime.In(loc)
 

backend/app/api/v1/snapshot.go

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

backend/app/dto/backup.go

@@ -36,6 +36,7 @@ type CommonBackup struct {
 	Name       string `json:"name"`
 	DetailName string `json:"detailName"`
 	Secret     string `json:"secret"`
+	FileName   string `json:"fileName"`
 }
 type CommonRecover struct {
 	Source     string `json:"source" validate:"required,oneof=OSS S3 SFTP MINIO LOCAL COS KODO OneDrive WebDAV"`

backend/app/dto/container.go

@@ -116,7 +116,7 @@ type PortHelper struct {
 
 type ContainerOperation struct {
 	Names     []string `json:"names" validate:"required"`
-	Operation string   `json:"operation" validate:"required,oneof=start stop restart kill pause unpause remove"`
+	Operation string   `json:"operation" validate:"required,oneof=up start stop restart kill pause unpause remove"`
 }
 
 type ContainerRename struct {
@@ -208,22 +208,24 @@ type ComposeContainer struct {
 	State       string `json:"state"`
 }
 type ComposeCreate struct {
-	Name     string `json:"name"`
-	From     string `json:"from" validate:"required,oneof=edit path template"`
-	File     string `json:"file"`
-	Path     string `json:"path"`
-	Template uint   `json:"template"`
+	Name     string   `json:"name"`
+	From     string   `json:"from" validate:"required,oneof=edit path template"`
+	File     string   `json:"file"`
+	Path     string   `json:"path"`
+	Template uint     `json:"template"`
+	Env      []string `json:"env"`
 }
 type ComposeOperation struct {
 	Name      string `json:"name" validate:"required"`
 	Path      string `json:"path" validate:"required"`
-	Operation string `json:"operation" validate:"required,oneof=start stop down"`
+	Operation string `json:"operation" validate:"required,oneof=up start stop down"`
 	WithFile  bool   `json:"withFile"`
 }
 type ComposeUpdate struct {
-	Name    string `json:"name" validate:"required"`
-	Path    string `json:"path" validate:"required"`
-	Content string `json:"content" validate:"required"`
+	Name    string   `json:"name" validate:"required"`
+	Path    string   `json:"path" validate:"required"`
+	Content string   `json:"content" validate:"required"`
+	Env     []string `json:"env"`
 }
 
 type ContainerLog struct {

backend/app/dto/dashboard.go

@@ -16,10 +16,11 @@ type DashboardBase struct {
 	KernelArch           string `json:"kernelArch"`
 	KernelVersion        string `json:"kernelVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
-
-	CPUCores        int    `json:"cpuCores"`
-	CPULogicalCores int    `json:"cpuLogicalCores"`
-	CPUModelName    string `json:"cpuModelName"`
+	IpV4Addr             string `json:"ipv4Addr"`
+	SystemProxy          string `json:"SystemProxy"`
+	CPUCores             int    `json:"cpuCores"`
+	CPULogicalCores      int    `json:"cpuLogicalCores"`
+	CPUModelName         string `json:"cpuModelName"`
 
 	CurrentInfo DashboardCurrent `json:"currentInfo"`
 }
@@ -34,6 +35,12 @@ type OsInfo struct {
 	DiskSize int64 `json:"diskSize"`
 }
 
+type DashboardReq struct {
+	Scope     string `json:"scope"`
+	IoOption  string `json:"ioOption"`
+	NetOption string `json:"netOption"`
+}
+
 type DashboardCurrent struct {
 	Uptime          uint64 `json:"uptime"`
 	TimeSinceUptime string `json:"timeSinceUptime"`
@@ -72,6 +79,7 @@ type DashboardCurrent struct {
 	NetBytesRecv uint64 `json:"netBytesRecv"`
 
 	GPUData []GPUInfo `json:"gpuData"`
+	XPUData []XPUInfo `json:"xpuData"`
 
 	ShotTime time.Time `json:"shotTime"`
 }
@@ -105,3 +113,13 @@ type GPUInfo struct {
 	MemTotal         string `json:"memTotal"`
 	FanSpeed         string `json:"fanSpeed"`
 }
+
+type XPUInfo struct {
+	DeviceID    int    `json:"deviceID"`
+	DeviceName  string `json:"deviceName"`
+	Memory      string `json:"memory"`
+	Temperature string `json:"temperature"`
+	MemoryUsed  string `json:"memoryUsed"`
+	Power       string `json:"power"`
+	MemoryUtil  string `json:"memoryUtil"`
+}

backend/app/dto/response/file.go

@@ -36,10 +36,11 @@ type FileWgetRes struct {
 }
 
 type FileLineContent struct {
-	Content string `json:"content"`
-	End     bool   `json:"end"`
-	Path    string `json:"path"`
-	Total   int    `json:"total"`
+	Content string   `json:"content"`
+	End     bool     `json:"end"`
+	Path    string   `json:"path"`
+	Total   int      `json:"total"`
+	Lines   []string `json:"lines"`
 }
 
 type FileExist struct {

backend/app/dto/response/website.go

@@ -30,6 +30,8 @@ type WebsiteRes struct {
 	RuntimeName   string    `json:"runtimeName"`
 	SSLExpireDate time.Time `json:"sslExpireDate"`
 	SSLStatus     string    `json:"sslStatus"`
+	AppInstallID  uint      `json:"appInstallId"`
+	RuntimeType   string    `json:"runtimeType"`
 }
 
 type WebsiteOption struct {

backend/app/dto/setting.go

@@ -98,6 +98,12 @@ type PortUpdate struct {
 	ServerPort uint `json:"serverPort" validate:"required,number,max=65535,min=1"`
 }
 
+type PageSnapshot struct {
+	PageInfo
+	Info    string `json:"info"`
+	OrderBy string `json:"orderBy" validate:"required,oneof=name created_at"`
+	Order   string `json:"order" validate:"required,oneof=null ascending descending"`
+}
 type SnapshotStatus struct {
 	Panel      string `json:"panel"`
 	PanelInfo  string `json:"panelInfo"`

backend/app/model/compose_template.go

@@ -12,4 +12,5 @@ type Compose struct {
 	BaseModel
 
 	Name string `gorm:"type:varchar(256)" json:"name"`
+	Path string `gorm:"type:varchar(256)" json:"path"`
 }

backend/app/repo/backup.go

@@ -25,6 +25,7 @@ type IBackupRepo interface {
 	WithByFileName(fileName string) DBOption
 	WithByType(backupType string) DBOption
 	WithByCronID(cronjobID uint) DBOption
+	WithFileNameStartWith(filePrefix string) DBOption
 }
 
 func NewIBackupRepo() IBackupRepo {
@@ -81,6 +82,12 @@ func (u *BackupRepo) WithByFileName(fileName string) DBOption {
 	}
 }
 
+func (u *BackupRepo) WithFileNameStartWith(filePrefix string) DBOption {
+	return func(g *gorm.DB) *gorm.DB {
+		return g.Where("file_name LIKE ?", filePrefix+"%")
+	}
+}
+
 func (u *BackupRepo) WithByType(backupType string) DBOption {
 	return func(g *gorm.DB) *gorm.DB {
 		if len(backupType) == 0 {

backend/app/repo/compose_template.go

@@ -19,6 +19,7 @@ type IComposeTemplateRepo interface {
 	CreateRecord(compose *model.Compose) error
 	DeleteRecord(opts ...DBOption) error
 	ListRecord() ([]model.Compose, error)
+	UpdateRecord(name string, vars map[string]interface{}) error
 }
 
 func NewIComposeTemplateRepo() IComposeTemplateRepo {
@@ -102,3 +103,7 @@ func (u *ComposeTemplateRepo) DeleteRecord(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Compose{}).Error
 }
+
+func (u *ComposeTemplateRepo) UpdateRecord(name string, vars map[string]interface{}) error {
+	return global.DB.Model(&model.Compose{}).Where("name = ?", name).Updates(vars).Error
+}

backend/app/repo/website_ssl.go

@@ -50,7 +50,6 @@ func (w WebsiteSSLRepo) WithByCAID(caID uint) DBOption {
 		return db.Where("ca_id = ?", caID)
 	}
 }
-
 func (w WebsiteSSLRepo) Page(page, size int, opts ...DBOption) (int64, []model.WebsiteSSL, error) {
 	var sslList []model.WebsiteSSL
 	db := getDb(opts...).Model(&model.WebsiteSSL{})

backend/app/service/app.go

@@ -91,10 +91,10 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
 	}
 	var appDTOs []*response.AppDto
 	for _, ap := range apps {
-		ap.ReadMe = ""
-		ap.Website = ""
-		ap.Document = ""
-		ap.Github = ""
+		// ap.ReadMe = ""
+		// ap.Website = ""
+		// ap.Document = ""
+		// ap.Github = ""
 		appDTO := &response.AppDto{
 			ID:          ap.ID,
 			Name:        ap.Name,
@@ -145,6 +145,9 @@ func (a AppService) GetAppTags() ([]response.TagDTO, error) {
 
 func (a AppService) GetApp(key string) (*response.AppDTO, error) {
 	var appDTO response.AppDTO
+	if key == "postgres" {
+		key = "postgresql"
+	}
 	app, err := appRepo.GetFirst(appRepo.WithKey(key))
 	if err != nil {
 		return nil, err
@@ -185,7 +188,7 @@ func (a AppService) GetAppDetail(appID uint, version, appType string) (response.
 
 		versionPath := filepath.Join(app.GetAppResourcePath(), detail.Version)
 		if !fileOp.Stat(versionPath) || detail.Update {
-			if err = downloadApp(app, detail, nil); err != nil {
+			if err = downloadApp(app, detail, nil); err != nil && !fileOp.Stat(versionPath) {
 				return appDetailDTO, err
 			}
 		}

backend/app/service/app_install.go

@@ -535,6 +535,12 @@ func (a *AppInstallService) GetUpdateVersions(req request.AppUpdateVersion) ([]d
 			if err != nil {
 				return versions, err
 			}
+			if app.Key == constant.AppMysql {
+				majorVersion := getMajorVersion(install.Version)
+				if !strings.HasPrefix(detail.Version, majorVersion) {
+					continue
+				}
+			}
 			versions = append(versions, dto.AppVersion{
 				Version:       detail.Version,
 				DetailId:      detail.ID,
@@ -703,6 +709,22 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 					}
 				}
 				appParam.Values = form.Values
+			} else if form.Type == "apps" {
+				if m, ok := form.Child.(map[string]interface{}); ok {
+					result := make(map[string]string)
+					for key, value := range m {
+						if strVal, ok := value.(string); ok {
+							result[key] = strVal
+						}
+					}
+					if envKey, ok := result["envKey"]; ok {
+						serviceName := envs[envKey]
+						if serviceName != nil {
+							appInstall, _ := appInstallRepo.GetFirst(appInstallRepo.WithServiceName(serviceName.(string)))
+							appParam.ShowValue = appInstall.Name
+						}
+					}
+				}
 			}
 			params = append(params, appParam)
 		} else {

backend/app/service/app_utils.go

@@ -186,17 +186,18 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
 			}
 		case constant.AppRedis:
 			if password, ok := params["PANEL_REDIS_ROOT_PASSWORD"]; ok {
-				if password != "" {
-					authParam := dto.RedisAuthParam{
-						RootPassword: password.(string),
-					}
-					authByte, err := json.Marshal(authParam)
-					if err != nil {
-						return err
-					}
-					appInstall.Param = string(authByte)
+				authParam := dto.RedisAuthParam{
+					RootPassword: "",
 				}
-				database.Password = password.(string)
+				if password != "" {
+					authParam.RootPassword = password.(string)
+					database.Password = password.(string)
+				}
+				authByte, err := json.Marshal(authParam)
+				if err != nil {
+					return err
+				}
+				appInstall.Param = string(authByte)
 			}
 		}
 		if err := databaseRepo.Create(ctx, database); err != nil {
@@ -516,8 +517,19 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 		)
 		global.LOG.Infof(i18n.GetMsgWithName("UpgradeAppStart", install.Name, nil))
 		if req.Backup {
-			backupRecord, err := NewIBackupService().AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name})
+			iBackUpService := NewIBackupService()
+			fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5))
+			backupRecord, err := iBackUpService.AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name, FileName: fileName})
 			if err == nil {
+				backups, _ := iBackUpService.ListAppRecords(install.App.Key, install.Name, "upgrade_backup")
+				if len(backups) > 3 {
+					backupsToDelete := backups[:len(backups)-3]
+					var deleteIDs []uint
+					for _, backup := range backupsToDelete {
+						deleteIDs = append(deleteIDs, backup.ID)
+					}
+					_ = iBackUpService.BatchDeleteRecord(deleteIDs)
+				}
 				localDir, err := loadLocalDir()
 				if err == nil {
 					backupFile = path.Join(localDir, backupRecord.FileDir, backupRecord.FileName)
@@ -1224,6 +1236,31 @@ func synAppInstall(containers map[string]types.Container, appInstall *model.AppI
 	_ = appInstallRepo.Save(context.Background(), appInstall)
 }
 
+func getMajorVersion(version string) string {
+	parts := strings.Split(version, ".")
+	if len(parts) >= 2 {
+		return parts[0] + "." + parts[1]
+	}
+	return version
+}
+
+func ignoreUpdate(installed model.AppInstall) bool {
+	if installed.App.Type == "php" || installed.Status == constant.Installing {
+		return true
+	}
+	if installed.App.Key == constant.AppMysql {
+		majorVersion := getMajorVersion(installed.Version)
+		appDetails, _ := appDetailRepo.GetBy(appDetailRepo.WithAppId(installed.App.ID))
+		for _, appDetail := range appDetails {
+			if strings.HasPrefix(appDetail.Version, majorVersion) && common.CompareVersion(appDetail.Version, installed.Version) {
+				return false
+			}
+		}
+		return true
+	}
+	return false
+}
+
 func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool) ([]response.AppInstallDTO, error) {
 	var (
 		res           []response.AppInstallDTO
@@ -1246,7 +1283,7 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
 	}
 
 	for _, installed := range appInstallList {
-		if updated && (installed.App.Type == "php" || installed.Status == constant.Installing || (installed.App.Key == constant.AppMysql && installed.Version == "5.6.51")) {
+		if updated && ignoreUpdate(installed) {
 			continue
 		}
 		if sync && !doNotNeedSync(installed) {

backend/app/service/backup.go

@@ -40,6 +40,7 @@ type IBackupService interface {
 	DeleteRecordByName(backupType, name, detailName string, withDeleteFile bool) error
 	BatchDeleteRecord(ids []uint) error
 	NewClient(backup *model.BackupAccount) (cloud_storage.CloudStorageClient, error)
+	ListAppRecords(name, detailName, fileName string) ([]model.BackupRecord, error)
 
 	ListFiles(req dto.BackupSearchFile) []string
 
@@ -100,6 +101,20 @@ func (u *BackupService) SearchRecordsWithPage(search dto.RecordSearch) (int64, [
 	return total, datas, err
 }
 
+func (u *BackupService) ListAppRecords(name, detailName, fileName string) ([]model.BackupRecord, error) {
+	records, err := backupRepo.ListRecord(
+		commonRepo.WithOrderBy("created_at asc"),
+		commonRepo.WithByName(name),
+		commonRepo.WithByType("app"),
+		backupRepo.WithFileNameStartWith(fileName),
+		backupRepo.WithByDetailName(detailName),
+	)
+	if err != nil {
+		return nil, err
+	}
+	return records, err
+}
+
 func (u *BackupService) SearchRecordsByCronjobWithPage(search dto.RecordSearchByCronjob) (int64, []dto.BackupRecords, error) {
 	total, records, err := backupRepo.PageRecord(
 		search.Page, search.PageSize,

backend/app/service/backup_app.go

@@ -39,7 +39,10 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, er
 	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))
+	fileName := req.FileName
+	if req.FileName == "" {
+		fileName = fmt.Sprintf("%s_%s.tar.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
+	}
 	if err := handleAppBackup(&install, backupDir, fileName, "", req.Secret); err != nil {
 		return nil, err
 	}

backend/app/service/clam.go

@@ -92,6 +92,8 @@ func (c *ClamService) LoadBaseInfo() (dto.ClamBaseInfo, error) {
 				baseInfo.Version = strings.TrimPrefix(version, "ClamAV ")
 			}
 		}
+	} else {
+		_ = StopAllCronJob(false)
 	}
 	if baseInfo.FreshIsActive {
 		version, err := cmd.Exec("freshclam --version")
@@ -139,7 +141,7 @@ func (c *ClamService) SearchWithPage(req dto.SearchClamWithPage) (int64, interfa
 		item.LastHandleDate = "-"
 		datas = append(datas, item)
 	}
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	for i := 0; i < len(datas); i++ {
 		logPaths := loadFileByName(datas[i].Name)
 		sort.Slice(logPaths, func(i, j int) bool {
@@ -268,7 +270,7 @@ func (c *ClamService) Delete(req dto.ClamDelete) error {
 }
 
 func (c *ClamService) HandleOnce(req dto.OperateByID) error {
-	if cmd.Which("clamdscan") == false {
+	if cleaned := StopAllCronJob(true); cleaned {
 		return buserr.New("ErrClamdscanNotFound")
 	}
 	clam, _ := clamRepo.Get(commonRepo.WithByID(req.ID))
@@ -321,7 +323,7 @@ func (c *ClamService) LoadRecords(req dto.ClamLogSearch) (int64, interface{}, er
 	}
 
 	var filterFiles []string
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	for _, item := range logPaths {
 		t1, err := time.ParseInLocation(constant.DateTimeSlimLayout, item, nyc)
 		if err != nil {
@@ -473,6 +475,29 @@ func (c *ClamService) UpdateFile(req dto.UpdateByNameAndFile) error {
 	return nil
 }
 
+func StopAllCronJob(withCheck bool) bool {
+	if withCheck {
+		isActive := false
+		exist1, _ := systemctl.IsExist(clamServiceNameCentOs)
+		if exist1 {
+			isActive, _ = systemctl.IsActive(clamServiceNameCentOs)
+		}
+		exist2, _ := systemctl.IsExist(clamServiceNameUbuntu)
+		if exist2 {
+			isActive, _ = systemctl.IsActive(clamServiceNameUbuntu)
+		}
+		if isActive {
+			return false
+		}
+	}
+	clams, _ := clamRepo.List(commonRepo.WithByStatus(constant.StatusEnable))
+	for i := 0; i < len(clams); i++ {
+		global.Cron.Remove(cron.EntryID(clams[i].EntryID))
+		_ = clamRepo.Update(clams[i].ID, map[string]interface{}{"status": constant.StatusDisable, "entry_id": 0})
+	}
+	return true
+}
+
 func loadFileByName(name string) []string {
 	var logPaths []string
 	pathItem := path.Join(global.CONF.System.DataDir, resultDir, name)

backend/app/service/container.go

@@ -187,7 +187,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 			IsFromApp = true
 		}
 
-		ports := loadContainerPort(item.Ports)
+		exposePorts := transPortToStr(records[i].Ports)
 		info := dto.ContainerInfo{
 			ContainerID:   item.ID,
 			CreateTime:    time.Unix(item.Created, 0).Format(constant.DateTimeLayout),
@@ -196,7 +196,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
 			ImageName:     item.Image,
 			State:         item.State,
 			RunTime:       item.Status,
-			Ports:         ports,
+			Ports:         exposePorts,
 			IsFromApp:     IsFromApp,
 			IsFromCompose: IsFromCompose,
 		}
@@ -445,6 +445,8 @@ func (u *ContainerService) ContainerInfo(req dto.OperationWithName) (*dto.Contai
 		}
 	}
 
+	exposePorts, _ := loadPortByInspect(oldContainer.ID, client)
+	data.ExposedPorts = loadContainerPortForInfo(exposePorts)
 	networkSettings := oldContainer.NetworkSettings
 	bridgeNetworkSettings := networkSettings.Networks[data.Network]
 	if bridgeNetworkSettings.IPAMConfig != nil {
@@ -465,19 +467,7 @@ func (u *ContainerService) ContainerInfo(req dto.OperationWithName) (*dto.Contai
 	for key, val := range oldContainer.Config.Labels {
 		data.Labels = append(data.Labels, fmt.Sprintf("%s=%s", key, val))
 	}
-	for key, val := range oldContainer.HostConfig.PortBindings {
-		var itemPort dto.PortHelper
-		if !strings.Contains(string(key), "/") {
-			continue
-		}
-		itemPort.ContainerPort = strings.Split(string(key), "/")[0]
-		itemPort.Protocol = strings.Split(string(key), "/")[1]
-		for _, binds := range val {
-			itemPort.HostIP = binds.HostIP
-			itemPort.HostPort = binds.HostPort
-			data.ExposedPorts = append(data.ExposedPorts, itemPort)
-		}
-	}
+
 	data.AutoRemove = oldContainer.HostConfig.AutoRemove
 	data.Privileged = oldContainer.HostConfig.Privileged
 	data.PublishAllPorts = oldContainer.HostConfig.PublishAllPorts
@@ -908,6 +898,10 @@ func (u *ContainerService) LoadContainerLogs(req dto.OperationWithNameAndType) s
 				break
 			}
 		}
+		if len(containers) == 0 {
+			composeItem, _ := composeRepo.GetRecord(commonRepo.WithByName(req.Name))
+			filePath = composeItem.Path
+		}
 	}
 	if _, err := os.Stat(filePath); err != nil {
 		return ""
@@ -1201,7 +1195,7 @@ func reCreateAfterUpdate(name string, client *client.Client, config *container.C
 	if err := client.ContainerStart(ctx, oldContainer.ID, container.StartOptions{}); err != nil {
 		global.LOG.Errorf("restart after container update failed, err: %v", err)
 	}
-	global.LOG.Errorf("recreate after container update successful")
+	global.LOG.Info("recreate after container update successful")
 }
 
 func loadVolumeBinds(binds []types.MountPoint) []dto.VolumeHelper {
@@ -1224,7 +1218,65 @@ func loadVolumeBinds(binds []types.MountPoint) []dto.VolumeHelper {
 	return datas
 }
 
-func loadContainerPort(ports []types.Port) []string {
+func loadPortByInspect(id string, client *client.Client) ([]types.Port, error) {
+	container, err := client.ContainerInspect(context.Background(), id)
+	if err != nil {
+		return nil, err
+	}
+	var itemPorts []types.Port
+	for key, val := range container.ContainerJSONBase.HostConfig.PortBindings {
+		if !strings.Contains(string(key), "/") {
+			continue
+		}
+		item := strings.Split(string(key), "/")
+		itemPort, _ := strconv.ParseUint(item[0], 10, 16)
+
+		for _, itemVal := range val {
+			publicPort, _ := strconv.ParseUint(itemVal.HostPort, 10, 16)
+			itemPorts = append(itemPorts, types.Port{PrivatePort: uint16(itemPort), Type: item[1], PublicPort: uint16(publicPort), IP: itemVal.HostIP})
+		}
+	}
+	return itemPorts, nil
+}
+
+func loadContainerPortForInfo(itemPorts []types.Port) []dto.PortHelper {
+	var exposedPorts []dto.PortHelper
+	samePortMap := make(map[string]dto.PortHelper)
+	ports := transPortToStr(itemPorts)
+	var itemPort dto.PortHelper
+	for _, item := range ports {
+		itemStr := strings.Split(item, "->")
+		if len(itemStr) < 2 {
+			continue
+		}
+		lastIndex := strings.LastIndex(itemStr[0], ":")
+		if lastIndex == -1 {
+			itemPort.HostPort = itemStr[0]
+		} else {
+			itemPort.HostIP = itemStr[0][0:lastIndex]
+			itemPort.HostPort = itemStr[0][lastIndex+1:]
+		}
+		itemContainer := strings.Split(itemStr[1], "/")
+		if len(itemContainer) != 2 {
+			continue
+		}
+		itemPort.ContainerPort = itemContainer[0]
+		itemPort.Protocol = itemContainer[1]
+		keyItem := fmt.Sprintf("%s->%s/%s", itemPort.HostPort, itemPort.ContainerPort, itemPort.Protocol)
+		if val, ok := samePortMap[keyItem]; ok {
+			val.HostIP = ""
+			samePortMap[keyItem] = val
+		} else {
+			samePortMap[keyItem] = itemPort
+		}
+	}
+	for _, val := range samePortMap {
+		exposedPorts = append(exposedPorts, val)
+	}
+	return exposedPorts
+}
+
+func transPortToStr(ports []types.Port) []string {
 	var (
 		ipv4Ports []types.Port
 		ipv6Ports []types.Port

backend/app/service/container_compose.go

@@ -4,7 +4,9 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"gopkg.in/yaml.v3"
 	"io"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -31,6 +33,12 @@ const composeConfigLabel = "com.docker.compose.project.config_files"
 const composeWorkdirLabel = "com.docker.compose.project.working_dir"
 const composeCreatedBy = "createdBy"
 
+type DockerCompose struct {
+	Version  string                            `yaml:"version"`
+	Services map[string]map[string]interface{} `yaml:"services"`
+	Networks map[string]interface{}            `yaml:"networks"`
+}
+
 func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface{}, error) {
 	var (
 		records   []dto.ComposeInfo
@@ -52,6 +60,20 @@ func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface
 	}
 
 	composeCreatedByLocal, _ := composeRepo.ListRecord()
+
+	composeLocalMap := make(map[string]dto.ComposeInfo)
+	for _, localItem := range composeCreatedByLocal {
+		composeItemLocal := dto.ComposeInfo{
+			ContainerNumber: 0,
+			CreatedAt:       localItem.CreatedAt.Format(constant.DateTimeLayout),
+			ConfigFile:      localItem.Path,
+			Workdir:         strings.TrimSuffix(localItem.Path, "/docker-compose.yml"),
+		}
+		composeItemLocal.CreatedBy = "1Panel"
+		composeItemLocal.Path = localItem.Path
+		composeLocalMap[localItem.Name] = composeItemLocal
+	}
+
 	composeMap := make(map[string]dto.ComposeInfo)
 	for _, container := range list {
 		if name, ok := container.Labels[composeProjectLabel]; ok {
@@ -95,12 +117,24 @@ func (u *ContainerService) PageCompose(req dto.SearchWithPage) (int64, interface
 			}
 		}
 	}
-	for _, item := range composeCreatedByLocal {
-		if err := composeRepo.DeleteRecord(commonRepo.WithByID(item.ID)); err != nil {
-			global.LOG.Error(err)
+
+	mergedMap := make(map[string]dto.ComposeInfo)
+	for key, localItem := range composeLocalMap {
+		mergedMap[key] = localItem
+	}
+	for key, item := range composeMap {
+		if existingItem, exists := mergedMap[key]; exists {
+			if item.ContainerNumber > 0 {
+				if existingItem.ContainerNumber <= 0 {
+					mergedMap[key] = item
+				}
+			}
+		} else {
+			mergedMap[key] = item
 		}
 	}
-	for key, value := range composeMap {
+
+	for key, value := range mergedMap {
 		value.Name = key
 		records = append(records, value)
 	}
@@ -149,6 +183,59 @@ func (u *ContainerService) TestCompose(req dto.ComposeCreate) (bool, error) {
 	return true, nil
 }
 
+func formatYAML(data []byte) []byte {
+	return []byte(strings.ReplaceAll(string(data), "\t", "  "))
+}
+
+func updateDockerComposeWithEnv(req dto.ComposeCreate) error {
+	data, err := ioutil.ReadFile(req.Path)
+	if err != nil {
+		return fmt.Errorf("failed to read docker-compose.yml: %v", err)
+	}
+	var composeItem DockerCompose
+	if err := yaml.Unmarshal(data, &composeItem); err != nil {
+		return fmt.Errorf("failed to parse docker-compose.yml: %v", err)
+	}
+	for serviceName, service := range composeItem.Services {
+		envMap := make(map[string]string)
+		if existingEnv, exists := service["environment"].([]interface{}); exists {
+			for _, env := range existingEnv {
+				envStr := env.(string)
+				parts := strings.SplitN(envStr, "=", 2)
+				if len(parts) == 2 {
+					envMap[parts[0]] = parts[1]
+				}
+			}
+		}
+		for _, env := range req.Env {
+			parts := strings.SplitN(env, "=", 2)
+			if len(parts) == 2 {
+				envMap[parts[0]] = parts[1]
+			}
+		}
+		envVars := []string{}
+		for key, value := range envMap {
+			envVars = append(envVars, key+"="+value)
+		}
+		service["environment"] = envVars
+		composeItem.Services[serviceName] = service
+	}
+	if composeItem.Networks != nil {
+		for key := range composeItem.Networks {
+			composeItem.Networks[key] = map[string]interface{}{}
+		}
+	}
+	newData, err := yaml.Marshal(&composeItem)
+	if err != nil {
+		return fmt.Errorf("failed to marshal docker-compose.yml: %v", err)
+	}
+	formattedData := formatYAML(newData)
+	if err := ioutil.WriteFile(req.Path, formattedData, 0644); err != nil {
+		return fmt.Errorf("failed to write docker-compose.yml: %v", err)
+	}
+	return nil
+}
+
 func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error) {
 	if cmd.CheckIllegal(req.Name, req.Path) {
 		return "", buserr.New(constant.ErrCmdIllegal)
@@ -173,6 +260,12 @@ func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error)
 	if err != nil {
 		return "", err
 	}
+	if len(req.Env) > 0 {
+		if err := updateDockerComposeWithEnv(req); err != nil {
+			fmt.Printf("failed to update docker-compose.yml with env: %v\n", err)
+			return "", err
+		}
+	}
 	go func() {
 		defer file.Close()
 		cmd := exec.Command("docker-compose", "-f", req.Path, "up", "-d")
@@ -186,7 +279,7 @@ func (u *ContainerService) CreateCompose(req dto.ComposeCreate) (string, error)
 			return
 		}
 		global.LOG.Infof("docker-compose up %s successful!", req.Name)
-		_ = composeRepo.CreateRecord(&model.Compose{Name: req.Name})
+		_ = composeRepo.CreateRecord(&model.Compose{Name: req.Name, Path: req.Path})
 		_, _ = file.WriteString("docker-compose up successful!")
 	}()
 
@@ -200,20 +293,87 @@ func (u *ContainerService) ComposeOperation(req dto.ComposeOperation) error {
 	if _, err := os.Stat(req.Path); err != nil {
 		return fmt.Errorf("load file with path %s failed, %v", req.Path, err)
 	}
-	if stdout, err := compose.Operate(req.Path, req.Operation); err != nil {
-		return errors.New(string(stdout))
+	if req.Operation == "up" {
+		if stdout, err := compose.Up(req.Path); err != nil {
+			return errors.New(string(stdout))
+		}
+	} else {
+		if stdout, err := compose.Operate(req.Path, req.Operation); err != nil {
+			return errors.New(string(stdout))
+		}
 	}
 	global.LOG.Infof("docker-compose %s %s successful", req.Operation, req.Name)
 	if req.Operation == "down" {
-		_ = composeRepo.DeleteRecord(commonRepo.WithByName(req.Name))
 		if req.WithFile {
+			_ = composeRepo.DeleteRecord(commonRepo.WithByName(req.Name))
 			_ = os.RemoveAll(path.Dir(req.Path))
+		} else {
+			composeItem, _ := composeRepo.GetRecord(commonRepo.WithByName(req.Name))
+			if composeItem.Path == "" {
+				upMap := make(map[string]interface{})
+				upMap["path"] = req.Path
+				_ = composeRepo.UpdateRecord(req.Name, upMap)
+			}
 		}
 	}
 
 	return nil
 }
 
+func updateComposeWithEnv(req dto.ComposeUpdate) error {
+	var composeItem DockerCompose
+	if err := yaml.Unmarshal([]byte(req.Content), &composeItem); err != nil {
+		return fmt.Errorf("failed to parse docker-compose content: %v", err)
+	}
+	for serviceName, service := range composeItem.Services {
+		envMap := make(map[string]string)
+		for _, env := range req.Env {
+			parts := strings.SplitN(env, "=", 2)
+			if len(parts) == 2 {
+				envMap[parts[0]] = parts[1]
+			}
+		}
+		newEnvVars := []string{}
+		if existingEnv, exists := service["environment"].([]interface{}); exists {
+			for _, env := range existingEnv {
+				envStr := env.(string)
+				parts := strings.SplitN(envStr, "=", 2)
+				if len(parts) == 2 {
+					key := parts[0]
+					if value, found := envMap[key]; found {
+						newEnvVars = append(newEnvVars, key+"="+value)
+						delete(envMap, key)
+					} else {
+						newEnvVars = append(newEnvVars, envStr)
+					}
+				}
+			}
+		}
+		for key, value := range envMap {
+			newEnvVars = append(newEnvVars, key+"="+value)
+		}
+		if len(newEnvVars) > 0 {
+			service["environment"] = newEnvVars
+		} else {
+			delete(service, "environment")
+		}
+		composeItem.Services[serviceName] = service
+	}
+	if composeItem.Networks != nil {
+		for key := range composeItem.Networks {
+			composeItem.Networks[key] = map[string]interface{}{}
+		}
+	}
+	newData, err := yaml.Marshal(&composeItem)
+	if err != nil {
+		return fmt.Errorf("failed to marshal docker-compose.yml: %v", err)
+	}
+	if err := ioutil.WriteFile(req.Path, newData, 0644); err != nil {
+		return fmt.Errorf("failed to write docker-compose.yml to path: %v", err)
+	}
+	return nil
+}
+
 func (u *ContainerService) ComposeUpdate(req dto.ComposeUpdate) error {
 	if cmd.CheckIllegal(req.Name, req.Path) {
 		return buserr.New(constant.ErrCmdIllegal)
@@ -222,16 +382,21 @@ func (u *ContainerService) ComposeUpdate(req dto.ComposeUpdate) error {
 	if err != nil {
 		return fmt.Errorf("load file with path %s failed, %v", req.Path, err)
 	}
-	file, err := os.OpenFile(req.Path, os.O_WRONLY|os.O_TRUNC, 0640)
-	if err != nil {
-		return err
+	if len(req.Env) > 0 {
+		if err := updateComposeWithEnv(req); err != nil {
+			return fmt.Errorf("failed to update docker-compose with env: %v", err)
+		}
+	} else {
+		file, err := os.OpenFile(req.Path, os.O_WRONLY|os.O_TRUNC, 0640)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		write := bufio.NewWriter(file)
+		_, _ = write.WriteString(req.Content)
+		write.Flush()
+		global.LOG.Infof("docker-compose.yml %s has been replaced", req.Path)
 	}
-	defer file.Close()
-	write := bufio.NewWriter(file)
-	_, _ = write.WriteString(req.Content)
-	write.Flush()
-
-	global.LOG.Infof("docker-compose.yml %s has been replaced, now start to docker-compose restart", req.Path)
 	if stdout, err := compose.Up(req.Path); err != nil {
 		if err := recreateCompose(string(oldFile), req.Path); err != nil {
 			return fmt.Errorf("update failed when handle compose up, err: %s, recreate failed: %v", string(stdout), err)

backend/app/service/container_volume.go

@@ -52,7 +52,7 @@ func (u *ContainerService) PageVolume(req dto.SearchWithPage) (int64, interface{
 		records = list.Volumes[start:end]
 	}
 
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	for _, item := range records {
 		tag := make([]string, 0)
 		for _, val := range item.Labels {

backend/app/service/cronjob_backup.go

@@ -17,15 +17,20 @@ import (
 
 func (u *CronjobService) handleApp(cronjob model.Cronjob, startTime time.Time) error {
 	var apps []model.AppInstall
-	if cronjob.AppID == "all" {
+	if strings.Contains(cronjob.AppID, "all") {
 		apps, _ = appInstallRepo.ListBy()
 	} else {
-		itemID, _ := strconv.Atoi(cronjob.AppID)
-		app, err := appInstallRepo.GetFirst(commonRepo.WithByID(uint(itemID)))
+		appIds := strings.Split(cronjob.AppID, ",")
+		var idItems []uint
+		for i := 0; i < len(appIds); i++ {
+			itemID, _ := strconv.Atoi(appIds[i])
+			idItems = append(idItems, uint(itemID))
+		}
+		appItems, err := appInstallRepo.ListBy(commonRepo.WithIdsIn(idItems))
 		if err != nil {
 			return err
 		}
-		apps = append(apps, app)
+		apps = appItems
 	}
 	accountMap, err := loadClientMap(cronjob.BackupAccounts)
 	if err != nil {
@@ -232,7 +237,7 @@ type databaseHelper struct {
 
 func loadDbsForJob(cronjob model.Cronjob) []databaseHelper {
 	var dbs []databaseHelper
-	if cronjob.DBName == "all" {
+	if strings.Contains(cronjob.DBName, "all") {
 		if cronjob.DBType == "mysql" || cronjob.DBType == "mariadb" {
 			mysqlItems, _ := mysqlRepo.List()
 			for _, mysql := range mysqlItems {
@@ -254,36 +259,42 @@ func loadDbsForJob(cronjob model.Cronjob) []databaseHelper {
 		}
 		return dbs
 	}
-	itemID, _ := strconv.Atoi(cronjob.DBName)
-	if cronjob.DBType == "mysql" || cronjob.DBType == "mariadb" {
-		mysqlItem, _ := mysqlRepo.Get(commonRepo.WithByID(uint(itemID)))
-		dbs = append(dbs, databaseHelper{
-			DBType:   cronjob.DBType,
-			Database: mysqlItem.MysqlName,
-			Name:     mysqlItem.Name,
-		})
-	} else {
-		pgItem, _ := postgresqlRepo.Get(commonRepo.WithByID(uint(itemID)))
-		dbs = append(dbs, databaseHelper{
-			DBType:   cronjob.DBType,
-			Database: pgItem.PostgresqlName,
-			Name:     pgItem.Name,
-		})
+
+	dbNames := strings.Split(cronjob.DBName, ",")
+	for _, name := range dbNames {
+		itemID, _ := strconv.Atoi(name)
+		if cronjob.DBType == "mysql" || cronjob.DBType == "mariadb" {
+			mysqlItem, _ := mysqlRepo.Get(commonRepo.WithByID(uint(itemID)))
+			dbs = append(dbs, databaseHelper{
+				DBType:   cronjob.DBType,
+				Database: mysqlItem.MysqlName,
+				Name:     mysqlItem.Name,
+			})
+		} else {
+			pgItem, _ := postgresqlRepo.Get(commonRepo.WithByID(uint(itemID)))
+			dbs = append(dbs, databaseHelper{
+				DBType:   cronjob.DBType,
+				Database: pgItem.PostgresqlName,
+				Name:     pgItem.Name,
+			})
+		}
 	}
 	return dbs
 }
 
 func loadWebsForJob(cronjob model.Cronjob) []model.Website {
 	var weblist []model.Website
-	if cronjob.Website == "all" {
+	if strings.Contains(cronjob.Website, "all") {
 		weblist, _ = websiteRepo.List()
 		return weblist
 	}
-	itemID, _ := strconv.Atoi(cronjob.Website)
-	webItem, _ := websiteRepo.GetFirst(commonRepo.WithByID(uint(itemID)))
-	if webItem.ID != 0 {
-		weblist = append(weblist, webItem)
+	websites := strings.Split(cronjob.Website, ",")
+	var idItems []uint
+	for i := 0; i < len(websites); i++ {
+		itemID, _ := strconv.Atoi(websites[i])
+		idItems = append(idItems, uint(itemID))
 	}
+	weblist, _ = websiteRepo.List(commonRepo.WithIdsIn(idItems))
 	return weblist
 }
 

backend/app/service/cronjob_helper.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	pathUtils "path"
 	"strings"
 	"time"
 
@@ -139,7 +140,6 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string, secret string)
 
 	excludes := strings.Split(exclusionRules, ",")
 	excludeRules := ""
-	excludes = append(excludes, "*.sock")
 	for _, exclude := range excludes {
 		if len(exclude) == 0 {
 			continue
@@ -162,10 +162,14 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string, secret string)
 
 	if len(secret) != 0 {
 		extraCmd := "| openssl enc -aes-256-cbc -salt -k '" + secret + "' -out"
-		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s %s", " -"+excludeRules, path, extraCmd, targetDir+"/"+name)
+		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read --exclude-from=<(find %s -type s -print) -zcf %s %s %s %s", sourceDir, " -"+excludeRules, path, extraCmd, targetDir+"/"+name)
 		global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******"))
 	} else {
-		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s", targetDir+"/"+name, excludeRules, path)
+		itemPrefix := pathUtils.Base(sourceDir)
+		if itemPrefix == "/" {
+			itemPrefix = ""
+		}
+		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read --exclude-from=<(find %s -type s -printf '%s' | sed 's|^|%s/|') -zcf %s %s %s", sourceDir, "%P\n", itemPrefix, targetDir+"/"+name, excludeRules, path)
 		global.LOG.Debug(commands)
 	}
 	stdout, err := cmd.ExecWithTimeOut(commands, 24*time.Hour)
@@ -239,7 +243,6 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t
 			_ = fileOp.WriteFile(srcErrorLogPath, strings.NewReader(""), 0755)
 		}
 		msg := i18n.GetMsgWithMap("CutWebsiteLogSuccess", map[string]interface{}{"name": website.PrimaryDomain, "path": dstFilePath})
-		global.LOG.Infof(msg)
 		msgs = append(msgs, msg)
 	}
 	u.removeExpiredLog(*cronjob)
@@ -326,7 +329,6 @@ func (u *CronjobService) uploadCronjobBackFile(cronjob model.Cronjob, accountMap
 }
 
 func (u *CronjobService) removeExpiredBackup(cronjob model.Cronjob, accountMap map[string]cronjobUploadHelper, record model.BackupRecord) {
-	global.LOG.Infof("start to handle remove expired, retain copies: %d", cronjob.RetainCopies)
 	var opts []repo.DBOption
 	opts = append(opts, commonRepo.WithByFrom("cronjob"))
 	opts = append(opts, backupRepo.WithByCronID(cronjob.ID))
@@ -361,7 +363,6 @@ func (u *CronjobService) removeExpiredBackup(cronjob model.Cronjob, accountMap m
 }
 
 func (u *CronjobService) removeExpiredLog(cronjob model.Cronjob) {
-	global.LOG.Infof("start to handle remove expired, retain copies: %d", cronjob.RetainCopies)
 	records, _ := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(cronjob.ID)), commonRepo.WithOrderBy("created_at desc"))
 	if len(records) <= int(cronjob.RetainCopies) {
 		return

backend/app/service/dashboard.go

@@ -3,13 +3,18 @@ package service
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/shirou/gopsutil/v3/load"
+	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/net"
+	network "net"
+	"os"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
-	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/copier"
@@ -17,9 +22,6 @@ import (
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/host"
-	"github.com/shirou/gopsutil/v3/load"
-	"github.com/shirou/gopsutil/v3/mem"
-	"github.com/shirou/gopsutil/v3/net"
 )
 
 type DashboardService struct{}
@@ -27,7 +29,7 @@ type DashboardService struct{}
 type IDashboardService interface {
 	LoadOsInfo() (*dto.OsInfo, error)
 	LoadBaseInfo(ioOption string, netOption string) (*dto.DashboardBase, error)
-	LoadCurrentInfo(ioOption string, netOption string) *dto.DashboardCurrent
+	LoadCurrentInfo(req dto.DashboardReq) *dto.DashboardCurrent
 
 	Restart(operation string) error
 }
@@ -94,11 +96,20 @@ func (u *DashboardService) LoadBaseInfo(ioOption string, netOption string) (*dto
 	baseInfo.KernelVersion = hostInfo.KernelVersion
 	ss, _ := json.Marshal(hostInfo)
 	baseInfo.VirtualizationSystem = string(ss)
-
+	baseInfo.IpV4Addr = GetOutboundIP()
+	httpProxy := os.Getenv("http_proxy")
+	if httpProxy == "" {
+		httpProxy = os.Getenv("HTTP_PROXY")
+	}
+	if httpProxy != "" {
+		baseInfo.SystemProxy = httpProxy
+	}
+	baseInfo.SystemProxy = "noProxy"
 	appInstall, err := appInstallRepo.ListBy()
 	if err != nil {
 		return nil, err
 	}
+
 	baseInfo.AppInstalledNumber = len(appInstall)
 	postgresqlDbs, err := postgresqlRepo.List()
 	if err != nil {
@@ -128,78 +139,88 @@ func (u *DashboardService) LoadBaseInfo(ioOption string, netOption string) (*dto
 	baseInfo.CPUCores, _ = cpu.Counts(false)
 	baseInfo.CPULogicalCores, _ = cpu.Counts(true)
 
-	baseInfo.CurrentInfo = *u.LoadCurrentInfo(ioOption, netOption)
+	baseInfo.CurrentInfo = *u.LoadCurrentInfo(dto.DashboardReq{
+		Scope:     "ioNet",
+		IoOption:  ioOption,
+		NetOption: netOption,
+	})
 	return &baseInfo, nil
 }
 
-func (u *DashboardService) LoadCurrentInfo(ioOption string, netOption string) *dto.DashboardCurrent {
+func (u *DashboardService) LoadCurrentInfo(req dto.DashboardReq) *dto.DashboardCurrent {
 	var currentInfo dto.DashboardCurrent
+	if req.Scope == "gpu" {
+		currentInfo.GPUData = loadGPUInfo()
+		currentInfo.XPUData = loadXpuInfo()
+	}
+
 	hostInfo, _ := host.Info()
 	currentInfo.Uptime = hostInfo.Uptime
-	currentInfo.TimeSinceUptime = time.Now().Add(-time.Duration(hostInfo.Uptime) * time.Second).Format(constant.DateTimeLayout)
-	currentInfo.Procs = hostInfo.Procs
-
-	currentInfo.CPUTotal, _ = cpu.Counts(true)
-	totalPercent, _ := cpu.Percent(0, false)
-	if len(totalPercent) == 1 {
-		currentInfo.CPUUsedPercent = totalPercent[0]
-		currentInfo.CPUUsed = currentInfo.CPUUsedPercent * 0.01 * float64(currentInfo.CPUTotal)
-	}
-	currentInfo.CPUPercent, _ = cpu.Percent(0, true)
-
-	loadInfo, _ := load.Avg()
-	currentInfo.Load1 = loadInfo.Load1
-	currentInfo.Load5 = loadInfo.Load5
-	currentInfo.Load15 = loadInfo.Load15
-	currentInfo.LoadUsagePercent = loadInfo.Load1 / (float64(currentInfo.CPUTotal*2) * 0.75) * 100
-
-	memoryInfo, _ := mem.VirtualMemory()
-	currentInfo.MemoryTotal = memoryInfo.Total
-	currentInfo.MemoryAvailable = memoryInfo.Available
-	currentInfo.MemoryUsed = memoryInfo.Used
-	currentInfo.MemoryUsedPercent = memoryInfo.UsedPercent
-
-	swapInfo, _ := mem.SwapMemory()
-	currentInfo.SwapMemoryTotal = swapInfo.Total
-	currentInfo.SwapMemoryAvailable = swapInfo.Free
-	currentInfo.SwapMemoryUsed = swapInfo.Used
-	currentInfo.SwapMemoryUsedPercent = swapInfo.UsedPercent
-
-	currentInfo.DiskData = loadDiskInfo()
-	currentInfo.GPUData = loadGPUInfo()
-
-	if ioOption == "all" {
-		diskInfo, _ := disk.IOCounters()
-		for _, state := range diskInfo {
-			currentInfo.IOReadBytes += state.ReadBytes
-			currentInfo.IOWriteBytes += state.WriteBytes
-			currentInfo.IOCount += (state.ReadCount + state.WriteCount)
-			currentInfo.IOReadTime += state.ReadTime
-			currentInfo.IOWriteTime += state.WriteTime
-		}
-	} else {
-		diskInfo, _ := disk.IOCounters(ioOption)
-		for _, state := range diskInfo {
-			currentInfo.IOReadBytes += state.ReadBytes
-			currentInfo.IOWriteBytes += state.WriteBytes
-			currentInfo.IOCount += (state.ReadCount + state.WriteCount)
-			currentInfo.IOReadTime += state.ReadTime
-			currentInfo.IOWriteTime += state.WriteTime
+	if req.Scope == "basic" {
+		currentInfo.TimeSinceUptime = time.Now().Add(-time.Duration(hostInfo.Uptime) * time.Second).Format(constant.DateTimeLayout)
+		currentInfo.Procs = hostInfo.Procs
+		currentInfo.CPUTotal, _ = cpu.Counts(true)
+		totalPercent, _ := cpu.Percent(100*time.Millisecond, false)
+		if len(totalPercent) == 1 {
+			currentInfo.CPUUsedPercent = totalPercent[0]
+			currentInfo.CPUUsed = currentInfo.CPUUsedPercent * 0.01 * float64(currentInfo.CPUTotal)
 		}
+		currentInfo.CPUPercent, _ = cpu.Percent(100*time.Millisecond, true)
+
+		loadInfo, _ := load.Avg()
+		currentInfo.Load1 = loadInfo.Load1
+		currentInfo.Load5 = loadInfo.Load5
+		currentInfo.Load15 = loadInfo.Load15
+		currentInfo.LoadUsagePercent = loadInfo.Load1 / (float64(currentInfo.CPUTotal*2) * 0.75) * 100
+
+		memoryInfo, _ := mem.VirtualMemory()
+		currentInfo.MemoryTotal = memoryInfo.Total
+		currentInfo.MemoryAvailable = memoryInfo.Available
+		currentInfo.MemoryUsed = memoryInfo.Used
+		currentInfo.MemoryUsedPercent = memoryInfo.UsedPercent
+
+		swapInfo, _ := mem.SwapMemory()
+		currentInfo.SwapMemoryTotal = swapInfo.Total
+		currentInfo.SwapMemoryAvailable = swapInfo.Free
+		currentInfo.SwapMemoryUsed = swapInfo.Used
+		currentInfo.SwapMemoryUsedPercent = swapInfo.UsedPercent
+		currentInfo.DiskData = loadDiskInfo()
 	}
 
-	if netOption == "all" {
-		netInfo, _ := net.IOCounters(false)
-		if len(netInfo) != 0 {
-			currentInfo.NetBytesSent = netInfo[0].BytesSent
-			currentInfo.NetBytesRecv = netInfo[0].BytesRecv
+	if req.Scope == "ioNet" {
+		if req.IoOption == "all" {
+			diskInfo, _ := disk.IOCounters()
+			for _, state := range diskInfo {
+				currentInfo.IOReadBytes += state.ReadBytes
+				currentInfo.IOWriteBytes += state.WriteBytes
+				currentInfo.IOCount += (state.ReadCount + state.WriteCount)
+				currentInfo.IOReadTime += state.ReadTime
+				currentInfo.IOWriteTime += state.WriteTime
+			}
+		} else {
+			diskInfo, _ := disk.IOCounters(req.IoOption)
+			for _, state := range diskInfo {
+				currentInfo.IOReadBytes += state.ReadBytes
+				currentInfo.IOWriteBytes += state.WriteBytes
+				currentInfo.IOCount += (state.ReadCount + state.WriteCount)
+				currentInfo.IOReadTime += state.ReadTime
+				currentInfo.IOWriteTime += state.WriteTime
+			}
 		}
-	} else {
-		netInfo, _ := net.IOCounters(true)
-		for _, state := range netInfo {
-			if state.Name == netOption {
-				currentInfo.NetBytesSent = state.BytesSent
-				currentInfo.NetBytesRecv = state.BytesRecv
+
+		if req.NetOption == "all" {
+			netInfo, _ := net.IOCounters(false)
+			if len(netInfo) != 0 {
+				currentInfo.NetBytesSent = netInfo[0].BytesSent
+				currentInfo.NetBytesRecv = netInfo[0].BytesRecv
+			}
+		} else {
+			netInfo, _ := net.IOCounters(true)
+			for _, state := range netInfo {
+				if state.Name == req.NetOption {
+					currentInfo.NetBytesSent = state.BytesSent
+					currentInfo.NetBytesRecv = state.BytesRecv
+				}
 			}
 		}
 	}
@@ -208,6 +229,18 @@ func (u *DashboardService) LoadCurrentInfo(ioOption string, netOption string) *d
 	return &currentInfo
 }
 
+func GetOutboundIP() string {
+	conn, err := network.Dial("udp", "8.8.8.8:80")
+
+	if err != nil {
+		return "IPNotFound"
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*network.UDPAddr)
+	return localAddr.IP.String()
+}
+
 type diskInfo struct {
 	Type   string
 	Mount  string
@@ -323,3 +356,19 @@ func loadGPUInfo() []dto.GPUInfo {
 	}
 	return data
 }
+
+func loadXpuInfo() []dto.XPUInfo {
+	list := xpack.LoadXpuInfo()
+	if len(list) == 0 {
+		return nil
+	}
+	var data []dto.XPUInfo
+	for _, gpu := range list {
+		var dataItem dto.XPUInfo
+		if err := copier.Copy(&dataItem, &gpu); err != nil {
+			continue
+		}
+		data = append(data, dataItem)
+	}
+	return data
+}

backend/app/service/database_mysql.go

@@ -141,6 +141,10 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
 }
 
 func (u *MysqlService) BindUser(req dto.BindUser) error {
+	if cmd.CheckIllegal(req.Username, req.Password, req.Permission) {
+		return buserr.New(constant.ErrCmdIllegal)
+	}
+
 	dbItem, err := mysqlRepo.Get(mysqlRepo.WithByMysqlName(req.Database), commonRepo.WithByName(req.DB))
 	if err != nil {
 		return err
@@ -533,7 +537,10 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
 	info.Position = "OFF"
 	rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
 	if err != nil {
-		return nil, err
+		rows, err = executeSqlForRows(app.ContainerName, app.Key, app.Password, "SHOW BINARY LOG STATUS;")
+		if err != nil {
+			return nil, err
+		}
 	}
 	if len(rows) > 2 {
 		itemValue := strings.Split(rows[1], "\t")

backend/app/service/docker.go

@@ -10,8 +10,10 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/constant"
+	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"github.com/1Panel-dev/1Panel/backend/utils/docker"
+	"github.com/1Panel-dev/1Panel/backend/utils/systemctl"
 	"github.com/pkg/errors"
 )
 
@@ -198,6 +200,10 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error {
 	}
 	if len(daemonMap) == 0 {
 		_ = os.Remove(constant.DaemonJsonPath)
+		stdout, err := cmd.Exec("systemctl restart docker")
+		if err != nil {
+			return errors.New(string(stdout))
+		}
 		return nil
 	}
 	newJson, err := json.MarshalIndent(daemonMap, "", "\t")
@@ -304,6 +310,10 @@ func (u *DockerService) UpdateIpv6Option(req dto.Ipv6Option) error {
 func (u *DockerService) UpdateConfByFile(req dto.DaemonJsonUpdateByFile) error {
 	if len(req.File) == 0 {
 		_ = os.Remove(constant.DaemonJsonPath)
+		stdout, err := cmd.Exec("systemctl restart docker")
+		if err != nil {
+			return errors.New(string(stdout))
+		}
 		return nil
 	}
 	err := createIfNotExistDaemonJsonFile()
@@ -328,8 +338,15 @@ func (u *DockerService) UpdateConfByFile(req dto.DaemonJsonUpdateByFile) error {
 
 func (u *DockerService) OperateDocker(req dto.DockerOperation) error {
 	service := "docker"
+	sudo := cmd.SudoHandleCmd()
 	if req.Operation == "stop" {
-		service = "docker.socket"
+		isSocketActive, _ := systemctl.IsActive("docker.socket")
+		if isSocketActive {
+			std, err := cmd.Execf("%s systemctl stop docker.socket", sudo)
+			if err != nil {
+				global.LOG.Errorf("handle systemctl stop docker.socket failed, err: %v", std)
+			}
+		}
 	}
 	stdout, err := cmd.Execf("systemctl %s %s ", req.Operation, service)
 	if err != nil {

backend/app/service/file.go

@@ -62,9 +62,13 @@ func NewIFileService() IFileService {
 
 func (f *FileService) GetFileList(op request.FileOption) (response.FileInfo, error) {
 	var fileInfo response.FileInfo
-	if _, err := os.Stat(op.Path); err != nil && os.IsNotExist(err) {
+	data, err := os.Stat(op.Path)
+	if err != nil && os.IsNotExist(err) {
 		return fileInfo, nil
 	}
+	if !data.IsDir() {
+		op.FileOption.Path = filepath.Dir(op.FileOption.Path)
+	}
 	info, err := files.NewFileInfo(op.FileOption)
 	if err != nil {
 		return fileInfo, err
@@ -141,7 +145,7 @@ func shouldFilterPath(path string) bool {
 func (f *FileService) buildFileTree(node *response.FileTree, items []*files.FileInfo, op request.FileOption, level int) error {
 	for _, v := range items {
 		if shouldFilterPath(v.Path) {
-			global.LOG.Info("File Tree: Skipping %s due to filter\n", v.Path)
+			global.LOG.Infof("File Tree: Skipping %s due to filter\n", v.Path)
 			continue
 		}
 		childNode := response.FileTree{
@@ -167,7 +171,7 @@ func (f *FileService) buildChildNode(childNode *response.FileTree, fileInfo *fil
 	subInfo, err := files.NewFileInfo(op.FileOption)
 	if err != nil {
 		if os.IsPermission(err) || errors.Is(err, unix.EACCES) {
-			global.LOG.Info("File Tree: Skipping %s due to permission denied\n", fileInfo.Path)
+			global.LOG.Infof("File Tree: Skipping %s due to permission denied\n", fileInfo.Path)
 			return nil
 		}
 		global.LOG.Errorf("File Tree: Skipping %s due to error: %s\n", fileInfo.Path, err.Error())
@@ -474,11 +478,20 @@ func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.Fi
 	if err != nil {
 		return nil, err
 	}
+	if req.Latest && req.Page == 1 && len(lines) < 1000 && total > 1 {
+		preLines, _, _, err := files.ReadFileByLine(logFilePath, total-1, req.PageSize, false)
+		if err != nil {
+			return nil, err
+		}
+		lines = append(preLines, lines...)
+	}
+
 	res := &response.FileLineContent{
 		Content: strings.Join(lines, "\n"),
 		End:     isEndOfFile,
 		Path:    logFilePath,
 		Total:   total,
+		Lines:   lines,
 	}
 	return res, nil
 }

backend/app/service/firewall.go

@@ -588,14 +588,6 @@ func (u *FirewallService) addPortsBeforeStart(client firewall.FirewallClient) er
 	if err := client.Port(fireClient.FireInfo{Port: "443", Protocol: "tcp", Strategy: "accept"}, "add"); err != nil {
 		return err
 	}
-	apps := u.loadPortByApp()
-	for _, app := range apps {
-		if len(app.HttpPort) != 0 && app.HttpPort != "0" {
-			if err := client.Port(fireClient.FireInfo{Port: app.HttpPort, Protocol: "tcp", Strategy: "accept"}, "add"); err != nil {
-				return err
-			}
-		}
-	}
 
 	return client.Reload()
 }

backend/app/service/image.go

@@ -286,7 +286,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		authStr := base64.URLEncoding.EncodeToString(encodedJSON)
+		authStr := base64.StdEncoding.EncodeToString(encodedJSON)
 		options.RegistryAuth = authStr
 	}
 	image := repo.DownloadUrl + "/" + req.ImageName
@@ -295,7 +295,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
 		out, err := client.ImagePull(context.TODO(), image, options)
 		if err != nil {
 			_, _ = file.WriteString("image pull failed!")
-			global.LOG.Errorf("image %s pull failed, err: %v", image, err)
+			_, _ = file.WriteString(fmt.Sprintf("image %s pull failed, err: %v", image, err))
 			return
 		}
 		defer out.Close()

backend/app/service/monitor.go

@@ -201,16 +201,19 @@ func StartMonitor(removeBefore bool, interval string) error {
 	service := NewIMonitorService()
 	ctx, cancel := context.WithCancel(context.Background())
 	monitorCancel = cancel
-	monitorID, err := global.Cron.AddJob(fmt.Sprintf("@every %sm", interval), service)
-	if err != nil {
-		return err
-	}
-
+	now := time.Now()
+	nextMinute := now.Truncate(time.Minute).Add(time.Minute)
+	time.AfterFunc(time.Until(nextMinute), func() {
+		monitorID, err := global.Cron.AddJob(fmt.Sprintf("@every %sm", interval), service)
+		if err != nil {
+			return
+		}
+		global.MonitorCronID = monitorID
+	})
 	service.Run()
 
 	go service.saveIODataToDB(ctx, float64(intervalItem))
 	go service.saveNetDataToDB(ctx, float64(intervalItem))
 
-	global.MonitorCronID = monitorID
 	return nil
 }

backend/app/service/snapshot.go

@@ -27,7 +27,7 @@ type SnapshotService struct {
 }
 
 type ISnapshotService interface {
-	SearchWithPage(req dto.SearchWithPage) (int64, interface{}, error)
+	SearchWithPage(req dto.PageSnapshot) (int64, interface{}, error)
 	SnapshotCreate(req dto.SnapshotCreate) error
 	SnapshotRecover(req dto.SnapshotRecover) error
 	SnapshotRollback(req dto.SnapshotRecover) error
@@ -46,8 +46,11 @@ func NewISnapshotService() ISnapshotService {
 	return &SnapshotService{}
 }
 
-func (u *SnapshotService) SearchWithPage(req dto.SearchWithPage) (int64, interface{}, error) {
-	total, systemBackups, err := snapshotRepo.Page(req.Page, req.PageSize, commonRepo.WithLikeName(req.Info))
+func (u *SnapshotService) SearchWithPage(req dto.PageSnapshot) (int64, interface{}, error) {
+	total, systemBackups, err := snapshotRepo.Page(req.Page, req.PageSize, commonRepo.WithLikeName(req.Info), commonRepo.WithOrderRuleBy(req.OrderBy, req.Order))
+	if err != nil {
+		return 0, nil, err
+	}
 	dtoSnap, err := loadSnapSize(systemBackups)
 	if err != nil {
 		return 0, nil, err

backend/app/service/snapshot_create.go

@@ -231,7 +231,6 @@ func handleSnapTar(sourceDir, targetDir, name, exclusionRules string, secret str
 	exMap := make(map[string]struct{})
 	exStr := ""
 	excludes := strings.Split(exclusionRules, ";")
-	excludes = append(excludes, "*.sock")
 	for _, exclude := range excludes {
 		if len(exclude) == 0 {
 			continue
@@ -257,10 +256,10 @@ func handleSnapTar(sourceDir, targetDir, name, exclusionRules string, secret str
 	commands := ""
 	if len(secret) != 0 {
 		extraCmd := "| openssl enc -aes-256-cbc -salt -k '" + secret + "' -out"
-		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s %s", " -"+exStr, path, extraCmd, targetDir+"/"+name)
+		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read --exclude-from=<(find %s -type s -print) -zcf %s %s %s %s", sourceDir, " -"+exStr, path, extraCmd, targetDir+"/"+name)
 		global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******"))
 	} else {
-		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s -C %s .", targetDir+"/"+name, exStr, sourceDir)
+		commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read --exclude-from=<(find %s -type s -printf '%s' | sed 's|^|./|') -zcf %s %s -C %s .", sourceDir, "%P\n", targetDir+"/"+name, exStr, sourceDir)
 		global.LOG.Debug(commands)
 	}
 	stdout, err := cmd.ExecWithTimeOut(commands, 30*time.Minute)

backend/app/service/snapshot_recover.go

@@ -47,7 +47,7 @@ func (u *SnapshotService) HandleSnapshotRecover(snap model.Snapshot, isRecover b
 			req.IsNew = true
 		}
 		if req.IsNew || snap.InterruptStep == "Backup" {
-			if err := backupBeforeRecover(snap, ""); err != nil {
+			if err := backupBeforeRecover(snap); err != nil {
 				updateRecoverStatus(snap.ID, isRecover, "Backup", constant.StatusFailed, fmt.Sprintf("handle backup before recover failed, err: %v", err))
 				return
 			}
@@ -149,7 +149,7 @@ func (u *SnapshotService) HandleSnapshotRecover(snap model.Snapshot, isRecover b
 	_, _ = cmd.Exec("systemctl daemon-reload && systemctl restart 1panel.service")
 }
 
-func backupBeforeRecover(snap model.Snapshot, secret string) error {
+func backupBeforeRecover(snap model.Snapshot) error {
 	baseDir := fmt.Sprintf("%s/1panel_original/original_%s", global.CONF.System.BaseDir, snap.Name)
 	var wg sync.WaitGroup
 	var status model.SnapshotStatus

backend/app/service/ssh.go

@@ -124,6 +124,16 @@ func (u *SSHService) OperateSSH(operation string) error {
 	if operation == "enable" || operation == "disable" {
 		serviceName += ".service"
 	}
+	if operation == "stop" {
+		isSocketActive, _ := systemctl.IsActive(serviceName + ".socket")
+		if isSocketActive {
+			std, err := cmd.Execf("%s systemctl stop %s", sudo, serviceName+".socket")
+			if err != nil {
+				global.LOG.Errorf("handle systemctl stop %s.socket failed, err: %v", serviceName, std)
+			}
+		}
+	}
+
 	stdout, err := cmd.Execf("%s systemctl %s %s", sudo, operation, serviceName)
 	if err != nil {
 		if strings.Contains(stdout, "alias name or linked unit file") {
@@ -312,7 +322,7 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 
 	showCountFrom := (req.Page - 1) * req.PageSize
 	showCountTo := req.Page * req.PageSize
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	qqWry, err := qqwry.NewQQwry()
 	if err != nil {
 		global.LOG.Errorf("load qqwry datas failed: %s", err)

backend/app/service/website.go

@@ -9,6 +9,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
+	"github.com/1Panel-dev/1Panel/backend/utils/docker"
 	"os"
 	"path"
 	"reflect"
@@ -139,8 +140,10 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 	}
 	for _, web := range websites {
 		var (
-			appName     string
-			runtimeName string
+			appName      string
+			runtimeName  string
+			runtimeType  string
+			appInstallID uint
 		)
 		switch web.Type {
 		case constant.Deployment:
@@ -149,12 +152,15 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 				return 0, nil, err
 			}
 			appName = appInstall.Name
+			appInstallID = appInstall.ID
 		case constant.Runtime:
 			runtime, err := runtimeRepo.GetFirst(commonRepo.WithByID(web.RuntimeID))
 			if err != nil {
 				return 0, nil, err
 			}
 			runtimeName = runtime.Name
+			runtimeType = runtime.Type
+			appInstallID = runtime.ID
 		}
 		sitePath := path.Join(constant.AppInstallDir, constant.AppOpenresty, nginxInstall.Name, "www", "sites", web.Alias)
 
@@ -173,6 +179,8 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 			SSLStatus:     checkSSLStatus(web.WebsiteSSL.ExpireDate),
 			RuntimeName:   runtimeName,
 			SitePath:      sitePath,
+			AppInstallID:  appInstallID,
+			RuntimeType:   runtimeType,
 		})
 	}
 	return total, websiteDTOs, nil
@@ -305,6 +313,14 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
 		switch runtime.Type {
 		case constant.RuntimePHP:
 			if runtime.Resource == constant.ResourceAppstore {
+				client, err := docker.NewDockerClient()
+				if err != nil {
+					return err
+				}
+				defer client.Close()
+				if !checkImageExist(client, runtime.Image) {
+					return buserr.WithName("ErrImageNotExist", runtime.Name)
+				}
 				var (
 					req     request.AppInstallCreate
 					install *model.AppInstall
@@ -471,7 +487,9 @@ func (w WebsiteService) DeleteWebsite(req request.WebsiteDelete) error {
 	tx, ctx := helper.GetTxAndContext()
 	defer tx.Rollback()
 
-	go NewIBackupService().DeleteRecordByName("website", website.PrimaryDomain, website.Alias, req.DeleteBackup)
+	go func() {
+		_ = NewIBackupService().DeleteRecordByName("website", website.PrimaryDomain, website.Alias, req.DeleteBackup)
+	}()
 	if err := websiteRepo.DeleteBy(ctx, commonRepo.WithByID(req.ID)); err != nil {
 		return err
 	}
@@ -623,8 +641,10 @@ func (w WebsiteService) DeleteWebsiteDomain(domainId uint) error {
 				wafSite := wafWebsite
 				oldDomains := wafSite.Domains
 				var newDomains []string
+				removed := false
 				for _, domain := range oldDomains {
-					if domain == webSiteDomain.Domain {
+					if domain == webSiteDomain.Domain && !removed {
+						removed = true
 						continue
 					}
 					newDomains = append(newDomains, domain)
@@ -910,6 +930,7 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH
 		websiteSSL.Provider = constant.Manual
 		websiteSSL.PrivateKey = privateKey
 		websiteSSL.Pem = certificate
+		websiteSSL.Status = constant.SSLReady
 
 		res.SSL = websiteSSL
 	}

backend/app/service/website_ca.go

@@ -432,14 +432,14 @@ func (w WebsiteCAService) DownloadFile(id uint) (*os.File, error) {
 	if err = fileOp.CreateDir(dir, 0666); err != nil {
 		return nil, err
 	}
-	if err = fileOp.WriteFile(path.Join(dir, "ca.csr"), strings.NewReader(ca.CSR), 0644); err != nil {
+	if err = fileOp.WriteFile(path.Join(dir, "ca.crt"), strings.NewReader(ca.CSR), 0644); err != nil {
 		return nil, err
 	}
-	if err = fileOp.WriteFile(path.Join(dir, "private.key"), strings.NewReader(ca.PrivateKey), 0644); err != nil {
+	if err = fileOp.WriteFile(path.Join(dir, "ca.key"), strings.NewReader(ca.PrivateKey), 0644); err != nil {
 		return nil, err
 	}
 	fileName := ca.Name + ".zip"
-	if err = fileOp.Compress([]string{path.Join(dir, "ca.csr"), path.Join(dir, "private.key")}, dir, fileName, files.SdkZip, ""); err != nil {
+	if err = fileOp.Compress([]string{path.Join(dir, "ca.crt"), path.Join(dir, "ca.key")}, dir, fileName, files.SdkZip, ""); err != nil {
 		return nil, err
 	}
 	return os.Open(path.Join(dir, fileName))

backend/constant/alert.go

@@ -0,0 +1,11 @@
+package constant
+
+const (
+	AlertEnable      = "Enable"
+	AlertDisable     = "Disable"
+	AlertSuccess     = "Success"
+	AlertError       = "Error"
+	AlertSyncError   = "SyncError"
+	AlertPushError   = "PushError"
+	AlertPushSuccess = "PushSuccess"
+)

backend/constant/errs.go

@@ -95,7 +95,7 @@ var (
 	ErrPathNotFound     = "ErrPathNotFound"
 	ErrMovePathFailed   = "ErrMovePathFailed"
 	ErrLinkPathNotFound = "ErrLinkPathNotFound"
-	ErrFileIsExist       = "ErrFileIsExist"
+	ErrFileIsExist      = "ErrFileIsExist"
 	ErrFileUpload       = "ErrFileUpload"
 	ErrFileDownloadDir  = "ErrFileDownloadDir"
 	ErrCmdNotFound      = "ErrCmdNotFound"
@@ -162,3 +162,12 @@ var (
 	ErrLicenseSave  = "ErrLicenseSave"
 	ErrLicenseSync  = "ErrLicenseSync"
 )
+
+// alert
+var (
+	ErrAlert       = "ErrAlert"
+	ErrAlertPush   = "ErrAlertPush"
+	ErrAlertSave   = "ErrAlertSave"
+	ErrAlertSync   = "ErrAlertSync"
+	ErrAlertRemote = "ErrAlertRemote"
+)

backend/cron/cron.go

@@ -17,14 +17,14 @@ import (
 )
 
 func Run() {
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	global.Cron = cron.New(cron.WithLocation(nyc), cron.WithChain(cron.Recover(cron.DefaultLogger)), cron.WithChain(cron.DelayIfStillRunning(cron.DefaultLogger)))
 
 	var (
 		interval model.Setting
 		status   model.Setting
 	)
-	syncBeforeStart()
+	go syncBeforeStart()
 	if err := global.DB.Where("key = ?", "MonitorStatus").Find(&status).Error; err != nil {
 		global.LOG.Errorf("load monitor status from db failed, err: %v", err)
 	}

backend/cron/job/ssl.go

@@ -1,6 +1,10 @@
 package job
 
 import (
+	"path"
+	"strings"
+	"time"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/repo"
 	"github.com/1Panel-dev/1Panel/backend/app/service"
@@ -8,9 +12,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
-	"path"
-	"strings"
-	"time"
 )
 
 type ssl struct {
@@ -25,7 +26,7 @@ func (ssl *ssl) Run() {
 	sslRepo := repo.NewISSLRepo()
 	sslService := service.NewIWebsiteSSLService()
 	sslList, _ := sslRepo.List()
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	global.LOG.Info("The scheduled certificate update task is currently in progress ...")
 	now := time.Now().Add(10 * time.Second)
 	for _, s := range sslList {

backend/cron/job/website.go

@@ -1,6 +1,9 @@
 package job
 
 import (
+	"sync"
+	"time"
+
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
 	"github.com/1Panel-dev/1Panel/backend/app/repo"
@@ -8,8 +11,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
-	"sync"
-	"time"
 )
 
 type website struct{}
@@ -19,7 +20,7 @@ func NewWebsiteJob() *website {
 }
 
 func (w *website) Run() {
-	nyc, _ := time.LoadLocation(common.LoadTimeZone())
+	nyc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 	websites, _ := repo.NewIWebsiteRepo().List()
 	global.LOG.Info("Website scheduled task in progress ...")
 	now := time.Now().Add(10 * time.Minute)

backend/i18n/lang/en.yaml

@@ -94,6 +94,7 @@ ErrPathPermission: 'A folder with non-1000:1000 permissions was detected in the
 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"
+ErrImageNotExist: "Running environment {{.name}} image does not exist, please re-edit the running environment"
 
 #ssl
 ErrSSLCannotDelete: "The certificate {{ .name }} is being used by the website and cannot be removed"
@@ -196,3 +197,11 @@ ErrLicenseSync: "Failed to sync license information, no license information dete
 ErrXpackNotFound: "This section is a professional edition feature, please import the license first in Panel Settings-License interface"
 ErrXpackNotActive: "This section is a professional edition feature, please synchronize the license status first in Panel Settings-License interface"
 ErrXpackOutOfDate: "The current license has expired, please re-import the license in Panel Settings-License interface"
+
+
+#license
+ErrAlert: "Alert information format error, please check and try again!"
+ErrAlertPush: "Alert push error, please check and try again!"
+ErrAlertSave: "Alert save error, please check and try again!"
+ErrAlertSync: "Alert sync error, please check and try again!"
+ErrAlertRemote: "Remote alert error, please check and try again!"

backend/i18n/lang/zh-Hant.yaml

@@ -94,6 +94,7 @@ ErrPathPermission: 'index 目錄下偵測到非 1000:1000 權限資料夾，可
 ErrDomainIsUsed: "域名已被網站【{{ .name }}】使用"
 ErrDomainFormat: "{{ .name }} 域名格式不正確"
 ErrDefaultAlias: "default 為保留代號，請使用其他代號"
+ErrImageNotExist: "執行環境 {{.name}} 鏡像不存在，請重新編輯執行環境"
 
 #ssl
 ErrSSLCannotDelete: "{{ .name }} 證書正在被網站使用，無法刪除"
@@ -198,3 +199,10 @@ ErrLicenseSync: "許可證信息同步失敗，資料庫中未檢測到許可證
 ErrXpackNotFound: "該部分為專業版功能，請先在 面板設置-許可證 界面導入許可證"
 ErrXpackNotActive: "該部分為專業版功能，請先在 面板設置-許可證 界面同步許可證狀態"
 ErrXpackOutOfDate: "當前許可證已過期，請重新在 面板設置-許可證 界面導入許可證"
+
+#license
+ErrAlert: "告警資訊格式錯誤，請檢查後重試！"
+ErrAlertPush: "告警資訊推送錯誤，請檢查後重試！"
+ErrAlertSave: "告警資訊保存錯誤，請檢查後重試！"
+ErrAlertSync: "告警資訊同步錯誤，請檢查後重試！"
+ErrAlertRemote: "告警資訊遠端錯誤，請檢查後重試！"

backend/i18n/lang/zh.yaml

@@ -94,6 +94,7 @@ ErrPathPermission: 'index 目录下检测到非 1000:1000 权限文件夹，可
 ErrDomainIsUsed: "域名已被网站【{{ .name }}】使用"
 ErrDomainFormat: "{{ .name }} 域名格式不正确"
 ErrDefaultAlias: "default 为保留代号，请使用其他代号"
+ErrImageNotExist: "运行环境 {{.name}} 镜像不存在，请重新编辑运行环境"
 
 #ssl
 ErrSSLCannotDelete: "{{ .name }} 证书正在被网站使用，无法删除"
@@ -200,3 +201,10 @@ ErrXpackNotFound: "该部分为专业版功能，请先在 面板设置-许可
 ErrXpackNotActive: "该部分为专业版功能，请先在 面板设置-许可证 界面同步许可证状态"
 ErrXpackOutOfDate: "当前许可证已过期，请重新在 面板设置-许可证 界面导入许可证"
 
+#license
+ErrAlert: "告警信息格式错误，请检查后重试！"
+ErrAlertPush: "告警信息推送错误，请检查后重试！"
+ErrAlertSave: "告警信息保存错误，请检查后重试！"
+ErrAlertSync: "告警信息同步错误，请检查后重试！"
+ErrAlertRemote: "告警信息远端错误，请检查后重试！"
+

backend/init/cache/cache.go

@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"os"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/global"
@@ -10,7 +11,8 @@ import (
 
 func Init() {
 	c := global.CONF.System.Cache
-
+	_ = os.RemoveAll(c)
+	_ = os.Mkdir(c, 0755)
 	options := badger.Options{
 		Dir:                c,
 		ValueDir:           c,

backend/init/migration/migrate.go

@@ -93,6 +93,8 @@ func Init() {
 		migrations.AddShellColumn,
 		migrations.AddClam,
 		migrations.AddClamStatus,
+		migrations.AddAlertMenu,
+		migrations.AddComposeColumn,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)

backend/init/migration/migrations/v_1_10.go

@@ -288,3 +288,39 @@ var AddClamStatus = &gormigrate.Migration{
 		return nil
 	},
 }
+
+var AddAlertMenu = &gormigrate.Migration{
+	ID: "20240706-update-xpack-hide-menu",
+	Migrate: func(tx *gorm.DB) error {
+		var (
+			setting model.Setting
+			menu    dto.XpackHideMenu
+		)
+		tx.Model(&model.Setting{}).Where("key", "XpackHideMenu").First(&setting)
+		if err := json.Unmarshal([]byte(setting.Value), &menu); err != nil {
+			return err
+		}
+		menu.Children = append(menu.Children, dto.XpackHideMenu{
+			ID:      "7",
+			Title:   "xpack.alert.alert",
+			Path:    "/xpack/alert/dashboard",
+			Label:   "XAlertDashboard",
+			IsCheck: true,
+		})
+		data, err := json.Marshal(menu)
+		if err != nil {
+			return err
+		}
+		return tx.Model(&model.Setting{}).Where("key", "XpackHideMenu").Updates(map[string]interface{}{"value": string(data)}).Error
+	},
+}
+
+var AddComposeColumn = &gormigrate.Migration{
+	ID: "20240906-add-compose-command",
+	Migrate: func(tx *gorm.DB) error {
+		if err := tx.AutoMigrate(&model.Compose{}); err != nil {
+			return err
+		}
+		return nil
+	},
+}

backend/middleware/demo_handle.go

@@ -19,6 +19,7 @@ var whiteUrlList = map[string]struct{}{
 	"/api/v1/logs/operation":      {},
 	"/api/v1/logs/login":          {},
 	"/api/v1/auth/logout":         {},
+	"/api/v1/dashboard/current":   {},
 
 	"/api/v1/apps/installed/loadport": {},
 	"/api/v1/apps/installed/check":    {},

backend/middleware/operation.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"reflect"
 	"strings"
 	"time"
 
@@ -96,10 +97,11 @@ func OperationLog() gin.HandlerFunc {
 					if funcs.InputValue == key {
 						var names []string
 						if funcs.IsList {
-							sql := fmt.Sprintf("SELECT %s FROM %s where %s in (?);", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
-							_ = global.DB.Raw(sql, value).Scan(&names)
+							query := fmt.Sprintf("SELECT %s FROM %s WHERE %s in (?)", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
+							_ = global.DB.Raw(query, value).Scan(&names)
 						} else {
-							_ = global.DB.Raw(fmt.Sprintf("select %s from %s where %s = ?;", funcs.OutputColumn, funcs.DB, funcs.InputColumn), value).Scan(&names)
+							query := fmt.Sprintf("SELECT %s FROM %s WHERE %s = ?", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
+							_ = global.DB.Raw(query, value).Scan(&names)
 						}
 						formatMap[funcs.OutputValue] = strings.Join(names, ",")
 						break
@@ -109,12 +111,21 @@ func OperationLog() gin.HandlerFunc {
 		}
 		for key, value := range formatMap {
 			if strings.Contains(operationDic.FormatEN, "["+key+"]") {
-				if arrays, ok := value.([]string); ok {
-					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(arrays, ",")))
-					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(arrays, ",")))
-				} else {
+				t := reflect.TypeOf(value)
+				if t.Kind() != reflect.Array && t.Kind() != reflect.Slice {
 					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", value))
 					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", value))
+				} else {
+					val := reflect.ValueOf(value)
+					length := val.Len()
+
+					var elements []string
+					for i := 0; i < length; i++ {
+						element := val.Index(i).Interface().(string)
+						elements = append(elements, element)
+					}
+					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(elements, ",")))
+					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(elements, ",")))
 				}
 			}
 		}

backend/middleware/password_expired.go

@@ -30,7 +30,7 @@ func PasswordExpired() gin.HandlerFunc {
 			helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypePasswordExpired, err)
 			return
 		}
-		loc, _ := time.LoadLocation(common.LoadTimeZone())
+		loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
 		expiredTime, err := time.ParseInLocation(constant.DateTimeLayout, extime.Value, loc)
 		if err != nil {
 			helper.ErrorWithDetail(c, constant.CodePasswordExpired, constant.ErrTypePasswordExpired, err)

backend/router/ro_dashboard.go

@@ -18,7 +18,7 @@ func (s *DashboardRouter) InitRouter(Router *gin.RouterGroup) {
 	{
 		cmdRouter.GET("/base/os", baseApi.LoadDashboardOsInfo)
 		cmdRouter.GET("/base/:ioOption/:netOption", baseApi.LoadDashboardBaseInfo)
-		cmdRouter.GET("/current/:ioOption/:netOption", baseApi.LoadDashboardCurrentInfo)
+		cmdRouter.POST("/current", baseApi.LoadDashboardCurrentInfo)
 		cmdRouter.POST("/system/restart/:operation", baseApi.SystemRestart)
 	}
 }

backend/utils/cloud_storage/client/s3.go

@@ -27,12 +27,16 @@ func NewS3Client(vars map[string]interface{}) (*s3Client, error) {
 	if len(scType) == 0 {
 		scType = "Standard"
 	}
+	mode := loadParamFromVars("mode", vars)
+	if len(mode) == 0 {
+		mode = "virtual hosted"
+	}
 	sess, err := session.NewSession(&aws.Config{
 		Credentials:      credentials.NewStaticCredentials(accessKey, secretKey, ""),
 		Endpoint:         aws.String(endpoint),
 		Region:           aws.String(region),
 		DisableSSL:       aws.Bool(true),
-		S3ForcePathStyle: aws.Bool(false),
+		S3ForcePathStyle: aws.Bool(mode == "path"),
 	})
 	if err != nil {
 		return nil, err

backend/utils/common/common.go

@@ -256,13 +256,6 @@ func LoadSizeUnit2F(value float64) string {
 	return fmt.Sprintf("%.2f", value)
 }
 
-func LoadTimeZone() string {
-	loc := time.Now().Location()
-	if _, err := time.LoadLocation(loc.String()); err != nil {
-		return "Asia/Shanghai"
-	}
-	return loc.String()
-}
 func LoadTimeZoneByCmd() string {
 	loc := time.Now().Location().String()
 	if _, err := time.LoadLocation(loc); err != nil {
@@ -325,3 +318,27 @@ func SplitStr(str string, spi ...string) []string {
 func IsValidIP(ip string) bool {
 	return net.ParseIP(ip) != nil
 }
+
+const (
+	b  = uint64(1)
+	kb = 1024 * b
+	mb = 1024 * kb
+	gb = 1024 * mb
+)
+
+func FormatBytes(bytes uint64) string {
+	switch {
+	case bytes < kb:
+		return fmt.Sprintf("%dB", bytes)
+	case bytes < mb:
+		return fmt.Sprintf("%.2fKB", float64(bytes)/float64(kb))
+	case bytes < gb:
+		return fmt.Sprintf("%.2fMB", float64(bytes)/float64(mb))
+	default:
+		return fmt.Sprintf("%.2fGB", float64(bytes)/float64(gb))
+	}
+}
+
+func FormatPercent(percent float64) string {
+	return fmt.Sprintf("%.2f%%", percent)
+}

backend/utils/files/file_op.go

@@ -613,6 +613,9 @@ func (f FileOp) decompressWithSDK(srcFile string, dst string, cType CompressType
 func (f FileOp) Decompress(srcFile string, dst string, cType CompressType, secret string) error {
 	if cType == Tar || cType == Zip || cType == TarGz {
 		shellArchiver, err := NewShellArchiver(cType)
+		if !f.Stat(dst) {
+			_ = f.CreateDir(dst, 0755)
+		}
 		if err == nil {
 			if err = shellArchiver.Extract(srcFile, dst, secret); err == nil {
 				return nil

backend/utils/files/fileinfo.go

@@ -72,6 +72,9 @@ func NewFileInfo(op FileOption) (*FileInfo, error) {
 
 	info, err := appFs.Stat(op.Path)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, buserr.New(constant.ErrLinkPathNotFound)
+		}
 		return nil, err
 	}
 
@@ -101,7 +104,26 @@ func NewFileInfo(op FileOption) (*FileInfo, error) {
 	}
 
 	if file.IsSymlink {
-		file.LinkPath = GetSymlink(op.Path)
+		linkPath := GetSymlink(op.Path)
+		if !filepath.IsAbs(linkPath) {
+			dir := filepath.Dir(op.Path)
+			var err error
+			linkPath, err = filepath.Abs(filepath.Join(dir, linkPath))
+			if err != nil {
+				return nil, err
+			}
+		}
+		file.LinkPath = linkPath
+		targetInfo, err := appFs.Stat(linkPath)
+		if err != nil {
+			file.IsDir = false
+			file.Mode = "-"
+			file.User = "-"
+			file.Group = "-"
+		} else {
+			file.IsDir = targetInfo.IsDir()
+		}
+		file.Extension = filepath.Ext(file.LinkPath)
 	}
 	if op.Expand {
 		if err := handleExpansion(file, op); err != nil {
@@ -308,7 +330,26 @@ func (f *FileInfo) processFiles(files []FileSearchInfo, option FileOption) ([]*F
 			file.FavoriteID = favorite.ID
 		}
 		if isSymlink {
-			file.LinkPath = GetSymlink(fPath)
+			linkPath := GetSymlink(fPath)
+			if !filepath.IsAbs(linkPath) {
+				dir := filepath.Dir(fPath)
+				var err error
+				linkPath, err = filepath.Abs(filepath.Join(dir, linkPath))
+				if err != nil {
+					return nil, err
+				}
+			}
+			file.LinkPath = linkPath
+			targetInfo, err := file.Fs.Stat(linkPath)
+			if err != nil {
+				file.IsDir = false
+				file.Mode = "-"
+				file.User = "-"
+				file.Group = "-"
+			} else {
+				file.IsDir = targetInfo.IsDir()
+			}
+			file.Extension = filepath.Ext(file.LinkPath)
 		}
 		if df.Size() > 0 {
 			file.MimeType = GetMimeType(fPath)

backend/utils/files/tar.go

@@ -18,7 +18,7 @@ func NewTarArchiver(compressType CompressType) ShellArchiver {
 }
 
 func (t TarArchiver) Extract(FilePath string, dstDir string, secret string) error {
-	return cmd.ExecCmd(fmt.Sprintf("%s %s %s -C %s", t.Cmd, t.getOptionStr("extract"), FilePath, dstDir))
+	return cmd.ExecCmd(fmt.Sprintf("%s %s \"%s\" -C \"%s\"", t.Cmd, t.getOptionStr("extract"), FilePath, dstDir))
 }
 
 func (t TarArchiver) Compress(sourcePaths []string, dstFile string, secret string) error {

backend/utils/files/tar_gz.go

@@ -20,11 +20,11 @@ func (t TarGzArchiver) Extract(filePath, dstDir string, secret string) error {
 	var err error
 	commands := ""
 	if len(secret) != 0 {
-		extraCmd := "openssl enc -d -aes-256-cbc -k '" + secret + "' -in " + filePath + " | "
-		commands = fmt.Sprintf("%s tar -zxvf - -C %s", extraCmd, dstDir+" > /dev/null 2>&1")
+		extraCmd := fmt.Sprintf("openssl enc -d -aes-256-cbc -k '%s' -in '%s' | ", secret, filePath)
+		commands = fmt.Sprintf("%s tar -zxvf - -C '%s' > /dev/null 2>&1", extraCmd, dstDir)
 		global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******"))
 	} else {
-		commands = fmt.Sprintf("tar -zxvf %s %s", filePath+" -C ", dstDir+" > /dev/null 2>&1")
+		commands = fmt.Sprintf("tar -zxvf '%s' -C '%s' > /dev/null 2>&1", filePath, dstDir)
 		global.LOG.Debug(commands)
 	}
 	if err = cmd.ExecCmd(commands); err != nil {
@@ -34,27 +34,25 @@ func (t TarGzArchiver) Extract(filePath, dstDir string, secret string) error {
 }
 
 func (t TarGzArchiver) Compress(sourcePaths []string, dstFile string, secret string) error {
-	var err error
-	path := ""
-	itemDir := ""
+	var itemDirs []string
 	for _, item := range sourcePaths {
-		itemDir += filepath.Base(item) + " "
+		itemDirs = append(itemDirs, fmt.Sprintf("\"%s\"", filepath.Base(item)))
 	}
-	aheadDir := dstFile[:strings.LastIndex(dstFile, "/")]
+	itemDir := strings.Join(itemDirs, " ")
+	aheadDir := filepath.Dir(sourcePaths[0])
 	if len(aheadDir) == 0 {
 		aheadDir = "/"
 	}
-	path += fmt.Sprintf("- -C %s %s", aheadDir, itemDir)
 	commands := ""
 	if len(secret) != 0 {
-		extraCmd := "| openssl enc -aes-256-cbc -salt -k '" + secret + "' -out"
-		commands = fmt.Sprintf("tar -zcf %s %s %s", path, extraCmd, dstFile)
+		extraCmd := fmt.Sprintf("| openssl enc -aes-256-cbc -salt -k '%s' -out '%s'", secret, dstFile)
+		commands = fmt.Sprintf("tar -zcf - -C \"%s\" %s %s", aheadDir, itemDir, extraCmd)
 		global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******"))
 	} else {
-		commands = fmt.Sprintf("tar -zcf %s -C %s %s", dstFile, aheadDir, itemDir)
+		commands = fmt.Sprintf("tar -zcf \"%s\" -C \"%s\" %s", dstFile, aheadDir, itemDir)
 		global.LOG.Debug(commands)
 	}
-	if err = cmd.ExecCmd(commands); err != nil {
+	if err := cmd.ExecCmd(commands); err != nil {
 		return err
 	}
 	return nil

backend/utils/files/utils.go

@@ -72,16 +72,21 @@ func countLines(path string) (int, error) {
 		return 0, err
 	}
 	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	lineCount := 0
-	for scanner.Scan() {
-		lineCount++
+	reader := bufio.NewReader(file)
+	count := 0
+	for {
+		_, err := reader.ReadString('\n')
+		if err != nil {
+			if err == io.EOF {
+				if count > 0 {
+					count++
+				}
+				return count, nil
+			}
+			return count, err
+		}
+		count++
 	}
-	if err := scanner.Err(); err != nil {
-		return 0, err
-	}
-	return lineCount, nil
 }
 
 func ReadFileByLine(filename string, page, pageSize int, latest bool) (lines []string, isEndOfFile bool, total int, err error) {

backend/utils/http/request.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"context"
+	"errors"
 	"io"
 	"net/http"
 	"time"
@@ -35,6 +36,9 @@ func HandleGetWithTransport(url, method string, transport *http.Transport, timeo
 	if err != nil {
 		return 0, nil, err
 	}
+	if resp.StatusCode != http.StatusOK {
+		return 0, nil, errors.New(resp.Status)
+	}
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return 0, nil, err

backend/utils/mfa/mfa.go

@@ -40,7 +40,6 @@ func ValidCode(code, intervalStr, secret string) bool {
 	}
 	totp := gotp.NewTOTP(secret, 6, interval, nil)
 	now := time.Now().Unix()
-	strInt64 := strconv.FormatInt(now, 10)
-	id16, _ := strconv.Atoi(strInt64)
-	return totp.Verify(code, int64(id16))
+	prevTime := now - int64(interval)
+	return totp.Verify(code, now) || totp.Verify(code, prevTime)
 }

backend/utils/mysql/helper/dump.go

@@ -1,303 +0,0 @@
-package helper
-
-import (
-	"bufio"
-	"database/sql"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	_ "github.com/go-sql-driver/mysql"
-)
-
-func init() {}
-
-type dumpOption struct {
-	isData bool
-
-	tables      []string
-	isAllTable  bool
-	isDropTable bool
-	writer      io.Writer
-}
-
-type DumpOption func(*dumpOption)
-
-func WithDropTable() DumpOption {
-	return func(option *dumpOption) {
-		option.isDropTable = true
-	}
-}
-
-func WithData() DumpOption {
-	return func(option *dumpOption) {
-		option.isData = true
-	}
-}
-
-func WithWriter(writer io.Writer) DumpOption {
-	return func(option *dumpOption) {
-		option.writer = writer
-	}
-}
-
-func Dump(dns string, opts ...DumpOption) error {
-	start := time.Now()
-	global.LOG.Infof("dump start at %s\n", start.Format(constant.DateTimeLayout))
-	defer func() {
-		end := time.Now()
-		global.LOG.Infof("dump end at %s, cost %s\n", end.Format(constant.DateTimeLayout), end.Sub(start))
-	}()
-
-	var err error
-
-	var o dumpOption
-
-	for _, opt := range opts {
-		opt(&o)
-	}
-
-	if len(o.tables) == 0 {
-		o.isAllTable = true
-	}
-
-	if o.writer == nil {
-		o.writer = os.Stdout
-	}
-
-	buf := bufio.NewWriter(o.writer)
-	defer buf.Flush()
-
-	itemFile, lineNumber := "", 0
-
-	itemFile += "-- ----------------------------\n"
-	itemFile += "-- MySQL Database Dump\n"
-	itemFile += "-- Start Time: " + start.Format(constant.DateTimeLayout) + "\n"
-	itemFile += "-- ----------------------------\n\n\n"
-
-	db, err := sql.Open("mysql", dns)
-	if err != nil {
-		global.LOG.Errorf("open mysql db failed, err: %v", err)
-		return err
-	}
-	defer db.Close()
-
-	dbName, err := getDBNameFromDNS(dns)
-	if err != nil {
-		global.LOG.Errorf("get db name from dns failed, err: %v", err)
-		return err
-	}
-	_, err = db.Exec(fmt.Sprintf("USE `%s`", dbName))
-	if err != nil {
-		global.LOG.Errorf("exec `use %s` failed, err: %v", dbName, err)
-		return err
-	}
-
-	var tables []string
-	if o.isAllTable {
-		tmp, err := getAllTables(db)
-		if err != nil {
-			global.LOG.Errorf("get all tables failed, err: %v", err)
-			return err
-		}
-		tables = tmp
-	} else {
-		tables = o.tables
-	}
-
-	for _, table := range tables {
-		if o.isDropTable {
-			itemFile += fmt.Sprintf("DROP TABLE IF EXISTS `%s`;\n", table)
-		}
-
-		itemFile += "-- ----------------------------\n"
-		itemFile += fmt.Sprintf("-- Table structure for %s\n", table)
-		itemFile += "-- ----------------------------\n"
-
-		createTableSQL, err := getCreateTableSQL(db, table)
-		if err != nil {
-			global.LOG.Errorf("get create table sql failed, err: %v", err)
-			return err
-		}
-		itemFile += createTableSQL
-		itemFile += ";\n\n\n\n"
-
-		if o.isData {
-			itemFile += "-- ----------------------------\n"
-			itemFile += fmt.Sprintf("-- Records of %s\n", table)
-			itemFile += "-- ----------------------------\n"
-
-			lineRows, err := db.Query(fmt.Sprintf("SELECT * FROM `%s`", table))
-			if err != nil {
-				global.LOG.Errorf("exec `select * from %s` failed, err: %v", table, err)
-				return err
-			}
-			defer lineRows.Close()
-
-			var columns []string
-			columns, err = lineRows.Columns()
-			if err != nil {
-				global.LOG.Errorf("get columes failed, err: %v", err)
-				return err
-			}
-			columnTypes, err := lineRows.ColumnTypes()
-			if err != nil {
-				global.LOG.Errorf("get colume types failed, err: %v", err)
-				return err
-			}
-			for lineRows.Next() {
-				row := make([]interface{}, len(columns))
-				rowPointers := make([]interface{}, len(columns))
-				for i := range columns {
-					rowPointers[i] = &row[i]
-				}
-				if err = lineRows.Scan(rowPointers...); err != nil {
-					global.LOG.Errorf("scan row data failed, err: %v", err)
-					return err
-				}
-				ssql := loadDataSql(row, columnTypes, table)
-				if len(ssql) != 0 {
-					itemFile += ssql
-					lineNumber++
-				}
-				if lineNumber > 500 {
-					_, _ = buf.WriteString(itemFile)
-					itemFile = ""
-					lineNumber = 0
-				}
-			}
-
-			itemFile += "\n\n"
-		}
-	}
-
-	itemFile += "-- ----------------------------\n"
-	itemFile += "-- Dumped by mysqldump\n"
-	itemFile += "-- Cost Time: " + time.Since(start).String() + "\n"
-	itemFile += "-- ----------------------------\n"
-
-	_, _ = buf.WriteString(itemFile)
-	_ = buf.Flush()
-
-	return nil
-}
-
-func getCreateTableSQL(db *sql.DB, table string) (string, error) {
-	var createTableSQL string
-	err := db.QueryRow(fmt.Sprintf("SHOW CREATE TABLE `%s`", table)).Scan(&table, &createTableSQL)
-	if err != nil {
-		return "", err
-	}
-	createTableSQL = strings.Replace(createTableSQL, "CREATE TABLE", "CREATE TABLE IF NOT EXISTS", 1)
-	return createTableSQL, nil
-}
-
-func getAllTables(db *sql.DB) ([]string, error) {
-	var tables []string
-	rows, err := db.Query("SHOW TABLES")
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var table string
-		err = rows.Scan(&table)
-		if err != nil {
-			return nil, err
-		}
-		tables = append(tables, table)
-	}
-	return tables, nil
-}
-
-func loadDataSql(row []interface{}, columnTypes []*sql.ColumnType, table string) string {
-	ssql := "INSERT INTO `" + table + "` VALUES ("
-	for i, col := range row {
-		if col == nil {
-			ssql += "NULL"
-		} else {
-			Type := columnTypes[i].DatabaseTypeName()
-			Type = strings.Replace(Type, "UNSIGNED", "", -1)
-			Type = strings.Replace(Type, " ", "", -1)
-			switch Type {
-			case "TINYINT", "SMALLINT", "MEDIUMINT", "INT", "INTEGER", "BIGINT":
-				if bs, ok := col.([]byte); ok {
-					ssql += string(bs)
-				} else {
-					ssql += fmt.Sprintf("%d", col)
-				}
-			case "FLOAT", "DOUBLE":
-				if bs, ok := col.([]byte); ok {
-					ssql += string(bs)
-				} else {
-					ssql += fmt.Sprintf("%f", col)
-				}
-			case "DECIMAL", "DEC":
-				ssql += fmt.Sprintf("%s", col)
-
-			case "DATE":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the DATE type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format("2006-01-02"))
-			case "DATETIME":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the DATETIME type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format(constant.DateTimeLayout))
-			case "TIMESTAMP":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the TIMESTAMP type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format(constant.DateTimeLayout))
-			case "TIME":
-				t, ok := col.([]byte)
-				if !ok {
-					global.LOG.Errorf("the TIME type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", string(t))
-			case "YEAR":
-				t, ok := col.([]byte)
-				if !ok {
-					global.LOG.Errorf("the YEAR type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += string(t)
-			case "CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT":
-				ssql += fmt.Sprintf("'%s'", strings.Replace(fmt.Sprintf("%s", col), "'", "''", -1))
-			case "BIT", "BINARY", "VARBINARY", "TINYBLOB", "BLOB", "MEDIUMBLOB", "LONGBLOB":
-				ssql += fmt.Sprintf("0x%X", col)
-			case "ENUM", "SET":
-				ssql += fmt.Sprintf("'%s'", col)
-			case "BOOL", "BOOLEAN":
-				if col.(bool) {
-					ssql += "true"
-				} else {
-					ssql += "false"
-				}
-			case "JSON":
-				ssql += fmt.Sprintf("'%s'", col)
-			default:
-				global.LOG.Errorf("unsupported colume type: %s", Type)
-				return ""
-			}
-		}
-		if i < len(row)-1 {
-			ssql += ","
-		}
-	}
-	ssql += ");\n"
-	return ssql
-}

backend/utils/mysql/helper/source.go

@@ -1,244 +0,0 @@
-package helper
-
-import (
-	"bufio"
-	"database/sql"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-)
-
-type sourceOption struct {
-	dryRun      bool
-	mergeInsert int
-	debug       bool
-}
-type SourceOption func(*sourceOption)
-
-func WithMergeInsert(size int) SourceOption {
-	return func(o *sourceOption) {
-		o.mergeInsert = size
-	}
-}
-
-type dbWrapper struct {
-	DB     *sql.DB
-	debug  bool
-	dryRun bool
-}
-
-func newDBWrapper(db *sql.DB, dryRun, debug bool) *dbWrapper {
-
-	return &dbWrapper{
-		DB:     db,
-		dryRun: dryRun,
-		debug:  debug,
-	}
-}
-
-func (db *dbWrapper) Exec(query string, args ...interface{}) (sql.Result, error) {
-	if db.debug {
-		global.LOG.Debugf("query %s", query)
-	}
-
-	if db.dryRun {
-		return nil, nil
-	}
-	return db.DB.Exec(query, args...)
-}
-
-func Source(dns string, reader io.Reader, opts ...SourceOption) error {
-	start := time.Now()
-	global.LOG.Infof("source start at %s", start.Format(constant.DateTimeLayout))
-	defer func() {
-		end := time.Now()
-		global.LOG.Infof("source end at %s, cost %s", end.Format(constant.DateTimeLayout), end.Sub(start))
-	}()
-
-	var err error
-	var db *sql.DB
-	var o sourceOption
-	for _, opt := range opts {
-		opt(&o)
-	}
-
-	dbName, err := getDBNameFromDNS(dns)
-	if err != nil {
-		global.LOG.Errorf("get db name from dns failed, err: %v", err)
-		return err
-	}
-
-	db, err = sql.Open("mysql", dns)
-	if err != nil {
-		global.LOG.Errorf("open mysql db failed, err: %v", err)
-		return err
-	}
-	defer db.Close()
-
-	dbWrapper := newDBWrapper(db, o.dryRun, o.debug)
-
-	_, err = dbWrapper.Exec(fmt.Sprintf("USE `%s`;", dbName))
-	if err != nil {
-		global.LOG.Errorf("exec `use %s` failed, err: %v", dbName, err)
-		return err
-	}
-
-	db.SetConnMaxLifetime(3600)
-
-	r := bufio.NewReader(reader)
-	_, err = dbWrapper.Exec("SET autocommit=0;")
-	if err != nil {
-		global.LOG.Errorf("exec `set autocommit=0` failed, err: %v", err)
-		return err
-	}
-
-	for {
-		line, err := readLine(r)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			global.LOG.Errorf("read sql failed, err: %v", err)
-			return err
-		}
-
-		ssql, err := trim(line)
-		if err != nil {
-			global.LOG.Errorf("trim sql failed, err: %v", err)
-			return err
-		}
-
-		afterInsertSql := ""
-		if o.mergeInsert > 1 && strings.HasPrefix(ssql, "INSERT INTO") {
-			var insertSQLs []string
-			insertSQLs = append(insertSQLs, ssql)
-			for i := 0; i < o.mergeInsert-1; i++ {
-				line, err := readLine(r)
-				if err != nil {
-					if err == io.EOF {
-						break
-					}
-					return err
-				}
-				ssql2, err := trim(line)
-				if err != nil {
-					global.LOG.Errorf("trim merge insert sql failed, err: %v", err)
-					return err
-				}
-				if strings.HasPrefix(ssql2, "INSERT INTO") {
-					insertSQLs = append(insertSQLs, ssql2)
-					continue
-				}
-				afterInsertSql = ssql2
-				break
-			}
-			ssql, err = mergeInsert(insertSQLs)
-			if err != nil {
-				global.LOG.Errorf("do merge insert failed, err: %v", err)
-				return err
-			}
-		}
-
-		_, err = dbWrapper.Exec(ssql)
-		if err != nil {
-			global.LOG.Errorf("exec sql failed, err: %v", err)
-			return err
-		}
-		if len(afterInsertSql) != 0 {
-			_, err = dbWrapper.Exec(afterInsertSql)
-			if err != nil {
-				global.LOG.Errorf("exec sql failed, err: %v", err)
-				return err
-			}
-		}
-	}
-
-	_, err = dbWrapper.Exec("COMMIT;")
-	if err != nil {
-		global.LOG.Errorf("exec `commit` failed, err: %v", err)
-		return err
-	}
-
-	_, err = dbWrapper.Exec("SET autocommit=1;")
-	if err != nil {
-		global.LOG.Errorf("exec `autocommit=1` failed, err: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func mergeInsert(insertSQLs []string) (string, error) {
-	if len(insertSQLs) == 0 {
-		return "", errors.New("no input provided")
-	}
-	builder := strings.Builder{}
-	sql1 := insertSQLs[0]
-	sql1 = strings.TrimSuffix(sql1, ";")
-	builder.WriteString(sql1)
-	for i, insertSQL := range insertSQLs[1:] {
-		if i < len(insertSQLs)-1 {
-			builder.WriteString(",")
-		}
-
-		valuesIdx := strings.Index(insertSQL, "VALUES")
-		if valuesIdx == -1 {
-			return "", errors.New("invalid SQL: missing VALUES keyword")
-		}
-		sqln := insertSQL[valuesIdx:]
-		sqln = strings.TrimPrefix(sqln, "VALUES")
-		sqln = strings.TrimSuffix(sqln, ";")
-		builder.WriteString(sqln)
-
-	}
-	builder.WriteString(";")
-
-	return builder.String(), nil
-}
-
-func trim(s string) (string, error) {
-	s = strings.TrimLeft(s, "\n")
-	s = strings.TrimSpace(s)
-	return s, nil
-}
-
-func getDBNameFromDNS(dns string) (string, error) {
-	ss1 := strings.Split(dns, "/")
-	if len(ss1) == 2 {
-		ss2 := strings.Split(ss1[1], "?")
-		if len(ss2) == 2 {
-			return ss2[0], nil
-		}
-	}
-
-	return "", fmt.Errorf("dns error: %s", dns)
-}
-
-func readLine(r *bufio.Reader) (string, error) {
-	lineItem, err := r.ReadString('\n')
-	if err != nil {
-		if err == io.EOF {
-			return lineItem, err
-		}
-		global.LOG.Errorf("read merge insert sql failed, err: %v", err)
-		return "", err
-	}
-	if strings.HasSuffix(lineItem, ";\n") {
-		return lineItem, nil
-	}
-	lineAppend, err := readLine(r)
-	if err != nil {
-		if err == io.EOF {
-			return lineItem, err
-		}
-		global.LOG.Errorf("read merge insert sql failed, err: %v", err)
-		return "", err
-	}
-
-	return lineItem + lineAppend, nil
-}

backend/utils/ssl/client.go

@@ -4,6 +4,7 @@ import (
 	"crypto"
 	"encoding/json"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -292,8 +293,12 @@ func (c *AcmeClient) GetDNSResolve(domains []string) (map[string]Resolve, error)
 			continue
 		}
 		challengeInfo := dns01.GetChallengeInfo(domain, keyAuth)
+		fqdn := challengeInfo.FQDN
+		if strings.HasPrefix(domain, "*.") && strings.Contains(fqdn, "*.") {
+			fqdn = strings.Replace(fqdn, "*.", "", 1)
+		}
 		resolves[domain] = Resolve{
-			Key:   challengeInfo.FQDN,
+			Key:   fqdn,
 			Value: challengeInfo.Value,
 		}
 	}

backend/utils/websocket/process_data.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/global"
+	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	"github.com/1Panel-dev/1Panel/backend/utils/files"
 	"github.com/shirou/gopsutil/v3/host"
 	"github.com/shirou/gopsutil/v3/net"
@@ -147,26 +148,6 @@ func getDownloadProcess(progress DownloadProgress) (res []byte, err error) {
 	return
 }
 
-const (
-	b  = uint64(1)
-	kb = 1024 * b
-	mb = 1024 * kb
-	gb = 1024 * mb
-)
-
-func formatBytes(bytes uint64) string {
-	switch {
-	case bytes < kb:
-		return fmt.Sprintf("%dB", bytes)
-	case bytes < mb:
-		return fmt.Sprintf("%.2fKB", float64(bytes)/float64(kb))
-	case bytes < gb:
-		return fmt.Sprintf("%.2fMB", float64(bytes)/float64(mb))
-	default:
-		return fmt.Sprintf("%.2fGB", float64(bytes)/float64(gb))
-	}
-}
-
 func getProcessData(processConfig PsProcessConfig) (res []byte, err error) {
 	var processes []*process.Process
 	processes, err = process.Processes()
@@ -230,14 +211,14 @@ func getProcessData(processConfig PsProcessConfig) (res []byte, err error) {
 		procData.CpuPercent = fmt.Sprintf("%.2f", procData.CpuValue) + "%"
 		menInfo, procErr := proc.MemoryInfo()
 		if procErr == nil {
-			procData.Rss = formatBytes(menInfo.RSS)
+			procData.Rss = common.FormatBytes(menInfo.RSS)
 			procData.RssValue = menInfo.RSS
-			procData.Data = formatBytes(menInfo.Data)
-			procData.VMS = formatBytes(menInfo.VMS)
-			procData.HWM = formatBytes(menInfo.HWM)
-			procData.Stack = formatBytes(menInfo.Stack)
-			procData.Locked = formatBytes(menInfo.Locked)
-			procData.Swap = formatBytes(menInfo.Swap)
+			procData.Data = common.FormatBytes(menInfo.Data)
+			procData.VMS = common.FormatBytes(menInfo.VMS)
+			procData.HWM = common.FormatBytes(menInfo.HWM)
+			procData.Stack = common.FormatBytes(menInfo.Stack)
+			procData.Locked = common.FormatBytes(menInfo.Locked)
+			procData.Swap = common.FormatBytes(menInfo.Swap)
 		} else {
 			procData.Rss = "--"
 			procData.Data = "--"
@@ -251,8 +232,8 @@ func getProcessData(processConfig PsProcessConfig) (res []byte, err error) {
 		}
 		ioStat, procErr := proc.IOCounters()
 		if procErr == nil {
-			procData.DiskWrite = formatBytes(ioStat.WriteBytes)
-			procData.DiskRead = formatBytes(ioStat.ReadBytes)
+			procData.DiskWrite = common.FormatBytes(ioStat.WriteBytes)
+			procData.DiskRead = common.FormatBytes(ioStat.ReadBytes)
 		} else {
 			procData.DiskWrite = "--"
 			procData.DiskRead = "--"

backend/utils/xpack/xpack.go

@@ -32,6 +32,10 @@ func LoadGpuInfo() []interface{} {
 	return nil
 }
 
+func LoadXpuInfo() []interface{} {
+	return nil
+}
+
 func StartClam(startClam model.Clam, isUpdate bool) (int, error) {
 	return 0, buserr.New(constant.ErrXpackNotFound)
 }

cmd/server/docs/docs.go

@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"
@@ -216,28 +215,12 @@ const docTemplate = `{
                     }
                 },
                 "x-panel-log": {
-                    "BeforeFunctions": [
-                        {
-                            "db": "app_installs",
-                            "input_column": "name",
-                            "input_value": "name",
-                            "isList": false,
-                            "output_column": "app_id",
-                            "output_value": "appId"
-                        },
-                        {
-                            "db": "apps",
-                            "info": "appId",
-                            "isList": false,
-                            "output_column": "key",
-                            "output_value": "appKey"
-                        }
-                    ],
+                    "BeforeFunctions": [],
                     "bodyKeys": [
                         "name"
                     ],
-                    "formatEN": "Install app [appKey]-[name]",
-                    "formatZH": "安装应用 [appKey]-[name]",
+                    "formatEN": "Install app [name]",
+                    "formatZH": "安装应用 [name]",
                     "paramKeys": []
                 }
             }
@@ -11486,7 +11469,7 @@ const docTemplate = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SearchWithPage"
+                            "$ref": "#/definitions/dto.SearchClamWithPage"
                         }
                     }
                 ],
@@ -19321,6 +19304,42 @@ const docTemplate = `{
                 }
             }
         },
+        "dto.SearchClamWithPage": {
+            "type": "object",
+            "required": [
+                "order",
+                "orderBy",
+                "page",
+                "pageSize"
+            ],
+            "properties": {
+                "info": {
+                    "type": "string"
+                },
+                "order": {
+                    "type": "string",
+                    "enum": [
+                        "null",
+                        "ascending",
+                        "descending"
+                    ]
+                },
+                "orderBy": {
+                    "type": "string",
+                    "enum": [
+                        "name",
+                        "status",
+                        "created_at"
+                    ]
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "type": "integer"
+                }
+            }
+        },
         "dto.SearchForTree": {
             "type": "object",
             "properties": {
@@ -23457,6 +23476,8 @@ var SwaggerInfo = &swag.Spec{
 	Description:      "开源Linux面板",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {

cmd/server/docs/swagger.json

@@ -209,28 +209,12 @@
                     }
                 },
                 "x-panel-log": {
-                    "BeforeFunctions": [
-                        {
-                            "db": "app_installs",
-                            "input_column": "name",
-                            "input_value": "name",
-                            "isList": false,
-                            "output_column": "app_id",
-                            "output_value": "appId"
-                        },
-                        {
-                            "db": "apps",
-                            "info": "appId",
-                            "isList": false,
-                            "output_column": "key",
-                            "output_value": "appKey"
-                        }
-                    ],
+                    "BeforeFunctions": [],
                     "bodyKeys": [
                         "name"
                     ],
-                    "formatEN": "Install app [appKey]-[name]",
-                    "formatZH": "安装应用 [appKey]-[name]",
+                    "formatEN": "Install app [name]",
+                    "formatZH": "安装应用 [name]",
                     "paramKeys": []
                 }
             }
@@ -11479,7 +11463,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SearchWithPage"
+                            "$ref": "#/definitions/dto.SearchClamWithPage"
                         }
                     }
                 ],
@@ -19314,6 +19298,42 @@
                 }
             }
         },
+        "dto.SearchClamWithPage": {
+            "type": "object",
+            "required": [
+                "order",
+                "orderBy",
+                "page",
+                "pageSize"
+            ],
+            "properties": {
+                "info": {
+                    "type": "string"
+                },
+                "order": {
+                    "type": "string",
+                    "enum": [
+                        "null",
+                        "ascending",
+                        "descending"
+                    ]
+                },
+                "orderBy": {
+                    "type": "string",
+                    "enum": [
+                        "name",
+                        "status",
+                        "created_at"
+                    ]
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "type": "integer"
+                }
+            }
+        },
         "dto.SearchForTree": {
             "type": "object",
             "properties": {

cmd/server/docs/swagger.yaml

@@ -2748,6 +2748,32 @@ definitions:
     - ssl
     - sslType
     type: object
+  dto.SearchClamWithPage:
+    properties:
+      info:
+        type: string
+      order:
+        enum:
+        - "null"
+        - ascending
+        - descending
+        type: string
+      orderBy:
+        enum:
+        - name
+        - status
+        - created_at
+        type: string
+      page:
+        type: integer
+      pageSize:
+        type: integer
+    required:
+    - order
+    - orderBy
+    - page
+    - pageSize
+    type: object
   dto.SearchForTree:
     properties:
       info:
@@ -5633,22 +5659,11 @@ paths:
       tags:
       - App
       x-panel-log:
-        BeforeFunctions:
-        - db: app_installs
-          input_column: name
-          input_value: name
-          isList: false
-          output_column: app_id
-          output_value: appId
-        - db: apps
-          info: appId
-          isList: false
-          output_column: key
-          output_value: appKey
+        BeforeFunctions: []
         bodyKeys:
         - name
-        formatEN: Install app [appKey]-[name]
-        formatZH: 安装应用 [appKey]-[name]
+        formatEN: Install app [name]
+        formatZH: 安装应用 [name]
         paramKeys: []
   /apps/installed/check:
     post:
@@ -12769,7 +12784,7 @@ paths:
         name: request
         required: true
         schema:
-          $ref: '#/definitions/dto.SearchWithPage'
+          $ref: '#/definitions/dto.SearchClamWithPage'
       responses:
         "200":
           description: OK

cmd/server/nginx_conf/proxy.conf

@@ -5,9 +5,10 @@ location ^~ /test {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header REMOTE-HOST $remote_addr;
     proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $http_connection;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_http_version 1.1;
-
     add_header X-Cache $upstream_cache_status;
+    add_header Cache-Control no-cache; 
+    proxy_ssl_server_name off; 
 }

cmd/server/nginx_conf/website_default.conf

@@ -10,7 +10,7 @@ server {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $http_connection;
 
 
     access_log /www/sites/domain/log/access.log main;

frontend/package.json

@@ -37,11 +37,11 @@
         "codemirror": "^6.0.1",
         "echarts": "^5.5.0",
         "element-plus": "^2.7.5",
-        "fit2cloud-ui-plus": "^1.1.4",
+        "fit2cloud-ui-plus": "^1.1.6",
         "highlight.js": "^11.9.0",
         "js-base64": "^3.7.7",
         "md-editor-v3": "^2.11.3",
-        "monaco-editor": "^0.34.1",
+        "monaco-editor": "^0.50.0",
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "pinia-plugin-persistedstate": "^1.6.1",
@@ -72,7 +72,7 @@
         "postcss-html": "^1.4.1",
         "prettier": "^2.6.2",
         "rollup-plugin-visualizer": "^5.5.4",
-        "sass": "^1.49.7",
+        "sass": "^1.77.8",
         "standard-version": "^9.5.0",
         "stylelint": "^15.10.1",
         "tailwindcss": "^3.4.1",

frontend/src/api/interface/backup.ts

@@ -6,6 +6,7 @@ export namespace Backup {
         type: string;
         accessKey: string;
         bucket: string;
+        bucketInput: boolean;
         credential: string;
         backupPath: string;
         vars: string;

frontend/src/api/interface/container.ts

@@ -254,6 +254,8 @@ export namespace Container {
         file: string;
         path: string;
         template: number;
+        env: Array<string>;
+        envStr: string;
     }
     export interface ComposeOperation {
         name: string;
@@ -265,6 +267,7 @@ export namespace Container {
         name: string;
         path: string;
         content: string;
+        env: Array<string>;
     }
 
     export interface TemplateCreate {

frontend/src/api/interface/cronjob.ts

@@ -24,6 +24,9 @@ export namespace Cronjob {
         backupAccounts: string;
         defaultDownload: string;
         backupAccountList: Array<string>;
+        appIdList: Array<string>;
+        websiteList: Array<string>;
+        dbNameList: Array<string>;
         retainCopies: number;
         status: string;
         secret: string;

frontend/src/api/interface/dashboard.ts

@@ -22,6 +22,8 @@ export namespace Dashboard {
         kernelArch: string;
         kernelVersion: string;
         virtualizationSystem: string;
+        ipv4Addr: string;
+        systemProxy: string;
 
         cpuCores: number;
         cpuLogicalCores: number;
@@ -62,6 +64,7 @@ export namespace Dashboard {
         diskData: Array<DiskInfo>;
 
         gpuData: Array<GPUInfo>;
+        xpuData: Array<XPUInfo>;
 
         netBytesSent: number;
         netBytesRecv: number;
@@ -92,4 +95,20 @@ export namespace Dashboard {
         memoryUsage: string;
         fanSpeed: string;
     }
+
+    export interface XPUInfo {
+        deviceID: number;
+        deviceName: string;
+        memory: string;
+        temperature: string;
+        memoryUsed: string;
+        power: string;
+        memoryUtil: string;
+    }
+
+    export interface DashboardReq {
+        scope: string;
+        ioOption: string;
+        netOption: string;
+    }
 }

frontend/src/api/interface/file.ts

@@ -11,7 +11,7 @@ export namespace File {
         size: number;
         isDir: boolean;
         isSymlink: boolean;
-        linkPath: boolean;
+        linkPath: string;
         type: string;
         updateTime: string;
         modTime: string;

frontend/src/api/interface/website.ts

@@ -31,6 +31,7 @@ export namespace Website {
         sitePath: string;
         appName: string;
         runtimeName: string;
+        runtimeType: string;
     }
     export interface WebsiteRes extends CommonModel {
         protocol: string;

frontend/src/api/modules/dashboard.ts

@@ -9,8 +9,8 @@ export const loadBaseInfo = (ioOption: string, netOption: string) => {
     return http.get<Dashboard.BaseInfo>(`/dashboard/base/${ioOption}/${netOption}`);
 };
 
-export const loadCurrentInfo = (ioOption: string, netOption: string) => {
-    return http.get<Dashboard.CurrentInfo>(`/dashboard/current/${ioOption}/${netOption}`);
+export const loadCurrentInfo = (req: Dashboard.DashboardReq) => {
+    return http.post<Dashboard.CurrentInfo>(`/dashboard/current`, req);
 };
 
 export const systemRestart = (operation: string) => {

frontend/src/assets/iconfont/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "panel"; /* Project id 3575356 */
-  src: url('iconfont.woff2?t=1717570629440') format('woff2'),
-       url('iconfont.woff?t=1717570629440') format('woff'),
-       url('iconfont.ttf?t=1717570629440') format('truetype'),
-       url('iconfont.svg?t=1717570629440#panel') format('svg');
+  src: url('iconfont.woff2?t=1724290117056') format('woff2'),
+       url('iconfont.woff?t=1724290117056') format('woff'),
+       url('iconfont.ttf?t=1724290117056') format('truetype'),
+       url('iconfont.svg?t=1724290117056#panel') format('svg');
 }
 
 .panel {
@@ -14,6 +14,50 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.p-alert-1:before {
+  content: "\e611";
+}
+
+.p-alert-2:before {
+  content: "\e701";
+}
+
+.p-aws:before {
+  content: "\e600";
+}
+
+.p-tengxunyun1:before {
+  content: "\e651";
+}
+
+.p-qiniuyun:before {
+  content: "\e62c";
+}
+
+.p-minio:before {
+  content: "\e63c";
+}
+
+.p-onedrive:before {
+  content: "\e601";
+}
+
+.p-oss:before {
+  content: "\e607";
+}
+
+.p-SFTP:before {
+  content: "\e647";
+}
+
+.p-webdav:before {
+  content: "\e622";
+}
+
+.p-zhongduan:before {
+  content: "\e731";
+}
+
 .p-docker1:before {
   content: "\e76a";
 }
@@ -178,18 +222,10 @@
   content: "\e856";
 }
 
-.p-webdav:before {
-  content: "\e622";
-}
-
 .p-xiangqing:before {
   content: "\e677";
 }
 
-.p-onedrive:before {
-  content: "\e601";
-}
-
 .p-caidan:before {
   content: "\e61d";
 }
@@ -198,14 +234,6 @@
   content: "\e744";
 }
 
-.p-tengxunyun1:before {
-  content: "\e651";
-}
-
-.p-qiniuyun:before {
-  content: "\e62c";
-}
-
 .p-file-png:before {
   content: "\e7ae";
 }
@@ -250,10 +278,6 @@
   content: "\e60f";
 }
 
-.p-aws:before {
-  content: "\e600";
-}
-
 .p-taolun:before {
   content: "\e602";
 }
@@ -262,22 +286,10 @@
   content: "\e616";
 }
 
-.p-SFTP:before {
-  content: "\e647";
-}
-
 .p-huaban88:before {
   content: "\e67c";
 }
 
-.p-oss:before {
-  content: "\e607";
-}
-
-.p-minio:before {
-  content: "\e63c";
-}
-
 .p-logout:before {
   content: "\e8fe";
 }

frontend/src/assets/iconfont/iconfont.json

@@ -5,6 +5,83 @@
   "css_prefix_text": "p-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "29851742",
+      "name": "短信告警",
+      "font_class": "alert-1",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "33427786",
+      "name": "告警日志",
+      "font_class": "alert-2",
+      "unicode": "e701",
+      "unicode_decimal": 59137
+    },
+    {
+      "icon_id": "32101973",
+      "name": "Amazon_Web_Services_Logo",
+      "font_class": "aws",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "12959160",
+      "name": "腾讯云",
+      "font_class": "tengxunyun1",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24877229",
+      "name": "七牛云",
+      "font_class": "qiniuyun",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "20290513",
+      "name": "minio",
+      "font_class": "minio",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "13015332",
+      "name": "onedrive",
+      "font_class": "onedrive",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "16268521",
+      "name": "oss",
+      "font_class": "oss",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "13532955",
+      "name": "SFTP",
+      "font_class": "SFTP",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "23044673",
+      "name": "webdav",
+      "font_class": "webdav",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "30053592",
+      "name": "终端",
+      "font_class": "zhongduan",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
     {
       "icon_id": "1064806",
       "name": "docker",
@@ -292,13 +369,6 @@
       "unicode": "e856",
       "unicode_decimal": 59478
     },
-    {
-      "icon_id": "23044673",
-      "name": "webdav",
-      "font_class": "webdav",
-      "unicode": "e622",
-      "unicode_decimal": 58914
-    },
     {
       "icon_id": "10293150",
       "name": "详情",
@@ -306,13 +376,6 @@
       "unicode": "e677",
       "unicode_decimal": 58999
     },
-    {
-      "icon_id": "13015332",
-      "name": "onedrive",
-      "font_class": "onedrive",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
     {
       "icon_id": "7708032",
       "name": "菜单",
@@ -327,20 +390,6 @@
       "unicode": "e744",
       "unicode_decimal": 59204
     },
-    {
-      "icon_id": "12959160",
-      "name": "腾讯云",
-      "font_class": "tengxunyun1",
-      "unicode": "e651",
-      "unicode_decimal": 58961
-    },
-    {
-      "icon_id": "24877229",
-      "name": "七牛云",
-      "font_class": "qiniuyun",
-      "unicode": "e62c",
-      "unicode_decimal": 58924
-    },
     {
       "icon_id": "19671162",
       "name": "png-1",
@@ -418,13 +467,6 @@
       "unicode": "e60f",
       "unicode_decimal": 58895
     },
-    {
-      "icon_id": "32101973",
-      "name": "Amazon_Web_Services_Logo",
-      "font_class": "aws",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    },
     {
       "icon_id": "1760690",
       "name": "讨论",
@@ -439,13 +481,6 @@
       "unicode": "e616",
       "unicode_decimal": 58902
     },
-    {
-      "icon_id": "13532955",
-      "name": "SFTP",
-      "font_class": "SFTP",
-      "unicode": "e647",
-      "unicode_decimal": 58951
-    },
     {
       "icon_id": "15337722",
       "name": "Logo GitHub",
@@ -453,20 +488,6 @@
       "unicode": "e67c",
       "unicode_decimal": 59004
     },
-    {
-      "icon_id": "16268521",
-      "name": "oss",
-      "font_class": "oss",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "20290513",
-      "name": "minio",
-      "font_class": "minio",
-      "unicode": "e63c",
-      "unicode_decimal": 58940
-    },
     {
       "icon_id": "924436",
       "name": "logout",

frontend/src/components/app-status/index.vue

@@ -2,75 +2,68 @@
     <div>
         <div class="app-status" v-if="data.isExist">
             <el-card>
-                <div class="flex items-center">
-                    <div>
+                <div class="flex w-full flex-col gap-4 md:flex-row">
+                    <div class="flex flex-wrap gap-4">
                         <el-tag effect="dark" type="success">{{ data.app }}</el-tag>
+                        <Status :key="refresh" :status="data.status"></Status>
+                        <el-tag>{{ $t('app.version') }}:{{ data.version }}</el-tag>
                     </div>
-                    <div>
-                        <Status class="status-content" :key="refresh" :status="data.status"></Status>
-                    </div>
-                    <div>
-                        <el-tag class="status-content">{{ $t('app.version') }}:{{ data.version }}</el-tag>
-                    </div>
-                    <div>
-                        <span class="buttons">
-                            <el-button
-                                type="primary"
-                                v-if="data.status != 'Running'"
-                                link
-                                @click="onOperate('start')"
-                                :disabled="data.status === 'Installing'"
-                            >
-                                {{ $t('app.start') }}
-                            </el-button>
-                            <el-button type="primary" v-if="data.status === 'Running'" link @click="onOperate('stop')">
-                                {{ $t('app.stop') }}
-                            </el-button>
-                            <el-divider direction="vertical" />
-                            <el-button
-                                type="primary"
-                                link
-                                :disabled="data.status === 'Installing'"
-                                @click="onOperate('restart')"
-                            >
-                                {{ $t('app.restart') }}
-                            </el-button>
-                            <el-divider direction="vertical" />
-                            <el-button
-                                type="primary"
-                                link
-                                v-if="data.app === 'OpenResty'"
-                                @click="onOperate('reload')"
-                                :disabled="data.status !== 'Running'"
-                            >
-                                {{ $t('app.reload') }}
-                            </el-button>
-                            <el-divider v-if="data.app === 'OpenResty'" direction="vertical" />
-                            <el-button
-                                type="primary"
-                                @click="setting"
-                                link
-                                :disabled="
-                                    data.status === 'Installing' ||
-                                    (data.status !== 'Running' && data.app === 'OpenResty')
-                                "
-                            >
-                                {{ $t('commons.button.set') }}
-                            </el-button>
-                            <el-divider v-if="data.app === 'OpenResty'" direction="vertical" />
-                            <el-button
-                                v-if="data.app === 'OpenResty'"
-                                type="primary"
-                                @click="clear"
-                                link
-                                :disabled="
-                                    data.status === 'Installing' ||
-                                    (data.status !== 'Running' && data.app === 'OpenResty')
-                                "
-                            >
-                                {{ $t('nginx.clearProxyCache') }}
-                            </el-button>
-                        </span>
+
+                    <div class="mt-0.5">
+                        <el-button
+                            type="primary"
+                            v-if="data.status != 'Running'"
+                            link
+                            @click="onOperate('start')"
+                            :disabled="data.status === 'Installing'"
+                        >
+                            {{ $t('app.start') }}
+                        </el-button>
+                        <el-button type="primary" v-if="data.status === 'Running'" link @click="onOperate('stop')">
+                            {{ $t('app.stop') }}
+                        </el-button>
+                        <el-divider direction="vertical" />
+                        <el-button
+                            type="primary"
+                            link
+                            :disabled="data.status === 'Installing'"
+                            @click="onOperate('restart')"
+                        >
+                            {{ $t('app.restart') }}
+                        </el-button>
+                        <el-divider direction="vertical" />
+                        <el-button
+                            type="primary"
+                            link
+                            v-if="data.app === 'OpenResty'"
+                            @click="onOperate('reload')"
+                            :disabled="data.status !== 'Running'"
+                        >
+                            {{ $t('app.reload') }}
+                        </el-button>
+                        <el-divider v-if="data.app === 'OpenResty'" direction="vertical" />
+                        <el-button
+                            type="primary"
+                            @click="setting"
+                            link
+                            :disabled="
+                                data.status === 'Installing' || (data.status !== 'Running' && data.app === 'OpenResty')
+                            "
+                        >
+                            {{ $t('commons.button.set') }}
+                        </el-button>
+                        <el-divider v-if="data.app === 'OpenResty'" direction="vertical" />
+                        <el-button
+                            v-if="data.app === 'OpenResty'"
+                            type="primary"
+                            @click="clear"
+                            link
+                            :disabled="
+                                data.status === 'Installing' || (data.status !== 'Running' && data.app === 'OpenResty')
+                            "
+                        >
+                            {{ $t('nginx.clearProxyCache') }}
+                        </el-button>
                     </div>
 
                     <div class="ml-5" v-if="key === 'openresty' && (httpPort != 80 || httpsPort != 443)">
@@ -95,12 +88,12 @@
             <LayoutContent :title="getTitle(key)" :divider="true">
                 <template #main>
                     <div class="app-warn">
-                        <div class="flx-center">
-                            <span>{{ $t('app.checkInstalledWarn', [data.app]) }}</span>
-                            <span @click="goRouter(key)" class="flx-align-center">
-                                <el-icon class="ml-2"><Position /></el-icon>
+                        <div class="flex flex-col gap-4 items-cetner justify-center w-full sm:flex-row">
+                            <div>{{ $t('app.checkInstalledWarn', [data.app]) }}</div>
+                            <div @click="goRouter(key)" class="flex items-cetner justify-center text-[#74a4f3]">
+                                <el-icon class="flex items-center justify-center"><Position /></el-icon>
                                 {{ $t('database.goInstall') }}
-                            </span>
+                            </div>
                         </div>
                         <div>
                             <img src="@/assets/images/no_app.svg" />

frontend/src/components/backup/index.vue

@@ -72,30 +72,52 @@
             </ComplexTable>
         </el-drawer>
 
+        <el-dialog
+            v-model="open"
+            :title="isBackup ? $t('commons.button.backup') : $t('commons.button.recover') + ' - ' + name"
+            width="40%"
+            :close-on-click-modal="false"
+            :before-close="handleBackupClose"
+        >
+            <el-form ref="backupForm" label-position="left" v-loading="loading">
+                <el-form-item
+                    :label="$t('setting.compressPassword')"
+                    style="margin-top: 10px"
+                    v-if="type === 'app' || type === 'website'"
+                >
+                    <el-input v-model="secret" :placeholder="$t('setting.backupRecoverMessage')" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="handleBackupClose" :disabled="loading">
+                        {{ $t('commons.button.cancel') }}
+                    </el-button>
+                    <el-button type="primary" @click="onSubmit" :disabled="loading">
+                        {{ $t('commons.button.confirm') }}
+                    </el-button>
+                </span>
+            </template>
+        </el-dialog>
+
         <OpDialog ref="opRef" @search="search" />
     </div>
-
-    <AppBackUp ref="backupRef" @close="search" />
-    <AppRecover ref="recoverRef" />
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import { computeSize, dateFormat, downloadFile } from '@/utils/util';
-import { getBackupList } 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 router from '@/routers';
-import AppBackUp from '@/views/app-store/installed/backup/index.vue';
-import AppRecover from '@/views/app-store/installed/recover/index.vue';
+import { MsgSuccess } from '@/utils/message';
 
 const selects = ref<any>([]);
 const loading = ref();
 const opRef = ref();
-const backupRef = ref();
-const recoverRef = ref();
 
 const data = ref();
 const paginationConfig = reactive({
@@ -113,6 +135,10 @@ const backupPath = ref();
 const status = ref();
 const secret = ref();
 
+const open = ref();
+const isBackup = ref();
+const currentRow = ref();
+
 interface DialogProps {
     type: string;
     name: string;
@@ -133,6 +159,9 @@ const acceptParams = (params: DialogProps): void => {
 const handleClose = () => {
     backupVisible.value = false;
 };
+const handleBackupClose = () => {
+    open.value = false;
+};
 
 const loadBackupDir = () => {
     getBackupList().then((res) => {
@@ -175,25 +204,84 @@ const search = async () => {
 };
 
 const onBackup = async () => {
+    isBackup.value = true;
+    if (type.value !== 'app' && type.value !== 'website') {
+        ElMessageBox.confirm(
+            i18n.global.t('commons.msg.backupHelper', [name.value + '( ' + detailName.value + ' )']),
+            i18n.global.t('commons.button.backup'),
+            {
+                confirmButtonText: i18n.global.t('commons.button.confirm'),
+                cancelButtonText: i18n.global.t('commons.button.cancel'),
+            },
+        ).then(async () => {
+            onSubmit();
+        });
+        return;
+    }
+    open.value = true;
+};
+
+const onSubmit = async () => {
+    if (isBackup.value) {
+        let params = {
+            type: type.value,
+            name: name.value,
+            detailName: detailName.value,
+            secret: secret.value,
+        };
+        loading.value = true;
+        await handleBackup(params)
+            .then(() => {
+                loading.value = false;
+                handleClose();
+                handleBackupClose();
+                MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+                search();
+            })
+            .catch(() => {
+                loading.value = false;
+            });
+        return;
+    }
     let params = {
+        source: currentRow.value.source,
         type: type.value,
         name: name.value,
         detailName: detailName.value,
+        file: currentRow.value.fileDir + '/' + currentRow.value.fileName,
         secret: secret.value,
     };
-    backupRef.value.acceptParams(params);
+    loading.value = true;
+    await handleRecover(params)
+        .then(() => {
+            loading.value = false;
+            handleClose();
+            handleBackupClose();
+            MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+            search();
+        })
+        .catch(() => {
+            loading.value = false;
+        });
 };
 
 const onRecover = async (row: Backup.RecordInfo) => {
-    let params = {
-        source: row.source,
-        type: type.value,
-        name: name.value,
-        detailName: detailName.value,
-        file: row.fileDir + '/' + row.fileName,
-        secret: secret.value,
-    };
-    recoverRef.value.acceptParams(params);
+    isBackup.value = false;
+    currentRow.value = row;
+    if (type.value !== 'app' && type.value !== 'website') {
+        ElMessageBox.confirm(
+            i18n.global.t('commons.msg.recoverHelper', [name.value + '( ' + detailName.value + ' )']),
+            i18n.global.t('commons.button.recover'),
+            {
+                confirmButtonText: i18n.global.t('commons.button.confirm'),
+                cancelButtonText: i18n.global.t('commons.button.cancel'),
+            },
+        ).then(async () => {
+            onSubmit();
+        });
+        return;
+    }
+    open.value = true;
 };
 
 const onDownload = async (row: Backup.RecordInfo) => {

frontend/src/components/error-message/error_code.vue

@@ -1,16 +1,14 @@
 <template>
     <div>
-        <body>
-            <div>
-                <el-row type="flex" justify="center">
-                    <h1>{{ loadErrInfo() }}</h1>
-                </el-row>
-            </div>
-            <hr />
-            <div>
-                <el-row type="flex" justify="center"><span>nginx</span></el-row>
-            </div>
-        </body>
+        <div>
+            <el-row type="flex" justify="center">
+                <h1>{{ loadErrInfo() }}</h1>
+            </el-row>
+        </div>
+        <hr />
+        <div>
+            <el-row type="flex" justify="center"><span>nginx</span></el-row>
+        </div>
     </div>
 </template>
 

frontend/src/components/layout-content/index.vue

@@ -105,6 +105,9 @@ const showBack = computed(() => {
 
 .content-container__toolbar {
     margin-top: 20px;
+    .el-button + .el-button {
+        margin: 0 !important;
+    }
 }
 
 .content-container_form {

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

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading="isLoading">
         <div v-if="defaultButton">
             <el-checkbox border v-model="tailLog" class="float-left" @change="changeTail(false)">
                 {{ $t('commons.button.watch') }}
@@ -29,7 +29,6 @@ import { ReadByLine } from '@/api/modules/files';
 import { watch } from 'vue';
 
 const editorRef = ref();
-
 interface LogProps {
     id?: number;
     type: string;
@@ -74,10 +73,11 @@ let timer: NodeJS.Timer | null = null;
 const tailLog = ref(false);
 const content = ref('');
 const end = ref(false);
-const lastContent = ref('');
 const scrollerElement = ref<HTMLElement | null>(null);
 const minPage = ref(1);
 const maxPage = ref(1);
+const logs = ref([]);
+const isLoading = ref(false);
 
 const readReq = reactive({
     id: 0,
@@ -114,7 +114,12 @@ const stopSignals = [
     'image push successful!',
 ];
 
+const lastLogs = ref([]);
+
 const getContent = (pre: boolean) => {
+    if (isLoading.value) {
+        return;
+    }
     emit('update:isReading', true);
     readReq.id = props.config.id;
     readReq.type = props.config.type;
@@ -122,38 +127,55 @@ const getContent = (pre: boolean) => {
     if (readReq.page < 1) {
         readReq.page = 1;
     }
+    isLoading.value = true;
     ReadByLine(readReq).then((res) => {
         if (!end.value && res.data.end) {
-            lastContent.value = content.value;
+            lastLogs.value = [...logs.value];
         }
 
-        res.data.content = res.data.content.replace(/\\u(\w{4})/g, function (match, grp) {
-            return String.fromCharCode(parseInt(grp, 16));
-        });
         data.value = res.data;
-        if (res.data.content != '') {
-            if (stopSignals.some((signal) => res.data.content.endsWith(signal))) {
+        if (res.data.lines && res.data.lines.length > 0) {
+            res.data.lines = res.data.lines.map((line) =>
+                line.replace(/\\u(\w{4})/g, function (match, grp) {
+                    return String.fromCharCode(parseInt(grp, 16));
+                }),
+            );
+            const newLogs = res.data.lines;
+            if (newLogs.length === readReq.pageSize && readReq.page < res.data.total) {
+                readReq.page++;
+            }
+
+            if (
+                readReq.type == 'php' &&
+                logs.value.length > 0 &&
+                newLogs.length > 0 &&
+                newLogs[newLogs.length - 1] === logs.value[logs.value.length - 1]
+            ) {
+                isLoading.value = false;
+                return;
+            }
+
+            if (stopSignals.some((signal) => newLogs[newLogs.length - 1].endsWith(signal))) {
                 onCloseLog();
             }
             if (end.value) {
-                if (lastContent.value == '') {
-                    content.value = res.data.content;
+                if ((logs.value.length = 0)) {
+                    logs.value = newLogs;
                 } else {
-                    content.value = pre
-                        ? res.data.content + '\n' + lastContent.value
-                        : lastContent.value + '\n' + res.data.content;
+                    logs.value = pre ? [...newLogs, ...lastLogs.value] : [...lastLogs.value, ...newLogs];
                 }
             } else {
-                if (content.value == '') {
-                    content.value = res.data.content;
+                if ((logs.value.length = 0)) {
+                    logs.value = newLogs;
                 } else {
-                    content.value = pre
-                        ? res.data.content + '\n' + content.value
-                        : content.value + '\n' + res.data.content;
+                    logs.value = pre ? [...newLogs, ...logs.value] : [...logs.value, ...newLogs];
                 }
             }
         }
+
         end.value = res.data.end;
+        content.value = logs.value.join('\n');
+
         emit('update:hasContent', content.value !== '');
         nextTick(() => {
             if (pre) {
@@ -171,16 +193,52 @@ const getContent = (pre: boolean) => {
             maxPage.value = res.data.total;
             minPage.value = res.data.total;
         }
+        if (logs.value && logs.value.length > 3000) {
+            logs.value.splice(0, readReq.pageSize);
+            if (minPage.value > 1) {
+                minPage.value--;
+            }
+        }
+
+        isLoading.value = false;
     });
 };
 
+function throttle<T extends (...args: any[]) => any>(func: T, limit: number): (...args: Parameters<T>) => void {
+    let inThrottle: boolean;
+    let lastFunc: ReturnType<typeof setTimeout>;
+    let lastRan: number;
+    return function (this: any, ...args: Parameters<T>) {
+        if (!inThrottle) {
+            func.apply(this, args);
+            lastRan = Date.now();
+            inThrottle = true;
+            setTimeout(() => (inThrottle = false), limit);
+        } else {
+            clearTimeout(lastFunc);
+            lastFunc = setTimeout(() => {
+                if (Date.now() - lastRan >= limit) {
+                    func.apply(this, args);
+                    lastRan = Date.now();
+                }
+            }, limit - (Date.now() - lastRan));
+        }
+    };
+}
+
+const throttledGetContent = throttle(getContent, 3000);
+
+const search = () => {
+    throttledGetContent(false);
+};
+
 const changeTail = (fromOutSide: boolean) => {
     if (fromOutSide) {
         tailLog.value = !tailLog.value;
     }
     if (tailLog.value) {
         timer = setInterval(() => {
-            getContent(false);
+            search();
         }, 1000 * 3);
     } else {
         onCloseLog();
@@ -198,6 +256,7 @@ const onCloseLog = async () => {
     tailLog.value = false;
     clearInterval(Number(timer));
     timer = null;
+    isLoading.value = false;
 };
 
 function isScrolledToBottom(element: HTMLElement): boolean {
@@ -218,7 +277,7 @@ const init = () => {
         changeTail(false);
     }
     readReq.latest = true;
-    getContent(false);
+    search();
 
     nextTick(() => {});
 };
@@ -232,9 +291,14 @@ const initCodemirror = () => {
         if (editorRef.value) {
             scrollerElement.value = editorRef.value.$el as HTMLElement;
             scrollerElement.value.addEventListener('scroll', function () {
+                if (tailLog.value) {
+                    return;
+                }
                 if (isScrolledToBottom(scrollerElement.value)) {
-                    readReq.page = maxPage.value;
-                    getContent(false);
+                    if (maxPage.value > 1) {
+                        readReq.page = maxPage.value;
+                    }
+                    search();
                 }
                 if (isScrolledToTop(scrollerElement.value)) {
                     readReq.page = minPage.value - 1;
@@ -242,7 +306,7 @@ const initCodemirror = () => {
                         return;
                     }
                     minPage.value = readReq.page;
-                    getContent(true);
+                    throttledGetContent(true);
                 }
             });
             let hljsDom = scrollerElement.value.querySelector('.hljs') as HTMLElement;