vue2-client 1.22.3 → 1.22.5

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,15 @@ 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) {
-  if (data) {
-    localStorage.setItem(ACCESS_TOKEN, data)
+function 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)
-    setSingleAuthorization({ token: data, expireAt: dateAfter })
+    setAuthorization({ token: token, expireAt: dateAfter })
   }
 }
 
@@ -108,11 +96,12 @@ function afterLogin(res, options) {
     const data = encrypt.encrypt(
       JSON.stringify({ username: name, password: password })
     )
+    const jwt = res.jwtNew
     // 获取路由配置
     getRoutesConfig(data, setting.routeName)
       .then((result) => {
         Vue.$login
-          .login(result)
+          .login(result, jwt)
           .then(() => {
             // V3任何情况首位加入资源管理
             const resourceManageMain = {
@@ -123,7 +112,7 @@ function afterLogin(res, options) {
             }
             result.functions.unshift(resourceManageMain)
             afterGeneral(result, options)
-            setAccessToken(data)
+            setAccessToken(data, jwt)
             if (result.deps === '用户工单登记') {
               router.push(setting.ticketPage).catch(() => {
               })

package/.history/.eslintrc_20260521171150.js

@@ -1,74 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  // prettier 放最后，自动关闭所有与 Prettier 冲突的格式规则
-  extends: ['plugin:vue/essential', 'plugin:vue/strongly-recommended', 'plugin:vue/vue3-recommended', '@vue/standard', 'prettier'],
-  rules: {
-    camelcase: 'off',
-    'comma-dangle': 'off',
-    'no-console': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'generator-star-spacing': 'off',
-    'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': 'off',
-    'vue/attribute-hyphenation': 0,
-    'vue/html-self-closing': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/no-unused-components': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/no-use-v-if-with-v-for': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/no-parsing-error': 0,
-    'vue/name-property-casing': 0,
-    'vue/multi-word-component-names': 0,
-    'vue/no-mutating-props': 0,
-    'no-tabs': 0,
-    'multiline-ternary': 0,
-    'object-shorthand': 0,
-    quotes: [
-      2,
-      'single',
-      {
-        avoidEscape: true,
-        allowTemplateLiterals: true
-      }
-    ],
-    semi: [
-      2,
-      'never',
-      {
-        beforeStatementContinuationChars: 'never'
-      }
-    ],
-    'no-delete-var': 2,
-    'prefer-const': [
-      2,
-      {
-        ignoreReadBeforeAssign: false
-      }
-    ],
-    'template-curly-spacing': 'off',
-    indent: 'off',
-    // 必须使用全等: false
-    eqeqeq: 0,
-    // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off',
-    // 关闭函数名后空格检查，跟随 Prettier 默认风格 function foo()
-    'space-before-function-paren': 'off'
-  },
-  parserOptions: {
-    parser: '@babel/eslint-parser'
-  },
-  overrides: [
-    {
-      files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
-      env: {
-        jest: true
-      }
-    }
-  ]
-}

package/.history/.eslintrc_20260521171213.js

@@ -1,74 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  // prettier 放最后，自动关闭所有与 Prettier 冲突的格式规则
-  extends: ['plugin:vue/essential', 'plugin:vue/strongly-recommended', '@vue/standard', 'prettier'],
-  rules: {
-    camelcase: 'off',
-    'comma-dangle': 'off',
-    'no-console': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'generator-star-spacing': 'off',
-    'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': 'off',
-    'vue/attribute-hyphenation': 0,
-    'vue/html-self-closing': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/no-unused-components': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/no-use-v-if-with-v-for': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/no-parsing-error': 0,
-    'vue/name-property-casing': 0,
-    'vue/multi-word-component-names': 0,
-    'vue/no-mutating-props': 0,
-    'no-tabs': 0,
-    'multiline-ternary': 0,
-    'object-shorthand': 0,
-    quotes: [
-      2,
-      'single',
-      {
-        avoidEscape: true,
-        allowTemplateLiterals: true
-      }
-    ],
-    semi: [
-      2,
-      'never',
-      {
-        beforeStatementContinuationChars: 'never'
-      }
-    ],
-    'no-delete-var': 2,
-    'prefer-const': [
-      2,
-      {
-        ignoreReadBeforeAssign: false
-      }
-    ],
-    'template-curly-spacing': 'off',
-    indent: 'off',
-    // 必须使用全等: false
-    eqeqeq: 0,
-    // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off',
-    // 关闭函数名后空格检查，跟随 Prettier 默认风格 function foo()
-    'space-before-function-paren': 'off'
-  },
-  parserOptions: {
-    parser: '@babel/eslint-parser'
-  },
-  overrides: [
-    {
-      files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
-      env: {
-        jest: true
-      }
-    }
-  ]
-}