vue2-client 1.22.4 → 1.22.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.22.4",
+  "version": "1.22.5",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/pages/login/Login.vue

@@ -160,9 +160,10 @@ export default {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        const jwt = res.jwtNew
         // 获取路由配置
         getRoutesConfig(data, this.routeName).then(result => {
-          this.$login.login(result).then(() => {
+          this.$login.login(result, jwt).then(() => {
             // V3任何情况首位加入资源管理
             const resourceManageMain = {
               name: '资源管理',
@@ -172,7 +173,7 @@ export default {
             }
             result.functions.unshift(resourceManageMain)
             this.afterGeneral(result)
-            this.setAccessToken(data)
+            this.setAccessToken(data, jwt)
             if (result.deps === '用户工单登记') {
               this.$router.push(this.ticketPage).catch(() => {})
             } else {
@@ -216,14 +217,15 @@ export default {
       indexedDB.clear()
       this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
     },
-    setAccessToken (data) {
-      if (data) {
-        localStorage.setItem(ACCESS_TOKEN, data)
-        let timestamp = new Date().getTime()// 当前的时间戳
+    setAccessToken (data, jwt) {
+      const token = jwt || data
+      if (token) {
+        localStorage.setItem(ACCESS_TOKEN, token)
+        let timestamp = new Date().getTime() // 当前的时间戳
         timestamp = timestamp + 12 * 60 * 60 * 1000
         // 格式化时间获取年月日, 登陆过期时间
         const dateAfter = new Date(timestamp)
-        setAuthorization({ token: data, expireAt: dateAfter })
+        setAuthorization({ token: token, expireAt: dateAfter })
       }
     }
   }

package/src/pages/login/LoginV3.vue

@@ -159,9 +159,10 @@ export default {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        const jwt = res.jwtNew
         // 获取路由配置
         getRoutesConfig(data, this.routeName).then(result => {
-          this.$login.login(result).then(() => {
+          this.$login.login(result, jwt).then(() => {
             // V3任何情况首位加入资源管理
             const resourceManageMain = {
               name: '资源管理',
@@ -171,7 +172,7 @@ export default {
             }
             result.functions.unshift(resourceManageMain)
             this.afterGeneral(result)
-            this.setAccessToken(data)
+            this.setAccessToken(data, jwt)
             if (result.deps === '用户工单登记') {
               this.$router.push(this.ticketPage).catch(() => {})
             } else {
@@ -215,14 +216,15 @@ export default {
       indexedDB.clear()
       this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
     },
-    setAccessToken (data) {
-      if (data) {
-        localStorage.setItem(ACCESS_TOKEN, data)
-        let timestamp = new Date().getTime()// 当前的时间戳
+    setAccessToken (data, jwt) {
+      const token = jwt || data
+      if (token) {
+        localStorage.setItem(ACCESS_TOKEN, token)
+        let timestamp = new Date().getTime() // 当前的时间戳
         timestamp = timestamp + 12 * 60 * 60 * 1000
         // 格式化时间获取年月日, 登陆过期时间
         const dateAfter = new Date(timestamp)
-        setAuthorization({ token: data, expireAt: dateAfter })
+        setAuthorization({ token: token, expireAt: dateAfter })
       }
     }
   }

package/src/utils/login.js

@@ -42,27 +42,16 @@ export function checkSingleAuthorization(authType = AUTH_TYPE.BEARER, token) {
   return false
 }
 
-function setSingleAuthorization(auth, authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      localStorage.setItem(V4_ACCESS_TOKEN, 'Bearer ' + auth.token)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
 function setAccessToken(data, jwt) {
   const token = jwt || data
-  localStorage.setItem(ACCESS_TOKEN, token)
-  let timestamp = new Date().getTime() // 当前的时间戳
-  timestamp = timestamp + 12 * 60 * 60 * 1000
-  // 格式化时间获取年月日, 登陆过期时间
-  const dateAfter = new Date(timestamp)
-  setSingleAuthorization({ token: token, expireAt: dateAfter })
+  if (token) {
+    localStorage.setItem(ACCESS_TOKEN, token)
+    let timestamp = new Date().getTime() // 当前的时间戳
+    timestamp = timestamp + 12 * 60 * 60 * 1000
+    // 格式化时间获取年月日, 登陆过期时间
+    const dateAfter = new Date(timestamp)
+    setAuthorization({ token: token, expireAt: dateAfter })
+  }
 }
 
 function afterGeneral(result, options) {