diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 1a061278..6a914857 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -86,6 +86,10 @@ public class LoginController extends BaseController{ // 是否显示验证码 model.addAttribute("isValidCodeLogin", ObjectUtils.toInteger(Global.getConfig("sys.login.failedNumAfterValidCode", "200")) == 0); + //获取当前会话对象 + Session session = UserUtils.getSession(); + model.addAttribute("sessionid", (String)session.getId()); + // 获取登录参数 Map paramMap = ServletUtils.getExtParams(request); @@ -172,6 +176,10 @@ public class LoginController extends BaseController{ // } model.addAttribute("isValidCodeLogin", BaseAuthorizingRealm.isValidCodeLogin(username, /*corpCode, */(String)paramMap.get("deviceType"), "failed")); } + + //获取当前会话对象 + Session session = UserUtils.getSession(); + model.addAttribute("sessionid", (String)session.getId()); // 登录操作如果是Ajax操作,直接返回登录信息字符串。 if (ServletUtils.isAjaxRequest(request)){ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 79508166..def444df 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -262,7 +262,7 @@ shiro: isAllowExternalSiteIframe: true # 是否允许跨域访问,如果允许,设置允许的域名,全部域名设置*号,如果不允许,此设置应该为空 -# accessControlAllowOrigin: http://demo.jeesite.com +# accessControlAllowOrigin: http://demo.jeesite.net # accessControlAllowOrigin: '*' # URI 权限过滤器定义 diff --git a/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java b/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java index dd5664a3..8a74b7a1 100644 --- a/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java +++ b/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java @@ -43,9 +43,9 @@ public class MobileAppTest { * 登录地址及登录信息 */ private static String loginUrl = "/login" - + "?username=" + DesUtils.encode("thinkgem", "thinkgem,jeesite,com") + + "?username=" + DesUtils.encode("system", "thinkgem,jeesite,com") + "&password=" + DesUtils.encode("admin", "thinkgem,jeesite,com") - + "¶m_deviceType=mobileApp"; + + "¶m_deviceType=mobileApp&__sid="; /** * 存储的会话编号,则通过getSid()获取。