From 622fb8d47d58aea1e39f64dbf9460c4bc664ab28 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 2 Dec 2021 11:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=B8=AD=E5=8A=A0=E5=85=A5=E8=AF=B7=E6=B1=82ID/?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96Header=E6=B7=BB=E5=8A=A0/=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../@default/servers/server/log/viewPopup.html   | 16 ++++++++--------
 .../settings/headers/createDeletePopup.html      |  1 +
 .../server/settings/headers/createSetPopup.html  |  1 +
 .../server/settings/headers/updateSetPopup.html  |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/web/views/@default/servers/server/log/viewPopup.html b/web/views/@default/servers/server/log/viewPopup.html
index 5e9ba589..5092e505 100644
--- a/web/views/@default/servers/server/log/viewPopup.html
+++ b/web/views/@default/servers/server/log/viewPopup.html
@@ -12,25 +12,25 @@
 	<table class="ui table selectable small">
 		<tr>
 			<td style="width: 50%">请求概要<em>(Request)</em>：{{accessLog.request}}</td>
-			<td>请求URI<em>(RequestURI)</em>：{{accessLog.requestURI}}</td>
+            <td>请求ID：{{accessLog.requestId}}</td>
 		</tr>
 		<tr>
 			<td>请求方法<em>(RequestMethod)</em>：{{accessLog.requestMethod}}</td>
-			<td>主机地址<em>(Host)</em>：{{accessLog.host}}</td>
+            <td>请求URI<em>(RequestURI)</em>：{{accessLog.requestURI}}</td>
 		</tr>
 		<tr>
-			<td>请求来源<em>(Referer)</em>：
-				<span v-if="accessLog.referer != null && accessLog.referer.length > 0">{{accessLog.referer}}</span>
-				<span v-else>-</span>
-			</td>
+            <td>主机地址<em>(Host)</em>：{{accessLog.host}}</td>
 			<td>终端地址<em>(RemoteAddr:RemotePort)</em>：{{accessLog.remoteAddr}}:{{accessLog.remotePort}}</td>
 		</tr>
 		<tr>
+            <td>请求来源<em>(Referer)</em>：
+                <span v-if="accessLog.referer != null && accessLog.referer.length > 0">{{accessLog.referer}}</span>
+                <span v-else class="disabled">[没有设置]</span>
+            </td>
 			<td>终端信息<em>(UserAgent)</em>：
 				<span v-if="accessLog.userAgent != null && accessLog.userAgent.length > 0">{{accessLog.userAgent}}</span>
-				<span v-else>-</span>
+				<span v-else class="disabled">[没有设置]</span>
 			</td>
-			<td>协议<em>(Proto)</em>：{{accessLog.proto}}</td>
 		</tr>
 		<tr>
 			<td>状态<em>(StatusMessage)</em>：<span :class="{red:accessLog.status>=400, green:accessLog.status<400}">{{accessLog.status}} {{accessLog.statusMessage}}</span></td>
diff --git a/web/views/@default/servers/server/settings/headers/createDeletePopup.html b/web/views/@default/servers/server/settings/headers/createDeletePopup.html
index 07655948..6a849c4a 100644
--- a/web/views/@default/servers/server/settings/headers/createDeletePopup.html
+++ b/web/views/@default/servers/server/settings/headers/createDeletePopup.html
@@ -8,6 +8,7 @@
 			<td class="title">名称<em>（Name）</em></td>
 			<td>
 				<input type="text" name="name" maxlength="100" ref="focus"/>
+                <p class="comment">请注意名称的大小写，如无特殊需求，Header名称的格式通常为<code-label>Xxx</code-label>或者<code-label>Xxx-Yyy</code-label>。</p>
 			</td>
 		</tr>
 	</table>
diff --git a/web/views/@default/servers/server/settings/headers/createSetPopup.html b/web/views/@default/servers/server/settings/headers/createSetPopup.html
index 6a9a23a5..29acebbe 100644
--- a/web/views/@default/servers/server/settings/headers/createSetPopup.html
+++ b/web/views/@default/servers/server/settings/headers/createSetPopup.html
@@ -15,6 +15,7 @@
 			<td>值<em>（Value）</em></td>
 			<td>
 				<input type="text" name="value" maxlength="500"/>
+                <p class="comment">可以包含请求变量。</p>
 			</td>
 		</tr>
 	</table>
diff --git a/web/views/@default/servers/server/settings/headers/updateSetPopup.html b/web/views/@default/servers/server/settings/headers/updateSetPopup.html
index 84e50c9a..dd16d4c7 100644
--- a/web/views/@default/servers/server/settings/headers/updateSetPopup.html
+++ b/web/views/@default/servers/server/settings/headers/updateSetPopup.html
@@ -9,12 +9,14 @@
 			<td class="title">名称<em>（Name）</em></td>
 			<td>
 				<input type="text" name="name" value="" v-model="headerConfig.name" maxlength="200" placeholder="类似于Server、Content-Type之类" ref="focus"/>
+                <p class="comment">请注意名称的大小写，如无特殊需求，Header名称的格式通常为<code-label>Xxx</code-label>或者<code-label>Xxx-Yyy</code-label>。</p>
 			</td>
 		</tr>
 		<tr>
 			<td>值<em>（Value）</em></td>
 			<td>
 				<input type="text" name="value" v-model="headerConfig.value" maxlength="500"/>
+                <p class="comment">可以包含请求变量。</p>
 			</td>
 		</tr>
 	</table>