vue2-client 1.17.34 → 1.17.35

package/src/services/api/restTools.js

@@ -1,215 +1,215 @@
-import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
-import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param serviceName
- * @param isDev
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function postByServiceName (url, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
-  if (url.startsWith('api/') || url.startsWith('/api/')) {
-    return request(url, METHOD.POST, parameter, config)
-  }
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  if (!url.startsWith('/')) {
-    url = '/' + url
-  }
-  url = apiPre + serviceName + url
-  return request(url, METHOD.POST, parameter, config)
-}
-
-/**
- * DELETE请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function del (url, parameter, config = {}) {
-  return request(url, METHOD.DELETE, parameter, config)
-}
-
-/**
- * PUT请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function put (url, parameter, config = {}) {
-  return request(url, METHOD.PUT, parameter, config)
-}
-
-/**
- * 封装 EventSource 请求函数
- * @param {string} url - 请求地址
- * @param {Object} options - 请求选项（包括 method, headers, body 等）
- * @param {Function} onDataUpdate - 数据更新回调，每次接收到新的数据都会调用
- * @param {Function} onError - 错误处理回调
- * @returns {Function} - 用于取消请求的函数
- */
-function startEventStreamPOST (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
-  return startEventStream(url, params, headers, onDataUpdate, onError, serviceName, 'POST')
-}
-function startEventStream (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
-  // let isStopped = false
-  let isStopped = false
-  let requestCount = 0
-
-  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
-    }
-    url = '/api/' + serviceName + url
-  }
-
-  console.log(`[EventStream] 开始新的请求: ${url}`, {
-    params,
-    headers,
-    method
-  })
-
-  const controller = new AbortController()
-  const { signal } = controller
-  const token = localStorage.getItem(ACCESS_TOKEN)
-  // 增加 V4 登录请求头
-  if (token) {
-    const compatible = getSystemVersion()
-    if (compatible === 'V4') {
-      // V4 环境则添加 V4请求头
-      headers[V4_ACCESS_TOKEN] = token
-    } else {
-      headers[ACCESS_TOKEN] = token
-    }
-  }
-  fetch(url, {
-    method: method,
-    headers: {
-      ...headers,
-      Accept: 'text/event-stream',
-      'Cache-Control': 'no-cache',
-      Connection: 'keep-alive'
-    },
-    body: JSON.stringify(params),
-    signal
-  }).then(response => {
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`)
-    }
-
-    requestCount++
-    console.log(`[EventStream] 请求已打开 (第${requestCount}次): ${url}`, {
-      status: response.status,
-      statusText: response.statusText
-    })
-
-    const reader = response.body.getReader()
-    const decoder = new TextDecoder()
-    let buffer = ''
-
-    function processStream () {
-      if (isStopped) {
-        console.log(`[EventStream] 请求已停止，停止读取流: ${url}`)
-        return
-      }
-
-      reader.read().then(({ done, value }) => {
-        if (done) {
-          console.log(`[EventStream] 流读取完成: ${url}`)
-          return
-        }
-
-        const chunk = decoder.decode(value, { stream: true })
-        buffer += chunk
-
-        // 处理接收到的数据
-        const lines = buffer.split('\n')
-        buffer = lines.pop() // 保留最后一个不完整的行
-
-        let currentEvent = null
-        let currentData = null
-
-        for (const line of lines) {
-          if (line.startsWith('event: ')) {
-            currentEvent = line.slice(7)
-          } else if (line.startsWith('data: ')) {
-            currentData = line.slice(6)
-            try {
-              const parsedData = JSON.parse(currentData)
-              if (currentEvent === 'additionalInfo') {
-                // 触发 additionalInfo 回调
-                onDataUpdate?.(parsedData, 'additionalInfo')
-              } else {
-                // 普通消息数据
-                onDataUpdate?.(parsedData, 'sourceInfo')
-              }
-            } catch (e) {
-              if (currentEvent === 'sourceInfo') {
-                // 触发 sourceInfo 回调
-                onDataUpdate?.(currentData, 'sourceInfo')
-              } else {
-                onDataUpdate?.(currentData, 'data')
-              }
-            }
-            // 重置当前事件和数据
-            currentEvent = null
-            currentData = null
-          }
-        }
-
-        processStream()
-      }).catch(error => {
-        console.error(`[EventStream] 流读取错误: ${url}`, error)
-        if (!isStopped) {
-          isStopped = true
-          onError?.(error)
-        }
-      })
-    }
-
-    processStream()
-  }).catch(error => {
-    console.error(`[EventStream] 请求错误: ${url}`, error)
-    if (!isStopped) {
-      isStopped = true
-      onError?.(error)
-    }
-  })
-
-  // 返回停止函数
-  return () => {
-    isStopped = true
-    controller.abort()
-    console.log('连接已关闭')
-  }
-}
-
-export { get, post, del, put, postByServiceName, startEventStream, startEventStreamPOST }
+import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
+import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param serviceName
+ * @param isDev
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function postByServiceName (url, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
+  if (url.startsWith('api/') || url.startsWith('/api/')) {
+    return request(url, METHOD.POST, parameter, config)
+  }
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  if (!url.startsWith('/')) {
+    url = '/' + url
+  }
+  url = apiPre + serviceName + url
+  return request(url, METHOD.POST, parameter, config)
+}
+
+/**
+ * DELETE请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function del (url, parameter, config = {}) {
+  return request(url, METHOD.DELETE, parameter, config)
+}
+
+/**
+ * PUT请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function put (url, parameter, config = {}) {
+  return request(url, METHOD.PUT, parameter, config)
+}
+
+/**
+ * 封装 EventSource 请求函数
+ * @param {string} url - 请求地址
+ * @param {Object} options - 请求选项（包括 method, headers, body 等）
+ * @param {Function} onDataUpdate - 数据更新回调，每次接收到新的数据都会调用
+ * @param {Function} onError - 错误处理回调
+ * @returns {Function} - 用于取消请求的函数
+ */
+function startEventStreamPOST (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
+  return startEventStream(url, params, headers, onDataUpdate, onError, serviceName, 'POST')
+}
+function startEventStream (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
+  // let isStopped = false
+  let isStopped = false
+  let requestCount = 0
+
+  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
+    if (!url.startsWith('/')) {
+      url = '/' + url
+    }
+    url = '/api/' + serviceName + url
+  }
+
+  console.log(`[EventStream] 开始新的请求: ${url}`, {
+    params,
+    headers,
+    method
+  })
+
+  const controller = new AbortController()
+  const { signal } = controller
+  const token = localStorage.getItem(ACCESS_TOKEN)
+  // 增加 V4 登录请求头
+  if (token) {
+    const compatible = getSystemVersion()
+    if (compatible === 'V4') {
+      // V4 环境则添加 V4请求头
+      headers[V4_ACCESS_TOKEN] = token
+    } else {
+      headers[ACCESS_TOKEN] = token
+    }
+  }
+  fetch(url, {
+    method: method,
+    headers: {
+      ...headers,
+      Accept: 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive'
+    },
+    body: JSON.stringify(params),
+    signal
+  }).then(response => {
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`)
+    }
+
+    requestCount++
+    console.log(`[EventStream] 请求已打开 (第${requestCount}次): ${url}`, {
+      status: response.status,
+      statusText: response.statusText
+    })
+
+    const reader = response.body.getReader()
+    const decoder = new TextDecoder()
+    let buffer = ''
+
+    function processStream () {
+      if (isStopped) {
+        console.log(`[EventStream] 请求已停止，停止读取流: ${url}`)
+        return
+      }
+
+      reader.read().then(({ done, value }) => {
+        if (done) {
+          console.log(`[EventStream] 流读取完成: ${url}`)
+          return
+        }
+
+        const chunk = decoder.decode(value, { stream: true })
+        buffer += chunk
+
+        // 处理接收到的数据
+        const lines = buffer.split('\n')
+        buffer = lines.pop() // 保留最后一个不完整的行
+
+        let currentEvent = null
+        let currentData = null
+
+        for (const line of lines) {
+          if (line.startsWith('event: ')) {
+            currentEvent = line.slice(7)
+          } else if (line.startsWith('data: ')) {
+            currentData = line.slice(6)
+            try {
+              const parsedData = JSON.parse(currentData)
+              if (currentEvent === 'additionalInfo') {
+                // 触发 additionalInfo 回调
+                onDataUpdate?.(parsedData, 'additionalInfo')
+              } else {
+                // 普通消息数据
+                onDataUpdate?.(parsedData, 'sourceInfo')
+              }
+            } catch (e) {
+              if (currentEvent === 'sourceInfo') {
+                // 触发 sourceInfo 回调
+                onDataUpdate?.(currentData, 'sourceInfo')
+              } else {
+                onDataUpdate?.(currentData, 'data')
+              }
+            }
+            // 重置当前事件和数据
+            currentEvent = null
+            currentData = null
+          }
+        }
+
+        processStream()
+      }).catch(error => {
+        console.error(`[EventStream] 流读取错误: ${url}`, error)
+        if (!isStopped) {
+          isStopped = true
+          onError?.(error)
+        }
+      })
+    }
+
+    processStream()
+  }).catch(error => {
+    console.error(`[EventStream] 请求错误: ${url}`, error)
+    if (!isStopped) {
+      isStopped = true
+      onError?.(error)
+    }
+  })
+
+  // 返回停止函数
+  return () => {
+    isStopped = true
+    controller.abort()
+    console.log('连接已关闭')
+  }
+}
+
+export { get, post, del, put, postByServiceName, startEventStream, startEventStreamPOST }

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 }