From 9a7c4ae65e48c26dfeacc6dda289b7b1d80b9765 Mon Sep 17 00:00:00 2001
From: huzhushan <huzhushan@126.com>
Date: Wed, 28 Apr 2021 09:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=94=81=E5=B1=8F=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=92=8Ctoken=E4=BF=9D=E5=AD=98=E5=9C=A8=E4=B8=80=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Topbar/LockModal.vue | 14 +++++-------
 src/permission.js                          | 19 +++++++++-------
 src/store/modules/app.js                   | 26 +++++++++++++++++++++-
 src/views/lock/Unlock.vue                  | 12 +++++-----
 4 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/layout/components/Topbar/LockModal.vue b/src/layout/components/Topbar/LockModal.vue
index 5cba282..f6eb61b 100644
--- a/src/layout/components/Topbar/LockModal.vue
+++ b/src/layout/components/Topbar/LockModal.vue
@@ -44,7 +44,7 @@
  * @version: 
  * @Date: 2021-04-23 14:15:50
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-04-23 15:24:54
+ * @LastEditTime: 2021-04-28 09:23:23
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
@@ -87,9 +87,8 @@
 <script>
 import { defineComponent, reactive, ref } from 'vue'
 import Avatar from '@/components/Avatar/index.vue'
-import { setItem } from '@/utils/storage'
-import { AesEncryption } from '@/utils/encrypt'
 import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
 
 export default defineComponent({
   components: {
@@ -97,6 +96,7 @@ export default defineComponent({
   },
   setup() {
     const router = useRouter()
+    const store = useStore()
     const dialogVisible = ref(false)
     const lockForm = ref(null)
     const lockModel = reactive({
@@ -111,11 +111,9 @@ export default defineComponent({
           return false
         }
 
-        // 对密码加密
-        const encryption = new AesEncryption()
-        const pwd = encryption.encryptByAES(lockModel.password)
-        // 存储到localStorage
-        setItem('__VEA_SCREEN_LOCKED__', pwd)
+        // 对密码加密并跟token保存在一起
+        store.dispatch('app/setScreenCode', lockModel.password)
+
         // 跳转到锁屏页面
         router.push('/lock?redirect=' + router.currentRoute.value.fullPath)
       })
diff --git a/src/permission.js b/src/permission.js
index cead940..3fb34e5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,7 +26,7 @@
  * @version:
  * @Date: 2021-04-20 11:06:21
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-04-25 13:50:27
+ * @LastEditTime: 2021-04-28 09:31:23
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
@@ -77,13 +77,16 @@ router.beforeEach(async to => {
     }
 
     // 判断是否处于锁屏状态
-    if (to.name !== 'lock' && !!getItem('__VEA_SCREEN_LOCKED__')) {
-      return {
-        name: 'lock',
-        query: {
-          redirect: to.path,
-        },
-        replace: true,
+    if (to.name !== 'lock') {
+      const { authorization } = store.state.app
+      if (!!authorization && !!authorization.screenCode) {
+        return {
+          name: 'lock',
+          query: {
+            redirect: to.path,
+          },
+          replace: true,
+        }
       }
     }
 
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 0c67844..5b01f7a 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,13 +3,15 @@
  * @version:
  * @Date: 2021-04-20 11:06:21
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-04-21 09:34:07
+ * @LastEditTime: 2021-04-28 09:38:35
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
  * @Donate: https://huzhushan.gitee.io/vue3-element-admin/donate/
  */
 import { getItem, setItem, removeItem } from '@/utils/storage' //getItem和setItem是封装的操作localStorage的方法
+import { AesEncryption } from '@/utils/encrypt'
+import { toRaw } from 'vue'
 export const TOKEN = 'VEA-TOKEN'
 const COLLAPSE = 'VEA-COLLAPSE'
 
@@ -55,5 +57,27 @@ export default {
       // 清除用户信息
       commit('account/clearUserinfo', '', { root: true })
     },
+    setScreenCode({ commit, state }, password) {
+      const authorization = toRaw(state.authorization)
+
+      if (!password) {
+        try {
+          delete authorization.screenCode
+        } catch (err) {
+          console.log(err)
+        }
+        commit('setToken', authorization)
+
+        return
+      }
+
+      // 对密码加密
+      const screenCode = new AesEncryption().encryptByAES(password)
+
+      commit('setToken', {
+        ...authorization,
+        screenCode,
+      })
+    },
   },
 }
diff --git a/src/views/lock/Unlock.vue b/src/views/lock/Unlock.vue
index 6517888..04b28f2 100644
--- a/src/views/lock/Unlock.vue
+++ b/src/views/lock/Unlock.vue
@@ -37,7 +37,7 @@
  * @version: 
  * @Date: 2021-04-23 19:17:20
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-04-25 10:57:31
+ * @LastEditTime: 2021-04-28 09:35:20
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
@@ -106,12 +106,12 @@ export default defineComponent({
     const loading = ref(false)
 
     const checkPwd = async (rule, value, callback) => {
-      const encryption = new AesEncryption()
-      const cipher = getItem('__VEA_SCREEN_LOCKED__')
+      const { authorization } = store.state.app
+      const cipher = authorization && authorization.screenCode
       if (!cipher) {
         return callback()
       }
-      const pwd = encryption.decryptByAES(cipher)
+      const pwd = new AesEncryption().decryptByAES(cipher)
       if (pwd === value) {
         return callback()
       } else {
@@ -161,7 +161,8 @@ export default defineComponent({
 
         // 返回锁屏前的页面
         router.push({ path: route.query.redirect || '/', replace: true })
-        removeItem('__VEA_SCREEN_LOCKED__')
+        // 清除锁屏密码
+        store.dispatch('app/setScreenCode', '')
       })
     }
 
@@ -174,7 +175,6 @@ export default defineComponent({
       router.push('/login?redirect=' + (route.query.redirect || '/'))
       // 清除token
       store.dispatch('app/clearToken')
-      removeItem('__VEA_SCREEN_LOCKED__')
     }
 
     return {