Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-external-sdk into dev

es/fetch/index.js

@@ -1,2 +0,0 @@
-"use strict";
-require('isomorphic-fetch');

es/fetch/index.mp.js

@@ -1,2 +0,0 @@
-"use strict";
-global.fetch = global.fetch;

es/fetch/index.web.js

@@ -1,2 +0,0 @@
-"use strict";
-global.fetch = fetch;

es/service/ctyun/CTYun.js

@@ -57,7 +57,7 @@ export class CTYunInstance {
                 accessKey: this.accessKey,
                 policy: signInfo.encodePolicy,
                 signature: signInfo.signature,
-                uploadHost: `http://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
+                uploadHost: `https://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
                 bucket,
             };
         }

es/service/qiniu/QiniuCloud.js

@@ -4,7 +4,7 @@ import { Md5 } from 'ts-md5';
 import { Buffer } from 'buffer';
 import { stringify } from 'querystring';
 import { OakExternalException, OakNetworkException, } from 'oak-domain/lib/types/Exception';
-import { url as URL } from 'oak-domain/lib/utils/url/index';
+import { url as URL } from 'oak-domain/lib/utils/url';
 /**
  * qiniu endpoint list
  * https://developer.qiniu.com/kodo/1671/region-endpoint-fq

lib/fetch/index.js

@@ -1,2 +0,0 @@
-"use strict";
-require('isomorphic-fetch');

lib/fetch/index.mp.js

@@ -1,2 +0,0 @@
-"use strict";
-global.fetch = global.fetch;

lib/fetch/index.web.js

@@ -1,2 +0,0 @@
-"use strict";
-global.fetch = fetch;

lib/service/ctyun/CTYun.js

@@ -61,7 +61,7 @@ class CTYunInstance {
                 accessKey: this.accessKey,
                 policy: signInfo.encodePolicy,
                 signature: signInfo.signature,
-                uploadHost: `http://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
+                uploadHost: `https://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
                 bucket,
             };
         }

lib/service/qiniu/QiniuCloud.js

@@ -8,7 +8,7 @@ const ts_md5_1 = require("ts-md5");
 const buffer_1 = require("buffer");
 const querystring_1 = require("querystring");
 const Exception_1 = require("oak-domain/lib/types/Exception");
-const index_1 = require("oak-domain/lib/utils/url/index");
+const url_1 = require("oak-domain/lib/utils/url");
 /**
  * qiniu endpoint list
  * https://developer.qiniu.com/kodo/1671/region-endpoint-fq
@@ -344,7 +344,7 @@ class QiniuCloudInstance {
         /**
          * web/server环境测试通过，小程序没测，by Xc
          */
-        const url = new index_1.url(`https://${host}${path}`);
+        const url = new url_1.url(`https://${host}${path}`);
         if (process.env.NODE_ENV === 'development' && mockData) {
             console.warn(`mocking access qiniu api: url: ${url.toString()}, body: ${JSON.stringify(body)}, method: ${method}`, mockData);
             return mockData;

src/service/ctyun/CTYun.ts

@@ -62,7 +62,7 @@ export class CTYunInstance {
                 accessKey: this.accessKey,
                 policy: signInfo.encodePolicy,
                 signature: signInfo.signature,
-                uploadHost: `http://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
+                uploadHost: `https://${bucket}.${CTYun_ENDPOINT_LIST[zone].ul}`,
                 bucket,
             };
         } catch (err) {

src/service/qiniu/QiniuCloud.ts

@@ -7,7 +7,7 @@ import {
     OakExternalException,
     OakNetworkException,
 } from 'oak-domain/lib/types/Exception';
-import { url as URL, urlObject as UrlObject } from 'oak-domain/lib/utils/url/index';
+import { url as URL, urlObject as UrlObject } from 'oak-domain/lib/utils/url';
 import { QiniuZone } from '../../types/Qiniu';
 
 /**