@freelog/tools-lib 0.1.138 → 0.1.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.138",
+  "version": "0.1.140",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "prepare": "tsdx build",
     "size": "size-limit",
     "analyze": "size-limit --why",
-    "publish": "npm publish --access public"
+    "publish": "npm publish --access=public"
   },
   "husky": {
     "hooks": {}

package/src/service-API/activities.ts

@@ -58,6 +58,33 @@ export function adsDetails(params: AdsDetailsParamsType) {
   });
 }
 
+// 访问广告（埋点）
+interface EventTrackingAdsVisitParamsType {
+  _id: string;
+}
+
+export function eventTrackingAdsVisit(params: EventTrackingAdsVisitParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/activities/ads/visit`,
+    params: params,
+  });
+}
+
+// 点击广告（埋点）
+interface EventTrackingAdsClickParamsType {
+  _id: string;
+}
+
+export function eventTrackingAdsClick(params: EventTrackingAdsClickParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/activities/ads/click`,
+    params: params,
+  });
+}
+
+
 // 获取基本任务详情
 interface GetBaseTaskInfoParamsType {
 }

package/src/service-API/contracts.ts

@@ -1,101 +1,137 @@
-import FUtil from '../utils';
-
-// 查看合同详情
-interface ContractDetailsParamsType {
-  contractId: string;
-  isLoadPolicyInfo?: 0 | 1;
-  projection?: string;
-  isTranslate?: 0 | 1;
-}
-
-export function contractDetails({contractId, ...params}: ContractDetailsParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/contracts/${contractId}`,
-    params: params,
-  });
-}
-
-// 查询合同分页列表
-interface ContractsParamsType {
-  skip?: number;
-  limit?: number;
-  identityType: 1 | 2;
-  licensorId?: string;
-  licenseeId?: string;
-  subjectIds?: string;
-  subjectType?: 1 | 2 | 3;
-  isDefault?: number;
-  keywords?: string;
-  status?: 0 | 1 | 2; // 合同状态 0:生效中 1:已终止 2:异常的
-  authStatus?: 1 | 2 | 128; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权,多个通过'与'运算
-  order?: 'asc' | 'desc'; // asc:正序 desc:倒序
-  licenseeIdentityType?: number;
-  isLoadPolicyInfo?: 0 | 1;
-  isTranslate?: 0 | 1;
-  startDate?: string;
-  endDate?: string;
-  projection?: string;
-}
-
-export function contracts(params: ContractsParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/contracts`,
-    params: params,
-  });
-}
-
-// 批量查询合同列表
-interface BatchContractsParamsType {
-  contractIds?: string;
-  subjectIds?: string;
-  subjectType?: 1 | 2 | 3;
-  licenseeIdentityType?: 1 | 2 | 3;
-  licensorId?: string;
-  licenseeId?: string | number;
-  isLoadPolicyInfo?: 0 | 1;
-  projection?: string;
-  isTranslate?: 0 | 1;
-}
-
-export function batchContracts(params: BatchContractsParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/contracts/list`,
-    params: params,
-  });
-}
-
-// 查看合同流转记录分页列表
-interface TransitionRecordsParamsType {
-  contractId: string;
-  skip?: number;
-  limit?: number;
-  isTranslate?: 0 | 1;
-}
-
-export function transitionRecords({contractId, ...params}: TransitionRecordsParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/contracts/${contractId}/transitionRecords`,
-    params: params,
-  });
-}
-
-// 统计合约签约量
-interface ContractsSignCountParamsType {
-  objectIds: string | number;
-  objectType: 1 | 2 | 3 | 4 | 5;  // 统计对象类型(1:甲方ID 2:甲方所属ID 3:乙方ID 4:乙方所属ID 5:标的物ID)
-  subjectType: 1 | 2 | 3;  // 标的物类型(1:资源 2:展品 3:用户组)
-  startDate?: string;
-  endDate?: string;
-}
-
-export function contractsSignCount(params: ContractsSignCountParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/contracts/signCount`,
-    params: params,
-  });
-}
+import FUtil from '../utils';
+
+// 创建合同
+interface CreateContractParamsType {
+  subjectId: string;
+  subjectType: 1 | 2 | 3; // 标的物类型 1:资源 2:展品 3:用户组
+  policyId: string;
+  licenseeId: string | number;
+  licenseeIdentityType: 1 | 2 | 3; // 乙方身份类型 1:资源方 2:节点方 3:C端用户
+}
+
+export function createContract({...params}: CreateContractParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/contracts`,
+    data: params,
+  });
+}
+
+// 批量创建合同
+interface BatchCreateContractsParamsType {
+  subjects: {
+    subjectId: string;
+    policyId: string;
+  }[];
+  subjectType: 1 | 2 | 3; // 标的物类型 1:资源 2:展品 3:用户组
+  licenseeId: string | number;
+  licenseeIdentityType: 1 | 2 | 3; // 乙方身份类型 1:资源方 2:节点方 3:C端用户
+}
+
+export function batchCreateContracts({...params}: BatchCreateContractsParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/contracts/batchSign`,
+    data: params,
+  });
+}
+
+// 查看合同详情
+interface ContractDetailsParamsType {
+  contractId: string;
+  isLoadPolicyInfo?: 0 | 1;
+  projection?: string;
+  isTranslate?: 0 | 1;
+}
+
+export function contractDetails({contractId, ...params}: ContractDetailsParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/contracts/${contractId}`,
+    params: params,
+  });
+}
+
+// 查询合同分页列表
+interface ContractsParamsType {
+  skip?: number;
+  limit?: number;
+  identityType: 1 | 2;
+  licensorId?: string;
+  licenseeId?: string;
+  subjectIds?: string;
+  subjectType?: 1 | 2 | 3;
+  isDefault?: number;
+  keywords?: string;
+  status?: 0 | 1 | 2; // 合同状态 0:生效中 1:已终止 2:异常的
+  authStatus?: 1 | 2 | 128; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权,多个通过'与'运算
+  order?: 'asc' | 'desc'; // asc:正序 desc:倒序
+  licenseeIdentityType?: number;
+  isLoadPolicyInfo?: 0 | 1;
+  isTranslate?: 0 | 1;
+  startDate?: string;
+  endDate?: string;
+  projection?: string;
+}
+
+export function contracts(params: ContractsParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/contracts`,
+    params: params,
+  });
+}
+
+// 批量查询合同列表
+interface BatchContractsParamsType {
+  contractIds?: string;
+  subjectIds?: string;
+  subjectType?: 1 | 2 | 3;
+  licenseeIdentityType?: 1 | 2 | 3;
+  licensorId?: string;
+  licenseeId?: string | number;
+  isLoadPolicyInfo?: 0 | 1;
+  projection?: string;
+  isTranslate?: 0 | 1;
+}
+
+export function batchContracts(params: BatchContractsParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/contracts/list`,
+    params: params,
+  });
+}
+
+// 查看合同流转记录分页列表
+interface TransitionRecordsParamsType {
+  contractId: string;
+  skip?: number;
+  limit?: number;
+  isTranslate?: 0 | 1;
+}
+
+export function transitionRecords({contractId, ...params}: TransitionRecordsParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/contracts/${contractId}/transitionRecords`,
+    params: params,
+  });
+}
+
+// 统计合约签约量
+interface ContractsSignCountParamsType {
+  objectIds: string | number;
+  objectType: 1 | 2 | 3 | 4 | 5;  // 统计对象类型(1:甲方ID 2:甲方所属ID 3:乙方ID 4:乙方所属ID 5:标的物ID)
+  subjectType: 1 | 2 | 3;  // 标的物类型(1:资源 2:展品 3:用户组)
+  startDate?: string;
+  endDate?: string;
+}
+
+export function contractsSignCount(params: ContractsSignCountParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/contracts/signCount`,
+    params: params,
+  });
+}

package/src/service-API/recombinations/index.ts

@@ -1,92 +1,92 @@
-import * as Tool from '../../utils/tools';
-import * as Storage from '../storages';
-
-interface FileInfo {
-  sha1: string;
-  state: 'success' | 'fail' | 'nonentity';
-  info: {
-    [key: string]: any;
-  }
-}
-
-interface GetFileInfosBySha1Params {
-  sha1: string[];
-}
-
-export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<{
-  error: string;
-  result: FileInfo[],
-}> {
-  if (sha1.length === 0) {
-    return {
-      error: '',
-      result: [],
-    };
-  }
-
-  let delay: number = 500;
-
-  let needHandleSha1: string[] = [...sha1];
-
-  let allData: FileInfo[] = [];
-
-  while (true) {
-    // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
-    const {ret, errCode, data, msg}: any = await Storage.filesListInfo({
-      sha1: needHandleSha1.join(','),
-    });
-
-    if (ret !== 0 || errCode !== 0) {
-      console.log({
-        ret, errCode, data, msg
-      }, '09iowksdjaklfjs;oalijflskdjflsdkjflkj');
-      return {
-        error: msg,
-        result: allData,
-      };
-    }
-
-    needHandleSha1 = data
-      .filter((d: any) => {
-        return d.metaAnalyzeStatus === 0 || d.metaAnalyzeStatus === 1;
-      })
-      .map((d: any) => {
-        return d.sha1;
-      });
-    const finishedInfo: FileInfo[] = data
-      .filter((d: any) => {
-        return d.metaAnalyzeStatus !== 0 && d.metaAnalyzeStatus !== 1;
-      })
-      .map((d: any) => {
-        let state: 'success' | 'fail' | 'nonentity' = 'fail';
-        if (!d.metaAnalyzeStatus) {
-          state = 'nonentity';
-        } else if (d.metaAnalyzeStatus === 2) {
-          state = 'success';
-        } else if (d.metaAnalyzeStatus === 3) {
-          state = 'fail';
-        }
-        console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
-        return {
-          sha1: d.sha1,
-          state,
-          info: d,
-        };
-      });
-    cdPartially && cdPartially(finishedInfo);
-    allData = [
-      ...allData,
-      ...finishedInfo,
-    ];
-
-    if (needHandleSha1.length === 0) {
-      break;
-    }
-    await Tool.promiseSleep(delay);
-    // delay += 500;
-  }
-  return {
-    error: '',
-    result: allData,
-  };
-}
+import * as Tool from '../../utils/tools';
+import * as Storage from '../storages';
+
+interface FileInfo {
+  sha1: string;
+  state: 'success' | 'fail' | 'nonentity';
+  info: {
+    [key: string]: any;
+  }
+}
+
+interface GetFileInfosBySha1Params {
+  sha1: string[];
+}
+
+export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<{
+  error: string;
+  result: FileInfo[],
+}> {
+  if (sha1.length === 0) {
+    return {
+      error: '',
+      result: [],
+    };
+  }
+
+  let delay: number = 500;
+
+  let needHandleSha1: string[] = [...sha1];
+
+  let allData: FileInfo[] = [];
+
+  while (true) {
+    // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
+    const {ret, errCode, data, msg}: any = await Storage.filesListInfo({
+      sha1: needHandleSha1.join(','),
+    });
+
+    if (ret !== 0 || errCode !== 0) {
+      console.log({
+        ret, errCode, data, msg
+      }, '09iowksdjaklfjs;oalijflskdjflsdkjflkj');
+      return {
+        error: msg,
+        result: allData,
+      };
+    }
+
+    needHandleSha1 = data
+      .filter((d: any) => {
+        return d.metaAnalyzeStatus === 0 || d.metaAnalyzeStatus === 1;
+      })
+      .map((d: any) => {
+        return d.sha1;
+      });
+    const finishedInfo: FileInfo[] = data
+      .filter((d: any) => {
+        return d.metaAnalyzeStatus !== 0 && d.metaAnalyzeStatus !== 1;
+      })
+      .map((d: any) => {
+        let state: 'success' | 'fail' | 'nonentity' = 'fail';
+        if (!d.metaAnalyzeStatus) {
+          state = 'nonentity';
+        } else if (d.metaAnalyzeStatus === 2) {
+          state = 'success';
+        } else if (d.metaAnalyzeStatus === 3) {
+          state = 'fail';
+        }
+        console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
+        return {
+          sha1: d.sha1,
+          state,
+          info: d,
+        };
+      });
+    cdPartially && cdPartially(finishedInfo);
+    allData = [
+      ...allData,
+      ...finishedInfo,
+    ];
+
+    if (needHandleSha1.length === 0) {
+      break;
+    }
+    await Tool.promiseSleep(delay);
+    // delay += 500;
+  }
+  return {
+    error: '',
+    result: allData,
+  };
+}