From 2956d18cecc13dd6435a6ccdd743eacbcc9f04d2 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 13 Oct 2018 20:47:29 +0800 Subject: [PATCH 1/3] no message Former-commit-id: 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5 [formerly c3c60a79855d50c56a434eeaf59e29def32213c8 [formerly aadfbbd86ddb0d5b6477af805b18c5331bff96a3]]]]] Former-commit-id: f9e8f3adda0d3b8b9b8e73a1d61622bec170898a Former-commit-id: 95f0b3f33ebbde615ecd9eea541be2fcebe493ed Former-commit-id: d301e8adbfee1d5edf69e15cb79f35c190eeebae [formerly 4053f1c826056cbaa146fac54aa72d444f7f24ae] Former-commit-id: 36fa26e3d0d4f54b3a2377d31ddf094067aca0ae Former-commit-id: f14f9ea2bd7806cbd93eddf068f437dbfbfdeb13 Former-commit-id: bad957ddc620774add82ed308e0aee5700fbfbaa Former-commit-id: 50f57cb8433f7826233433950657257225996db4 Former-commit-id: 0a0a5e36ff82fce7001ec6d5ba04a07c1a0759d2 --- 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 86af00fa..f266338a 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 00000000..0c101283 --- /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 b2a44d13560ad25c5396ce8b297218b7269648b1 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 13 Oct 2018 20:51:16 +0800 Subject: [PATCH 2/3] no message Former-commit-id: 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 5f4ee2187599947f17286d3bb3e54dfd090fd15e [formerly a61522201421698c4bf5148b2d8094896f673fc3]]]]] Former-commit-id: f48de1f970e9cfdac764e8df25a39d8424bf1c8c Former-commit-id: 476ea4773938b730931e1d9ed07cb7ea32f3075a Former-commit-id: c836cfc9721da7ff774bd42a51e5d6224a17769c [formerly 75709120c47b08f8f922c3713d7144c7499624c2] Former-commit-id: 330bcf325705b7a28f46bee1aa9348622e968365 Former-commit-id: eebce31e83173f9fe1d08755395ad650a29d4f7a Former-commit-id: 365fe059c05fbb378cb56193fea7a3b64f12b97b Former-commit-id: be8d993244dcf243e97d1586e690da4868952fa4 Former-commit-id: 58b71c1e23f509080990e2563f4e0dba45e20fff --- 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 f266338a..0a81b2cf 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 4839d4e012553d6bbbae894e19deacf64bab9989 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 13 Oct 2018 20:53:19 +0800 Subject: [PATCH 3/3] no message Former-commit-id: b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly 53fae434f86195f623d9d964be0ad5956c5f0638 [formerly bf3fb82abd06b17599d1d68fa49bf56c02288976 [formerly 2ca017521c913fbdb1d19a096228a388c0e56ac3]]]]] Former-commit-id: 818ef1b8b51d8fe3af7dc04b90ffdaf2c6f0c45d Former-commit-id: df4e6184adc8c2677853be2b28ef22221e57c46f Former-commit-id: c458bb07665cb83a6733c9ead2b63da3040acb79 [formerly 505ab2914c8e02f4152a74801a4c1beb71c30074] Former-commit-id: 632c96a86bf674555bd7163ef4c13c00e15ba105 Former-commit-id: 376cff42c807e4b2c5b0550f82cb351e0f478871 Former-commit-id: 6b6e14f268336ceb650eec80ae28ce9b033160ab Former-commit-id: 2ab2924dbfc029c521626afffea44b6a5468d6de Former-commit-id: 9922d8d46433c7e7bdc03aded8b0a96b157b7207 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 942ef8f1..367d6c96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.5.2", + "version": "1.5.3", "private": true, "scripts": { "serve": "vue-cli-service serve --open",