From 67672fbc94e0cca4e2f78214f19f744f016b4c90 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 Feb 2023 13:49:59 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E7=99=BB=E5=BD=95):=20=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E9=92=89=E9=92=89=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=85=8D?=
 =?UTF-8?q?=E7=99=BB=E4=BD=BF=E7=94=A8DE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/ehcache/ehcache.xml | 18 ++++--------------
 mobile/src/locale/zh-Hans.json                 |  2 +-
 mobile/src/locale/zh-Hant.json                 |  2 +-
 mobile/src/pages.json                          |  2 +-
 mobile/src/pages/login/index.vue               | 11 +++++++++--
 5 files changed, 16 insertions(+), 19 deletions(-)

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 @@
     <cache
             name="sys_token_store"
             eternal="true"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="3000"
+            maxElementsInMemory="1"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
     />
 
-    <cache
-            name="sys_token_store_delay"
-            eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="3000"
-            overflowToDisk="true"
-            diskPersistent="false"
-            timeToIdleSeconds="3"
-            timeToLiveSeconds="5"
-            memoryStoreEvictionPolicy="LRU"
-    />
+
 
 
 </ehcache>
\ 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