diff --git a/backend/app/service/app_install.go b/backend/app/service/app_install.go index cae799f29..2bbad072d 100644 --- a/backend/app/service/app_install.go +++ b/backend/app/service/app_install.go @@ -490,6 +490,9 @@ func syncById(installId uint) error { if err != nil { return err } + if appInstall.Status == constant.Installing { + return nil + } containerNames, err := getContainerNames(appInstall) if err != nil { diff --git a/backend/utils/ssl/acme.go b/backend/utils/ssl/acme.go index 26310ee98..110d6c171 100644 --- a/backend/utils/ssl/acme.go +++ b/backend/utils/ssl/acme.go @@ -27,7 +27,6 @@ func GetPrivateKey(priKey crypto.PrivateKey) []byte { } func NewRegisterClient(email string) (*AcmeClient, error) { - priKey, err := rsa.GenerateKey(rand.Reader, 2048) if err != nil { panic(err) @@ -58,7 +57,6 @@ func NewRegisterClient(email string) (*AcmeClient, error) { } func NewPrivateKeyClient(email string, privateKey string) (*AcmeClient, error) { - block, _ := pem.Decode([]byte(privateKey)) priKey, err := x509.ParsePKCS1PrivateKey(block.Bytes) if err != nil { diff --git a/cmd/server/web/web.go b/cmd/server/web/web.go deleted file mode 100644 index dc7a3d3b0..000000000 --- a/cmd/server/web/web.go +++ /dev/null @@ -1,15 +0,0 @@ -package web - -import "embed" - -//go:embed index.html -var IndexHtml embed.FS - -//go:embed assets/* -var Assets embed.FS - -//go:embed index.html -var IndexByte []byte - -//go:embed favicon.png -var Favicon embed.FS diff --git a/frontend/auto-imports.d.ts b/frontend/auto-imports.d.ts deleted file mode 100644 index fd8cc86b8..000000000 --- a/frontend/auto-imports.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by 'unplugin-auto-import' -// We suggest you to commit this file into source control -declare global { - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']; -} -export {}; diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue index a5b2e4634..885ef0759 100644 --- a/frontend/src/components/app-status/index.vue +++ b/frontend/src/components/app-status/index.vue @@ -8,14 +8,25 @@ {{ $t('app.version') }}:{{ data.version }} - + {{ $t('app.start') }} {{ $t('app.stop') }} - + {{ $t('app.restart') }} @@ -23,7 +34,9 @@ type="primary" @click="setting" link - :disabled="data.status !== 'Running' && data.app === 'OpenResty'" + :disabled=" + data.status === 'Installing' || (data.status !== 'Running' && data.app === 'OpenResty') + " > {{ $t('commons.button.set') }} @@ -128,7 +141,7 @@ const onOperate = async (operation: string) => { const getTitle = (key: string) => { switch (key) { - case 'nginx': + case 'openresty': return i18n.global.t('website.website'); case 'mysql': return 'MySQL ' + i18n.global.t('menu.database'); diff --git a/frontend/src/views/container/image/build/index.vue b/frontend/src/views/container/image/build/index.vue deleted file mode 100644 index a212d9452..000000000 --- a/frontend/src/views/container/image/build/index.vue +++ /dev/null @@ -1,199 +0,0 @@ - - -