Merge branch 'dev' into test

6 years ago · 239569aa18
parent 4123856456 e77af7ef7b
commit 239569aa18
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
@ -75,7 +75,7 @@ public class AuthController extends CoreBaseController {

            LOGGER.info("会员登陆：{}",user);
            AuthUtil.setSessionObject("languageCode",languageCode);
-            result = new ResultBean(true, "", AuthUtil.getSessionUser());
+            result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser());
            result.setUrl("/");
        } catch (IncorrectCredentialsException e) {
            // 密码错误