From e5284856173ea1f2993f46fca4675b309bfd5bfd Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 21 Jan 2020 11:34:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 9bcfaca6..633d6dc7 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -39,7 +39,6 @@ export default { }, mounted () { window.setUseStats = (value) => { - localStorage.setItem('useStats', value) document.querySelector('.el-message__closeBtn').click() if (value === 1) { this.$st.sendPv('/allow_stats') @@ -48,6 +47,7 @@ export default { this.$st.sendPv('/disallow_stats') this.$st.sendEv('全局', '允许/禁止统计', '禁止') } + localStorage.setItem('useStats', value) } // first-time user From 47c224ecf4adc8109464c9c9699362ff5189979b Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 21 Jan 2020 15:40:03 +0800 Subject: [PATCH 2/5] updated stats --- frontend/src/App.vue | 9 ++++++--- frontend/src/views/layout/components/Sidebar/index.vue | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 633d6dc7..bf60dc0b 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -34,10 +34,13 @@ export default { } }, methods: {}, - created () { - this.$store.dispatch('setting/getSetting') + async created () { + await this.$store.dispatch('setting/getSetting') }, - mounted () { + async mounted () { + const res = await this.$request.get('/version') + this.version = res.data.data + sessionStorage.setItem('v', this.version) window.setUseStats = (value) => { document.querySelector('.el-message__closeBtn').click() if (value === 1) { diff --git a/frontend/src/views/layout/components/Sidebar/index.vue b/frontend/src/views/layout/components/Sidebar/index.vue index 8b371a44..97e3d86a 100644 --- a/frontend/src/views/layout/components/Sidebar/index.vue +++ b/frontend/src/views/layout/components/Sidebar/index.vue @@ -55,9 +55,7 @@ export default { } }, async created () { - const res = await this.$request.get('/version') - this.version = res.data.data - sessionStorage.setItem('v', this.version) + } } From 0ccac805d779f22efb28ec5b0cdebcd978bcd921 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Tue, 21 Jan 2020 15:40:17 +0800 Subject: [PATCH 3/5] updated stats --- frontend/src/views/layout/components/Sidebar/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/layout/components/Sidebar/index.vue b/frontend/src/views/layout/components/Sidebar/index.vue index 97e3d86a..942cd3dd 100644 --- a/frontend/src/views/layout/components/Sidebar/index.vue +++ b/frontend/src/views/layout/components/Sidebar/index.vue @@ -55,7 +55,6 @@ export default { } }, async created () { - } } From ec76d07b1a1d46fc7e5348cbae136bbb6ee16898 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Wed, 22 Jan 2020 11:07:38 +0800 Subject: [PATCH 4/5] updated stats --- backend/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/main.go b/backend/main.go index 20d70b22..a7a07002 100644 --- a/backend/main.go +++ b/backend/main.go @@ -133,6 +133,8 @@ func main() { anonymousGroup.POST("/login", routes.Login) // 用户登录 anonymousGroup.PUT("/users", routes.PutUser) // 添加用户 anonymousGroup.GET("/setting", routes.GetSetting) // 获取配置信息 + // release版本 + anonymousGroup.GET("/version", routes.GetVersion) // 获取发布的版本 } authGroup := app.Group("/", middlewares.AuthorizationMiddleware()) { @@ -206,8 +208,6 @@ func main() { authGroup.DELETE("/users/:id", routes.DeleteUser) // 删除用户 authGroup.GET("/me", routes.GetMe) // 获取自己账户 authGroup.POST("/me", routes.PostMe) // 修改自己账户 - // release版本 - authGroup.GET("/version", routes.GetVersion) // 获取发布的版本 // 系统 authGroup.GET("/system/deps/:lang", routes.GetAllDepList) // 节点所有第三方依赖列表 authGroup.GET("/system/deps/:lang/:dep_name/json", routes.GetDepJson) // 节点第三方依赖JSON From e659d60c0eb258e89522098791858d98ba222748 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Wed, 22 Jan 2020 12:17:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BAversion=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/layout/components/Sidebar/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/layout/components/Sidebar/index.vue b/frontend/src/views/layout/components/Sidebar/index.vue index 942cd3dd..34679a77 100644 --- a/frontend/src/views/layout/components/Sidebar/index.vue +++ b/frontend/src/views/layout/components/Sidebar/index.vue @@ -47,11 +47,13 @@ export default { }, isCollapse () { return !this.sidebar.opened + }, + version () { + return window.sessionStorage.getItem('v') } }, data () { return { - version: '' } }, async created () {