ecinc-cloud-mappaio 9.7.15 → 9.7.16

package/lib/ecmappaio.common.js

@@ -908,17 +908,23 @@ var actions = {
       sysCode = userInfo.sysCode,
       imei = userInfo.imei,
       enjwt = userInfo.enjwt;
+    var reqData = {
+      username: username.trim(),
+      password: password,
+      kaptcha: kaptcha,
+      encrypt: encrypt,
+      productCode: productCode,
+      sysCode: sysCode,
+      imei: imei,
+      enjwt: enjwt
+    };
+    if (userInfo.captchaType === 'tencent') {
+      reqData.captchaType = 'tencent';
+      reqData.tencentTicket = userInfo.tencentTicket;
+      reqData.tencentRandstr = userInfo.tencentRandstr;
+    }
     return new Promise(function (resolve, reject) {
-      window.$user.formLogin({
-        username: username.trim(),
-        password: password,
-        kaptcha: kaptcha,
-        encrypt: encrypt,
-        productCode: productCode,
-        sysCode: sysCode,
-        imei: imei,
-        enjwt: enjwt
-      }).then( /*#__PURE__*/function () {
+      window.$user.formLogin(reqData).then( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
           var data, jwtToken, loginUser;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -55693,7 +55699,7 @@ service.interceptors.request.use(function (config) {
   }
   if (config.method === 'put' || config.method === 'delete') {
     if (window.forbidPut) {
-      config.headers['X-HTTP-Method-Override'] = config.method.toUpperCase();
+      config.headers.set('X-HTTP-Method-Override', config.method.toUpperCase());
       config.method = 'post';
     }
   }
@@ -55701,11 +55707,11 @@ service.interceptors.request.use(function (config) {
     // let each request carry token
     // ['X-Token'] is a custom headers key
     // please modify it according to the actual situation
-    config.headers['httpPort'] = window.$tempPort || location.port;
+    config.headers.set('httpPort', window.$tempPort || location.port);
     if (sessionStorage.getItem('productCode')) {
-      config.headers['productCode'] = sessionStorage.getItem('productCode');
+      config.headers.set('productCode', sessionStorage.getItem('productCode'));
     } else if (window.productCode && location.href.indexOf('productCode') === -1) {
-      config.headers['productCode'] = window.productCode;
+      config.headers.set('productCode', window.productCode);
     }
     var domain = '';
     if (location.href.indexOf('windwx.html') > 0) {
@@ -55716,13 +55722,13 @@ service.interceptors.request.use(function (config) {
     if (domain.substring(domain.length - 1) === '/') {
       domain = domain.substring(0, domain.length - 1);
     }
-    config.headers['apigw'] = domain + "/apigw";
+    config.headers.set('apigw', domain + "/apigw");
   } else if (window.productCode && location.href.indexOf('productCode') === -1) {
-    config.headers['productCode'] = window.productCode;
+    config.headers.set('productCode', window.productCode);
   }
-  config.headers['ecweb-csrf-token'] = decodeURIComponent(sessionStorage.getItem('ecweb-csrf-token') || '');
+  config.headers.set('ecweb-csrf-token', decodeURIComponent(sessionStorage.getItem('ecweb-csrf-token') || ''));
   if (window.$auth && window.$auth.getTicket()) {
-    config.headers['ecweb-ticket-' + config.headers['productCode']] = decodeURIComponent(window.$auth.getTicket());
+    config.headers.set('ecweb-ticket-' + config.headers.get('productCode'), decodeURIComponent(window.$auth.getTicket()));
   }
   var language = (0,lang/* getLanguage */.Z0)();
   if (language === 'en') {
@@ -55730,7 +55736,7 @@ service.interceptors.request.use(function (config) {
   } else if (language === 'zhCN') {
     language = 'zh-CN';
   }
-  config.headers['accept-language'] = language;
+  config.headers.set('accept-language', language);
   return config;
 }, function (error) {
   console.log(error); // for debug

package/lib/ecmappaio.umd.js

@@ -918,17 +918,23 @@ var actions = {
       sysCode = userInfo.sysCode,
       imei = userInfo.imei,
       enjwt = userInfo.enjwt;
+    var reqData = {
+      username: username.trim(),
+      password: password,
+      kaptcha: kaptcha,
+      encrypt: encrypt,
+      productCode: productCode,
+      sysCode: sysCode,
+      imei: imei,
+      enjwt: enjwt
+    };
+    if (userInfo.captchaType === 'tencent') {
+      reqData.captchaType = 'tencent';
+      reqData.tencentTicket = userInfo.tencentTicket;
+      reqData.tencentRandstr = userInfo.tencentRandstr;
+    }
     return new Promise(function (resolve, reject) {
-      window.$user.formLogin({
-        username: username.trim(),
-        password: password,
-        kaptcha: kaptcha,
-        encrypt: encrypt,
-        productCode: productCode,
-        sysCode: sysCode,
-        imei: imei,
-        enjwt: enjwt
-      }).then( /*#__PURE__*/function () {
+      window.$user.formLogin(reqData).then( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
           var data, jwtToken, loginUser;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -55703,7 +55709,7 @@ service.interceptors.request.use(function (config) {
   }
   if (config.method === 'put' || config.method === 'delete') {
     if (window.forbidPut) {
-      config.headers['X-HTTP-Method-Override'] = config.method.toUpperCase();
+      config.headers.set('X-HTTP-Method-Override', config.method.toUpperCase());
       config.method = 'post';
     }
   }
@@ -55711,11 +55717,11 @@ service.interceptors.request.use(function (config) {
     // let each request carry token
     // ['X-Token'] is a custom headers key
     // please modify it according to the actual situation
-    config.headers['httpPort'] = window.$tempPort || location.port;
+    config.headers.set('httpPort', window.$tempPort || location.port);
     if (sessionStorage.getItem('productCode')) {
-      config.headers['productCode'] = sessionStorage.getItem('productCode');
+      config.headers.set('productCode', sessionStorage.getItem('productCode'));
     } else if (window.productCode && location.href.indexOf('productCode') === -1) {
-      config.headers['productCode'] = window.productCode;
+      config.headers.set('productCode', window.productCode);
     }
     var domain = '';
     if (location.href.indexOf('windwx.html') > 0) {
@@ -55726,13 +55732,13 @@ service.interceptors.request.use(function (config) {
     if (domain.substring(domain.length - 1) === '/') {
       domain = domain.substring(0, domain.length - 1);
     }
-    config.headers['apigw'] = domain + "/apigw";
+    config.headers.set('apigw', domain + "/apigw");
   } else if (window.productCode && location.href.indexOf('productCode') === -1) {
-    config.headers['productCode'] = window.productCode;
+    config.headers.set('productCode', window.productCode);
   }
-  config.headers['ecweb-csrf-token'] = decodeURIComponent(sessionStorage.getItem('ecweb-csrf-token') || '');
+  config.headers.set('ecweb-csrf-token', decodeURIComponent(sessionStorage.getItem('ecweb-csrf-token') || ''));
   if (window.$auth && window.$auth.getTicket()) {
-    config.headers['ecweb-ticket-' + config.headers['productCode']] = decodeURIComponent(window.$auth.getTicket());
+    config.headers.set('ecweb-ticket-' + config.headers.get('productCode'), decodeURIComponent(window.$auth.getTicket()));
   }
   var language = (0,lang/* getLanguage */.Z0)();
   if (language === 'en') {
@@ -55740,7 +55746,7 @@ service.interceptors.request.use(function (config) {
   } else if (language === 'zhCN') {
     language = 'zh-CN';
   }
-  config.headers['accept-language'] = language;
+  config.headers.set('accept-language', language);
   return config;
 }, function (error) {
   console.log(error); // for debug