@smart100/spu-web-plugin 1.0.25-beta.3 → 1.0.25-beta.5

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.25-beta.3";
+var version = "1.0.25-beta.5";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -16839,7 +16839,7 @@ function singleLogin(_x3) {
 }
 function _singleLogin() {
   _singleLogin = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee8(query) {
-    var flag, token, refreshtoken, tokenexpires, envname, context, setBaseInfo, isneedlogin, loginRole, refreshTokenUser, tokenUser, nowEnvname, envData;
+    var flag, token, refreshtoken, tokenexpires, envname, context, setBaseInfo, isneedlogin, loginRole, curUser, cacheUser, refreshTokenUser, tokenUser, nowEnvname, envData;
     return _regeneratorRuntime$1().wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
@@ -16858,7 +16858,9 @@ function _singleLogin() {
             }
           };
           query = cloneDeep$1(query);
-          if (!globalOptions.isfixapptokenexpired) {
+          // App SPUWebview 内用 Native-Api 获取token 而不是从 url 上取
+          // 暂时只在 门户引擎 中启用 等门户引擎验证通过之后 再改成所有 SPU 默认
+          if (!(globalOptions.isfixapptokenexpired && globalOptions.modulekey === 'portalEngine')) {
             _context8.next = 6;
             break;
           }
@@ -16874,141 +16876,153 @@ function _singleLogin() {
           envname = query.envname;
           context = query.context;
           if (!checkLoginByToken(token)) {
-            _context8.next = 65;
+            _context8.next = 67;
             break;
           }
           isneedlogin = true; // 是否需要走单点登录流程
           loginRole = getRoleByToken(token);
-          if (loginRole === 'center') {
-            // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
-            // 之所以不强制校验 refreshtoken tokenexpires 是因为安装卸载配置页面有可能放在产品运营中心 没有这两字段
-            if (checkLogin() && token === getToken()) {
-              isneedlogin = false;
-            }
-          } else {
-            // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
-            if (checkLogin() && token === getToken() && refreshtoken === getRefreshToken() && tokenexpires === getTokenExpires()) {
-              isneedlogin = false;
+          curUser = getUserByToken(token);
+          cacheUser = getUserByToken(getToken()); // 如果本地已经登录
+          if (checkLogin()) {
+            // 产品运营中心单点登录只有 token
+            if (loginRole === 'center') {
+              if ((curUser === null || curUser === void 0 ? void 0 : curUser.userCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.userCode) && (curUser === null || curUser === void 0 ? void 0 : curUser.appId) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.appId)) {
+                isneedlogin = false;
+              }
+            } else {
+              // 不重复走单点登录的逻辑
+              // 旧：判断当前单点登录的 token/refreshtoken/tokenexpires 是否与本地缓存的一致
+              // 新：解析当前单点登录 token 中的 mbcode、tenantcode，如果与缓存的一致，说明本次登录与上次登录是同个人同个租户
+              // 新逻辑暂时只用于超表
+              if (globalOptions.modulekey === 'litheformspu' && globalOptions.isoptimizesingleloginlogic) {
+                if ((curUser === null || curUser === void 0 ? void 0 : curUser.memberCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.memberCode) && (curUser === null || curUser === void 0 ? void 0 : curUser.tenantCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.tenantCode)) {
+                  isneedlogin = false;
+                }
+              } else {
+                if (token === getToken() && refreshtoken === getRefreshToken() && tokenexpires === getTokenExpires()) {
+                  isneedlogin = false;
+                }
+              }
             }
           }
           // isneedlogin = true
           // debugger
           if (!isneedlogin) {
-            _context8.next = 62;
+            _context8.next = 64;
             break;
           }
           setBaseInfo();
           // 单点登录写入 token 之后
-          _context8.prev = 18;
+          _context8.prev = 20;
           if (!checkLogin()) {
-            _context8.next = 25;
+            _context8.next = 27;
             break;
           }
           refreshTokenUser = getUserByToken(getRefreshToken());
           tokenUser = getUserByToken(getToken()); // 如果 refreshtoken 不完整【由于web端登录时 如果有选择租户或选择职位的情况 得到的 refreshtoken 是不完整】 则通过完整的 token 换取完整的 refreshtoken 如果不换的话 通过刷新 token 接口得到的 token 也变成不完整的了
           if (!(!(refreshTokenUser !== null && refreshTokenUser !== void 0 && refreshTokenUser.tokenId) && tokenUser !== null && tokenUser !== void 0 && tokenUser.tokenId)) {
-            _context8.next = 25;
+            _context8.next = 27;
             break;
           }
-          _context8.next = 25;
+          _context8.next = 27;
           return updateToken();
-        case 25:
-          _context8.next = 30;
-          break;
         case 27:
-          _context8.prev = 27;
-          _context8.t0 = _context8["catch"](18);
-          console.error(_context8.t0);
-        case 30:
           _context8.next = 32;
-          return getEnvname();
+          break;
+        case 29:
+          _context8.prev = 29;
+          _context8.t0 = _context8["catch"](20);
+          console.error(_context8.t0);
         case 32:
+          _context8.next = 34;
+          return getEnvname();
+        case 34:
           nowEnvname = _context8.sent;
           if (!nowEnvname) {
-            _context8.next = 53;
+            _context8.next = 55;
             break;
           }
-          _context8.next = 36;
+          _context8.next = 38;
           return requestEnvdata(nowEnvname);
-        case 36:
+        case 38:
           envData = _context8.sent;
           if (!envData) {
-            _context8.next = 49;
+            _context8.next = 51;
             break;
           }
           saveEnvdata(envData);
           if (!envData.tenantcode) {
-            _context8.next = 45;
+            _context8.next = 47;
             break;
           }
           setTecode(envData.tenantcode);
           // 租户配置
-          _context8.next = 43;
+          _context8.next = 45;
           return tenantSetting.requestAndSetTenantSetting(envData.tenantcode);
-        case 43:
-          _context8.next = 47;
-          break;
         case 45:
+          _context8.next = 49;
+          break;
+        case 47:
           tenantSetting.removeTenantSetting();
           removeTecode();
-        case 47:
-          _context8.next = 51;
-          break;
         case 49:
+          _context8.next = 53;
+          break;
+        case 51:
           removeEnvdata();
           removeTecode();
-        case 51:
-          _context8.next = 55;
-          break;
         case 53:
+          _context8.next = 57;
+          break;
+        case 55:
           removeEnvdata();
           removeTecode();
-        case 55:
-          _context8.next = 57;
-          return getAndSetTenant();
         case 57:
           _context8.next = 59;
-          return getAndSetUserInfo();
+          return getAndSetTenant();
         case 59:
+          _context8.next = 61;
+          return getAndSetUserInfo();
+        case 61:
           flag = true;
-          _context8.next = 63;
+          _context8.next = 65;
           break;
-        case 62:
+        case 64:
           flag = true;
-        case 63:
-          _context8.next = 68;
-          break;
         case 65:
+          _context8.next = 70;
+          break;
+        case 67:
           flag = false;
           setBaseInfo(); // 传递的token过期依然写入 如果不写入的话 有可能之前的token本来没过期 页面依然可用
-          console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。');
-        case 68:
+          console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires/envname 是否非法或过期。');
+        case 70:
           if (!flag) {
-            _context8.next = 77;
+            _context8.next = 79;
             break;
           }
           // 启动刷新token机制
           startRefreshtoken();
           // 获取spu 信息
-          _context8.next = 72;
+          _context8.next = 74;
           return core$1.initGetData();
-        case 72:
+        case 74:
           // 删除 query 中相关参数
           token && delete query.token;
           refreshtoken && delete query.refreshtoken;
           tokenexpires && delete query.tokenexpires;
           envname && delete query.envname;
           context && delete query.context;
-        case 77:
+        case 79:
           return _context8.abrupt("return", {
             flag: flag,
             query: query
           });
-        case 78:
+        case 80:
         case "end":
           return _context8.stop();
       }
-    }, _callee8, null, [[18, 27]]);
+    }, _callee8, null, [[20, 29]]);
   }));
   return _singleLogin.apply(this, arguments);
 }
@@ -17779,7 +17793,8 @@ var getLocationByNative = /*#__PURE__*/function () {
                   district: res.district || '',
                   street: res.street || '',
                   number: res.number || '',
-                  detailaddr: res.detailaddr || ''
+                  detailaddr: res.detailaddr || '',
+                  citycode: res.citycode || ''
                   // poiid: res.poiid || '',
                   // poitypename: res.poitypename || '',
                   // poitypecode: res.poitypecode || '',
@@ -17888,6 +17903,7 @@ var getLocationByAMap = /*#__PURE__*/function () {
                   address: '',
                   // poiname: '',
                   regionid: '',
+                  citycode: '',
                   country: '',
                   province: '',
                   city: '',
@@ -17910,12 +17926,13 @@ var getLocationByAMap = /*#__PURE__*/function () {
                   if (addrssDetail) {
                     result.address = addrssDetail.addressDetail.address;
                     // result.poiname = addrssDetail.addressDetail.poiname
-                    result.regionid = addrssDetail.addressDetail.regionid;
-                    result.country = addrssDetail.addressDetail.country;
-                    result.province = addrssDetail.addressDetail.province;
-                    result.city = addrssDetail.addressDetail.city;
-                    result.district = addrssDetail.addressDetail.district;
-                    result.street = addrssDetail.addressDetail.street;
+                    result.regionid = addrssDetail.addressDetail.regionid || '';
+                    result.citycode = addrssDetail.addressDetail.citycode || '';
+                    result.country = addrssDetail.addressDetail.country || '';
+                    result.province = addrssDetail.addressDetail.province || '';
+                    result.city = addrssDetail.addressDetail.city || '';
+                    result.district = addrssDetail.addressDetail.district || '';
+                    result.street = addrssDetail.addressDetail.street || '';
                     result.number = addrssDetail.addressDetail.number;
                     result.detailaddr = addrssDetail.addressDetail.detailaddr;
                     // result.poiid = addrssDetail.addressDetail.poiid
@@ -17977,6 +17994,7 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
                   address: '',
                   // poiname: '',
                   regionid: '',
+                  citycode: '',
                   country: '',
                   province: '',
                   city: '',
@@ -18001,12 +18019,13 @@ var getCityLocationByAMap = /*#__PURE__*/function () {
                   if (addrssDetail) {
                     result.address = addrssDetail.addressDetail.address;
                     // result.poiname = addrssDetail.addressDetail.poiname
-                    result.regionid = addrssDetail.addressDetail.regionid;
-                    result.country = addrssDetail.addressDetail.country;
-                    result.province = addrssDetail.addressDetail.province;
-                    result.city = addrssDetail.addressDetail.city;
-                    result.district = addrssDetail.addressDetail.district;
-                    result.street = addrssDetail.addressDetail.street;
+                    result.regionid = addrssDetail.addressDetail.regionid || '';
+                    result.citycode = addrssDetail.addressDetail.citycode || '';
+                    result.country = addrssDetail.addressDetail.country || '';
+                    result.province = addrssDetail.addressDetail.province || '';
+                    result.city = addrssDetail.addressDetail.city || '';
+                    result.district = addrssDetail.addressDetail.district || '';
+                    result.street = addrssDetail.addressDetail.street || '';
                     result.number = addrssDetail.addressDetail.number;
                     result.detailaddr = addrssDetail.addressDetail.detailaddr;
                     // result.poiid = addrssDetail.addressDetail.poiid
@@ -18145,6 +18164,7 @@ var getAddressDetailByAMap = /*#__PURE__*/function () {
                       address: address || '',
                       // poiname: poiname || '',
                       regionid: addressComponent.adcode || '',
+                      citycode: addressComponent.citycode || '',
                       country: country || '',
                       province: addressComponent.province || '',
                       city: addressComponent.city || '',
@@ -52474,7 +52494,7 @@ var getUrl = /*#__PURE__*/function () {
           copeStr = provider !== null && provider !== void 0 && provider.isAliyun ? getAliyunCope(cope) : getCope(cope);
           contentType = getContentType(suffix);
           if (!(provider !== null && provider !== void 0 && provider.isAliyun)) {
-            _context.next = 26;
+            _context.next = 25;
             break;
           }
           ossClient = new AliClient({
@@ -52489,11 +52509,10 @@ var getUrl = /*#__PURE__*/function () {
           responseHeader = {
             // 'content-type': contentType || undefined,
             'content-disposition': 'attachment; filename=' + (filename && encodeURIComponent(filename)) // 阿里云提供的下载名字
-          };
-
-          if (contentType) {
-            responseHeader['content-type'] = contentType;
-          }
+          }; // TODO 阿里云不在提供，会报错
+          // if (contentType) {
+          //   responseHeader['content-type'] = contentType
+          // }
           ossUrl = ossClient.signatureUrl(objectKey, {
             response: responseHeader,
             process: copeStr
@@ -52503,9 +52522,9 @@ var getUrl = /*#__PURE__*/function () {
           //   ossUrl = ossUrl.replace(paths[1] + '/' + paths[2], paths[1])
           // }
           return _context.abrupt("return", ossUrl);
-        case 26:
+        case 25:
           if (!(provider !== null && provider !== void 0 && provider.isHuawei)) {
-            _context.next = 43;
+            _context.next = 42;
             break;
           }
           obs = new ObsClient({
@@ -52517,7 +52536,7 @@ var getUrl = /*#__PURE__*/function () {
           if (objectKey && objectKey[0] === '/') {
             objectKey = objectKey.slice(1);
           }
-          _context.prev = 29;
+          _context.prev = 28;
           Params = {
             // Method: 'get',
             Bucket: storageConfig.cloudserv_storage_storagebucket,
@@ -52537,17 +52556,17 @@ var getUrl = /*#__PURE__*/function () {
           // if (expires) setCacheUrl(cacheKey, signedUrl, +expires)
           // 华为云通过 createSignedUrlSync 生产的签名链接默认带有 :80 或者 :443 端口 后端删除时需要去除
           return _context.abrupt("return", signedUrl.replace(/:(80|443)/, ''));
-        case 37:
-          _context.prev = 37;
-          _context.t0 = _context["catch"](29);
+        case 36:
+          _context.prev = 36;
+          _context.t0 = _context["catch"](28);
           console.error(_context.t0);
           throw Error(_context.t0);
-        case 41:
-          _context.next = 56;
+        case 40:
+          _context.next = 55;
           break;
-        case 43:
+        case 42:
           if (!(provider !== null && provider !== void 0 && provider.isMinio)) {
-            _context.next = 55;
+            _context.next = 54;
             break;
           }
           s3Params = {
@@ -52585,18 +52604,18 @@ var getUrl = /*#__PURE__*/function () {
               });
             });
           };
-          _context.next = 51;
+          _context.next = 50;
           return getSignedUrlPro();
-        case 51:
+        case 50:
           _signedUrl = _context.sent;
           return _context.abrupt("return", _signedUrl);
-        case 55:
+        case 54:
           throw Error("\u6682\u4E0D\u652F\u6301".concat(provider === null || provider === void 0 ? void 0 : provider.name, "\u5B58\u50A8\u7C7B\u578B"));
-        case 56:
+        case 55:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[29, 37]]);
+    }, _callee, null, [[28, 36]]);
   }));
   return function getUrl(_x) {
     return _ref2.apply(this, arguments);
@@ -70651,6 +70670,7 @@ var getDefaultGlobalOptions = function getDefaultGlobalOptions() {
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
     isfixapptokenexpired: false,
+    isoptimizesingleloginlogic: false,
     singleLoginCallback: null,
     router: null
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.25-beta.3",
+  "version": "1.0.25-beta.5",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -29,7 +29,6 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
-    "@rollup/rollup-darwin-x64": "^4.53.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.10",
     "@types/node": "^20.8.10",

package/src/index.ts

@@ -58,6 +58,7 @@ const getDefaultGlobalOptions = () => {
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
     isfixapptokenexpired: false, // 是否修复apptoken过期问题 目前版本暂时不默认修复 等门户引擎验证通过之后 再改成默认修复
+    isoptimizesingleloginlogic: false, // 是否优化判断不重复走单点登录的逻辑 暂时只在超表上优化
     singleLoginCallback: null,
     router: null
   }

package/src/login.ts

@@ -601,7 +601,9 @@ const fixAppTokenExpired = async () => {
 // 单点登录
 async function singleLogin(query: IAny) {
   query = cloneDeep(query)
-  if (globalOptions.isfixapptokenexpired) {
+  // App SPUWebview 内用 Native-Api 获取token 而不是从 url 上取
+  // 暂时只在 门户引擎 中启用 等门户引擎验证通过之后 再改成所有 SPU 默认
+  if (globalOptions.isfixapptokenexpired && globalOptions.modulekey === 'portalEngine') {
     query = await fixLoginQuery(query)
   }
 
@@ -630,24 +632,33 @@ async function singleLogin(query: IAny) {
   if (checkLoginByToken(token)) {
     let isneedlogin = true // 是否需要走单点登录流程
     const loginRole = getRoleByToken(token)
-
-    if (loginRole === 'center') {
-      // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
-      // 之所以不强制校验 refreshtoken tokenexpires 是因为安装卸载配置页面有可能放在产品运营中心 没有这两字段
-      if (checkLogin() && token === getToken()) {
-        isneedlogin = false
-      }
-    } else {
-      // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
-      if (
-        checkLogin() &&
-        token === getToken() &&
-        refreshtoken === getRefreshToken() &&
-        tokenexpires === getTokenExpires()
-      ) {
-        isneedlogin = false
+    const curUser = getUserByToken(token)
+    const cacheUser = getUserByToken(getToken())
+
+    // 如果本地已经登录
+    if (checkLogin()) {
+      // 产品运营中心单点登录只有 token
+      if (loginRole === 'center') {
+        if (curUser?.userCode === cacheUser?.userCode && curUser?.appId === cacheUser?.appId) {
+          isneedlogin = false
+        }
+      } else {
+        // 不重复走单点登录的逻辑
+        // 旧：判断当前单点登录的 token/refreshtoken/tokenexpires 是否与本地缓存的一致
+        // 新：解析当前单点登录 token 中的 mbcode、tenantcode，如果与缓存的一致，说明本次登录与上次登录是同个人同个租户
+        // 新逻辑暂时只用于超表
+        if (globalOptions.modulekey === 'litheformspu' && globalOptions.isoptimizesingleloginlogic) {
+          if (curUser?.memberCode === cacheUser?.memberCode && curUser?.tenantCode === cacheUser?.tenantCode) {
+            isneedlogin = false
+          }
+        } else {
+          if (token === getToken() && refreshtoken === getRefreshToken() && tokenexpires === getTokenExpires()) {
+            isneedlogin = false
+          }
+        }
       }
     }
+
     // isneedlogin = true
     // debugger
 
@@ -702,7 +713,7 @@ async function singleLogin(query: IAny) {
   } else {
     flag = false
     setBaseInfo() // 传递的token过期依然写入 如果不写入的话 有可能之前的token本来没过期 页面依然可用
-    console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。')
+    console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires/envname 是否非法或过期。')
   }
 
   // 单点登录成功

package/src/map/index.ts

@@ -49,6 +49,7 @@ const getLocationByNative = async (): Promise<Location> => {
           street: res.street || '',
           number: res.number || '',
           detailaddr: res.detailaddr || '',
+          citycode: res.citycode || '',
           // poiid: res.poiid || '',
           // poitypename: res.poitypename || '',
           // poitypecode: res.poitypecode || '',
@@ -216,6 +217,7 @@ const getLocationByAMap = async (): Promise<Location> => {
           address: '',
           // poiname: '',
           regionid: '',
+          citycode: '',
           country: '',
           province: '',
           city: '',
@@ -238,12 +240,13 @@ const getLocationByAMap = async (): Promise<Location> => {
           if (addrssDetail) {
             result.address = addrssDetail.addressDetail.address
             // result.poiname = addrssDetail.addressDetail.poiname
-            result.regionid = addrssDetail.addressDetail.regionid
-            result.country = addrssDetail.addressDetail.country
-            result.province = addrssDetail.addressDetail.province
-            result.city = addrssDetail.addressDetail.city
-            result.district = addrssDetail.addressDetail.district
-            result.street = addrssDetail.addressDetail.street
+            result.regionid = addrssDetail.addressDetail.regionid || ''
+            result.citycode = addrssDetail.addressDetail.citycode || ''
+            result.country = addrssDetail.addressDetail.country || ''
+            result.province = addrssDetail.addressDetail.province || ''
+            result.city = addrssDetail.addressDetail.city || ''
+            result.district = addrssDetail.addressDetail.district || ''
+            result.street = addrssDetail.addressDetail.street || ''
             result.number = addrssDetail.addressDetail.number
             result.detailaddr = addrssDetail.addressDetail.detailaddr
             // result.poiid = addrssDetail.addressDetail.poiid
@@ -292,6 +295,7 @@ const getCityLocationByAMap = async (): Promise<Location> => {
           address: '',
           // poiname: '',
           regionid: '',
+          citycode: '',
           country: '',
           province: '',
           city: '',
@@ -316,12 +320,13 @@ const getCityLocationByAMap = async (): Promise<Location> => {
           if (addrssDetail) {
             result.address = addrssDetail.addressDetail.address
             // result.poiname = addrssDetail.addressDetail.poiname
-            result.regionid = addrssDetail.addressDetail.regionid
-            result.country = addrssDetail.addressDetail.country
-            result.province = addrssDetail.addressDetail.province
-            result.city = addrssDetail.addressDetail.city
-            result.district = addrssDetail.addressDetail.district
-            result.street = addrssDetail.addressDetail.street
+            result.regionid = addrssDetail.addressDetail.regionid || ''
+            result.citycode = addrssDetail.addressDetail.citycode || ''
+            result.country = addrssDetail.addressDetail.country || ''
+            result.province = addrssDetail.addressDetail.province || ''
+            result.city = addrssDetail.addressDetail.city || ''
+            result.district = addrssDetail.addressDetail.district || ''
+            result.street = addrssDetail.addressDetail.street || ''
             result.number = addrssDetail.addressDetail.number
             result.detailaddr = addrssDetail.addressDetail.detailaddr
             // result.poiid = addrssDetail.addressDetail.poiid
@@ -383,6 +388,7 @@ interface IAddressDetail {
     address: string
     // poiname: string
     regionid: string
+    citycode: string
     country: string
     province: string
     city: string
@@ -469,6 +475,7 @@ const getAddressDetailByAMap = async (position: Location): Promise<IAddressDetai
               address: address || '',
               // poiname: poiname || '',
               regionid: addressComponent.adcode || '',
+              citycode: addressComponent.citycode || '',
               country: country || '',
               province: addressComponent.province || '',
               city: addressComponent.city || '',

package/src/oss/downloadService.ts

@@ -163,9 +163,10 @@ const getUrl = async ({
       // 'content-type': contentType || undefined,
       'content-disposition': 'attachment; filename=' + (filename && encodeURIComponent(filename)) // 阿里云提供的下载名字
     }
-    if (contentType) {
-      responseHeader['content-type'] = contentType
-    }
+    // TODO 阿里云不在提供，会报错
+    // if (contentType) {
+    //   responseHeader['content-type'] = contentType
+    // }
 
     const ossUrl = ossClient.signatureUrl(objectKey, {
       response: responseHeader,