diff --git a/agent/app/repo/app_install.go b/agent/app/repo/app_install.go index 46596e9cd..60b977d81 100644 --- a/agent/app/repo/app_install.go +++ b/agent/app/repo/app_install.go @@ -136,7 +136,7 @@ func (a *AppInstallRepo) Create(ctx context.Context, install *model.AppInstall) } func (a *AppInstallRepo) Save(ctx context.Context, install *model.AppInstall) error { - return getTx(ctx).Debug().Omit("App").Save(&install).Error + return getTx(ctx).Omit("App").Save(&install).Error } func (a *AppInstallRepo) DeleteBy(opts ...DBOption) error { diff --git a/agent/app/service/app.go b/agent/app/service/app.go index d968b654c..622d6b7c2 100644 --- a/agent/app/service/app.go +++ b/agent/app/service/app.go @@ -182,7 +182,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, nil); err != nil { + if err = downloadApp(app, detail, nil, nil); err != nil && !fileOp.Stat(versionPath) { return appDetailDTO, err } } diff --git a/agent/app/service/website.go b/agent/app/service/website.go index 8ec4e4114..61dbd3bcb 100644 --- a/agent/app/service/website.go +++ b/agent/app/service/website.go @@ -201,10 +201,7 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons func (w WebsiteService) GetWebsites() ([]response.WebsiteDTO, error) { var websiteDTOs []response.WebsiteDTO - websites, err := websiteRepo.List(commonRepo.WithOrderRuleBy("primary_domain", "ascending")) - if err != nil { - return nil, err - } + websites, _ := websiteRepo.List(commonRepo.WithOrderRuleBy("primary_domain", "ascending")) for _, web := range websites { res := response.WebsiteDTO{ Website: web, @@ -513,10 +510,7 @@ func (w WebsiteService) GetWebsiteOptions(req request.WebsiteOptionReq) ([]respo if len(req.Types) > 0 { options = append(options, websiteRepo.WithTypes(req.Types)) } - webs, err := websiteRepo.List(options...) - if err != nil { - return nil, err - } + webs, _ := websiteRepo.List(options...) var datas []response.WebsiteOption for _, web := range webs { var item response.WebsiteOption @@ -2903,3 +2897,7 @@ func (w WebsiteService) UpdateDefaultHtml(req request.WebsiteHtmlUpdate) error { } return fileOp.SaveFile(resourcePath, req.Content, 0644) } + +func (w WebsiteService) GetUpStreams() ([]dto.NginxUpstream, error) { + return nil, nil +} diff --git a/agent/utils/http/request.go b/agent/utils/http/request.go index b3c56bee0..3d64853d6 100644 --- a/agent/utils/http/request.go +++ b/agent/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 diff --git a/frontend/src/api/modules/website.ts b/frontend/src/api/modules/website.ts index 54d613b98..eff283569 100644 --- a/frontend/src/api/modules/website.ts +++ b/frontend/src/api/modules/website.ts @@ -38,8 +38,8 @@ export const GetWebsite = (id: number) => { return http.get(`/websites/${id}`); }; -export const GetWebsiteOptions = () => { - return http.get(`/websites/options`); +export const GetWebsiteOptions = (req: Website.OptionReq) => { + return http.post(`/websites/options`, req); }; export const GetWebsiteConfig = (id: number, type: string) => { diff --git a/frontend/src/components/layout-content/index.vue b/frontend/src/components/layout-content/index.vue index ab7e21d31..6507ed4ac 100644 --- a/frontend/src/components/layout-content/index.vue +++ b/frontend/src/components/layout-content/index.vue @@ -33,9 +33,6 @@ -
diff --git a/frontend/src/components/log-file/index.vue b/frontend/src/components/log-file/index.vue index b2ccf3e6c..6ada55232 100644 --- a/frontend/src/components/log-file/index.vue +++ b/frontend/src/components/log-file/index.vue @@ -18,6 +18,7 @@ language="JavaScript" :autodetect="false" :code="content" + :style="editorStyle" >
@@ -37,6 +38,15 @@ interface LogProps { tail?: boolean; } +const editorStyle = computed(() => { + const height = 'calc(100vh - ' + props.heightDiff + 'px)'; + return { + height, + width: '100%', + overflow: 'auto', + }; +}); + const props = defineProps({ config: { type: Object as () => LogProps | null, @@ -47,10 +57,6 @@ const props = defineProps({ tail: false, }), }, - style: { - type: String, - default: 'height: calc(100vh - 200px); width: 100%; min-height: 400px; overflow: auto;', - }, defaultButton: { type: Boolean, default: true, @@ -63,6 +69,10 @@ const props = defineProps({ type: Boolean, default: false, }, + heightDiff: { + type: Number, + default: 500, + }, }); const data = ref({ enable: false, @@ -246,7 +256,7 @@ const initCodemirror = () => { } }); let hljsDom = scrollerElement.value.querySelector('.hljs') as HTMLElement; - hljsDom.style['min-height'] = '100px'; + hljsDom.style.minHeight = '95%'; } }); }; @@ -264,9 +274,7 @@ defineExpose({ changeTail, onDownload, clearLog }); diff --git a/frontend/src/components/main-div/index.vue b/frontend/src/components/main-div/index.vue index 55ebd4248..5c6960f93 100644 --- a/frontend/src/components/main-div/index.vue +++ b/frontend/src/components/main-div/index.vue @@ -1,32 +1,36 @@ - + diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue index 4c70c91cb..5f831c70f 100644 --- a/frontend/src/views/container/compose/create/index.vue +++ b/frontend/src/views/container/compose/create/index.vue @@ -49,17 +49,17 @@ :heightDiff="400" > -
- -
+
+ +