v1.4.1

2026-04-25 14:45:18 +08:00 · 2024-07-27 15:42:58 +08:00
parent 7279dc873f
commit d7d0c8fbfe
490 changed files with 2158 additions and 738 deletions
--- a/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go
+++ b/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go
@@ -4,6 +4,7 @@ package iplists

 import (
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
--- a/internal/web/actions/default/servers/iplists/createIPPopup.go
+++ b/internal/web/actions/default/servers/iplists/createIPPopup.go
@@ -1,6 +1,8 @@
 package iplists

 import (
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -9,7 +11,6 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
-	"strings"
 )

 type CreateIPPopupAction struct {
--- a/internal/web/actions/default/servers/iplists/deleteCount.go
+++ b/internal/web/actions/default/servers/iplists/deleteCount.go
@@ -3,12 +3,13 @@
 package iplists

 import (
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
-	"strings"
 )

 type DeleteCountAction struct {
--- a/internal/web/actions/default/servers/iplists/deleteItems.go
+++ b/internal/web/actions/default/servers/iplists/deleteItems.go
@@ -3,12 +3,13 @@
 package iplists

 import (
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
-	"strings"
 )

 type DeleteItemsAction struct {
--- a/internal/web/actions/default/servers/iplists/exportData.go
+++ b/internal/web/actions/default/servers/iplists/exportData.go
@@ -6,6 +6,8 @@ import (
 	"bytes"
 	"encoding/csv"
 	"encoding/json"
+	"strconv"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -13,7 +15,6 @@ import (
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
 	"github.com/tealeg/xlsx/v3"
-	"strconv"
 )

 type ExportDataAction struct {
--- a/internal/web/actions/default/servers/iplists/import.go
+++ b/internal/web/actions/default/servers/iplists/import.go
@@ -6,6 +6,10 @@ import (
 	"bytes"
 	"encoding/csv"
 	"encoding/json"
+	"io"
+	"regexp"
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -14,9 +18,6 @@ import (
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
 	"github.com/tealeg/xlsx/v3"
-	"io"
-	"regexp"
-	"strings"
 )

 type ImportAction struct {
--- a/internal/web/actions/default/servers/iplists/index.go
+++ b/internal/web/actions/default/servers/iplists/index.go
@@ -3,13 +3,14 @@
 package iplists

 import (
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
 )

 type IndexAction struct {
--- a/internal/web/actions/default/servers/iplists/iplistutils/utils.go
+++ b/internal/web/actions/default/servers/iplists/iplistutils/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package iplistutils

--- a/internal/web/actions/default/servers/iplists/items.go
+++ b/internal/web/actions/default/servers/iplists/items.go
@@ -3,13 +3,14 @@
 package iplists

 import (
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
 )

 type ItemsAction struct {
--- a/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go
+++ b/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go
@@ -4,6 +4,7 @@ package iplists

 import (
 	"encoding/json"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
--- a/internal/web/actions/default/servers/iplists/utils.go
+++ b/internal/web/actions/default/servers/iplists/utils.go
@@ -4,6 +4,7 @@ package iplists

 import (
 	"errors"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"