mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 13:10:26 +08:00 
			
		
		
		
	添加域名时自动分割用逗号、顿号连接的域名列表
This commit is contained in:
		@@ -36,31 +36,43 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 | 
				
			|||||||
		// 去除空格
 | 
							// 去除空格
 | 
				
			||||||
		serverName = regexp.MustCompile(`\s+`).ReplaceAllString(serverName, "")
 | 
							serverName = regexp.MustCompile(`\s+`).ReplaceAllString(serverName, "")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// 处理URL
 | 
							// 是否包含了多个域名
 | 
				
			||||||
		if regexp.MustCompile(`^(?i)(http|https|ftp)://`).MatchString(serverName) {
 | 
							var splitReg = regexp.MustCompile(`([,、|,;|])`)
 | 
				
			||||||
			u, err := url.Parse(serverName)
 | 
							if splitReg.MatchString(serverName) {
 | 
				
			||||||
			if err == nil && len(u.Host) > 0 {
 | 
								params.ServerNames = strings.Join(splitReg.Split(serverName, -1), "\n")
 | 
				
			||||||
				serverName = u.Host
 | 
								params.Mode = "multiple"
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								// 处理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
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// 去除端口
 | 
								// 去除端口
 | 
				
			||||||
		if regexp.MustCompile(`:\d+$`).MatchString(serverName) {
 | 
								if regexp.MustCompile(`:\d+$`).MatchString(serverName) {
 | 
				
			||||||
			host, _, err := net.SplitHostPort(serverName)
 | 
									host, _, err := net.SplitHostPort(serverName)
 | 
				
			||||||
			if err == nil && len(host) > 0 {
 | 
									if err == nil && len(host) > 0 {
 | 
				
			||||||
				serverName = host
 | 
										serverName = host
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		params.Must.
 | 
								params.Must.
 | 
				
			||||||
			Field("serverName", serverName).
 | 
									Field("serverName", serverName).
 | 
				
			||||||
			Require("请输入域名")
 | 
									Require("请输入域名")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		this.Data["serverName"] = maps.Map{
 | 
								this.Data["serverName"] = maps.Map{
 | 
				
			||||||
			"name": serverName,
 | 
									"name": serverName,
 | 
				
			||||||
			"type": "full",
 | 
									"type": "full",
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								this.Success()
 | 
				
			||||||
 | 
								return
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} else if params.Mode == "multiple" {
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if params.Mode == "multiple" {
 | 
				
			||||||
		if len(params.ServerNames) == 0 {
 | 
							if len(params.ServerNames) == 0 {
 | 
				
			||||||
			this.FailField("serverNames", "请输入至少域名")
 | 
								this.FailField("serverNames", "请输入至少域名")
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
@@ -99,8 +111,6 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 | 
				
			|||||||
			"type":     "full",
 | 
								"type":     "full",
 | 
				
			||||||
			"subNames": serverNames,
 | 
								"subNames": serverNames,
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} else {
 | 
					 | 
				
			||||||
		this.Fail("错误的mode参数")
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	this.Success()
 | 
						this.Success()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user