@smart100/spu-web-plugin 1.0.15 → 1.0.17

package/dist/index.d.ts

@@ -66,8 +66,14 @@ interface IUpload {
   onprogress?: (p: number, _checkpoint?: any) => void
 }
 
+interface ICopy {
+  copykey: string
+  storagetype?: StorageType
+}
+
 interface IUploadService {
   upload: (options: IUpload) => Promise<any>
+  copy: (options: ICopy) => Promise<any>
 }
 
 // interface ISPUWebPluginOptions {
@@ -111,6 +117,13 @@ export const spuConfig: any
 export const globalConfig: any
 export const downloadService: IDownloadService
 export const uploadService: IUploadService
+export const getServToken: () => Promise<{
+  accesskeyid: string
+  accesskeysecret: string
+  securitytoken: string
+  expiration: string
+}>
+export const getCloudServ: (type?: StorageType) => any
 export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.15";
+var version = "1.0.17";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -8606,6 +8606,7 @@ var CloudServ = /*#__PURE__*/function () {
   return CloudServ;
 }();
 var cloudServ = new CloudServ();
+var getCloudServ = cloudServ.get.bind(cloudServ);
 
 var cryptoJs = {exports: {}};
 
@@ -17210,7 +17211,7 @@ var MapService = /*#__PURE__*/function () {
               key = this.key;
               secretkey = this.secretkey;
               if (!(type === 'tencent')) {
-                _context2.next = 11;
+                _context2.next = 14;
                 break;
               }
               if (!(!key || !secretkey)) {
@@ -17220,45 +17221,54 @@ var MapService = /*#__PURE__*/function () {
               console.error('请填写腾讯地图 Web App Key 和 Web Secret Key');
               return _context2.abrupt("return");
             case 7:
-              _context2.next = 9;
+              console.log('当前使用腾讯地图');
+              console.log("Web App Key: ".concat(key));
+              console.log("Web Secret Key: ".concat(secretkey));
+              _context2.next = 12;
               return this.initTecent();
-            case 9:
-              _context2.next = 25;
+            case 12:
+              _context2.next = 34;
               break;
-            case 11:
+            case 14:
               if (!(type === 'amap')) {
-                _context2.next = 19;
+                _context2.next = 25;
                 break;
               }
               if (!(!key || !secretkey)) {
-                _context2.next = 15;
+                _context2.next = 18;
                 break;
               }
               console.error('请填写高德地图 Web App Key 和 Web Secret Key');
               return _context2.abrupt("return");
-            case 15:
-              _context2.next = 17;
+            case 18:
+              console.log('当前使用高德地图');
+              console.log("Web App Key: ".concat(key));
+              console.log("Web Secret Key: ".concat(secretkey));
+              _context2.next = 23;
               return this.initAmap();
-            case 17:
-              _context2.next = 25;
+            case 23:
+              _context2.next = 34;
               break;
-            case 19:
+            case 25:
               if (!(type === 'baidu')) {
-                _context2.next = 25;
+                _context2.next = 34;
                 break;
               }
               if (key) {
-                _context2.next = 23;
+                _context2.next = 29;
                 break;
               }
               console.error('请填写百度地图 Web App Key');
               return _context2.abrupt("return");
-            case 23:
-              _context2.next = 25;
+            case 29:
+              console.log('当前使用百度地图');
+              console.log("Web App Key: ".concat(key));
+              console.log("Web Secret Key: ".concat(secretkey));
+              _context2.next = 34;
               return this.initBaidu();
-            case 25:
+            case 34:
               this.isInit = true;
-            case 26:
+            case 35:
             case "end":
               return _context2.stop();
           }
@@ -18056,66 +18066,67 @@ var getLocationPromise = /*#__PURE__*/function () {
           location = _context17.sent;
         case 6:
           if (location) {
-            _context17.next = 10;
-            break;
-          }
-          _context17.next = 9;
-          return getLocationByNavigator();
-        case 9:
-          location = _context17.sent;
-        case 10:
-          if (location) {
-            _context17.next = 35;
+            _context17.next = 31;
             break;
           }
           if (!(mapService.type === 'amap')) {
-            _context17.next = 21;
+            _context17.next = 17;
             break;
           }
-          _context17.next = 14;
+          _context17.next = 10;
           return getLocationByAMap();
-        case 14:
+        case 10:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
-            _context17.next = 19;
+            _context17.next = 15;
             break;
           }
-          _context17.next = 18;
+          _context17.next = 14;
           return getCityLocationByAMap();
-        case 18:
+        case 14:
           location = _context17.sent;
-        case 19:
-          _context17.next = 35;
+        case 15:
+          _context17.next = 31;
           break;
-        case 21:
+        case 17:
           if (!(mapService.type === 'tencent' && isuseiplocarion)) {
-            _context17.next = 27;
+            _context17.next = 23;
             break;
           }
-          _context17.next = 24;
+          _context17.next = 20;
           return getIPLocationByTMap();
-        case 24:
+        case 20:
           location = _context17.sent;
-          _context17.next = 35;
+          _context17.next = 31;
           break;
-        case 27:
+        case 23:
           if (!(mapService.type === 'baidu')) {
-            _context17.next = 35;
+            _context17.next = 31;
             break;
           }
-          _context17.next = 30;
+          _context17.next = 26;
           return getLocationByBMap();
-        case 30:
+        case 26:
           location = _context17.sent;
           if (!(!location && isuseiplocarion)) {
+            _context17.next = 31;
+            break;
+          }
+          _context17.next = 30;
+          return getCityLocationByBMap();
+        case 30:
+          location = _context17.sent;
+        case 31:
+          if (location) {
             _context17.next = 35;
             break;
           }
           _context17.next = 34;
-          return getCityLocationByBMap();
+          return getLocationByNavigator();
         case 34:
           location = _context17.sent;
         case 35:
+          // location = null
           // 开发模式下为了方便测试提供虚拟定位
           if (!location && urlquery.isvirtuallocation) {
             location = {
@@ -51809,7 +51820,7 @@ var last = 0;
 var servtoken = null;
 var isGetting = false;
 var xhr = null;
-var getServToken = /*#__PURE__*/function () {
+var requestServToken = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
     var response;
     return _regeneratorRuntime$1().wrap(function _callee$(_context) {
@@ -51833,11 +51844,11 @@ var getServToken = /*#__PURE__*/function () {
       }
     }, _callee, null, [[0, 7]]);
   }));
-  return function getServToken() {
+  return function requestServToken() {
     return _ref.apply(this, arguments);
   };
 }();
-var initServToken = function initServToken() {
+var getServToken = function getServToken() {
   return new Promise(function (resolve, reject) {
     // 在请求中,排队列
     if (isGetting && xhr) {
@@ -51864,7 +51875,7 @@ var initServToken = function initServToken() {
       if (!last || last - Date.now() < 1000 * 60 * 5) {
         // 过期了 重新请求
         isGetting = true;
-        xhr = getServToken();
+        xhr = requestServToken();
         xhr.then(function (res) {
           servtoken = res;
           last = new Date(res.expiration).getTime();
@@ -51974,7 +51985,7 @@ var getUrl = /*#__PURE__*/function () {
           throw Error('无可用存储设置');
         case 4:
           _context.next = 6;
-          return initServToken();
+          return getServToken();
         case 6:
           servToken = _context.sent;
           if (servToken) {
@@ -52056,7 +52067,8 @@ var getUrl = /*#__PURE__*/function () {
           res = obs.createSignedUrlSync(Params);
           signedUrl = res.SignedUrl; // const expires = get(qs.parse(signedUrl), 'Expires') as string
           // if (expires) setCacheUrl(cacheKey, signedUrl, +expires)
-          return _context.abrupt("return", signedUrl);
+          // 华为云通过 createSignedUrlSync 生产的签名链接默认带有 :80 或者 :443 端口 后端删除时需要去除
+          return _context.abrupt("return", signedUrl.replace(/:(80|443)/, ''));
         case 37:
           _context.prev = 37;
           _context.t0 = _context["catch"](29);
@@ -52669,7 +52681,7 @@ var upload = /*#__PURE__*/function () {
           throw Error('无可用存储设置');
         case 6:
           _context4.next = 8;
-          return initServToken();
+          return getServToken();
         case 8:
           servToken = _context4.sent;
           if (servToken) {
@@ -52727,9 +52739,10 @@ var upload = /*#__PURE__*/function () {
                                       onprogress && onprogress(p, _checkpoint);
                                       if (p === 1) {
                                         resolve({
+                                          key: osskey,
                                           source: source,
                                           filename: file.name,
-                                          type: file.type,
+                                          type: type,
                                           date: date,
                                           datetime: datetime,
                                           storage: storagetype,
@@ -52784,9 +52797,10 @@ var upload = /*#__PURE__*/function () {
                     uploadRes = _context3.sent;
                     if (uploadRes) {
                       resolve({
+                        key: osskey,
                         source: source,
                         filename: file.name,
-                        type: file.type,
+                        type: type,
                         date: date,
                         datetime: datetime,
                         storage: storagetype,
@@ -52840,7 +52854,7 @@ var upload = /*#__PURE__*/function () {
                           key: osskey,
                           source: source,
                           filename: file.name,
-                          type: file.type,
+                          type: type,
                           date: date,
                           datetime: datetime,
                           storage: storagetype,
@@ -52873,8 +52887,177 @@ var upload = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
+var createTargetObj = function createTargetObj(copykey) {
+  var storagetype = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'storage';
+  var uuid = v4();
+  var datetime = Date.now().toString();
+  var date = dayjs(Number(datetime)).format('YYYYMMDD');
+  var arr = copykey.split('/');
+  arr[0] = uuid.slice(0, 3);
+  arr[2] = date;
+  var arr2 = arr[arr.length - 1].split('.');
+  var ext = arr2[arr2.length - 1];
+  arr[arr.length - 1] = "".concat(uuid, ".").concat(ext);
+  return {
+    key: arr.join('/'),
+    source: arr[arr.length - 1],
+    datetime: datetime,
+    date: date,
+    type: arr[1],
+    storage: storagetype
+  };
+};
+var copy = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5(_ref4) {
+    var _ref4$copykey, copykey, _ref4$storagetype, storagetype, storageConfig, servToken, provider, targetObj;
+    return _regeneratorRuntime$1().wrap(function _callee5$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _ref4$copykey = _ref4.copykey, copykey = _ref4$copykey === void 0 ? '' : _ref4$copykey, _ref4$storagetype = _ref4.storagetype, storagetype = _ref4$storagetype === void 0 ? 'storage' : _ref4$storagetype;
+          storageConfig = cloudServ.get(storagetype);
+          if (storageConfig) {
+            _context6.next = 4;
+            break;
+          }
+          throw Error('无可用存储设置');
+        case 4:
+          _context6.next = 6;
+          return getServToken();
+        case 6:
+          servToken = _context6.sent;
+          if (servToken) {
+            _context6.next = 9;
+            break;
+          }
+          throw Error('无可用servToken');
+        case 9:
+          provider = cloudServ.getProvider(storagetype);
+          targetObj = createTargetObj(copykey, storagetype);
+          return _context6.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref6 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4(resolve, reject) {
+              var ossClient, obs, s3;
+              return _regeneratorRuntime$1().wrap(function _callee4$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
+                  case 0:
+                    if (!(provider !== null && provider !== void 0 && provider.isAliyun)) {
+                      _context5.next = 5;
+                      break;
+                    }
+                    ossClient = new AliClient({
+                      // region: cloudServ.cloudserv_storage_storageendpoint,
+                      endpoint: storageConfig.cloudserv_storage_storageendpoint,
+                      accessKeyId: servToken.accesskeyid,
+                      accessKeySecret: servToken.accesskeysecret,
+                      stsToken: servToken.securitytoken,
+                      bucket: storageConfig.cloudserv_storage_storagebucket,
+                      secure: true
+                      // sldEnable: true // 二级域名,ip地址
+                    });
+
+                    co$1(ossClient.copy(targetObj.key, copykey)).then(function (res) {
+                      var _res$res, _res$data;
+                      // console.log(res)
+                      // debugger
+                      // resolve(targetObj)
+                      if ((res === null || res === void 0 || (_res$res = res.res) === null || _res$res === void 0 ? void 0 : _res$res.status) === 200 && res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.etag) {
+                        resolve(targetObj);
+                      } else {
+                        console.error(res);
+                        reject(res);
+                      }
+                    })["catch"](function (e) {
+                      console.error(e);
+                      // debugger
+                      reject(e);
+                    });
+                    _context5.next = 16;
+                    break;
+                  case 5:
+                    if (!(provider !== null && provider !== void 0 && provider.isHuawei)) {
+                      _context5.next = 10;
+                      break;
+                    }
+                    obs = new ObsClient({
+                      access_key_id: servToken.accesskeyid,
+                      secret_access_key: servToken.accesskeysecret,
+                      server: storageConfig.cloudserv_storage_storageendpoint,
+                      security_token: servToken.securitytoken
+                    });
+                    obs.copyObject({
+                      Bucket: storageConfig.cloudserv_storage_storagebucket,
+                      Key: targetObj.key,
+                      CopySource: "".concat(storageConfig.cloudserv_storage_storagebucket, "/").concat(copykey)
+                    }).then(function (res) {
+                      var _res$CommonMsg;
+                      if ((res === null || res === void 0 || (_res$CommonMsg = res.CommonMsg) === null || _res$CommonMsg === void 0 ? void 0 : _res$CommonMsg.Status) === 200 && res !== null && res !== void 0 && res.InterfaceResult) {
+                        resolve(targetObj);
+                      } else {
+                        console.error(res);
+                        reject(res);
+                      }
+                    })["catch"](function (e) {
+                      console.error(e);
+                      reject(e);
+                    });
+                    _context5.next = 16;
+                    break;
+                  case 10:
+                    if (!(provider !== null && provider !== void 0 && provider.isMinio || provider !== null && provider !== void 0 && provider.isAwss3)) {
+                      _context5.next = 15;
+                      break;
+                    }
+                    // debugger
+                    // debugger
+                    s3 = new S3Client({
+                      accessKeyId: servToken.accesskeyid,
+                      secretAccessKey: servToken.accesskeysecret,
+                      sessionToken: servToken.securitytoken,
+                      region: storageConfig.cloudserv_storage_region,
+                      endpoint: storageConfig.cloudserv_storage_storageendpoint,
+                      signatureVersion: 'v4',
+                      s3ForcePathStyle: provider !== null && provider !== void 0 && provider.isMinio ? true : undefined
+                    }); // console.log(s3)
+                    // debugger
+                    s3.copyObject({
+                      Bucket: storageConfig.cloudserv_storage_storagebucket,
+                      CopySource: "".concat(storageConfig.cloudserv_storage_storagebucket, "/").concat(copykey),
+                      Key: targetObj.key
+                    }, function (err, data) {
+                      if (err) {
+                        console.error(err);
+                        reject(err);
+                      } else {
+                        // console.log(data)
+                        resolve(targetObj);
+                      }
+                    });
+                    _context5.next = 16;
+                    break;
+                  case 15:
+                    throw Error("\u6682\u4E0D\u652F\u6301".concat(provider === null || provider === void 0 ? void 0 : provider.name, "\u5B58\u50A8\u7C7B\u578B"));
+                  case 16:
+                  case "end":
+                    return _context5.stop();
+                }
+              }, _callee4);
+            }));
+            return function (_x5, _x6) {
+              return _ref6.apply(this, arguments);
+            };
+          }()));
+        case 12:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee5);
+  }));
+  return function copy(_x4) {
+    return _ref5.apply(this, arguments);
+  };
+}();
 var uploadService = {
-  upload: upload
+  upload: upload,
+  copy: copy
 };
 
 var isinit = false;
@@ -70043,4 +70226,4 @@ var SPUWebPlugin = {
   version: version
 };
 
-export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getAddress, getDistance, getLocation, getRefreshToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };
+export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getAddress, getCloudServ, getDistance, getLocation, getRefreshToken, getServToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/index.ts

@@ -7,6 +7,8 @@ import { installAxios, spuAxios, axios } from './axios'
 import { installSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
+import { getServToken } from './oss/servtoken'
+import { getCloudServ } from './oss/cloudServ'
 import { getUniqueid, functionCheck, setTitle, isInApp, isdebugger, isvirtuallocation } from './utils'
 import { installUrlquery } from './urlquery'
 import { mapService } from './map/MapService'
@@ -109,6 +111,8 @@ export {
   globalConfig,
   downloadService,
   uploadService,
+  getServToken,
+  getCloudServ,
   getUniqueid,
   getUuid,
   functionCheck,

package/src/login.ts

@@ -2,7 +2,7 @@ import { get, cloneDeep } from 'lodash-es'
 import jwtDecode from 'jwt-decode'
 import { lsProxy } from './storageProxy'
 import { axios } from './axios'
-import cloudServ from './cloudServ'
+import cloudServ from './oss/cloudServ'
 import core from './core'
 import { urlquery } from './urlquery'
 import { getData, setData, removeData } from './storageCache'

package/src/map/MapService.ts

@@ -108,18 +108,27 @@ class MapService {
         console.error('请填写腾讯地图 Web App Key 和 Web Secret Key')
         return
       }
+      console.log('当前使用腾讯地图')
+      console.log(`Web App Key: ${key}`)
+      console.log(`Web Secret Key: ${secretkey}`)
       await this.initTecent()
     } else if (type === 'amap') {
       if (!key || !secretkey) {
         console.error('请填写高德地图 Web App Key 和 Web Secret Key')
         return
       }
+      console.log('当前使用高德地图')
+      console.log(`Web App Key: ${key}`)
+      console.log(`Web Secret Key: ${secretkey}`)
       await this.initAmap()
     } else if (type === 'baidu') {
       if (!key) {
         console.error('请填写百度地图 Web App Key')
         return
       }
+      console.log('当前使用百度地图')
+      console.log(`Web App Key: ${key}`)
+      console.log(`Web Secret Key: ${secretkey}`)
       await this.initBaidu()
     }
     this.isInit = true

package/src/map/index.ts

@@ -95,20 +95,19 @@ const getLocationByNavigator = async (): Promise<Location> => {
 }
 
 // ipaas ip 定位
-const getIPLocationByIpaas = async (
-  ip?: string
-): Promise<Location> => {
+const getIPLocationByIpaas = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByIpaas start...')
   return new Promise((resolve, reject) => {
     const AMapKey = getAMapKey()
 
-    axios.post(
-      'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271',
-      {
-        key: AMapKey.key, // 好像不传也没问题 因为key是在ipaas那边设置的
-        ip: ip || ''
-      }
-    )
+    axios
+      .post(
+        'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271',
+        {
+          key: AMapKey.key, // 好像不传也没问题 因为key是在ipaas那边设置的
+          ip: ip || ''
+        }
+      )
       .then((res: any) => {
         // console.log(res)
         // debugger
@@ -134,7 +133,8 @@ const getIPLocationByIpaas = async (
           console.error('getIPLocationByIpaas fail')
           resolve(null)
         }
-      }).catch((err: any) => {
+      })
+      .catch((err: any) => {
         console.error(err)
         console.error('getIPLocationByIpaas fail')
         resolve(null)
@@ -150,12 +150,15 @@ const getAddressByIpaas = async (position: Location): Promise<string> => {
     if (position) {
       try {
         const AMapKey = getAMapKey()
-        const result = await axios.post('https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001809906', {
-          longitude: position.longitude,
-          latitude: position.latitude,
-          key: AMapKey.key
-          // extensions: 'all'
-        })
+        const result = await axios.post(
+          'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001809906',
+          {
+            longitude: position.longitude,
+            latitude: position.latitude,
+            key: AMapKey.key
+            // extensions: 'all'
+          }
+        )
         // console.log(result)
         const address = result?.data?.formatted_address
         if (address) {
@@ -484,11 +487,6 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
     location = await getLocationByNative()
   }
 
-  if (!location) {
-    location = await getLocationByNavigator()
-  }
-  // location = null
-
   if (!location) {
     if (mapService.type === 'amap') {
       location = await getLocationByAMap()
@@ -509,6 +507,11 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
     }
   }
 
+  if (!location) {
+    location = await getLocationByNavigator()
+  }
+  // location = null
+
   // 开发模式下为了方便测试提供虚拟定位
   if (!location && urlquery.isvirtuallocation) {
     location = {

package/src/{cloudServ.ts → oss/cloudServ.ts}

@@ -1,4 +1,4 @@
-import { lsProxy } from './storageProxy'
+import { lsProxy } from '../storageProxy'
 
 class CloudServ {
   CLOUD_SERVE_KEY = 'cloudserv'
@@ -49,4 +49,11 @@ class CloudServ {
 
 const cloudServ = new CloudServ()
 
+
+const getCloudServ = cloudServ.get.bind(cloudServ)
+
 export default cloudServ
+
+export {
+  getCloudServ
+}

package/src/oss/downloadService.ts

@@ -1,7 +1,7 @@
 import { AliClient, ObsClient, S3Client } from './OSSClient'
 import dayjs from 'dayjs'
-import cloudServ from '../cloudServ'
-import { initServToken } from './servtoken'
+import cloudServ from './cloudServ'
+import { getServToken } from './servtoken'
 import { axios } from '../axios'
 import { getUser } from '../login'
 // import { get } from 'lodash-es'
@@ -130,7 +130,7 @@ const getUrl = async ({
 }: IDownload) => {
   const storageConfig = cloudServ.get(storagetype)
   if (!storageConfig) throw Error('无可用存储设置')
-  const servToken = await initServToken()
+  const servToken = await getServToken()
   if (!servToken) throw Error('无可用servToken')
 
   const tenantCode = getUser('tenantcode')
@@ -210,7 +210,8 @@ const getUrl = async ({
       // const expires = get(qs.parse(signedUrl), 'Expires') as string
       // if (expires) setCacheUrl(cacheKey, signedUrl, +expires)
 
-      return signedUrl
+      // 华为云通过 createSignedUrlSync 生产的签名链接默认带有 :80 或者 :443 端口 后端删除时需要去除
+      return signedUrl.replace(/:(80|443)/, '')
     } catch (e: any) {
       console.error(e)
       throw Error(e)

package/src/oss/servtoken.ts

@@ -18,7 +18,7 @@ let servtoken: ServToken | null = null
 let isGetting = false
 let xhr: Promise<ServToken> | null = null
 
-const getServToken = async () => {
+const requestServToken = async () => {
   try {
     const response: ServToken = await axios.get('/api/teapi/auth/servtoken').then((res: any) => res.data)
     // debugger
@@ -28,7 +28,7 @@ const getServToken = async () => {
   }
 }
 
-export const initServToken = () => {
+export const getServToken = () => {
   return new Promise<ServToken>((resolve, reject) => {
     // 在请求中,排队列
     if (isGetting && xhr) {
@@ -57,7 +57,7 @@ export const initServToken = () => {
       if (!last || last - Date.now() < 1000 * 60 * 5) {
         // 过期了 重新请求
         isGetting = true
-        xhr = getServToken()
+        xhr = requestServToken()
         xhr
           .then((res) => {
             servtoken = res

package/src/oss/uploadService.ts

@@ -2,10 +2,9 @@ import { AliClient, ObsClient, S3Client } from './OSSClient'
 import { v4 as uuidv4 } from 'uuid'
 import dayjs from 'dayjs'
 import co from 'co'
-
 import { getUser } from '../login'
-import cloudServ from '../cloudServ'
-import { initServToken } from './servtoken'
+import cloudServ from './cloudServ'
+import { getServToken } from './servtoken'
 import { obsMultiUpload } from './multiUpload'
 
 interface IUpload {
@@ -28,7 +27,7 @@ const upload = async ({
   if (!file) throw Error('请传入文件')
   const storageConfig = cloudServ.get(storagetype)
   if (!storageConfig) throw Error('无可用存储设置')
-  const servToken = await initServToken()
+  const servToken = await getServToken()
   if (!servToken) throw Error('无可用servToken')
 
   const provider = cloudServ.getProvider(storagetype)
@@ -66,9 +65,10 @@ const upload = async ({
             onprogress && onprogress(p, _checkpoint)
             if (p === 1) {
               resolve({
+                key: osskey,
                 source,
                 filename: file.name,
-                type: file.type,
+                type: type,
                 date: date,
                 datetime: datetime,
                 storage: storagetype,
@@ -105,9 +105,10 @@ const upload = async ({
         })
         if (uploadRes) {
           resolve({
+            key: osskey,
             source,
             filename: file.name,
-            type: file.type,
+            type: type,
             date: date,
             datetime: datetime,
             storage: storagetype,
@@ -161,7 +162,7 @@ const upload = async ({
             key: osskey,
             source,
             filename: file.name,
-            type: file.type,
+            type: type,
             date: date,
             datetime: datetime,
             storage: storagetype,
@@ -177,6 +178,128 @@ const upload = async ({
   return promise
 }
 
+
+const createTargetObj = (copykey: string, storagetype: StorageType = 'storage') => {
+  const uuid = uuidv4()
+  const datetime = Date.now().toString()
+  const date = dayjs(Number(datetime)).format('YYYYMMDD')
+  const arr = copykey.split('/')
+  arr[0] = uuid.slice(0, 3)
+  arr[2] = date
+  const arr2 = arr[arr.length - 1].split('.')
+  const ext = arr2[arr2.length - 1]
+  arr[arr.length - 1] = `${uuid}.${ext}`
+  return {
+    key: arr.join('/'),
+    source: arr[arr.length - 1],
+    datetime,
+    date,
+    type: arr[1],
+    storage: storagetype,
+  }
+}
+
+const copy = async ({
+  copykey = '',
+  storagetype = 'storage'
+}: any) => {
+  const storageConfig = cloudServ.get(storagetype)
+  if (!storageConfig) throw Error('无可用存储设置')
+  const servToken = await getServToken()
+  if (!servToken) throw Error('无可用servToken')
+
+  const provider = cloudServ.getProvider(storagetype)
+  const targetObj = createTargetObj(copykey, storagetype)
+
+  return new Promise(async (resolve, reject) => {
+    if (provider?.isAliyun) {
+      const ossClient = new AliClient({
+        // region: cloudServ.cloudserv_storage_storageendpoint,
+        endpoint: storageConfig.cloudserv_storage_storageendpoint,
+        accessKeyId: servToken.accesskeyid,
+        accessKeySecret: servToken.accesskeysecret,
+        stsToken: servToken.securitytoken,
+        bucket: storageConfig.cloudserv_storage_storagebucket,
+        secure: true
+        // sldEnable: true // 二级域名,ip地址
+      })
+      co(ossClient.copy(targetObj.key, copykey))
+        .then((res: any) => {
+          // console.log(res)
+          // debugger
+          // resolve(targetObj)
+          if (res?.res?.status === 200 && res?.data?.etag) {
+            resolve(targetObj)
+          } else {
+            console.error(res)
+            reject(res)
+          }
+        })
+        .catch((e: any) => {
+          console.error(e)
+          // debugger
+          reject(e)
+        })
+    } else if (provider?.isHuawei) {
+      const obs = new ObsClient({
+        access_key_id: servToken.accesskeyid,
+        secret_access_key: servToken.accesskeysecret,
+        server: storageConfig.cloudserv_storage_storageendpoint,
+        security_token: servToken.securitytoken
+      })
+      obs.copyObject({
+        Bucket: storageConfig.cloudserv_storage_storagebucket,
+        Key: targetObj.key,
+        CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`
+      })
+      .then((res: any) => {
+        if (res?.CommonMsg?.Status === 200 && res?.InterfaceResult) {
+          resolve(targetObj)
+        } else {
+          console.error(res)
+          reject(res)
+        }
+      })
+      .catch((e: any) => {
+        console.error(e)
+        reject(e)
+      })
+    } else if (provider?.isMinio || provider?.isAwss3) {
+      // debugger
+      // debugger
+      const s3 = new S3Client({
+        accessKeyId: servToken.accesskeyid,
+        secretAccessKey: servToken.accesskeysecret,
+        sessionToken: servToken.securitytoken,
+        region: storageConfig.cloudserv_storage_region,
+        endpoint: storageConfig.cloudserv_storage_storageendpoint,
+        signatureVersion: 'v4',
+        s3ForcePathStyle: provider?.isMinio ? true : undefined
+      })
+      // console.log(s3)
+      // debugger
+      s3.copyObject({
+        Bucket: storageConfig.cloudserv_storage_storagebucket,
+        CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`,
+        Key: targetObj.key
+      }, (err: any, data: any) => {
+        if (err) {
+          console.error(err)
+          reject(err)
+        } else {
+          // console.log(data)
+          resolve(targetObj)
+        }
+      })
+    } else {
+      throw Error(`暂不支持${provider?.name}存储类型`)
+    }
+  })
+}
+
+
+
 export default {
-  upload
+  upload,
+  copy
 }

package/src/types/index.d.ts

@@ -66,8 +66,14 @@ interface IUpload {
   onprogress?: (p: number, _checkpoint?: any) => void
 }
 
+interface ICopy {
+  copykey: string
+  storagetype?: StorageType
+}
+
 interface IUploadService {
   upload: (options: IUpload) => Promise<any>
+  copy: (options: ICopy) => Promise<any>
 }
 
 // interface ISPUWebPluginOptions {
@@ -111,6 +117,13 @@ export const spuConfig: any
 export const globalConfig: any
 export const downloadService: IDownloadService
 export const uploadService: IUploadService
+export const getServToken: () => Promise<{
+  accesskeyid: string
+  accesskeysecret: string
+  securitytoken: string
+  expiration: string
+}>
+export const getCloudServ: (type?: StorageType) => any
 export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean