优化数据库节点管理

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

@@ -3,28 +3,35 @@ package db
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
-type CleanPopupAction struct {
+type CleanAction struct {
 	actionutils.ParentAction
 }
 
-func (this *CleanPopupAction) Init() {
+func (this *CleanAction) Init() {
-	this.Nav("", "", "")
+	this.Nav("", "", "clean")
 }
 
-func (this *CleanPopupAction) RunGet(params struct {
+func (this *CleanAction) RunGet(params struct {
 	NodeId int64
 }) {
+	_, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
 
 	this.Show()
 }
 
-func (this *CleanPopupAction) RunPost(params struct {
+func (this *CleanAction) RunPost(params struct {
 	NodeId int64
 
 	Must *actions.Must
@@ -33,8 +40,7 @@ func (this *CleanPopupAction) RunPost(params struct {
 		DbNodeId: params.NodeId,
 	})
 	if err != nil {
-		this.ErrorPage(err)
+		this.Fail("查询数据时出错了：" + err.Error())
-		return
 	}
 
 	tableMaps := []maps.Map{}

internal/web/actions/default/db/dbnodeutils/utils.go

@@ -0,0 +1,34 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package dbnodeutils
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+)
+
+// InitNode 初始化指标信息
+func InitNode(parent *actionutils.ParentAction, nodeId int64) (*pb.DBNode, error) {
+	client, err := rpc.SharedRPC()
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := client.DBNodeRPC().FindEnabledDBNode(parent.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: nodeId})
+	if err != nil {
+		return nil, err
+	}
+	var node = resp.DbNode
+	if node == nil {
+		return nil, errors.New("not found db node with id '" + types.String(nodeId) + "'")
+	}
+	parent.Data["node"] = maps.Map{
+		"id":   node.Id,
+		"name": node.Name,
+	}
+	return node, nil
+}

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

@@ -45,6 +45,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 				"isOk":    node.Status.IsOk,
 				"error":   node.Status.Error,
 				"size":    numberutils.FormatBytes(node.Status.Size),
+				"version": node.Status.Version,
 			},
 		})
 	}

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

@@ -16,12 +16,14 @@ func init() {
 			Prefix("/db").
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
-			GetPost("/updatePopup", new(UpdatePopupAction)).
+			GetPost("/update", new(UpdateAction)).
 			Post("/delete", new(DeleteAction)).
-			GetPost("/cleanPopup", new(CleanPopupAction)).
+			GetPost("/clean", new(CleanAction)).
 			Post("/deleteTable", new(DeleteTableAction)).
 			Post("/truncateTable", new(TruncateTableAction)).
-
+			Get("/node", new(NodeAction)).
+			Get("/logs", new(LogsAction)).
+			Post("/status", new(StatusAction)).
 			EndAll()
 	})
 }

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

@@ -0,0 +1,82 @@
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type LogsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *LogsAction) Init() {
+	this.Nav("", "", "log")
+}
+
+func (this *LogsAction) RunGet(params struct {
+	NodeId int64
+
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
+}) {
+	_, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["nodeId"] = params.NodeId
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+
+	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
+		Role:    nodeconfigs.NodeRoleDatabase,
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count, 20)
+
+	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:  params.NodeId,
+		Role:    nodeconfigs.NodeRoleDatabase,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+
+	logs := []maps.Map{}
+	for _, log := range logsResp.NodeLogs {
+		logs = append(logs, maps.Map{
+			"tag":         log.Tag,
+			"description": log.Description,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
+			"level":       log.Level,
+			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+		})
+	}
+	this.Data["logs"] = logs
+
+	this.Data["page"] = page.AsHTML()
+
+	this.Show()
+}

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

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodeAction) Init() {
+	this.Nav("", "", "node")
+}
+
+func (this *NodeAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"isOn":        node.IsOn,
+		"name":        node.Name,
+		"database":    node.Database,
+		"host":        node.Host,
+		"port":        node.Port,
+		"username":    node.Username,
+		"password":    node.Password,
+		"description": node.Description,
+	}
+
+	this.Show()
+}

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

@@ -0,0 +1,38 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	statusResp, err := this.RPC().DBNodeRPC().CheckDBNodeStatus(this.AdminContext(), &pb.CheckDBNodeStatusRequest{DbNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var status = statusResp.DbNodeStatus
+	if status != nil {
+		this.Data["status"] = maps.Map{
+			"isOk":    status.IsOk,
+			"error":   status.Error,
+			"size":    numberutils.FormatBytes(status.Size),
+			"version": status.Version,
+		}
+	} else {
+		this.Data["status"] = nil
+	}
+
+	this.Success()
+}

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

@@ -8,15 +8,15 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-type UpdatePopupAction struct {
+type UpdateAction struct {
 	actionutils.ParentAction
 }
 
-func (this *UpdatePopupAction) Init() {
+func (this *UpdateAction) Init() {
-	this.Nav("", "", "")
+	this.Nav("", "", "update")
 }
 
-func (this *UpdatePopupAction) RunGet(params struct {
+func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().DBNodeRPC().FindEnabledDBNode(this.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: params.NodeId})
@@ -46,7 +46,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 	this.Show()
 }
 
-func (this *UpdatePopupAction) RunPost(params struct {
+func (this *UpdateAction) RunPost(params struct {
 	NodeId int64
 
 	Name     string

web/views/@default/db/@menu.html

@@ -0,0 +1,8 @@
+<first-menu>
+    <menu-item href="/db">所有节点</menu-item>
+    <span class="item disabled">|</span>
+    <menu-item :href="'/db/node?nodeId=' + node.id" code="node">"{{node.name}}"详情</menu-item>
+    <menu-item :href="'/db/clean?nodeId=' + node.id" code="clean">清理</menu-item>
+    <menu-item :href="'/db/logs?nodeId=' + node.id" code="log">运行日志</menu-item>
+    <menu-item :href="'/db/update?nodeId=' + node.id" code="update">修改</menu-item>
+</first-menu>

web/views/@default/db/clean.html

@@ -1,4 +1,5 @@
-{$layout "layout_popup"}
+{$layout}
+{$template "menu"}
 
 <div class="ui message" v-if="isLoading">正在加载中...</div>
 

web/views/@default/db/index.html

@@ -12,15 +12,20 @@
 			<th>节点名称</th>
 			<th>连接地址</th>
 			<th>数据库名</th>
+            <th>数据库版本</th>
             <th>用量</th>
 			<th class="center width10">状态</th>
-			<th class="three op">操作</th>
+			<th class="two op">操作</th>
 		</tr>
 	</thead>
 	<tr v-for="node in nodes">
-		<td>{{node.name}}</td>
+        <td><a :href="'/db/node?nodeId=' + node.id">{{node.name}}</a></td>
 		<td>{{node.host}}:{{node.port}}</td>
 		<td>{{node.database}}</td>
+        <td>
+            <span v-if="node.status.version.length > 0">v{{node.status.version}}</span>
+            <span class="disabled" v-else>-</span>
+        </td>
         <td>
             <span v-if="node.status.isOk">{{node.status.size}}</span>
             <span v-else class="disabled">-</span>
@@ -35,8 +40,7 @@
             </span>
         </td>
 		<td>
-            <a href="" @click.prevent="cleanNode(node.id)" v-if="node.isOn && node.status.isOk">清理</a><span v-else class="disabled">清理 </span> &nbsp;
+            <a :href="'/db/node?nodeId=' + node.id">详情</a>
-			<a href="" @click.prevent="updateNode(node.id)">修改</a> &nbsp;
 			<a href="" @click.prevent="deleteNode(node.id)">删除</a>
 		</td>
 	</tr>

web/views/@default/db/index.js

@@ -11,18 +11,6 @@ Tea.context(function () {
 		})
 	}
 
-	// 修改节点
-	this.updateNode = function (nodeId) {
-		teaweb.popup("/db/updatePopup?nodeId=" + nodeId, {
-			height: "30em",
-			callback: function () {
-				teaweb.success("保存成功", function () {
-					window.location.reload()
-				})
-			}
-		})
-	}
-
 	// 删除节点
 	this.deleteNode = function (nodeId) {
 		let that = this
@@ -35,14 +23,6 @@ Tea.context(function () {
 		})
 	}
 	
-    // 清理节点
-    this.cleanNode = function (nodeId) {
-        teaweb.popup("/db/cleanPopup?nodeId=" + nodeId, {
-        	width: "44em",
-        	height: "26em"
-		})
-    }
-
 	// 显示错误信息
     this.showError = function (err) {
 	    teaweb.popupTip("<span style=\"color:#db2828\">错误信息：" + err + "</span>")

web/views/@default/db/logs.css

@@ -0,0 +1,5 @@
+pre.log-box {
+  margin: 0;
+  padding: 0;
+}
+/*# sourceMappingURL=logs.css.map */

web/views/@default/db/logs.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["logs.less"],"names":[],"mappings":"AAAA,GAAG;EACF,SAAA;EACA,UAAA","file":"logs.css"}

web/views/@default/db/logs.html

@@ -0,0 +1,51 @@
+{$layout}
+{$template "menu"}
+{$template "/datepicker"}
+
+<div class="margin"></div>
+<form method="get" action="/db/logs" class="ui form" autocomplete="off">
+    <input type="hidden" name="nodeId" :value="nodeId"/>
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" name="dayFrom" placeholder="开始日期" v-model="dayFrom" value="" style="width:8em" id="day-from-picker"/>
+        </div>
+        <div class="ui field">
+            <input type="text" name="dayTo" placeholder="结束日期" v-model="dayTo" value="" style="width:8em" id="day-to-picker"/>
+        </div>
+        <div class="ui field">
+            <select class="ui dropdown" name="level" v-model="level">
+                <option value="">[级别]</option>
+                <option value="error">错误</option>
+                <option value="warning">警告</option>
+                <option value="info">信息</option>
+                <option value="success">成功</option>
+            </select>
+        </div>
+        <div class="ui field">
+            <input type="text" name="keyword" style="width:10em" v-model="keyword" placeholder="关键词"/>
+        </div>
+        <div class="ui field">
+            <button type="submit" class="ui button">查询</button>
+        </div>
+        <div class="ui field" v-if="dayFrom.length > 0 || dayTo.length > 0 || keyword.length > 0 || level.length > 0">
+            <a :href="'/db/logs?nodeId=' + nodeId">[清除条件]</a>
+        </div>
+    </div>
+</form>
+
+<p class="comment" v-if="logs.length == 0">暂时还没有日志。</p>
+
+<table class="ui table selectable" v-if="logs.length > 0">
+    <thead>
+        <tr>
+
+        </tr>
+    </thead>
+    <tr v-for="log in logs">
+        <td>
+            <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
+        </td>
+    </tr>
+</table>
+
+<div class="page" v-html="page"></div>

web/views/@default/db/logs.js

@@ -0,0 +1,6 @@
+Tea.context(function () {
+	this.$delay(function () {
+		teaweb.datepicker("day-from-picker")
+		teaweb.datepicker("day-to-picker")
+	})
+})

web/views/@default/db/logs.less

@@ -0,0 +1,4 @@
+pre.log-box {
+	margin: 0;
+	padding: 0;
+}

web/views/@default/db/node.html

@@ -0,0 +1,68 @@
+{$layout}
+{$template "menu"}
+
+<table class="ui table definition selectable">
+    <tr>
+        <td class="title">节点名称</td>
+        <td>
+            {{node.name}}
+        </td>
+    </tr>
+    <tr>
+        <td>状态</td>
+        <td>
+            <label-on :v-is-on="node.isOn"></label-on>
+
+            <div v-if="status != null" style="margin-top: 0.8em">
+                <div v-if="status.isOk">
+                    <p class="comment">
+                        <span v-if="status.version.length > 0">版本： v{{status.version}} /</span>
+                        <span v-if="status.isOk">用量：{{status.size}}</span>
+                        <span v-else class="disabled">-</span>
+                    </p>
+                </div>
+                <div v-else>
+                    <span class="red">连接错误：{{status.error}}</span>
+                </div>
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>主机地址<em>（Host）</em></td>
+        <td>
+            {{node.host}}
+        </td>
+    </tr>
+    <tr>
+        <td>数据库端口<em>（Port）</em></td>
+        <td>
+            {{node.port}}
+        </td>
+    </tr>
+    <tr>
+        <td>数据库名称<em>（Database）</em></td>
+        <td>
+            {{node.database}}
+        </td>
+    </tr>
+    <tr>
+        <td>用户名<em>（Username）</em></td>
+        <td>
+            {{node.username}}
+        </td>
+    </tr>
+    <tr>
+        <td>密码<em>（Password）</em></td>
+        <td>
+            <span v-if="node.password.length > 0">{{node.password}}</span>
+            <span v-else class="disabled">-</span>
+        </td>
+    </tr>
+    <tr>
+        <td>详细描述</td>
+        <td>
+            <span v-if="node.description.length > 0">{{node.description}}</span>
+            <span v-else class="disabled">-</span>
+        </td>
+    </tr>
+</table>

web/views/@default/db/node.js

@@ -0,0 +1,16 @@
+Tea.context(function () {
+	this.$delay(function () {
+		this.loadStatus(this.node.id)
+	})
+
+	this.status = null
+	this.loadStatus = function (nodeId) {
+		this.$post(".status")
+			.params({
+				nodeId: nodeId
+			})
+			.success(function (resp) {
+				this.status = resp.data.status
+			})
+	}
+})

web/views/@default/db/update.html

@@ -1,6 +1,5 @@
-{$layout "layout_popup"}
+{$layout}
-
+{$template "menu"}
-<h3>修改节点</h3>
 
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 	<input type="hidden" name="nodeId" :value="node.id"/>

web/views/@default/db/update.js

@@ -0,0 +1,3 @@
+Tea.context(function () {
+	this.success = NotifySuccess("保存成功", "/db/node?nodeId=" + this.node.id)
+})