dff-util 1.0.0 → 1.0.2

package/dist/main/http.d.ts

@@ -10,6 +10,10 @@ export declare const HttpHeaders: {
     authorization: null;
     'x-request-id': null;
 };
+export declare const BaseHeaders: {
+    authorization: null;
+    'x-request-id': null;
+};
 export declare class Http {
     static API_BASE_URL: string | undefined;
     static TOKEN_URL: string;
@@ -18,7 +22,7 @@ export declare class Http {
     static Post(url: string, data: any, headers: any, type?: RespType): Promise<any>;
     static Put(url: string, data: any, headers: any, type?: RespType): Promise<any>;
     static Delete(url: string, params: any, headers: any, type?: RespType): Promise<any>;
-    static Token(sessionInfo: any, key: string, type?: RespType): Promise<any>;
-    static Upload(fullUrl: string, file: File, data?: Record<string, any>, headers?: any, type?: RespType): Promise<any>;
+    static Token(sessionInfo: any, appKey: string, apiKey?: string, type?: RespType): Promise<any>;
+    static Upload(fullUrl: string, file: File, isHeadersAddMultiForm?: boolean, data?: Record<string, any>, headers?: any, type?: RespType): Promise<any>;
     static Download(fullUrl: string, params: any, headers?: any): Promise<Buffer>;
 }

package/dist/main/http.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Http = exports.HttpHeaders = exports.RespType = void 0;
+exports.Http = exports.BaseHeaders = exports.HttpHeaders = exports.RespType = void 0;
 var RespType;
 (function (RespType) {
     RespType["JSON"] = "json";
@@ -23,6 +23,10 @@ exports.HttpHeaders = {
     authorization: null,
     'x-request-id': null,
 };
+exports.BaseHeaders = {
+    authorization: null,
+    'x-request-id': null,
+};
 class Http {
     static RespData(response_1) {
         return __awaiter(this, arguments, void 0, function* (response, type = RespType.JSON) {
@@ -105,13 +109,14 @@ class Http {
             }
         });
     }
-    static Token(sessionInfo_1, key_1) {
-        return __awaiter(this, arguments, void 0, function* (sessionInfo, key, type = RespType.TEXT) {
+    static Token(sessionInfo_1, appKey_1, apiKey_1) {
+        return __awaiter(this, arguments, void 0, function* (sessionInfo, appKey, apiKey, type = RespType.TEXT) {
             const url = `${Http.API_BASE_URL}${Http.TOKEN_URL}`;
-            const params = { key: key, payload: JSON.stringify(sessionInfo) };
+            const params = { key: appKey, payload: JSON.stringify(sessionInfo) };
             const fullUrl = `${url}?${new URLSearchParams(params).toString()}`;
+            const headers = Object.assign(Object.assign({}, Headers), { 'X-API-KEY': apiKey || '' });
             try {
-                const requestOptions = { method: 'GET', headers: exports.HttpHeaders };
+                const requestOptions = { method: 'GET', headers: headers };
                 const response = yield fetch(fullUrl, requestOptions);
                 return yield Http.RespData(response, type);
             }
@@ -122,20 +127,25 @@ class Http {
         });
     }
     static Upload(fullUrl_1, file_1) {
-        return __awaiter(this, arguments, void 0, function* (fullUrl, file, data = {}, headers = exports.HttpHeaders, type = RespType.JSON) {
+        return __awaiter(this, arguments, void 0, function* (fullUrl, file, isHeadersAddMultiForm = false, data = {}, headers = exports.BaseHeaders, type = RespType.JSON) {
             const formData = new FormData();
+            console.log(file);
             formData.append('file', file);
             for (const key in data) {
                 if (data[key] !== undefined && data[key] !== null) {
                     formData.append(key, data[key]);
                 }
             }
+            if (isHeadersAddMultiForm) {
+                headers = Object.assign(Object.assign({}, headers), { 'Content-Type': 'multipart/form-data' });
+            }
             try {
                 const requestOptions = {
                     method: 'POST',
                     body: formData,
-                    headers: Object.assign(Object.assign({}, headers), { 'Content-Type': 'multipart/form-data' }),
+                    headers: Object.assign({}, headers),
                 };
+                console.log(requestOptions);
                 const response = yield fetch(fullUrl, requestOptions);
                 return yield Http.RespData(response, type);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dff-util",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {