From 0bddeef63ebeb36d3dac4e0920ef5e2b53da2c85 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 24 Mar 2025 18:41:30 +0800
Subject: [PATCH] feat(runtime): fix issue with install php runtime failed
 (#8230)

---
 agent/app/dto/response/website.go                        | 1 +
 agent/app/service/app.go                                 | 2 +-
 agent/app/service/website.go                             | 2 ++
 agent/utils/common/common.go                             | 9 +++++++++
 frontend/src/api/interface/website.ts                    | 1 +
 .../src/views/website/website/config/basic/index.vue     | 6 +++++-
 .../website/website/config/basic/resource/index.vue      | 7 ++++++-
 frontend/src/views/website/website/index.vue             | 7 +++++--
 8 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/agent/app/dto/response/website.go b/agent/app/dto/response/website.go
index 857a5cd0d..725ca42f6 100644
--- a/agent/app/dto/response/website.go
+++ b/agent/app/dto/response/website.go
@@ -113,5 +113,6 @@ type Resource struct {
 type Database struct {
 	Name string `json:"name"`
 	Type string `json:"type"`
+	From string `json:"from"`
 	ID   uint   `json:"id"`
 }
diff --git a/agent/app/service/app.go b/agent/app/service/app.go
index 82d7a669b..a03ac72b8 100644
--- a/agent/app/service/app.go
+++ b/agent/app/service/app.go
@@ -112,7 +112,7 @@ func (a AppService) PageApp(ctx *gin.Context, req request.AppSearch) (interface{
 	lang := strings.ToLower(common.GetLang(ctx))
 	for _, ap := range apps {
 		if req.Type == "php" {
-			if ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(fmt.Sprintf("%f", ap.RequiredPanelVersion), info.SystemVersion) {
+			if ap.RequiredPanelVersion == 0 || !common.CompareAppVersion(fmt.Sprintf("%f", ap.RequiredPanelVersion), common.GetSystemVersion(info.SystemVersion)) {
 				continue
 			}
 		}
diff --git a/agent/app/service/website.go b/agent/app/service/website.go
index b260ba3d8..e94d59df7 100644
--- a/agent/app/service/website.go
+++ b/agent/app/service/website.go
@@ -3219,6 +3219,7 @@ func (w WebsiteService) ListDatabases() ([]response.Database, error) {
 				ID:   db.ID,
 				Name: db.Name,
 				Type: database.Type,
+				From: database.From,
 			})
 		}
 	}
@@ -3230,6 +3231,7 @@ func (w WebsiteService) ListDatabases() ([]response.Database, error) {
 				ID:   db.ID,
 				Name: db.Name,
 				Type: database.Type,
+				From: database.From,
 			})
 		}
 	}
diff --git a/agent/utils/common/common.go b/agent/utils/common/common.go
index d3a03888c..5b3c6eab0 100644
--- a/agent/utils/common/common.go
+++ b/agent/utils/common/common.go
@@ -399,3 +399,12 @@ func RestartService(core, agent, reload bool) {
 		global.LOG.Errorf("restart 1panel service failed, err: %v, std: %s", err, std)
 	}
 }
+
+func GetSystemVersion(versionString string) string {
+	re := regexp.MustCompile(`v(\d+\.\d+\.\d+)`)
+	match := re.FindStringSubmatch(versionString)
+	if len(match) > 1 {
+		return match[1]
+	}
+	return ""
+}
diff --git a/frontend/src/api/interface/website.ts b/frontend/src/api/interface/website.ts
index b68b081df..d4b72e82f 100644
--- a/frontend/src/api/interface/website.ts
+++ b/frontend/src/api/interface/website.ts
@@ -628,6 +628,7 @@ export namespace Website {
         type: string;
         databaseID: number;
         websiteID: number;
+        from: string;
     }
 
     export interface ChangeDatabase {
diff --git a/frontend/src/views/website/website/config/basic/index.vue b/frontend/src/views/website/website/config/basic/index.vue
index c2069e796..2e679ba21 100644
--- a/frontend/src/views/website/website/config/basic/index.vue
+++ b/frontend/src/views/website/website/config/basic/index.vue
@@ -45,7 +45,11 @@
             >
                 <PHP :id="id" v-if="tabIndex == '13'"></PHP>
             </el-tab-pane>
-            <el-tab-pane :label="$t('logs.resource')" name="14">
+            <el-tab-pane
+                :label="$t('logs.resource')"
+                name="14"
+                v-if="website.type === 'runtime' || website.type === 'static'"
+            >
                 <Resource :id="id" v-if="tabIndex == '14'"></Resource>
             </el-tab-pane>
             <el-tab-pane :label="$t('website.other')" name="12">
diff --git a/frontend/src/views/website/website/config/basic/resource/index.vue b/frontend/src/views/website/website/config/basic/resource/index.vue
index a7a663aee..19a68e689 100644
--- a/frontend/src/views/website/website/config/basic/resource/index.vue
+++ b/frontend/src/views/website/website/config/basic/resource/index.vue
@@ -23,7 +23,12 @@
                     >
                         <div class="flex justify-between items-center">
                             <span>{{ item.name }}</span>
-                            <el-tag>{{ item.type }}</el-tag>
+                            <div>
+                                <el-tag>{{ item.type }}</el-tag>
+                                <el-tag class="ml-1">
+                                    {{ item.from === 'local' ? $t('commons.table.local') : $t('database.remote') }}
+                                </el-tag>
+                            </div>
                         </div>
                     </el-option>
                 </el-select>
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 37ebd4145..accee8a39 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -272,7 +272,7 @@ const shortcuts = [
     {
         text: useI18n().t('website.ever'),
         value: () => {
-            return new Date('9999-12-31');
+            return new Date('2006-01-02');
         },
     },
     {
@@ -438,7 +438,10 @@ const pickerVisibility = (visibility: boolean, row: any) => {
 };
 
 const updateWebsitConfig = (row: any) => {
-    const reqDate = dateFormatSimple(row.expireDate);
+    let reqDate = dateFormatSimple(row.expireDate);
+    if (reqDate == '2006-01-02') {
+        reqDate = '9999-12-31';
+    }
     const req = {
         id: row.id,
         primaryDomain: row.primaryDomain,