diff --git a/internal/configloaders/admin_module_test.go b/internal/configloaders/admin_module_test.go index f6c020a3..6c69102f 100644 --- a/internal/configloaders/admin_module_test.go +++ b/internal/configloaders/admin_module_test.go @@ -6,7 +6,7 @@ import ( ) func TestLoadAdminModuleMapping(t *testing.T) { - m, err := LoadAdminModuleMapping() + m, err := loadAdminModuleMapping() if err != nil { t.Fatal(err) } diff --git a/internal/configloaders/admin_ui_config_test.go b/internal/configloaders/admin_ui_config_test.go index bdd805a0..43733408 100644 --- a/internal/configloaders/admin_ui_config_test.go +++ b/internal/configloaders/admin_ui_config_test.go @@ -9,7 +9,7 @@ import ( func TestLoadUIConfig(t *testing.T) { for i := 0; i < 10; i++ { before := time.Now() - config, err := LoadUIConfig() + config, err := LoadAdminUIConfig() if err != nil { t.Fatal(err) } @@ -20,7 +20,7 @@ func TestLoadUIConfig(t *testing.T) { func TestLoadUIConfig2(t *testing.T) { for i := 0; i < 10; i++ { - config, err := LoadUIConfig() + config, err := LoadAdminUIConfig() if err != nil { t.Fatal(err) } diff --git a/internal/configs/api_config_test.go b/internal/configs/api_config_test.go index f5dd4c63..a99e9ff4 100644 --- a/internal/configs/api_config_test.go +++ b/internal/configs/api_config_test.go @@ -14,13 +14,7 @@ func TestLoadAPIConfig(t *testing.T) { } func TestAPIConfig_WriteFile(t *testing.T) { - config := &APIConfig{ - RPC: struct { - Endpoints []string `yaml:"endpoints"` - }{}, - NodeId: "1", - Secret: "2", - } + config := &APIConfig{} err := config.WriteFile("/tmp/api_config.yaml") if err != nil { t.Fatal(err) diff --git a/internal/web/actions/default/api/delete.go b/internal/web/actions/default/api/delete.go index cc351516..d11501cd 100644 --- a/internal/web/actions/default/api/delete.go +++ b/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{}) diff --git a/internal/web/actions/default/clusters/cluster/groups/createPopup.go b/internal/web/actions/default/clusters/cluster/groups/createPopup.go index 9d3bd926..3666986b 100644 --- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go +++ b/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() } diff --git a/internal/web/actions/default/clusters/regions/items/updatePopup.go b/internal/web/actions/default/clusters/regions/items/updatePopup.go index 515f99a1..cca40ac4 100644 --- a/internal/web/actions/default/clusters/regions/items/updatePopup.go +++ b/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). diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go index a9baa197..715a3804 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go +++ b/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 diff --git a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go index 65973c0d..b96f0223 100644 --- a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go +++ b/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() } diff --git a/internal/web/actions/default/servers/groups/group/settings/index/index.go b/internal/web/actions/default/servers/groups/group/settings/index/index.go index 0e0c9815..e285f487 100644 --- a/internal/web/actions/default/servers/groups/group/settings/index/index.go +++ b/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 } diff --git a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go index 11a801fa..83c57752 100644 --- a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go +++ b/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() } diff --git a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go index 6fe2cb88..2c1b3254 100644 --- a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go +++ b/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() } diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go index b703d13e..4744fdbe 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go +++ b/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 diff --git a/internal/web/actions/default/servers/iplists/createIPPopup.go b/internal/web/actions/default/servers/iplists/createIPPopup.go index 9b77685e..e8e31c83 100644 --- a/internal/web/actions/default/servers/iplists/createIPPopup.go +++ b/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 diff --git a/internal/web/actions/default/servers/iplists/updateIPPopup.go b/internal/web/actions/default/servers/iplists/updateIPPopup.go index 8c4aff1c..6a098c43 100644 --- a/internal/web/actions/default/servers/iplists/updateIPPopup.go +++ b/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 diff --git a/internal/web/actions/default/servers/server/settings/cache/updateRefs.go b/internal/web/actions/default/servers/server/settings/cache/updateRefs.go index 34178def..53fcab84 100644 --- a/internal/web/actions/default/servers/server/settings/cache/updateRefs.go +++ b/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) diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go index e63b8d53..5f364745 100644 --- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go +++ b/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() } diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go index b703d13e..4744fdbe 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go +++ b/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 diff --git a/internal/web/actions/default/ui/countryOptions.go b/internal/web/actions/default/ui/countryOptions.go index e4cadd1e..1346769c 100644 --- a/internal/web/actions/default/ui/countryOptions.go +++ b/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]) }