From c1aafa2d48c5077e745c4f04262e8b702e1aae3a Mon Sep 17 00:00:00 2001
From: xianyunleo <xianyunleo@gmail.com>
Date: Fri, 1 Dec 2023 19:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E6=A3=80=E6=B5=8B=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/core/website/NginxWebsite.js | 12 +++++++-----
 src/main/core/website/Website.js      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/core/website/NginxWebsite.js b/src/main/core/website/NginxWebsite.js
index 304eae78..53d59863 100644
--- a/src/main/core/website/NginxWebsite.js
+++ b/src/main/core/website/NginxWebsite.js
@@ -85,11 +85,13 @@ export default class NginxWebsite {
     async setBasicInfo(websiteInfo) {
         let text = this.confText;
         let serverNameStr;
-        if (websiteInfo.extraServerName) {
-            if (await Nginx.websiteExists(websiteInfo.extraServerName, websiteInfo.port)) {
-                throw new Error('第二域名不能重复！')
-            }
-            serverNameStr = `server_name ${this.serverName} ${websiteInfo.extraServerName};`;
+        let extraServerName = websiteInfo.extraServerName
+        if (extraServerName) {
+            if (extraServerName !== this.getExtraServerName())
+                if (await Nginx.websiteExists(extraServerName, websiteInfo.port)) {
+                    throw new Error(`${extraServerName}:${websiteInfo.port}\n已经存在，不能重复！`)
+                }
+            serverNameStr = `server_name ${this.serverName} ${extraServerName};`
         } else {
             serverNameStr = `server_name ${this.serverName};`;
         }
diff --git a/src/main/core/website/Website.js b/src/main/core/website/Website.js
index b7197a8f..651271f8 100644
--- a/src/main/core/website/Website.js
+++ b/src/main/core/website/Website.js
@@ -10,7 +10,7 @@ export default class Website {
      */
     static async add(websiteInfo) {
         if (await Nginx.websiteExists(websiteInfo.serverName, websiteInfo.port)) {
-            throw new Error('网站已经存在！');
+            throw new Error(`${websiteInfo.serverName}:${websiteInfo.port}\n已经存在，不能重复！`)
         }
 
         if (!FileUtil.Exists(websiteInfo.rootPath)) {