增加API节点安装配置界面

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

@@ -12,7 +12,7 @@ func init() {
 		server.
 			Helper(helpers.NewUserMustAuth()).
 			Helper(NewHelper()).
-			Helper(settingutils.NewHelper("api")).
+			Helper(settingutils.NewHelper("apiNodes")).
 			Prefix("/api").
 			Get("", new(IndexAction)).
 			GetPost("/node/createPopup", new(node.CreatePopupAction)).

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

@@ -1,13 +1,8 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/logs"
-	"github.com/iwind/TeaGo/maps"
 	"net/http"
-	"strconv"
 )
 
 type Helper struct {
@@ -22,43 +17,5 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) (goNext bool) {
 		return true
 	}
 
-	action.Data["teaMenu"] = "api"
-
-	nodeId := action.ParamInt64("nodeId")
-	nodeIdString := strconv.FormatInt(nodeId, 10)
-
-	// 节点信息
-	rpcClient, err := rpc.SharedRPC()
-	if err != nil {
-		logs.Error(err)
-		return
-	}
-	nodeResp, err := rpcClient.APINodeRPC().FindEnabledAPINode(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledAPINodeRequest{NodeId: nodeId})
-	if err != nil {
-		action.WriteString(err.Error())
-		return
-	}
-	if nodeResp.Node == nil {
-		action.WriteString("node not found")
-		return
-	}
-
-	// 左侧菜单栏
-	secondMenuItem := action.Data.GetString("secondMenuItem")
-	switch action.Data.GetString("firstMenuItem") {
-	case "setting":
-		action.Data["leftMenuItems"] = this.createSettingMenu(nodeIdString, secondMenuItem)
-	}
-
 	return true
 }
-
-// 设置相关菜单
-func (this *Helper) createSettingMenu(nodeIdString string, selectedItem string) (items []maps.Map) {
-	items = append(items, maps.Map{
-		"name":     "基础设置",
-		"url":      "/api/node/settings?nodeId=" + nodeIdString,
-		"isActive": selectedItem == "basic",
-	})
-	return
-}

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

@@ -0,0 +1,102 @@
+package node
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "index")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.NotFound("apiNode", params.NodeId)
+		return
+	}
+
+	// 监听地址
+	httpConfig := &serverconfigs.HTTPProtocolConfig{}
+	if len(node.HttpJSON) > 0 {
+		err = json.Unmarshal(node.HttpJSON, httpConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+	if len(node.HttpsJSON) > 0 {
+		err = json.Unmarshal(node.HttpsJSON, httpsConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// 监听地址
+	listens := []*serverconfigs.NetworkAddressConfig{}
+	listens = append(listens, httpConfig.Listen...)
+	listens = append(listens, httpsConfig.Listen...)
+
+	// 证书信息
+	certs := []*sslconfigs.SSLCertConfig{}
+	sslPolicyId := int64(0)
+	if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 {
+		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON
+		if len(sslPolicyConfigJSON) > 0 {
+			sslPolicyId = httpsConfig.SSLPolicyRef.SSLPolicyId
+
+			sslPolicy := &sslconfigs.SSLPolicy{}
+			err = json.Unmarshal(sslPolicyConfigJSON, sslPolicy)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			certs = sslPolicy.Certs
+		}
+	}
+
+	// 访问地址
+	accessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	if len(node.AccessAddrsJSON) > 0 {
+		err = json.Unmarshal(node.AccessAddrsJSON, &accessAddrs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"name":        node.Name,
+		"description": node.Description,
+		"isOn":        node.IsOn,
+		"listens":     listens,
+		"accessAddrs": accessAddrs,
+		"hasHTTPS":    sslPolicyId > 0,
+		"certs":       certs,
+	}
+
+	this.Show()
+}

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

@@ -10,7 +10,7 @@ func init() {
 	TeaGo.BeforeStart(func(server *TeaGo.Server) {
 		server.
 			Helper(helpers.NewUserMustAuth()).
-			Helper(settingutils.NewHelper("api")).
+			Helper(settingutils.NewHelper("apiNodes")).
 			Prefix("/api/node").
 
 			// 这里不受Helper的约束
@@ -19,8 +19,9 @@ func init() {
 
 			// 节点相关
 			Helper(NewHelper()).
-			GetPost("/settings", new(SettingsAction)).
-
+			Get("", new(IndexAction)).
+			GetPost("/update", new(UpdateAction)).
+			Get("/install", new(InstallAction)).
 
 			EndAll()
 	})

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

@@ -0,0 +1,58 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/maps"
+	"io/ioutil"
+	"os"
+)
+
+type InstallAction struct {
+	actionutils.ParentAction
+}
+
+func (this *InstallAction) Init() {
+	this.Nav("", "", "install")
+}
+
+func (this *InstallAction) RunGet(params struct {
+	NodeId int64
+}) {
+	// API节点信息
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.NotFound("apiNode", params.NodeId)
+		return
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":       node.Id,
+		"name":     node.Name,
+		"uniqueId": node.UniqueId,
+		"secret":   node.Secret,
+	}
+
+	// 数据库配置
+	dbConfigMap := maps.Map{
+		"config":     "",
+		"error":      "",
+		"isNotFound": false,
+	}
+	dbConfigFile := Tea.ConfigFile("api_db.yaml")
+	data, err := ioutil.ReadFile(dbConfigFile)
+	dbConfigMap["config"] = string(data)
+	if err != nil {
+		dbConfigMap["error"] = err.Error()
+		dbConfigMap["isNotFound"] = os.IsNotExist(err)
+	}
+	this.Data["dbConfig"] = dbConfigMap
+
+	this.Show()
+}

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

@@ -10,16 +10,15 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-type SettingsAction struct {
+type UpdateAction struct {
 	actionutils.ParentAction
 }
 
-func (this *SettingsAction) Init() {
-	this.Nav("", "setting", "setting")
-	this.SecondMenu("basic")
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
 }
 
-func (this *SettingsAction) RunGet(params struct {
+func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{
@@ -104,7 +103,7 @@ func (this *SettingsAction) RunGet(params struct {
 }
 
 // 保存基础设置
-func (this *SettingsAction) RunPost(params struct {
+func (this *UpdateAction) RunPost(params struct {
 	NodeId          int64
 	Name            string
 	SslPolicyId     int64

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

@@ -11,7 +11,7 @@ func init() {
 		server.
 			Helper(new(helpers.UserMustAuth)).
 			Helper(new(Helper)).
-			Helper(settingutils.NewHelper("db")).
+			Helper(settingutils.NewHelper("dbNodes")).
 			Prefix("/db").
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).

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

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

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

@@ -0,0 +1,18 @@
+package profile
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(settingutils.NewHelper("database")).
+			Prefix("/settings/database").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/settings/settingutils/utils.go

@@ -27,12 +27,13 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool)
 	tabbar := actionutils.NewTabbar()
 	tabbar.Add("管理界面", "", "/settings", "", this.tab == "console")
 	tabbar.Add("安全设置", "", "/settings/security", "", this.tab == "security")
-	tabbar.Add("API节点", "", "/api", "exchange", this.tab == "api")
-	tabbar.Add("日志数据库节点", "", "/db", "database", this.tab == "db")
+	tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database")
+	tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes")
+	tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes")
 	tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup")
 	tabbar.Add("个人资料", "", "/settings/profile", "", this.tab == "profile")
 	tabbar.Add("登录设置", "", "/settings/login", "", this.tab == "login")
-	tabbar.Add("检查版本更新", "", "/settings/upgrade", "", this.tab == "upgrade")
+	tabbar.Add("检查新版本", "", "/settings/upgrade", "", this.tab == "upgrade")
 	actionutils.SetTabbar(actionPtr, tabbar)
 
 	return

internal/web/actions/default/ui/download.go

@@ -0,0 +1,23 @@
+package ui
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+// 下载指定的文本内容
+type DownloadAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DownloadAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *DownloadAction) RunGet(params struct {
+	File string
+	Text string
+}) {
+	this.AddHeader("Content-Disposition", "attachment; filename=\""+params.File+"\";")
+	this.WriteString(params.Text)
+
+}

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

@@ -8,8 +8,11 @@ import (
 func init() {
 	TeaGo.BeforeStart(func(server *TeaGo.Server) {
 		server.
-			Helper(new(actions.Gzip)).
 			Prefix("/ui").
+			Get("/download", new(DownloadAction)).
+
+			// 以下的需要压缩
+			Helper(new(actions.Gzip)).
 			Get("/components.js", new(ComponentsAction)).
 			EndAll()
 	})