优化代码

internal/web/actions/default/api/delete.go

@@ -25,6 +25,7 @@ func (this *DeleteAction) RunPost(params struct {
 	var apiNode = nodeResp.ApiNode
 	if apiNode == nil {
 		this.Success()
+		return
 	}
 	if apiNode.IsOn {
 		countResp, err := this.RPC().APINodeRPC().CountAllEnabledAndOnAPINodes(this.AdminContext(), &pb.CountAllEnabledAndOnAPINodesRequest{})

internal/web/actions/default/clusters/cluster/groups/createPopup.go

@@ -48,7 +48,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建节点分组", createResp.NodeGroupId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建节点分组 %d", createResp.NodeGroupId)
 
 	this.Success()
 }

internal/web/actions/default/clusters/regions/items/updatePopup.go

@@ -48,7 +48,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
-	defer this.CreateLogInfo("修改流量价格项目", params.ItemId)
+	defer this.CreateLogInfo("修改流量价格项目 %d", params.ItemId)
 
 	params.Must.
 		Field("name", params.Name).

internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go

@@ -80,9 +80,9 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
 
 		var ipToLong uint64
 		if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
-			ipToLong = utils.IP2Long(params.IpTo)
 			this.Fail("请输入正确的结束IP")
 		}
+		ipToLong = utils.IP2Long(params.IpTo)
 
 		if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
 			params.IpTo, params.IpFrom = params.IpFrom, params.IpTo

internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go

@@ -109,6 +109,10 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	this.Success()
 }

internal/web/actions/default/servers/groups/group/settings/index/index.go

@@ -24,5 +24,4 @@ func (this *IndexAction) RunGet(params struct {
 	} else {
 		this.RedirectURL("/servers/groups/group/settings/httpReverseProxy?groupId=" + types.String(params.GroupId))
 	}
-	return
 }

internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go

@@ -109,6 +109,10 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	this.Success()
 }

internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go

@@ -96,8 +96,12 @@ func (this *SettingAction) RunPost(params struct {
 		StripPrefix:     reverseProxyConfig.StripPrefix,
 		AutoFlush:       reverseProxyConfig.AutoFlush,
 		AddHeaders:      reverseProxyConfig.AddHeaders,
-		FollowRedirects:   reverseProxyConfig.FollowRedirects,
+		FollowRedirects: reverseProxyConfig.FollowRedirects,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	this.Success()
 }

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go

@@ -79,9 +79,9 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
 
 		var ipToLong uint64
 		if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
-			ipToLong = utils.IP2Long(params.IpTo)
 			this.Fail("请输入正确的结束IP")
 		}
+		ipToLong = utils.IP2Long(params.IpTo)
 
 		if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
 			params.IpTo, params.IpFrom = params.IpFrom, params.IpTo

internal/web/actions/default/servers/iplists/createIPPopup.go

@@ -97,9 +97,9 @@ func (this *CreateIPPopupAction) RunPost(params struct {
 
 			var ipToLong uint64
 			if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
-				ipToLong = utils.IP2Long(params.IpTo)
 				this.Fail("请输入正确的结束IP")
 			}
+			ipToLong = utils.IP2Long(params.IpTo)
 
 			if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
 				params.IpTo, params.IpFrom = params.IpFrom, params.IpTo

internal/web/actions/default/servers/iplists/updateIPPopup.go

@@ -79,9 +79,9 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
 
 		var ipToLong uint64
 		if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
-			ipToLong = utils.IP2Long(params.IpTo)
 			this.Fail("请输入正确的结束IP")
 		}
+		ipToLong = utils.IP2Long(params.IpTo)
 
 		if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
 			params.IpTo, params.IpFrom = params.IpFrom, params.IpTo

internal/web/actions/default/servers/server/settings/cache/updateRefs.go

@@ -41,9 +41,6 @@ func (this *UpdateRefsAction) RunPost(params struct {
 
 	// 校验配置
 	var cacheConfig = webConfig.Cache
-	if webConfig == nil {
-		this.Success()
-	}
 
 	var refs = []*serverconfigs.HTTPCacheRef{}
 	err = json.Unmarshal(params.RefsJSON, &refs)

internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go

@@ -100,6 +100,10 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	this.Success()
 }

internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go

@@ -79,9 +79,9 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
 
 		var ipToLong uint64
 		if len(params.IpTo) > 0 && !utils.IsIPv4(params.IpTo) {
-			ipToLong = utils.IP2Long(params.IpTo)
 			this.Fail("请输入正确的结束IP")
 		}
+		ipToLong = utils.IP2Long(params.IpTo)
 
 		if ipFromLong > 0 && ipToLong > 0 && ipFromLong > ipToLong {
 			params.IpTo, params.IpFrom = params.IpFrom, params.IpTo

internal/web/actions/default/ui/countryOptions.go

@@ -26,7 +26,7 @@ func (this *CountryOptionsAction) RunPost(params struct{}) {
 		}
 
 		var letter = ""
-		if len(country.Pinyin) > 0 && len(country.Pinyin) > 0 && len(country.Pinyin[0]) > 0 {
+		if len(country.Pinyin) > 0 && len(country.Pinyin[0]) > 0 {
 			letter = strings.ToUpper(country.Pinyin[0][:1])
 		}