From 2baf1231fb807adb055aa119ef59d50fd89ba542 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 24 Jul 2018 10:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: bd8e62cb1176c5c72e9488fe8d5c8f38f77e04b1 [formerly bd8e62cb1176c5c72e9488fe8d5c8f38f77e04b1 [formerly bd8e62cb1176c5c72e9488fe8d5c8f38f77e04b1 [formerly bd8e62cb1176c5c72e9488fe8d5c8f38f77e04b1 [formerly cf82b886c527b03972cedcafc5668121166909f2 [formerly 0309fd84c4814c2c37d9d5574647030fea59f0d4]]]]]
Former-commit-id: 1cd1b6fe9a45d9402c1cc360354343ebe0cf6ff3
Former-commit-id: b3fb970877f9519f75ce614397747eb6d946ca08
Former-commit-id: ed677ded8ea24939bd035379451ece7d702ed7ea [formerly 7bb7ed67507187934d2509937dee4b83edf8e956]
Former-commit-id: 860c98dbf78b1005805c1a85d382b8c9d6b72c84
Former-commit-id: 525977932b688689d5ba2a8659f215ad20733729
Former-commit-id: 5c3dc34e1728ef16655190f18d0242f7e6afd0e4
Former-commit-id: 98f010c91a6a76d65ca85ff99d108695058464b6
Former-commit-id: 1250470e95353e562e2b9813f8531d6976e3708e
---
 src/libs/util.js                            | 50 ++++++---------------
 src/router/index.js                         |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id |  2 +-
 3 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index a5d58e93..879af305 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -8,57 +8,33 @@ import { version } from '../../package.json'
 let util = {}
 
 /**
- * @description 存储 uuid 到 cookie
- * @param {String} value uuid value
+ * @description 存储 cookie 值
+ * @param {String} name cookie name
+ * @param {String} value cookie value
  * @param {Object} setting cookie setting
  */
-util.uuidSet = function (value = '', setting = {}) {
+util.cookieSet = function (name = 'default', value = '', setting = {}) {
   let cookieSetting = {
     expires: 1
   }
   Object.assign(cookieSetting, setting)
-  Cookies.set(`d2admin-${version}-uuid`, value, cookieSetting)
+  Cookies.set(`d2admin-${version}-${name}`, value, cookieSetting)
 }
 
 /**
- * @description 得到现在的用户 uuid
+ * @description 拿到 cookie 值
+ * @param {String} name cookie name
  */
-util.uuidGet = function () {
-  return Cookies.get(`d2admin-${version}-uuid`)
+util.cookieGet = function (name = 'default') {
+  return Cookies.get(`d2admin-${version}-${name}`)
 }
 
 /**
- * @description 删除用户 uuid
+ * @description 删除 cookie
+ * @param {String} name cookie name
  */
-util.uuidRemove = function () {
-  return Cookies.remove(`d2admin-${version}-uuid`)
-}
-
-/**
- * @description 存储 token 到 cookie
- * @param {String} value token value
- * @param {Object} setting cookie setting
- */
-util.tokenSet = function (value = '', setting = {}) {
-  let cookieSetting = {
-    expires: 1
-  }
-  Object.assign(cookieSetting, setting)
-  Cookies.set(`d2admin-${version}-token`, value, cookieSetting)
-}
-
-/**
- * @description 得到现在的用户 token
- */
-util.tokenGet = function () {
-  return Cookies.get(`d2admin-${version}-token`)
-}
-
-/**
- * @description 删除用户 token
- */
-util.tokenRemove = function () {
-  return Cookies.remove(`d2admin-${version}-token`)
+util.cookieRemove = function (name = 'default') {
+  return Cookies.remove(`d2admin-${version}-${name}`)
 }
 
 /**
diff --git a/src/router/index.js b/src/router/index.js
index c90c70a4..b065a3c3 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,7 +19,7 @@ router.beforeEach((to, from, next) => {
   if (to.matched.some(r => r.meta.requiresAuth)) {
     // 这里暂时将cookie里是否存有token作为验证是否登陆的条件
     // 请根据自身业务需要修改
-    const token = util.tokenGet()
+    const token = util.cookieGet('token')
     if (token && token !== 'undefined') {
       next()
     } else {
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 065ad2a4..71dedf57 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-2372f09c3e06b1cc538901de0bb6cd6c3c21b8f2
\ No newline at end of file
+7ef7e525f2d37a8e3fef5528dd88a3b143b5d688
\ No newline at end of file