From 24db40540ba1255f187436c0b30bd23ea78cbc57 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 5 Jun 2023 19:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=9C=A8=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20--=20=E2=80=9C=E7=BD=91=E7=AB=99=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E2=80=9D=20=E4=B8=AD=E8=AE=BE=E7=BD=AE=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9IP=E8=AE=BF=E9=97=AE=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/global-server-config/index.go    |  5 ++++
 .../settings/global-server-config/index.html  | 25 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
index af121656..490bba68 100644
--- a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
@@ -64,6 +64,7 @@ p { color: grey; }
 </body>
 </html>`
 	}
+
 	this.Data["httpAllDomainMismatchActionContentHTML"] = httpAllDomainMismatchActionContentHTML
 
 	this.Show()
@@ -77,6 +78,8 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllAllowMismatchDomainsJSON        []byte
 	HttpAllAllowNodeIP                     bool
 	HttpAllDefaultDomain                   string
+	HttpAllNodeIPPageHTML                  string
+	HttpAllNodeIPShowPage                  bool
 	HttpAllForceLnRequest                  bool
 
 	HttpAllSupportsLowVersionHTTP  bool
@@ -137,6 +140,8 @@ func (this *IndexAction) RunPost(params struct {
 	config.HTTPAll.AllowMismatchDomains = allowMismatchDomains
 	config.HTTPAll.AllowNodeIP = params.HttpAllAllowNodeIP
 	config.HTTPAll.DefaultDomain = params.HttpAllDefaultDomain
+	config.HTTPAll.NodeIPShowPage = params.HttpAllNodeIPShowPage
+	config.HTTPAll.NodeIPPageHTML = params.HttpAllNodeIPPageHTML
 
 	// HTTP All
 	config.HTTPAll.SupportsLowVersionHTTP = params.HttpAllSupportsLowVersionHTTP
diff --git a/web/views/@default/clusters/cluster/settings/global-server-config/index.html b/web/views/@default/clusters/cluster/settings/global-server-config/index.html
index 3c8f4559..402d7868 100644
--- a/web/views/@default/clusters/cluster/settings/global-server-config/index.html
+++ b/web/views/@default/clusters/cluster/settings/global-server-config/index.html
@@ -18,9 +18,9 @@
                 </td>
             </tr>
             <tr v-show="config.httpAll.matchDomainStrictly">
-                <td class="color-border">页面提示</td>
+                <td class="color-border">未绑定域名页面提示</td>
                 <td>
-                    <textarea name="httpAllDomainMismatchActionContentHTML" v-model="httpAllDomainMismatchActionContentHTML"></textarea>
+                    <textarea rows="3" name="httpAllDomainMismatchActionContentHTML" v-model="httpAllDomainMismatchActionContentHTML"></textarea>
                     <p class="comment">访问未绑定的域名时提示的文字，可以使用HTML；仅限于HTTP请求，不适于用HTTPS（HTTPS会提示证书错误）。</p>
                 </td>
             </tr>
@@ -31,6 +31,14 @@
                     <p class="comment">允许这些域名不经过绑定就可以直接访问网站。</p>
                 </td>
             </tr>
+            <tr v-show="config.httpAll.matchDomainStrictly">
+                <td class="color-border">默认域名</td>
+                <td>
+                    <input type="text" name="httpAllDefaultDomain" v-model="config.httpAll.defaultDomain"/>
+                    <p class="comment">例外域名或使用节点IP访问时使用的默认域名。</p>
+                </td>
+            </tr>
+
             <tr v-show="config.httpAll.matchDomainStrictly">
                 <td class="color-border">允许使用节点IP访问</td>
                 <td>
@@ -39,10 +47,17 @@
                 </td>
             </tr>
             <tr v-show="config.httpAll.matchDomainStrictly">
-                <td class="color-border">默认域名</td>
+                <td class="color-border">访问节点IP显示自定义内容</td>
                 <td>
-                    <input type="text" name="httpAllDefaultDomain" v-model="config.httpAll.defaultDomain"/>
-                    <p class="comment">例外域名或使用节点IP访问时使用的默认域名。</p>
+                    <checkbox name="httpAllNodeIPShowPage" v-model="config.httpAll.nodeIPShowPage"></checkbox>
+                    <p class="comment">选中后，表示用户访问节点IP时显示自定义内容。</p>
+                </td>
+            </tr>
+            <tr v-show="config.httpAll.matchDomainStrictly && config.httpAll.nodeIPShowPage">
+                <td class="color-border">访问节点IP自定义内容</td>
+                <td>
+                    <textarea name="httpAllNodeIPPageHTML" v-model="config.httpAll.nodeIPPageHTML" rows="3" placeholder="访问节点IP时要显示的自定义内容"></textarea>
+                    <p class="comment">访问节点IP时要显示的自定义内容，支持HTML。</p>
                 </td>
             </tr>
         </table>