From cb90cd1a10c4fad5873d11b4498bec4583970671 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Tue, 3 Jan 2023 17:54:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/app_install.go            |  2 --
 backend/app/service/website.go                | 19 +++++-----
 frontend/src/lang/modules/zh.ts               |  5 +--
 .../views/website/website/default/index.vue   | 36 ++++++++++++-------
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/backend/app/service/app_install.go b/backend/app/service/app_install.go
index 724cf10d2..473913416 100644
--- a/backend/app/service/app_install.go
+++ b/backend/app/service/app_install.go
@@ -129,9 +129,7 @@ func (a AppInstallService) Operate(req request.AppInstalledOperate) error {
 	if err != nil {
 		return err
 	}
-
 	dockerComposePath := install.GetComposePath()
-
 	switch req.Operate {
 	case constant.Up:
 		out, err := compose.Up(dockerComposePath)
diff --git a/backend/app/service/website.go b/backend/app/service/website.go
index 9bc6f1e3d..8dc80902c 100644
--- a/backend/app/service/website.go
+++ b/backend/app/service/website.go
@@ -804,13 +804,16 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
 			return err
 		}
 	}
-	website, err := websiteRepo.GetFirst(commonRepo.WithByID(id))
-	if err != nil {
-		return err
+	if id > 0 {
+		website, err := websiteRepo.GetFirst(commonRepo.WithByID(id))
+		if err != nil {
+			return err
+		}
+		if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: "listen", Params: []string{"80", "default_server"}}}, &website); err != nil {
+			return err
+		}
+		website.DefaultServer = true
+		return websiteRepo.Save(context.Background(), &website)
 	}
-	if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: "listen", Params: []string{"80", "default_server"}}}, &website); err != nil {
-		return err
-	}
-	website.DefaultServer = true
-	return websiteRepo.Save(context.Background(), &website)
+	return nil
 }
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index f9f4f592e..5d4214f3a 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -959,8 +959,9 @@ export default {
         nextYear: '一年后',
         allGroup: '所有分组',
         noLog: '当前没有日志...',
-        defaulServer: '默认网站',
-        noDefaulServer: '当前没有默认网站',
+        defaulServer: '默认站点',
+        noDefaulServer: '未设置',
+        defaulServerHelper: '设置默认站点后,所有未绑定的域名和IP都被定向到默认站点\n可有效防止恶意解析',
     },
     nginx: {
         serverNamesHashBucketSizeHelper: '服务器名字的hash表大小',
diff --git a/frontend/src/views/website/website/default/index.vue b/frontend/src/views/website/website/default/index.vue
index b23e879a9..26203d6a2 100644
--- a/frontend/src/views/website/website/default/index.vue
+++ b/frontend/src/views/website/website/default/index.vue
@@ -2,21 +2,33 @@
     <el-dialog
         v-model="open"
         :title="$t('website.defaulServer')"
-        width="20%"
+        width="25%"
         @close="handleClose"
         :close-on-click-modal="false"
     >
-        <div style="text-align: center">
-            <el-select v-model="defaultId">
-                <el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option>
-                <el-option
-                    v-for="(website, key) in websites"
-                    :key="key"
-                    :value="website.id"
-                    :label="website.primaryDomain"
-                ></el-option>
-            </el-select>
-        </div>
+        <el-row>
+            <el-col :offset="5">
+                <div style="text-align: center">
+                    <el-form-item :label="$t('website.defaulServer')">
+                        <el-select v-model="defaultId">
+                            <el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option>
+                            <el-option
+                                v-for="(website, key) in websites"
+                                :key="key"
+                                :value="website.id"
+                                :label="website.primaryDomain"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-alert :closable="false">
+                <template #default>
+                    <span style="white-space: pre-line">{{ $t('website.defaulServerHelper') }}</span>
+                </template>
+            </el-alert>
+        </el-row>
+
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>