gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

feat: 取消启动时自动更新应用

Browse Source
This commit is contained in:
zhengkunwang223 2023-02-13 11:38:09 +04:00 committed by zhengkunwang223
parent fa9d524368
commit eefec2560c
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/app/service/app.go
View File

@ -25,6 +25,20 @@ import (
type AppService struct { type AppService struct {
} }
type IAppService interface {
PageApp(req request.AppSearch) (interface{}, error)
GetAppTags() ([]response.TagDTO, error)
GetApp(key string) (*response.AppDTO, error)
GetAppDetail(appId uint, version string) (response.AppDetailDTO, error)
Install(ctx context.Context, req request.AppInstallCreate) (*model.AppInstall, error)
SyncInstalled(installId uint) error
SyncAppList() error
}
func NewIAppService() IAppService {
return &AppService{}
}
func (a AppService) PageApp(req request.AppSearch) (interface{}, error) { func (a AppService) PageApp(req request.AppSearch) (interface{}, error) {
var opts []repo.DBOption var opts []repo.DBOption
opts = append(opts, appRepo.OrderByRecommend()) opts = append(opts, appRepo.OrderByRecommend())
@ -131,7 +145,6 @@ func (a AppService) GetAppDetail(appId uint, version string) (response.AppDetail
appDetailDTO response.AppDetailDTO appDetailDTO response.AppDetailDTO
opts []repo.DBOption opts []repo.DBOption
) )
opts = append(opts, appDetailRepo.WithAppId(appId), appDetailRepo.WithVersion(version)) opts = append(opts, appDetailRepo.WithAppId(appId), appDetailRepo.WithVersion(version))
detail, err := appDetailRepo.GetFirst(opts...) detail, err := appDetailRepo.GetFirst(opts...)
if err != nil { if err != nil {
@ -152,7 +165,6 @@ func (a AppService) GetAppDetail(appId uint, version string) (response.AppDetail
if err := checkLimit(app); err != nil { if err := checkLimit(app); err != nil {
appDetailDTO.Enable = false appDetailDTO.Enable = false
} }
return appDetailDTO, nil return appDetailDTO, nil
} }
@ -160,7 +172,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
if list, _ := appInstallRepo.ListBy(commonRepo.WithByName(req.Name)); len(list) > 0 { if list, _ := appInstallRepo.ListBy(commonRepo.WithByName(req.Name)); len(list) > 0 {
return nil, buserr.New(constant.ErrNameIsExist) return nil, buserr.New(constant.ErrNameIsExist)
} }
httpPort, err := checkPort("PANEL_APP_PORT_HTTP", req.Params) httpPort, err := checkPort("PANEL_APP_PORT_HTTP", req.Params)
if err != nil { if err != nil {
return nil, err return nil, err
@ -169,7 +180,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
appDetail, err := appDetailRepo.GetFirst(commonRepo.WithByID(req.AppDetailId)) appDetail, err := appDetailRepo.GetFirst(commonRepo.WithByID(req.AppDetailId))
if err != nil { if err != nil {
return nil, err return nil, err
@ -178,14 +188,12 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := checkRequiredAndLimit(app); err != nil { if err := checkRequiredAndLimit(app); err != nil {
return nil, err return nil, err
} }
if err := copyAppData(app.Key, appDetail.Version, req.Name, req.Params); err != nil { if err := copyAppData(app.Key, appDetail.Version, req.Name, req.Params); err != nil {
return nil, err return nil, err
} }
paramByte, err := json.Marshal(req.Params) paramByte, err := json.Marshal(req.Params)
if err != nil { if err != nil {
return nil, err return nil, err
@ -201,7 +209,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
HttpsPort: httpsPort, HttpsPort: httpsPort,
App: app, App: app,
} }
composeMap := make(map[string]interface{}) composeMap := make(map[string]interface{})
if err := yaml.Unmarshal([]byte(appDetail.DockerCompose), &composeMap); err != nil { if err := yaml.Unmarshal([]byte(appDetail.DockerCompose), &composeMap); err != nil {
return nil, err return nil, err

8
backend/init/business/business.go
View File

@ -3,9 +3,17 @@ package business
import ( import (
"github.com/1Panel-dev/1Panel/backend/app/service" "github.com/1Panel-dev/1Panel/backend/app/service"
"github.com/1Panel-dev/1Panel/backend/global" "github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/utils/common"
) )
func Init() { func Init() {
setting, err := service.NewISettingService().GetSettingInfo()
if err != nil {
global.LOG.Errorf("sync app error: %s", err.Error())
}
if common.CompareVersion(setting.AppStoreVersion, "0.0") {
return
}
appService := service.AppService{} appService := service.AppService{}
if err := appService.SyncAppList(); err != nil { if err := appService.SyncAppList(); err != nil {
global.LOG.Errorf("sync app error: %s", err.Error()) global.LOG.Errorf("sync app error: %s", err.Error())