@freelog/tools-lib 0.1.185 → 0.1.187

package/dist/utils/linkTo.d.ts

@@ -59,6 +59,12 @@ export declare function myCollections({}?: MyCollectionsParamsType): TReturnType
 interface MyCollectsParamsType {
 }
 export declare function myCollects({}?: MyCollectsParamsType): TReturnType;
+interface MyResourceIncomeParamsType {
+}
+export declare function myResourceIncome({}?: MyResourceIncomeParamsType): TReturnType;
+interface MyResourceTransactionParamsType {
+}
+export declare function myResourceTransaction({}?: MyResourceTransactionParamsType): TReturnType;
 interface ResourceVersionInfoParamsType {
     resourceID: string;
     version?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.185",
+  "version": "0.1.187",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -19,8 +19,9 @@
     "prepare": "tsdx build",
     "size": "size-limit",
     "analyze": "size-limit --why",
-    "publish": "npm publish --access=public",
-    "resetRegistry": "npm config set registry https://registry.npmjs.org/"
+    "publish": "npm publish --access=public --registry=https://registry.npmjs.org/",
+    "resetRegistry": "npm config set registry https://registry.npmjs.org/",
+    "setRegistry": "npm config set registry https://registry.npmmirror.com/"
   },
   "husky": {
     "hooks": {}

package/src/service-API/index.ts

@@ -1,43 +1,45 @@
-import * as Node from './nodes';
-import * as Exhibit from './presentables';
-import * as Storage from './storages';
-import * as Collection from './collections';
-import * as Resource from './resources';
-import * as User from './user';
-import * as InformalNode from './informalNodes';
-import * as Contract from './contracts';
-import * as Transaction from './transactions';
-import * as Captcha from './captcha';
-import * as Event from './events';
-import * as Activity from './activities';
-import * as TestQualification from './testQualifications';
-import * as Statistic from './statistics';
-import * as I18n from './i18n';
-import * as Policy from './policies';
-import * as recombination from './recombinations';
-import * as Operation from './operation';
-import * as ResourceType from './resourceType';
-
-const FServiceAPI = {
-  Node,
-  Exhibit,
-  Storage,
-  Collection,
-  Resource,
-  User,
-  InformalNode,
-  Contract,
-  Transaction,
-  Captcha,
-  Event,
-  Activity,
-  TestQualification,
-  Statistic,
-  I18n,
-  Policy,
-  recombination,
-  Operation,
-  ResourceType,
-};
-
-export default FServiceAPI;
+import * as Node from './nodes';
+import * as Exhibit from './presentables';
+import * as Storage from './storages';
+import * as Collection from './collections';
+import * as Resource from './resources';
+import * as User from './user';
+import * as InformalNode from './informalNodes';
+import * as Contract from './contracts';
+import * as Transaction from './transactions';
+import * as Captcha from './captcha';
+import * as Event from './events';
+import * as Activity from './activities';
+import * as TestQualification from './testQualifications';
+import * as Statistic from './statistics';
+import * as I18n from './i18n';
+import * as Policy from './policies';
+import * as recombination from './recombinations';
+import * as Operation from './operation';
+import * as ResourceType from './resourceType';
+import * as Payment from './payment';
+
+const FServiceAPI = {
+  Node,
+  Exhibit,
+  Storage,
+  Collection,
+  Resource,
+  User,
+  InformalNode,
+  Contract,
+  Transaction,
+  Captcha,
+  Event,
+  Activity,
+  TestQualification,
+  Statistic,
+  I18n,
+  Policy,
+  recombination,
+  Operation,
+  ResourceType,
+  Payment,
+};
+
+export default FServiceAPI;

package/src/service-API/payment.ts

@@ -0,0 +1,82 @@
+import { AxiosRequestConfig } from 'axios';
+import FUtil from '../utils';
+
+// 证件上传与识别
+interface UploadIDCardParamsType {
+  file: File;
+}
+
+export function uploadIDCard(params: UploadIDCardParamsType, config?: AxiosRequestConfig) {
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(params)) {
+    if (value) {
+      formData.append(key, value);
+    }
+  }
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v3/transactions/accounts/idCardUploadAndOcr`,
+    data: formData,
+    ...config,
+  });
+}
+
+
+// 开通金融账户
+interface OpenFinancialAccountParamsType {
+  accountType: 1 | 2; // 账户类型(1:个人账户 2:节点账户)
+  ownerId: number; // 账户所有者ID; 根据账户类型动态赋值userId或nodeId
+  certType: '00'; // 证件类型(00:身份证)
+  certNo: string; // 证件号码;例如身份证号
+  name: string; // 证件上的名称;例如身份证上的姓名
+  certValidityType: 0 | 1;  // 证件有效期是否是长期; 0:非长期有效 1:长期有效
+  certBeginDate: string; // 证件有效期开始日期
+  certEndDate?: string; // 证件有效期结束日期(长期有效时此处不传)
+  mobile: string; // 开户人真实手机号;
+  certImagePaths: string[]; // 证件照保密存放的path部分; 身份证号码识别接口会返回
+}
+
+export function openFinancialAccount(params: OpenFinancialAccountParamsType, config?: AxiosRequestConfig) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v3/transactions/accounts`,
+    data: params,
+    ...config,
+  });
+}
+
+// 金融账户绑定提现卡
+interface BindWithdrawCardParamsType {
+  accountId: string; // 金融账户ID
+  cardType: 0 | 1 | 2 | 4; // 0：对公，1：对私法人，2：对私非法人，4：对公非同名；个人商户/用户不支持对公类型，对私非法人类型;
+  bankName: string; // 开户行名称
+  cardName: string; // 持卡人姓名
+  cardNo: string; // 卡号
+  provId: string; // 银行所在省ID
+  areaId: string; // 银行所在城市ID
+  branchCode?: string; // 银行支行联行号; 当card_type=0时必填
+}
+
+export function bindWithdrawCard({accountId, ...params}: BindWithdrawCardParamsType, config?: AxiosRequestConfig) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v3/transactions/accounts/${accountId}/bindCashCard`,
+    data: params,
+    ...config,
+  });
+}
+
+// 登录用户关联金融登账户信息查询
+interface QueryFinancialAccountInfoParamsType {
+  accountType: 1 | 2; // 账户类型(1:个人账户 2:节点账户)
+  ownerId: number; // 账户所有者ID; 根据账户类型动态赋值userId或nodeId
+}
+
+export function queryFinancialAccountInfo(params: QueryFinancialAccountInfoParamsType, config?: AxiosRequestConfig) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v3/transactions/accounts/query`,
+    params: params,
+    ...config,
+  });
+}

package/src/service-API/policies.ts

@@ -1,93 +1,93 @@
-// import {Base64} from 'js-base64';
-import FUtil from '../utils';
-
-// 批量获取授权策略列表
-interface PoliciesParamsType {
-  page?: number;
-  pageSize?: number;
-  subjectType?: 1 | 2 | 3; // 1:资源 2:展品 3:用户组
-  projection?: string;
-}
-
-export function policies(params: PoliciesParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/policies`,
-    params: params,
-  });
-}
-
-// 批量获取授权策略列表
-interface PoliciesListParamsType {
-  policyIds: string;
-  subjectType?: number;
-  userId?: number;
-  projection?: string;
-}
-
-export function policiesList(params: PoliciesListParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/policies/list`,
-    params: params,
-  });
-}
-
-// 策略模板
-interface PolicyTemplatesParamsType {
-}
-
-export function policyTemplates(params: PolicyTemplatesParamsType = {}) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/translate/translate-config/list4Client`,
-    params: params,
-  });
-}
-
-// 重新编译
-interface PolicyReCompileParamsType {
-  _id?: string;
-  contract?: string;
-  fillArgs: {
-    name: string;
-    value: string;
-  }[];
-}
-
-export function policyReCompile(data: PolicyReCompileParamsType) {
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/translate/reCompile`,
-    data: data,
-  });
-}
-
-// 模板策略翻译
-interface PolicyTranslationParamsType {
-  contract: string;
-}
-
-export function policyTranslation({contract}: PolicyTranslationParamsType) {
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/translate/translate`,
-    data: {
-      contract: contract,
-    },
-  });
-}
-
-// 模板策略翻译
-interface PolicyTransferTranslationParamsType {
-  contract: string;
-  fsmTransfers: any;
-}
-
-export function policyTransferTranslation(params: PolicyTransferTranslationParamsType) {
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/translate/transfer`,
-    data: params,
-  });
-}
+// import {Base64} from 'js-base64';
+import FUtil from '../utils';
+
+// 批量获取授权策略列表
+interface PoliciesParamsType {
+  page?: number;
+  pageSize?: number;
+  subjectType?: 1 | 2 | 3; // 1:资源 2:展品 3:用户组
+  projection?: string;
+}
+
+export function policies(params: PoliciesParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/policies`,
+    params: params,
+  });
+}
+
+// 批量获取授权策略列表
+interface PoliciesListParamsType {
+  policyIds: string;
+  subjectType?: number;
+  userId?: number;
+  projection?: string;
+}
+
+export function policiesList(params: PoliciesListParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/policies/list`,
+    params: params,
+  });
+}
+
+// 策略模板
+interface PolicyTemplatesParamsType {
+}
+
+export function policyTemplates(params: PolicyTemplatesParamsType = {}) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/translate/translate-config/list4Client`,
+    params: params,
+  });
+}
+
+// 重新编译
+interface PolicyReCompileParamsType {
+  _id?: string;
+  contract?: string;
+  fillArgs: {
+    name: string;
+    value: string | number;
+  }[];
+}
+
+export function policyReCompile(data: PolicyReCompileParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/translate/reCompile`,
+    data: data,
+  });
+}
+
+// 模板策略翻译
+interface PolicyTranslationParamsType {
+  contract: string;
+}
+
+export function policyTranslation({contract}: PolicyTranslationParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/translate/translate`,
+    data: {
+      contract: contract,
+    },
+  });
+}
+
+// 模板策略翻译
+interface PolicyTransferTranslationParamsType {
+  contract: string;
+  fsmTransfers: any;
+}
+
+export function policyTransferTranslation(params: PolicyTransferTranslationParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/translate/transfer`,
+    data: params,
+  });
+}

package/src/utils/axios.ts

@@ -1,141 +1,141 @@
-import axios, {AxiosRequestConfig} from 'axios';
-// import NProgress from 'nprogress';
-// import "nprogress/nprogress.css";
-import {completeUrlByDomain} from "./format";
-import * as LinkTo from './linkTo';
-// import {CommonReturn, RequestParamsType} from "../service-API/tools";
-import FServiceAPI from "../service-API";
-// import  from '../service-API';
-
-const codeMessage: any = {
-  200: '服务器成功返回请求的数据。',
-  201: '新建或修改数据成功。',
-  202: '一个请求已经进入后台排队（异步任务）。',
-  204: '删除数据成功。',
-  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
-  401: '用户没有权限（令牌、用户名、密码错误）。',
-  403: '用户得到授权，但是访问是被禁止的。',
-  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
-  406: '请求的格式不可得。',
-  410: '请求的资源被永久删除，且不会再得到的。',
-  422: '当创建一个对象时，发生一个验证错误。',
-  500: '服务器发生错误，请检查服务器。',
-  502: '网关错误。',
-  503: '服务不可用，服务器暂时过载或维护。',
-  504: '网关超时。',
-};
-
-// export let apiHost: string = '';
-if (window.location.hostname.includes('.com')) {
-  // apiHost = `${window.location.protocol}//qi.${(window.location.host.match(/(?<=\.).*/) || [''])[0]}`;
-  // apiHost = window.location.origin.replace('console', 'qi');
-  axios.defaults.withCredentials = true;
-  axios.defaults.baseURL = completeUrlByDomain('api');
-}
-
-/**
- * 异常处理程序
- */
-// const errorHandler = (error: { response: Response }): Response => {
-//   const {response} = error;
-//   if (response && response.status) {
-//     const errorText = codeMessage[response.status] || response.statusText;
-//     const {status, url} = response;
-//
-//     // notification.error({
-//     //   message: `请求错误 ${status}: ${url}`,
-//     //   description: errorText,
-//     // });
-//   } else if (!response) {
-//     // notification.error({
-//     //   description: '您的网络发生异常，无法连接服务器',
-//     //   message: '网络异常',
-//     // });
-//   }
-//   return response;
-// };
-//
-// // Add a request interceptor
-axios.interceptors.request.use(
-  (config) => {
-    // Do something before request is sent
-    // NProgress.start();
-    return config;
-  },
-  (error) => {
-    // Do something with request error
-    // NProgress.done();
-    return Promise.reject(error);
-  }
-);
-
-/**
- * 配置request请求时的默认参数
- */
-axios.interceptors.response.use(
-  (response) => {
-    // Do something with response data
-    // console.log(response, 'response!!!!!!');
-    // NProgress.done();
-    if (response.status !== 200) {
-
-      const error = {
-        description: codeMessage[response.status],
-        message: response.status,
-      };
-
-      // notification.error(error);
-      throw new Error(JSON.stringify(error));
-    }
-    const {data, headers} = response;
-    if (headers['content-disposition']?.includes('attachment;')) {
-      // downloadFile(response);
-      return;
-    }
-
-    // console.log(data, 'data2390jasdflkf');
-
-
-    // if ((data.errcode === undefined
-    //   ? (data.errCode !== 0 && data.errCode !== 2)
-    //   : (data.errcode !== 0 && data.errcode !== 2))
-    //   || data.ret !== 0) {
-    //
-    //   // notification.error({
-    //   //   message: data.msg,
-    //   // });
-    //   throw new Error(JSON.stringify(data));
-    // }
-    return data;
-  },
-  (error) => {
-    // Do something with response error
-    // NProgress.done();
-    return Promise.reject(error);
-  });
-
-export default axios;
-
-
-export async function request(config: AxiosRequestConfig, {
-// export async function request(config: any, {
-  noRedirect = false,
-  noErrorAlert = false,
-// }: RequestParamsType = {}): Promise<CommonReturn & { data: any } | void> {
-}: any = {}): Promise<any> {
-  const result: any = await axios.request(config);
-  // console.log(result, 'response');
-  // const {data} = response;
-  // console.log(result, 'result90iowjksdfjlsdkj')
-  if (result.errCode=== 30 && !noRedirect) {
-    await FServiceAPI.User.logout();
-    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
-  } else if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
-    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.userFreeze({goTo: window.location.href})}`);
-  } else if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
-    // window.alert(result.msg);
-    // return;
-
-  }
-  return result;
-}
+import axios, {AxiosRequestConfig} from 'axios';
+// import NProgress from 'nprogress';
+// import "nprogress/nprogress.css";
+import {completeUrlByDomain} from "./format";
+import * as LinkTo from './linkTo';
+// import {CommonReturn, RequestParamsType} from "../service-API/tools";
+import FServiceAPI from "../service-API";
+// import  from '../service-API';
+
+const codeMessage: any = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。',
+};
+
+// export let apiHost: string = '';
+if (window.location.hostname.includes('.com')) {
+  // apiHost = `${window.location.protocol}//qi.${(window.location.host.match(/(?<=\.).*/) || [''])[0]}`;
+  // apiHost = window.location.origin.replace('console', 'qi');
+  axios.defaults.withCredentials = true;
+  axios.defaults.baseURL = completeUrlByDomain('api');
+}
+
+/**
+ * 异常处理程序
+ */
+// const errorHandler = (error: { response: Response }): Response => {
+//   const {response} = error;
+//   if (response && response.status) {
+//     const errorText = codeMessage[response.status] || response.statusText;
+//     const {status, url} = response;
+//
+//     // notification.error({
+//     //   message: `请求错误 ${status}: ${url}`,
+//     //   description: errorText,
+//     // });
+//   } else if (!response) {
+//     // notification.error({
+//     //   description: '您的网络发生异常，无法连接服务器',
+//     //   message: '网络异常',
+//     // });
+//   }
+//   return response;
+// };
+//
+// // Add a request interceptor
+axios.interceptors.request.use(
+  (config) => {
+    // Do something before request is sent
+    // NProgress.start();
+    return config;
+  },
+  (error) => {
+    // Do something with request error
+    // NProgress.done();
+    return Promise.reject(error);
+  }
+);
+
+/**
+ * 配置request请求时的默认参数
+ */
+axios.interceptors.response.use(
+  (response) => {
+    // Do something with response data
+    // console.log(response, 'response!!!!!!');
+    // NProgress.done();
+    if (response.status !== 200 && response.status !== 201) {
+
+      const error = {
+        description: codeMessage[response.status],
+        message: response.status,
+      };
+
+      // notification.error(error);
+      throw new Error(JSON.stringify(error));
+    }
+    const {data, headers} = response;
+    if (headers['content-disposition']?.includes('attachment;')) {
+      // downloadFile(response);
+      return;
+    }
+
+    // console.log(data, 'data2390jasdflkf');
+
+
+    // if ((data.errcode === undefined
+    //   ? (data.errCode !== 0 && data.errCode !== 2)
+    //   : (data.errcode !== 0 && data.errcode !== 2))
+    //   || data.ret !== 0) {
+    //
+    //   // notification.error({
+    //   //   message: data.msg,
+    //   // });
+    //   throw new Error(JSON.stringify(data));
+    // }
+    return data;
+  },
+  (error) => {
+    // Do something with response error
+    // NProgress.done();
+    return Promise.reject(error);
+  });
+
+export default axios;
+
+
+export async function request(config: AxiosRequestConfig, {
+// export async function request(config: any, {
+  noRedirect = false,
+  noErrorAlert = false,
+// }: RequestParamsType = {}): Promise<CommonReturn & { data: any } | void> {
+}: any = {}): Promise<any> {
+  const result: any = await axios.request(config);
+  // console.log(result, 'response');
+  // const {data} = response;
+  // console.log(result, 'result90iowjksdfjlsdkj')
+  if (result.errCode=== 30 && !noRedirect) {
+    await FServiceAPI.User.logout();
+    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
+  } else if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
+    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.userFreeze({goTo: window.location.href})}`);
+  } else if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
+    // window.alert(result.msg);
+    // return;
+
+  }
+  return result;
+}