@freelog/tools-lib 0.1.157 → 0.1.160

package/src/utils/axios.ts

@@ -30,7 +30,7 @@ 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('qi');
+  axios.defaults.baseURL = completeUrlByDomain('api');
 }
 
 /**

package/src/utils/format.ts

@@ -32,7 +32,7 @@ export function formatDateTime(date: string, showTime: boolean = false) {
  * @param domain 要组合的三级域名
  */
 export function completeUrlByDomain(domain: string): string {
-  let origin: string = `http://${domain}.testfreelog.com`;
+  let origin: string = `https://${domain}.testfreelog.com`;
 
   if (window.location.origin.includes('.freelog.com')) {
     origin = `https://${domain}.freelog.com`;

package/src/utils/linkTo.ts

@@ -70,6 +70,14 @@ export function resourceDetails({resourceID, ...params}: ResourceDetailsParamsTy
   return `/resource/details/${resourceID}${handleQuery(params)}`;
 }
 
+// 资源创建入口
+interface ResourceCreatorParamsType {
+}
+
+export function resourceCreatorEntry({}: ResourceCreatorParamsType = {}): TReturnType {
+  return `/resource/creatorEntry`;
+}
+
 // 资源创建
 interface ResourceCreatorParamsType {
 }
@@ -78,6 +86,14 @@ export function resourceCreator({}: ResourceCreatorParamsType = {}): TReturnType
   return `/resource/creator`;
 }
 
+// 资源批量创建
+interface ResourceCreatorParamsType {
+}
+
+export function resourceCreatorBatch({}: ResourceCreatorParamsType = {}): TReturnType {
+  return `/resource/creatorBatch`;
+}
+
 // 我的资源
 interface MyResourcesParamsType {
 }
@@ -409,10 +425,15 @@ export function reward({}: RewardParamsType = {}) {
 
 // 我的合约
 interface ContractParamsType {
+  identityType?: 1 | 2;
+  licensorName?: string;
+  licenseeName?: string;
 }
 
-export function contract({}: ContractParamsType = {}) {
-  return `/logged/contract`;
+export function contract({...params}: ContractParamsType = {}) {
+  return `/logged/contract${handleQuery({
+    ...params
+  })}`;
 }
 
 // 个人设置

package/src/utils/tools.ts

@@ -1,102 +1,102 @@
-// import * as CryptoJS from 'crypto-js';
-
-/**
- * 根据 File 获取 SHA1 Hash 字符串
- * @param file
- * @return {Promise<string>}
- */
-export function getSHA1Hash(file: File): Promise<string> {
-  return new Promise((resolve) => {
-    const reader: FileReader = new FileReader();
-    reader.readAsArrayBuffer(file);
-    reader.onload = async () => {
-      if (!reader.result) {
-        resolve('');
-        return '';
-      }
-      if (typeof reader.result === 'string') {
-        resolve('');
-        return '';
-      }
-      const sha1: string = await self.crypto.subtle.digest('SHA-1', reader.result).then(a => Array.from(new Uint8Array(a)).map(a => a.toString(16).padStart(2, '0')).join(''));
-      resolve(sha1);
-      return '';
-    };
-
-  });
-}
-
-/**
- * 生成随机码
- */
-export function generateRandomCode(strLen: number = 5): string {
-  const allStr: string = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
-  const newStrArr: string[] = [];
-  for (let i = 0; i < strLen; i++) {
-    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
-  }
-  return newStrArr.join('');
-}
-
-/**
- * 通过读取 cookies 获取用户 ID
- */
-export function getUserIDByCookies(): number {
-  const uid: string | undefined = document.cookie.split('; ').find((co) => co.startsWith('uid='));
-  if (!uid) {
-    return -1;
-  }
-  return Number(uid.replace('uid=', ''));
-}
-
-
-/**
- * 将服务端的合约状态转换成前端需要的状态
- */
-interface TransformServerAPIContractStateParams {
-  status: 0 | 1 | 2; // 合同综合状态: 0:正常 1:已终止(不接受任何事件,也不给授权,事实上无效的合约) 2:异常
-  authStatus: 1 | 2 | 128 | number; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权
-}
-
-export function transformServerAPIContractState({
-                                                  status,
-                                                  authStatus,
-                                                }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception' {
-  if (status === 0) {
-    if (authStatus === 1 || authStatus === 3) {
-      return 'active';
-    }
-    if (authStatus === 2) {
-      return 'testActive';
-    }
-    if (authStatus === 128) {
-      return 'inactive';
-    }
-  }
-
-  if (status === 1) {
-    return 'terminal';
-  }
-  return 'exception';
-}
-
-/**
- * 暂时休眠
- * @param ms 休眠时常(毫秒)
- */
-export function promiseSleep(ms: number = 300): Promise<void> {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve();
-    }, ms);
-  });
-}
-
-/**
- * 获取用户头像URL
- * @param userID
- */
-export function getAvatarUrl(userID: number = 0): string {
-  // return `${completeUrlByDomain('image')}/avatar/${userID || getUserIDByCookies()}?t=${Date.now()}`;
-  return `https://image.freelog.com/avatar/${userID || getUserIDByCookies()}?t=${Date.now()}`;
-}
+// import * as CryptoJS from 'crypto-js';
+
+/**
+ * 根据 File 获取 SHA1 Hash 字符串
+ * @param file
+ * @return {Promise<string>}
+ */
+export function getSHA1Hash(file: File): Promise<string> {
+  return new Promise((resolve) => {
+    const reader: FileReader = new FileReader();
+    reader.readAsArrayBuffer(file);
+    reader.onload = async () => {
+      if (!reader.result) {
+        resolve('');
+        return '';
+      }
+      if (typeof reader.result === 'string') {
+        resolve('');
+        return '';
+      }
+      const sha1: string = await self.crypto.subtle.digest('SHA-1', reader.result).then(a => Array.from(new Uint8Array(a)).map(a => a.toString(16).padStart(2, '0')).join(''));
+      resolve(sha1);
+      return '';
+    };
+
+  });
+}
+
+/**
+ * 生成随机码
+ */
+export function generateRandomCode(strLen: number = 5): string {
+  const allStr: string = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
+  const newStrArr: string[] = [];
+  for (let i = 0; i < strLen; i++) {
+    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
+  }
+  return newStrArr.join('');
+}
+
+/**
+ * 通过读取 cookies 获取用户 ID
+ */
+export function getUserIDByCookies(): number {
+  const uid: string | undefined = document.cookie.split('; ').find((co) => co.startsWith('uid='));
+  if (!uid) {
+    return -1;
+  }
+  return Number(uid.replace('uid=', ''));
+}
+
+
+/**
+ * 将服务端的合约状态转换成前端需要的状态
+ */
+interface TransformServerAPIContractStateParams {
+  status: 0 | 1 | 2; // 合同综合状态: 0:正常 1:已终止(不接受任何事件,也不给授权,事实上无效的合约) 2:异常
+  authStatus: 1 | 2 | 128 | number; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权
+}
+
+export function transformServerAPIContractState({
+                                                  status,
+                                                  authStatus,
+                                                }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception' {
+  if (status === 0) {
+    if (authStatus === 1 || authStatus === 3) {
+      return 'active';
+    }
+    if (authStatus === 2) {
+      return 'testActive';
+    }
+    if (authStatus === 128) {
+      return 'inactive';
+    }
+  }
+
+  if (status === 1) {
+    return 'terminal';
+  }
+  return 'exception';
+}
+
+/**
+ * 暂时休眠
+ * @param ms 休眠时常(毫秒)
+ */
+export function promiseSleep(ms: number = 300): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+}
+
+/**
+ * 获取用户头像URL
+ * @param userID
+ */
+export function getAvatarUrl(userID: number = 0): string {
+  // return `${completeUrlByDomain('image')}/avatar/${userID || getUserIDByCookies()}?t=${Date.now()}`;
+  return `https://image.freelog.com/avatar/${userID || getUserIDByCookies()}?t=${Date.now()}`;
+}