@gjzq/sdk 1.6.0-beta.4 → 1.6.0-beta.6

package/dist/{index-5FZwaohR.js → index-Bhwz_1He.js}

@@ -5338,6 +5338,54 @@ http.interceptors.request.use(function (config) {
 http.interceptors.response.use(authMiddleware);
 http.interceptors.response.use(parseResponseMiddleware);
 
+// 封装支持跨域cookie共享的http函数
+// hybrid环境下不支持域名共享（安卓兼容性问题白屏） 需要区分
+var isHybrid = location.origin.indexOf('http') != 0 && window.envConfig;
+// 获取请求配置，只有在非hybrid环境下才添加withCredentials
+var getRequestOptions = function getRequestOptions(additionalOptions) {
+  if (additionalOptions === void 0) {
+    additionalOptions = {};
+  }
+  if (!isHybrid) {
+    return _assign(_assign({}, additionalOptions), {
+      withCredentials: true
+    });
+  }
+  return additionalOptions;
+};
+var httpWithCred = {
+  get: function get(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.get(url, _assign({}, requestOptions)) : http.get(url);
+  },
+  post: function post(url, data) {
+    var requestOptions = getRequestOptions({
+      withCredentials: true
+    });
+    return http.post(url, data, requestOptions);
+  },
+  put: function put(url, data) {
+    var requestOptions = getRequestOptions();
+    return http.put(url, data, requestOptions);
+  },
+  delete: function _delete(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.delete(url, _assign({}, requestOptions)) : http.delete(url);
+  },
+  patch: function patch(url, data) {
+    var requestOptions = getRequestOptions();
+    return http.patch(url, data, requestOptions);
+  },
+  head: function head(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.head(url, _assign({}, requestOptions)) : http.head(url);
+  },
+  options: function options(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.options(url, _assign({}, requestOptions)) : http.options(url);
+  }
+};
+
 /**
  * yjb3.0-user登录-phpsession状态同步
  * @function userLogin
@@ -5345,7 +5393,7 @@ http.interceptors.response.use(parseResponseMiddleware);
  * @returns {Promise<HttpResponse>}
  */
 function userLoginForWeb(param) {
-  return http.post("".concat(API_URL, "/login/user"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/user"), param);
 }
 
 /**
@@ -5355,7 +5403,7 @@ function userLoginForWeb(param) {
  * @returns {Promise<HttpResponse>}
  */
 function pidLogin(param) {
-  return http.post("".concat(API_URL, "/login/passport"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/passport"), param);
 }
 
 function readHybridNoSystemParam$1() {
@@ -5371,7 +5419,7 @@ function readHybridNoSystemParam$1() {
   });
 }
 function checkFundAccountLoginFromServer() {
-  return http.get(API_URL + '/login/fundAccount');
+  return httpWithCred.get(API_URL + '/login/fundAccount');
 }
 //委托客户端请求yjbapi
 function fetchYJBAPI(param_1) {
@@ -5584,7 +5632,7 @@ function getUserTokenForHybrid() {
  * multiLogin 功能组件
  */
 function multiLogin(param) {
-  return http.post("".concat(API_URL, "/login/multi"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/multi"), param);
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -5709,9 +5757,9 @@ function readHybridSystemParamIgnoreError(keys) {
  */
 function logoutForWeb(loginType) {
   if (loginType) {
-    return http.post("".concat(API_URL, "/logout/").concat(loginType));
+    return httpWithCred.post("".concat(API_URL, "/logout/").concat(loginType));
   }
-  return http.post("".concat(API_URL, "/logout"), {});
+  return httpWithCred.post("".concat(API_URL, "/logout"), {});
 }
 
 /**
@@ -5763,7 +5811,7 @@ function checkFundAccountLogin() {
       });
     });
   }
-  return http.get("".concat(API_URL, "/login/fundAccount"));
+  return httpWithCred.get("".concat(API_URL, "/login/fundAccount"));
 }
 
 /**
@@ -5772,7 +5820,7 @@ function checkFundAccountLogin() {
  * @returns {Promise<HttpResponse>}
  */
 function checkMarginAccountLogin() {
-  return http.get("".concat(API_URL, "/login/marginAccount"));
+  return httpWithCred.get("".concat(API_URL, "/login/marginAccount"));
 }
 
 /**
@@ -5781,7 +5829,7 @@ function checkMarginAccountLogin() {
  * @returns {Promise<HttpResponse>}
  */
 function checkUserLogin() {
-  return http.get("".concat(API_URL, "/login/user"));
+  return httpWithCred.get("".concat(API_URL, "/login/user"));
 }
 
 /**
@@ -5849,7 +5897,7 @@ function bindInfo(data) {
  * @returns {Promise<HttpResponse> }
  */
 function marginAccountLogin(param) {
-  return http.post("".concat(API_URL, "/login/marginAccount"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/marginAccount"), param);
 }
 
 /**
@@ -5859,7 +5907,7 @@ function marginAccountLogin(param) {
  * @returns {Promise<HttpResponse>}
  */
 function fundAccountLogin(param) {
-  return http.post("".concat(API_URL, "/login/fundAccount"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/fundAccount"), param);
 }
 
 /**
@@ -7424,7 +7472,7 @@ function getWechatUserInfoService(params) {
  * @returns
 */
 function getShortLinkFunc(data) {
-  return http.post(API_URL, _assign({
+  return httpWithCred.post(API_URL, _assign({
     UniqueKey: 'serviceName.shortlink.create.remainParam'
   }, data));
 }
@@ -8990,7 +9038,7 @@ var pageInitWithSession = function pageInitWithSession(loginType, URL, needClose
  * @returns {Promise<HttpResponse>}
  */
 function qqStockLogin(param) {
-  return http.post("".concat(API_URL, "/login/qqstock"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/qqstock"), param);
 }
 
 function readFile(param) {

package/dist/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-5FZwaohR.js');
+var index = require('./index-Bhwz_1He.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/dist/pure.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-5FZwaohR.js');
+var index = require('./index-Bhwz_1He.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/es/checkFundAccountLogin/index.mjs

@@ -1,7 +1,7 @@
 import { __awaiter, __generator } from '../node_modules/tslib/tslib.es6.mjs';
 import { useHybridLogin, LoginType, LOGOUT_TYPE } from '../utils/const.mjs';
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 import { syncLoginStatusBetweenNativeAndServer } from '../syncLoginStatusBetweenNativeAndServer/index.mjs';
 import { checkFundAccountLoginFromServer } from '../utils/loginFuncs.mjs';
 import { decrypt } from '../utils/funcs.mjs';
@@ -57,7 +57,7 @@ function checkFundAccountLogin() {
       });
     });
   }
-  return http.get("".concat(API_URL, "/login/fundAccount"));
+  return httpWithCred.get("".concat(API_URL, "/login/fundAccount"));
 }
 
 export { checkFundAccountLogin };

package/es/checkMarginAccountLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * marginAccount登录状态检查
@@ -7,7 +7,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function checkMarginAccountLogin() {
-  return http.get("".concat(API_URL, "/login/marginAccount"));
+  return httpWithCred.get("".concat(API_URL, "/login/marginAccount"));
 }
 
 export { checkMarginAccountLogin };

package/es/checkUserLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * user登录状态检查
@@ -7,7 +7,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function checkUserLogin() {
-  return http.get("".concat(API_URL, "/login/user"));
+  return httpWithCred.get("".concat(API_URL, "/login/user"));
 }
 
 export { checkUserLogin };

package/es/fundAccountLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * fundaccount登录
@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function fundAccountLogin(param) {
-  return http.post("".concat(API_URL, "/login/fundAccount"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/fundAccount"), param);
 }
 
 export { fundAccountLogin };

package/es/http/httpWithCred.mjs

@@ -0,0 +1,52 @@
+import { __assign as _assign } from '../node_modules/tslib/tslib.es6.mjs';
+import { http } from './index.mjs';
+
+// 封装支持跨域cookie共享的http函数
+// hybrid环境下不支持域名共享（安卓兼容性问题白屏） 需要区分
+var isHybrid = location.origin.indexOf('http') != 0 && window.envConfig;
+// 获取请求配置，只有在非hybrid环境下才添加withCredentials
+var getRequestOptions = function getRequestOptions(additionalOptions) {
+  if (additionalOptions === void 0) {
+    additionalOptions = {};
+  }
+  if (!isHybrid) {
+    return _assign(_assign({}, additionalOptions), {
+      withCredentials: true
+    });
+  }
+  return additionalOptions;
+};
+var httpWithCred = {
+  get: function get(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.get(url, _assign({}, requestOptions)) : http.get(url);
+  },
+  post: function post(url, data) {
+    var requestOptions = getRequestOptions({
+      withCredentials: true
+    });
+    return http.post(url, data, requestOptions);
+  },
+  put: function put(url, data) {
+    var requestOptions = getRequestOptions();
+    return http.put(url, data, requestOptions);
+  },
+  delete: function _delete(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.delete(url, _assign({}, requestOptions)) : http.delete(url);
+  },
+  patch: function patch(url, data) {
+    var requestOptions = getRequestOptions();
+    return http.patch(url, data, requestOptions);
+  },
+  head: function head(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.head(url, _assign({}, requestOptions)) : http.head(url);
+  },
+  options: function options(url, params) {
+    var requestOptions = getRequestOptions(params);
+    return Object.keys(requestOptions).length > 0 ? http.options(url, _assign({}, requestOptions)) : http.options(url);
+  }
+};
+
+export { httpWithCred as default };

package/es/logoutForWeb/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * 登出
@@ -9,9 +9,9 @@ import { http } from '../http/index.mjs';
  */
 function logoutForWeb(loginType) {
   if (loginType) {
-    return http.post("".concat(API_URL, "/logout/").concat(loginType));
+    return httpWithCred.post("".concat(API_URL, "/logout/").concat(loginType));
   }
-  return http.post("".concat(API_URL, "/logout"), {});
+  return httpWithCred.post("".concat(API_URL, "/logout"), {});
 }
 
 export { logoutForWeb };

package/es/marginAccountLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * marginAccount登录
@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse> }
  */
 function marginAccountLogin(param) {
-  return http.post("".concat(API_URL, "/login/marginAccount"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/marginAccount"), param);
 }
 
 export { marginAccountLogin };

package/es/multiLogin/index.mjs

@@ -1,11 +1,11 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * multiLogin 功能组件
  */
 function multiLogin(param) {
-  return http.post("".concat(API_URL, "/login/multi"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/multi"), param);
 }
 
 export { multiLogin };

package/es/pidLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * yjb3.0-passportId登录-phpsession状态同步
@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function pidLogin(param) {
-  return http.post("".concat(API_URL, "/login/passport"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/passport"), param);
 }
 
 export { pidLogin };

package/es/qqStockLogin/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * 腾讯自选股渠道，session_id登录
@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function qqStockLogin(param) {
-  return http.post("".concat(API_URL, "/login/qqstock"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/qqstock"), param);
 }
 
 export { qqStockLogin };

package/es/userLoginForWeb/index.mjs

@@ -1,5 +1,5 @@
 import { API_URL } from '../utils/urls.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 
 /**
  * yjb3.0-user登录-phpsession状态同步
@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function userLoginForWeb(param) {
-  return http.post("".concat(API_URL, "/login/user"), param);
+  return httpWithCred.post("".concat(API_URL, "/login/user"), param);
 }
 
 export { userLoginForWeb };

package/es/utils/apiFuncs.mjs

@@ -1,5 +1,6 @@
 import { __awaiter, __generator, __assign as _assign } from '../node_modules/tslib/tslib.es6.mjs';
 import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 import { wechatUserInfoDomain, wechatAuthDomain, API_URL } from './urls.mjs';
 
 function getWechatAuthUrl(params) {
@@ -23,7 +24,7 @@ function getWechatUserInfoService(params) {
  * @returns
 */
 function getShortLinkFunc(data) {
-  return http.post(API_URL, _assign({
+  return httpWithCred.post(API_URL, _assign({
     UniqueKey: 'serviceName.shortlink.create.remainParam'
   }, data));
 }

package/es/utils/loginFuncs.mjs

@@ -1,5 +1,5 @@
 import { __awaiter, __generator, __assign as _assign } from '../node_modules/tslib/tslib.es6.mjs';
-import { http } from '../http/index.mjs';
+import httpWithCred from '../http/httpWithCred.mjs';
 import { API_URL } from './urls.mjs';
 import { LoginType, NO_TOKEN, MESSAGE, CHANNELID, ALL_NO_SYSTEM_PARAM_KEYS, DEFAULT_RESPONSE } from './const.mjs';
 import { getUserUKeysByChannelId } from '../getUserUKeysByChannelId/index.mjs';
@@ -18,7 +18,7 @@ function readHybridNoSystemParam$1() {
   });
 }
 function checkFundAccountLoginFromServer() {
-  return http.get(API_URL + '/login/fundAccount');
+  return httpWithCred.get(API_URL + '/login/fundAccount');
 }
 //委托客户端请求yjbapi
 function fetchYJBAPI(param_1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjzq/sdk",
-  "version": "1.6.0-beta.4",
+  "version": "1.6.0-beta.6",
   "main": "dist/index.js",
   "module": "es/index.mjs",
   "types": "./dist/index.d.ts",