@freelog/tools-lib 0.1.151 → 0.1.153

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

@@ -1,97 +1,97 @@
-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[];
-  resourceTypeCode: string;
-}
-
-export async function getFilesSha1Info({
-                                         sha1,
-                                         resourceTypeCode
-                                       }: 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(','),
-      resourceTypeCode: resourceTypeCode,
-    });
-
-    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[];
+  resourceTypeCode: string;
+}
+
+export async function getFilesSha1Info({
+                                         sha1,
+                                         resourceTypeCode
+                                       }: 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(','),
+      resourceTypeCode: resourceTypeCode,
+    });
+
+    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,
+  };
+}

package/src/service-API/resources.ts

@@ -83,6 +83,7 @@ interface ListParamsType {
   keywords?: string;
   resourceType?: string;
   resourceTypeCode?: string;
+  resourceTypeCategory?: 1 | 2; // 资源类型分类，1：基础类型，2：自定义类型，其实只有2时生效，生效时，resourceTypeCode为父类类型
   omitResourceType?: string;
   isSelf?: 0 | 1;
   userId?: number;
@@ -215,6 +216,10 @@ interface CreateVersionParamsType {
       policyId: string;
     }[];
   }[];
+  inputAttrs: {
+    key: string;
+    value: string;
+  }[];
 }
 
 export function createVersion({resourceId, ...params}: CreateVersionParamsType) {
@@ -307,6 +312,10 @@ interface UpdateResourceVersionInfoParamsType {
       policyId: string;
     }[];
   }[];
+  inputAttrs: {
+    key: string;
+    value: string;
+  }[];
 }
 
 export function updateResourceVersionInfo(params: UpdateResourceVersionInfoParamsType) {
@@ -554,6 +563,8 @@ export function availableTags({...params}: AvailableTagsParamsType) {
 interface ResourceTypesParamsType {
   codeOrName?: string;
   category?: 1 | 2; // 种类 1：基础资源类型 2：自定义资源类型
+  isMine?: boolean;
+  status?: 0 | 1;
 }
 
 export function resourceTypes({...params}: ResourceTypesParamsType = {}) {
@@ -569,6 +580,8 @@ interface ListSimpleByParentCodeParamsType {
   parentCode: string;
   name?: string;
   category?: 1 | 2; // 种类 1：基础资源类型 2：自定义资源类型
+  excludeParentCode?: boolean;
+  isTerminate?: boolean;
 }
 
 export function ListSimpleByParentCode({...params}: ListSimpleByParentCodeParamsType) {
@@ -593,11 +606,11 @@ export function getResourceTypeInfoByCode({...params}: GetResourceTypeInfoByCode
 }
 
 //
-interface GetResourceAttrListSimple {
+interface GetResourceAttrListSimpleParamsType {
 
 }
 
-export function getResourceAttrListSimple({...params}: GetResourceAttrListSimple) {
+export function getResourceAttrListSimple({...params}: GetResourceAttrListSimpleParamsType) {
   return FUtil.Request({
     method: 'GET',
     url: `/v2/resources/attrs/listSimple`,
@@ -605,14 +618,27 @@ export function getResourceAttrListSimple({...params}: GetResourceAttrListSimple
   });
 }
 
-interface ListSimple4RecentlySimple {
+interface ListSimple4RecentlyParamsType {
 
 }
 
-export function listSimple4Recently({...params}: ListSimple4RecentlySimple = {}) {
+export function listSimple4Recently({...params}: ListSimple4RecentlyParamsType = {}) {
   return FUtil.Request({
     method: 'GET',
     url: `/v2/resources/types/listSimple4Recently`,
     params: params,
   });
 }
+
+// 通过key取资源属性
+interface GetAttrsInfoByKeyParamsType {
+  key: string;
+}
+
+export function getAttrsInfoByKey({...params}: GetAttrsInfoByKeyParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/resources/attrs/getInfoByKey`,
+    params: params,
+  });
+}