将版本修改为0.5.2.1

internal/configloaders/admin_module.go

@@ -22,6 +22,7 @@ const (
 	AdminModuleCodePlan      AdminModuleCode = "plan"      // 套餐
 	AdminModuleCodeLog       AdminModuleCode = "log"       // 日志
 	AdminModuleCodeSetting   AdminModuleCode = "setting"   // 设置
+	AdminModuleCodeTicket    AdminModuleCode = "ticket"    // 工单
 	AdminModuleCodeCommon    AdminModuleCode = "common"    // 只要登录就可以访问的模块
 )
 
@@ -159,7 +160,7 @@ func UpdateAdminTheme(adminId int64, theme string) {
 
 // AllModuleMaps 所有权限列表
 func AllModuleMaps() []maps.Map {
-	m := []maps.Map{
+	var m = []maps.Map{
 		{
 			"name": "看板",
 			"code": AdminModuleCodeDashboard,
@@ -204,11 +205,24 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeFinance,
 			"url":  "/finance",
 		},
-		{
-			"name": "套餐管理",
-			"code": AdminModuleCodePlan,
-			"url":  "/plans",
-		},
+	}...)
+
+	if teaconst.IsPlus {
+		m = append(m, []maps.Map{
+			{
+				"name": "套餐管理",
+				"code": AdminModuleCodePlan,
+				"url":  "/plans",
+			},
+			{
+				"name": "工单系统",
+				"code": AdminModuleCodeTicket,
+				"url":  "/tickets",
+			},
+		}...)
+	}
+
+	m = append(m, []maps.Map{
 		{
 			"name": "日志审计",
 			"code": AdminModuleCodeLog,

internal/configloaders/admin_ui_config.go

@@ -26,6 +26,15 @@ func LoadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) {
 	return &v, nil
 }
 
+func ReloadAdminUIConfig() error {
+	locker.Lock()
+	defer locker.Unlock()
+
+	sharedAdminUIConfig = nil
+	_, err := loadAdminUIConfig()
+	return err
+}
+
 func UpdateAdminUIConfig(uiConfig *systemconfigs.AdminUIConfig) error {
 	locker.Lock()
 	defer locker.Unlock()

internal/configs/api_config.go

@@ -4,7 +4,6 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -34,7 +33,7 @@ func LoadAPIConfig() (*APIConfig, error) {
 	var data []byte
 	var err error
 	for _, path := range paths {
-		data, err = ioutil.ReadFile(path)
+		data, err = os.ReadFile(path)
 		if err == nil {
 			if path == localFile {
 				isFromLocal = true
@@ -54,7 +53,7 @@ func LoadAPIConfig() (*APIConfig, error) {
 
 	if !isFromLocal {
 		// 恢复文件
-		_ = ioutil.WriteFile(localFile, data, 0666)
+		_ = os.WriteFile(localFile, data, 0666)
 	}
 
 	return config, nil
@@ -110,41 +109,48 @@ func (this *APIConfig) WriteFile(path string) error {
 		return err
 	}
 
+	err = os.WriteFile(path, data, 0666)
+	if err != nil {
+		return err
+	}
+
 	// 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息
 	// 写入 ~/.edge-admin/
-	filename := filepath.Base(path)
+	// 这个用来判断用户是否为重装，所以比较重要
+	var filename = filepath.Base(path)
 	homeDir, homeErr := os.UserHomeDir()
 	if homeErr == nil {
 		dir := homeDir + "/." + teaconst.ProcessName
 		stat, err := os.Stat(dir)
 		if err == nil && stat.IsDir() {
-			_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+			err = os.WriteFile(dir+"/"+filename, data, 0666)
+			if err != nil {
+				return err
+			}
 		} else if err != nil && os.IsNotExist(err) {
 			err = os.Mkdir(dir, 0777)
 			if err == nil {
-				_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+				err = os.WriteFile(dir+"/"+filename, data, 0666)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}
 
 	// 写入 /etc/edge-admin
 	{
-		dir := "/etc/" + teaconst.ProcessName
+		var dir = "/etc/" + teaconst.ProcessName
 		stat, err := os.Stat(dir)
 		if err == nil && stat.IsDir() {
-			_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+			_ = os.WriteFile(dir+"/"+filename, data, 0666)
 		} else if err != nil && os.IsNotExist(err) {
 			err = os.Mkdir(dir, 0777)
 			if err == nil {
-				_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+				_ = os.WriteFile(dir+"/"+filename, data, 0666)
 			}
 		}
 	}
 
-	err = ioutil.WriteFile(path, data, 0666)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/configs/plus_config.go

@@ -5,7 +5,7 @@ package configs
 import (
 	"encoding/json"
 	"github.com/iwind/TeaGo/Tea"
-	"io/ioutil"
+	"os"
 )
 
 var plusConfigFile = "plus.cache.json"
@@ -17,7 +17,7 @@ type PlusConfig struct {
 }
 
 func ReadPlusConfig() *PlusConfig {
-	data, err := ioutil.ReadFile(Tea.ConfigFile(plusConfigFile))
+	data, err := os.ReadFile(Tea.ConfigFile(plusConfigFile))
 	if err != nil {
 		return &PlusConfig{IsPlus: false}
 	}
@@ -34,7 +34,7 @@ func WritePlusConfig(config *PlusConfig) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
+	err = os.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
 	if err != nil {
 		return err
 	}

internal/const/build.go

@@ -1,5 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-// +build !plus
+//go:build !plus
 
 package teaconst
 

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.4.10"
+	Version = "0.5.2.1"
 
-	APINodeVersion = "0.4.10"
+	APINodeVersion = "0.5.2.1"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/const/plus.go

@@ -1,6 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 //go:build !plus
-// +build !plus
 
 package teaconst
 

internal/csrf/utils.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-// 生成Token
+// Generate 生成Token
 func Generate() string {
 	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 
@@ -23,7 +23,7 @@ func Generate() string {
 	return token
 }
 
-// 校验Token
+// Validate 校验Token
 func Validate(token string) (b bool) {
 	if len(token) == 0 {
 		return

internal/nodes/admin_node.go

@@ -16,7 +16,6 @@ import (
 	"github.com/iwind/TeaGo/types"
 	"github.com/iwind/gosock/pkg/gosock"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
 	"log"
 	"net"
 	"os"
@@ -173,9 +172,9 @@ func (this *AdminNode) checkServer() error {
 	if os.IsNotExist(err) {
 		// 创建文件
 		templateFile := Tea.ConfigFile("server.template.yaml")
-		data, err := ioutil.ReadFile(templateFile)
+		data, err := os.ReadFile(templateFile)
 		if err == nil {
-			err = ioutil.WriteFile(configFile, data, 0666)
+			err = os.WriteFile(configFile, data, 0666)
 			if err != nil {
 				return errors.New("create config file failed: " + err.Error())
 			}
@@ -195,7 +194,7 @@ https:
   cert: ""
   key: ""
 `
-			err = ioutil.WriteFile(configFile, []byte(templateYAML), 0666)
+			err = os.WriteFile(configFile, []byte(templateYAML), 0666)
 			if err != nil {
 				return errors.New("create config file failed: " + err.Error())
 			}
@@ -210,7 +209,7 @@ https:
 // 添加端口到防火墙
 func (this *AdminNode) addPortsToFirewall() {
 	var configFile = Tea.ConfigFile("server.yaml")
-	data, err := ioutil.ReadFile(configFile)
+	data, err := os.ReadFile(configFile)
 	if err != nil {
 		return
 	}
@@ -263,9 +262,9 @@ func (this *AdminNode) startAPINode() {
 		for _, path := range paths {
 			_, err = os.Stat(path)
 			if err == nil {
-				data, err := ioutil.ReadFile(path)
+				data, err := os.ReadFile(path)
 				if err == nil {
-					err = ioutil.WriteFile(configPath, data, 0666)
+					err = os.WriteFile(configPath, data, 0666)
 					if err == nil {
 						logs.Println("[NODE]recover 'edge-api/configs/api.yaml' from '" + path + "'")
 						canStart = true
@@ -289,9 +288,9 @@ func (this *AdminNode) startAPINode() {
 		for _, path := range paths {
 			_, err = os.Stat(path)
 			if err == nil {
-				data, err := ioutil.ReadFile(path)
+				data, err := os.ReadFile(path)
 				if err == nil {
-					err = ioutil.WriteFile(dbPath, data, 0666)
+					err = os.WriteFile(dbPath, data, 0666)
 					if err == nil {
 						logs.Println("[NODE]recover 'edge-api/configs/db.yaml' from '" + path + "'")
 						break
@@ -316,12 +315,12 @@ func (this *AdminNode) startAPINode() {
 // 生成Secret
 func (this *AdminNode) genSecret() string {
 	tmpFile := os.TempDir() + "/edge-admin-secret.tmp"
-	data, err := ioutil.ReadFile(tmpFile)
+	data, err := os.ReadFile(tmpFile)
 	if err == nil && len(data) == 32 {
 		return string(data)
 	}
 	secret := rands.String(32)
-	_ = ioutil.WriteFile(tmpFile, []byte(secret), 0666)
+	_ = os.WriteFile(tmpFile, []byte(secret), 0666)
 	return secret
 }
 

internal/rpc/rpc_client.go

@@ -11,6 +11,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"google.golang.org/grpc"
@@ -19,7 +20,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
 	"google.golang.org/grpc/metadata"
+	"net"
 	"net/url"
+	"strings"
 	"sync"
 	"time"
 )
@@ -38,7 +41,7 @@ func NewRPCClient(apiConfig *configs.APIConfig, isPrimary bool) (*RPCClient, err
 		return nil, errors.New("api config should not be nil")
 	}
 
-	client := &RPCClient{
+	var client = &RPCClient{
 		apiConfig: apiConfig,
 	}
 
@@ -123,6 +126,10 @@ func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerBandwidthStatRPC() pb.ServerBandwidthStatServiceClient {
+	return pb.NewServerBandwidthStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerClientSystemMonthlyStatRPC() pb.ServerClientSystemMonthlyStatServiceClient {
 	return pb.NewServerClientSystemMonthlyStatServiceClient(this.pickConn())
 }
@@ -316,22 +323,18 @@ func (this *RPCClient) IPLibraryRPC() pb.IPLibraryServiceClient {
 	return pb.NewIPLibraryServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) IPLibraryFileRPC() pb.IPLibraryFileServiceClient {
+	return pb.NewIPLibraryFileServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) IPLibraryArtifactRPC() pb.IPLibraryArtifactServiceClient {
+	return pb.NewIPLibraryArtifactServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) IPListRPC() pb.IPListServiceClient {
 	return pb.NewIPListServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) ReportNodeRPC() pb.ReportNodeServiceClient {
-	return pb.NewReportNodeServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) ReportNodeGroupRPC() pb.ReportNodeGroupServiceClient {
-	return pb.NewReportNodeGroupServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) ReportResultRPC() pb.ReportResultServiceClient {
-	return pb.NewReportResultServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) IPItemRPC() pb.IPItemServiceClient {
 	return pb.NewIPItemServiceClient(this.pickConn())
 }
@@ -356,6 +359,10 @@ func (this *RPCClient) RegionCityRPC() pb.RegionCityServiceClient {
 	return pb.NewRegionCityServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) RegionTownRPC() pb.RegionTownServiceClient {
+	return pb.NewRegionTownServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) RegionProviderRPC() pb.RegionProviderServiceClient {
 	return pb.NewRegionProviderServiceClient(this.pickConn())
 }
@@ -448,42 +455,6 @@ func (this *RPCClient) LatestItemRPC() pb.LatestItemServiceClient {
 	return pb.NewLatestItemServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) NSClusterRPC() pb.NSClusterServiceClient {
-	return pb.NewNSClusterServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
-	return pb.NewNSNodeServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
-	return pb.NewNSDomainServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
-	return pb.NewNSRecordServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSKeyRPC() pb.NSKeyServiceClient {
-	return pb.NewNSKeyServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRouteRPC() pb.NSRouteServiceClient {
-	return pb.NewNSRouteServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSAccessLogRPC() pb.NSAccessLogServiceClient {
-	return pb.NewNSAccessLogServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRPC() pb.NSServiceClient {
-	return pb.NewNSServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSQuestionOptionRPC() pb.NSQuestionOptionServiceClient {
-	return pb.NewNSQuestionOptionServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) MetricItemRPC() pb.MetricItemServiceClient {
 	return pb.NewMetricItemServiceClient(this.pickConn())
 }
@@ -526,8 +497,8 @@ func (this *RPCClient) TrafficDailyStatRPC() pb.TrafficDailyStatServiceClient {
 
 // Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
-	ctx := context.Background()
-	m := maps.Map{
+	var ctx = context.Background()
+	var m = maps.Map{
 		"timestamp": time.Now().Unix(),
 		"type":      "admin",
 		"userId":    adminId,
@@ -542,15 +513,15 @@ func (this *RPCClient) Context(adminId int64) context.Context {
 		utils.PrintError(err)
 		return context.Background()
 	}
-	token := base64.StdEncoding.EncodeToString(data)
+	var token = base64.StdEncoding.EncodeToString(data)
 	ctx = metadata.AppendToOutgoingContext(ctx, "nodeId", this.apiConfig.NodeId, "token", token)
 	return ctx
 }
 
 // APIContext 构造API上下文
 func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
-	ctx := context.Background()
-	m := maps.Map{
+	var ctx = context.Background()
+	var m = maps.Map{
 		"timestamp": time.Now().Unix(),
 		"type":      "api",
 		"userId":    apiNodeId,
@@ -565,7 +536,7 @@ func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 		utils.PrintError(err)
 		return context.Background()
 	}
-	token := base64.StdEncoding.EncodeToString(data)
+	var token = base64.StdEncoding.EncodeToString(data)
 	ctx = metadata.AppendToOutgoingContext(ctx, "nodeId", this.apiConfig.NodeId, "token", token)
 	return ctx
 }
@@ -582,20 +553,39 @@ func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
 
 // 初始化
 func (this *RPCClient) init() error {
+	// 当前的IP地址
+	var localIPAddrs = this.localIPAddrs()
+
 	// 重新连接
-	conns := []*grpc.ClientConn{}
+	var conns = []*grpc.ClientConn{}
 	for _, endpoint := range this.apiConfig.RPC.Endpoints {
 		u, err := url.Parse(endpoint)
 		if err != nil {
 			return errors.New("parse endpoint failed: " + err.Error())
 		}
+
+		var apiHost = u.Host
+
+		// 如果本机，则将地址修改为回路地址
+		if lists.ContainsString(localIPAddrs, u.Hostname()) {
+			if strings.Contains(apiHost, "[") { // IPv6 [host]:port
+				apiHost = "[::1]"
+			} else {
+				apiHost = "127.0.0.1"
+			}
+			var port = u.Port()
+			if len(port) > 0 {
+				apiHost += ":" + port
+			}
+		}
+
 		var conn *grpc.ClientConn
 		var callOptions = grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(128*1024*1024),
 			grpc.UseCompressor(gzip.Name))
 		if u.Scheme == "http" {
-			conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions)
+			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions)
 		} else if u.Scheme == "https" {
-			conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
+			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
 				InsecureSkipVerify: true,
 			})), callOptions)
 		} else {
@@ -622,7 +612,7 @@ func (this *RPCClient) pickConn() *grpc.ClientConn {
 
 	// 检查连接状态
 	if len(this.conns) > 0 {
-		availableConns := []*grpc.ClientConn{}
+		var availableConns = []*grpc.ClientConn{}
 		for _, state := range []connectivity.State{connectivity.Ready, connectivity.Idle, connectivity.Connecting} {
 			for _, conn := range this.conns {
 				if conn.GetState() == state {
@@ -674,3 +664,18 @@ func (this *RPCClient) Close() error {
 
 	return lastErr
 }
+
+func (this *RPCClient) localIPAddrs() []string {
+	localInterfaceAddrs, err := net.InterfaceAddrs()
+	var localIPAddrs = []string{}
+	if err == nil {
+		for _, addr := range localInterfaceAddrs {
+			var addrString = addr.String()
+			var index = strings.Index(addrString, "/")
+			if index > 0 {
+				localIPAddrs = append(localIPAddrs, addrString[:index])
+			}
+		}
+	}
+	return localIPAddrs
+}

internal/rpc/rpc_client_test.go

@@ -35,7 +35,8 @@ func TestRPCClient_NodeRPC(t *testing.T) {
 func TestRPC_Dial_HTTP(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"http://127.0.0.1:8004"},
 		},
@@ -56,7 +57,8 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 func TestRPC_Dial_HTTP_2(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"https://127.0.0.1:8003"},
 		},
@@ -77,7 +79,8 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 func TestRPC_Dial_HTTPS(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"https://127.0.0.1:8004"},
 		},
@@ -94,3 +97,53 @@ func TestRPC_Dial_HTTPS(t *testing.T) {
 	}
 	t.Log(resp.Node)
 }
+
+func BenchmarkNewRPCClient(b *testing.B) {
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		b.Fatal(err)
+	}
+	rpc, err := NewRPCClient(config, true)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		resp, err := rpc.AdminRPC().LoginAdmin(rpc.Context(0), &pb.LoginAdminRequest{
+			Username: "admin",
+			Password: stringutil.Md5("123456"),
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+		_ = resp
+	}
+}
+
+func BenchmarkNewRPCClient_2(b *testing.B) {
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		b.Fatal(err)
+	}
+	rpc, err := NewRPCClient(config, true)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	var conn = rpc.AdminRPC()
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		resp, err := conn.LoginAdmin(rpc.Context(0), &pb.LoginAdminRequest{
+			Username: "admin",
+			Password: stringutil.Md5("123456"),
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+		_ = resp
+	}
+}

internal/tasks/task_check_updates.go

@@ -14,7 +14,7 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	stringutil "github.com/iwind/TeaGo/utils/string"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"runtime"
 	"strings"
@@ -95,7 +95,7 @@ func (this *CheckUpdatesTask) Loop() error {
 	defer func() {
 		_ = resp.Body.Close()
 	}()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return errors.New("read api failed: " + err.Error())
 	}

internal/utils/nodelogutils/utils.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 //go:build !plus
-// +build !plus
 
 package nodelogutils
 

internal/utils/service_linux.go

@@ -1,4 +1,4 @@
-// +build linux
+//go:build linux
 
 package utils
 
@@ -7,7 +7,6 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"regexp"
@@ -16,7 +15,7 @@ import (
 var systemdServiceFile = "/etc/systemd/system/edge-admin.service"
 var initServiceFile = "/etc/init.d/" + teaconst.SystemdServiceName
 
-// 安装服务
+// Install 安装服务
 func (this *ServiceManager) Install(exePath string, args []string) error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can install the service")
@@ -30,7 +29,7 @@ func (this *ServiceManager) Install(exePath string, args []string) error {
 	return this.installSystemdService(systemd, exePath, args)
 }
 
-// 启动服务
+// Start 启动服务
 func (this *ServiceManager) Start() error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can start the service")
@@ -47,7 +46,7 @@ func (this *ServiceManager) Start() error {
 	return exec.Command("service", teaconst.ProcessName, "start").Start()
 }
 
-// 删除服务
+// Uninstall 删除服务
 func (this *ServiceManager) Uninstall() error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can uninstall the service")
@@ -83,13 +82,13 @@ func (this *ServiceManager) installInitService(exePath string, args []string) er
 		return errors.New("'scripts/" + shortName + "' file not exists")
 	}
 
-	data, err := ioutil.ReadFile(scriptFile)
+	data, err := os.ReadFile(scriptFile)
 	if err != nil {
 		return err
 	}
 
 	data = regexp.MustCompile("INSTALL_DIR=.+").ReplaceAll(data, []byte("INSTALL_DIR="+Tea.Root))
-	err = ioutil.WriteFile(initServiceFile, data, 0777)
+	err = os.WriteFile(initServiceFile, data, 0777)
 	if err != nil {
 		return err
 	}
@@ -137,7 +136,7 @@ ExecReload=` + exePath + ` reload
 WantedBy=multi-user.target`
 
 	// write file
-	err := ioutil.WriteFile(systemdServiceFile, []byte(desc), 0777)
+	err := os.WriteFile(systemdServiceFile, []byte(desc), 0777)
 	if err != nil {
 		return err
 	}

internal/utils/service_others.go

@@ -1,4 +1,4 @@
-// +build !linux,!windows
+//go:build !linux && !windows
 
 package utils
 

internal/utils/service_windows.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package utils
 

internal/utils/strings.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// format address
+// FormatAddress format address
 func FormatAddress(addr string) string {
 	if strings.HasSuffix(addr, "unix:") {
 		return addr
@@ -17,7 +17,7 @@ func FormatAddress(addr string) string {
 	return addr
 }
 
-// 分割数字
+// SplitNumbers 分割数字
 func SplitNumbers(numbers string) (result []int64) {
 	if len(numbers) == 0 {
 		return

internal/utils/strings_stream.go

@@ -0,0 +1,67 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import (
+	"github.com/iwind/TeaGo/lists"
+	"strings"
+)
+
+func FilterNotEmpty(item string) bool {
+	return len(item) > 0
+}
+
+func MapAddPrefixFunc(prefix string) func(item string) string {
+	return func(item string) string {
+		if !strings.HasPrefix(item, prefix) {
+			return prefix + item
+		}
+		return item
+	}
+}
+
+type StringsStream struct {
+	s []string
+}
+
+func NewStringsStream(s []string) *StringsStream {
+	return &StringsStream{s: s}
+}
+
+func (this *StringsStream) Map(f ...func(item string) string) *StringsStream {
+	for index, item := range this.s {
+		for _, f1 := range f {
+			item = f1(item)
+		}
+		this.s[index] = item
+	}
+	return this
+}
+
+func (this *StringsStream) Filter(f ...func(item string) bool) *StringsStream {
+	for _, f1 := range f {
+		var newStrings = []string{}
+		for _, item := range this.s {
+			if f1(item) {
+				newStrings = append(newStrings, item)
+			}
+		}
+		this.s = newStrings
+	}
+	return this
+}
+
+func (this *StringsStream) Unique() *StringsStream {
+	var newStrings = []string{}
+	for _, item := range this.s {
+		if !lists.ContainsString(newStrings, item) {
+			newStrings = append(newStrings, item)
+		}
+	}
+	this.s = newStrings
+	return this
+}
+
+func (this *StringsStream) Result() []string {
+	return this.s
+}

internal/utils/strings_stream_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils_test
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"strings"
+	"testing"
+)
+
+func TestStringsStream_Filter(t *testing.T) {
+	var stream = utils.NewStringsStream([]string{"a", "b", "1", "2", "", "png", "a"})
+	stream.Filter(func(item string) bool {
+		return len(item) > 0
+	})
+	t.Log(stream.Result())
+	stream.Map(func(item string) string {
+		return "." + item
+	})
+	t.Log(stream.Result())
+	stream.Unique()
+	t.Log(stream.Result())
+	stream.Map(strings.ToUpper, strings.ToLower)
+	t.Log(stream.Result())
+}

internal/web/actions/actionutils/page.go

@@ -111,7 +111,7 @@ func (this *Page) AsHTML() string {
 	}
 
 	// 每页数
-	result = append(result, `<select class="ui dropdown" style="height:34px;padding-top:0;padding-bottom:0;margin-left:1em;color:#666" onchange="ChangePageSize(this.value)">
+	result = append(result, `<select class="ui dropdown" style="padding-top:0;padding-bottom:0;margin-left:1em;color:#666" onchange="ChangePageSize(this.value)">
 	<option value="10">[每页]</option>`+this.renderSizeOption(10)+
 		this.renderSizeOption(20)+
 		this.renderSizeOption(30)+

internal/web/actions/actionutils/utils.go

@@ -11,7 +11,6 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -68,7 +67,7 @@ func FailPage(action actions.ActionWrapper, err error) {
 		var issuesHTML = ""
 		if isLocalAPI {
 			// 读取本地API节点的issues
-			issuesData, issuesErr := ioutil.ReadFile(Tea.Root + "/edge-api/logs/issues.log")
+			issuesData, issuesErr := os.ReadFile(Tea.Root + "/edge-api/logs/issues.log")
 			if issuesErr == nil {
 				var issueMaps = []maps.Map{}
 				issuesErr = json.Unmarshal(issuesData, &issueMaps)

internal/web/actions/default/api/node/createAddrPopup.go

@@ -5,9 +5,12 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"net"
+	"net/url"
+	"regexp"
+	"strings"
 )
 
-// 添加地址
+// CreateAddrPopupAction 添加地址
 type CreateAddrPopupAction struct {
 	actionutils.ParentAction
 }
@@ -30,12 +33,31 @@ func (this *CreateAddrPopupAction) RunPost(params struct {
 		Field("addr", params.Addr).
 		Require("请输入访问地址")
 
+	// 兼容URL
+	if regexp.MustCompile(`^(?i)(http|https)://`).MatchString(params.Addr) {
+		u, err := url.Parse(params.Addr)
+		if err != nil {
+			this.FailField("addr", "错误的访问地址，不需要添加http://或https://")
+		}
+		params.Addr = u.Host
+	}
+
+	// 自动添加端口
+	if !strings.Contains(params.Addr, ":") {
+		switch params.Protocol {
+		case "http":
+			params.Addr += ":80"
+		case "https":
+			params.Addr += ":443"
+		}
+	}
+
 	host, port, err := net.SplitHostPort(params.Addr)
 	if err != nil {
 		this.FailField("addr", "错误的访问地址")
 	}
 
-	addrConfig := &serverconfigs.NetworkAddressConfig{
+	var addrConfig = &serverconfigs.NetworkAddressConfig{
 		Protocol:  serverconfigs.Protocol(params.Protocol),
 		Host:      host,
 		PortRange: port,

internal/web/actions/default/api/node/install.go

@@ -5,7 +5,6 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/maps"
-	"io/ioutil"
 	"os"
 )
 
@@ -46,7 +45,7 @@ func (this *InstallAction) RunGet(params struct {
 		"isNotFound": false,
 	}
 	dbConfigFile := Tea.ConfigFile("api_db.yaml")
-	data, err := ioutil.ReadFile(dbConfigFile)
+	data, err := os.ReadFile(dbConfigFile)
 	dbConfigMap["config"] = string(data)
 	if err != nil {
 		dbConfigMap["error"] = err.Error()

internal/web/actions/default/api/node/updateAddrPopup.go

@@ -5,6 +5,9 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"net"
+	"net/url"
+	"regexp"
+	"strings"
 )
 
 type UpdateAddrPopupAction struct {
@@ -27,6 +30,26 @@ func (this *UpdateAddrPopupAction) RunPost(params struct {
 	params.Must.
 		Field("addr", params.Addr).
 		Require("请输入访问地址")
+
+	// 兼容URL
+	if regexp.MustCompile(`^(?i)(http|https)://`).MatchString(params.Addr) {
+		u, err := url.Parse(params.Addr)
+		if err != nil {
+			this.FailField("addr", "错误的访问地址，不需要添加http://或https://")
+		}
+		params.Addr = u.Host
+	}
+
+	// 自动添加端口
+	if !strings.Contains(params.Addr, ":") {
+		switch params.Protocol {
+		case "http":
+			params.Addr += ":80"
+		case "https":
+			params.Addr += ":443"
+		}
+	}
+
 	host, port, err := net.SplitHostPort(params.Addr)
 	if err != nil {
 		this.FailField("addr", "错误的访问地址")

internal/web/actions/default/clusters/cluster/node/detail.go

@@ -25,7 +25,8 @@ func (this *DetailAction) Init() {
 }
 
 func (this *DetailAction) RunGet(params struct {
-	NodeId int64
+	NodeId    int64
+	ClusterId int64
 }) {
 	this.Data["nodeId"] = params.NodeId
 
@@ -43,13 +44,13 @@ func (this *DetailAction) RunGet(params struct {
 	// 主集群
 	var clusterMap maps.Map = nil
 	if node.NodeCluster != nil {
-		clusterId := node.NodeCluster.Id
+		var clusterId = node.NodeCluster.Id
 		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		cluster := clusterResp.NodeCluster
+		var cluster = clusterResp.NodeCluster
 		if cluster != nil {
 			clusterMap = maps.Map{
 				"id":         cluster.Id,
@@ -69,6 +70,14 @@ func (this *DetailAction) RunGet(params struct {
 		})
 	}
 
+	// 当前访问集群的DNS设置
+	clusterDNSInfo, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["dnsIsExcludingLnNode"] = clusterDNSInfo != nil && !clusterDNSInfo.IncludingLnNodes && node.Level > 1
+
 	// IP地址
 	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
@@ -286,6 +295,11 @@ func (this *DetailAction) RunGet(params struct {
 		}
 	}
 
+	var lnAddrs = node.LnAddrs
+	if lnAddrs == nil {
+		lnAddrs = []string{}
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":                node.Id,
 		"name":              node.Name,
@@ -303,6 +317,7 @@ func (this *DetailAction) RunGet(params struct {
 		"routes":            routeMaps,
 		"level":             node.Level,
 		"levelInfo":         nodeconfigs.FindNodeLevel(int(node.Level)),
+		"lnAddrs":           lnAddrs,
 
 		"status": maps.Map{
 			"isActive":             status.IsActive,

internal/web/actions/default/clusters/cluster/node/nodeutils/utils_ext.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
 //go:build !plus
-// +build !plus
 
 package nodeutils
 

internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go

@@ -102,8 +102,12 @@ func (this *IndexAction) RunPost(params struct {
 			this.FailField("tcpMaxConnectionsPerIP", "TCP: 单IP TCP最大连接数不能小于"+types.String(nodeconfigs.DefaultTCPMinConnectionsPerIP))
 		}
 
-		if tcpConfig.NewConnectionsRate > 0 && tcpConfig.NewConnectionsRate < nodeconfigs.DefaultTCPNewConnectionsMinRate {
-			this.FailField("tcpNewConnectionsRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinRate))
+		if tcpConfig.NewConnectionsMinutelyRate > 0 && tcpConfig.NewConnectionsMinutelyRate < nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate {
+			this.FailField("tcpNewConnectionsMinutelyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate))
+		}
+
+		if tcpConfig.NewConnectionsSecondlyRate > 0 && tcpConfig.NewConnectionsSecondlyRate < nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate {
+			this.FailField("tcpNewConnectionsSecondlyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate))
 		}
 
 		// Port

internal/web/actions/default/clusters/cluster/node/update.go

@@ -11,6 +11,7 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
+	"net"
 )
 
 type UpdateAction struct {
@@ -61,7 +62,7 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	ipAddressMaps := []maps.Map{}
+	var ipAddressMaps = []maps.Map{}
 	for _, addr := range ipAddressesResp.NodeIPAddresses {
 		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
 		if err != nil {
@@ -109,6 +110,12 @@ func (this *UpdateAction) RunGet(params struct {
 		"level":       node.Level,
 	}
 
+	if node.LnAddrs == nil {
+		nodeMap["lnAddrs"] = []string{}
+	} else {
+		nodeMap["lnAddrs"] = node.LnAddrs
+	}
+
 	if node.NodeCluster != nil {
 		nodeMap["primaryCluster"] = maps.Map{
 			"id":   node.NodeCluster.Id,
@@ -149,6 +156,7 @@ func (this *UpdateAction) RunPost(params struct {
 	SecondaryClusterIds []byte
 	IsOn                bool
 	Level               int32
+	LnAddrs             []string
 
 	Must *actions.Must
 }) {
@@ -178,7 +186,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// IP地址
-	ipAddresses := []maps.Map{}
+	var ipAddresses = []maps.Map{}
 	if len(params.IPAddressesJSON) > 0 {
 		err := json.Unmarshal(params.IPAddressesJSON, &ipAddresses)
 		if err != nil {
@@ -195,6 +203,27 @@ func (this *UpdateAction) RunPost(params struct {
 		this.Fail("没有权限修改节点级别：" + types.String(params.Level))
 	}
 
+	// 检查Ln节点地址
+	var lnAddrs = []string{}
+	if params.Level > 1 {
+		for _, lnAddr := range params.LnAddrs {
+			if len(lnAddr) == 0 {
+				continue
+			}
+
+			// 处理 host:port
+			host, _, err := net.SplitHostPort(lnAddr)
+			if err == nil {
+				lnAddr = host
+			}
+
+			if net.ParseIP(lnAddr) == nil {
+				this.Fail("L2级别访问地址 '" + lnAddr + "' 格式错误，请纠正后再提交")
+			}
+			lnAddrs = append(lnAddrs, lnAddr)
+		}
+	}
+
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
 		NodeId:                  params.NodeId,
 		NodeGroupId:             params.GroupId,
@@ -204,6 +233,7 @@ func (this *UpdateAction) RunPost(params struct {
 		SecondaryNodeClusterIds: secondaryClusterIds,
 		IsOn:                    params.IsOn,
 		Level:                   params.Level,
+		LnAddrs:                 lnAddrs,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/node/update_hook.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 //go:build !plus
-// +build !plus
 
 package node
 

internal/web/actions/default/clusters/cluster/nodes.go

@@ -282,7 +282,7 @@ func (this *NodesAction) RunGet(params struct {
 	this.Data["groups"] = groupMaps
 
 	// 所有区域
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go

@@ -75,8 +75,12 @@ func (this *IndexAction) RunPost(params struct {
 			this.FailField("tcpMaxConnectionsPerIP", "TCP: 单IP TCP最大连接数不能小于"+types.String(nodeconfigs.DefaultTCPMinConnectionsPerIP))
 		}
 
-		if tcpConfig.NewConnectionsRate > 0 && tcpConfig.NewConnectionsRate < nodeconfigs.DefaultTCPNewConnectionsMinRate {
-			this.FailField("tcpNewConnectionsRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinRate))
+		if tcpConfig.NewConnectionsMinutelyRate > 0 && tcpConfig.NewConnectionsMinutelyRate < nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate {
+			this.FailField("tcpNewConnectionsMinutelyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate))
+		}
+
+		if tcpConfig.NewConnectionsSecondlyRate > 0 && tcpConfig.NewConnectionsSecondlyRate < nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate {
+			this.FailField("tcpNewConnectionsSecondlyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate))
 		}
 
 		// Port

internal/web/actions/default/clusters/cluster/settings/dns/index.go

@@ -53,6 +53,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["ttl"] = dnsInfoResp.Ttl
 	this.Data["cnameAsDomain"] = dnsInfoResp.CnameAsDomain
+	this.Data["includingLnNodes"] = dnsInfoResp.IncludingLnNodes
 
 	this.Show()
 }
@@ -60,13 +61,14 @@ func (this *IndexAction) RunGet(params struct {
 func (this *IndexAction) RunPost(params struct {
 	ClusterId int64
 
-	DnsDomainId     int64
-	DnsName         string
-	NodesAutoSync   bool
-	ServersAutoSync bool
-	CnameRecords    []string
-	Ttl             int32
-	CnameAsDomain   bool
+	DnsDomainId      int64
+	DnsName          string
+	NodesAutoSync    bool
+	ServersAutoSync  bool
+	CnameRecords     []string
+	Ttl              int32
+	CnameAsDomain    bool
+	IncludingLnNodes bool
 
 	ConfirmResetDomain bool // 是否确认重置域名
 
@@ -107,14 +109,15 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err := this.RPC().NodeClusterRPC().UpdateNodeClusterDNS(this.AdminContext(), &pb.UpdateNodeClusterDNSRequest{
-		NodeClusterId:   params.ClusterId,
-		DnsName:         params.DnsName,
-		DnsDomainId:     params.DnsDomainId,
-		NodesAutoSync:   params.NodesAutoSync,
-		ServersAutoSync: params.ServersAutoSync,
-		CnameRecords:    params.CnameRecords,
-		Ttl:             params.Ttl,
-		CnameAsDomain:   params.CnameAsDomain,
+		NodeClusterId:    params.ClusterId,
+		DnsName:          params.DnsName,
+		DnsDomainId:      params.DnsDomainId,
+		NodesAutoSync:    params.NodesAutoSync,
+		ServersAutoSync:  params.ServersAutoSync,
+		CnameRecords:     params.CnameRecords,
+		Ttl:              params.Ttl,
+		CnameAsDomain:    params.CnameAsDomain,
+		IncludingLnNodes: params.IncludingLnNodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/clusters/clusterutils/cluster_helper_ext.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
 //go:build !plus
-// +build !plus
 
 package clusterutils
 

internal/web/actions/default/clusters/logs/fix.go

@@ -4,6 +4,7 @@ package logs
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
 	"strings"
@@ -29,5 +30,8 @@ func (this *FixAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧数字Badge更新
+	helpers.NotifyNodeLogsCountChange()
+
 	this.Success()
 }

internal/web/actions/default/clusters/logs/fixAll.go

@@ -4,6 +4,7 @@ package logs
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -21,5 +22,8 @@ func (this *FixAllAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧数字Badge更新
+	helpers.NotifyNodeLogsCountChange()
+
 	this.Success()
 }

internal/web/actions/default/clusters/logs/index.go

@@ -120,6 +120,8 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	var firstUnreadNodeMap maps.Map = nil
+
 	var logs = []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
 		// 节点信息
@@ -132,6 +134,13 @@ func (this *IndexAction) RunGet(params struct {
 			continue
 		}
 
+		if params.Type == "unread" && firstUnreadNodeMap == nil {
+			firstUnreadNodeMap = maps.Map{
+				"id":   node.Id,
+				"name": node.Name,
+			}
+		}
+
 		// 服务信息
 		var serverMap = maps.Map{"id": 0}
 		if log.ServerId > 0 {
@@ -174,5 +183,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["logs"] = logs
 
+	this.Data["firstUnreadNode"] = firstUnreadNodeMap
+
 	this.Show()
 }

internal/web/actions/default/clusters/logs/readAllLogs.go

@@ -4,6 +4,7 @@ package logs
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -20,5 +21,8 @@ func (this *ReadAllLogsAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧数字Badge更新
+	helpers.NotifyNodeLogsCountChange()
+
 	this.Success()
 }

internal/web/actions/default/clusters/logs/readLogs.go

@@ -4,6 +4,8 @@ package logs
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -13,14 +15,21 @@ type ReadLogsAction struct {
 
 func (this *ReadLogsAction) RunPost(params struct {
 	LogIds []int64
+
+	NodeId int64
 }) {
 	_, err := this.RPC().NodeLogRPC().UpdateNodeLogsRead(this.AdminContext(), &pb.UpdateNodeLogsReadRequest{
 		NodeLogIds: params.LogIds,
+		NodeId:     params.NodeId,
+		Role:       nodeconfigs.NodeRoleNode,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
+	// 通知左侧数字Badge更新
+	helpers.NotifyNodeLogsCountChange()
+
 	this.Success()
 }

internal/web/actions/default/clusters/nodes.go

@@ -258,7 +258,7 @@ func (this *NodesAction) RunGet(params struct {
 	this.Data["groups"] = groupMaps
 
 	// 所有区域
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/regions/prices.go

@@ -20,7 +20,7 @@ func (this *PricesAction) Init() {
 
 func (this *PricesAction) RunGet(params struct{}) {
 	// 所有价格项目
-	itemsResp, err := this.RPC().NodePriceItemRPC().FindAllEnabledAndOnNodePriceItems(this.AdminContext(), &pb.FindAllEnabledAndOnNodePriceItemsRequest{Type: regionutils.PriceTypeTraffic})
+	itemsResp, err := this.RPC().NodePriceItemRPC().FindAllAvailableNodePriceItems(this.AdminContext(), &pb.FindAllAvailableNodePriceItemsRequest{Type: regionutils.PriceTypeTraffic})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/regions/selectPopup.go

@@ -16,7 +16,7 @@ func (this *SelectPopupAction) Init() {
 }
 
 func (this *SelectPopupAction) RunGet(params struct{}) {
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/dashboard/index.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dashboard/dashboardutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/maps"
@@ -25,6 +26,10 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct{}) {
+	// 通知菜单数字Badge更新
+	helpers.NotifyIPItemsCountChanges()
+	helpers.NotifyNodeLogsCountChange()
+
 	if teaconst.IsPlus {
 		this.RedirectURL("/dashboard/boards")
 		return

internal/web/actions/default/dashboard/restartLocalAPINode.go

@@ -43,6 +43,9 @@ func (this *RestartLocalAPINodeAction) RunPost(params struct {
 		}
 	}
 
+	// 停止1秒等待命令运行完毕
+	time.Sleep(1 * time.Second)
+
 	// 检查是否已启动
 	var countTries = 120
 	for {

internal/web/actions/default/dns/providers/createPopup.go

@@ -1,7 +1,6 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
 //go:build !plus
-// +build !plus
 
 package providers
 
@@ -43,19 +42,7 @@ func (this *CreatePopupAction) RunGet(params struct{}) {
 	this.Data["paramCustomHTTPSecret"] = rands.HexString(32)
 
 	// EdgeDNS集群列表
-	nsClustersResp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	nsClusterMaps := []maps.Map{}
-	for _, nsCluster := range nsClustersResp.NsClusters {
-		nsClusterMaps = append(nsClusterMaps, maps.Map{
-			"id":   nsCluster.Id,
-			"name": nsCluster.Name,
-		})
-	}
-	this.Data["nsClusters"] = nsClusterMaps
+	this.Data["nsClusters"] = []maps.Map{}
 
 	this.Show()
 }
@@ -82,9 +69,6 @@ func (this *CreatePopupAction) RunPost(params struct {
 	ParamCloudFlareAPIKey string
 	ParamCloudFlareEmail  string
 
-	// Local EdgeDNS
-	ParamLocalEdgeDNSClusterId int64
-
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -137,11 +121,6 @@ func (this *CreatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.ParamCloudFlareAPIKey
 		apiParams["email"] = params.ParamCloudFlareEmail
-	case "localEdgeDNS":
-		params.Must.
-			Field("ParamLocalEdgeDNSClusterId", params.ParamLocalEdgeDNSClusterId).
-			Gt(0, "请选择域名服务集群")
-		apiParams["clusterId"] = params.ParamLocalEdgeDNSClusterId
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

internal/web/actions/default/dns/providers/provider.go

@@ -40,21 +40,10 @@ func (this *ProviderAction) RunGet(params struct {
 	}
 
 	// 本地EdgeDNS相关
-	var localEdgeDNSMap = maps.Map{}
-	if provider.Type == "localEdgeDNS" {
-		nsClusterId := apiParams.GetInt64("clusterId")
-		nsClusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: nsClusterId})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		nsCluster := nsClusterResp.NsCluster
-		if nsCluster != nil {
-			localEdgeDNSMap = maps.Map{
-				"id":   nsCluster.Id,
-				"name": nsCluster.Name,
-			}
-		}
+	localEdgeDNSMap, err := this.readEdgeDNS(provider, apiParams)
+	if err != nil {
+		this.ErrorPage(err)
+		return
 	}
 
 	this.Data["provider"] = maps.Map{

internal/web/actions/default/dns/providers/provider_ext.go

@@ -0,0 +1,13 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package providers
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func (this *ProviderAction) readEdgeDNS(provider *pb.DNSProvider, apiParams maps.Map) (maps.Map, error) {
+	return maps.Map{}, nil
+}

internal/web/actions/default/dns/providers/updatePopup.go

@@ -1,5 +1,4 @@
 //go:build !plus
-// +build !plus
 
 package providers
 
@@ -68,19 +67,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 	this.Data["types"] = typeMaps
 
 	// EdgeDNS集群列表
-	nsClustersResp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	nsClusterMaps := []maps.Map{}
-	for _, nsCluster := range nsClustersResp.NsClusters {
-		nsClusterMaps = append(nsClusterMaps, maps.Map{
-			"id":   nsCluster.Id,
-			"name": nsCluster.Name,
-		})
-	}
-	this.Data["nsClusters"] = nsClusterMaps
+	this.Data["nsClusters"] = []maps.Map{}
 
 	this.Show()
 }
@@ -109,9 +96,6 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	ParamCloudFlareAPIKey string
 	ParamCloudFlareEmail  string
 
-	// Local EdgeDNS
-	ParamLocalEdgeDNSClusterId int64
-
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -166,11 +150,6 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.ParamCloudFlareAPIKey
 		apiParams["email"] = params.ParamCloudFlareEmail
-	case "localEdgeDNS":
-		params.Must.
-			Field("ParamLocalEdgeDNSClusterId", params.ParamLocalEdgeDNSClusterId).
-			Gt(0, "请选择域名服务集群")
-		apiParams["clusterId"] = params.ParamLocalEdgeDNSClusterId
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

internal/web/actions/default/dns/updateClusterPopup.go

@@ -23,36 +23,38 @@ func (this *UpdateClusterPopupAction) RunGet(params struct {
 }) {
 	this.Data["clusterId"] = params.ClusterId
 
-	dnsResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	dnsInfoResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	this.Data["dnsName"] = dnsResp.Name
-	this.Data["nodesAutoSync"] = dnsResp.NodesAutoSync
-	this.Data["serversAutoSync"] = dnsResp.ServersAutoSync
-	if dnsResp.Domain != nil {
-		this.Data["domainId"] = dnsResp.Domain.Id
-		this.Data["domain"] = dnsResp.Domain.Name
+	this.Data["dnsName"] = dnsInfoResp.Name
+	this.Data["nodesAutoSync"] = dnsInfoResp.NodesAutoSync
+	this.Data["serversAutoSync"] = dnsInfoResp.ServersAutoSync
+	if dnsInfoResp.Domain != nil {
+		this.Data["domainId"] = dnsInfoResp.Domain.Id
+		this.Data["domain"] = dnsInfoResp.Domain.Name
 	} else {
 		this.Data["domainId"] = 0
 		this.Data["domain"] = ""
 	}
-	if dnsResp.Provider != nil {
-		this.Data["providerType"] = dnsResp.Provider.Type
-		this.Data["providerId"] = dnsResp.Provider.Id
+	if dnsInfoResp.Provider != nil {
+		this.Data["providerType"] = dnsInfoResp.Provider.Type
+		this.Data["providerId"] = dnsInfoResp.Provider.Id
 	} else {
 		this.Data["providerType"] = ""
 		this.Data["providerId"] = 0
 	}
 
-	if len(dnsResp.CnameRecords) == 0 {
+	if len(dnsInfoResp.CnameRecords) == 0 {
 		this.Data["cnameRecords"] = []string{}
 	} else {
-		this.Data["cnameRecords"] = dnsResp.CnameRecords
+		this.Data["cnameRecords"] = dnsInfoResp.CnameRecords
 	}
 
-	this.Data["ttl"] = dnsResp.Ttl
+	this.Data["ttl"] = dnsInfoResp.Ttl
+	this.Data["cnameAsDomain"] = dnsInfoResp.CnameAsDomain
+	this.Data["includingLnNodes"] = dnsInfoResp.IncludingLnNodes
 
 	// 所有服务商
 	providerTypesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{})
@@ -73,13 +75,15 @@ func (this *UpdateClusterPopupAction) RunGet(params struct {
 }
 
 func (this *UpdateClusterPopupAction) RunPost(params struct {
-	ClusterId       int64
-	DnsName         string
-	DomainId        int64
-	NodesAutoSync   bool
-	ServersAutoSync bool
-	CnameRecords    []string
-	Ttl             int32
+	ClusterId        int64
+	DnsName          string
+	DomainId         int64
+	NodesAutoSync    bool
+	ServersAutoSync  bool
+	CnameRecords     []string
+	Ttl              int32
+	CnameAsDomain    bool
+	IncludingLnNodes bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -108,13 +112,15 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterDNS(this.AdminContext(), &pb.UpdateNodeClusterDNSRequest{
-		NodeClusterId:   params.ClusterId,
-		DnsName:         params.DnsName,
-		DnsDomainId:     params.DomainId,
-		NodesAutoSync:   params.NodesAutoSync,
-		ServersAutoSync: params.ServersAutoSync,
-		CnameRecords:    params.CnameRecords,
-		Ttl:             params.Ttl,
+		NodeClusterId:    params.ClusterId,
+		DnsName:          params.DnsName,
+		DnsDomainId:      params.DomainId,
+		NodesAutoSync:    params.NodesAutoSync,
+		ServersAutoSync:  params.ServersAutoSync,
+		CnameRecords:     params.CnameRecords,
+		Ttl:              params.Ttl,
+		CnameAsDomain:    params.CnameAsDomain,
+		IncludingLnNodes: params.IncludingLnNodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/index/index.go

@@ -58,7 +58,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["isUser"] = false
 	this.Data["menu"] = "signIn"
 
-	timestamp := fmt.Sprintf("%d", time.Now().Unix())
+	var timestamp = fmt.Sprintf("%d", time.Now().Unix())
 	this.Data["token"] = stringutil.Md5(TokenSalt+timestamp) + timestamp
 	this.Data["from"] = params.From
 
@@ -111,11 +111,11 @@ func (this *IndexAction) RunPost(params struct {
 	if len(params.Token) <= 32 {
 		this.Fail("请通过登录页面登录")
 	}
-	timestampString := params.Token[32:]
+	var timestampString = params.Token[32:]
 	if stringutil.Md5(TokenSalt+timestampString) != params.Token[:32] {
 		this.FailField("refresh", "登录页面已过期，请刷新后重试")
 	}
-	timestamp := types.Int64(timestampString)
+	var timestamp = types.Int64(timestampString)
 	if timestamp < time.Now().Unix()-1800 {
 		this.FailField("refresh", "登录页面已过期，请刷新后重试")
 	}
@@ -157,7 +157,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	if otpLoginResp.Login != nil && otpLoginResp.Login.IsOn {
-		loginParams := maps.Map{}
+		var loginParams = maps.Map{}
 		err = json.Unmarshal(otpLoginResp.Login.ParamsJSON, &loginParams)
 		if err != nil {
 			this.ErrorPage(err)
@@ -169,7 +169,7 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	}
 
-	adminId := resp.AdminId
+	var adminId = resp.AdminId
 	params.Auth.StoreAdmin(adminId, params.Remember)
 
 	// 记录日志

internal/web/actions/default/log/exportExcel.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/lists"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"github.com/tealeg/xlsx/v3"
 	"strconv"
@@ -69,17 +68,13 @@ func (this *ExportExcelAction) RunGet(params struct {
 			return
 		}
 		if regionResp.IpRegion != nil {
-			pieces := []string{}
-			if len(regionResp.IpRegion.Country) > 0 {
-				pieces = append(pieces, regionResp.IpRegion.Country)
+			regionName = regionResp.IpRegion.Summary
+
+			// remove isp from regionName
+			var index = strings.LastIndex(regionName, "|")
+			if index > 0 {
+				regionName = regionName[:index]
 			}
-			if len(regionResp.IpRegion.Province) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.Province) {
-				pieces = append(pieces, regionResp.IpRegion.Province)
-			}
-			if len(regionResp.IpRegion.City) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.City) && !lists.ContainsString(pieces, strings.TrimSuffix(regionResp.IpRegion.Province, "市")) {
-				pieces = append(pieces, regionResp.IpRegion.City)
-			}
-			regionName = strings.Join(pieces, " ")
 
 			if len(regionResp.IpRegion.Isp) > 0 {
 				ispName = regionResp.IpRegion.Isp

internal/web/actions/default/log/index.go

@@ -4,10 +4,8 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strings"
 )
 
 type IndexAction struct {
@@ -72,11 +70,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		if regionResp.IpRegion != nil {
-			pieces := []string{regionResp.IpRegion.Summary}
-			if len(regionResp.IpRegion.Isp) > 0 && !lists.ContainsString(pieces, regionResp.IpRegion.Isp) {
-				pieces = append(pieces, "| "+regionResp.IpRegion.Isp)
-			}
-			regionName = strings.Join(pieces, " ")
+			regionName = regionResp.IpRegion.Summary
 		}
 
 		logMaps = append(logMaps, maps.Map{

internal/web/actions/default/servers/addPortPopup.go

@@ -26,7 +26,7 @@ func (this *AddPortPopupAction) RunGet(params struct {
 }) {
 	this.Data["from"] = params.From
 
-	protocols := serverconfigs.AllServerProtocolsForType(params.ServerType)
+	protocols := serverconfigs.FindAllServerProtocolsForType(params.ServerType)
 	if len(params.Protocol) > 0 {
 		result := []maps.Map{}
 		for _, p := range protocols {

internal/web/actions/default/servers/addServerNamePopup.go

@@ -30,7 +30,7 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 	Must *actions.Must
 }) {
 	if params.Mode == "single" {
-		var serverName = params.ServerName
+		var serverName = strings.ToLower(params.ServerName)
 
 		// 去除空格
 		serverName = regexp.MustCompile(`\s+`).ReplaceAllString(serverName, "")
@@ -72,6 +72,9 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 				}
 			}
 
+			// 转成小写
+			serverName = strings.ToLower(serverName)
+
 			serverNames = append(serverNames, serverName)
 		}
 		this.Data["serverName"] = maps.Map{

internal/web/actions/default/servers/certs/delete.go

@@ -36,15 +36,11 @@ func (this *DeleteAction) RunPost(params struct {
 		this.Fail("此证书正在被某些API节点引用，请先修改API节点后再删除")
 	}
 
-	// 是否正在被用户节点使用
-	countResp, err = this.RPC().UserNodeRPC().CountAllEnabledUserNodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledUserNodesWithSSLCertIdRequest{SslCertId: params.CertId})
+	err = this.filterDelete(params.CertId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	if countResp.Count > 0 {
-		this.Fail("此证书正在被某些用户节点引用，请先修改用户节点后再删除")
-	}
 
 	_, err = this.RPC().SSLCertRPC().DeleteSSLCert(this.AdminContext(), &pb.DeleteSSLCertRequest{SslCertId: params.CertId})
 	if err != nil {

internal/web/actions/default/servers/certs/delete_ext.go

@@ -0,0 +1,8 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package certs
+
+func (this *DeleteAction) filterDelete(certId int64) error {
+	return nil
+}

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

@@ -36,21 +36,21 @@ func (this *IndexAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
-	selectedCountryIds := []int64{}
+	var selectedCountryIds = []int64{}
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		selectedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 	}
 
-	countriesResp, err := this.RPC().RegionCountryRPC().FindAllEnabledRegionCountries(this.AdminContext(), &pb.FindAllEnabledRegionCountriesRequest{})
+	countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	countryMaps := []maps.Map{}
+	var countryMaps = []maps.Map{}
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

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

@@ -37,23 +37,23 @@ func (this *ProvincesAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
-	selectedProvinceIds := []int64{}
+	var selectedProvinceIds = []int64{}
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 	}
 
-	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{
+	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
 		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	provinceMaps := []maps.Map{}
+	var provinceMaps = []maps.Map{}
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/servers/groups/group/servergrouputils/menu.go

@@ -1,7 +1,6 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
 //go:build !plus
-// +build !plus
 
 package servergrouputils
 

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

@@ -46,16 +46,16 @@ func (this *CountriesAction) RunGet(params struct {
 		selectedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 	}
 
-	countriesResp, err := this.RPC().RegionCountryRPC().FindAllEnabledRegionCountries(this.AdminContext(), &pb.FindAllEnabledRegionCountriesRequest{})
+	countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	countryMaps := []maps.Map{}
-	for _, country := range countriesResp.Countries {
+	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

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

@@ -46,18 +46,18 @@ func (this *ProvincesAction) RunGet(params struct {
 		selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 	}
 
-	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{
-		CountryId: int64(ChinaCountryId),
+	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
+		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	provinceMaps := []maps.Map{}
-	for _, province := range provincesResp.Provinces {
+	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/servers/index.go

@@ -217,11 +217,8 @@ func (this *IndexAction) RunGet(params struct {
 
 		// 统计数据
 		var bandwidth = ""
-		if server.LatestServerDailyStat != nil {
-			var bytesPerSecond = server.LatestServerDailyStat.Bytes / 300
-			if bytesPerSecond > 0 {
-				bandwidth = numberutils.FormatBytes(bytesPerSecond)
-			}
+		if server.BandwidthBytes > 0 {
+			bandwidth = numberutils.FormatBytes(server.BandwidthBytes)
 		}
 
 		serverMaps = append(serverMaps, maps.Map{

internal/web/actions/default/servers/ipbox/index.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
+	"strings"
 	"time"
 )
 
@@ -30,7 +31,14 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	if regionResp.IpRegion != nil {
-		this.Data["regions"] = regionResp.IpRegion.Summary
+		var regionName = regionResp.IpRegion.Summary
+
+		// remove isp from regionName
+		var index = strings.LastIndex(regionName, "|")
+		if index > 0 {
+			regionName = regionName[:index]
+		}
+		this.Data["regions"] = regionName
 	} else {
 		this.Data["regions"] = ""
 	}

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

@@ -4,6 +4,7 @@ package iplists
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -23,5 +24,8 @@ func (this *DeleteAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧菜单Badge更新
+	helpers.NotifyIPItemsCountChanges()
+
 	this.Success()
 }

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

@@ -3,6 +3,7 @@ package iplists
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -22,5 +23,8 @@ func (this *DeleteIPAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧菜单Badge更新
+	helpers.NotifyIPItemsCountChanges()
+
 	this.Success()
 }

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

@@ -4,6 +4,7 @@ package iplists
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
 	"strings"
@@ -33,5 +34,8 @@ func (this *DeleteItemsAction) RunPost(params struct {
 		return
 	}
 
+	// 通知左侧菜单Badge更新
+	helpers.NotifyIPItemsCountChanges()
+
 	this.Success()
 }

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

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
+	"strings"
 	"time"
 )
 
@@ -165,6 +166,13 @@ func (this *IndexAction) RunGet(params struct {
 			var ipRegion = regionResp.IpRegion
 			if ipRegion != nil {
 				region = ipRegion.Summary
+
+				// remove isp from regionName
+				var index = strings.LastIndex(region, "|")
+				if index > 0 {
+					region = region[:index]
+				}
+
 				isp = ipRegion.Isp
 			}
 		}

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

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
+	"strings"
 	"time"
 )
 
@@ -116,6 +117,13 @@ func (this *ItemsAction) RunGet(params struct {
 			var ipRegion = regionResp.IpRegion
 			if ipRegion != nil {
 				region = ipRegion.Summary
+
+				// remove isp from regionName
+				var index = strings.LastIndex(region, "|")
+				if index > 0 {
+					region = region[:index]
+				}
+
 				isp = ipRegion.Isp
 			}
 		}

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

@@ -4,6 +4,7 @@ package iplists
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -20,5 +21,8 @@ func (this *ReadAllAction) RunPost(params struct{}) {
 		return
 	}
 
+	// 通知左侧菜单Badge更新
+	helpers.NotifyIPItemsCountChanges()
+
 	this.Success()
 }

internal/web/actions/default/servers/logs/hasLogs.go

@@ -0,0 +1,67 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"regexp"
+	"strings"
+)
+
+// HasLogsAction 检查某个分区是否有日志
+type HasLogsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *HasLogsAction) RunPost(params struct {
+	ClusterId int64
+	NodeId    int64
+	Day       string
+	Hour      string
+	Keyword   string
+	Ip        string
+	Domain    string
+	HasError  int
+	HasWAF    int
+	Partition int32 `default:"-1"`
+
+	RequestId string
+	ServerId  int64
+}) {
+	if len(params.Day) == 0 {
+		params.Day = timeutil.Format("Y-m-d")
+	}
+
+	var day = params.Day
+
+	if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
+		day = strings.ReplaceAll(day, "-", "")
+	}
+
+	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
+		Partition:         params.Partition,
+		RequestId:         params.RequestId,
+		NodeClusterId:     params.ClusterId,
+		NodeId:            params.NodeId,
+		ServerId:          params.ServerId,
+		HasError:          params.HasError > 0,
+		HasFirewallPolicy: params.HasWAF > 0,
+		Day:               day,
+		HourFrom:          params.Hour,
+		HourTo:            params.Hour,
+		Keyword:           params.Keyword,
+		Ip:                params.Ip,
+		Domain:            params.Domain,
+		Size:              1,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["hasLogs"] = len(resp.HttpAccessLogs) > 0
+
+	this.Success()
+}

internal/web/actions/default/servers/logs/init.go

@@ -18,6 +18,7 @@ func init() {
 			Get("", new(IndexAction)).
 			GetPost("/settings", new(SettingsAction)).
 			Post("/partitionData", new(PartitionDataAction)).
+			Post("/hasLogs", new(HasLogsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/log/viewPopup.go

@@ -93,8 +93,16 @@ func (this *ViewPopupAction) RunGet(params struct {
 	}
 	region := regionResp.IpRegion
 	if region != nil {
+		var regionName = region.Summary
+
+		// remove isp from regionName
+		var index = strings.LastIndex(regionName, "|")
+		if index > 0 {
+			regionName = regionName[:index]
+		}
+
 		regionMap = maps.Map{
-			"full": region.Summary,
+			"full": regionName,
 			"isp":  region.Isp,
 		}
 	}

internal/web/actions/default/servers/server/settings/access/createPopup.go

@@ -1,13 +1,16 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !plus
 
 package access
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"strings"
 )
 
 type CreatePopupAction struct {
@@ -37,6 +40,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 	SubRequestMethod        string
 	SubRequestFollowRequest bool
 
+	Exts        []string
+	DomainsJSON []byte
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -44,14 +50,42 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入名称").
 		Field("type", params.Type).
-		Require("请输入认证类型")
+		Require("请输入鉴权类型")
 
 	var ref = &serverconfigs.HTTPAuthPolicyRef{IsOn: true}
-	var paramsJSON []byte
+
+	// 扩展名
+	var exts = utils.NewStringsStream(params.Exts).
+		Map(strings.TrimSpace, strings.ToLower).
+		Filter(utils.FilterNotEmpty).
+		Map(utils.MapAddPrefixFunc(".")).
+		Unique().
+		Result()
+
+	// 域名
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		var rawDomains = []string{}
+		err := json.Unmarshal(params.DomainsJSON, &rawDomains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// TODO 如果用户填写了一个网址，应该分析域名并填入
+
+		domains = utils.NewStringsStream(rawDomains).
+			Map(strings.TrimSpace, strings.ToLower).
+			Filter(utils.FilterNotEmpty).
+			Unique().
+			Result()
+	}
+
+	var method serverconfigs.HTTPAuthMethodInterface
 
 	switch params.Type {
 	case serverconfigs.HTTPAuthTypeBasicAuth:
-		users := []*serverconfigs.HTTPAuthBasicMethodUser{}
+		var users = []*serverconfigs.HTTPAuthBasicMethodUser{}
 		err := json.Unmarshal(params.HttpAuthBasicAuthUsersJSON, &users)
 		if err != nil {
 			this.ErrorPage(err)
@@ -60,40 +94,39 @@ func (this *CreatePopupAction) RunPost(params struct {
 		if len(users) == 0 {
 			this.Fail("请添加至少一个用户")
 		}
-		method := &serverconfigs.HTTPAuthBasicMethod{
+		method = &serverconfigs.HTTPAuthBasicMethod{
 			Users:   users,
 			Realm:   params.BasicAuthRealm,
 			Charset: params.BasicAuthCharset,
 		}
-		methodJSON, err := json.Marshal(method)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		paramsJSON = methodJSON
 	case serverconfigs.HTTPAuthTypeSubRequest:
 		params.Must.Field("subRequestURL", params.SubRequestURL).
 			Require("请输入子请求URL")
 		if params.SubRequestFollowRequest {
 			params.SubRequestMethod = ""
 		}
-		method := &serverconfigs.HTTPAuthSubRequestMethod{
+		method = &serverconfigs.HTTPAuthSubRequestMethod{
 			URL:    params.SubRequestURL,
 			Method: params.SubRequestMethod,
 		}
-		methodJSON, err := json.Marshal(method)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		paramsJSON = methodJSON
 	default:
-		this.Fail("不支持的认证类型'" + params.Type + "'")
+		this.Fail("不支持的鉴权类型'" + params.Type + "'")
+	}
+
+	if method == nil {
+		this.Fail("无法找到对应的鉴权方式")
+	}
+	method.SetExts(exts)
+	method.SetDomains(domains)
+
+	paramsJSON, err := json.Marshal(method)
+	if err != nil {
+		this.ErrorPage(err)
+		return
 	}
 
 	var paramsMap map[string]interface{}
-	err := json.Unmarshal(paramsJSON, &paramsMap)
+	err = json.Unmarshal(paramsJSON, &paramsMap)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -108,7 +141,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	defer this.CreateLogInfo("创建HTTP认证 %d", createResp.HttpAuthPolicyId)
+	defer this.CreateLogInfo("创建HTTP鉴权 %d", createResp.HttpAuthPolicyId)
 	ref.AuthPolicyId = createResp.HttpAuthPolicyId
 	ref.AuthPolicy = &serverconfigs.HTTPAuthPolicy{
 		Id:     createResp.HttpAuthPolicyId,

internal/web/actions/default/servers/server/settings/access/index.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
 )
 
 type IndexAction struct {
@@ -28,6 +29,28 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	this.Data["webId"] = webConfig.Id
+
+	// 移除不存在的鉴权方法
+	var allTypes = []string{}
+	for _, def := range serverconfigs.FindAllHTTPAuthTypes() {
+		allTypes = append(allTypes, def.Code)
+	}
+
+	if webConfig.Auth != nil {
+		var refs = webConfig.Auth.PolicyRefs
+		var realRefs = []*serverconfigs.HTTPAuthPolicyRef{}
+		for _, ref := range refs {
+			if ref.AuthPolicy == nil {
+				continue
+			}
+			if !lists.ContainsString(allTypes, ref.AuthPolicy.Type) {
+				continue
+			}
+			realRefs = append(realRefs, ref)
+		}
+		webConfig.Auth.PolicyRefs = realRefs
+	}
+
 	this.Data["authConfig"] = webConfig.Auth
 
 	this.Show()
@@ -38,9 +61,8 @@ func (this *IndexAction) RunPost(params struct {
 	AuthJSON []byte
 
 	Must *actions.Must
-	CSRF *actionutils.CSRF
 }) {
-	defer this.CreateLogInfo("修改Web %d 的认证设置", params.WebId)
+	defer this.CreateLogInfo("修改Web %d 的鉴权设置", params.WebId)
 
 	var authConfig = &serverconfigs.HTTPAuthConfig{}
 	err := json.Unmarshal(params.AuthJSON, authConfig)
@@ -53,7 +75,7 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("配置校验失败：" + err.Error())
 	}
 
-	// 保存之前删除多于的配置信息
+	// 保存之前删除多余的配置信息
 	for _, ref := range authConfig.PolicyRefs {
 		ref.AuthPolicy = nil
 	}

internal/web/actions/default/servers/server/settings/access/init.go

@@ -16,6 +16,7 @@ func init() {
 			GetPost("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
 			GetPost("/updatePopup", new(UpdatePopupAction)).
+			Post("/random", new(RandomAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/settings/access/random.go

@@ -0,0 +1,18 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package access
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/rands"
+)
+
+type RandomAction struct {
+	actionutils.ParentAction
+}
+
+func (this *RandomAction) RunPost(params struct{}) {
+	this.Data["random"] = rands.HexString(32)
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/access/updatePopup.go

@@ -1,14 +1,17 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !plus
 
 package access
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"strings"
 )
 
 type UpdatePopupAction struct {
@@ -70,17 +73,20 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	SubRequestMethod        string
 	SubRequestFollowRequest bool
 
+	Exts        []string
+	DomainsJSON []byte
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
-	defer this.CreateLogInfo("修改HTTP认证 %d", params.PolicyId)
+	defer this.CreateLogInfo("修改HTTP鉴权 %d", params.PolicyId)
 
 	policyResp, err := this.RPC().HTTPAuthPolicyRPC().FindEnabledHTTPAuthPolicy(this.AdminContext(), &pb.FindEnabledHTTPAuthPolicyRequest{HttpAuthPolicyId: params.PolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	policy := policyResp.HttpAuthPolicy
+	var policy = policyResp.HttpAuthPolicy
 	if policy == nil {
 		this.NotFound("httpAuthPolicy", params.PolicyId)
 		return
@@ -91,12 +97,40 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入名称")
 
+	// 扩展名
+	var exts = utils.NewStringsStream(params.Exts).
+		Map(strings.TrimSpace, strings.ToLower).
+		Filter(utils.FilterNotEmpty).
+		Map(utils.MapAddPrefixFunc(".")).
+		Unique().
+		Result()
+
+	// 域名
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		var rawDomains = []string{}
+		err := json.Unmarshal(params.DomainsJSON, &rawDomains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// TODO 如果用户填写了一个网址，应该分析域名并填入
+
+		domains = utils.NewStringsStream(rawDomains).
+			Map(strings.TrimSpace, strings.ToLower).
+			Filter(utils.FilterNotEmpty).
+			Unique().
+			Result()
+	}
+
 	var ref = &serverconfigs.HTTPAuthPolicyRef{IsOn: true}
-	var paramsJSON []byte
+
+	var method serverconfigs.HTTPAuthMethodInterface
 
 	switch policyType {
 	case serverconfigs.HTTPAuthTypeBasicAuth:
-		users := []*serverconfigs.HTTPAuthBasicMethodUser{}
+		var users = []*serverconfigs.HTTPAuthBasicMethodUser{}
 		err := json.Unmarshal(params.HttpAuthBasicAuthUsersJSON, &users)
 		if err != nil {
 			this.ErrorPage(err)
@@ -105,36 +139,35 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		if len(users) == 0 {
 			this.Fail("请添加至少一个用户")
 		}
-		method := &serverconfigs.HTTPAuthBasicMethod{
+		method = &serverconfigs.HTTPAuthBasicMethod{
 			Users:   users,
 			Realm:   params.BasicAuthRealm,
 			Charset: params.BasicAuthCharset,
 		}
-		methodJSON, err := json.Marshal(method)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		paramsJSON = methodJSON
 	case serverconfigs.HTTPAuthTypeSubRequest:
 		params.Must.Field("subRequestURL", params.SubRequestURL).
 			Require("请输入子请求URL")
 		if params.SubRequestFollowRequest {
 			params.SubRequestMethod = ""
 		}
-		method := &serverconfigs.HTTPAuthSubRequestMethod{
+		method = &serverconfigs.HTTPAuthSubRequestMethod{
 			URL:    params.SubRequestURL,
 			Method: params.SubRequestMethod,
 		}
-		methodJSON, err := json.Marshal(method)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		paramsJSON = methodJSON
 	default:
-		this.Fail("不支持的认证类型'" + policyType + "'")
+		this.Fail("不支持的鉴权类型'" + policyType + "'")
+	}
+
+	if method == nil {
+		this.Fail("无法找到对应的鉴权方式")
+	}
+	method.SetExts(exts)
+	method.SetDomains(domains)
+
+	paramsJSON, err := json.Marshal(method)
+	if err != nil {
+		this.ErrorPage(err)
+		return
 	}
 
 	var paramsMap map[string]interface{}

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

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 )
 
@@ -27,19 +28,45 @@ func (this *CreatePopupAction) RunGet(params struct {
 func (this *CreatePopupAction) RunPost(params struct {
 	CacheRefJSON []byte
 
+	CondType              string
+	CondJSON              []byte
+	CondIsCaseInsensitive bool
+
 	Must *actions.Must
 }) {
 	var cacheRef = &serverconfigs.HTTPCacheRef{}
 	err := json.Unmarshal(params.CacheRefJSON, cacheRef)
 	if err != nil {
-		this.ErrorPage(err)
+		this.Fail("解析条件出错：" + err.Error() + ", JSON: " + string(params.CacheRefJSON))
 		return
 	}
+
+	if len(params.CondJSON) > 0 {
+		var cond = &shared.HTTPRequestCond{}
+		err = json.Unmarshal(params.CondJSON, cond)
+		if err != nil {
+			this.Fail("解析条件出错：" + err.Error() + ", JSON: " + string(params.CondJSON))
+			return
+		}
+		cond.Type = params.CondType
+		cond.IsCaseInsensitive = params.CondIsCaseInsensitive
+		cacheRef.SimpleCond = cond
+
+		// 将组合条件置为空
+		cacheRef.Conds = &shared.HTTPRequestCondsConfig{}
+	}
+
+	err = cacheRef.Init()
+	if err != nil {
+		this.Fail("解析条件出错：" + err.Error())
+		return
+	}
+
 	if len(cacheRef.Key) == 0 {
 		this.Fail("请输入缓存Key")
 	}
 
-	if cacheRef.Conds == nil || len(cacheRef.Conds.Groups) == 0 {
+	if (cacheRef.Conds == nil || len(cacheRef.Conds.Groups) == 0) && cacheRef.SimpleCond == nil {
 		this.Fail("请填写匹配条件分组")
 	}
 

internal/web/actions/default/servers/server/settings/dns/init.go

@@ -15,6 +15,7 @@ func init() {
 			Prefix("/servers/server/settings/dns").
 			GetPost("", new(IndexAction)).
 			Post("/regenerateCNAME", new(RegenerateCNAMEAction)).
+			GetPost("/updateCNAMEPopup", new(UpdateCNAMEPopupAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/settings/dns/regenerateCNAME.go

@@ -16,7 +16,7 @@ func (this *RegenerateCNAMEAction) RunPost(params struct {
 }) {
 	defer this.CreateLogInfo("重新生成服务 %d 的CNAME", params.ServerId)
 
-	_, err := this.RPC().ServerRPC().RegenerateServerCNAME(this.AdminContext(), &pb.RegenerateServerCNAMERequest{ServerId: params.ServerId})
+	_, err := this.RPC().ServerRPC().RegenerateServerDNSName(this.AdminContext(), &pb.RegenerateServerDNSNameRequest{ServerId: params.ServerId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go

@@ -0,0 +1,94 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/types"
+	"regexp"
+	"strings"
+)
+
+type UpdateCNAMEPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateCNAMEPopupAction) RunGet(params struct {
+	ServerId int64
+}) {
+	this.Data["serverId"] = params.ServerId
+
+	dnsInfoResp, err := this.RPC().ServerRPC().FindEnabledServerDNS(this.AdminContext(), &pb.FindEnabledServerDNSRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["dnsName"] = dnsInfoResp.DnsName
+
+	this.Show()
+}
+
+func (this *UpdateCNAMEPopupAction) RunPost(params struct {
+	ServerId int64
+	DnsName  string
+}) {
+	defer this.CreateLogInfo("修改服务 %d CNAME为 %s", params.ServerId, params.DnsName)
+
+	var dnsName = strings.ToLower(params.DnsName)
+	if len(dnsName) == 0 {
+		this.FailField("dnsName", "CNAME不能为空")
+	}
+
+	const maxLen = 30
+	if len(dnsName) > maxLen {
+		this.FailField("dnsName", "CNAME长度不能超过"+types.String(maxLen)+"个字符")
+	}
+	if !regexp.MustCompile(`^[a-z0-9]{1,` + types.String(maxLen) + `}$`).MatchString(dnsName) {
+		this.FailField("dnsName", "CNAME中只能包含数字、英文字母")
+	}
+
+	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var server = serverResp.Server
+	if server == nil {
+		this.Fail("找不到要修改的服务")
+	}
+	if server.NodeCluster == nil {
+		this.Fail("服务必须先分配到一个集群才能修改")
+	}
+	var clusterId = server.NodeCluster.Id
+
+	if server.DnsName == params.DnsName {
+		// 没有修改则直接返回
+		this.Success()
+	}
+
+	serverIdResp, err := this.RPC().ServerRPC().FindServerIdWithDNSName(this.AdminContext(), &pb.FindServerIdWithDNSNameRequest{
+		NodeClusterId: clusterId,
+		DnsName:       dnsName,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if serverIdResp.ServerId > 0 && serverIdResp.ServerId != params.ServerId {
+		this.FailField("dnsName", "当前CNAME已被别的服务占用，请换一个")
+	}
+
+	_, err = this.RPC().ServerRPC().UpdateServerDNSName(this.AdminContext(), &pb.UpdateServerDNSNameRequest{
+		ServerId: params.ServerId,
+		DnsName:  dnsName,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/locations/access/index.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
 )
 
 type IndexAction struct {
@@ -28,6 +29,28 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	this.Data["webId"] = webConfig.Id
+
+	// 移除不存在的鉴权方法
+	var allTypes = []string{}
+	for _, def := range serverconfigs.FindAllHTTPAuthTypes() {
+		allTypes = append(allTypes, def.Code)
+	}
+
+	if webConfig.Auth != nil {
+		var refs = webConfig.Auth.PolicyRefs
+		var realRefs = []*serverconfigs.HTTPAuthPolicyRef{}
+		for _, ref := range refs {
+			if ref.AuthPolicy == nil {
+				continue
+			}
+			if !lists.ContainsString(allTypes, ref.AuthPolicy.Type) {
+				continue
+			}
+			realRefs = append(realRefs, ref)
+		}
+		webConfig.Auth.PolicyRefs = realRefs
+	}
+
 	this.Data["authConfig"] = webConfig.Auth
 
 	this.Show()
@@ -38,7 +61,6 @@ func (this *IndexAction) RunPost(params struct {
 	AuthJSON []byte
 
 	Must *actions.Must
-	CSRF *actionutils.CSRF
 }) {
 	defer this.CreateLogInfo("修改Web %d 的认证设置", params.WebId)
 

internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go

@@ -98,7 +98,7 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsPrior && locationConfig.Web.Cache.IsOn,
 	})
 	menuItems = append(menuItems, maps.Map{
-		"name":     "访问控制",
+		"name":     "访问鉴权",
 		"url":      "/servers/server/settings/locations/access?serverId=" + serverIdString + "&locationId=" + locationIdString,
 		"isActive": secondMenuItem == "access",
 		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Auth != nil && locationConfig.Web.Auth.IsPrior,
@@ -179,6 +179,13 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RemoteAddr != nil && locationConfig.Web.RemoteAddr.IsOn,
 	})
 
+	menuItems = append(menuItems, maps.Map{
+		"name":     "请求限制",
+		"url":      "/servers/server/settings/locations/requestLimit?serverId=" + serverIdString + "&locationId=" + locationIdString,
+		"isActive": secondMenuItem == "requestLimit",
+		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RequestLimit != nil && locationConfig.Web.RequestLimit.IsOn,
+	})
+
 	return menuItems
 }
 
@@ -187,12 +194,12 @@ func (this *LocationHelper) hasHTTPHeaders(web *serverconfigs.HTTPWebConfig) boo
 	if web == nil {
 		return false
 	}
-	if web.RequestHeaderPolicyRef != nil {
+	if web.RequestHeaderPolicyRef != nil && web.RequestHeaderPolicyRef.IsPrior {
 		if web.RequestHeaderPolicyRef.IsOn && web.RequestHeaderPolicy != nil && !web.RequestHeaderPolicy.IsEmpty() {
 			return true
 		}
 	}
-	if web.ResponseHeaderPolicyRef != nil {
+	if web.ResponseHeaderPolicyRef != nil && web.ResponseHeaderPolicyRef.IsPrior {
 		if web.ResponseHeaderPolicyRef.IsOn && web.ResponseHeaderPolicy != nil && !web.ResponseHeaderPolicy.IsEmpty() {
 			return true
 		}

internal/web/actions/default/servers/server/settings/locations/locationutils/menu.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 //go:build !plus
-// +build !plus
 
 package locationutils
 

internal/web/actions/default/servers/server/settings/locations/requestLimit/index.go

@@ -0,0 +1,55 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ServerId   int64
+	LocationId int64
+}) {
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithLocationId(this.AdminContext(), params.LocationId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["webId"] = webConfig.Id
+	this.Data["requestLimitConfig"] = webConfig.RequestLimit
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	WebId            int64
+	RequestLimitJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId)
+
+	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{
+		HttpWebId:        params.WebId,
+		RequestLimitJSON: params.RequestLimitJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/locations/requestLimit/init.go

@@ -0,0 +1,22 @@
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)).
+			Helper(locationutils.NewLocationHelper()).
+			Helper(serverutils.NewServerHelper()).
+			Data("tinyMenuItem", "requestLimit").
+			Prefix("/servers/server/settings/locations/requestLimit").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -46,7 +46,7 @@ func (this *CountriesAction) RunGet(params struct {
 		selectedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 	}
 
-	countriesResp, err := this.RPC().RegionCountryRPC().FindAllEnabledRegionCountries(this.AdminContext(), &pb.FindAllEnabledRegionCountriesRequest{})
+	countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -55,7 +55,7 @@ func (this *CountriesAction) RunGet(params struct {
 	for _, country := range countriesResp.RegionCountries {
 		countryMaps = append(countryMaps, maps.Map{
 			"id":        country.Id,
-			"name":      country.Name,
+			"name":      country.DisplayName,
 			"letter":    strings.ToUpper(string(country.Pinyin[0][0])),
 			"isChecked": lists.ContainsInt64(selectedCountryIds, country.Id),
 		})

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

@@ -46,7 +46,7 @@ func (this *ProvincesAction) RunGet(params struct {
 		selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 	}
 
-	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllEnabledRegionProvincesWithCountryId(this.AdminContext(), &pb.FindAllEnabledRegionProvincesWithCountryIdRequest{
+	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
 		RegionCountryId: int64(ChinaCountryId),
 	})
 	if err != nil {
@@ -57,7 +57,7 @@ func (this *ProvincesAction) RunGet(params struct {
 	for _, province := range provincesResp.RegionProvinces {
 		provinceMaps = append(provinceMaps, maps.Map{
 			"id":        province.Id,
-			"name":      province.Name,
+			"name":      province.DisplayName,
 			"isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id),
 		})
 	}

internal/web/actions/default/servers/serverutils/menu.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 //go:build !plus
-// +build !plus
 
 package serverutils
 

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -304,7 +304,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isOn":     serverConfig.Web != nil && serverConfig.Web.Cache != nil && serverConfig.Web.Cache.IsOn,
 		})
 		menuItems = append(menuItems, maps.Map{
-			"name":     "访问控制",
+			"name":     "访问鉴权",
 			"url":      "/servers/server/settings/access?serverId=" + serverIdString,
 			"isActive": secondMenuItem == "access",
 			"isOn":     serverConfig.Web != nil && serverConfig.Web.Auth != nil && serverConfig.Web.Auth.IsOn,

internal/web/actions/default/servers/users/options.go

@@ -16,14 +16,14 @@ func (this *OptionsAction) RunPost(params struct {
 	usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{
 		Keyword: params.Keyword,
 		Offset:  0,
-		Size:    10000, // TODO 改进 <plan-user-selector> 组件
+		Size:    100,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	userMaps := []maps.Map{}
+	var userMaps = []maps.Map{}
 	for _, user := range usersResp.Users {
 		userMaps = append(userMaps, maps.Map{
 			"id":       user.Id,

internal/web/actions/default/settings/database/index.go

@@ -7,7 +7,7 @@ import (
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/maps"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
+	"os"
 	"strings"
 )
 
@@ -23,7 +23,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 	this.Data["error"] = ""
 
 	configFile := Tea.ConfigFile("api_db.yaml")
-	data, err := ioutil.ReadFile(configFile)
+	data, err := os.ReadFile(configFile)
 	if err != nil {
 		this.Data["error"] = "read config file failed: api_db.yaml: " + err.Error()
 		this.Show()

internal/web/actions/default/settings/database/update.go

@@ -10,8 +10,8 @@ import (
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/maps"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
 	"net"
+	"os"
 	"regexp"
 	"strings"
 )
@@ -34,7 +34,7 @@ func (this *UpdateAction) RunGet(params struct{}) {
 	}
 
 	configFile := Tea.ConfigFile("api_db.yaml")
-	data, err := ioutil.ReadFile(configFile)
+	data, err := os.ReadFile(configFile)
 	if err != nil {
 		return
 	}
@@ -144,7 +144,7 @@ dbs:
     models:
       package: internal/web/models
 `
-	err := ioutil.WriteFile(configFile, []byte(template), 0666)
+	err := os.WriteFile(configFile, []byte(template), 0666)
 	if err != nil {
 		this.Fail("保存配置失败：" + err.Error())
 	}

internal/web/actions/default/settings/ip-library/delete.go

@@ -1,26 +0,0 @@
-package iplibrary
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-type DeleteAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DeleteAction) RunPost(params struct {
-	LibraryId int64
-}) {
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "删除IP库 %d", params.LibraryId)
-
-	_, err := this.RPC().IPLibraryRPC().DeleteIPLibrary(this.AdminContext(), &pb.DeleteIPLibraryRequest{IpLibraryId: params.LibraryId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

internal/web/actions/default/settings/ip-library/download.go

@@ -1,50 +0,0 @@
-package iplibrary
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-type DownloadAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DownloadAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *DownloadAction) RunGet(params struct {
-	LibraryId int64
-}) {
-	// 日志
-	defer this.CreateLog(oplogs.LevelInfo, "下载IP库 %d", params.LibraryId)
-
-	libraryResp, err := this.RPC().IPLibraryRPC().FindEnabledIPLibrary(this.AdminContext(), &pb.FindEnabledIPLibraryRequest{IpLibraryId: params.LibraryId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	if libraryResp.IpLibrary == nil || libraryResp.IpLibrary.File == nil {
-		this.NotFound("ipLibrary", params.LibraryId)
-		return
-	}
-
-	file := libraryResp.IpLibrary.File
-	chunkIdsResp, err := this.RPC().FileChunkRPC().FindAllFileChunkIds(this.AdminContext(), &pb.FindAllFileChunkIdsRequest{FileId: file.Id})
-	if err != nil {
-		this.ErrorPage(err)
-	}
-
-	this.AddHeader("Content-Disposition", "attachment; filename=\""+file.Filename+"\";")
-	for _, chunkId := range chunkIdsResp.FileChunkIds {
-		chunkResp, err := this.RPC().FileChunkRPC().DownloadFileChunk(this.AdminContext(), &pb.DownloadFileChunkRequest{FileChunkId: chunkId})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if chunkResp.FileChunk != nil {
-			this.Write(chunkResp.FileChunk.Data)
-		}
-	}
-}

internal/web/actions/default/settings/ip-library/helper.go

@@ -1,22 +0,0 @@
-package iplibrary
-
-import (
-	"github.com/iwind/TeaGo/actions"
-	"net/http"
-)
-
-type Helper struct {
-}
-
-func NewHelper() *Helper {
-	return &Helper{}
-}
-
-func (this *Helper) BeforeAction(action *actions.ActionObject) {
-	if action.Request.Method != http.MethodGet {
-		return
-	}
-
-	action.Data["mainTab"] = "component"
-	action.Data["secondMenuItem"] = "ip-library"
-}

internal/web/actions/default/settings/ip-library/index.go

@@ -1,56 +0,0 @@
-package iplibrary
-
-import (
-	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.FirstMenu("index")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	Type string
-}) {
-	if len(params.Type) == 0 {
-		params.Type = serverconfigs.IPLibraryTypes[0].GetString("code")
-	}
-
-	this.Data["types"] = serverconfigs.IPLibraryTypes
-	this.Data["selectedType"] = params.Type
-
-	// 列表
-	listResp, err := this.RPC().IPLibraryRPC().FindAllEnabledIPLibrariesWithType(this.AdminContext(), &pb.FindAllEnabledIPLibrariesWithTypeRequest{Type: params.Type})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	libraryMaps := []maps.Map{}
-	for _, library := range listResp.IpLibraries {
-		var fileMap maps.Map = nil
-		if library.File != nil {
-			fileMap = maps.Map{
-				"id":       library.File.Id,
-				"filename": library.File.Filename,
-				"sizeMB":   fmt.Sprintf("%.2f", float64(library.File.Size)/1024/1024),
-			}
-		}
-
-		libraryMaps = append(libraryMaps, maps.Map{
-			"id":          library.Id,
-			"file":        fileMap,
-			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", library.CreatedAt),
-		})
-	}
-	this.Data["libraries"] = libraryMaps
-
-	this.Show()
-}

internal/web/actions/default/settings/ip-library/init.go

@@ -1,23 +0,0 @@
-package iplibrary
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
-	"github.com/iwind/TeaGo"
-)
-
-func init() {
-	TeaGo.BeforeStart(func(server *TeaGo.Server) {
-		server.
-			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)).
-			Helper(NewHelper()).
-			Helper(settingutils.NewHelper("ipLibrary")).
-			Prefix("/settings/ip-library").
-			Get("", new(IndexAction)).
-			GetPost("/uploadPopup", new(UploadPopupAction)).
-			Post("/delete", new(DeleteAction)).
-			Get("/download", new(DownloadAction)).
-			EndAll()
-	})
-}

internal/web/actions/default/settings/ip-library/uploadPopup.go

@@ -1,111 +0,0 @@
-package iplibrary
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/actions"
-	"io"
-)
-
-type UploadPopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UploadPopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *UploadPopupAction) RunGet(params struct{}) {
-	this.Data["types"] = serverconfigs.IPLibraryTypes
-
-	this.Show()
-}
-
-func (this *UploadPopupAction) RunPost(params struct {
-	Type string
-	File *actions.File
-
-	Must *actions.Must
-}) {
-	libraryType := serverconfigs.FindIPLibraryWithType(params.Type)
-	if libraryType == nil {
-		this.Fail("错误的IP类型")
-	}
-
-	if params.File == nil {
-		this.Fail("请选择要上传的文件")
-	}
-
-	if params.File.Size == 0 {
-		this.Fail("文件内容不能为空")
-	}
-
-	if params.File.Ext != libraryType.GetString("ext") {
-		this.Fail("IP库文件扩展名错误，应该为：" + libraryType.GetString("ext"))
-	}
-
-	reader, err := params.File.OriginFile.Open()
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	defer func() {
-		_ = reader.Close()
-	}()
-
-	// 创建文件
-	fileResp, err := this.RPC().FileRPC().CreateFile(this.AdminContext(), &pb.CreateFileRequest{
-		Filename: params.File.Filename,
-		Size:     params.File.Size,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	fileId := fileResp.FileId
-
-	// 上传内容
-	buf := make([]byte, 512*1024)
-	for {
-		n, err := reader.Read(buf)
-		if n > 0 {
-			_, err = this.RPC().FileChunkRPC().CreateFileChunk(this.AdminContext(), &pb.CreateFileChunkRequest{
-				FileId: fileId,
-				Data:   buf[:n],
-			})
-			if err != nil {
-				this.Fail("上传失败：" + err.Error())
-			}
-		}
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			this.Fail("上传失败：" + err.Error())
-		}
-	}
-
-	// 置为已完成
-	_, err = this.RPC().FileRPC().UpdateFileFinished(this.AdminContext(), &pb.UpdateFileFinishedRequest{FileId: fileId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	// 保存
-	createResp, err := this.RPC().IPLibraryRPC().CreateIPLibrary(this.AdminContext(), &pb.CreateIPLibraryRequest{
-		Type:   params.Type,
-		FileId: fileId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "上传IP库 %d", createResp.IpLibraryId)
-
-	this.Success()
-}

internal/web/actions/default/settings/security/index.go

@@ -31,7 +31,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 	// 国家和地区
 	var countryMaps = []maps.Map{}
 	for _, countryId := range config.AllowCountryIds {
-		countryResp, err := this.RPC().RegionCountryRPC().FindEnabledRegionCountry(this.AdminContext(), &pb.FindEnabledRegionCountryRequest{RegionCountryId: countryId})
+		countryResp, err := this.RPC().RegionCountryRPC().FindRegionCountry(this.AdminContext(), &pb.FindRegionCountryRequest{RegionCountryId: countryId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -40,7 +40,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		if country != nil {
 			countryMaps = append(countryMaps, maps.Map{
 				"id":   country.Id,
-				"name": country.Name,
+				"name": country.DisplayName,
 			})
 		}
 	}
@@ -49,7 +49,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 	// 省份
 	var provinceMaps = []maps.Map{}
 	for _, provinceId := range config.AllowProvinceIds {
-		provinceResp, err := this.RPC().RegionProvinceRPC().FindEnabledRegionProvince(this.AdminContext(), &pb.FindEnabledRegionProvinceRequest{RegionProvinceId: provinceId})
+		provinceResp, err := this.RPC().RegionProvinceRPC().FindRegionProvince(this.AdminContext(), &pb.FindRegionProvinceRequest{RegionProvinceId: provinceId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -58,7 +58,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		if province != nil {
 			provinceMaps = append(provinceMaps, maps.Map{
 				"id":   province.Id,
-				"name": province.Name,
+				"name": province.DisplayName,
 			})
 		}
 	}

internal/web/actions/default/settings/server/updateHTTPSPopup.go

@@ -8,8 +8,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/actions"
-	"io/ioutil"
 	"net"
+	"os"
 )
 
 type UpdateHTTPSPopupAction struct {
@@ -31,12 +31,12 @@ func (this *UpdateHTTPSPopupAction) RunGet(params struct{}) {
 	// 证书
 	certConfigs := []*sslconfigs.SSLCertConfig{}
 	if len(serverConfig.Https.Cert) > 0 && len(serverConfig.Https.Key) > 0 {
-		certData, err := ioutil.ReadFile(Tea.Root + "/" + serverConfig.Https.Cert)
+		certData, err := os.ReadFile(Tea.Root + "/" + serverConfig.Https.Cert)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		keyData, err := ioutil.ReadFile(Tea.Root + "/" + serverConfig.Https.Key)
+		keyData, err := os.ReadFile(Tea.Root + "/" + serverConfig.Https.Key)
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -120,11 +120,11 @@ func (this *UpdateHTTPSPopupAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		err = ioutil.WriteFile(Tea.ConfigFile("https.key.pem"), certConfig.KeyData, 0666)
+		err = os.WriteFile(Tea.ConfigFile("https.key.pem"), certConfig.KeyData, 0666)
 		if err != nil {
 			this.Fail("保存密钥失败：" + err.Error())
 		}
-		err = ioutil.WriteFile(Tea.ConfigFile("https.cert.pem"), certConfig.CertData, 0666)
+		err = os.WriteFile(Tea.ConfigFile("https.cert.pem"), certConfig.CertData, 0666)
 		if err != nil {
 			this.Fail("保存证书失败：" + err.Error())
 		}