From 9669c0ddda97d286b3b2b88743c03e321adc82a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Tue, 13 Jul 2021 14:28:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=A7=84=E5=88=99=E6=94=B9?= =?UTF-8?q?=E6=88=90=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tasks/task_authority.go | 3 ++- internal/web/actions/default/ns/index.go | 6 +++++ .../server/settings/locations/create.go | 2 +- .../settings/locations/location/index.go | 6 ++--- .../settings/locations/locationutils/utils.go | 2 +- .../locations/reverseProxy/setting.go | 2 +- .../servers/serverutils/server_helper.go | 2 +- web/views/@default/@layout.html | 4 +-- web/views/@default/dashboard/boards/index.css | 2 +- .../@default/dashboard/boards/index.css.map | 2 +- .../@default/dashboard/boards/index.html | 25 ++++++++++++++----- .../@default/dashboard/boards/index.less | 10 +++++--- web/views/@default/dashboard/index.css | 2 +- web/views/@default/dashboard/index.css.map | 2 +- web/views/@default/dashboard/index.html | 14 ++++++----- web/views/@default/dashboard/index.less | 10 +++++--- .../settings/locations/@location_menu.html | 2 +- .../server/settings/locations/create.html | 2 +- .../server/settings/locations/index.html | 4 +-- .../server/settings/locations/index.js | 4 +-- .../settings/locations/location/index.html | 2 +- .../server/settings/rewrite/createPopup.html | 2 +- .../server/settings/rewrite/updatePopup.html | 2 +- 23 files changed, 69 insertions(+), 43 deletions(-) diff --git a/internal/tasks/task_authority.go b/internal/tasks/task_authority.go index ee3e4336..485efe71 100644 --- a/internal/tasks/task_authority.go +++ b/internal/tasks/task_authority.go @@ -11,6 +11,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/logs" + timeutil "github.com/iwind/TeaGo/utils/time" "time" ) @@ -74,7 +75,7 @@ func (this *AuthorityTask) Loop() error { return err } var oldState = teaconst.IsPlus - if resp.AuthorityKey != nil { + if resp.AuthorityKey != nil && len(resp.AuthorityKey.Value) > 0 && resp.AuthorityKey.DayTo >= timeutil.Format("Y-m-d") { teaconst.IsPlus = true } else { teaconst.IsPlus = false diff --git a/internal/web/actions/default/ns/index.go b/internal/web/actions/default/ns/index.go index 8ff05dff..d9303619 100644 --- a/internal/web/actions/default/ns/index.go +++ b/internal/web/actions/default/ns/index.go @@ -1,6 +1,7 @@ package ns import ( + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" @@ -19,6 +20,11 @@ func (this *IndexAction) RunGet(params struct { UserId int64 Keyword string }) { + if !teaconst.IsPlus { + this.RedirectURL("/") + return + } + this.Data["clusterId"] = params.ClusterId this.Data["userId"] = params.UserId this.Data["keyword"] = params.Keyword diff --git a/internal/web/actions/default/servers/server/settings/locations/create.go b/internal/web/actions/default/servers/server/settings/locations/create.go index b86d1fdb..472932a7 100644 --- a/internal/web/actions/default/servers/server/settings/locations/create.go +++ b/internal/web/actions/default/servers/server/settings/locations/create.go @@ -12,7 +12,7 @@ import ( "strings" ) -// 创建路径规则 +// CreateAction 创建路由规则 type CreateAction struct { actionutils.ParentAction } diff --git a/internal/web/actions/default/servers/server/settings/locations/location/index.go b/internal/web/actions/default/servers/server/settings/locations/location/index.go index 510c7628..f322073c 100644 --- a/internal/web/actions/default/servers/server/settings/locations/location/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/location/index.go @@ -11,7 +11,7 @@ import ( "strings" ) -// 路径规则详情 +// IndexAction 路由规则详情 type IndexAction struct { actionutils.ParentAction } @@ -52,11 +52,11 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改路径规则 %d 设置", params.LocationId) + defer this.CreateLogInfo("修改路由规则 %d 设置", params.LocationId) params.Must. Field("pattern", params.Pattern). - Require("请输入路径匹配规则") + Require("请输入路由匹配规则") // 校验正则 if params.PatternType == serverconfigs.HTTPLocationPatternTypeRegexp { diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go index e2540c36..a5aae02d 100644 --- a/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go @@ -7,7 +7,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" ) -// 查找路径规则配置 +// FindLocationConfig 查找路由规则配置 func FindLocationConfig(parentAction *actionutils.ParentAction, locationId int64) (locationConfig *serverconfigs.HTTPLocationConfig, isOk bool) { locationConfigResp, err := parentAction.RPC().HTTPLocationRPC().FindEnabledHTTPLocationConfig(parentAction.AdminContext(), &pb.FindEnabledHTTPLocationConfigRequest{LocationId: locationId}) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go index 9ad0c34a..9c520584 100644 --- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go +++ b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go @@ -52,7 +52,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改路径规则 %d 的反向代理设置", params.LocationId) + defer this.CreateLogInfo("修改路由规则 %d 的反向代理设置", params.LocationId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index dc6ffa63..540ee389 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -251,7 +251,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && len(serverConfig.Web.HostRedirects) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": "路径规则", + "name": "路由规则", "url": "/servers/server/settings/locations?serverId=" + serverIdString, "isActive": secondMenuItem == "locations", "isOn": serverConfig.Web != nil && len(serverConfig.Web.Locations) > 0, diff --git a/web/views/@default/@layout.html b/web/views/@default/@layout.html index 6b18a022..6b5d6bae 100644 --- a/web/views/@default/@layout.html +++ b/web/views/@default/@layout.html @@ -25,7 +25,7 @@
-
+
  {{teaTitle}} v{{teaVersion}}   @@ -69,7 +69,7 @@
-
+
-
+
+ 升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{monitorNodeUpgradeInfo.count}} 个监控节点需要升级到 v{{monitorNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{userNodeUpgradeInfo.count}} 个用户节点需要升级到 v{{userNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{authorityNodeUpgradeInfo.count}} 个企业版认证节点需要升级到 v{{authorityNodeUpgradeInfo.version}} 版本
+
+ + 升级提醒：有 {{monitorNodeUpgradeInfo.count}} 个监控节点需要升级到 v{{monitorNodeUpgradeInfo.version}} 版本
+
+ + 升级提醒：有 {{userNodeUpgradeInfo.count}} 个用户节点需要升级到 v{{userNodeUpgradeInfo.version}} 版本
+
+ + 升级提醒：有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本
+
+ + 升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本 +
+
+ + 升级提醒：有 {{authorityNodeUpgradeInfo.count}} 个企业版认证节点需要升级到 v{{authorityNodeUpgradeInfo.version}} 版本 +
{$template "menu"} diff --git a/web/views/@default/dashboard/boards/index.less b/web/views/@default/dashboard/boards/index.less index fcb67336..341448a5 100644 --- a/web/views/@default/dashboard/boards/index.less +++ b/web/views/@default/dashboard/boards/index.less @@ -1,8 +1,10 @@ .ui.message { - .icon { - position: absolute; - right: 1em; - top: 1.8em; + a { + .icon { + position: absolute; + right: 1em; + top: 1.8em; + } } } diff --git a/web/views/@default/dashboard/index.css b/web/views/@default/dashboard/index.css index 6a894a18..17eb73d2 100644 --- a/web/views/@default/dashboard/index.css +++ b/web/views/@default/dashboard/index.css @@ -1,4 +1,4 @@ -.ui.message .icon { +.ui.message a .icon { position: absolute; right: 1em; top: 1.8em; diff --git a/web/views/@default/dashboard/index.css.map b/web/views/@default/dashboard/index.css.map index 53288e00..d910f224 100644 --- a/web/views/@default/dashboard/index.css.map +++ b/web/views/@default/dashboard/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,EACC;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAKH;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html index f8bb1b78..68585d6b 100644 --- a/web/views/@default/dashboard/index.html +++ b/web/views/@default/dashboard/index.html @@ -2,12 +2,14 @@ {$template "/echarts"} -
升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{monitorNodeUpgradeInfo.count}} 个监控节点需要升级到 v{{monitorNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{userNodeUpgradeInfo.count}} 个用户节点需要升级到 v{{userNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{nsNodeUpgradeInfo.count}} 个DNS节点需要升级到 v{{nsNodeUpgradeInfo.version}} 版本
-
升级提醒：有 {{authorityNodeUpgradeInfo.count}} 个企业版认证节点需要升级到 v{{authorityNodeUpgradeInfo.version}} 版本
+
+ + 升级提醒：有 {{nodeUpgradeInfo.count}} 个边缘节点需要升级到 v{{nodeUpgradeInfo.version}} 版本 +
+
+ + 升级提醒：有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本 +
diff --git a/web/views/@default/dashboard/index.less b/web/views/@default/dashboard/index.less index fcb67336..341448a5 100644 --- a/web/views/@default/dashboard/index.less +++ b/web/views/@default/dashboard/index.less @@ -1,8 +1,10 @@ .ui.message { - .icon { - position: absolute; - right: 1em; - top: 1.8em; + a { + .icon { + position: absolute; + right: 1em; + top: 1.8em; + } } } diff --git a/web/views/@default/servers/server/settings/locations/@location_menu.html b/web/views/@default/servers/server/settings/locations/@location_menu.html index a8faccde..5921114a 100644 --- a/web/views/@default/servers/server/settings/locations/@location_menu.html +++ b/web/views/@default/servers/server/settings/locations/@location_menu.html @@ -1,4 +1,4 @@ - 所有路径规则 » + 所有路由规则 » {{locationConfig.pattern}} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/locations/create.html b/web/views/@default/servers/server/settings/locations/create.html index 690fd7a1..8a9ff543 100644 --- a/web/views/@default/servers/server/settings/locations/create.html +++ b/web/views/@default/servers/server/settings/locations/create.html @@ -30,7 +30,7 @@
-

如果选中了此选项，一旦匹配成功，不会继续匹配其他的路径规则。

+

如果选中了此选项，一旦匹配成功，不会继续匹配其他的路由规则。

diff --git a/web/views/@default/servers/server/settings/locations/index.html b/web/views/@default/servers/server/settings/locations/index.html index 67922135..8704d48d 100644 --- a/web/views/@default/servers/server/settings/locations/index.html +++ b/web/views/@default/servers/server/settings/locations/index.html @@ -8,7 +8,7 @@
{$template "menu"} -

暂时还没有路径规则。

+

暂时还没有路由规则。

@@ -39,5 +39,5 @@
-

拖动左侧的图标可以对路径规则进行排序。

+

拖动左侧的图标可以对路由规则进行排序。

\ No newline at end of file diff --git a/web/views/@default/servers/server/settings/locations/index.js b/web/views/@default/servers/server/settings/locations/index.js index 5b393386..d7f2d5b9 100644 --- a/web/views/@default/servers/server/settings/locations/index.js +++ b/web/views/@default/servers/server/settings/locations/index.js @@ -3,9 +3,9 @@ Tea.context(function () { this.sort() }, 1000) - // 删除路径规则 + // 删除路由规则 this.deleteLocation = function (locationId) { - teaweb.confirm("确定要删除此路径规则吗？", function () { + teaweb.confirm("确定要删除此路由规则吗？", function () { this.$post(".delete") .params({ webId: this.webId, diff --git a/web/views/@default/servers/server/settings/locations/location/index.html b/web/views/@default/servers/server/settings/locations/location/index.html index cedb89ab..4e25b5d5 100644 --- a/web/views/@default/servers/server/settings/locations/location/index.html +++ b/web/views/@default/servers/server/settings/locations/location/index.html @@ -32,7 +32,7 @@
-

如果选中了此选项，一旦匹配成功，不会继续匹配其他的路径规则。

+

如果选中了此选项，一旦匹配成功，不会继续匹配其他的路由规则。

diff --git a/web/views/@default/servers/server/settings/rewrite/createPopup.html b/web/views/@default/servers/server/settings/rewrite/createPopup.html index 1c0f5f3b..e3aa9b21 100644 --- a/web/views/@default/servers/server/settings/rewrite/createPopup.html +++ b/web/views/@default/servers/server/settings/rewrite/createPopup.html @@ -69,7 +69,7 @@
-

如果选中了此选项，一旦匹配成功，不会继续匹配其他的重写规则或路径规则。

+

如果选中了此选项，一旦匹配成功，不会继续匹配其他的重写规则或路由规则。

diff --git a/web/views/@default/servers/server/settings/rewrite/updatePopup.html b/web/views/@default/servers/server/settings/rewrite/updatePopup.html index 8aeefe13..34884aa3 100644 --- a/web/views/@default/servers/server/settings/rewrite/updatePopup.html +++ b/web/views/@default/servers/server/settings/rewrite/updatePopup.html @@ -70,7 +70,7 @@
-

如果选中了此选项，一旦匹配成功，不会继续匹配其他的重写规则或路径规则。

+

如果选中了此选项，一旦匹配成功，不会继续匹配其他的重写规则或路由规则。