vue2-client 1.18.39 → 1.18.40

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/src/utils/request.js

@@ -12,9 +12,81 @@ import { logout, V4RefreshToken } from '@vue2-client/services/user'
 import { LOGIN, SEARCH, V4_LOGIN } from '@vue2-client/services/apiService'
 import { setV4AccessToken } from '@vue2-client/utils/login'
 import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+
 // 是否显示重新登录
 let isReloginShow
 
+// ============ 请求去重管理 ============
+// 存储进行中的请求 Map<requestKey, { promise, controller }>
+const pendingRequests = new Map()
+
+/**
+ * 生成请求唯一标识
+ * @param {object} config - axios 请求配置
+ * @returns {string} 请求标识
+ */
+function generateRequestKey (config) {
+  const { method, url, data, params } = config
+  let dataStr = ''
+  let paramsStr = ''
+  try {
+    dataStr = data ? JSON.stringify(data) : ''
+    paramsStr = params ? JSON.stringify(params) : ''
+  } catch (e) {
+    // 循环引用或其他序列化问题，使用时间戳保证唯一性
+    console.warn('[请求去重] 参数序列化失败，跳过去重')
+    dataStr = `_${Date.now()}_${Math.random()}`
+  }
+  return `${method}:${url}:${dataStr}:${paramsStr}`
+}
+
+/**
+ * 添加请求到 pending 列表
+ * @param {object} config - axios 请求配置
+ */
+function addPendingRequest (config) {
+  const requestKey = generateRequestKey(config)
+  config._requestKey = requestKey
+
+  if (!pendingRequests.has(requestKey)) {
+    // 创建 AbortController 用于取消请求
+    const controller = new AbortController()
+    config.signal = controller.signal
+    pendingRequests.set(requestKey, { controller, config })
+  }
+}
+
+/**
+ * 移除已完成的请求
+ * @param {object} config - axios 请求配置
+ */
+function removePendingRequest (config) {
+  const requestKey = config._requestKey || generateRequestKey(config)
+  if (pendingRequests.has(requestKey)) {
+    pendingRequests.delete(requestKey)
+  }
+}
+
+/**
+ * 检查是否有相同的请求正在进行
+ * @param {object} config - axios 请求配置
+ * @returns {boolean}
+ */
+function hasPendingRequest (config) {
+  const requestKey = generateRequestKey(config)
+  return pendingRequests.has(requestKey)
+}
+
+/**
+ * 清空所有 pending 请求
+ */
+export function clearPendingRequests () {
+  pendingRequests.forEach(({ controller }) => {
+    controller.abort()
+  })
+  pendingRequests.clear()
+}
+
 axios.defaults.timeout = 50000
 axios.defaults.withCredentials = true
 // 如果是microapp
@@ -145,6 +217,24 @@ function checkAuthorization (authType = AUTH_TYPE.BEARER) {
 function loadInterceptors () {
   // 加载请求拦截器
   axios.interceptors.request.use(config => {
+    // ============ 请求去重逻辑 ============
+    // POST 请求默认开启去重，可通过 config.dedupe = false 关闭
+    const shouldDedupe = config.method?.toLowerCase() === 'post' && config.dedupe !== false
+
+    if (shouldDedupe && hasPendingRequest(config)) {
+      // 相同请求正在进行中，直接拒绝，不发起请求
+      console.warn(`重复请求被拦截: ${config.url}`)
+      const error = new Error('重复请求被取消')
+      error.code = 'ERR_DUPLICATE_REQUEST'
+      error.config = config
+      return Promise.reject(error)
+    }
+
+    if (shouldDedupe) {
+      addPendingRequest(config)
+    }
+    // ============ 去重逻辑结束 ============
+
     const token = localStorage.getItem(ACCESS_TOKEN)
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
@@ -189,6 +279,9 @@ function loadInterceptors () {
   }, errorHandler)
   // 加载响应拦截器
   axios.interceptors.response.use((res) => {
+    // 请求完成，移除 pending 记录
+    removePendingRequest(res.config)
+
     // 判断是否需要解密
     if (res.headers && res.headers['x-encrypted'] === '1') {
       const v4SessionKey = localStorage.getItem('v4-session-key')
@@ -315,6 +408,16 @@ function loginExpire () {
 }
 // 异常拦截处理器
 const errorHandler = (error) => {
+  // 请求失败，移除 pending 记录
+  if (error.config) {
+    removePendingRequest(error.config)
+  }
+
+  // 如果是被取消的请求（去重导致或 AbortController），静默处理
+  if (error.name === 'CanceledError' || error.code === 'ERR_CANCELED' || error.code === 'ERR_DUPLICATE_REQUEST') {
+    return Promise.reject(error)
+  }
+
   if (error.response) {
     const data = error.response.data
     // 从 localstorage 获取 token

package/vue.config.js

@@ -53,13 +53,18 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-linepatrol/': {
-        // pathRewrite: { '^/api/af-linepatrol/': '/' },
-        target: revenue,
+        pathRewrite: { '^/api/af-linepatrol/': '/' },
+        target: 'http://127.0.0.1:9012',
         changeOrigin: true
       },
       '/api/linepatrol/': {
-        // pathRewrite: { '^/api/linepatrol/': '/' },
-        target: revenue,
+        pathRewrite: { '^/api/linepatrol/': '/' },
+        target: 'http://127.0.0.1:9012',
+        changeOrigin: true
+      },
+      '/api/af-revenue/': {
+        pathRewrite: { '^/api/af-revenue/': '/' },
+        target: 'http://127.0.0.1:9026',
         changeOrigin: true
       },
       // '/api/af-system/resource': {

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0