diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml index f8d8591b20..5976911a62 100644 --- a/backend/src/main/resources/ehcache/ehcache.xml +++ b/backend/src/main/resources/ehcache/ehcache.xml @@ -273,23 +273,13 @@ - + \ No newline at end of file diff --git a/mobile/src/locale/zh-Hans.json b/mobile/src/locale/zh-Hans.json index afaed12e0f..3da2e19ea1 100644 --- a/mobile/src/locale/zh-Hans.json +++ b/mobile/src/locale/zh-Hans.json @@ -1,5 +1,5 @@ { - "app.name": "Hello uni-app", + "app.name": "DataEase", "navigate.menuHome": "首页", "navigate.menuDir": "目录", diff --git a/mobile/src/locale/zh-Hant.json b/mobile/src/locale/zh-Hant.json index a3b8f5f97c..ff6fb1f846 100644 --- a/mobile/src/locale/zh-Hant.json +++ b/mobile/src/locale/zh-Hant.json @@ -1,5 +1,5 @@ { - "app.name": "Hello uni-app", + "app.name": "DataEase", "navigate.menuHome": "首頁", "navigate.menuDir": "目錄", "navigate.menuMe": "我的", diff --git a/mobile/src/pages.json b/mobile/src/pages.json index 1fcfb0dc34..11a720f61d 100644 --- a/mobile/src/pages.json +++ b/mobile/src/pages.json @@ -4,7 +4,7 @@ { "path": "pages/login/index", "style": { - "navigationBarTitleText": "%navigate.login%", + "navigationBarTitleText": "%app.name%", "app-plus": { "titleNView": false } diff --git a/mobile/src/pages/login/index.vue b/mobile/src/pages/login/index.vue index 12b9d94dee..5c68fc6808 100644 --- a/mobile/src/pages/login/index.vue +++ b/mobile/src/pages/login/index.vue @@ -69,7 +69,7 @@ title: this.$t('commons.loading') }); this.loadUiInfo() - this.loadPublicKey() + this.loadPublicKey() if (!this.autoLogin() && getToken() && getUserInfo()) { this.toMain() } @@ -154,8 +154,15 @@ const url = window.location.href const param = getUrlParams(url) if (param?.detoken) { + if(param.detoken.endsWith('#/')) + param.detoken = param.detoken.substr(0, param.detoken.length - 2) setToken(param.detoken) - this.toMain() + getInfo().then(res => { + setUserInfo(res.data) + const redirect = window.location.href.split('?')[0] + + window.location.href = redirect + }) return true } return false