fix: 解决 PHP 运行环境网站删除之后没有删除应用的问题 (#6036)

1Panel-dev · Aug 6, 2024 · d639e46 · d639e46
1 parent fa633bf
commit d639e46
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/backend/app/dto/response/website.go b/backend/app/dto/response/website.go
@@ -30,6 +30,7 @@ type WebsiteRes struct {
 	RuntimeName   string    `json:"runtimeName"`
 	SSLExpireDate time.Time `json:"sslExpireDate"`
 	SSLStatus     string    `json:"sslStatus"`
+	AppInstallID  uint      `json:"appInstallId"`
 }
 
 type WebsiteOption struct {

diff --git a/backend/app/service/website.go b/backend/app/service/website.go
@@ -139,8 +139,9 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 	}
 	for _, web := range websites {
 		var (
-			appName     string
-			runtimeName string
+			appName      string
+			runtimeName  string
+			appInstallID uint
 		)
 		switch web.Type {
 		case constant.Deployment:
@@ -149,12 +150,14 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 				return 0, nil, err
 			}
 			appName = appInstall.Name
+			appInstallID = appInstall.ID
 		case constant.Runtime:
 			runtime, err := runtimeRepo.GetFirst(commonRepo.WithByID(web.RuntimeID))
 			if err != nil {
 				return 0, nil, err
 			}
 			runtimeName = runtime.Name
+			appInstallID = runtime.ID
 		}
 		sitePath := path.Join(constant.AppInstallDir, constant.AppOpenresty, nginxInstall.Name, "www", "sites", web.Alias)
 
@@ -173,6 +176,7 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 			SSLStatus:     checkSSLStatus(web.WebsiteSSL.ExpireDate),
 			RuntimeName:   runtimeName,
 			SitePath:      sitePath,
+			AppInstallID:  appInstallID,
 		})
 	}
 	return total, websiteDTOs, nil

diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -1852,6 +1852,10 @@ const message = {
         useCustom: 'Customize docker-compose.yml',
         useCustomHelper:
             'Using a custom docker-compose.yml file may cause the application upgrade to fail. If it is not necessary, do not check it',
+        diffHelper:
+            'The left side is the old version, the right side is the new version. After editing, click to save the custom version',
+        pullImage: 'Pull Image',
+        pullImageHelper: 'Execute docker pull to pull the image before the application starts',
     },
     website: {
         website: 'Website',

diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
@@ -1720,6 +1720,8 @@ const message = {
         useCustom: '自訂 docker-compose.yml',
         useCustomHelper: '使用自訂 docker-compose.yml 文件，可能會導致應用程式升級失敗，如無必要，請勿勾選',
         diffHelper: '左側為舊版本，右側為新版，編輯之後點選使用自訂版本儲存',
+        pullImage: '拉取鏡像',
+        pullImageHelper: '在應用啟動之前執行 docker pull 來拉取鏡像',
     },
     website: {
         website: '網站',

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -1721,6 +1721,8 @@ const message = {
         useCustom: '自定义 docker-compose.yml',
         useCustomHelper: '使用自定义 docker-compose.yml 文件，可能会导致应用升级失败，如无必要，请勿勾选',
         diffHelper: '左侧为旧版本，右侧为新版，编辑之后点击使用自定义版本保存',
+        pullImage: '拉取镜像',
+        pullImageHelper: '在应用启动之前执行 docker pull 来拉取镜像',
     },
     website: {
         website: '网站',

diff --git a/frontend/src/views/app-store/detail/install/index.vue b/frontend/src/views/app-store/detail/install/index.vue
@@ -109,8 +109,8 @@
                             <span class="input-help">{{ $t('app.editComposeHelper') }}</span>
                         </el-form-item>
                         <el-form-item pro="pullImage">
-                            <el-checkbox v-model="req.pullImage" :label="$t('container.forcePull')" size="large" />
-                            <span class="input-help">{{ $t('container.forcePullHelper') }}</span>
+                            <el-checkbox v-model="req.pullImage" :label="$t('app.pullImage')" size="large" />
+                            <span class="input-help">{{ $t('app.pullImageHelper') }}</span>
                         </el-form-item>
                         <div v-if="req.editCompose">
                             <codemirror

diff --git a/frontend/src/views/app-store/installed/upgrade/index.vue b/frontend/src/views/app-store/installed/upgrade/index.vue
@@ -58,8 +58,8 @@
                         </span>
                     </el-form-item>
                     <el-form-item pro="pullImage" v-if="operateReq.operate === 'upgrade'">
-                        <el-checkbox v-model="operateReq.pullImage" :label="$t('container.forcePull')" size="large" />
-                        <span class="input-help">{{ $t('container.forcePullHelper') }}</span>
+                        <el-checkbox v-model="operateReq.pullImage" :label="$t('app.pullImage')" size="large" />
+                        <span class="input-help">{{ $t('app.pullImageHelper') }}</span>
                     </el-form-item>
                 </el-form>
             </el-col>