gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-16 18:54:43 +08:00
Code

fix: 解决创建网站中报错导致的锁库

Browse Source
This commit is contained in:
zhengkunwang223 2023-02-08 18:12:13 +08:00 committed by zhengkunwang223
parent 1dc6267409
commit 58252caa20
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/app/api/v1/website.go
View File

@ -79,11 +79,14 @@ func (b *BaseApi) CreateWebsite(c *gin.Context) {
helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err) helper.ErrorWithDetail(c, constant.CodeErrBadRequest, constant.ErrTypeInvalidParams, err)
return return
} }
err := websiteService.CreateWebsite(req) tx, ctx := helper.GetTxAndContext()
err := websiteService.CreateWebsite(ctx, req)
if err != nil { if err != nil {
tx.Rollback()
helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err) helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
return return
} }
tx.Commit()
helper.SuccessWithData(c, nil) helper.SuccessWithData(c, nil)
} }

16
backend/app/service/website.go
View File

@ -30,7 +30,7 @@ type WebsiteService struct {
type IWebsiteService interface { type IWebsiteService interface {
PageWebsite(req request.WebsiteSearch) (int64, []response.WebsiteDTO, error) PageWebsite(req request.WebsiteSearch) (int64, []response.WebsiteDTO, error)
GetWebsites() ([]response.WebsiteDTO, error) GetWebsites() ([]response.WebsiteDTO, error)
CreateWebsite(create request.WebsiteCreate) error CreateWebsite(ctx context.Context, create request.WebsiteCreate) error
OpWebsite(req request.WebsiteOp) error OpWebsite(req request.WebsiteOp) error
GetWebsiteOptions() ([]string, error) GetWebsiteOptions() ([]string, error)
Backup(id uint) error Backup(id uint) error
@ -96,7 +96,7 @@ func (w WebsiteService) GetWebsites() ([]response.WebsiteDTO, error) {
return websiteDTOs, nil return websiteDTOs, nil
} }
func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) error { func (w WebsiteService) CreateWebsite(ctx context.Context, create request.WebsiteCreate) error {
if exist, _ := websiteRepo.GetBy(websiteRepo.WithDomain(create.PrimaryDomain)); len(exist) > 0 { if exist, _ := websiteRepo.GetBy(websiteRepo.WithDomain(create.PrimaryDomain)); len(exist) > 0 {
return buserr.New(constant.ErrNameIsExist) return buserr.New(constant.ErrNameIsExist)
} }
@ -123,7 +123,6 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) error {
ErrorLog: true, ErrorLog: true,
} }
tx, ctx := getTxAndContext()
var appInstall *model.AppInstall var appInstall *model.AppInstall
switch create.Type { switch create.Type {
case constant.Deployment: case constant.Deployment:
@ -161,7 +160,6 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) error {
} }
domainModel, err := getDomain(domain, website.ID) domainModel, err := getDomain(domain, website.ID)
if err != nil { if err != nil {
tx.Rollback()
return err return err
} }
if reflect.DeepEqual(domainModel, model.WebsiteDomain{}) { if reflect.DeepEqual(domainModel, model.WebsiteDomain{}) {
@ -171,18 +169,10 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) error {
} }
if len(domains) > 0 { if len(domains) > 0 {
if err := websiteDomainRepo.BatchCreate(ctx, domains); err != nil { if err := websiteDomainRepo.BatchCreate(ctx, domains); err != nil {
tx.Rollback()
return err return err
} }
} }
return configDefaultNginx(website, domains, appInstall)
if err := configDefaultNginx(website, domains, appInstall); err != nil {
tx.Rollback()
return err
}
tx.Commit()
return nil
} }
func (w WebsiteService) OpWebsite(req request.WebsiteOp) error { func (w WebsiteService) OpWebsite(req request.WebsiteOp) error {