@uxda/appkit 4.1.25 → 4.1.28

package/src/balance/api/endpoints.ts

@@ -1,126 +1,126 @@
-import { HttpEndpoints } from '../../shared/http'
-import { 账户流水筛选项, ConsumptionType } from '../types'
-
-type OnlyApp = {
-  app: string
-}
-
-type AndApp<T> = OnlyApp & T
-
-/**
- * 流水交易类型映射
- */
-const typeMappings: Record<string, ConsumptionType> = {
-  CZ: '充值',
-  JF: '缴费',
-  FE: '返额',
-  ZJ: '增加',
-  KJ: '扣减',
-  XH: '消耗',
-  TH: '退回',
-  ZS: '赠送',
-  HG: '换购',
-}
-
-/**
- * 映射还能反过来
- */
-const typeMappingsReversed = Object.fromEntries(
-  Object.entries(typeMappings).map(([x, y]) => [y, x])
-)
-
-const positionMappings = {
-  common: '云豆',
-  rights: '小云豆',
-  gift: '权益',
-}
-
-const positionMappingsReversed = Object.fromEntries(
-  Object.entries(positionMappings).map(([x, y]) => [y, x])
-)
-
-const directionMappings = {
-  0: '收入',
-  1: '支出',
-}
-
-const directionMappingsReversed = Object.fromEntries(
-  Object.entries(directionMappings).map(([x, y]) => [y, x])
-)
-
-const endpointsList: HttpEndpoints = {
-  获取余额明细: {
-    path: '/ac-app/account/info/detail/app', // /app
-    translate: (data: OnlyApp) => ({
-      appCode: data.app,
-    }),
-    transform(result: any) {
-      return {
-        total: result.commonAccount,
-        privileges: result.rightsAccountBalList.map((r: any) => ({
-          title: r.rightsName,
-          count: r.rightsAccount,
-          unit: r.rightsUnit,
-          appCode: r.appCode,
-          id: r.activityId,
-        })),
-      }
-    },
-  },
-  获取账户流水: {
-    path: '/ac-app/account/record/detail/mobile',
-    translate: (data: AndApp<账户流水筛选项>) => {
-      return {
-        appCode: data.app,
-        accountType: positionMappingsReversed[data.账户类型] || '',
-        inOrOut: directionMappingsReversed[data.收入还是支出] || '',
-        changeType: typeMappingsReversed[data.交易类型] || '',
-        operateTimeStart: data.dateFrom || '',
-        operateTimeEnd: data.dateTo || '',
-        rightsCode: data.权益类目,
-        pageNum: data.page,
-        pageSize: 10,
-      }
-    },
-    transform(response: any) {
-      const data = response.list.map((d: any) => ({
-        账户类型: positionMappings[d.accountType],
-        交易类型: typeMappings[d.changeType],
-        收入还是支出: directionMappings[d.inOrOut],
-        amount: d.changeValue,
-        title: d.rightsName,
-        time: Date.parse(d.operateTime), // 后台返回的是日期字符串，这里格式化成 timestamp
-        description: d.remark,
-      }))
-      return data
-    },
-  },
-  获取权益类目: {
-    path: '/ac-app/rights/item/list',
-    translate: (data: OnlyApp) => ({
-      appCode: data.app,
-    }),
-    // translate (data: ConsumptionFiltering) {
-    //   // return { appCode: data.appCode }
-    // },
-    transform: (data: any[]) =>
-      data.map((d) => ({
-        name: d.rightsName,
-        code: d.rightsCode,
-      })),
-  },
-}
-
-const endpoints = Object.fromEntries(
-  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
-)
-
-const translates = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
-)
-
-const transforms = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
-)
-
-export { endpoints, translates, transforms }
+import { HttpEndpoints } from '../../shared/http'
+import { 账户流水筛选项, ConsumptionType } from '../types'
+
+type OnlyApp = {
+  app: string
+}
+
+type AndApp<T> = OnlyApp & T
+
+/**
+ * 流水交易类型映射
+ */
+const typeMappings: Record<string, ConsumptionType> = {
+  CZ: '充值',
+  JF: '缴费',
+  FE: '返额',
+  ZJ: '增加',
+  KJ: '扣减',
+  XH: '消耗',
+  TH: '退回',
+  ZS: '赠送',
+  HG: '换购',
+}
+
+/**
+ * 映射还能反过来
+ */
+const typeMappingsReversed = Object.fromEntries(
+  Object.entries(typeMappings).map(([x, y]) => [y, x])
+)
+
+const positionMappings = {
+  common: '云豆',
+  rights: '小云豆',
+  gift: '权益',
+}
+
+const positionMappingsReversed = Object.fromEntries(
+  Object.entries(positionMappings).map(([x, y]) => [y, x])
+)
+
+const directionMappings = {
+  0: '收入',
+  1: '支出',
+}
+
+const directionMappingsReversed = Object.fromEntries(
+  Object.entries(directionMappings).map(([x, y]) => [y, x])
+)
+
+const endpointsList: HttpEndpoints = {
+  获取余额明细: {
+    path: '/ac-app/account/info/detail/app', // /app
+    translate: (data: OnlyApp) => ({
+      appCode: data.app,
+    }),
+    transform(result: any) {
+      return {
+        total: result.commonAccount,
+        privileges: result.rightsAccountBalList.map((r: any) => ({
+          title: r.rightsName,
+          count: r.rightsAccount,
+          unit: r.rightsUnit,
+          appCode: r.appCode,
+          id: r.activityId,
+        })),
+      }
+    },
+  },
+  获取账户流水: {
+    path: '/ac-app/account/record/detail/mobile',
+    translate: (data: AndApp<账户流水筛选项>) => {
+      return {
+        appCode: data.app,
+        accountType: positionMappingsReversed[data.账户类型] || '',
+        inOrOut: directionMappingsReversed[data.收入还是支出] || '',
+        changeType: typeMappingsReversed[data.交易类型] || '',
+        operateTimeStart: data.dateFrom || '',
+        operateTimeEnd: data.dateTo || '',
+        rightsCode: data.权益类目,
+        pageNum: data.page,
+        pageSize: 10,
+      }
+    },
+    transform(response: any) {
+      const data = response.list.map((d: any) => ({
+        账户类型: positionMappings[d.accountType],
+        交易类型: typeMappings[d.changeType],
+        收入还是支出: directionMappings[d.inOrOut],
+        amount: d.changeValue,
+        title: d.rightsName,
+        time: Date.parse(d.operateTime), // 后台返回的是日期字符串，这里格式化成 timestamp
+        description: d.remark,
+      }))
+      return data
+    },
+  },
+  获取权益类目: {
+    path: '/ac-app/rights/item/list',
+    translate: (data: OnlyApp) => ({
+      appCode: data.app,
+    }),
+    // translate (data: ConsumptionFiltering) {
+    //   // return { appCode: data.appCode }
+    // },
+    transform: (data: any[]) =>
+      data.map((d) => ({
+        name: d.rightsName,
+        code: d.rightsCode,
+      })),
+  },
+}
+
+const endpoints = Object.fromEntries(
+  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
+)
+
+const translates = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
+)
+
+const transforms = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
+)
+
+export { endpoints, translates, transforms }

package/src/balance/api/index.ts

@@ -1,82 +1,106 @@
-import Taro from '@tarojs/taro'
-import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
-import { translates, transforms } from './endpoints'
-import { useAppKitOptions } from '../../Appkit'
-
-/**
- * 小程序端 Http
- * 使用 Taro.request 实现
- */
-const vendor = {
-  async request<T>(config: HttpRequestConfig) {
-    return new Promise<ResponseRaw<T>>((resolve, reject) => {
-      Taro.request({
-        url: config.url,
-        method: config.method,
-        header: config.headers,
-        data: config.data,
-      })
-        .then(({ data }) => {
-          resolve({
-            status: +data.code,
-            message: data.msg,
-            data: data.result as T,
-          })
-        })
-        .catch((e: any) => {
-          reject(e)
-        })
-    })
-  },
-}
-
-function useHttp() {
-  const appkitOptions = useAppKitOptions()
-  const headers = {
-    Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
-    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
-  }
-  /**
-   * 传入配置获取 Http instanse
-   */
-  const $http = createHttp({
-    vendor,
-    baseUrl: appkitOptions.baseUrl(),
-    headers,
-    interceptors: [
-      (raw) => {
-        if (raw.status == 401) {
-          appkitOptions[401]()
-          return true
-        }
-        return false
-      },
-      (raw) => {
-        if (raw.status > 500) {
-          return true
-        }
-        return false
-      },
-    ],
-    paging: {
-      translate: (params: PagingParams) => ({
-        pageNum: params.page,
-        pageSize: params.pageSize,
-      }),
-      transform(data: any): PagingData {
-        return {
-          totalPages: data.pages,
-        }
-      },
-    },
-    translates,
-    transforms,
-  })
-  return $http
-}
-
-export { useHttp }
-
-export * from './endpoints'
+import Taro from '@tarojs/taro'
+import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
+import { translates, transforms } from './endpoints'
+import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
+
+const logger = useLogger()
+/**
+ * 小程序端 Http
+ * 使用 Taro.request 实现
+ */
+const vendor = {
+  async request<T>(config: HttpRequestConfig) {
+    return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
+      Taro.request({
+        url: config.url,
+        method: config.method,
+        header,
+        data: config.data,
+      })
+        .then(({ data }) => {
+          if (data.success) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            Taro.showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
+          })
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+function useHttp() {
+  const appkitOptions = useAppKitOptions()
+  const headers = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: appkitOptions.app(),
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
+  }
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
+    baseUrl: appkitOptions.baseUrl(),
+    headers,
+    interceptors: [
+      (raw) => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      (raw) => {
+        if (raw.status > 500) {
+          return true
+        }
+        return false
+      },
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize,
+      }),
+      transform(data: any): PagingData {
+        return {
+          totalPages: data.pages,
+        }
+      },
+    },
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'