@deppon/deppon-request 1.15.8 → 1.15.11

package/README.md

@@ -220,3 +220,49 @@ request({
 ```
 
 更多 API 请参考源码。
+
+## Cookie 跨域处理
+
+本包自动处理 Cookie 跨域设置，确保在跨域请求时能够正确携带 Cookie。
+
+### 自动设置
+
+1. **`withCredentials`**：默认设置为 `true`，允许跨域请求携带 Cookie
+2. **`document.domain`**：自动调用 `@deppon/deppon-utils` 的 `setCookieDomain()` 方法设置：
+
+    - 如果 URL 包含 `deppontest.com`，自动设置 `document.domain = 'deppontest.com'`
+    - 如果 URL 包含 `deppon.com`，自动设置 `document.domain = 'deppon.com'`
+
+    注意：`setCookieDomain` 方法已从 `@deppon/deppon-utils` 导入，你也可以手动调用：
+
+    ```javascript
+    import { setCookieDomain } from '@deppon/deppon-utils';
+    setCookieDomain();
+    ```
+
+### 使用场景
+
+-   在 UAP 环境中，需要跨域请求时携带 Cookie（如登录凭证）
+-   在子域名之间共享 Cookie
+-   在 iframe 环境中进行跨域请求
+
+### 注意事项
+
+1. `document.domain` 只能在当前域或其父域上设置
+    - 例如：如果当前域是 `a.deppon.com`，可以设置为 `deppon.com`，但不能设置为其他域
+2. 设置 `document.domain` 后，端口号会被忽略
+3. 如果设置失败（例如跨域限制），会静默失败，不影响其他功能
+4. `withCredentials` 需要服务端配合设置 `Access-Control-Allow-Credentials: true` 响应头
+
+### 示例
+
+```javascript
+import request from '@deppon/deppon-request';
+
+// 跨域请求会自动携带 Cookie
+request({
+    url: 'https://api.deppon.com/user/info',
+    method: 'get',
+    // withCredentials: true 已自动设置
+});
+```

package/es/composable.js

@@ -1,6 +1,6 @@
 import './_virtual/_rollup-plugin-inject-process-env.js';
 import { inject, getCurrentInstance } from 'vue';
-import CBKRquest from './request/request.js';
+import DepponRquest from './request/request.js';
 
 /**
  * Composition API: useRequest
@@ -43,7 +43,7 @@ function useRequest() {
 
   // 如果都没有，返回默认实例并提示
   if (!requestFromProvide) {
-    return CBKRquest;
+    return DepponRquest;
   }
   return requestFromProvide;
 }

package/es/index.js

@@ -1,8 +1,8 @@
 import './_virtual/_rollup-plugin-inject-process-env.js';
-import CBKRquest from './request/request.js';
+import DepponRquest from './request/request.js';
 export { default as VuePlugin } from './vue.js';
 export { useRequest } from './composable.js';
 
 
 
-export { CBKRquest as default };
+export { DepponRquest as default };

package/es/request/cookieDomain.js

@@ -0,0 +1,42 @@
+import '../_virtual/_rollup-plugin-inject-process-env.js';
+
+/**
+ * 设置 document.domain 以支持 cookie 跨域
+ * 
+ * 参考 cmc-prefercenter-vue 项目中的实现：
+ * - 如果 URL 包含 deppontest.com，设置 document.domain = 'deppontest.com'
+ * - 如果 URL 包含 deppon.com，设置 document.domain = 'deppon.com'
+ * 
+ * 注意：document.domain 只能在当前域或其父域上设置
+ * 例如：如果当前域是 a.deppon.com，可以设置为 deppon.com，但不能设置为其他域
+ */
+function setCookieDomain() {
+  if (typeof window === 'undefined' || typeof document === 'undefined') {
+    return;
+  }
+  try {
+    var href = window.location.href;
+
+    // 检查是否包含 deppontest.com
+    if (href.indexOf('deppontest.com') !== -1) {
+      // 检查当前域是否已经是 deppontest.com 或其子域
+      var currentHost = window.location.hostname;
+      if (currentHost === 'deppontest.com' || currentHost.endsWith('.deppontest.com')) {
+        document.domain = 'deppontest.com';
+      }
+    }
+
+    // 检查是否包含 deppon.com
+    if (href.indexOf('deppon.com') !== -1) {
+      // 检查当前域是否已经是 deppon.com 或其子域
+      var _currentHost = window.location.hostname;
+      if (_currentHost === 'deppon.com' || _currentHost.endsWith('.deppon.com')) {
+        document.domain = 'deppon.com';
+      }
+    }
+  } catch (error) {
+    // 如果设置失败（例如跨域限制），静默失败
+  }
+}
+
+export { setCookieDomain };

package/es/request/index.js

@@ -1,6 +1,6 @@
 import '../_virtual/_rollup-plugin-inject-process-env.js';
-import CBKRquest from './request.js';
+import DepponRquest from './request.js';
 
 
 
-export { CBKRquest as default };
+export { DepponRquest as default };

package/es/request/instance.js

@@ -2,10 +2,18 @@ import '../_virtual/_rollup-plugin-inject-process-env.js';
 import axios from 'axios';
 import { res, resErr } from './resInterceptor.js';
 import { req, reqErr } from './reqInterceptor.js';
+import { setCookieDomain } from '@deppon/deppon-utils';
 
+// 初始化时设置 document.domain（仅执行一次）
+var domainInitialized = false;
+if (!domainInitialized) {
+  setCookieDomain();
+  domainInitialized = true;
+}
 function appInstance(options) {
   var App = axios.create();
   App.defaults.timeout = process.env.NODE_ENV === 'production' ? 10000 : 300000;
+  // 允许携带 cookie（跨域请求时需要）
   App.defaults.withCredentials = true;
   App.interceptors.request.use(function (_req) {
     return req(_req, options);

package/es/request/reqInterceptor.js

@@ -49,43 +49,7 @@ var replaceTrace = function replaceTrace(targetUrl, value) {
 
 // check列表中是否包含pathname
 var checkPathName = function checkPathName(pathname) {
-  var PATHS = ['ts/hotel/item',
-  // 酒店
-  'ts/groupon/item',
-  // 拼团
-  'ts/agentpurchasing/item',
-  // 盖亚
-  'ts/pn/item',
-  // 票牛
-  'ts/performance/item',
-  // 演出
-  'ts/platform/item',
-  // 平台
-  'ts/ticket/item',
-  // 门票
-  'ts/shopcard/item',
-  // 老商户卡
-  'ts/hotelcard/index',
-  // 酒店卡
-  'kt/bargain/item',
-  // 砍价一元拿
-  'ts/groupon/detail',
-  // 参团详情
-  'm/club/index',
-  // club首页
-  'm/club/detail',
-  // club详情
-  'm/bekka/coin',
-  // club充值
-  'h5/product/detail',
-  // 新商户卡
-  'h5/item/detail',
-  // 新酒店
-  'h5/product/package/detail', 'h5/product/groupon/package/detail', 'h5/product/groupon/detail',
-  // 新拼团
-  'cps/partner/groupon/item',
-  // 分销拼团
-  'cps/partner/hotel/item' // 分销酒店
+  var PATHS = ['ts/hotel/item' // 酒店
   ];
   var isIncludes = false;
   for (var i in PATHS) {

package/es/request/request.js

@@ -22,7 +22,7 @@ if (!window.onceList) {
     }
   });
 }
-function CBKRquest(options) {
+function DepponRquest(options) {
   // 适配当前ajax已有的功能
   // resove cancel token
   if (options.once) {
@@ -92,4 +92,4 @@ function autoParseParams(config) {
   }
 }
 
-export { CBKRquest as default };
+export { DepponRquest as default };

package/es/vue.js

@@ -1,16 +1,20 @@
 import './_virtual/_rollup-plugin-inject-process-env.js';
-import CBKRquest from './request/request.js';
+import DepponRquest from './request/request.js';
+import { setCookieDomain } from '@deppon/deppon-utils';
 
 /**
  * Vue 插件安装函数
  * @param {Object} app - Vue 应用实例
  */
 function install(app) {
+  // 设置 document.domain 以支持 cookie 跨域
+  setCookieDomain();
+
   // 注册全局属性
-  app.config.globalProperties.$request = CBKRquest;
+  app.config.globalProperties.$request = DepponRquest;
 
   // 提供实例，供 Composition API 使用
-  app.provide('depponRequest', CBKRquest);
+  app.provide('depponRequest', DepponRquest);
 }
 var vue = {
   install: install

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@deppon/deppon-request",
-    "version": "1.15.8",
+    "version": "1.15.11",
     "description": "德邦前端 http 请求包",
     "license": "MIT",
     "homepage": "",
@@ -35,9 +35,9 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.17.7",
-        "@deppon/deppon-bridge": "1.15.8",
-        "@deppon/deppon-ui": "1.15.8",
-        "@deppon/deppon-utils": "1.15.8",
+        "@deppon/deppon-bridge": "1.15.11",
+        "@deppon/deppon-ui": "1.15.11",
+        "@deppon/deppon-utils": "1.15.11",
         "axios": "^0.26.0",
         "md5": "^2.3.0",
         "qs": "^6.10.3"
@@ -45,5 +45,5 @@
     "peerDependencies": {
         "vue": "^3.0.0"
     },
-    "gitHead": "0090a12bd52758440e388fef7e9f021b916028cf"
+    "gitHead": "77b874714bab56f83e6336762f87e9b13f234cc9"
 }