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 @@
-
现在修改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 @@
暂时还没有节点。
@@ -22,7 +22,7 @@