@freelog/tools-lib 0.1.144 → 0.1.145

package/src/service-API/storages.ts

@@ -9,7 +9,7 @@ export interface CreateBucketParamsType {
 export function createBucket(params: CreateBucketParamsType) {
   return FUtil.Request({
     method: 'POST',
-    url: `/v1/storages/buckets`,
+    url: `/v2/storages/buckets`,
     data: params,
   });
 }
@@ -22,7 +22,7 @@ interface BucketListParamsType {
 export function bucketList(params: BucketListParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets`,
+    url: `/v2/storages/buckets`,
     params: params,
   });
 }
@@ -34,7 +34,7 @@ interface SpaceStatisticsParamsType {
 export function spaceStatistics(params: SpaceStatisticsParamsType = {}) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets/spaceStatistics`,
+    url: `/v2/storages/buckets/spaceStatistics`,
     params: params,
   });
 }
@@ -47,7 +47,7 @@ interface DeleteBucketParamsType {
 export function deleteBucket(params: DeleteBucketParamsType) {
   return FUtil.Request({
     method: 'DELETE',
-    url: `/v1/storages/buckets/${params.bucketName}`,
+    url: `/v2/storages/buckets/${params.bucketName}`,
     // params: params,
   });
 }
@@ -60,7 +60,7 @@ interface BucketDetailsParamsType {
 export function bucketDetails({bucketName}: BucketDetailsParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets/${bucketName}`,
+    url: `/v2/storages/buckets/${bucketName}`,
     // params: params,
   });
 }
@@ -81,7 +81,7 @@ interface ObjectListParamsType {
 export function objectList({bucketName, ...params}: ObjectListParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets/${bucketName}/objects`,
+    url: `/v2/storages/buckets/${bucketName}/objects`,
     params: params,
   });
 }
@@ -111,7 +111,7 @@ interface CreateObjectParamsType {
 export function createObject({bucketName, ...params}: CreateObjectParamsType) {
   return FUtil.Request({
     method: 'POST',
-    url: `/v1/storages/buckets/${bucketName}/objects`,
+    url: `/v2/storages/buckets/${bucketName}/objects`,
     data: params,
   });
 }
@@ -130,13 +130,13 @@ export function objectDetails(params: ObjectDetailsParamsType1 | ObjectDetailsPa
   if ((params as ObjectDetailsParamsType2).objectIdOrName) {
     return FUtil.Request({
       method: 'GET',
-      url: `/v1/storages/objects/${encodeURIComponent((params as ObjectDetailsParamsType2).objectIdOrName)}`,
+      url: `/v2/storages/objects/${encodeURIComponent((params as ObjectDetailsParamsType2).objectIdOrName)}`,
       params: params,
     });
   }
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets/${(params as ObjectDetailsParamsType1).bucketName}/objects/${(params as ObjectDetailsParamsType1).objectId}`,
+    url: `/v2/storages/buckets/${(params as ObjectDetailsParamsType1).bucketName}/objects/${(params as ObjectDetailsParamsType1).objectId}`,
     params: params,
   });
 }
@@ -150,7 +150,7 @@ interface DeleteObjectsParamsType {
 export function deleteObjects(params: DeleteObjectsParamsType) {
   return FUtil.Request({
     method: 'DELETE',
-    url: `/v1/storages/buckets/${params.bucketName}/objects/${params.objectIds}`,
+    url: `/v2/storages/buckets/${params.bucketName}/objects/${params.objectIds}`,
     data: params,
   });
 }
@@ -163,7 +163,7 @@ interface BucketIsExistParamsType {
 export function bucketIsExist({bucketName}: BucketIsExistParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/buckets/${bucketName}/isExist`,
+    url: `/v2/storages/buckets/${bucketName}/isExist`,
     // params: params,
   });
 }
@@ -174,7 +174,7 @@ interface DownloadObjectParamsType {
 }
 
 export function downloadObject(params: DownloadObjectParamsType) {
-  return window.location.href = FUtil.Format.completeUrlByDomain('qi') + `/v1/storages/objects/${params.objectIdOrName}/file`;
+  return window.location.href = FUtil.Format.completeUrlByDomain('qi') + `/v2/storages/objects/${params.objectIdOrName}/file`;
 }
 
 // 根据sha1查询文件是否存在
@@ -185,7 +185,7 @@ interface FileIsExistParamsType {
 export function fileIsExist(params: FileIsExistParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/files/fileIsExist`,
+    url: `/v2/storages/files/fileIsExist`,
     params: params,
   });
 }
@@ -205,17 +205,17 @@ export function uploadFile(params: UploadFileParamsType, config?: AxiosRequestCo
   }
 
   if (!returnCancel) {
-    // return FUtil.Axios.post('/v1/storages/files/upload', formData, config);
+    // return FUtil.Axios.post('/v2/storages/files/upload', formData, config);
     return FUtil.Request({
       method: 'POST',
-      url: `/v1/storages/files/upload`,
+      url: `/v2/storages/files/upload`,
       data: formData,
       ...config,
     });
   }
 
   let cancel: any = null;
-  // const promise = FUtil.Axios.post('/v1/storages/files/upload', formData, {
+  // const promise = FUtil.Axios.post('/v2/storages/files/upload', formData, {
   //   cancelToken: new FUtil.Axios.CancelToken((c) => {
   //     cancel = c;
   //   }),
@@ -223,7 +223,7 @@ export function uploadFile(params: UploadFileParamsType, config?: AxiosRequestCo
 
   const promise = FUtil.Request({
     method: 'POST',
-    url: `/v1/storages/files/upload`,
+    url: `/v2/storages/files/upload`,
     data: formData,
     cancelToken: new FUtil.Axios.CancelToken((c) => {
       cancel = c;
@@ -251,7 +251,7 @@ export function uploadImage(params: UploadImageParamsType, config?: AxiosRequest
   }
   return FUtil.Request({
     method: 'POST',
-    url: `/v1/storages/files/uploadImage`,
+    url: `/v2/storages/files/uploadImage`,
     data: formData,
     ...config,
   });
@@ -293,7 +293,7 @@ interface BatchObjectListParamsType {
 export function batchObjectList(params: BatchObjectListParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/objects/list`,
+    url: `/v2/storages/objects/list`,
     params: params,
   });
 }
@@ -307,7 +307,7 @@ interface FilePropertyParamsType {
 export function fileProperty({sha1, ...params}: FilePropertyParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v1/storages/files/${sha1}/property`,
+    url: `/v2/storages/files/${sha1}/property`,
     params: params,
   });
 }
@@ -325,7 +325,7 @@ interface CycleDependencyCheckParamsType {
 export function cycleDependencyCheck({objectIdOrName, ...params}: CycleDependencyCheckParamsType) {
   return FUtil.Request({
     method: 'POST',
-    url: `/v1/storages/objects/${objectIdOrName}/cycleDependencyCheck`,
+    url: `/v2/storages/objects/${objectIdOrName}/cycleDependencyCheck`,
     data: params,
   });
 }

package/src/utils/axios.ts

@@ -56,58 +56,63 @@ if (window.location.hostname.includes('.com')) {
 // };
 //
 // // Add a request interceptor
-axios.interceptors.request.use(function (config) {
-  // Do something before request is sent
-  NProgress.start();
-  return config;
-}, function (error) {
-  // Do something with request error
-  NProgress.done();
-  return Promise.reject(error);
-});
+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(function (response) {
-  // Do something with response data
-  // console.log(response, 'response!!!!!!');
-  NProgress.done();
-  if (response.status !== 200) {
+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,
-    };
+      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;
-  }
+      // 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');
+    // 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;
-}, function (error) {
-  // Do something with response error
-  NProgress.done();
-  return Promise.reject(error);
-});
+    // 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;
 
@@ -125,21 +130,12 @@ export async function request(config: AxiosRequestConfig, {
   if (result.ret === 0 && result.errCode === 30 && !noRedirect) {
     await FServiceAPI.User.logout();
     window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
-  }
-  if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
+  } else if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
     window.location.replace(`${completeUrlByDomain('user')}${LinkTo.userFreeze({goTo: window.location.href})}`);
-  }
-  if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
+  } else if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
     // window.alert(result.msg);
     // return;
+
   }
   return result;
 }
-
-// export function downloadFile(res: AxiosResponse) {
-//   const {data, headers} = res;
-//   // const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
-//   const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
-//   const blob = new Blob([data], {});
-//   FileSaver.saveAs(blob, fileName);
-// }