访客IP设置中支持多个请求报头

.golangci.yaml

@@ -0,0 +1,74 @@
+# https://golangci-lint.run/usage/configuration/
+
+linters:
+  enable-all: true
+  disable:
+    - ifshort
+    - exhaustivestruct
+    - golint
+    - nosnakecase
+    - scopelint
+    - varcheck
+    - structcheck
+    - interfacer
+    - maligned
+    - deadcode
+    - dogsled
+    - wrapcheck
+    - wastedassign
+    - varnamelen
+    - testpackage
+    - thelper
+    - nilerr
+    - sqlclosecheck
+    - paralleltest
+    - nonamedreturns
+    - nlreturn
+    - nakedret
+    - ireturn
+    - interfacebloat
+    - gosmopolitan
+    - gomnd
+    - goerr113
+    - gochecknoglobals
+    - exhaustruct
+    - errorlint
+    - depguard
+    - exhaustive
+    - containedctx
+    - wsl
+    - cyclop
+    - dupword
+    - errchkjson
+    - contextcheck
+    - tagalign
+    - dupl
+    - forbidigo
+    - funlen
+    - goconst
+    - godox
+    - gosec
+    - lll
+    - nestif
+    - revive
+    - unparam
+    - stylecheck
+    - gocritic
+    - gofumpt
+    - gomoddirectives
+    - godot
+    - gofmt
+    - gocognit
+    - mirror
+    - gocyclo
+    - gochecknoinits
+    - gci
+    - maintidx
+    - prealloc
+    - goimports
+    - errname
+    - musttag
+    - forcetypeassert
+    - whitespace
+    - noctx
+    - reassign

build/build.sh

@@ -57,9 +57,11 @@ function build() {
 	if [ "$(which uglifyjs)" ]; then
     	echo "compress to component.js ..."
     	uglifyjs --compress --mangle -- "${JS_ROOT}"/components.src.js > "${JS_ROOT}"/components.js
+    	uglifyjs --compress --mangle -- "${JS_ROOT}"/utils.js > "${JS_ROOT}"/utils.min.js
     else
     	echo "copy to component.js ..."
     	cp "${JS_ROOT}"/components.src.js "${JS_ROOT}"/components.js
+    	cp "${JS_ROOT}"/utils.js "${JS_ROOT}"/utils.min.js
     fi
 
 	# create dir & copy files

build/configs/.gitignore

@@ -1,4 +1,5 @@
 api.yaml
+api_admin.yaml
 server.yaml
 api_db.yaml
 *.pem

build/configs/api.template.yaml

@@ -1,4 +0,0 @@
-rpc:
-  endpoints: [ "http://127.0.0.1:8003" ]
-nodeId: ""
-secret: ""

build/configs/api_admin.template.yaml

@@ -0,0 +1,3 @@
+rpc.endpoints: [ "http://127.0.0.1:8003" ]
+nodeId: ""
+secret: ""

build/generate.sh

@@ -2,15 +2,21 @@
 
 JS_ROOT=../web/public/js
 
-echo "generate component.src.js ..."
+echo "generating component.src.js ..."
 go run -tags=community ../cmd/edge-admin/main.go  generate
 
-if [ `which uglifyjs` ]; then
+if [ "$(which uglifyjs)" ]; then
 	echo "compress to component.js ..."
 	uglifyjs --compress --mangle -- ${JS_ROOT}/components.src.js > ${JS_ROOT}/components.js
+
+	echo "compress to utils.min.js ..."
+	uglifyjs --compress --mangle -- ${JS_ROOT}/utils.js > ${JS_ROOT}/utils.min.js
 else
 	echo "copy to component.js ..."
 	cp ${JS_ROOT}/components.src.js ${JS_ROOT}/components.js
+
+	echo "copy to utils.min.js ..."
+	cp ${JS_ROOT}/utils.js ${JS_ROOT}/utils.min.js
 fi
 
 echo "ok"

cmd/edge-admin/main.go

@@ -161,7 +161,7 @@ func main() {
 					if progress >= 0 {
 						if progress == 0 || progress == 1 || progress-lastProgress >= 0.1 {
 							lastProgress = progress
-							log.Println(fmt.Sprintf("%.2f%%", manager.Progress()*100))
+							log.Printf("%.2f%%", manager.Progress()*100)
 						}
 					}
 				} else {

docker/Dockerfile

@@ -1,11 +1,15 @@
-FROM alpine:latest
+FROM --platform=linux/amd64 alpine:latest
 LABEL maintainer="goedge.cdn@gmail.com"
 ENV TZ "Asia/Shanghai"
-ENV VERSION 1.2.6
+ENV VERSION 1.2.8
 ENV ROOT_DIR /usr/local/goedge
 ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip
+
+# remote official repository
 ENV TAR_URL "https://dl.goedge.cn/edge/v${VERSION}/edge-admin-linux-amd64-plus-v${VERSION}.zip"
-#ENV TAR_URL "http://192.168.2.61:8080/edge-admin-linux-amd64-plus-v${VERSION}.zip" # your local repository
+
+# your local repository
+#ENV TAR_URL "http://192.168.2.61:8080/edge-admin-linux-amd64-plus-v${VERSION}.zip"
 
 RUN apk add --no-cache tzdata
 

internal/apps/app_cmd.go

@@ -1,6 +1,7 @@
 package apps
 
 import (
+	"errors"
 	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/logs"
@@ -9,8 +10,10 @@ import (
 	"github.com/iwind/gosock/pkg/gosock"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -186,13 +189,16 @@ func (this *AppCmd) runStart() {
 		return
 	}
 
-	cmd := exec.Command(os.Args[0])
+	var cmd = exec.Command(this.exe())
 	err := cmd.Start()
 	if err != nil {
 		fmt.Println(this.product+"  start failed:", err.Error())
 		return
 	}
 
+	// create symbolic links
+	_ = this.createSymLinks()
+
 	fmt.Println(this.product+" started ok, pid:", cmd.Process.Pid)
 }
 
@@ -239,3 +245,58 @@ func (this *AppCmd) getPID() int {
 	}
 	return maps.NewMap(reply.Params).GetInt("pid")
 }
+
+func (this *AppCmd) exe() string {
+	var exe, _ = os.Executable()
+	if len(exe) == 0 {
+		exe = os.Args[0]
+	}
+	return exe
+}
+
+// 创建软链接
+func (this *AppCmd) createSymLinks() error {
+	if runtime.GOOS != "linux" {
+		return nil
+	}
+
+	var exe, _ = os.Executable()
+	if len(exe) == 0 {
+		return nil
+	}
+
+	var errorList = []string{}
+
+	// bin
+	{
+		var target = "/usr/bin/" + teaconst.ProcessName
+		old, _ := filepath.EvalSymlinks(target)
+		if old != exe {
+			_ = os.Remove(target)
+			err := os.Symlink(exe, target)
+			if err != nil {
+				errorList = append(errorList, err.Error())
+			}
+		}
+	}
+
+	// log
+	{
+		var realPath = filepath.Dir(filepath.Dir(exe)) + "/logs/run.log"
+		var target = "/var/log/" + teaconst.ProcessName + ".log"
+		old, _ := filepath.EvalSymlinks(target)
+		if old != realPath {
+			_ = os.Remove(target)
+			err := os.Symlink(realPath, target)
+			if err != nil {
+				errorList = append(errorList, err.Error())
+			}
+		}
+	}
+
+	if len(errorList) > 0 {
+		return errors.New(strings.Join(errorList, "\n"))
+	}
+
+	return nil
+}

internal/configs/api_config.go

@@ -1,6 +1,7 @@
 package configs
 
 import (
+	"errors"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"gopkg.in/yaml.v3"
@@ -8,12 +9,19 @@ import (
 	"path/filepath"
 )
 
+const ConfigFileName = "api_admin.yaml"
+const oldConfigFileName = "api.yaml"
+
 // APIConfig API配置
 type APIConfig struct {
-	RPC struct {
+	OldRPC struct {
 		Endpoints     []string `yaml:"endpoints"`
 		DisableUpdate bool     `yaml:"disableUpdate"`
-	} `yaml:"rpc"`
+	} `yaml:"rpc,omitempty"`
+
+	RPCEndpoints     []string `yaml:"rpc.endpoints,flow" json:"rpc.endpoints"`
+	RPCDisableUpdate bool     `yaml:"rpc.disableUpdate" json:"rpc.disableUpdate"`
+
 	NodeId string `yaml:"nodeId"`
 	Secret string `yaml:"secret"`
 }
@@ -21,23 +29,29 @@ type APIConfig struct {
 // LoadAPIConfig 加载API配置
 func LoadAPIConfig() (*APIConfig, error) {
 	// 候选文件
-	var localFile = Tea.ConfigFile("api.yaml")
+	var realFile = Tea.ConfigFile(ConfigFileName)
+	var oldRealFile = Tea.ConfigFile(oldConfigFileName)
 	var isFromLocal = false
-	var paths = []string{localFile}
+	var paths = []string{realFile, oldRealFile}
 	homeDir, homeErr := os.UserHomeDir()
 	if homeErr == nil {
-		paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml")
+		paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/"+ConfigFileName)
 	}
-	paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml")
+	paths = append(paths, "/etc/"+teaconst.ProcessName+"/"+ConfigFileName)
 
 	var data []byte
 	var err error
+	var isFromOld = false
 	for _, path := range paths {
 		data, err = os.ReadFile(path)
 		if err == nil {
-			if path == localFile {
+			if path == realFile || path == oldRealFile {
 				isFromLocal = true
 			}
+
+			// 自动生成新的配置文件
+			isFromOld = path == oldRealFile
+
 			break
 		}
 	}
@@ -51,9 +65,20 @@ func LoadAPIConfig() (*APIConfig, error) {
 		return nil, err
 	}
 
+	err = config.Init()
+	if err != nil {
+		return nil, errors.New("init error: " + err.Error())
+	}
+
 	if !isFromLocal {
 		// 恢复文件
-		_ = os.WriteFile(localFile, data, 0666)
+		_ = os.WriteFile(realFile, data, 0666)
+	}
+
+	// 自动生成新配置文件
+	if isFromOld {
+		config.OldRPC.Endpoints = nil
+		_ = config.WriteFile(Tea.ConfigFile(ConfigFileName))
 	}
 
 	return config, nil
@@ -61,9 +86,9 @@ func LoadAPIConfig() (*APIConfig, error) {
 
 // ResetAPIConfig 重置配置
 func ResetAPIConfig() error {
-	var filename = "api.yaml"
+	var filename = ConfigFileName
 
-	// 重置 configs/api.yaml
+	// 重置 configs/api_admin.yaml
 	{
 		var configFile = Tea.ConfigFile(filename)
 		stat, err := os.Stat(configFile)
@@ -75,7 +100,7 @@ func ResetAPIConfig() error {
 		}
 	}
 
-	// 重置 ~/.edge-admin/api.yaml
+	// 重置 ~/.edge-admin/api_admin.yaml
 	homeDir, homeErr := os.UserHomeDir()
 	if homeErr == nil {
 		var configFile = homeDir + "/." + teaconst.ProcessName + "/" + filename
@@ -88,7 +113,7 @@ func ResetAPIConfig() error {
 		}
 	}
 
-	// 重置 /etc/edge-admin/api.yaml
+	// 重置 /etc/edge-admin/api_admin.yaml
 	{
 		var configFile = "/etc/" + teaconst.ProcessName + "/" + filename
 		stat, err := os.Stat(configFile)
@@ -103,6 +128,22 @@ func ResetAPIConfig() error {
 	return nil
 }
 
+func IsNewInstalled() bool {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return false
+	}
+
+	for _, filename := range []string{ConfigFileName, oldConfigFileName} {
+		_, err = os.Stat(homeDir + "/." + teaconst.ProcessName + "/" + filename)
+		if err == nil {
+			return false
+		}
+	}
+
+	return true
+}
+
 // WriteFile 写入API配置
 func (this *APIConfig) WriteFile(path string) error {
 	data, err := yaml.Marshal(this)
@@ -159,11 +200,27 @@ func (this *APIConfig) WriteFile(path string) error {
 // Clone 克隆当前配置
 func (this *APIConfig) Clone() *APIConfig {
 	return &APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{},
 		NodeId: this.NodeId,
 		Secret: this.Secret,
 	}
 }
+
+func (this *APIConfig) Init() error {
+	// compatible with old
+	if len(this.RPCEndpoints) == 0 && len(this.OldRPC.Endpoints) > 0 {
+		this.RPCEndpoints = this.OldRPC.Endpoints
+		this.RPCDisableUpdate = this.OldRPC.DisableUpdate
+	}
+
+	if len(this.RPCEndpoints) == 0 {
+		return errors.New("no valid 'rpc.endpoints'")
+	}
+
+	if len(this.NodeId) == 0 {
+		return errors.New("'nodeId' required")
+	}
+	if len(this.Secret) == 0 {
+		return errors.New("'secret' required")
+	}
+	return nil
+}

internal/configs/api_config_test.go

@@ -2,6 +2,7 @@ package configs
 
 import (
 	_ "github.com/iwind/TeaGo/bootstrap"
+	"gopkg.in/yaml.v3"
 	"testing"
 )
 
@@ -11,10 +12,16 @@ func TestLoadAPIConfig(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Log(config)
+
+	configData, err := yaml.Marshal(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(string(configData))
 }
 
 func TestAPIConfig_WriteFile(t *testing.T) {
-	config := &APIConfig{}
+	var config = &APIConfig{}
 	err := config.WriteFile("/tmp/api_config.yaml")
 	if err != nil {
 		t.Fatal(err)

internal/const/const.go

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

internal/encrypt/method_aes_128_cfb_test.go

@@ -19,7 +19,6 @@ func TestAES128CFBMethod_Encrypt(t *testing.T) {
 	dst = dst[:len(src)]
 	t.Log("dst:", string(dst))
 
-	src = make([]byte, len(src))
 	src, err = method.Decrypt(dst)
 	if err != nil {
 		t.Fatal(err)
@@ -64,7 +63,6 @@ func TestAES128CFBMethod_Encrypt2(t *testing.T) {
 
 	for _, dst := range sources {
 		dst2 := append([]byte{}, dst...)
-		src2 := make([]byte, len(dst2))
 		src2, err := method.Decrypt(dst2)
 		if err != nil {
 			t.Fatal(err)

internal/events/utils.go

@@ -5,22 +5,22 @@ import "sync"
 var eventsMap = map[string][]func(){} // event => []callbacks
 var locker = sync.Mutex{}
 
-// 增加事件回调
+// On 增加事件回调
 func On(event string, callback func()) {
 	locker.Lock()
 	defer locker.Unlock()
 
-	callbacks, _ := eventsMap[event]
+	var callbacks = eventsMap[event]
 	callbacks = append(callbacks, callback)
 	eventsMap[event] = callbacks
 }
 
-// 通知事件
+// Notify 通知事件
 func Notify(event string) {
 	locker.Lock()
-	callbacks, _ := eventsMap[event]
+	var callbacks = eventsMap[event]
 	locker.Unlock()
-	
+
 	for _, callback := range callbacks {
 		callback()
 	}

internal/gen/generate.go

@@ -5,7 +5,7 @@ package gen
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
+	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
@@ -22,7 +22,7 @@ import (
 func Generate() error {
 	err := generateComponentsJSFile()
 	if err != nil {
-		return errors.New("generate 'components.src.js' failed: " + err.Error())
+		return fmt.Errorf("generate 'components.src.js' failed: %w", err)
 	}
 
 	return nil

internal/nodes/admin_node.go

@@ -2,6 +2,7 @@ package nodes
 
 import (
 	"errors"
+	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
@@ -65,7 +66,7 @@ func (this *AdminNode) Run() {
 	this.addPortsToFirewall()
 
 	// 监听信号
-	sigQueue := make(chan os.Signal)
+	var sigQueue = make(chan os.Signal, 8)
 	signal.Notify(sigQueue, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL, syscall.SIGQUIT)
 	go func() {
 		for range sigQueue {
@@ -106,8 +107,7 @@ func (this *AdminNode) Run() {
 // Daemon 实现守护进程
 func (this *AdminNode) Daemon() {
 	var sock = gosock.NewTmpSock(teaconst.ProcessName)
-	isDebug := lists.ContainsString(os.Args, "debug")
-	isDebug = true
+	var isDebug = lists.ContainsString(os.Args, "debug")
 	for {
 		conn, err := sock.Dial()
 		if err != nil {
@@ -185,7 +185,7 @@ func (this *AdminNode) checkServer() error {
 		if err == nil {
 			err = os.WriteFile(configFile, data, 0666)
 			if err != nil {
-				return errors.New("create config file failed: " + err.Error())
+				return fmt.Errorf("create config file failed: %w", err)
 			}
 		} else {
 			templateYAML := `# environment code
@@ -205,11 +205,11 @@ https:
 `
 			err = os.WriteFile(configFile, []byte(templateYAML), 0666)
 			if err != nil {
-				return errors.New("create config file failed: " + err.Error())
+				return fmt.Errorf("create config file failed: %w", err)
 			}
 		}
 	} else {
-		return errors.New("can not read config from 'configs/server.yaml': " + err.Error())
+		return fmt.Errorf("can not read config from 'configs/server.yaml': %w", err)
 	}
 
 	return nil
@@ -255,7 +255,7 @@ func (this *AdminNode) addPortsToFirewall() {
 
 // 启动API节点
 func (this *AdminNode) startAPINode() {
-	configPath := Tea.Root + "/edge-api/configs/api.yaml"
+	var configPath = Tea.Root + "/edge-api/configs/api.yaml"
 	_, err := os.Stat(configPath)
 	canStart := false
 	if err == nil {

internal/rpc/rpc_client.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"encoding/base64"
 	"errors"
+	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/encrypt"
@@ -522,10 +523,10 @@ func (this *RPCClient) init() error {
 
 	// 重新连接
 	var conns = []*grpc.ClientConn{}
-	for _, endpoint := range this.apiConfig.RPC.Endpoints {
+	for _, endpoint := range this.apiConfig.RPCEndpoints {
 		u, err := url.Parse(endpoint)
 		if err != nil {
-			return errors.New("parse endpoint failed: " + err.Error())
+			return fmt.Errorf("parse endpoint failed: %w", err)
 		}
 
 		var apiHost = u.Host

internal/setup/utils.go

@@ -2,8 +2,6 @@ package setup
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"os"
 )
 
 var isConfigured bool
@@ -21,13 +19,5 @@ func IsConfigured() bool {
 
 // IsNewInstalled IsNew 检查是否新安装
 func IsNewInstalled() bool {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return false
-	}
-	_, err = os.Stat(homeDir + "/." + teaconst.ProcessName + "/api.yaml")
-	if err != nil {
-		return true
-	}
-	return false
+	return configs.IsNewInstalled()
 }

internal/tasks/task_check_updates.go

@@ -5,6 +5,7 @@ package tasks
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/goman"
@@ -63,7 +64,7 @@ func (this *CheckUpdatesTask) Loop() error {
 	if len(valueJSON) > 0 {
 		err = json.Unmarshal(valueJSON, config)
 		if err != nil {
-			return errors.New("decode config failed: " + err.Error())
+			return fmt.Errorf("decode config failed: %w", err)
 		}
 		if !config.AutoCheck {
 			return nil
@@ -90,7 +91,7 @@ func (this *CheckUpdatesTask) Loop() error {
 	apiURL = strings.ReplaceAll(apiURL, "${version}", teaconst.Version)
 	resp, err := http.Get(apiURL)
 	if err != nil {
-		return errors.New("read api failed: " + err.Error())
+		return fmt.Errorf("read api failed: %w", err)
 	}
 
 	defer func() {
@@ -98,13 +99,13 @@ func (this *CheckUpdatesTask) Loop() error {
 	}()
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return errors.New("read api failed: " + err.Error())
+		return fmt.Errorf("read api failed: %w", err)
 	}
 
 	var apiResponse = &Response{}
 	err = json.Unmarshal(data, apiResponse)
 	if err != nil {
-		return errors.New("decode version data failed: " + err.Error())
+		return fmt.Errorf("decode version data failed: %w", err)
 	}
 
 	if apiResponse.Code != 200 {

internal/tasks/task_sync_api_nodes.go

@@ -65,7 +65,7 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	// 是否禁止自动升级
-	if config.RPC.DisableUpdate {
+	if config.RPCDisableUpdate {
 		return nil
 	}
 
@@ -88,7 +88,7 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	// 和现有的对比
-	if this.isSame(newEndpoints, config.RPC.Endpoints) {
+	if this.isSame(newEndpoints, config.RPCEndpoints) {
 		return nil
 	}
 
@@ -99,14 +99,14 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	// 修改RPC对象配置
-	config.RPC.Endpoints = newEndpoints
+	config.RPCEndpoints = newEndpoints
 	err = rpcClient.UpdateConfig(config)
 	if err != nil {
 		return err
 	}
 
 	// 保存到文件
-	err = config.WriteFile(Tea.ConfigFile("api.yaml"))
+	err = config.WriteFile(Tea.ConfigFile(configs.ConfigFileName))
 	if err != nil {
 		return err
 	}

internal/ttlcache/cache.go

@@ -10,8 +10,10 @@ var DefaultCache = NewCache()
 // TTL缓存
 // 最大的缓存时间为30 * 86400
 // Piece数据结构：
-//      Piece1          |  Piece2 | Piece3 | ...
-//  [ Item1, Item2, ... |   ...
+//
+//	    Piece1          |  Piece2 | Piece3 | ...
+//	[ Item1, Item2, ... |   ...
+//
 // KeyMap列表数据结构
 // { timestamp1 => [key1, key2, ...] }, ...
 type Cache struct {
@@ -109,19 +111,11 @@ func (this *Cache) Read(key string) (item *Item) {
 	return this.pieces[uint64Key%this.countPieces].Read(uint64Key)
 }
 
-func (this *Cache) readIntKey(key uint64) (value *Item) {
-	return this.pieces[key%this.countPieces].Read(key)
-}
-
 func (this *Cache) Delete(key string) {
 	uint64Key := HashKey([]byte(key))
 	this.pieces[uint64Key%this.countPieces].Delete(uint64Key)
 }
 
-func (this *Cache) deleteIntKey(key uint64) {
-	this.pieces[key%this.countPieces].Delete(key)
-}
-
 func (this *Cache) Count() (count int) {
 	for _, piece := range this.pieces {
 		count += piece.Count()

internal/utils/apinodeutils/upgrader.go

@@ -57,7 +57,7 @@ func (this *Upgrader) Upgrade() error {
 		return err
 	}
 	var newAPIConfig = apiConfig.Clone()
-	newAPIConfig.RPC.Endpoints = apiNode.AccessAddrs
+	newAPIConfig.RPCEndpoints = apiNode.AccessAddrs
 
 	rpcClient, err := rpc.NewRPCClient(newAPIConfig, false)
 	if err != nil {
@@ -79,7 +79,7 @@ func (this *Upgrader) Upgrade() error {
 	// 升级API节点
 	err = this.upgradeAPINode(sharedClient.Context(0), rpcClient)
 	if err != nil {
-		return errors.New("upgrade api node failed: " + err.Error())
+		return fmt.Errorf("upgrade api node failed: %w", err)
 	}
 
 	return nil
@@ -109,7 +109,7 @@ func (this *Upgrader) upgradeAPINode(ctx context.Context, rpcClient *rpc.RPCClie
 
 	localVersion, err := lookupLocalVersion()
 	if err != nil {
-		return errors.New("lookup version failed: " + err.Error())
+		return fmt.Errorf("lookup version failed: %w", err)
 	}
 
 	// 检查要升级的文件
@@ -251,7 +251,7 @@ func (this *Upgrader) upgradeNodes(ctx context.Context, rpcClient *rpc.RPCClient
 		if !ok || stringutil.VersionCompare(remoteDeployFile.Version, deployFile.Version) < 0 {
 			err = this.uploadNodeDeployFile(ctx, rpcClient, deployFile.Path)
 			if err != nil {
-				return errors.New("upload deploy file '" + filepath.Base(deployFile.Path) + "' failed: " + err.Error())
+				return fmt.Errorf("upload deploy file '%s' failed: %w", filepath.Base(deployFile.Path), err)
 			}
 		}
 	}
@@ -284,7 +284,7 @@ func (this *Upgrader) upgradeNSNodes(ctx context.Context, rpcClient *rpc.RPCClie
 		if !ok || stringutil.VersionCompare(remoteDeployFile.Version, deployFile.Version) < 0 {
 			err = this.uploadNodeDeployFile(ctx, rpcClient, deployFile.Path)
 			if err != nil {
-				return errors.New("upload deploy file '" + filepath.Base(deployFile.Path) + "' failed: " + err.Error())
+				return fmt.Errorf("upload deploy file '%s' failed: %w", filepath.Base(deployFile.Path), err)
 			}
 		}
 	}

internal/utils/json.go

@@ -5,6 +5,7 @@ package utils
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"reflect"
 )
 
@@ -24,7 +25,36 @@ func JSONClone(v interface{}) (interface{}, error) {
 	return nv, nil
 }
 
-// 判断JSON数据是否为null
+// JSONIsNull 判断JSON数据是否为null
 func JSONIsNull(jsonData []byte) bool {
 	return len(jsonData) == 0 || bytes.Equal(jsonData, []byte("null"))
 }
+
+// JSONDecodeConfig 解码并重新编码
+// 是为了去除原有JSON中不需要的数据
+func JSONDecodeConfig(data []byte, ptr any) (encodeJSON []byte, err error) {
+	err = json.Unmarshal(data, ptr)
+	if err != nil {
+		return
+	}
+
+	encodeJSON, err = json.Marshal(ptr)
+	if err != nil {
+		return
+	}
+
+	// validate config
+	if ptr != nil {
+		config, ok := ptr.(interface {
+			Init() error
+		})
+		if ok {
+			initErr := config.Init()
+			if initErr != nil {
+				err = errors.New("validate config failed: " + initErr.Error())
+			}
+		}
+	}
+
+	return
+}

internal/utils/service.go

@@ -39,7 +39,7 @@ func (this *ServiceManager) setup() {
 	this.onceLocker.Do(func() {
 		logFile := files.NewFile(Tea.Root + "/logs/service.log")
 		if logFile.Exists() {
-			logFile.Delete()
+			_ = logFile.Delete()
 		}
 
 		//logger

internal/utils/service_linux.go

@@ -59,10 +59,10 @@ func (this *ServiceManager) Uninstall() error {
 		}
 
 		// disable service
-		exec.Command(systemd, "disable", teaconst.SystemdServiceName+".service").Start()
+		_ = exec.Command(systemd, "disable", teaconst.SystemdServiceName+".service").Start()
 
 		// reload
-		exec.Command(systemd, "daemon-reload")
+		_ = exec.Command(systemd, "daemon-reload").Start()
 
 		return files.NewFile(systemdServiceFile).Delete()
 	}
@@ -143,10 +143,10 @@ WantedBy=multi-user.target`
 	}
 
 	// stop current systemd service if running
-	exec.Command(systemd, "stop", shortName+".service")
+	_ = exec.Command(systemd, "stop", shortName+".service").Start()
 
 	// reload
-	exec.Command(systemd, "daemon-reload")
+	_ = exec.Command(systemd, "daemon-reload").Start()
 
 	// enable
 	cmd := exec.Command(systemd, "enable", shortName+".service")

internal/utils/service_windows.go

@@ -4,6 +4,7 @@ package utils
 
 import (
 	"fmt"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
@@ -15,7 +16,7 @@ import (
 func (this *ServiceManager) Install(exePath string, args []string) error {
 	m, err := mgr.Connect()
 	if err != nil {
-		return fmt.Errorf("connecting: %s please 'Run as administrator' again", err.Error())
+		return fmt.Errorf("connecting: %w please 'Run as administrator' again", err)
 	}
 	defer m.Disconnect()
 	s, err := m.OpenService(this.Name)
@@ -30,7 +31,7 @@ func (this *ServiceManager) Install(exePath string, args []string) error {
 		StartType:   windows.SERVICE_AUTO_START,
 	}, args...)
 	if err != nil {
-		return fmt.Errorf("creating: %s", err.Error())
+		return fmt.Errorf("creating: %w", err)
 	}
 	defer s.Close()
 
@@ -46,12 +47,12 @@ func (this *ServiceManager) Start() error {
 	defer m.Disconnect()
 	s, err := m.OpenService(this.Name)
 	if err != nil {
-		return fmt.Errorf("could not access service: %v", err)
+		return fmt.Errorf("could not access service: %w", err)
 	}
 	defer s.Close()
 	err = s.Start("service")
 	if err != nil {
-		return fmt.Errorf("could not start service: %v", err)
+		return fmt.Errorf("could not start service: %w", err)
 	}
 
 	return nil
@@ -61,12 +62,12 @@ func (this *ServiceManager) Start() error {
 func (this *ServiceManager) Uninstall() error {
 	m, err := mgr.Connect()
 	if err != nil {
-		return fmt.Errorf("connecting: %s please 'Run as administrator' again", err.Error())
+		return fmt.Errorf("connecting: %w please 'Run as administrator' again", err)
 	}
 	defer m.Disconnect()
 	s, err := m.OpenService(this.Name)
 	if err != nil {
-		return fmt.Errorf("open service: %s", err.Error())
+		return fmt.Errorf("open service: %w", err)
 	}
 
 	// shutdown service
@@ -78,7 +79,7 @@ func (this *ServiceManager) Uninstall() error {
 	defer s.Close()
 	err = s.Delete()
 	if err != nil {
-		return fmt.Errorf("deleting: %s", err.Error())
+		return fmt.Errorf("deleting: %w", err)
 	}
 	return nil
 }

internal/utils/upgrade_manager.go

@@ -7,6 +7,7 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"errors"
+	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/maps"
@@ -111,13 +112,13 @@ func (this *UpgradeManager) Start() error {
 		url = strings.ReplaceAll(url, "${version}", teaconst.Version)
 		req, err := http.NewRequest(http.MethodGet, url, nil)
 		if err != nil {
-			return errors.New("create url request failed: " + err.Error())
+			return fmt.Errorf("create url request failed: %w", err)
 		}
 		req.Header.Set("User-Agent", "Edge-Admin/"+teaconst.Version)
 
 		resp, err := this.client.Do(req)
 		if err != nil {
-			return errors.New("read latest version failed: " + err.Error())
+			return fmt.Errorf("read latest version failed: %w", err)
 		}
 
 		defer func() {
@@ -130,13 +131,13 @@ func (this *UpgradeManager) Start() error {
 
 		data, err := io.ReadAll(resp.Body)
 		if err != nil {
-			return errors.New("read latest version failed: " + err.Error())
+			return fmt.Errorf("read latest version failed: %w", err)
 		}
 
 		var m = maps.Map{}
 		err = json.Unmarshal(data, &m)
 		if err != nil {
-			return errors.New("invalid response data: " + err.Error() + ", origin data: " + string(data))
+			return fmt.Errorf("invalid response data: %w, origin data: %s", err, string(data))
 		}
 
 		var code = m.GetInt("code")
@@ -172,13 +173,13 @@ func (this *UpgradeManager) Start() error {
 	{
 		req, err := http.NewRequest(http.MethodGet, downloadURL, nil)
 		if err != nil {
-			return errors.New("create download request failed: " + err.Error())
+			return fmt.Errorf("create download request failed: %w", err)
 		}
 		req.Header.Set("User-Agent", "Edge-Admin/"+teaconst.Version)
 
 		resp, err := this.client.Do(req)
 		if err != nil {
-			return errors.New("download failed: " + downloadURL + ": " + err.Error())
+			return fmt.Errorf("download failed: '%s': %w", downloadURL, err)
 		}
 
 		defer func() {
@@ -201,7 +202,7 @@ func (this *UpgradeManager) Start() error {
 
 		fp, err := os.Create(destFile)
 		if err != nil {
-			return errors.New("create file failed: " + err.Error())
+			return fmt.Errorf("create file failed: %w", err)
 		}
 
 		defer func() {
@@ -217,7 +218,7 @@ func (this *UpgradeManager) Start() error {
 			if this.isCancelled {
 				return nil
 			}
-			return errors.New("download failed: " + err.Error())
+			return fmt.Errorf("download failed: %w", err)
 		}
 
 		_ = fp.Close()
@@ -228,7 +229,7 @@ func (this *UpgradeManager) Start() error {
 		if err == nil && stat.IsDir() {
 			err = os.RemoveAll(unzipDir)
 			if err != nil {
-				return errors.New("remove old dir '" + unzipDir + "' failed: " + err.Error())
+				return fmt.Errorf("remove old dir '%s' failed: %w", unzipDir, err)
 			}
 		}
 		var unzipCmd = exec.Command(unzipExe, "-q", "-o", destFile, "-d", unzipDir)
@@ -236,18 +237,18 @@ func (this *UpgradeManager) Start() error {
 		unzipCmd.Stderr = unzipStderr
 		err = unzipCmd.Run()
 		if err != nil {
-			return errors.New("unzip installation file failed: " + err.Error() + ": " + unzipStderr.String())
+			return fmt.Errorf("unzip installation file failed: %w: %s", err, unzipStderr.String())
 		}
 
 		installationFiles, err := filepath.Glob(unzipDir + "/edge-" + this.component + "/*")
 		if err != nil {
-			return errors.New("lookup installation files failed: " + err.Error())
+			return fmt.Errorf("lookup installation files failed: %w", err)
 		}
 
 		// cp to target dir
 		currentExe, err := os.Executable()
 		if err != nil {
-			return errors.New("reveal current executable file path failed: " + err.Error())
+			return fmt.Errorf("reveal current executable file path failed: %w", err)
 		}
 		var targetDir = filepath.Dir(filepath.Dir(currentExe))
 		if !Tea.IsTesting() {

internal/web/actions/actionutils/utils.go

@@ -107,13 +107,13 @@ func MatchPath(action *actions.ActionObject, path string) bool {
 
 // FindParentAction 查找父级Action
 func FindParentAction(actionPtr actions.ActionWrapper) *ParentAction {
-	parentActionValue := reflect.ValueOf(actionPtr).Elem().FieldByName("ParentAction")
-	if parentActionValue.IsValid() {
-		parentAction, isOk := parentActionValue.Interface().(ParentAction)
-		if isOk {
-			return &parentAction
-		}
+	action, ok := actionPtr.(interface {
+		Parent() *ParentAction
+	})
+	if ok {
+		return action.Parent()
 	}
+
 	return nil
 }
 
@@ -140,7 +140,7 @@ func findStack(err string) string {
 				filename = filename[strings.Index(filename, "src"):]
 			}
 
-			err += "\n\t\t" + string(filename) + ":" + fmt.Sprintf("%d", lineNo)
+			err += "\n\t\t" + filename + ":" + fmt.Sprintf("%d", lineNo)
 
 			break
 		}
@@ -155,11 +155,11 @@ func parseAPIErr(action actions.ActionWrapper, err error) (apiNodeIsStarting boo
 	var apiEndpoints = []string{}
 	apiConfig, apiConfigErr := configs.LoadAPIConfig()
 	if apiConfigErr == nil && apiConfig != nil {
-		apiEndpoints = append(apiEndpoints, apiConfig.RPC.Endpoints...)
+		apiEndpoints = append(apiEndpoints, apiConfig.RPCEndpoints...)
 	}
 
 	var isRPCConnError bool
-	err, isRPCConnError = rpcerrors.HumanError(err, apiEndpoints, Tea.ConfigFile("api.yaml"))
+	_, isRPCConnError = rpcerrors.HumanError(err, apiEndpoints, Tea.ConfigFile(configs.ConfigFileName))
 	if isRPCConnError {
 		// API节点是否正在启动
 		var sock = gosock.NewTmpSock("edge-api")

internal/web/actions/default/admins/otpQrcode.go

@@ -67,5 +67,5 @@ func (this *OtpQrcodeAction) RunGet(params struct {
 		return
 	}
 	this.AddHeader("Content-Type", "image/png")
-	this.Write(data)
+	_, _ = this.Write(data)
 }

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

@@ -297,7 +297,7 @@ func (this *DetailAction) RunGet(params struct {
 	}
 
 	// 缓存硬盘 & 内存容量
-	var maxCacheDiskCapacity maps.Map = nil
+	var maxCacheDiskCapacity maps.Map
 	if node.MaxCacheDiskCapacity != nil {
 		maxCacheDiskCapacity = maps.Map{
 			"count": node.MaxCacheDiskCapacity.Count,
@@ -310,7 +310,7 @@ func (this *DetailAction) RunGet(params struct {
 		}
 	}
 
-	var maxCacheMemoryCapacity maps.Map = nil
+	var maxCacheMemoryCapacity maps.Map
 	if node.MaxCacheMemoryCapacity != nil {
 		maxCacheMemoryCapacity = maps.Map{
 			"count": node.MaxCacheMemoryCapacity.Count,
@@ -389,6 +389,7 @@ func (this *DetailAction) RunGet(params struct {
 			"exePath":              status.ExePath,
 			"apiSuccessPercent":    status.APISuccessPercent,
 			"apiAvgCostSeconds":    status.APIAvgCostSeconds,
+			"diskWritingSpeedMB":   status.DiskWritingSpeedMB,
 		},
 
 		"group":  groupMap,

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

@@ -2,9 +2,11 @@ package node
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -109,6 +111,26 @@ func (this *InstallAction) RunGet(params struct {
 	var installerFiles = clusterutils.ListInstallerFiles()
 	this.Data["installerFiles"] = installerFiles
 
+	// SSH主机地址
+	this.Data["sshAddr"] = ""
+	if node.NodeLogin != nil && node.NodeLogin.Type == "ssh" && !utils.JSONIsNull(node.NodeLogin.Params) {
+		var loginParams = maps.Map{}
+		err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		var host = loginParams.GetString("host")
+		if len(host) > 0 {
+			var port = loginParams.GetString("port")
+			if port == "0" {
+				port = "22"
+			}
+			this.Data["sshAddr"] = configutils.QuoteIP(host) + ":" + port
+		}
+	}
+
 	this.Show()
 }
 

internal/web/actions/default/clusters/cluster/node/settings/cache/index.go

@@ -33,7 +33,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// 缓存硬盘 & 内存容量
-	var maxCacheDiskCapacity maps.Map = nil
+	var maxCacheDiskCapacity maps.Map
 	if node.MaxCacheDiskCapacity != nil {
 		maxCacheDiskCapacity = maps.Map{
 			"count": node.MaxCacheDiskCapacity.Count,
@@ -46,7 +46,7 @@ func (this *IndexAction) RunGet(params struct {
 		}
 	}
 
-	var maxCacheMemoryCapacity maps.Map = nil
+	var maxCacheMemoryCapacity maps.Map
 	if node.MaxCacheMemoryCapacity != nil {
 		maxCacheMemoryCapacity = maps.Map{
 			"count": node.MaxCacheMemoryCapacity.Count,

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

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -35,6 +36,7 @@ func (this *IndexAction) RunGet(params struct {
 	clusters = append(clusters, node.SecondaryNodeClusters...)
 	var allDNSRouteMaps = map[int64][]maps.Map{} // domain id => routes
 	var routeMaps = map[int64][]maps.Map{}       // domain id => routes
+	var domainIds = []int64{}
 	for _, cluster := range clusters {
 		dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
 			NodeId:        params.NodeId,
@@ -49,6 +51,13 @@ func (this *IndexAction) RunGet(params struct {
 			continue
 		}
 		var domainId = dnsInfo.DnsDomainId
+
+		// remove same domain
+		if lists.ContainsInt64(domainIds, domainId) {
+			continue
+		}
+		domainIds = append(domainIds, domainId)
+
 		var domainName = dnsInfo.DnsDomainName
 		if len(dnsInfo.Routes) > 0 {
 			for _, route := range dnsInfo.Routes {
@@ -102,15 +111,23 @@ func (this *IndexAction) RunPost(params struct {
 }) {
 	defer this.CreateLogInfo(codes.NodeDNS_LogUpdateNodeDNS, params.NodeId)
 
-	dnsRouteCodes := []string{}
+	var rawRouteCodes = []string{}
 	if len(params.DnsRoutesJSON) > 0 {
-		err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes)
+		err := json.Unmarshal(params.DnsRoutesJSON, &rawRouteCodes)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
 	}
 
+	// remove duplications
+	var dnsRouteCodes = []string{}
+	for _, routeCode := range rawRouteCodes {
+		if !lists.ContainsString(dnsRouteCodes, routeCode) {
+			dnsRouteCodes = append(dnsRouteCodes, routeCode)
+		}
+	}
+
 	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
 		NodeId:      params.NodeId,
 		IpAddr:      "",

internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go

@@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		var grantMap = maps.Map{}
-		grantId := loginParams.GetInt64("grantId")
+		var grantId = loginParams.GetInt64("grantId")
 		if grantId > 0 {
 			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {

internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go

@@ -43,13 +43,19 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["config"] = config
 
-	var httpAllDomainMismatchActionContentHTML = ""
+	var httpAllDomainMismatchActionCode = serverconfigs.DomainMismatchActionPage
+	var httpAllDomainMismatchActionContentHTML string
 	var httpAllDomainMismatchActionStatusCode = "404"
-	if config.HTTPAll.DomainMismatchAction != nil && config.HTTPAll.DomainMismatchAction.Options != nil {
-		httpAllDomainMismatchActionContentHTML = config.HTTPAll.DomainMismatchAction.Options.GetString("contentHTML")
-		var statusCode = config.HTTPAll.DomainMismatchAction.Options.GetInt("statusCode")
-		if statusCode > 0 {
-			httpAllDomainMismatchActionStatusCode = types.String(statusCode)
+	if config.HTTPAll.DomainMismatchAction != nil {
+		httpAllDomainMismatchActionCode = config.HTTPAll.DomainMismatchAction.Code
+
+		if config.HTTPAll.DomainMismatchAction.Options != nil {
+			// 即使是非 page 处理动作，也读取这些内容，以便于在切换到 page 时，可以顺利读取到先前的设置
+			httpAllDomainMismatchActionContentHTML = config.HTTPAll.DomainMismatchAction.Options.GetString("contentHTML")
+			var statusCode = config.HTTPAll.DomainMismatchAction.Options.GetInt("statusCode")
+			if statusCode > 0 {
+				httpAllDomainMismatchActionStatusCode = types.String(statusCode)
+			}
 		}
 	} else {
 		httpAllDomainMismatchActionContentHTML = `<!DOCTYPE html>
@@ -73,6 +79,7 @@ p { color: grey; }
 </html>`
 	}
 
+	this.Data["httpAllDomainMismatchActionCode"] = httpAllDomainMismatchActionCode
 	this.Data["httpAllDomainMismatchActionContentHTML"] = httpAllDomainMismatchActionContentHTML
 	this.Data["httpAllDomainMismatchActionStatusCode"] = httpAllDomainMismatchActionStatusCode
 
@@ -83,6 +90,7 @@ func (this *IndexAction) RunPost(params struct {
 	ClusterId int64
 
 	HttpAllMatchDomainStrictly             bool
+	HttpAllDomainMismatchActionCode        string
 	HttpAllDomainMismatchActionContentHTML string
 	HttpAllDomainMismatchActionStatusCode  string
 	HttpAllAllowMismatchDomainsJSON        []byte
@@ -90,11 +98,13 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllDefaultDomain                   string
 	HttpAllNodeIPPageHTML                  string
 	HttpAllNodeIPShowPage                  bool
+	HttpAllEnableServerAddrVariable        bool
 
-	HttpAllServerName              string
-	HttpAllSupportsLowVersionHTTP  bool
-	HttpAllMatchCertFromAllServers bool
-	HttpAllForceLnRequest          bool
+	HttpAllServerName                string
+	HttpAllSupportsLowVersionHTTP    bool
+	HttpAllMatchCertFromAllServers   bool
+	HttpAllForceLnRequest            bool
+	HttpAllLnRequestSchedulingMethod string
 
 	HttpAccessLogIsOn                     bool
 	HttpAccessLogEnableRequestHeaders     bool
@@ -139,7 +149,7 @@ func (this *IndexAction) RunPost(params struct {
 
 	config.HTTPAll.MatchDomainStrictly = params.HttpAllMatchDomainStrictly
 	config.HTTPAll.DomainMismatchAction = &serverconfigs.DomainMismatchAction{
-		Code: serverconfigs.DomainMismatchActionPage,
+		Code: params.HttpAllDomainMismatchActionCode,
 		Options: maps.Map{
 			"statusCode":  domainMisMatchStatusCode,
 			"contentHTML": params.HttpAllDomainMismatchActionContentHTML,
@@ -167,6 +177,8 @@ func (this *IndexAction) RunPost(params struct {
 	config.HTTPAll.SupportsLowVersionHTTP = params.HttpAllSupportsLowVersionHTTP
 	config.HTTPAll.MatchCertFromAllServers = params.HttpAllMatchCertFromAllServers
 	config.HTTPAll.ForceLnRequest = params.HttpAllForceLnRequest
+	config.HTTPAll.LnRequestSchedulingMethod = params.HttpAllLnRequestSchedulingMethod
+	config.HTTPAll.EnableServerAddrVariable = params.HttpAllEnableServerAddrVariable
 
 	// 访问日志
 	config.HTTPAccessLog.IsOn = params.HttpAccessLogIsOn

internal/web/actions/default/db/helper.go

@@ -19,7 +19,7 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) {
 
 	action.Data["teaMenu"] = "db"
 
-	selectedTabbar, _ := action.Data["mainTab"]
+	var selectedTabbar = action.Data["mainTab"]
 
 	var tabbar = actionutils.NewTabbar()
 	tabbar.Add(this.Lang(action, codes.DBNode_TabNodes), "", "/db", "", selectedTabbar == "db")

internal/web/actions/default/db/logs.go

@@ -63,6 +63,10 @@ func (this *LogsAction) RunGet(params struct {
 		Offset: page.Offset,
 		Size:   page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {

internal/web/actions/default/dns/domains/domainutils/utils.go

@@ -101,9 +101,7 @@ func ValidateRecordValue(recordType dnsconfigs.RecordType, value string) (messag
 			return
 		}
 	case dnsconfigs.RecordTypeCNAME:
-		if strings.HasSuffix(value, ".") {
-			value = value[:len(value)-1]
-		}
+		value = strings.TrimSuffix(value, ".")
 		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
 			message = "请输入正确的域名"
 			return
@@ -118,17 +116,13 @@ func ValidateRecordValue(recordType dnsconfigs.RecordType, value string) (messag
 			return
 		}
 	case dnsconfigs.RecordTypeNS:
-		if strings.HasSuffix(value, ".") {
-			value = value[:len(value)-1]
-		}
+		value = strings.TrimSuffix(value, ".")
 		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
 			message = "请输入正确的DNS服务器域名"
 			return
 		}
 	case dnsconfigs.RecordTypeMX:
-		if strings.HasSuffix(value, ".") {
-			value = value[:len(value)-1]
-		}
+		value = strings.TrimSuffix(value, ".")
 		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
 			message = "请输入正确的邮件服务器域名"
 			return

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

@@ -28,7 +28,7 @@ func (this *IndexAction) RunGet(params struct {
 
 	// 格式化域名
 	var domain = params.Domain
-	domain = regexp.MustCompile(`^(www\.)`).ReplaceAllString(params.Domain, "")
+	domain = regexp.MustCompile(`^(www\.)`).ReplaceAllString(domain, "")
 	domain = strings.ToLower(domain)
 
 	countResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{

internal/web/actions/default/files/file.go

@@ -57,6 +57,6 @@ func (this *FileAction) RunGet(params struct {
 		if chunkResp.FileChunk == nil {
 			continue
 		}
-		this.Write(chunkResp.FileChunk.Data)
+		_, _ = this.Write(chunkResp.FileChunk.Data)
 	}
 }

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

@@ -3,11 +3,11 @@ package log
 import (
 	"bytes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"github.com/tealeg/xlsx/v3"
 	"strconv"
-	"strings"
 )
 
 type ExportExcelAction struct {
@@ -65,23 +65,11 @@ func (this *ExportExcelAction) RunGet(params struct {
 	for _, log := range logsResp.Logs {
 		var regionName = ""
 		var ispName = ""
-		regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: log.Ip})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if regionResp.IpRegion != nil {
-			regionName = regionResp.IpRegion.Summary
 
-			// remove isp from regionName
-			var index = strings.LastIndex(regionName, "|")
-			if index > 0 {
-				regionName = regionName[:index]
-			}
-
-			if len(regionResp.IpRegion.Isp) > 0 {
-				ispName = regionResp.IpRegion.Isp
-			}
+		var ipRegion = iplibrary.LookupIP(log.Ip)
+		if ipRegion != nil && ipRegion.IsOk() {
+			regionName = ipRegion.RegionSummary()
+			ispName = ipRegion.ProviderName()
 		}
 
 		var row = sheet.AddRow()
@@ -123,5 +111,5 @@ func (this *ExportExcelAction) RunGet(params struct {
 	}
 
 	this.AddHeader("Content-Length", strconv.Itoa(buf.Len()))
-	this.Write(buf.Bytes())
+	_, _ = this.Write(buf.Bytes())
 }

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

@@ -3,6 +3,7 @@ package log
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -84,14 +85,10 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	var logMaps = []maps.Map{}
 	for _, log := range logsResp.Logs {
-		regionName := ""
-		regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: log.Ip})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if regionResp.IpRegion != nil {
-			regionName = regionResp.IpRegion.Summary
+		var regionName = ""
+		var ipRegion = iplibrary.LookupIP(log.Ip)
+		if ipRegion != nil && ipRegion.IsOk() {
+			regionName = ipRegion.Summary()
 		}
 
 		logMaps = append(logMaps, maps.Map{

internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go

@@ -36,7 +36,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 		if addrId > 0 {
 			resultAddrIds = append(resultAddrIds, addrId)
 
-			var isOn = false
+			var isOn bool
 			if !addr.Has("isOn") { // 兼容老版本
 				isOn = true
 			} else {

internal/web/actions/default/nodes/nodeutils/utils.go

@@ -101,14 +101,9 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 			apiNode := apiNodeResp.ApiNode
 
 			apiRPCClient, err := rpc.NewRPCClient(&configs.APIConfig{
-				RPC: struct {
-					Endpoints     []string `yaml:"endpoints"`
-					DisableUpdate bool     `yaml:"disableUpdate"`
-				}{
-					Endpoints: apiNode.AccessAddrs,
-				},
-				NodeId: apiNode.UniqueId,
-				Secret: apiNode.Secret,
+				RPCEndpoints: apiNode.AccessAddrs,
+				NodeId:       apiNode.UniqueId,
+				Secret:       apiNode.Secret,
 			}, false)
 			if err != nil {
 				locker.Lock()
@@ -282,14 +277,9 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 			apiNode := apiNodeResp.ApiNode
 
 			apiRPCClient, err := rpc.NewRPCClient(&configs.APIConfig{
-				RPC: struct {
-					Endpoints     []string `yaml:"endpoints"`
-					DisableUpdate bool     `yaml:"disableUpdate"`
-				}{
-					Endpoints: apiNode.AccessAddrs,
-				},
-				NodeId: apiNode.UniqueId,
-				Secret: apiNode.Secret,
+				RPCEndpoints: apiNode.AccessAddrs,
+				NodeId:       apiNode.UniqueId,
+				Secret:       apiNode.Secret,
 			}, false)
 			if err != nil {
 				locker.Lock()

internal/web/actions/default/recover/helper.go

@@ -1,4 +1,4 @@
-package recover
+package recovers
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"

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

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package recover
+package recovers
 
 import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 

internal/web/actions/default/recover/init.go

@@ -1,4 +1,4 @@
-package recover
+package recovers
 
 import "github.com/iwind/TeaGo"
 

internal/web/actions/default/recover/updateHosts.go

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package recover
+package recovers
 
 import (
 	"bytes"
@@ -35,14 +35,9 @@ func (this *UpdateHostsAction) RunPost(params struct {
 	}
 
 	client, err := rpc.NewRPCClient(&configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: []string{params.Protocol + "://" + configutils.QuoteIP(params.Host) + ":" + params.Port},
-		},
-		NodeId: params.NodeId,
-		Secret: params.NodeSecret,
+		RPCEndpoints: []string{params.Protocol + "://" + configutils.QuoteIP(params.Host) + ":" + params.Port},
+		NodeId:       params.NodeId,
+		Secret:       params.NodeSecret,
 	}, false)
 	if err != nil {
 		this.FailField("host", "测试API节点时出错，请检查配置，错误信息："+err.Error())
@@ -165,23 +160,18 @@ func (this *UpdateHostsAction) RunPost(params struct {
 		}
 	}
 
-	// 修改api.yaml
+	// 修改api_admin.yaml
 	var apiConfig = &configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: endpoints,
-		},
-		NodeId: adminAPIToken.NodeId,
-		Secret: adminAPIToken.Secret,
+		RPCEndpoints: endpoints,
+		NodeId:       adminAPIToken.NodeId,
+		Secret:       adminAPIToken.Secret,
 	}
-	err = apiConfig.WriteFile(Tea.Root + "/configs/api.yaml")
+	err = apiConfig.WriteFile(Tea.Root + "/configs/" + configs.ConfigFileName)
 	if err != nil {
-		this.Fail("保存configs/api.yaml失败：" + err.Error())
+		this.Fail("保存configs/" + configs.ConfigFileName + "失败：" + err.Error())
 	}
 
-	// 加载api.yaml
+	// 加载api_admin.yaml
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {
 		this.Fail("初始化RPC失败：" + err.Error())

internal/web/actions/default/recover/validateApi.go

@@ -1,4 +1,4 @@
-package recover
+package recovers
 
 import (
 	"encoding/json"
@@ -42,14 +42,9 @@ func (this *ValidateApiAction) RunPost(params struct {
 		Field("nodeSecret", params.NodeSecret).
 		Require("请输入节点secret")
 	client, err := rpc.NewRPCClient(&configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: []string{params.Protocol + "://" + configutils.QuoteIP(params.Host) + ":" + params.Port},
-		},
-		NodeId: params.NodeId,
-		Secret: params.NodeSecret,
+		RPCEndpoints: []string{params.Protocol + "://" + configutils.QuoteIP(params.Host) + ":" + params.Port},
+		NodeId:       params.NodeId,
+		Secret:       params.NodeSecret,
 	}, false)
 	if err != nil {
 		this.FailField("host", "测试API节点时出错，请检查配置，错误信息："+err.Error())

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

@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"net"
 	"net/url"
 	"regexp"
 	"strings"
@@ -43,6 +44,14 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 			}
 		}
 
+		// 去除端口
+		if regexp.MustCompile(`:\d+$`).MatchString(serverName) {
+			host, _, err := net.SplitHostPort(serverName)
+			if err == nil && len(host) > 0 {
+				serverName = host
+			}
+		}
+
 		params.Must.
 			Field("serverName", serverName).
 			Require("请输入域名")
@@ -72,6 +81,14 @@ func (this *AddServerNamePopupAction) RunPost(params struct {
 				}
 			}
 
+			// 去除端口
+			if regexp.MustCompile(`:\d+$`).MatchString(serverName) {
+				host, _, err := net.SplitHostPort(serverName)
+				if err == nil && len(host) > 0 {
+					serverName = host
+				}
+			}
+
 			// 转成小写
 			serverName = strings.ToLower(serverName)
 

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

@@ -36,5 +36,5 @@ func (this *DownloadCertAction) RunGet(params struct {
 	}
 
 	this.AddHeader("Content-Disposition", "attachment; filename=\"cert-"+strconv.FormatInt(params.CertId, 10)+".pem\";")
-	this.Write(certConfig.CertData)
+	_, _ = this.Write(certConfig.CertData)
 }

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

@@ -36,5 +36,5 @@ func (this *DownloadKeyAction) RunGet(params struct {
 	}
 
 	this.AddHeader("Content-Disposition", "attachment; filename=\"key-"+strconv.FormatInt(params.CertId, 10)+".pem\";")
-	this.Write(certConfig.KeyData)
+	_, _ = this.Write(certConfig.KeyData)
 }

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

@@ -50,12 +50,12 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["user"] = userMap
 
-	var countAll = int64(0)
-	var countCA = int64(0)
-	var countAvailable = int64(0)
-	var countExpired = int64(0)
-	var count7Days = int64(0)
-	var count30Days = int64(0)
+	var countAll int64
+	var countCA int64
+	var countAvailable int64
+	var countExpired int64
+	var count7Days int64
+	var count30Days int64
 
 	// 计算数量
 	{

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

@@ -172,6 +172,11 @@ func (this *SelectPopupAction) RunGet(params struct {
 		})
 	}
 
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	if listResp == nil {
 		this.ErrorPage(errors.New("'listResp' should not be nil"))
 		return

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

@@ -1,6 +1,7 @@
 package certs
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -120,7 +121,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 
 	// 校验
 	certConfig.IsCA = params.IsCA
-	err = certConfig.Init(nil)
+	err = certConfig.Init(context.TODO())
 	if err != nil {
 		if params.IsCA {
 			this.Fail("证书校验错误：" + err.Error())

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

@@ -4,6 +4,7 @@ package certs
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -156,7 +157,7 @@ func (this *UploadBatchPopupAction) RunPost(params struct {
 			CertData: certData,
 			KeyData:  keyData,
 		}
-		err := certConfig.Init(nil)
+		err := certConfig.Init(context.TODO())
 		if err != nil {
 			this.Fail("证书验证失败：" + err.Error())
 			return

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

@@ -1,6 +1,7 @@
 package certs
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
@@ -60,8 +61,8 @@ func (this *UploadPopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入证书说明")
 
-	var certData = []byte{}
-	var keyData = []byte{}
+	var certData []byte
+	var keyData []byte
 
 	if params.TextMode {
 		if len(params.CertText) == 0 {
@@ -104,7 +105,7 @@ func (this *UploadPopupAction) RunPost(params struct {
 		CertData: certData,
 		KeyData:  keyData,
 	}
-	err := certConfig.Init(nil)
+	err := certConfig.Init(context.TODO())
 	if err != nil {
 		if params.IsCA {
 			this.Fail("证书校验错误：" + err.Error())

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

@@ -35,5 +35,5 @@ func (this *ViewCertAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	this.Write(certConfig.CertData)
+	_, _ = this.Write(certConfig.CertData)
 }

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

@@ -30,5 +30,5 @@ func (this *ViewKeyAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	this.Write(certConfig.KeyData)
+	_, _ = this.Write(certConfig.KeyData)
 }

internal/web/actions/default/servers/components/cache/createPopup.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -21,6 +22,7 @@ func (this *CreatePopupAction) Init() {
 
 func (this *CreatePopupAction) RunGet(params struct{}) {
 	this.Data["types"] = serverconfigs.AllCachePolicyStorageTypes
+
 	this.Show()
 }
 
@@ -33,9 +35,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 	FileMemoryCapacityJSON []byte
 	FileOpenFileCacheMax   int
 	FileEnableSendfile     bool
+	FileMinFreeSizeJSON    []byte
 
 	CapacityJSON         []byte
 	MaxSizeJSON          []byte
+	FetchTimeoutJSON     []byte
 	SyncCompressionCache bool
 
 	Description string
@@ -48,14 +52,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Require("请输入策略名称")
 
 	// 校验选项
-	var options interface{}
+	var options any
 	switch params.Type {
 	case serverconfigs.CachePolicyStorageFile:
 		params.Must.
 			Field("fileDir", params.FileDir).
 			Require("请输入缓存目录")
 
-		memoryCapacity := &shared.SizeCapacity{}
+		var memoryCapacity = &shared.SizeCapacity{}
 		if len(params.FileMemoryCapacityJSON) > 0 {
 			err := json.Unmarshal(params.FileMemoryCapacityJSON, memoryCapacity)
 			if err != nil {
@@ -72,6 +76,19 @@ func (this *CreatePopupAction) RunPost(params struct {
 			}
 		}
 
+		var minFreeSize = &shared.SizeCapacity{}
+		var minFreeSizeJSON = params.FileMinFreeSizeJSON
+		if !utils.JSONIsNull(minFreeSizeJSON) {
+			_, err := utils.JSONDecodeConfig(minFreeSizeJSON, minFreeSize)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if minFreeSize.Count < 0 {
+				minFreeSize.Count = 0
+			}
+		}
+
 		options = &serverconfigs.HTTPFileCacheStorage{
 			Dir: params.FileDir,
 			MemoryPolicy: &serverconfigs.HTTPCachePolicy{
@@ -79,6 +96,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 			},
 			OpenFileCache:  openFileCacheConfig,
 			EnableSendfile: params.FileEnableSendfile,
+			MinFreeSize:    minFreeSize,
 		}
 	case serverconfigs.CachePolicyStorageMemory:
 		options = &serverconfigs.HTTPMemoryCacheStorage{}
@@ -97,6 +115,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Description:          params.Description,
 		CapacityJSON:         params.CapacityJSON,
 		MaxSizeJSON:          params.MaxSizeJSON,
+		FetchTimeoutJSON:     params.FetchTimeoutJSON,
 		Type:                 params.Type,
 		OptionsJSON:          optionsJSON,
 		SyncCompressionCache: params.SyncCompressionCache,

internal/web/actions/default/servers/components/cache/helper.go

@@ -5,7 +5,6 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils"
 	"github.com/iwind/TeaGo/actions"
 	"net/http"
-	"reflect"
 )
 
 type Helper struct {
@@ -27,11 +26,11 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) {
 	cachePolicyId := action.ParamInt64("cachePolicyId")
 	action.Data["cachePolicyId"] = cachePolicyId
 
-	parentActionValue := reflect.ValueOf(actionPtr).Elem().FieldByName("ParentAction")
-	if parentActionValue.IsValid() {
-		parentAction, isOk := parentActionValue.Interface().(actionutils.ParentAction)
-		if isOk {
-			action.Data["cachePolicyName"] = cacheutils.FindCachePolicyNameWithoutError(&parentAction, cachePolicyId)
-		}
+	parentActionObj, ok := actionPtr.(interface {
+		Parent() *actionutils.ParentAction
+	})
+	if ok {
+		var parentAction = parentActionObj.Parent()
+		action.Data["cachePolicyName"] = cacheutils.FindCachePolicyNameWithoutError(parentAction, cachePolicyId)
 	}
 }

internal/web/actions/default/servers/components/cache/policy.go

@@ -26,6 +26,12 @@ func (this *PolicyAction) RunGet(params struct {
 	}
 	this.Data["cachePolicy"] = cachePolicy
 
+	// 预热超时时间
+	this.Data["fetchTimeoutString"] = ""
+	if cachePolicy.FetchTimeout != nil && cachePolicy.FetchTimeout.Count > 0 {
+		this.Data["fetchTimeoutString"] = cachePolicy.FetchTimeout.Description()
+	}
+
 	this.Data["typeName"] = serverconfigs.FindCachePolicyStorageName(cachePolicy.Type)
 
 	// 正在使用此策略的集群
@@ -34,7 +40,7 @@ func (this *PolicyAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	clusterMaps := []maps.Map{}
+	var clusterMaps = []maps.Map{}
 	for _, cluster := range clustersResp.NodeClusters {
 		clusterMaps = append(clusterMaps, maps.Map{
 			"id":   cluster.Id,

internal/web/actions/default/servers/components/cache/update.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -38,6 +39,18 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+
+	// fix min free size
+	if cachePolicy.Type == serverconfigs.CachePolicyStorageFile && cachePolicy.Options != nil {
+		_, ok := cachePolicy.Options["minFreeSize"]
+		if !ok {
+			cachePolicy.Options["minFreeSize"] = &shared.SizeCapacity{
+				Count: 0,
+				Unit:  shared.SizeCapacityUnitGB,
+			}
+		}
+	}
+
 	this.Data["cachePolicy"] = cachePolicy
 
 	// 其他选项
@@ -57,10 +70,12 @@ func (this *UpdateAction) RunPost(params struct {
 	FileMemoryCapacityJSON []byte
 	FileOpenFileCacheMax   int
 	FileEnableSendfile     bool
+	FileMinFreeSizeJSON    []byte
 
 	CapacityJSON         []byte
 	MaxSizeJSON          []byte
 	SyncCompressionCache bool
+	FetchTimeoutJSON     []byte
 
 	Description string
 	IsOn        bool
@@ -84,7 +99,7 @@ func (this *UpdateAction) RunPost(params struct {
 			Field("fileDir", params.FileDir).
 			Require("请输入缓存目录")
 
-		memoryCapacity := &shared.SizeCapacity{}
+		var memoryCapacity = &shared.SizeCapacity{}
 		if len(params.FileMemoryCapacityJSON) > 0 {
 			err := json.Unmarshal(params.FileMemoryCapacityJSON, memoryCapacity)
 			if err != nil {
@@ -101,6 +116,19 @@ func (this *UpdateAction) RunPost(params struct {
 			}
 		}
 
+		var minFreeSize = &shared.SizeCapacity{}
+		var minFreeSizeJSON = params.FileMinFreeSizeJSON
+		if !utils.JSONIsNull(minFreeSizeJSON) {
+			_, err := utils.JSONDecodeConfig(minFreeSizeJSON, minFreeSize)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if minFreeSize.Count < 0 {
+				minFreeSize.Count = 0
+			}
+		}
+
 		options = &serverconfigs.HTTPFileCacheStorage{
 			Dir: params.FileDir,
 			MemoryPolicy: &serverconfigs.HTTPCachePolicy{
@@ -108,6 +136,7 @@ func (this *UpdateAction) RunPost(params struct {
 			},
 			OpenFileCache:  openFileCacheConfig,
 			EnableSendfile: params.FileEnableSendfile,
+			MinFreeSize:    minFreeSize,
 		}
 	case serverconfigs.CachePolicyStorageMemory:
 		options = &serverconfigs.HTTPMemoryCacheStorage{}
@@ -122,7 +151,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 校验缓存条件
-	refs := []*serverconfigs.HTTPCacheRef{}
+	var refs = []*serverconfigs.HTTPCacheRef{}
 	if len(params.RefsJSON) > 0 {
 		err = json.Unmarshal(params.RefsJSON, &refs)
 		if err != nil {
@@ -146,6 +175,7 @@ func (this *UpdateAction) RunPost(params struct {
 		Type:                 params.Type,
 		OptionsJSON:          optionsJSON,
 		SyncCompressionCache: params.SyncCompressionCache,
+		FetchTimeoutJSON:     params.FetchTimeoutJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -76,14 +76,6 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("配置校验失败：" + err.Error())
 	}
 
-	// 允许不匹配的域名
-	allowMismatchDomains := []string{}
-	for _, domain := range params.AllowMismatchDomains {
-		if len(domain) > 0 {
-			allowMismatchDomains = append(allowMismatchDomains, domain)
-		}
-	}
-
 	// TCP端口范围
 	if params.TcpAllPortRangeMin < 1024 {
 		params.TcpAllPortRangeMin = 1024

internal/web/actions/default/servers/components/waf/createRulePopup.go

@@ -5,7 +5,6 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -21,7 +20,7 @@ func (this *CreateRulePopupAction) RunGet(params struct {
 	Type string
 }) {
 	// check points
-	checkpointList := []maps.Map{}
+	var checkpointList = []maps.Map{}
 	for _, checkpoint := range firewallconfigs.AllCheckpoints {
 		if (params.Type == "inbound" && checkpoint.IsRequest) || params.Type == "outbound" {
 			checkpointList = append(checkpointList, maps.Map{
@@ -38,15 +37,17 @@ func (this *CreateRulePopupAction) RunGet(params struct {
 	}
 
 	// operators
-	this.Data["operators"] = lists.Map(firewallconfigs.AllRuleOperators, func(k int, v interface{}) interface{} {
-		def := v.(*firewallconfigs.RuleOperatorDefinition)
-		return maps.Map{
-			"name":        def.Name,
-			"code":        def.Code,
-			"description": def.Description,
-			"case":        def.CaseInsensitive,
-		}
-	})
+	var operatorMaps = []maps.Map{}
+	for _, operator := range firewallconfigs.AllRuleOperators {
+		operatorMaps = append(operatorMaps, maps.Map{
+			"name":        operator.Name,
+			"code":        operator.Code,
+			"description": operator.Description,
+			"case":        operator.CaseInsensitive,
+			"dataType":    operator.DataType,
+		})
+	}
+	this.Data["operators"] = operatorMaps
 
 	this.Data["checkpoints"] = checkpointList
 

internal/web/actions/default/servers/components/waf/exportDownload.go

@@ -31,7 +31,7 @@ func (this *ExportDownloadAction) RunGet(params struct {
 	if ok {
 		this.AddHeader("Content-Disposition", "attachment; filename=\"WAF-"+types.String(params.PolicyId)+".json\";")
 		this.AddHeader("Content-Length", strconv.Itoa(len(data)))
-		this.Write(data)
+		_, _ = this.Write(data)
 	} else {
 		this.WriteString("找不到要导出的内容")
 		return

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

@@ -40,10 +40,13 @@ func (this *IndexAction) RunGet(params struct {
 
 	var deniedCountryIds = []int64{}
 	var allowedCountryIds = []int64{}
+	var countryHTML string
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		deniedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 		allowedCountryIds = policyConfig.Inbound.Region.AllowCountryIds
+		countryHTML = policyConfig.Inbound.Region.CountryHTML
 	}
+	this.Data["countryHTML"] = countryHTML
 
 	countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{})
 	if err != nil {
@@ -91,6 +94,8 @@ func (this *IndexAction) RunPost(params struct {
 	ExceptURLPatternsJSON []byte
 	OnlyURLPatternsJSON   []byte
 
+	CountryHTML string
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -128,6 +133,13 @@ func (this *IndexAction) RunPost(params struct {
 	}
 	policyConfig.Inbound.Region.CountryExceptURLPatterns = exceptURLPatterns
 
+	// 自定义提示
+	if len(params.CountryHTML) > 32<<10 {
+		this.Fail("提示内容长度不能超出32K")
+		return
+	}
+	policyConfig.Inbound.Region.CountryHTML = params.CountryHTML
+
 	// 限制URL
 	var onlyURLPatterns = []*shared.URLPattern{}
 	if len(params.OnlyURLPatternsJSON) > 0 {

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

@@ -40,10 +40,13 @@ func (this *ProvincesAction) RunGet(params struct {
 
 	var deniedProvinceIds = []int64{}
 	var allowedProvinceIds = []int64{}
+	var provinceHTML string
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		deniedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 		allowedProvinceIds = policyConfig.Inbound.Region.AllowProvinceIds
+		provinceHTML = policyConfig.Inbound.Region.ProvinceHTML
 	}
+	this.Data["provinceHTML"] = provinceHTML
 
 	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
 		RegionCountryId: regionconfigs.RegionChinaId,
@@ -92,6 +95,8 @@ func (this *ProvincesAction) RunPost(params struct {
 	ExceptURLPatternsJSON []byte
 	OnlyURLPatternsJSON   []byte
 
+	ProvinceHTML string
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -140,6 +145,13 @@ func (this *ProvincesAction) RunPost(params struct {
 	}
 	policyConfig.Inbound.Region.ProvinceOnlyURLPatterns = onlyURLPatterns
 
+	// 自定义提示
+	if len(params.ProvinceHTML) > 32<<10 {
+		this.Fail("提示内容长度不能超出32K")
+		return
+	}
+	policyConfig.Inbound.Region.ProvinceHTML = params.ProvinceHTML
+
 	inboundJSON, err := json.Marshal(policyConfig.Inbound)
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/components/waf/log.go

@@ -3,6 +3,7 @@ package waf
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/lists"
@@ -141,20 +142,7 @@ func (this *LogAction) RunGet(params struct {
 	this.Data["groups"] = groupMaps
 
 	// 根据IP查询区域
-	regionMap := map[string]string{} // ip => region
-	if len(ipList) > 0 {
-		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if resp.IpRegionMap != nil {
-			for ip, region := range resp.IpRegionMap {
-				regionMap[ip] = region.Summary
-			}
-		}
-	}
-	this.Data["regions"] = regionMap
+	this.Data["regions"] = iplibrary.LookupIPSummaries(ipList)
 
 	// WAF相关
 	var wafInfos = map[int64]maps.Map{}                          // set id => WAF Map

internal/web/actions/default/servers/components/waf/policy.go

@@ -1,6 +1,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -29,7 +30,7 @@ func (this *PolicyAction) RunGet(params struct {
 		return
 	}
 
-	internalGroups := []maps.Map{}
+	var internalGroups = []maps.Map{}
 	if firewallPolicy.Inbound != nil {
 		for _, group := range firewallPolicy.Inbound.Groups {
 			internalGroups = append(internalGroups, maps.Map{
@@ -86,18 +87,22 @@ func (this *PolicyAction) RunGet(params struct {
 	}
 
 	this.Data["firewallPolicy"] = maps.Map{
-		"id":               firewallPolicy.Id,
-		"name":             firewallPolicy.Name,
-		"isOn":             firewallPolicy.IsOn,
-		"description":      firewallPolicy.Description,
-		"mode":             firewallPolicy.Mode,
-		"modeInfo":         firewallconfigs.FindFirewallMode(firewallPolicy.Mode),
-		"groups":           internalGroups,
-		"blockOptions":     firewallPolicy.BlockOptions,
-		"captchaOptions":   firewallPolicy.CaptchaOptions,
-		"useLocalFirewall": firewallPolicy.UseLocalFirewall,
-		"synFlood":         firewallPolicy.SYNFlood,
-		"log":              firewallPolicy.Log,
+		"id":                       firewallPolicy.Id,
+		"name":                     firewallPolicy.Name,
+		"isOn":                     firewallPolicy.IsOn,
+		"description":              firewallPolicy.Description,
+		"mode":                     firewallPolicy.Mode,
+		"modeInfo":                 firewallconfigs.FindFirewallMode(firewallPolicy.Mode),
+		"groups":                   internalGroups,
+		"blockOptions":             firewallPolicy.BlockOptions,
+		"captchaOptions":           firewallPolicy.CaptchaOptions,
+		"useLocalFirewall":         firewallPolicy.UseLocalFirewall,
+		"synFlood":                 firewallPolicy.SYNFlood,
+		"log":                      firewallPolicy.Log,
+		"maxRequestBodySize":       firewallPolicy.MaxRequestBodySize,
+		"maxRequestBodySizeFormat": numberutils.FormatBytes(firewallPolicy.MaxRequestBodySize),
+		"denyCountryHTML":          firewallPolicy.DenyCountryHTML,
+		"denyProvinceHTML":         firewallPolicy.DenyProvinceHTML,
 	}
 
 	// 正在使用此策略的集群

internal/web/actions/default/servers/components/waf/sortSets.go

@@ -52,6 +52,10 @@ func (this *SortSetsAction) RunPost(params struct {
 		FirewallRuleGroupId:  params.GroupId,
 		FirewallRuleSetsJSON: newRefsJSON,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	this.Success()
 }

internal/web/actions/default/servers/components/waf/update.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"net/http"
 )
 
@@ -64,16 +65,19 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	this.Data["firewallPolicy"] = maps.Map{
-		"id":               firewallPolicy.Id,
-		"name":             firewallPolicy.Name,
-		"description":      firewallPolicy.Description,
-		"isOn":             firewallPolicy.IsOn,
-		"mode":             firewallPolicy.Mode,
-		"blockOptions":     firewallPolicy.BlockOptions,
-		"captchaOptions":   firewallPolicy.CaptchaOptions,
-		"useLocalFirewall": firewallPolicy.UseLocalFirewall,
-		"synFloodConfig":   firewallPolicy.SYNFlood,
-		"log":              firewallPolicy.Log,
+		"id":                 firewallPolicy.Id,
+		"name":               firewallPolicy.Name,
+		"description":        firewallPolicy.Description,
+		"isOn":               firewallPolicy.IsOn,
+		"mode":               firewallPolicy.Mode,
+		"blockOptions":       firewallPolicy.BlockOptions,
+		"captchaOptions":     firewallPolicy.CaptchaOptions,
+		"useLocalFirewall":   firewallPolicy.UseLocalFirewall,
+		"synFloodConfig":     firewallPolicy.SYNFlood,
+		"log":                firewallPolicy.Log,
+		"maxRequestBodySize": types.String(firewallPolicy.MaxRequestBodySize),
+		"denyCountryHTML":    firewallPolicy.DenyCountryHTML,
+		"denyProvinceHTML":   firewallPolicy.DenyProvinceHTML,
 	}
 
 	// 预置分组
@@ -110,6 +114,9 @@ func (this *UpdateAction) RunPost(params struct {
 	UseLocalFirewall   bool
 	SynFloodJSON       []byte
 	LogJSON            []byte
+	MaxRequestBodySize int64
+	DenyCountryHTML    string
+	DenyProvinceHTML   string
 
 	Must *actions.Must
 }) {
@@ -134,6 +141,11 @@ func (this *UpdateAction) RunPost(params struct {
 		this.Fail("验证码动作参数校验失败：" + err.Error())
 	}
 
+	// 最大内容尺寸
+	if params.MaxRequestBodySize < 0 {
+		params.MaxRequestBodySize = 0
+	}
+
 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallPolicy(this.AdminContext(), &pb.UpdateHTTPFirewallPolicyRequest{
 		HttpFirewallPolicyId: params.FirewallPolicyId,
 		IsOn:                 params.IsOn,
@@ -146,6 +158,9 @@ func (this *UpdateAction) RunPost(params struct {
 		UseLocalFirewall:     params.UseLocalFirewall,
 		SynFloodJSON:         params.SynFloodJSON,
 		LogJSON:              params.LogJSON,
+		MaxRequestBodySize:   params.MaxRequestBodySize,
+		DenyCountryHTML:      params.DenyCountryHTML,
+		DenyProvinceHTML:     params.DenyProvinceHTML,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -347,7 +347,7 @@ func (this *CreateAction) RunPost(params struct {
 		var rootJSON []byte
 		var err error
 		if len(params.WebRoot) > 0 {
-			var rootConfig = &serverconfigs.HTTPRootConfig{}
+			var rootConfig = serverconfigs.NewHTTPRootConfig()
 			rootConfig.IsOn = true
 			rootConfig.Dir = params.WebRoot
 			rootConfig.Indexes = []string{"index.html", "index.htm"}
@@ -564,9 +564,11 @@ func (this *CreateAction) RunPost(params struct {
 			var remoteAddrConfig = &serverconfigs.HTTPRemoteAddrConfig{
 				IsOn:  true,
 				Value: "${rawRemoteAddr}",
+				Type:  serverconfigs.HTTPRemoteAddrTypeDefault,
 			}
 			if params.RemoteAddrIsOn {
 				remoteAddrConfig.Value = "${remoteAddr}"
+				remoteAddrConfig.Type = serverconfigs.HTTPRemoteAddrTypeProxy
 			}
 			remoteAddrConfigJSON, err := json.Marshal(remoteAddrConfig)
 			if err != nil {

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

@@ -42,7 +42,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["reverseProxyRef"] = reverseProxyRef
 
-	var reverseProxy = &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -34,7 +34,7 @@ func (this *SchedulingAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	reverseProxy := serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -1,6 +1,7 @@
 package httpReverseProxy
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils"
@@ -35,14 +36,14 @@ func (this *SettingAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+	var reverseProxyRef = &serverconfigs.ReverseProxyRef{}
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyRefJSON, reverseProxyRef)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)
@@ -66,14 +67,14 @@ func (this *SettingAction) RunPost(params struct {
 
 	// TODO 校验配置
 
-	var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{}
+	var reverseProxyConfig = serverconfigs.NewReverseProxyConfig()
 	err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	err = reverseProxyConfig.Init(nil)
+	err = reverseProxyConfig.Init(context.TODO())
 	if err != nil {
 		this.Fail("配置校验失败：" + err.Error())
 	}
@@ -109,6 +110,7 @@ func (this *SettingAction) RunPost(params struct {
 		AddHeaders:        reverseProxyConfig.AddHeaders,
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
+		Retry50X:          reverseProxyConfig.Retry50X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -10,6 +10,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"regexp"
 	"strings"
 )
 
@@ -54,9 +55,29 @@ func (this *IndexAction) RunPost(params struct {
 	err := json.Unmarshal(params.RemoteAddrJSON, remoteAddrConfig)
 	if err != nil {
 		this.Fail("参数校验失败：" + err.Error())
+		return
 	}
 
 	remoteAddrConfig.Value = strings.TrimSpace(remoteAddrConfig.Value)
+
+	switch remoteAddrConfig.Type {
+	case serverconfigs.HTTPRemoteAddrTypeRequestHeader:
+		if len(remoteAddrConfig.RequestHeaderName) == 0 {
+			this.FailField("requestHeaderName", "请输入请求报头")
+			return
+		}
+		if !regexp.MustCompile(`^[\w-_,]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
+			this.FailField("requestHeaderName", "请求报头中只能含有数字、英文字母、下划线、中划线")
+			return
+		}
+		remoteAddrConfig.Value = "${header." + remoteAddrConfig.RequestHeaderName + "}"
+	case serverconfigs.HTTPRemoteAddrTypeVariable:
+		if len(remoteAddrConfig.Value) == 0 {
+			this.FailField("value", "请输入自定义变量")
+			return
+		}
+	}
+
 	err = remoteAddrConfig.Init()
 	if err != nil {
 		this.Fail("配置校验失败：" + err.Error())

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

@@ -42,7 +42,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["reverseProxyRef"] = reverseProxyRef
 
-	var reverseProxy = &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -34,7 +34,7 @@ func (this *SchedulingAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)
@@ -42,8 +42,8 @@ func (this *SchedulingAction) RunGet(params struct {
 	}
 	this.Data["reverseProxyId"] = reverseProxy.Id
 
-	schedulingCode := reverseProxy.FindSchedulingConfig().Code
-	schedulingMap := schedulingconfigs.FindSchedulingType(schedulingCode)
+	var schedulingCode = reverseProxy.FindSchedulingConfig().Code
+	var schedulingMap = schedulingconfigs.FindSchedulingType(schedulingCode)
 	if schedulingMap == nil {
 		this.ErrorPage(errors.New("invalid scheduling code '" + schedulingCode + "'"))
 		return

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

@@ -1,6 +1,7 @@
 package tcpReverseProxy
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils"
@@ -35,14 +36,14 @@ func (this *SettingAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+	var reverseProxyRef = &serverconfigs.ReverseProxyRef{}
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyRefJSON, reverseProxyRef)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)
@@ -66,14 +67,14 @@ func (this *SettingAction) RunPost(params struct {
 
 	// TODO 校验配置
 
-	var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{}
+	var reverseProxyConfig = serverconfigs.NewReverseProxyConfig()
 	err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	err = reverseProxyConfig.Init(nil)
+	err = reverseProxyConfig.Init(context.TODO())
 	if err != nil {
 		this.Fail("配置校验失败：" + err.Error())
 	}
@@ -109,6 +110,7 @@ func (this *SettingAction) RunPost(params struct {
 		AddHeaders:        reverseProxyConfig.AddHeaders,
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
+		Retry50X:          reverseProxyConfig.Retry50X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -42,7 +42,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["reverseProxyRef"] = reverseProxyRef
 
-	var reverseProxy = &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -34,7 +34,7 @@ func (this *SchedulingAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -1,6 +1,7 @@
 package udpReverseProxy
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils"
@@ -42,7 +43,7 @@ func (this *SettingAction) RunGet(params struct {
 		return
 	}
 
-	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxy = serverconfigs.NewReverseProxyConfig()
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
 	if err != nil {
 		this.ErrorPage(err)
@@ -66,14 +67,14 @@ func (this *SettingAction) RunPost(params struct {
 
 	// TODO 校验配置
 
-	reverseProxyConfig := &serverconfigs.ReverseProxyConfig{}
+	var reverseProxyConfig = serverconfigs.NewReverseProxyConfig()
 	err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	err = reverseProxyConfig.Init(nil)
+	err = reverseProxyConfig.Init(context.TODO())
 	if err != nil {
 		this.Fail("配置校验失败：" + err.Error())
 	}

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

@@ -102,6 +102,10 @@ func (this *IndexAction) RunPost(params struct {
 			RequestSameOrigin:    websocketConfig.RequestSameOrigin,
 			RequestOrigin:        websocketConfig.RequestOrigin,
 		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 	}
 
 	websocketRef.WebsocketId = websocketConfig.Id

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

@@ -4,10 +4,10 @@ package ipbox
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strings"
 	"time"
 )
 
@@ -25,24 +25,15 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["ip"] = params.Ip
 
 	// IP信息
-	regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: params.Ip})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
+
 
 	this.Data["regions"] = ""
 	this.Data["isp"] = ""
-	if regionResp.IpRegion != nil {
-		var regionName = regionResp.IpRegion.Summary
 
-		// remove isp from regionName
-		var index = strings.LastIndex(regionName, "|")
-		if index > 0 {
-			regionName = regionName[:index]
-		}
-		this.Data["regions"] = regionName
-		this.Data["isp"] = regionResp.IpRegion.Isp
+	var ipRegion = iplibrary.LookupIP(params.Ip)
+	if ipRegion != nil && ipRegion.IsOk() {
+		this.Data["regions"] = ipRegion.RegionSummary()
+		this.Data["isp"] = ipRegion.ProviderName()
 	}
 
 	// IP列表

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

@@ -31,7 +31,7 @@ func (this *ExportDataAction) RunGet(params struct {
 	defer this.CreateLogInfo(codes.IPList_LogExportIPList, params.ListId)
 
 	var err error
-	var ext = ""
+	var ext string
 	var jsonMaps = []maps.Map{}
 	var xlsxFile *xlsx.File
 	var xlsxSheet *xlsx.Sheet
@@ -146,5 +146,5 @@ func (this *ExportDataAction) RunGet(params struct {
 
 	this.AddHeader("Content-Disposition", "attachment; filename=\"ip-list-"+numberutils.FormatInt64(params.ListId)+ext+"\";")
 	this.AddHeader("Content-Length", strconv.Itoa(len(data)))
-	this.Write(data)
+	_, _ = this.Write(data)
 }

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

@@ -4,11 +4,11 @@ package iplists
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strings"
 	"time"
 )
 
@@ -162,22 +162,10 @@ func (this *IndexAction) RunGet(params struct {
 		var region = ""
 		var isp = ""
 		if len(item.IpFrom) > 0 && len(item.IpTo) == 0 {
-			regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: item.IpFrom})
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			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
+			var ipRegion = iplibrary.LookupIP(item.IpFrom)
+			if ipRegion != nil && ipRegion.IsOk() {
+				region = ipRegion.RegionSummary()
+				isp = ipRegion.ProviderName()
 			}
 		}
 

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

@@ -4,11 +4,11 @@ package iplists
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strings"
 	"time"
 )
 
@@ -109,22 +109,10 @@ func (this *ItemsAction) RunGet(params struct {
 		var region = ""
 		var isp = ""
 		if len(item.IpFrom) > 0 && len(item.IpTo) == 0 {
-			regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: item.IpFrom})
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			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
+			var ipRegion = iplibrary.LookupIP(item.IpFrom)
+			if ipRegion != nil && ipRegion.IsOk() {
+				region = ipRegion.RegionSummary()
+				isp = ipRegion.ProviderName()
 			}
 		}
 

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

@@ -5,6 +5,7 @@ package logs
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
@@ -169,20 +170,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// 根据IP查询区域
-	var regionMap = map[string]string{} // ip => region
-	if len(ipList) > 0 {
-		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if resp.IpRegionMap != nil {
-			for ip, region := range resp.IpRegionMap {
-				regionMap[ip] = region.Summary
-			}
-		}
-	}
-	this.Data["regions"] = regionMap
+	this.Data["regions"] = iplibrary.LookupIPSummaries(ipList)
 
 	// WAF相关
 	var wafInfos = map[int64]maps.Map{}                          // set id => WAF Map

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

@@ -1,4 +1,4 @@
-package delete
+package deletes
 
 import (	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"

internal/web/actions/default/servers/server/delete/init.go

@@ -1,4 +1,4 @@
-package delete
+package deletes
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"

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

@@ -1,6 +1,7 @@
 package log
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
@@ -160,20 +161,7 @@ func (this *HistoryAction) RunGet(params struct {
 	}
 
 	// 根据IP查询区域
-	var regionMap = map[string]string{} // ip => region
-	if len(ipList) > 0 {
-		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if resp.IpRegionMap != nil {
-			for ip, region := range resp.IpRegionMap {
-				regionMap[ip] = region.Summary
-			}
-		}
-	}
-	this.Data["regions"] = regionMap
+	this.Data["regions"] = iplibrary.LookupIPSummaries(ipList)
 
 	// WAF相关
 	var wafInfos = map[int64]maps.Map{}                          // set id => WAF Map

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

@@ -1,6 +1,7 @@
 package log
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/lists"
@@ -129,20 +130,7 @@ func (this *IndexAction) RunPost(params struct {
 	this.Data["hasMore"] = accessLogsResp.HasMore
 
 	// 根据IP查询区域
-	var regionMap = map[string]string{} // ip => region
-	if len(ipList) > 0 {
-		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if resp.IpRegionMap != nil {
-			for ip, region := range resp.IpRegionMap {
-				regionMap[ip] = region.Summary
-			}
-		}
-	}
-	this.Data["regions"] = regionMap
+	this.Data["regions"] = iplibrary.LookupIPSummaries(ipList)
 
 	// WAF相关
 	var wafInfos = map[int64]maps.Map{}                          // set id => WAF Map

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

@@ -1,6 +1,7 @@
 package log
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
@@ -141,20 +142,7 @@ func (this *TodayAction) RunGet(params struct {
 	}
 
 	// 根据IP查询区域
-	var regionMap = map[string]string{} // ip => region
-	if len(ipList) > 0 {
-		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		if resp.IpRegionMap != nil {
-			for ip, region := range resp.IpRegionMap {
-				regionMap[ip] = region.Summary
-			}
-		}
-	}
-	this.Data["regions"] = regionMap
+	this.Data["regions"] = iplibrary.LookupIPSummaries(ipList)
 
 	// WAF相关
 	var wafInfos = map[int64]maps.Map{}                          // set id => WAF Map

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

@@ -2,6 +2,7 @@ package log
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	"net/http"
@@ -86,24 +87,11 @@ func (this *ViewPopupAction) RunGet(params struct {
 
 	// 地域相关
 	var regionMap maps.Map = nil
-	regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: accessLog.RemoteAddr})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	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]
-		}
-
+	var ipRegion = iplibrary.LookupIP(accessLog.RemoteAddr)
+	if ipRegion != nil && ipRegion.IsOk() {
 		regionMap = maps.Map{
-			"full": regionName,
-			"isp":  region.Isp,
+			"full": ipRegion.RegionSummary(),
+			"isp":  ipRegion.ProviderName(),
 		}
 	}
 	this.Data["region"] = regionMap

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

@@ -2,11 +2,13 @@ package cache
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
@@ -51,10 +53,20 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	if cachePolicy != nil {
+		var maxBytes = &shared.SizeCapacity{}
+		if !utils.JSONIsNull(cachePolicy.MaxBytesJSON) {
+			err = json.Unmarshal(cachePolicy.MaxBytesJSON, maxBytes)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
 		this.Data["cachePolicy"] = maps.Map{
-			"id":   cachePolicy.Id,
-			"name": cachePolicy.Name,
-			"isOn": cachePolicy.IsOn,
+			"id":       cachePolicy.Id,
+			"name":     cachePolicy.Name,
+			"isOn":     cachePolicy.IsOn,
+			"maxBytes": maxBytes,
 		}
 	} else {
 		this.Data["cachePolicy"] = nil
@@ -73,7 +85,7 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLogInfo(codes.ServerCache_LogUpdateCacheSettings, params.WebId)
 
 	// 校验配置
-	cacheConfig := &serverconfigs.HTTPCacheConfig{}
+	var cacheConfig = &serverconfigs.HTTPCacheConfig{}
 	err := json.Unmarshal(params.CacheJSON, cacheConfig)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
@@ -53,7 +54,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		_ = httpsConfig.Init(nil)
+		_ = httpsConfig.Init(context.TODO())
 		for _, port := range httpsConfig.AllPorts() {
 			if lists.ContainsInt(httpPorts, port) {
 				conflictingPorts = append(conflictingPorts, port)

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

@@ -1,6 +1,7 @@
 package https
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
@@ -43,7 +44,7 @@ func (this *IndexAction) RunGet(params struct {
 		httpsConfig.IsOn = true
 	}
 
-	_ = httpsConfig.Init(nil)
+	_ = httpsConfig.Init(context.TODO())
 	var httpsPorts = httpsConfig.AllPorts()
 
 	// 检查http和https端口冲突

internal/web/actions/default/servers/server/settings/https/requestCertPopup.go

@@ -32,18 +32,18 @@ func (this *RequestCertPopupAction) RunGet(params struct {
 		return
 	}
 
-	serverNameConfigs := []*serverconfigs.ServerNameConfig{}
+	var serverNameConfigs = []*serverconfigs.ServerNameConfig{}
 	err = json.Unmarshal(serverNamesResp.ServerNamesJSON, &serverNameConfigs)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	excludeServerNames := []string{}
+	var excludeServerNames = []string{}
 	if len(params.ExcludeServerNames) > 0 {
 		excludeServerNames = strings.Split(params.ExcludeServerNames, ",")
 	}
-	serverNames := []string{}
+	var serverNames = []string{}
 	for _, c := range serverNameConfigs {
 		if len(c.SubNames) == 0 {
 			if domainutils.ValidateDomainFormat(c.Name) && !lists.ContainsString(excludeServerNames, c.Name) {
@@ -64,7 +64,12 @@ func (this *RequestCertPopupAction) RunGet(params struct {
 		AdminId: this.AdminId(),
 		UserId:  0,
 	})
-	userMaps := []maps.Map{}
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var userMaps = []maps.Map{}
 	for _, user := range acmeUsersResp.AcmeUsers {
 		description := user.Description
 		if len(description) > 0 {

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

@@ -2,11 +2,13 @@ package cache
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -38,10 +40,20 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	if cachePolicy != nil {
+		var maxBytes = &shared.SizeCapacity{}
+		if !utils.JSONIsNull(cachePolicy.MaxBytesJSON) {
+			err = json.Unmarshal(cachePolicy.MaxBytesJSON, maxBytes)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
 		this.Data["cachePolicy"] = maps.Map{
-			"id":   cachePolicy.Id,
-			"name": cachePolicy.Name,
-			"isOn": cachePolicy.IsOn,
+			"id":       cachePolicy.Id,
+			"name":     cachePolicy.Name,
+			"isOn":     cachePolicy.IsOn,
+			"maxBytes": maxBytes,
 		}
 	} else {
 		this.Data["cachePolicy"] = nil