@freelog/tools-lib 0.1.130 → 0.1.133

package/dist/utils/format.d.ts

@@ -18,10 +18,6 @@ export declare function completeUrlByDomain(domain: string): string;
  * @param code 策略代码
  * @param targetType 标的物类型
  */
-export declare function policyCodeTranslationToText(code: string, targetType: string): Promise<{
-    error: string[] | null;
-    text?: string;
-}>;
 /**
  * 将资源类型关键字数组,转换成标准展示文字
  * @param arr 关键字数组

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.130",
+  "version": "0.1.133",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,6 @@
     "analyze": "size-limit --why",
     "publish": "npm publish --access public"
   },
-  "peerDependencies": {},
   "husky": {
     "hooks": {}
   },
@@ -47,6 +46,7 @@
     "@size-limit/preset-small-lib": "^4.11.0",
     "@types/crypto-js": "^4.0.1",
     "@types/js-cookie": "^3.0.2",
+    "@types/node": "^18.7.16",
     "@types/nprogress": "^0.2.0",
     "husky": "^6.0.0",
     "size-limit": "^4.11.0",

package/src/service-API/activities.ts

@@ -214,3 +214,18 @@ export function listInviteFriendInfos(params: ListInviteFriendInfosParamsType) {
     data: params,
   });
 }
+
+// 获取奖励记录详情列表
+interface GetRewardRecordInfosParamsType {
+  rewardGroupCode?: string;
+  rewardConfigCode?: string;
+  status?: 1 | 2 | 3; //奖励记录状态 1：未领取 2：可领取 3：已领取;
+}
+
+export function getRewardRecordInfos(params: GetRewardRecordInfosParamsType) {
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/activities/facade/getRewardRecordInfos`,
+    data: params,
+  });
+}

package/src/service-API/policies.ts

@@ -1,3 +1,4 @@
+// import {Base64} from 'js-base64';
 import FUtil from '../utils';
 
 // 批量获取授权策略列表
@@ -43,3 +44,32 @@ export function policyTemplates(params: PolicyTemplatesParamsType = {}) {
     params: params,
   });
 }
+
+// 模板策略翻译
+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/service-API/recombinations/index.ts

@@ -13,9 +13,15 @@ interface GetFileInfosBySha1Params {
   sha1: string[];
 }
 
-export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<FileInfo[]> {
+export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<{
+  error: string;
+  result: FileInfo[],
+}> {
   if (sha1.length === 0) {
-    return [];
+    return {
+      error: '',
+      result: [],
+    };
   }
 
   let delay: number = 500;
@@ -26,9 +32,20 @@ export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdParti
 
   while (true) {
     // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
-    const {data} = await Storage.filesListInfo({
+    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 && d.metaAnalyzeStatus === 1;
@@ -46,7 +63,10 @@ export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdParti
           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,
@@ -65,5 +85,8 @@ export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdParti
     await Tool.promiseSleep(delay);
     // delay += 500;
   }
-  return allData;
+  return {
+    error: '',
+    result: allData,
+  };
 }

package/src/utils/format.ts

@@ -1,8 +1,8 @@
 import moment from 'moment';
-import {report} from '@freelog/resource-policy-lang/dist';
-import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
+// import {report} from '@freelog/resource-policy-lang/dist';
+// import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
 
-const {compile} = require('@freelog/resource-policy-lang');
+// const {compile} = require('@freelog/resource-policy-lang');
 
 /**
  * 将对应的字节数，转换为易读单位数量
@@ -46,47 +46,47 @@ export function completeUrlByDomain(domain: string): string {
  * @param code 策略代码
  * @param targetType 标的物类型
  */
-export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
-  error: string[] | null;
-  text?: string;
-}> {
-  try {
-    const result = await compile(
-      code,
-      targetType,
-      completeUrlByDomain('qi'),
-      window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
-    );
-    const contract: ContractEntity = {
-      audiences: result.state_machine.audiences,
-      fsmStates: Object.entries<any>(result.state_machine.states)
-        .map((st) => {
-          return {
-            name: st[0],
-            serviceStates: st[1].serviceStates,
-            events: st[1].transitions.map((ts: any) => {
-
-              return {
-                id: ts.code,
-                name: ts.name,
-                args: ts.args,
-                state: ts.toState,
-              };
-            }),
-          };
-        }),
-    };
-    const rrr = report(contract);
-    return {
-      error: null,
-      text: rrr.audienceInfos[0].content + rrr.content,
-    };
-  } catch (err) {
-    return {
-      error: [err.message],
-    };
-  }
-}
+// export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
+//   error: string[] | null;
+//   text?: string;
+// }> {
+//   try {
+//     const result = await compile(
+//       code,
+//       targetType,
+//       completeUrlByDomain('qi'),
+//       window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
+//     );
+//     const contract: ContractEntity = {
+//       audiences: result.state_machine.audiences,
+//       fsmStates: Object.entries<any>(result.state_machine.states)
+//         .map((st) => {
+//           return {
+//             name: st[0],
+//             serviceStates: st[1].serviceStates,
+//             events: st[1].transitions.map((ts: any) => {
+//
+//               return {
+//                 id: ts.code,
+//                 name: ts.name,
+//                 args: ts.args,
+//                 state: ts.toState,
+//               };
+//             }),
+//           };
+//         }),
+//     };
+//     const rrr = report(contract);
+//     return {
+//       error: null,
+//       text: rrr.audienceInfos[0].content + rrr.content,
+//     };
+//   } catch (err) {
+//     return {
+//       error: [err.message],
+//     };
+//   }
+// }
 
 
 /**