From 27204704366dd4559ae4709443e6331c002891fc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 23 Feb 2019 15:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=8E=A5=E6=94=B6=E8=B7=A8=E5=9F=9F=E7=9A=84Cookie?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 3 +++
 web/src/main/resources/config/application.yml           | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 085e04fb..d0e50737 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -329,6 +329,9 @@ shiro:
   # 是否允许跨域访问，如果允许，设置允许的域名，全部域名设置*号，如果不允许，此设置应该为空
 #  accessControlAllowOrigin: http://demo.jeesite.com
 #  accessControlAllowOrigin: '*'
+
+  # 是否允许接收跨域的Cookie凭证数据
+#  accessControlAllowCredentials: true
   
   # 是否在登录后生成新的Session（默认false）
   isGenerateNewSessionAfterLogin: false
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 33411956..049138af 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -376,6 +376,10 @@ logging:
 #  # 是否允许跨域访问，如果允许，设置允许的域名，全部域名设置*号，如果不允许，此设置应该为空
 ##  accessControlAllowOrigin: http://demo.jeesite.com
 ##  accessControlAllowOrigin: '*'
+#
+#  # 是否允许接收跨域的Cookie凭证数据
+##  accessControlAllowCredentials: true
+
 #
 #  # 是否在登录后生成新的Session（默认false）
 #  isGenerateNewSessionAfterLogin: false