From 31d56143f5c2570c697f664375bf7149c9278396 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 13 Oct 2018 20:48:33 +0800
Subject: [PATCH 1/3] no message

Former-commit-id: 4f114549b4f048298ef6d2bd37b7cb57ca4cecca
---
 src/mock/index.js                    |  5 +++++
 src/mock/plugin/mock-cookie/index.js | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/mock/plugin/mock-cookie/index.js

diff --git a/src/mock/index.js b/src/mock/index.js
index 86af00f..f266338 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -1,5 +1,10 @@
 import Mock from 'mockjs'
 
+// 补丁 解决 mock.js 影响 Cookie 携带
+import MockCookie from './plugin/mock-cookie'
+
+MockCookie(Mock)
+
 // 导入所有的接口
 const req = context => context.keys().map(context)
 req(require.context('./api/', true, /\.js$/))
diff --git a/src/mock/plugin/mock-cookie/index.js b/src/mock/plugin/mock-cookie/index.js
new file mode 100644
index 0000000..0c10128
--- /dev/null
+++ b/src/mock/plugin/mock-cookie/index.js
@@ -0,0 +1,10 @@
+export default function (Mock) {
+  // 解决 Mock 情况下，携带 withCredentials = true，且未被拦截的跨域请求丢失 Cookies 的问题
+  Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
+  Mock.XHR.prototype.send = function () {
+    if (this.custom.xhr) {
+      this.custom.xhr.withCredentials = this.withCredentials || false
+    }
+    this.proxy_send(...arguments)
+  }
+}

From 3929710809518d4e3c1a1475c08927e24ae4334c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 13 Oct 2018 20:50:55 +0800
Subject: [PATCH 2/3] no message

Former-commit-id: 8a1bbc6a42e8679d9edb3a2ee6e3d0a7022dec34
---
 src/mock/index.js                                      | 4 ++--
 src/mock/{plugin/mock-cookie => patch/cookie}/index.js | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/mock/{plugin/mock-cookie => patch/cookie}/index.js (100%)

diff --git a/src/mock/index.js b/src/mock/index.js
index f266338..0a81b2c 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -1,9 +1,9 @@
 import Mock from 'mockjs'
 
 // 补丁 解决 mock.js 影响 Cookie 携带
-import MockCookie from './plugin/mock-cookie'
+import PatchCookie from './patch/cookie'
 
-MockCookie(Mock)
+PatchCookie(Mock)
 
 // 导入所有的接口
 const req = context => context.keys().map(context)
diff --git a/src/mock/plugin/mock-cookie/index.js b/src/mock/patch/cookie/index.js
similarity index 100%
rename from src/mock/plugin/mock-cookie/index.js
rename to src/mock/patch/cookie/index.js

From 937f06aeb353c8b77c27e8ed1015ed2538e39de1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 13 Oct 2018 20:54:07 +0800
Subject: [PATCH 3/3] no message

Former-commit-id: 48ce55e25af864bfe346d08437bb3f47dae7095d
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dcc1a8e..4374ed7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "vue-cli-service serve --open",