vue2-client 1.10.13 → 1.10.15

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/services/api/index.js

@@ -1,17 +1,17 @@
-import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { manageApi } from '@vue2-client/services/api/manage'
-import { get, post, postByServiceName } from '@vue2-client/services/api/restTools'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-
-export {
-  commonApi, getConfig, query, addOrModify, remove,
-  DictionaryDetailsViewApi,
-  LogDetailsViewApi,
-  manageApi,
-  QueryParamsDetailsViewApi,
-  get, post, postByServiceName,
-  TicketDetailsViewApi
-}
+import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { get, post, postByServiceName } from '@vue2-client/services/api/restTools'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+
+export {
+  commonApi, getConfig, query, addOrModify, remove,
+  DictionaryDetailsViewApi,
+  LogDetailsViewApi,
+  manageApi,
+  QueryParamsDetailsViewApi,
+  get, post, postByServiceName,
+  TicketDetailsViewApi
+}

package/src/services/api/restTools.js

@@ -1,145 +1,145 @@
-import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
-import { fetchEventSource } from '@microsoft/fetch-event-source'
-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
-  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
-    }
-    url = '/api/' + serviceName + url
-  }
-  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
-    }
-  }
-  // 开始请求
-  fetchEventSource(url, {
-    method: method,
-    headers: headers,
-    body: JSON.stringify(params),
-    signal,
-    onopen (response) {
-      if (!response.ok) {
-        const error = new Error(`Error: ${response.status} ${response.statusText}`)
-        onError?.(error)
-        throw error
-      }
-      console.log('连接已打开')
-    },
-    onmessage (event) {
-      if (isStopped) return
-      const data = event.data
-      try {
-        const parsedData = JSON.parse(data)
-        onDataUpdate?.(parsedData)
-      } catch (e) {
-        onDataUpdate?.(data)
-      }
-    },
-    onerror (error) {
-      if (isStopped) return
-      console.error('发生错误:', error)
-      isStopped = true
-      controller.abort()
-      onError?.(error)
-    },
-  }).then(r => {})
-
-  // 返回停止函数
-  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 { fetchEventSource } from '@microsoft/fetch-event-source'
+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
+  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
+    if (!url.startsWith('/')) {
+      url = '/' + url
+    }
+    url = '/api/' + serviceName + url
+  }
+  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
+    }
+  }
+  // 开始请求
+  fetchEventSource(url, {
+    method: method,
+    headers: headers,
+    body: JSON.stringify(params),
+    signal,
+    onopen (response) {
+      if (!response.ok) {
+        const error = new Error(`Error: ${response.status} ${response.statusText}`)
+        onError?.(error)
+        throw error
+      }
+      console.log('连接已打开')
+    },
+    onmessage (event) {
+      if (isStopped) return
+      const data = event.data
+      try {
+        const parsedData = JSON.parse(data)
+        onDataUpdate?.(parsedData)
+      } catch (e) {
+        onDataUpdate?.(data)
+      }
+    },
+    onerror (error) {
+      if (isStopped) return
+      console.error('发生错误:', error)
+      isStopped = true
+      controller.abort()
+      onError?.(error)
+    },
+  }).then(r => {})
+
+  // 返回停止函数
+  return () => {
+    isStopped = true
+    controller.abort()
+    console.log('连接已关闭')
+  }
+}
+
+export { get, post, del, put, postByServiceName, startEventStream, startEventStreamPOST }

package/src/services/apiService.js

@@ -1,15 +1,15 @@
-// 跨域代理前缀
-// const API_PROXY_PREFIX='/api'
-// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-
-module.exports = {
-  LOGIN: `/rs/logic/getLogin`,
-  MODIFY_PASSWORD: '/rs/user/modifypwd',
-  V4_LOGIN: '/api/af-auth/login',
-  V4_LOGOUT: '/api/af-auth/logout',
-  V4_REFRESH_TOKEN: '/api/af-auth/refresh',
-  ROUTES: `/rs/user/userLogin`,
-  SEARCH: `/rs/search`,
-  GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`
-}
+// 跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+
+module.exports = {
+  LOGIN: `/rs/logic/getLogin`,
+  MODIFY_PASSWORD: '/rs/user/modifypwd',
+  V4_LOGIN: '/api/af-auth/login',
+  V4_LOGOUT: '/api/af-auth/logout',
+  V4_REFRESH_TOKEN: '/api/af-auth/refresh',
+  ROUTES: `/rs/user/userLogin`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`
+}

package/src/services/user.js

@@ -1,90 +1,90 @@
-import {
-  LOGIN,
-  MODIFY_PASSWORD,
-  ROUTES,
-  V4_GET_INFO,
-  V4_LOGIN,
-  V4_LOGOUT
-} from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import axios from 'axios'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-export async function modifyPassword (name, password, newPassword) {
-  return request(MODIFY_PASSWORD, METHOD.POST, {
-    data: {
-      ename: name,
-      password: password,
-      newpassword: newPassword,
-      affirmpassword: newPassword
-    }
-  })
-}
-
-export async function V4Login (name, password, routeName) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password,
-    resourceName: routeName
-  })
-}
-
-export async function V4RefreshToken () {
-  const { AESDecrypt } = EncryptUtil
-  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
-  return axios.post(V4_LOGIN, {
-    username: info.name,
-    password: info.password,
-    resourceName: '智慧燃气'
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    window.microApp.dispatch({ type: 'logout' })
-  }
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig,
-  V4RefreshToken
-}
+import {
+  LOGIN,
+  MODIFY_PASSWORD,
+  ROUTES,
+  V4_GET_INFO,
+  V4_LOGIN,
+  V4_LOGOUT
+} from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import axios from 'axios'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password, routeName) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password,
+    resourceName: routeName
+  })
+}
+
+export async function V4RefreshToken () {
+  const { AESDecrypt } = EncryptUtil
+  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
+  return axios.post(V4_LOGIN, {
+    username: info.name,
+    password: info.password,
+    resourceName: '智慧燃气'
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: 'logout' })
+  }
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig,
+  V4RefreshToken
+}