diff --git a/internal/web/actions/default/common/changedClusters.go b/internal/web/actions/default/clusters/checkChange.go similarity index 88% rename from internal/web/actions/default/common/changedClusters.go rename to internal/web/actions/default/clusters/checkChange.go index 443b3fa2..61c6d25b 100644 --- a/internal/web/actions/default/common/changedClusters.go +++ b/internal/web/actions/default/clusters/checkChange.go @@ -1,4 +1,4 @@ -package common +package clusters import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" @@ -8,15 +8,15 @@ import ( ) // 检查变更的集群列表 -type ChangedClustersAction struct { +type CheckChangeAction struct { actionutils.ParentAction } -func (this *ChangedClustersAction) Init() { +func (this *CheckChangeAction) Init() { this.Nav("", "", "") } -func (this *ChangedClustersAction) RunGet(params struct { +func (this *CheckChangeAction) RunPost(params struct { IsNotifying bool }) { timeout := time.NewTimer(55 * time.Second) // 比客户端提前结束,避免在客户端产生一个请求错误 diff --git a/internal/web/actions/default/clusters/init.go b/internal/web/actions/default/clusters/init.go index 057ae93b..5e4a6c08 100644 --- a/internal/web/actions/default/clusters/init.go +++ b/internal/web/actions/default/clusters/init.go @@ -13,6 +13,8 @@ func init() { Prefix("/clusters"). Get("", new(IndexAction)). GetPost("/create", new(CreateAction)). + Post("/sync", new(SyncAction)). + Post("/checkChange", new(CheckChangeAction)). EndAll() }) } diff --git a/internal/web/actions/default/common/syncClusters.go b/internal/web/actions/default/clusters/sync.go similarity index 62% rename from internal/web/actions/default/common/syncClusters.go rename to internal/web/actions/default/clusters/sync.go index 83ab40aa..bc41cd89 100644 --- a/internal/web/actions/default/common/syncClusters.go +++ b/internal/web/actions/default/clusters/sync.go @@ -1,16 +1,18 @@ -package common +package clusters import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) // 同步集群 -type SyncClustersAction struct { +type SyncAction struct { actionutils.ParentAction } -func (this *SyncClustersAction) RunPost(params struct{}) { +func (this *SyncAction) RunPost(params struct{}) { // TODO 将来可以单独选择某一个集群进行单独的同步 // 所有有变化的集群 @@ -29,6 +31,13 @@ func (this *SyncClustersAction) RunPost(params struct{}) { this.ErrorPage(err) return } + + // 发送通知 + _, err = nodeutils.SendMessageToCluster(this.AdminContext(), cluster.Id, messageconfigs.MessageCodeConfigChanged, &messageconfigs.ConfigChangedMessage{}, 10) + if err != nil { + this.ErrorPage(err) + return + } } this.Success() diff --git a/internal/web/actions/default/common/init.go b/internal/web/actions/default/common/init.go deleted file mode 100644 index 0dafa6a6..00000000 --- a/internal/web/actions/default/common/init.go +++ /dev/null @@ -1,17 +0,0 @@ -package common - -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)). - Prefix("/common"). - Get("/changedClusters", new(ChangedClustersAction)). - Post("/syncClusters", new(SyncClustersAction)). - EndAll() - }) -} diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 78bebf10..0b003cdb 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -97,6 +97,7 @@ func (this *IndexAction) RunGet(params struct{}) { serverMaps = append(serverMaps, maps.Map{ "id": server.Id, + "isOn": server.IsOn, "name": server.Name, "cluster": maps.Map{ "id": server.Cluster.Id, diff --git a/internal/web/import.go b/internal/web/import.go index adda6b87..f60172cb 100644 --- a/internal/web/import.go +++ b/internal/web/import.go @@ -6,7 +6,6 @@ import ( _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings" - _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/common" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dashboard" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns" diff --git a/web/views/@default/@layout.js b/web/views/@default/@layout.js index c1e97b8f..1dfab97c 100644 --- a/web/views/@default/@layout.js +++ b/web/views/@default/@layout.js @@ -37,7 +37,7 @@ Tea.context(function () { * 检查集群变更 */ this.checkClusterChanges = function () { - this.$get("/common/changedClusters") + this.$post("/clusters/checkChange") .params({ isNotifying: (this.globalChangedClusters.length > 0) ? 1 : 0 }) @@ -64,7 +64,7 @@ Tea.context(function () { */ this.syncClustersConfigs = function () { teaweb.confirm("确定要同步集群服务配置吗?", function () { - this.$post("/common/syncClusters") + this.$post("/clusters/sync") .success(function () { this.globalChangedClusters = []; }) diff --git a/web/views/@default/clusters/cluster/node/@node_menu.html b/web/views/@default/clusters/cluster/node/@node_menu.html index 08884584..42b1f6ed 100644 --- a/web/views/@default/clusters/cluster/node/@node_menu.html +++ b/web/views/@default/clusters/cluster/node/@node_menu.html @@ -1,6 +1,6 @@ 节点详情 - 节点日志 - 修改节点 + 运行日志 + 修改设置 安装节点 \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/node/logs.css b/web/views/@default/clusters/cluster/node/logs.css new file mode 100644 index 00000000..dafa1562 --- /dev/null +++ b/web/views/@default/clusters/cluster/node/logs.css @@ -0,0 +1,5 @@ +pre.log-box { + margin: 0; + padding: 0; +} +/*# sourceMappingURL=logs.css.map */ \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/node/logs.css.map b/web/views/@default/clusters/cluster/node/logs.css.map new file mode 100644 index 00000000..6ae867b7 --- /dev/null +++ b/web/views/@default/clusters/cluster/node/logs.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["logs.less"],"names":[],"mappings":"AAAA,GAAG;EACF,SAAA;EACA,UAAA","file":"logs.css"} \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/node/logs.html b/web/views/@default/clusters/cluster/node/logs.html index bb9c51e6..05f40852 100644 --- a/web/views/@default/clusters/cluster/node/logs.html +++ b/web/views/@default/clusters/cluster/node/logs.html @@ -14,10 +14,7 @@ - - [{{log.createdTime}}] - [{{log.createdTime}}] - [{{log.tag}}]{{log.description}} +
[{{log.createdTime}}][{{log.createdTime}}][{{log.tag}}]{{log.description}}
diff --git a/web/views/@default/clusters/cluster/node/logs.less b/web/views/@default/clusters/cluster/node/logs.less new file mode 100644 index 00000000..9accd63d --- /dev/null +++ b/web/views/@default/clusters/cluster/node/logs.less @@ -0,0 +1,4 @@ +pre.log-box { + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index d3deb3b0..0e693047 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -9,10 +9,8 @@ 服务名称 服务类型 部署集群 - 运行中节点数 - 未运行节点数 端口 - 状态 + 状态 操作 @@ -20,8 +18,6 @@ {{server.name}} {{server.serverTypeName}} {{server.cluster.name}} - [暂无] - [暂无] -
@@ -29,7 +25,7 @@
- [暂无] + 详情