From f2b0eeb1f721aba2232d826497cfc2b03d5e7c62 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 27 Feb 2023 17:22:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=BA=94=E7=94=A8=E6=B2=A1=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=9A=84=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/v1/app.go | 4 ++++ backend/app/model/app.go | 4 ++-- backend/app/model/app_install.go | 4 ++-- backend/app/model/app_install_backup.go | 2 +- backend/app/model/website.go | 4 ++-- backend/app/model/website_ssl.go | 4 ++-- backend/app/service/app.go | 5 ++++- backend/app/service/website.go | 2 +- backend/init/db/db.go | 4 +++- backend/utils/compose/compose.go | 15 +++++---------- frontend/src/assets/fonts/font.scss | 4 ---- frontend/src/main.ts | 4 ---- .../views/website/website/nginx/status/index.vue | 14 +++++++------- 13 files changed, 33 insertions(+), 37 deletions(-) delete mode 100644 frontend/src/assets/fonts/font.scss diff --git a/backend/app/api/v1/app.go b/backend/app/api/v1/app.go index 4fa7fe3dd..850dfaf0c 100644 --- a/backend/app/api/v1/app.go +++ b/backend/app/api/v1/app.go @@ -4,6 +4,7 @@ import ( "github.com/1Panel-dev/1Panel/backend/app/api/v1/helper" "github.com/1Panel-dev/1Panel/backend/app/dto/request" "github.com/1Panel-dev/1Panel/backend/constant" + "github.com/1Panel-dev/1Panel/backend/global" "github.com/gin-gonic/gin" ) @@ -37,10 +38,13 @@ func (b *BaseApi) SearchApp(c *gin.Context) { // @Router /apps/sync [post] // @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFuntions":[],"formatZH":"应用商店同步","formatEN":"App store synchronization"} func (b *BaseApi) SyncApp(c *gin.Context) { + global.LOG.Infof("sync app list start ...") if err := appService.SyncAppList(); err != nil { + global.LOG.Errorf("sync app list error [%s]", err.Error()) helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err) return } + global.LOG.Infof("sync app list success!") helper.SuccessWithData(c, "") } diff --git a/backend/app/model/app.go b/backend/app/model/app.go index c892cc7da..58b4b834f 100644 --- a/backend/app/model/app.go +++ b/backend/app/model/app.go @@ -16,7 +16,7 @@ type App struct { Github string `json:"github" gorm:"type:varchar(64);not null"` Document string `json:"document" gorm:"type:varchar(64);not null"` Recommend int `json:"recommend" gorm:"type:Integer;not null"` - Details []AppDetail `json:"-"` + Details []AppDetail `json:"-" gorm:"-:migration"` TagsKey []string `json:"-" gorm:"-"` - AppTags []AppTag `json:"-" ` + AppTags []AppTag `json:"-" gorm:"-:migration"` } diff --git a/backend/app/model/app_install.go b/backend/app/model/app_install.go index 4044f86ff..8a3285950 100644 --- a/backend/app/model/app_install.go +++ b/backend/app/model/app_install.go @@ -21,8 +21,8 @@ type AppInstall struct { ServiceName string `json:"serviceName" gorm:"type:varchar(256);not null"` HttpPort int `json:"httpPort" gorm:"type:integer;not null"` HttpsPort int `json:"httpsPort" gorm:"type:integer;not null"` - App App `json:"app"` - Backups []AppInstallBackup `json:"backups"` + App App `json:"app" gorm:"-:migration"` + Backups []AppInstallBackup `json:"backups" gorm:"-:migration"` } func (i *AppInstall) GetPath() string { diff --git a/backend/app/model/app_install_backup.go b/backend/app/model/app_install_backup.go index b9018bfed..f70a21ac3 100644 --- a/backend/app/model/app_install_backup.go +++ b/backend/app/model/app_install_backup.go @@ -7,5 +7,5 @@ type AppInstallBackup struct { Param string `gorm:"type:longtext;" json:"param"` AppDetailId uint `gorm:"type:integer;not null" json:"app_detail_id"` AppInstallId uint `gorm:"type:integer;not null" json:"app_install_id"` - AppDetail AppDetail `json:"-"` + AppDetail AppDetail `json:"-" gorm:"-:migration"` } diff --git a/backend/app/model/website.go b/backend/app/model/website.go index 6943ef348..7f3a7a099 100644 --- a/backend/app/model/website.go +++ b/backend/app/model/website.go @@ -19,8 +19,8 @@ type Website struct { ErrorLog bool `json:"errorLog"` AccessLog bool `json:"accessLog"` DefaultServer bool `json:"defaultServer"` - Domains []WebsiteDomain `json:"domains"` - WebsiteSSL WebsiteSSL `json:"webSiteSSL"` + Domains []WebsiteDomain `json:"domains" gorm:"-:migration"` + WebsiteSSL WebsiteSSL `json:"webSiteSSL" gorm:"-:migration"` } func (w Website) TableName() string { diff --git a/backend/app/model/website_ssl.go b/backend/app/model/website_ssl.go index f880ac2bd..7382fef04 100644 --- a/backend/app/model/website_ssl.go +++ b/backend/app/model/website_ssl.go @@ -18,8 +18,8 @@ type WebsiteSSL struct { ExpireDate time.Time `json:"expireDate"` StartDate time.Time `json:"startDate"` - AcmeAccount WebsiteAcmeAccount `json:"acmeAccount"` - Websites []Website `json:"websites"` + AcmeAccount WebsiteAcmeAccount `json:"acmeAccount" gorm:"-:migration"` + Websites []Website `json:"websites" gorm:"-:migration"` } func (w WebsiteSSL) TableName() string { diff --git a/backend/app/service/app.go b/backend/app/service/app.go index be48f7caf..ef4fd18e3 100644 --- a/backend/app/service/app.go +++ b/backend/app/service/app.go @@ -356,7 +356,9 @@ func (a AppService) GetAppUpdate() (*response.AppUpdateRes, error) { if err != nil { return nil, err } - versionRes, err := http.Get(fmt.Sprintf("%s/%s/%s/appstore/apps.json", global.CONF.System.RepoUrl, global.CONF.System.Mode, setting.SystemVersion)) + versionUrl := fmt.Sprintf("%s/%s/%s/appstore/apps.json", global.CONF.System.RepoUrl, global.CONF.System.Mode, setting.SystemVersion) + versionRes, err := http.Get(versionUrl) + global.LOG.Infof("get current version from [%s]", versionUrl) if err != nil { return nil, err } @@ -384,6 +386,7 @@ func (a AppService) SyncAppList() error { return err } if !updateRes.CanUpdate { + global.LOG.Infof("The latest version is [%s] The app store is already up to date", updateRes.Version) return nil } if err := getAppFromRepo(updateRes.DownloadPath, updateRes.Version); err != nil { diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 56476ef23..a9c36d4fe 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -143,7 +143,7 @@ func (w WebsiteService) CreateWebsite(ctx context.Context, create request.Websit return err } appInstall = &install - website.AppInstallID = 0 + website.AppInstallID = appInstall.ID } } diff --git a/backend/init/db/db.go b/backend/init/db/db.go index d5ced3c33..90bf72a45 100644 --- a/backend/init/db/db.go +++ b/backend/init/db/db.go @@ -21,7 +21,9 @@ func Init() { panic(fmt.Errorf("init db file falied, err: %v", err)) } } - db, err := gorm.Open(sqlite.Open(fullPath), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(fullPath), &gorm.Config{ + DisableForeignKeyConstraintWhenMigrating: true, + }) if err != nil { panic(err) } diff --git a/backend/utils/compose/compose.go b/backend/utils/compose/compose.go index b664989e1..a35a8e11e 100644 --- a/backend/utils/compose/compose.go +++ b/backend/utils/compose/compose.go @@ -8,32 +8,27 @@ import ( func Up(filePath string) (string, error) { stdout, err := cmd.Execf("docker-compose -f %s up -d", filePath) - return string(stdout), err + return stdout, err } func Down(filePath string) (string, error) { stdout, err := cmd.Execf("docker-compose -f %s down", filePath) - return string(stdout), err + return stdout, err } func Stop(filePath string) (string, error) { stdout, err := cmd.Execf("docker-compose -f %s stop", filePath) - return string(stdout), err + return stdout, err } func Restart(filePath string) (string, error) { stdout, err := cmd.Execf("docker-compose -f %s restart", filePath) - return string(stdout), err + return stdout, err } func Operate(filePath, operation string) (string, error) { stdout, err := cmd.Execf("docker-compose -f %s %s", filePath, operation) - return string(stdout), err -} - -func Rmf(filePath string) (string, error) { - stdout, err := cmd.Execf("docker-compose -f %s rm -f", filePath) - return string(stdout), err + return stdout, err } func GetComposeProject(yml []byte, env map[string]string) (*types.Project, error) { diff --git a/frontend/src/assets/fonts/font.scss b/frontend/src/assets/fonts/font.scss deleted file mode 100644 index c9da70cb4..000000000 --- a/frontend/src/assets/fonts/font.scss +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: 'pingFangSC-Regular'; - src: url('./PingFang-SC-Regular.ttf'); -} diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 120ca2a41..8c561811e 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -1,12 +1,8 @@ import { createApp } from 'vue'; import App from './App.vue'; -// import 'element-plus/dist/index.css'; -// import 'element-plus/theme-chalk/dark/css-vars.css'; import '@/styles/index.scss'; -// import '@/styles/reset.scss'; import '@/styles/common.scss'; -import '@/assets/fonts/font.scss'; import '@/assets/iconfont/iconfont.css'; import '@/assets/iconfont/iconfont.js'; diff --git a/frontend/src/views/website/website/nginx/status/index.vue b/frontend/src/views/website/website/nginx/status/index.vue index 921652b49..4282d53fb 100644 --- a/frontend/src/views/website/website/nginx/status/index.vue +++ b/frontend/src/views/website/website/nginx/status/index.vue @@ -4,44 +4,44 @@ {{ data.active }} {{ data.accepts }} {{ data.handled }} {{ data.requests }} {{ data.reading }} {{ data.writing }} {{ data.waiting }}