diff --git a/internal/web/actions/default/api/delete.go b/internal/web/actions/default/settings/api/delete.go similarity index 100% rename from internal/web/actions/default/api/delete.go rename to internal/web/actions/default/settings/api/delete.go diff --git a/internal/web/actions/default/api/helper.go b/internal/web/actions/default/settings/api/helper.go similarity index 100% rename from internal/web/actions/default/api/helper.go rename to internal/web/actions/default/settings/api/helper.go diff --git a/internal/web/actions/default/api/index.go b/internal/web/actions/default/settings/api/index.go similarity index 100% rename from internal/web/actions/default/api/index.go rename to internal/web/actions/default/settings/api/index.go diff --git a/internal/web/actions/default/api/init.go b/internal/web/actions/default/settings/api/init.go similarity index 86% rename from internal/web/actions/default/api/init.go rename to internal/web/actions/default/settings/api/init.go index 8e12573e..2df85afc 100644 --- a/internal/web/actions/default/api/init.go +++ b/internal/web/actions/default/settings/api/init.go @@ -2,7 +2,7 @@ package api import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/api/node" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/api/node" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -14,7 +14,7 @@ func init() { Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(NewHelper()). Helper(settingutils.NewAdvancedHelper("apiNodes")). - Prefix("/api"). + Prefix("/settings/api"). Get("", new(IndexAction)). Get("/methodStats", new(MethodStatsAction)). GetPost("/node/createPopup", new(node.CreatePopupAction)). diff --git a/internal/web/actions/default/api/methodStats.go b/internal/web/actions/default/settings/api/methodStats.go similarity index 100% rename from internal/web/actions/default/api/methodStats.go rename to internal/web/actions/default/settings/api/methodStats.go diff --git a/internal/web/actions/default/api/node/createAddrPopup.go b/internal/web/actions/default/settings/api/node/createAddrPopup.go similarity index 100% rename from internal/web/actions/default/api/node/createAddrPopup.go rename to internal/web/actions/default/settings/api/node/createAddrPopup.go diff --git a/internal/web/actions/default/api/node/createPopup.go b/internal/web/actions/default/settings/api/node/createPopup.go similarity index 100% rename from internal/web/actions/default/api/node/createPopup.go rename to internal/web/actions/default/settings/api/node/createPopup.go diff --git a/internal/web/actions/default/api/node/helper.go b/internal/web/actions/default/settings/api/node/helper.go similarity index 100% rename from internal/web/actions/default/api/node/helper.go rename to internal/web/actions/default/settings/api/node/helper.go diff --git a/internal/web/actions/default/api/node/index.go b/internal/web/actions/default/settings/api/node/index.go similarity index 100% rename from internal/web/actions/default/api/node/index.go rename to internal/web/actions/default/settings/api/node/index.go diff --git a/internal/web/actions/default/api/node/init.go b/internal/web/actions/default/settings/api/node/init.go similarity index 96% rename from internal/web/actions/default/api/node/init.go rename to internal/web/actions/default/settings/api/node/init.go index 66c2aee5..19024921 100644 --- a/internal/web/actions/default/api/node/init.go +++ b/internal/web/actions/default/settings/api/node/init.go @@ -12,7 +12,7 @@ func init() { server. Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewAdvancedHelper("apiNodes")). - Prefix("/api/node"). + Prefix("/settings/api/node"). // 这里不受Helper的约束 GetPost("/createAddrPopup", new(CreateAddrPopupAction)). diff --git a/internal/web/actions/default/api/node/install.go b/internal/web/actions/default/settings/api/node/install.go similarity index 100% rename from internal/web/actions/default/api/node/install.go rename to internal/web/actions/default/settings/api/node/install.go diff --git a/internal/web/actions/default/api/node/logs.go b/internal/web/actions/default/settings/api/node/logs.go similarity index 100% rename from internal/web/actions/default/api/node/logs.go rename to internal/web/actions/default/settings/api/node/logs.go diff --git a/internal/web/actions/default/api/node/update.go b/internal/web/actions/default/settings/api/node/update.go similarity index 100% rename from internal/web/actions/default/api/node/update.go rename to internal/web/actions/default/settings/api/node/update.go diff --git a/internal/web/actions/default/api/node/updateAddrPopup.go b/internal/web/actions/default/settings/api/node/updateAddrPopup.go similarity index 100% rename from internal/web/actions/default/api/node/updateAddrPopup.go rename to internal/web/actions/default/settings/api/node/updateAddrPopup.go diff --git a/internal/web/actions/default/api/node/upgradeCheck.go b/internal/web/actions/default/settings/api/node/upgradeCheck.go similarity index 100% rename from internal/web/actions/default/api/node/upgradeCheck.go rename to internal/web/actions/default/settings/api/node/upgradeCheck.go diff --git a/internal/web/actions/default/api/node/upgradePopup.go b/internal/web/actions/default/settings/api/node/upgradePopup.go similarity index 100% rename from internal/web/actions/default/api/node/upgradePopup.go rename to internal/web/actions/default/settings/api/node/upgradePopup.go diff --git a/internal/web/actions/default/settings/settingutils/advanced_helper.go b/internal/web/actions/default/settings/settingutils/advanced_helper.go index 70d0351d..cc6aed0b 100644 --- a/internal/web/actions/default/settings/settingutils/advanced_helper.go +++ b/internal/web/actions/default/settings/settingutils/advanced_helper.go @@ -33,7 +33,7 @@ func (this *AdvancedHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNex var adminId = session.GetInt64("adminId") if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database") - tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes") + tabbar.Add("API节点", "", "/settings/api", "", this.tab == "apiNodes") tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes") tabbar.Add("迁移", "", "/settings/transfer", "", this.tab == "transfer") diff --git a/internal/web/import.go b/internal/web/import.go index 88acef41..0213adb5 100644 --- a/internal/web/import.go +++ b/internal/web/import.go @@ -9,8 +9,8 @@ import ( _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/admins" // API节点 - _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/api" - _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/api/node" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/api" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/api/node" // 节点集群 _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters" diff --git a/web/public/js/components/api-node/api-node-addresses-box.js b/web/public/js/components/api-node/api-node-addresses-box.js index d28f0cfa..af5cf09b 100644 --- a/web/public/js/components/api-node/api-node-addresses-box.js +++ b/web/public/js/components/api-node/api-node-addresses-box.js @@ -13,7 +13,7 @@ Vue.component("api-node-addresses-box", { // 添加IP地址 addAddr: function () { let that = this; - teaweb.popup("/api/node/createAddrPopup", { + teaweb.popup("/settings/api/node/createAddrPopup", { height: "16em", callback: function (resp) { that.addrs.push(resp.data.addr); @@ -25,7 +25,7 @@ Vue.component("api-node-addresses-box", { updateAddr: function (index, addr) { let that = this; window.UPDATING_ADDR = addr - teaweb.popup("/api/node/updateAddrPopup?addressId=", { + teaweb.popup("/settings/api/node/updateAddrPopup?addressId=", { callback: function (resp) { Vue.set(that.addrs, index, resp.data.addr); } diff --git a/web/views/@default/api/node/@menu.html b/web/views/@default/api/node/@menu.html deleted file mode 100644 index 20f96759..00000000 --- a/web/views/@default/api/node/@menu.html +++ /dev/null @@ -1,8 +0,0 @@ - - 节点列表 - | - "{{node.name}}"详情 - 运行日志 - 安装节点 - 修改节点 - diff --git a/web/views/@default/clusters/cluster/createNode.js b/web/views/@default/clusters/cluster/createNode.js index 4183d80b..e660adfc 100644 --- a/web/views/@default/clusters/cluster/createNode.js +++ b/web/views/@default/clusters/cluster/createNode.js @@ -146,7 +146,7 @@ Tea.context(function () { return case "RPC_TEST_FAILED": teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败,具体错误:" + errMsg + ",
现在修改API信息?", function () { - window.location = "/api" + window.location = "/settings/api" }) return default: diff --git a/web/views/@default/clusters/cluster/installRemote.js b/web/views/@default/clusters/cluster/installRemote.js index 4808cd4f..ba5a3685 100644 --- a/web/views/@default/clusters/cluster/installRemote.js +++ b/web/views/@default/clusters/cluster/installRemote.js @@ -142,7 +142,7 @@ Tea.context(function () { return case "RPC_TEST_FAILED": teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败,具体错误:" + errMsg + ",
现在修改API信息?", function () { - window.location = "/api" + window.location = "/settings/api" }) return default: diff --git a/web/views/@default/clusters/cluster/node/install.js b/web/views/@default/clusters/cluster/node/install.js index ff56e20d..5e537ea9 100644 --- a/web/views/@default/clusters/cluster/node/install.js +++ b/web/views/@default/clusters/cluster/node/install.js @@ -89,7 +89,7 @@ Tea.context(function () { return case "RPC_TEST_FAILED": teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败,具体错误:" + errMsg + ",
现在修改API信息?", function () { - window.location = "/api" + window.location = "/settings/api" }) return default: diff --git a/web/views/@default/clusters/cluster/upgradeRemote.js b/web/views/@default/clusters/cluster/upgradeRemote.js index a105db08..a1858a37 100644 --- a/web/views/@default/clusters/cluster/upgradeRemote.js +++ b/web/views/@default/clusters/cluster/upgradeRemote.js @@ -132,7 +132,7 @@ Tea.context(function () { return case "RPC_TEST_FAILED": teaweb.confirm("html:要升级的节点到API服务之间的RPC通讯测试失败,具体错误:" + errMsg + ",
现在修改API信息?", function () { - window.location = "/api" + window.location = "/settings/api" }) return default: diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html index 325e1ce5..936363aa 100644 --- a/web/views/@default/dashboard/index.html +++ b/web/views/@default/dashboard/index.html @@ -32,7 +32,7 @@
- 升级提醒:有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本;如果已经升级,请尝试重启API节点进程。 + 升级提醒:有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本;如果已经升级,请尝试重启API节点进程。
@@ -72,9 +72,9 @@
-

API节点

+

API节点

{{dashboard.countAPINodes}}个 - / {{dashboard.countOfflineAPINodes}}离线{{dashboard.countOfflineAPINodes}}离线 + / {{dashboard.countOfflineAPINodes}}离线{{dashboard.countOfflineAPINodes}}离线
diff --git a/web/views/@default/api/index.html b/web/views/@default/settings/api/index.html similarity index 92% rename from web/views/@default/api/index.html rename to web/views/@default/settings/api/index.html index 335954fa..5143be77 100644 --- a/web/views/@default/api/index.html +++ b/web/views/@default/settings/api/index.html @@ -2,7 +2,7 @@ [添加节点] - 用时统计 + 用时统计

暂时还没有节点。

@@ -22,7 +22,7 @@ - {{node.name}} + {{node.name}}
主节点
@@ -67,7 +67,7 @@ 未连接 - 详情   + 详情   删除 diff --git a/web/views/@default/api/index.js b/web/views/@default/settings/api/index.js similarity index 100% rename from web/views/@default/api/index.js rename to web/views/@default/settings/api/index.js diff --git a/web/views/@default/api/methodStats.html b/web/views/@default/settings/api/methodStats.html similarity index 87% rename from web/views/@default/api/methodStats.html rename to web/views/@default/settings/api/methodStats.html index df95dcb1..647bf74f 100644 --- a/web/views/@default/api/methodStats.html +++ b/web/views/@default/settings/api/methodStats.html @@ -1,7 +1,7 @@ {$layout}
-
+
@@ -21,7 +21,7 @@
  - 清除条件 + 清除条件
diff --git a/web/views/@default/settings/api/node/@menu.html b/web/views/@default/settings/api/node/@menu.html new file mode 100644 index 00000000..94929389 --- /dev/null +++ b/web/views/@default/settings/api/node/@menu.html @@ -0,0 +1,8 @@ + + 节点列表 + | + "{{node.name}}"详情 + 运行日志 + 安装节点 + 修改节点 + diff --git a/web/views/@default/api/node/createAddrPopup.html b/web/views/@default/settings/api/node/createAddrPopup.html similarity index 100% rename from web/views/@default/api/node/createAddrPopup.html rename to web/views/@default/settings/api/node/createAddrPopup.html diff --git a/web/views/@default/api/node/createPopup.html b/web/views/@default/settings/api/node/createPopup.html similarity index 100% rename from web/views/@default/api/node/createPopup.html rename to web/views/@default/settings/api/node/createPopup.html diff --git a/web/views/@default/api/node/createPopup.js b/web/views/@default/settings/api/node/createPopup.js similarity index 100% rename from web/views/@default/api/node/createPopup.js rename to web/views/@default/settings/api/node/createPopup.js diff --git a/web/views/@default/api/node/index.html b/web/views/@default/settings/api/node/index.html similarity index 100% rename from web/views/@default/api/node/index.html rename to web/views/@default/settings/api/node/index.html diff --git a/web/views/@default/api/node/install.html b/web/views/@default/settings/api/node/install.html similarity index 100% rename from web/views/@default/api/node/install.html rename to web/views/@default/settings/api/node/install.html diff --git a/web/views/@default/api/node/logs.css b/web/views/@default/settings/api/node/logs.css similarity index 100% rename from web/views/@default/api/node/logs.css rename to web/views/@default/settings/api/node/logs.css diff --git a/web/views/@default/api/node/logs.css.map b/web/views/@default/settings/api/node/logs.css.map similarity index 100% rename from web/views/@default/api/node/logs.css.map rename to web/views/@default/settings/api/node/logs.css.map diff --git a/web/views/@default/api/node/logs.html b/web/views/@default/settings/api/node/logs.html similarity index 90% rename from web/views/@default/api/node/logs.html rename to web/views/@default/settings/api/node/logs.html index fc858ded..783178cc 100644 --- a/web/views/@default/api/node/logs.html +++ b/web/views/@default/settings/api/node/logs.html @@ -3,7 +3,7 @@ {$template "/datepicker"}
-
+
@@ -28,7 +28,7 @@
diff --git a/web/views/@default/api/node/logs.js b/web/views/@default/settings/api/node/logs.js similarity index 100% rename from web/views/@default/api/node/logs.js rename to web/views/@default/settings/api/node/logs.js diff --git a/web/views/@default/api/node/logs.less b/web/views/@default/settings/api/node/logs.less similarity index 100% rename from web/views/@default/api/node/logs.less rename to web/views/@default/settings/api/node/logs.less diff --git a/web/views/@default/api/node/update.html b/web/views/@default/settings/api/node/update.html similarity index 100% rename from web/views/@default/api/node/update.html rename to web/views/@default/settings/api/node/update.html diff --git a/web/views/@default/api/node/update.js b/web/views/@default/settings/api/node/update.js similarity index 89% rename from web/views/@default/api/node/update.js rename to web/views/@default/settings/api/node/update.js index a01086cf..e06de297 100644 --- a/web/views/@default/api/node/update.js +++ b/web/views/@default/settings/api/node/update.js @@ -1,5 +1,5 @@ Tea.context(function () { - this.success = NotifySuccess("保存成功", "/api/node?nodeId=" + this.node.id) + this.success = NotifySuccess("保存成功", "/settings/api/node?nodeId=" + this.node.id) this.hasHTTPS = this.node.listens.$any(function (k, v) { return v.protocol == "https" diff --git a/web/views/@default/api/node/updateAddrPopup.html b/web/views/@default/settings/api/node/updateAddrPopup.html similarity index 100% rename from web/views/@default/api/node/updateAddrPopup.html rename to web/views/@default/settings/api/node/updateAddrPopup.html diff --git a/web/views/@default/api/node/updateAddrPopup.js b/web/views/@default/settings/api/node/updateAddrPopup.js similarity index 100% rename from web/views/@default/api/node/updateAddrPopup.js rename to web/views/@default/settings/api/node/updateAddrPopup.js diff --git a/web/views/@default/api/node/upgradePopup.html b/web/views/@default/settings/api/node/upgradePopup.html similarity index 100% rename from web/views/@default/api/node/upgradePopup.html rename to web/views/@default/settings/api/node/upgradePopup.html diff --git a/web/views/@default/api/node/upgradePopup.js b/web/views/@default/settings/api/node/upgradePopup.js similarity index 100% rename from web/views/@default/api/node/upgradePopup.js rename to web/views/@default/settings/api/node/upgradePopup.js