fix(app): fix issue with reinstall openresty failed (#8265)

agent/app/dto/response/website.go

@@ -111,8 +111,9 @@ type Resource struct {
 }
 
 type Database struct {
-	Name string `json:"name"`
+	Name         string `json:"name"`
-	Type string `json:"type"`
+	DatabaseName string `json:"databaseName"`
-	From string `json:"from"`
+	Type         string `json:"type"`
-	ID   uint   `json:"id"`
+	From         string `json:"from"`
+	ID           uint   `json:"id"`
 }

agent/app/service/app.go

@@ -192,16 +192,18 @@ func (a AppService) GetApp(ctx *gin.Context, key string) (*response.AppDTO, erro
 	}
 	var versionsRaw []string
 	hasLatest := false
+	latestVersion := ""
 	for _, detail := range details {
 		if strings.Contains(detail.Version, "latest") {
 			hasLatest = true
+			latestVersion = detail.Version
 			continue
 		}
 		versionsRaw = append(versionsRaw, detail.Version)
 	}
 	appDTO.Versions = common.GetSortedVersions(versionsRaw)
 	if hasLatest {
-		appDTO.Versions = append([]string{"latest"}, appDTO.Versions...)
+		appDTO.Versions = append([]string{latestVersion}, appDTO.Versions...)
 	}
 	tags, err := getAppTags(app.ID, strings.ToLower(common.GetLang(ctx)))
 	if err != nil {

agent/app/service/app_utils.go

@@ -1834,19 +1834,18 @@ func handleOpenrestyFile(appInstall *model.AppInstall) error {
 			break
 		}
 	}
-	if !hasDefaultWebsite {
+	if hasDefaultWebsite {
-		return nil
+		installDir := appInstall.GetPath()
+		defaultConfigPath := path.Join(installDir, "conf", "default", "00.default.conf")
+		fileOp := files.NewFileOp()
+		content, err := fileOp.GetContent(defaultConfigPath)
+		if err != nil {
+			return err
+		}
+		newContent := strings.ReplaceAll(string(content), "default_server", "")
+		if err := fileOp.WriteFile(defaultConfigPath, strings.NewReader(newContent), constant.FilePerm); err != nil {
+			return err
+		}
 	}
-	installDir := appInstall.GetPath()
+	return createAllWebsitesWAFConfig(websites)
-	defaultConfigPath := path.Join(installDir, "conf", "default", "00.default.conf")
-	fileOp := files.NewFileOp()
-	content, err := fileOp.GetContent(defaultConfigPath)
-	if err != nil {
-		return err
-	}
-	newContent := strings.ReplaceAll(string(content), "default_server", "")
-	if err := fileOp.WriteFile(defaultConfigPath, strings.NewReader(newContent), constant.FilePerm); err != nil {
-		return err
-	}
-	return createAllWebsitesWAFConfig()
 }

agent/app/service/website.go

@@ -3210,10 +3210,11 @@ func (w WebsiteService) ListDatabases() ([]response.Database, error) {
 		database, _ := databaseRepo.Get(repo.WithByName(db.MysqlName))
 		if database.ID > 0 {
 			res = append(res, response.Database{
-				ID:   db.ID,
+				ID:           db.ID,
-				Name: db.Name,
+				Name:         db.Name,
-				Type: database.Type,
+				Type:         database.Type,
-				From: database.From,
+				From:         database.From,
+				DatabaseName: database.Name,
 			})
 		}
 	}
@@ -3222,10 +3223,11 @@ func (w WebsiteService) ListDatabases() ([]response.Database, error) {
 		database, _ := databaseRepo.Get(repo.WithByName(db.PostgresqlName))
 		if database.ID > 0 {
 			res = append(res, response.Database{
-				ID:   db.ID,
+				ID:           db.ID,
-				Name: db.Name,
+				Name:         db.Name,
-				Type: database.Type,
+				Type:         database.Type,
-				From: database.From,
+				From:         database.From,
+				DatabaseName: database.Name,
 			})
 		}
 	}

agent/app/service/website_utils.go

@@ -297,11 +297,7 @@ func moveDefaultWafConfig(websiteDir string, defaultConfigContent []byte, defaul
 	return nil
 }
 
-func createAllWebsitesWAFConfig() error {
+func createAllWebsitesWAFConfig(websites []model.Website) error {
-	websites, _ := websiteRepo.List()
-	if len(websites) == 0 {
-		return nil
-	}
 	nginxInstall, err := getAppInstallByKey(constant.AppOpenresty)
 	if err != nil {
 		return err

agent/utils/docker/docker.go

@@ -196,7 +196,6 @@ func (c Client) PullImageWithProcessAndOptions(task *task.Task, imageName string
 			}
 			return err
 		}
-		timeStr := time.Now().Format("2006/01/02 15:04:05")
 		status, _ := progress["status"].(string)
 		if status == "Downloading" || status == "Extracting" {
 			id, _ := progress["id"].(string)
@@ -204,16 +203,17 @@ func (c Client) PullImageWithProcessAndOptions(task *task.Task, imageName string
 			current, _ := progressDetail["current"].(float64)
 			progressStr := ""
 			total, ok := progressDetail["total"].(float64)
+			timeStr := time.Now().Format("2006/01/02 15:04:05")
 			if ok {
 				progressStr = fmt.Sprintf("%s %s [%s] --- %.2f%%", timeStr, status, id, (current/total)*100)
 			} else {
 				progressStr = fmt.Sprintf("%s %s [%s] --- %.2f%%", timeStr, status, id, current)
 			}
-
 			_ = setLog(id, progressStr, task)
 		}
 		if status == "Pull complete" || status == "Download complete" {
 			id, _ := progress["id"].(string)
+			timeStr := time.Now().Format("2006/01/02 15:04:05")
 			progressStr := fmt.Sprintf("%s %s [%s] --- %.2f%%", timeStr, status, id, 100.0)
 			_ = setLog(id, progressStr, task)
 		}
@@ -312,7 +312,6 @@ func (c Client) BuildImageWithProcessAndOptions(task *task.Task, tar io.ReadClos
 			} else {
 				progressStr = fmt.Sprintf("%s %s [%s] --- %.2f%%", timeStr, status, id, current)
 			}
-
 			_ = setLog(id, progressStr, task)
 		case "Pull complete", "Download complete", "Verifying Checksum":
 			id, _ := progress["id"].(string)

frontend/src/api/interface/website.ts

@@ -629,6 +629,7 @@ export namespace Website {
         databaseID: number;
         websiteID: number;
         from: string;
+        databaseName: number;
     }
 
     export interface ChangeDatabase {

frontend/src/components/log/task/index.vue

@@ -1,11 +1,10 @@
 <template>
     <el-dialog
         v-model="open"
-        :destroy-on-close="true"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         :show-close="showClose"
-        :before-close="handleClose"
+        @close="handleClose"
         :width="width"
     >
         <div>
@@ -44,7 +43,6 @@ const config = reactive({
 });
 const open = ref(false);
 const showTail = ref(true);
-const emit = defineEmits(['close']);
 
 const openWithTaskID = (id: string, tail: boolean) => {
     config.taskID = id;
@@ -64,9 +62,10 @@ const openWithResourceID = (taskType: string, taskOperate: string, resourceID: n
     open.value = true;
 };
 
+const em = defineEmits(['close']);
 const handleClose = () => {
+    em('close', true);
     open.value = false;
-    emit('close', true);
     bus.emit('refreshTask', true);
 };
 

frontend/src/views/app-store/installed/index.vue

@@ -273,19 +273,46 @@
                                                         <table>
                                                             <tbody>
                                                                 <tr v-if="defaultLink != ''">
-                                                                    <td>
+                                                                    <td v-if="installed.httpPort > 0">
                                                                         <el-button
                                                                             type="primary"
                                                                             link
                                                                             @click="
                                                                                 toLink(
-                                                                                    defaultLink +
+                                                                                    'http://' +
+                                                                                        defaultLink +
                                                                                         ':' +
                                                                                         installed.httpPort,
                                                                                 )
                                                                             "
                                                                         >
-                                                                            {{ defaultLink + ':' + installed.httpPort }}
+                                                                            {{
+                                                                                'http://' +
+                                                                                defaultLink +
+                                                                                ':' +
+                                                                                installed.httpPort
+                                                                            }}
+                                                                        </el-button>
+                                                                    </td>
+                                                                    <td v-if="installed.httpsPort > 0">
+                                                                        <el-button
+                                                                            type="primary"
+                                                                            link
+                                                                            @click="
+                                                                                toLink(
+                                                                                    'https://' +
+                                                                                        defaultLink +
+                                                                                        ':' +
+                                                                                        installed.httpsPort,
+                                                                                )
+                                                                            "
+                                                                        >
+                                                                            {{
+                                                                                'https://' +
+                                                                                defaultLink +
+                                                                                ':' +
+                                                                                installed.httpsPort
+                                                                            }}
                                                                         </el-button>
                                                                     </td>
                                                                 </tr>

frontend/src/views/app-store/setting/default-domain/index.vue

@@ -2,14 +2,7 @@
     <DrawerPro v-model="drawerVisible" :header="$t('app.defaultWebDomain')" @close="handleClose" size="small">
         <el-form ref="formRef" label-position="top" :model="form" :rules="rules" @submit.prevent v-loading="loading">
             <el-form-item :label="$t('app.defaultWebDomain')" prop="defaultDomain">
-                <el-input v-model="form.defaultDomain">
+                <el-input v-model="form.defaultDomain"></el-input>
-                    <template #prepend>
-                        <el-select v-model="protocol" placeholder="Select" class="p-w-100">
-                            <el-option label="HTTP" value="http://" />
-                            <el-option label="HTTPS" value="https://" />
-                        </el-select>
-                    </template>
-                </el-input>
                 <span class="input-help">{{ $t('app.defaultWebDomainHepler') }}</span>
             </el-form-item>
         </el-form>
@@ -36,18 +29,15 @@ const form = reactive({
     defaultDomain: '',
 });
 const rules = reactive({
-    defaultDomain: [Rules.requiredInput],
+    defaultDomain: [Rules.requiredInput, Rules.ipV4V6OrDomain],
 });
 const formRef = ref<FormInstance>();
-const protocol = ref('http://');
 interface DialogProps {
-    protocol: string;
     domain: string;
 }
 
 const acceptParams = (config: DialogProps): void => {
     form.defaultDomain = config.domain;
-    protocol.value = config.protocol;
     drawerVisible.value = true;
 };
 
@@ -64,12 +54,8 @@ const submit = async () => {
         }
         loading.value = true;
         try {
-            let defaultDomain = '';
-            if (form.defaultDomain) {
-                defaultDomain = protocol.value + form.defaultDomain;
-            }
             const req = {
-                defaultDomain: defaultDomain,
+                defaultDomain: form.defaultDomain,
             };
             await updateAppStoreConfig(req);
             MsgSuccess(i18n.global.t('commons.msg.updateSuccess'));

frontend/src/views/app-store/setting/index.vue

@@ -14,12 +14,6 @@
                     <el-col :xs="24" :sm="20" :md="15" :lg="12" :xl="12">
                         <el-form-item :label="$t('app.defaultWebDomain')" prop="defaultDomain">
                             <el-input v-model="config.defaultDomain" disabled>
-                                <template #prepend>
-                                    <el-select v-model="protocol" placeholder="Select" class="p-w-100" disabled>
-                                        <el-option label="HTTP" value="http://" />
-                                        <el-option label="HTTPS" value="https://" />
-                                    </el-select>
-                                </template>
                                 <template #append>
                                     <el-button @click="setDefaultDomain()" icon="Setting">
                                         {{ $t('commons.button.set') }}
@@ -54,35 +48,15 @@ const config = ref({
 });
 const loading = ref(false);
 const configForm = ref();
-const protocol = ref('http://');
 const domainRef = ref();
 const useCustomApp = ref(false);
 
-function getUrl(url: string) {
-    const regex = /^(https?:\/\/)(.*)/;
-    const match = url.match(regex);
-    if (match) {
-        const protocol = match[1];
-        const remainder = match[2];
-        return {
-            protocol: protocol,
-            remainder: remainder,
-        };
-    } else {
-        return null;
-    }
-}
-
 const search = async () => {
     loading.value = true;
     try {
         const res = await getAppStoreConfig();
         if (res.data.defaultDomain != '') {
-            const url = getUrl(res.data.defaultDomain);
+            config.value.defaultDomain = res.data.defaultDomain;
-            if (url) {
-                config.value.defaultDomain = url.remainder;
-                protocol.value = url.protocol;
-            }
         }
     } catch (error) {
     } finally {
@@ -93,7 +67,6 @@ const search = async () => {
 const setDefaultDomain = () => {
     domainRef.value.acceptParams({
         domain: config.value.defaultDomain,
-        protocol: protocol.value,
     });
 };
 

frontend/src/views/website/website/config/basic/resource/index.vue

@@ -24,7 +24,7 @@
                         <div class="flex justify-between items-center">
                             <span>{{ item.name }}</span>
                             <div>
-                                <el-tag>{{ item.type }}</el-tag>
+                                <el-tag>{{ item.databaseName }}</el-tag>
                                 <el-tag class="ml-1">
                                     {{ item.from === 'local' ? $t('commons.table.local') : $t('database.remote') }}
                                 </el-tag>
@@ -79,16 +79,11 @@ const listDatabases = async () => {
     try {
         const res = await getWebsiteDatabase();
         databases.value = res.data;
-        if (databases.value.length > 0) {
+        if (databases.value.length > 0 && website.value.dbID > 0) {
-            if (website.value.dbID > 0) {
+            for (let i = 0; i < databases.value.length; i++) {
-                for (let i = 0; i < databases.value.length; i++) {
+                if (databases.value[i].id === website.value.dbID && databases.value[i].type === website.value.dbType) {
-                    if (
+                    req.db = databases.value[i].id + databases.value[i].type;
-                        databases.value[i].id === website.value.dbID &&
+                    break;
-                        databases.value[i].type === website.value.dbType
-                    ) {
-                        req.db = databases.value[i].id + databases.value[i].type;
-                        break;
-                    }
                 }
             }
         }