From 5cdf8cc3803bdd4a8b9fef616639f3d66176e8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=BB=84=E6=9E=97?= Date: Sun, 10 Sep 2023 23:29:55 +0800 Subject: [PATCH] add version info and GitHub link on index --- assets/static/css/index-color.css | 5 +++++ assets/static/js/index-server-info.js | 1 + assets/templates/index.html | 6 +++++- cmd/frps-panel/cmd.go | 3 ++- pkg/server/controller/controller.go | 1 + pkg/server/controller/op.go | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/assets/static/css/index-color.css b/assets/static/css/index-color.css index eaebdcf..ba48001 100644 --- a/assets/static/css/index-color.css +++ b/assets/static/css/index-color.css @@ -108,6 +108,11 @@ section.proxy-list .proxy-info .layui-row .layui-row > div:first-child { border-color: #fde2e2; } +.version a, +.version span { + color: #99a9bf; +} + @media (prefers-color-scheme: dark) { .layui-bg-blue { background-color: #395c74 !important; diff --git a/assets/static/js/index-server-info.js b/assets/static/js/index-server-info.js index d13d9b7..429b54a 100644 --- a/assets/static/js/index-server-info.js +++ b/assets/static/js/index-server-info.js @@ -38,6 +38,7 @@ var loadServerInfo = (function ($) { function renderServerInfo(data) { var html = layui.laytpl($('#serverInfoTemplate').html()).render(data); $('#content').html(html); + $('#frpVersion').text(data.version); renderTrafficChart(data); renderCountChart(data); diff --git a/assets/templates/index.html b/assets/templates/index.html index d03ceb3..7cab438 100644 --- a/assets/templates/index.html +++ b/assets/templates/index.html @@ -68,7 +68,11 @@ -
1.0.0
+
+ Frp + | + ${ .FrpsPanel } v${ .version } +
diff --git a/cmd/frps-panel/cmd.go b/cmd/frps-panel/cmd.go index 6e8c964..3268c43 100644 --- a/cmd/frps-panel/cmd.go +++ b/cmd/frps-panel/cmd.go @@ -13,7 +13,7 @@ import ( "strings" ) -const version = "0.0.2" +const version = "1.4.0" var ( showVersion bool @@ -55,6 +55,7 @@ var rootCmd = &cobra.Command{ Subdomains: subdomains, ConfigFile: configFile, IniFile: iniFile, + Version: version, }) if err != nil { return err diff --git a/pkg/server/controller/controller.go b/pkg/server/controller/controller.go index d7d7213..0863a24 100644 --- a/pkg/server/controller/controller.go +++ b/pkg/server/controller/controller.go @@ -215,6 +215,7 @@ func (c *HandleController) MakeManagerFunc() func(context *gin.Context) { "Addr": ginI18n.MustGetMessage(context, "Addr"), "LastStart": ginI18n.MustGetMessage(context, "Last Start"), "LastClose": ginI18n.MustGetMessage(context, "Last Close"), + "version": c.Version, }) } } diff --git a/pkg/server/controller/op.go b/pkg/server/controller/op.go index 49212d2..acfe839 100644 --- a/pkg/server/controller/op.go +++ b/pkg/server/controller/op.go @@ -20,6 +20,7 @@ type HandleController struct { Subdomains map[string][]string ConfigFile string IniFile *ini.File + Version string } func NewHandleController(config *HandleController) *HandleController {