阶段性提交

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

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 )
 

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

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 )

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

@@ -2,7 +2,7 @@ package node
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"

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

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"

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

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs/nodes"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"time"
 )
 
@@ -16,15 +17,19 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "node", "")
+	this.Nav("", "node", "index")
 	this.SecondMenu("nodes")
 }
 
 func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
+	ClusterId      int64
+	InstalledState int
 }) {
+	this.Data["installState"] = params.InstalledState
+
 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		ClusterId: params.ClusterId,
+		ClusterId:    params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -35,9 +40,10 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{
-		Offset:    page.Offset,
-		Size:      page.Size,
-		ClusterId: params.ClusterId,
+		Offset:       page.Offset,
+		Size:         page.Size,
+		ClusterId:    params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
 	})
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
@@ -71,6 +77,12 @@ func (this *IndexAction) RunGet(params struct {
 			"id":          node.Id,
 			"name":        node.Name,
 			"isInstalled": node.IsInstalled,
+			"installStatus": maps.Map{
+				"isRunning":  node.InstallStatus.IsRunning,
+				"isFinished": node.InstallStatus.IsFinished,
+				"isOk":       node.InstallStatus.IsOk,
+				"error":      node.InstallStatus.Error,
+			},
 			"status": maps.Map{
 				"isActive":     status.IsActive,
 				"updatedAt":    status.UpdatedAt,

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

@@ -21,6 +21,7 @@ func init() {
 			GetPost("/node/update", new(node.UpdateAction)).
 			GetPost("/node/install", new(node.InstallAction)).
 			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).
+			Post("/node/status", new(node.StatusAction)).
 			EndAll()
 	})
 }

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

@@ -2,18 +2,19 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
+// 创建节点
 type CreateAction struct {
 	actionutils.ParentAction
 }
 
 func (this *CreateAction) Init() {
-	this.Nav("", "node", "")
+	this.Nav("", "node", "create")
 	this.SecondMenu("nodes")
 }
 

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

@@ -1,11 +1,14 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"strings"
 )
 
+// 安装节点
 type InstallAction struct {
 	actionutils.ParentAction
 }
@@ -32,6 +35,19 @@ func (this *InstallAction) RunGet(params struct {
 		return
 	}
 
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
 	// 集群
 	var clusterMap maps.Map = nil
 	if node.Cluster != nil {
@@ -51,6 +67,19 @@ func (this *InstallAction) RunGet(params struct {
 		}
 	}
 
+	// API节点列表
+	apiNodesResp, err := this.RPC().APINodeRPC().FindAllEnabledAPINodes(this.AdminContext(), &pb.FindAllEnabledAPINodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	apiNodes := apiNodesResp.Nodes
+	apiEndpoints := []string{}
+	for _, apiNode := range apiNodes {
+		apiEndpoints = append(apiEndpoints, apiNode.Address)
+	}
+	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
+
 	this.Data["node"] = maps.Map{
 		"id":          node.Id,
 		"name":        node.Name,
@@ -63,3 +92,20 @@ func (this *InstallAction) RunGet(params struct {
 
 	this.Show()
 }
+
+// 开始安装
+func (this *InstallAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+}) {
+	_, err := this.RPC().NodeRPC().InstallNode(this.AdminContext(), &pb.InstallNodeRequest{
+		NodeId: params.NodeId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -2,7 +2,7 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/maps"

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

@@ -0,0 +1,45 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// 节点状态
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	// 节点
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
+	this.Data["isInstalled"] = node.IsInstalled
+
+	this.Success()
+}

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

@@ -2,7 +2,7 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

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

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )
 

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

@@ -1,7 +1,7 @@
 package settings
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

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

@@ -2,7 +2,7 @@ package clusters
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"

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

@@ -1,7 +1,7 @@
 package clusters
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 )

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

@@ -1,7 +1,7 @@
 package clusters
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/maps"
 )

internal/web/actions/default/common/changedClusters.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/maps"
 )

internal/web/actions/default/common/syncClusters.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )
 

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

@@ -0,0 +1,24 @@
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
+	"net/http"
+)
+
+type Helper struct {
+}
+
+func (this *Helper) BeforeAction(action *actions.ActionObject) {
+	if action.Request.Method != http.MethodGet {
+		return
+	}
+
+	action.Data["teaMenu"] = "db"
+
+	selectedTabbar, _ := action.Data["mainTab"]
+
+	tabbar := actionutils.NewTabbar()
+	tabbar.Add("数据库节点", "", "/db", "", selectedTabbar == "db")
+	actionutils.SetTabbar(action, tabbar)
+}

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

@@ -0,0 +1,15 @@
+package db
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("db", "db", "")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	this.Show()
+}

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

@@ -0,0 +1,18 @@
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(new(helpers.UserMustAuth)).
+			Helper(new(Helper)).
+			Prefix("/db").
+			Get("", new(IndexAction)).
+
+			EndAll()
+	})
+}

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

@@ -0,0 +1,24 @@
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
+	"net/http"
+)
+
+type Helper struct {
+}
+
+func (this *Helper) BeforeAction(action *actions.ActionObject) {
+	if action.Request.Method != http.MethodGet {
+		return
+	}
+
+	action.Data["teaMenu"] = "dns"
+
+	selectedTabbar, _ := action.Data["mainTab"]
+
+	tabbar := actionutils.NewTabbar()
+	tabbar.Add("DNS", "", "/dns", "", selectedTabbar == "dns")
+	actionutils.SetTabbar(action, tabbar)
+}

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

@@ -0,0 +1,15 @@
+package dns
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("dns", "dns", "")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	this.Show()
+}

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

@@ -0,0 +1,18 @@
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(new(helpers.UserMustAuth)).
+			Helper(new(Helper)).
+			Prefix("/dns").
+			Get("", new(IndexAction)).
+
+			EndAll()
+	})
+}

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

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"

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

@@ -0,0 +1,24 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
+	"net/http"
+)
+
+type Helper struct {
+}
+
+func (this *Helper) BeforeAction(action *actions.ActionObject) {
+	if action.Request.Method != http.MethodGet {
+		return
+	}
+
+	action.Data["teaMenu"] = "log"
+
+	selectedTabbar, _ := action.Data["mainTab"]
+
+	tabbar := actionutils.NewTabbar()
+	tabbar.Add("日志节点", "", "/log", "", selectedTabbar == "log")
+	actionutils.SetTabbar(action, tabbar)
+}

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

@@ -0,0 +1,15 @@
+package log
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("log", "log", "")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	this.Show()
+}

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

@@ -0,0 +1,18 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(new(helpers.UserMustAuth)).
+			Helper(new(Helper)).
+			Prefix("/log").
+			Get("", new(IndexAction)).
+
+			EndAll()
+	})
+}

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

@@ -1,7 +1,7 @@
 package nodes
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )
 

internal/web/actions/default/nodes/grants/create.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/nodes/grants/createPopup.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/nodes/grants/delete.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )
 

internal/web/actions/default/nodes/grants/grant.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/maps"

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

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/maps"

internal/web/actions/default/nodes/grants/selectPopup.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/nodes/grants/update.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/nodes/grants/updatePopup.go

@@ -1,7 +1,7 @@
 package grants
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/nodes/ipAddresses/createPopup.go

@@ -1,7 +1,7 @@
 package ipAddresses
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"

internal/web/actions/default/nodes/ipAddresses/updatePopup.go

@@ -1,7 +1,7 @@
 package ipAddresses
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"

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

@@ -1,10 +1,10 @@
 package servers
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/rands"
 	"regexp"
 	"strings"
 )
@@ -43,8 +43,22 @@ func (this *AddOriginPopupAction) RunPost(params struct {
 	host := addr[:portIndex]
 	port := addr[portIndex+1:]
 
+	resp, err := this.RPC().OriginServerRPC().CreateOriginServer(this.AdminContext(), &pb.CreateOriginServerRequest{
+		Name: "",
+		Addr: &pb.NetworkAddress{
+			Protocol:  params.Protocol,
+			Host:      host,
+			PortRange: port,
+		},
+		Description: "",
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	origin := &serverconfigs.OriginServerConfig{
-		Id:   rands.HexString(32),
+		Id:   resp.OriginId,
 		IsOn: true,
 		Addr: &serverconfigs.NetworkAddressConfig{
 			Protocol:  params.Protocol,

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

@@ -2,7 +2,7 @@ package servers
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"regexp"
@@ -20,7 +20,7 @@ func (this *AddPortPopupAction) Init() {
 func (this *AddPortPopupAction) RunGet(params struct {
 	ServerType string
 }) {
-	this.Data["protocols"] = serverutils.AllServerProtocolsForType(params.ServerType)
+	this.Data["protocols"] = serverconfigs.AllServerProtocolsForType(params.ServerType)
 
 	this.Show()
 }

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

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

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

@@ -0,0 +1,18 @@
+package cache
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package cache
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
+			Prefix("/servers/components/cache").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/servers/components/componentutils/component_helper.go

@@ -0,0 +1,94 @@
+package componentutils
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+	"net/http"
+)
+
+type ComponentHelper struct {
+}
+
+func NewComponentHelper() *ComponentHelper {
+	return &ComponentHelper{}
+}
+
+func (this *ComponentHelper) BeforeAction(action *actions.ActionObject) {
+	if action.Request.Method != http.MethodGet {
+		return
+	}
+	action.Data["teaMenu"] = "server"
+	action.Data["mainTab"] = "component"
+
+	// 顶部标签栏
+	selectedTabbar := action.Data.GetString("mainTab")
+	tabbar := actionutils.NewTabbar()
+	tabbar.Add("服务", "", "/servers", "", selectedTabbar == "server")
+	tabbar.Add("组件", "", "/servers/components", "", selectedTabbar == "component")
+	actionutils.SetTabbar(action, tabbar)
+
+	// 创建左侧菜单
+	secondMenuItem := action.Data.GetString("secondMenuItem")
+	action.Data["leftMenuItems"] = this.createLeftMenus(secondMenuItem)
+}
+
+func (this *ComponentHelper) createLeftMenus(secondMenuItem string) (items []maps.Map) {
+	items = append(items, maps.Map{
+		"name":     "通用设置",
+		"url":      "/servers/components",
+		"isActive": secondMenuItem == "global",
+	})
+	items = append(items, maps.Map{
+		"name":     "分组设置",
+		"url":      "/servers/components/group",
+		"isActive": secondMenuItem == "group",
+	})
+	items = append(items, maps.Map{
+		"name":     "缓存策略",
+		"url":      "/servers/components/cache",
+		"isActive": secondMenuItem == "cache",
+	})
+	items = append(items, maps.Map{
+		"name":     "WAF策略",
+		"url":      "/servers/components/waf",
+		"isActive": secondMenuItem == "waf",
+	})
+	items = append(items, maps.Map{
+		"name":     "日志策略",
+		"url":      "/servers/components/log",
+		"isActive": secondMenuItem == "log",
+	})
+	items = append(items, maps.Map{
+		"name":     "SSL证书管理",
+		"url":      "/servers/components/ssl",
+		"isActive": secondMenuItem == "ssl",
+	})
+	/**items = append(items, maps.Map{
+		"name":     "Gzip规则",
+		"url":      "/servers/components/gzip",
+		"isActive": secondMenuItem == "gzip",
+	})
+	items = append(items, maps.Map{
+		"name":   "路径规则",
+		"url":    "/servers/components/location",
+		"isActive": secondMenuItem == "location",
+	})
+	items = append(items, maps.Map{
+		"name":   "重写规则",
+		"url":    "/servers/components/rewrite",
+		"isActive": secondMenuItem == "write",
+	})
+	items = append(items, maps.Map{
+		"name":   "源站",
+		"url":    "/servers/components/origin",
+		"isActive": secondMenuItem == "origin",
+	})
+	items = append(items, maps.Map{
+		"name":     "变量",
+		"url":      "/servers/components/variable",
+		"isActive": secondMenuItem == "variable",
+	})**/
+
+	return
+}

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

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

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

@@ -0,0 +1,18 @@
+package group
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+
+	this.Show()
+}

internal/web/actions/default/servers/components/group/init.go

@@ -0,0 +1,19 @@
+package group
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
+			Prefix("/servers/components/group").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -10,6 +10,7 @@ type IndexAction struct {
 
 func (this *IndexAction) Init() {
 	this.Nav("", "component", "index")
+	this.SecondMenu("global")
 }
 
 func (this *IndexAction) RunGet(params struct{}) {

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

@@ -1,6 +1,7 @@
 package components
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -10,6 +11,7 @@ func init() {
 		server.
 			Helper(helpers.NewUserMustAuth()).
 			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
 			Prefix("/servers/components").
 			Get("", new(IndexAction)).
 			EndAll()

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

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

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

@@ -0,0 +1,18 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
+			Prefix("/servers/components/log").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

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

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

@@ -0,0 +1,18 @@
+package ssl
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+
+	this.Show()
+}

internal/web/actions/default/servers/components/ssl/init.go

@@ -0,0 +1,19 @@
+package ssl
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
+			Prefix("/servers/components/ssl").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

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

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

@@ -0,0 +1,18 @@
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(componentutils.NewComponentHelper()).
+			Prefix("/servers/components/waf").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -2,10 +2,9 @@ package servers
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/configs/serverconfigs"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -38,7 +37,7 @@ func (this *CreateAction) RunGet(params struct{}) {
 	this.Data["clusters"] = clusterMaps
 
 	// 服务类型
-	this.Data["serverTypes"] = serverutils.AllServerTypes()
+	this.Data["serverTypes"] = serverconfigs.AllServerTypes()
 
 	this.Show()
 }
@@ -75,7 +74,7 @@ func (this *CreateAction) RunPost(params struct {
 
 	// 端口地址
 	switch params.ServerType {
-	case serverutils.ServerTypeHTTPProxy, serverutils.ServerTypeHTTPWeb:
+	case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeHTTPWeb:
 		listen := []*serverconfigs.NetworkAddressConfig{}
 		err := json.Unmarshal([]byte(params.Addresses), &listen)
 		if err != nil {
@@ -104,7 +103,7 @@ func (this *CreateAction) RunPost(params struct {
 				serverConfig.HTTPS.AddListen(addr)
 			}
 		}
-	case serverutils.ServerTypeTCPProxy:
+	case serverconfigs.ServerTypeTCPProxy:
 		listen := []*serverconfigs.NetworkAddressConfig{}
 		err := json.Unmarshal([]byte(params.Addresses), &listen)
 		if err != nil {
@@ -149,7 +148,7 @@ func (this *CreateAction) RunPost(params struct {
 
 	// 源站地址
 	switch params.ServerType {
-	case serverutils.ServerTypeHTTPProxy, serverutils.ServerTypeTCPProxy:
+	case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeTCPProxy:
 		origins := []*serverconfigs.OriginServerConfig{}
 		err = json.Unmarshal([]byte(params.Origins), &origins)
 		if err != nil {
@@ -163,7 +162,7 @@ func (this *CreateAction) RunPost(params struct {
 
 	// Web地址
 	switch params.ServerType {
-	case serverutils.ServerTypeHTTPWeb:
+	case serverconfigs.ServerTypeHTTPWeb:
 		serverConfig.Web = &serverconfigs.WebConfig{
 			IsOn: true,
 			Root: params.WebRoot,
@@ -201,6 +200,9 @@ func (this *CreateAction) RunPost(params struct {
 	_, err = this.RPC().ServerRPC().CreateServer(this.AdminContext(), &pb.CreateServerRequest{
 		UserId:           0,
 		AdminId:          this.AdminId(),
+		Type:             params.ServerType,
+		Name:             params.Name,
+		Description:      params.Description,
 		ClusterId:        params.ClusterId,
 		Config:           serverConfigJSON,
 		IncludeNodesJSON: includeNodesJSON,

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

@@ -2,9 +2,9 @@ package servers
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/configs/serverconfigs"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	"strings"
@@ -112,7 +112,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 
 		serverMaps = append(serverMaps, maps.Map{
 			"id":   server.Id,
-			"name": serverConfig.Name,
+			"name": server.Name,
 			"cluster": maps.Map{
 				"id":   server.Cluster.Id,
 				"name": server.Cluster.Name,

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

@@ -1,6 +1,10 @@
 package delete
 
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
+)
 
 type IndexAction struct {
 	actionutils.ParentAction
@@ -14,3 +18,16 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct{}) {
 	this.Show()
 }
+
+func (this *IndexAction) RunPost(params struct {
+	ServerId int64
+	Must     *actions.Must
+}) {
+	_, err := this.RPC().ServerRPC().DisableServer(this.AdminContext(), &pb.DisableServerRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -12,7 +12,7 @@ func init() {
 			Helper(helpers.NewUserMustAuth()).
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/delete").
-			Get("", new(IndexAction)).
+			GetPost("", new(IndexAction)).
 			EndAll()
 	})
 }

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

@@ -1,7 +1,15 @@
 package settings
 
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
 
+// 服务基本信息设置
 type IndexAction struct {
 	actionutils.ParentAction
 }
@@ -11,6 +19,91 @@ func (this *IndexAction) Init() {
 	this.SecondMenu("basic")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+}) {
+	// 所有集群
+	resp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClusters(this.AdminContext(), &pb.FindAllEnabledNodeClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	clusterMaps := []maps.Map{}
+	for _, cluster := range resp.Clusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
+	// 当前服务信息
+	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	server := serverResp.Server
+	if server == nil {
+		this.NotFound("Server", params.ServerId)
+		return
+	}
+
+	clusterId := int64(0)
+	if server.Cluster != nil {
+		clusterId = server.Cluster.Id
+	}
+
+	this.Data["server"] = maps.Map{
+		"id":          server.Id,
+		"clusterId":   clusterId,
+		"type":        server.Type,
+		"name":        server.Name,
+		"description": server.Description,
+	}
+
+	serverType := serverconfigs.FindServerType(server.Type)
+	if serverType == nil {
+		this.ErrorPage(errors.New("invalid server type '" + server.Type + "'"))
+		return
+	}
+
+	typeName := serverType.GetString("name")
+	this.Data["typeName"] = typeName
+
 	this.Show()
 }
+
+// 保存
+func (this *IndexAction) RunPost(params struct {
+	ServerId    int64
+	Name        string
+	Description string
+	ClusterId   int64
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入服务名称")
+
+	if params.ClusterId <= 0 {
+		this.Fail("请选择部署的集群")
+	}
+
+	_, err := this.RPC().ServerRPC().UpdateServerBasic(this.AdminContext(), &pb.UpdateServerBasicRequest{
+		ServerId:    params.ServerId,
+		Name:        params.Name,
+		Description: params.Description,
+		ClusterId:   params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -12,7 +12,7 @@ func init() {
 			Helper(helpers.NewUserMustAuth()).
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/settings").
-			Get("", new(IndexAction)).
+			GetPost("", new(IndexAction)).
 			EndAll()
 	})
 }

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

@@ -1,9 +1,16 @@
 package tcp
 
 import (
+	"encoding/json"
+	"errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/actions"
 )
 
+// TCP设置
 type IndexAction struct {
 	actionutils.ParentAction
 }
@@ -16,7 +23,67 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ServerId int64
 }) {
-	// TODO
+	server, config, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
+	if !isOk {
+		return
+	}
+	if config.TCP == nil {
+		this.ErrorPage(errors.New("there is no tcp setting"))
+		return
+	}
+
+	if config.TCP.Listen == nil {
+		config.TCP.Listen = []*serverconfigs.NetworkAddressConfig{}
+	}
+
+	this.Data["serverType"] = server.Type
+	this.Data["addresses"] = config.TCP.Listen
 
 	this.Show()
 }
+
+func (this *IndexAction) RunPost(params struct {
+	ServerId   int64
+	ServerType string
+	Addresses  string
+
+	Must *actions.Must
+}) {
+	_, config, isOk := serverutils.FindServer(&this.ParentAction, params.ServerId)
+	if !isOk {
+		return
+	}
+
+	listen := []*serverconfigs.NetworkAddressConfig{}
+	err := json.Unmarshal([]byte(params.Addresses), &listen)
+	if err != nil {
+		this.Fail("端口地址解析失败：" + err.Error())
+	}
+
+	if config.IsHTTP() {
+		config.HTTP.Listen = listen
+	} else if config.IsTCP() {
+		config.TCP.Listen = listen
+	} else if config.IsUnix() {
+		config.Unix.Listen = listen
+	} else if config.IsUDP() {
+		config.UDP.Listen = listen
+	}
+
+	configData, err := config.AsJSON()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().ServerRPC().UpdateServerConfig(this.AdminContext(), &pb.UpdateServerConfigRequest{
+		ServerId: params.ServerId,
+		Config:   configData,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -12,7 +12,7 @@ func init() {
 			Helper(helpers.NewUserMustAuth()).
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/settings/tcp").
-			Get("", new(IndexAction)).
+			GetPost("", new(IndexAction)).
 			EndAll()
 	})
 }

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

@@ -3,10 +3,10 @@ package serverutils
 import (
 	"encoding/json"
 	"errors"
-	"github.com/TeaOSLab/EdgeAdmin/internal/configs/serverconfigs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
@@ -41,6 +41,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) {
 
 	serverId := action.ParamInt64("serverId")
 	serverIdString := strconv.FormatInt(serverId, 10)
+	action.Data["serverId"] = serverId
 
 	// 读取server信息
 	rpcClient, err := rpc.SharedRPC()
@@ -60,7 +61,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) {
 		return
 	}
 
-	// 源站管理
+	// 服务管理
 	serverConfig := &serverconfigs.ServerConfig{}
 	err = json.Unmarshal(server.Config, serverConfig)
 	if err != nil {
@@ -234,6 +235,11 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"url":      "/servers/server/settings/tcp?serverId=" + serverIdString,
 			"isActive": secondMenuItem == "tcp",
 		})
+		menuItems = append(menuItems, maps.Map{
+			"name":     "反向代理",
+			"url":      "/servers/server/settings/reverseProxy?serverId=" + serverIdString,
+			"isActive": secondMenuItem == "reverseProxy",
+		})
 	} else if serverConfig.IsUnix() {
 		menuItems = append(menuItems, maps.Map{
 			"name":     "Unix",

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

@@ -1,97 +1,30 @@
 package serverutils
 
 import (
-	"github.com/iwind/TeaGo/lists"
-	"github.com/iwind/TeaGo/maps"
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"strconv"
 )
 
-type ServerType = string
-
-const (
-	ServerTypeHTTPProxy ServerType = "httpProxy"
-	ServerTypeHTTPWeb   ServerType = "httpWeb"
-	ServerTypeTCPProxy  ServerType = "tcpProxy"
-	ServerTypeUnixProxy ServerType = "unixProxy"
-	ServerTypeUDPProxy  ServerType = "udp"
-)
-
-// 获取所有的服务类型
-func AllServerTypes() []maps.Map {
-	return []maps.Map{
-		{
-			"name": "HTTP反向代理",
-			"code": ServerTypeHTTPProxy,
-		},
-		{
-			"name": "HTTP Web服务",
-			"code": ServerTypeHTTPWeb,
-		},
-		{
-			"name": "TCP反向代理",
-			"code": ServerTypeTCPProxy,
-		},
-		/**{
-			"name": "UNIX协议反向代理",
-			"code": ServerTypeUnixProxy,
-		},
-		{
-			"name": "UDP反向代理",
-			"code": ServerTypeUDPProxy,
-		},**/
+// 查找Server
+func FindServer(p *actionutils.ParentAction, serverId int64) (*pb.Server, *serverconfigs.ServerConfig, bool) {
+	serverResp, err := p.RPC().ServerRPC().FindEnabledServer(p.AdminContext(), &pb.FindEnabledServerRequest{ServerId: serverId})
+	if err != nil {
+		p.ErrorPage(err)
+		return nil, nil, false
 	}
-}
-
-// 查找服务类型
-func FindServerType(code string) maps.Map {
-	for _, m := range AllServerTypes() {
-		if m.GetString("code") == code {
-			return m
-		}
-	}
-	return nil
-}
-
-// 获取所有协议
-func AllServerProtocolsForType(serverType ServerType) []maps.Map {
-	protocols := []maps.Map{
-		{
-			"name":        "HTTP",
-			"code":        "http",
-			"serverTypes": []ServerType{ServerTypeHTTPProxy, ServerTypeHTTPWeb},
-		},
-		{
-			"name":        "HTTPS",
-			"code":        "https",
-			"serverTypes": []ServerType{ServerTypeHTTPProxy, ServerTypeHTTPWeb},
-		},
-		{
-			"name":        "TCP",
-			"code":        "tcp",
-			"serverTypes": []ServerType{ServerTypeTCPProxy},
-		},
-		{
-			"name":        "TLS",
-			"code":        "tls",
-			"serverTypes": []ServerType{ServerTypeTCPProxy},
-		},
-		{
-			"name":        "Unix",
-			"code":        "unix",
-			"serverTypes": []ServerType{ServerTypeUnixProxy},
-		},
-		{
-			"name":        "UDP",
-			"code":        "udp",
-			"serverTypes": []ServerType{ServerTypeUDPProxy},
-		},
-	}
-
-	result := []maps.Map{}
-	for _, p := range protocols {
-		serverTypes := p.GetSlice("serverTypes")
-		if lists.Contains(serverTypes, serverType) {
-			result = append(result, p)
-		}
-	}
-	return result
+	server := serverResp.Server
+	if server == nil {
+		p.ErrorPage(errors.New("not found server with id '" + strconv.FormatInt(serverId, 10) + "'"))
+		return nil, nil, false
+	}
+	config, err := serverconfigs.NewServerConfigFromJSON(server.Config)
+	if err != nil {
+		p.ErrorPage(err)
+		return nil, nil, false
+	}
+
+	return server, config, true
 }