Commit 4b1e60f6 authored by 赵啸非's avatar 赵啸非

修改设备管理 外部登录

parent 73bdd440
...@@ -154,6 +154,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -154,6 +154,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
currUserName = "管理员"; currUserName = "管理员";
} }
saveCurrUser(request, response, user); saveCurrUser(request, response, user);
log.info("saveCurrUser");
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("currUserName", currUserName); data.put("currUserName", currUserName);
data.put("barList", outlookBarList); data.put("barList", outlookBarList);
...@@ -161,6 +162,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -161,6 +162,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
data.put("userType", user.getUserType()); data.put("userType", user.getUserType());
ret.put(KEY_RESULT_DATA, data); ret.put(KEY_RESULT_DATA, data);
this.generateBlackCookie(request, response, user.getLoginName(), urls); this.generateBlackCookie(request, response, user.getLoginName(), urls);
log.info("generateBlackCookie");
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!"); ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
ret.put("resources", urls); ret.put("resources", urls);
......
...@@ -20,4 +20,4 @@ outagedetection=true ...@@ -20,4 +20,4 @@ outagedetection=true
outagedetectioninterval=2 outagedetectioninterval=2
filter=true filter=true
exclude=mortals_xhx_task,mortals_xhx_param,mortals_xhx_device_log exclude=mortals_xhx_task,mortals_xhx_param,mortals_xhx_device_log,mortals_xhx_user
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment