优化代码/自动去除域名中的http://和https://等，防止误填

iwind · iwind · commit aef84189a403 · 2022-07-17T17:12:44.000+08:00
diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
@@ -132,20 +132,20 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 		"isActive": false,
 	})
 
-	items = append(items, maps.Map{
-		"name":     "健康检查",
-		"url":      "/clusters/cluster/settings/health?clusterId=" + clusterId,
-		"isActive": selectedItem == "health",
-		"isOn":     info != nil && info.HealthCheckIsOn,
-	})
-
 	items = append(items, maps.Map{
 		"name":     "DNS设置",
 		"url":      "/clusters/cluster/settings/dns?clusterId=" + clusterId,
 		"isActive": selectedItem == "dns",
 		"isOn":     cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0,
 	})
 
+	items = append(items, maps.Map{
+		"name":     "健康检查",
+		"url":      "/clusters/cluster/settings/health?clusterId=" + clusterId,
+		"isActive": selectedItem == "health",
+		"isOn":     info != nil && info.HealthCheckIsOn,
+	})
+
 	items = append(items, maps.Map{
 		"name":     "DDoS防护",
 		"url":      "/clusters/cluster/settings/ddos-protection?clusterId=" + clusterId,
diff --git a/internal/web/actions/default/servers/addServerNamePopup.go b/internal/web/actions/default/servers/addServerNamePopup.go
@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"net/url"
 	"regexp"
 	"strings"
 )
@@ -29,26 +30,49 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 	Must *actions.Must
 }) {
 	if params.Mode == "single" {
+		var serverName = params.ServerName
+
+		// 去除空格
+		serverName = regexp.MustCompile(`\s+`).ReplaceAllString(serverName, "")
+
+		// 处理URL
+		if regexp.MustCompile(`^(?i)(http|https|ftp)://`).MatchString(serverName) {
+			u, err := url.Parse(serverName)
+			if err == nil && len(u.Host) > 0 {
+				serverName = u.Host
+			}
+		}
+
 		params.Must.
-			Field("serverName", params.ServerName).
+			Field("serverName", serverName).
 			Require("请输入域名")
+
 		this.Data["serverName"] = maps.Map{
-			"name": params.ServerName,
+			"name": serverName,
 			"type": "full",
 		}
 	} else if params.Mode == "multiple" {
 		if len(params.ServerNames) == 0 {
 			this.FailField("serverNames", "请输入至少域名")
 		}
 
-		serverNames := []string{}
+		var serverNames = []string{}
 		for _, line := range strings.Split(params.ServerNames, "\n") {
-			line := strings.TrimSpace(line)
-			line = regexp.MustCompile(`\s+`).ReplaceAllString(line, "")
-			if len(line) == 0 {
+			var serverName = strings.TrimSpace(line)
+			serverName = regexp.MustCompile(`\s+`).ReplaceAllString(serverName, "")
+			if len(serverName) == 0 {
 				continue
 			}
-			serverNames = append(serverNames, line)
+
+			// 处理URL
+			if regexp.MustCompile(`^(?i)(http|https|ftp)://`).MatchString(serverName) {
+				u, err := url.Parse(serverName)
+				if err == nil && len(u.Host) > 0 {
+					serverName = u.Host
+				}
+			}
+
+			serverNames = append(serverNames, serverName)
 		}
 		this.Data["serverName"] = maps.Map{
 			"name":     "",
diff --git a/internal/web/actions/default/servers/components/cache/batch/index.go b/internal/web/actions/default/servers/components/cache/batch/index.go
@@ -21,14 +21,18 @@ func (this *IndexAction) Init() {
 	this.Nav("", "", "purge")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	KeyType string
+}) {
 	// 初始化菜单数据
 	err := InitMenu(this.Parent())
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
+	this.Data["keyType"] = params.KeyType
+
 	this.Show()
 }
 
diff --git a/web/public/js/components/plans/plan-bandwidth-ranges.js b/web/public/js/components/plans/plan-bandwidth-ranges.js
@@ -44,6 +44,9 @@ Vue.component("plan-bandwidth-ranges", {
 					return -1
 				}
 				if (v1.minMB == v2.minMB) {
+					if (v2.maxMB == 0 || v1.maxMB < v2.maxMB) {
+						return -1
+					}
 					return 0
 				}
 				return 1
diff --git a/web/public/js/components/server/reverse-proxy-box.js b/web/public/js/components/server/reverse-proxy-box.js
@@ -183,7 +183,7 @@ Vue.component("reverse-proxy-box", {
 				</td>
 			</tr>
 			<tr v-show="family == null || family == 'http'">
-				<td>回源主机名不包含端口</td>
+				<td>回源主机名移除端口</td>
 				<td><checkbox v-model="reverseProxyConfig.requestHostExcludingPort"></checkbox>
 					<p class="comment">选中后表示移除回源主机名中的端口部分。</p>
 				</td>
diff --git a/web/views/@default/clusters/cluster/settings/dns/index.html b/web/views/@default/clusters/cluster/settings/dns/index.html
@@ -45,6 +45,13 @@
 				<td colspan="2"><more-options-indicator></more-options-indicator></td>
 			</tr>
 			<tbody v-show="moreOptionsVisible">
+                <tr>
+                    <td>允许通过CNAME访问网站服务</td>
+                    <td>
+                        <checkbox name="cnameAsDomain" v-model="cnameAsDomain"></checkbox>
+                        <p class="comment">选中后，表示允许使用CNAME直接访问网站服务；如果取消选中，则表示CNAME只作为DNS解析记录使用。</p>
+                    </td>
+                </tr>
                 <tr>
                     <td>记录TTL</td>
                     <td>
@@ -54,13 +61,6 @@
                         </div>
                         <p class="comment">每个DNS服务商或者账号的TTL限制各有不同，请注意取值范围。0表示使用默认。</p>
                     </td>
-                </tr>
-                <tr>
-                    <td>允许通过CNAME访问网站服务</td>
-                    <td>
-                        <checkbox name="cnameAsDomain" v-model="cnameAsDomain"></checkbox>
-                        <p class="comment">选中后，表示允许使用CNAME直接访问网站服务；如果取消选中，则表示CNAME只作为DNS解析记录使用。</p>
-                    </td>
                 </tr>
 				<tr>
 					<td>是否同步节点DNS状态</td>
diff --git a/web/views/@default/servers/addServerNamePopup.html b/web/views/@default/servers/addServerNamePopup.html
@@ -9,14 +9,14 @@ <h3 v-if="isUpdating">修改域名绑定</h3>
 			<td class="title">单个域名 *</td>
 			<td>
 				<input type="text" name="serverName" ref="focus" maxlength="1024" v-model="serverName.name"/>
-				<p class="comment">请输入单个域名。</p>
+                <p class="comment">请输入单个域名，域名中<strong>不能</strong>包含<code-label>http</code-label>或<code-label>https</code-label>。</p>
 			</td>
 		</tr>
 		<tr v-if="mode == 'multiple'">
 			<td class="title">多个域名 *</td>
 			<td>
 				<textarea name="serverNames" ref="serverNames" v-model="multipleServerNames"></textarea>
-				<p class="comment">每行一个域名。</p>
+				<p class="comment">每行一个域名，域名中<strong>不能</strong>包含<code-label>http</code-label>或<code-label>https</code-label>。</p>
 			</td>
 		</tr>
 	</table>
diff --git a/web/views/@default/servers/components/cache/batch/index.js b/web/views/@default/servers/components/cache/batch/index.js
@@ -20,8 +20,10 @@ Tea.context(function () {
 
 	this.success = function () {
 		this.isOk = true
-		let f = NotifyReloadSuccess("任务提交成功")
-		f()
+		let that = this
+		teaweb.success("任务提交成功", function () {
+			window.location = window.location.pathname + "?keyType=" + that.keyType
+		})
 	}
 
 	this.fail = function (resp) {
@@ -39,5 +41,7 @@ Tea.context(function () {
 	/**
 	 * 操作类型
 	 */
-	this.keyType = "key" // key | prefix
+	if (this.keyType == null || this.keyType.length == 0) {
+		this.keyType = "key" // key | prefix
+	}
 })
diff --git a/web/views/@default/servers/components/cache/createPopup.html b/web/views/@default/servers/components/cache/createPopup.html
@@ -43,7 +43,7 @@ <h3>创建缓存策略</h3>
                 <td class="color-border">缓存文件句柄缓存</td>
                 <td>
                     <input type="text" name="fileOpenFileCacheMax" maxlength="6" value="0" style="width: 10em"/>
-                    <p class="comment">保持缓存文件句柄，提升缓存文件打开速度，建议数量不超过缓存文件数量的10%。</p>
+                    <p class="comment">保持在内存中的缓存文件句柄的数量，提升缓存文件打开速度，建议数量不超过缓存文件数量的十分之一。</p>
                 </td>
             </tr>
             <tr v-show="teaIsPlus">
diff --git a/web/views/@default/servers/components/cache/update.html b/web/views/@default/servers/components/cache/update.html
@@ -52,7 +52,7 @@
                     <td class="color-border">缓存文件句柄缓存</td>
                     <td>
                         <input type="text" name="fileOpenFileCacheMax" v-model="fileOpenFileCacheMax" maxlength="6" value="0" style="width: 10em"/>
-                        <p class="comment">保持缓存文件句柄，提升缓存文件打开速度，建议数量是缓存文件数量的10%。</p>
+                        <p class="comment">保持在内存中的缓存文件句柄的数量，提升缓存文件打开速度，建议数量不超过缓存文件数量的十分之一。</p>
                     </td>
                 </tr>
                 <tr v-show="teaIsPlus">

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,18 @@ func (this *IndexAction) Init() {`
`21`	`21`	`this.Nav("", "", "purge")`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (this *IndexAction) RunGet(params struct{}) {`
	`24`	`+func (this *IndexAction) RunGet(params struct {`
	`25`	`+ KeyType string`
	`26`	`+}) {`
`25`	`27`	`// 初始化菜单数据`
`26`	`28`	`err := InitMenu(this.Parent())`
`27`	`29`	`if err != nil {`
`28`	`30`	`this.ErrorPage(err)`
`29`	`31`	`return`
`30`	`32`	`}`
`31`	`33`
	`34`	`+ this.Data["keyType"] = params.KeyType`
	`35`	`+`
`32`	`36`	`this.Show()`
`33`	`37`	`}`
`34`	`38`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ Vue.component("plan-bandwidth-ranges", {`
`44`	`44`	`return -1`
`45`	`45`	`}`
`46`	`46`	`if (v1.minMB == v2.minMB) {`
	`47`	`+ if (v2.maxMB == 0 \|\| v1.maxMB < v2.maxMB) {`
	`48`	`+ return -1`
	`49`	`+ }`
`47`	`50`	`return 0`
`48`	`51`	`}`
`49`	`52`	`return 1`