周伟鹏 / cnlive_shenhe · Commits

Commit f2f0604d6bea26abf777e23472f4f9ed72d2215c

Authored by 王言钊
1 parent 01006825

添加注销记录功能、按照要求修改展示数据格式

Inline Side-by-side
Showing 1 changed file with 15 additions and 3 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @f2f0604
@@ -98,11 +98,12 @@ public class UsersController extends BaseController { @@ -98,11 +98,12 @@ public class UsersController extends BaseController {
98 sessionUser.setMaster(user.getMaster()); 98 sessionUser.setMaster(user.getMaster());
99 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser); 99 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
100 ShyLog shyLog = new ShyLog(); 100 ShyLog shyLog = new ShyLog();
101 - shyLog.setVideoName(id);  
102 - shyLog.setOperator(user.getUsername()); 101 + shyLog.setVideoId("-");
  102 + shyLog.setVideoName("-");
  103 + shyLog.setOperator(user.getUsername() + "(" + user.getUser_id() + ")");
103 shyLog.setOperationTime(new Date()); 104 shyLog.setOperationTime(new Date());
104 shyLog.setOperationType("登录"); 105 shyLog.setOperationType("登录");
105 - shyLog.setRemark(user.getUsername() + "登录"); 106 + shyLog.setRemark(user.getUsername() + "--" + "登录");
106 shyLogService.addShyLog(shyLog); 107 shyLogService.addShyLog(shyLog);
107 return "redirect:" + redirectURL + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority="; 108 return "redirect:" + redirectURL + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
108 } 109 }
@@ -113,6 +114,17 @@ public class UsersController extends BaseController { @@ -113,6 +114,17 @@ public class UsersController extends BaseController {
113 114
114 @RequestMapping("/logout") 115 @RequestMapping("/logout")
115 public String logout(HttpSession session) { 116 public String logout(HttpSession session) {
  117 + SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.SESSION_KEY);
  118 + if (sessionUser != null) {
  119 + ShyLog shyLog = new ShyLog();
  120 + shyLog.setVideoId("-");
  121 + shyLog.setVideoName("-");
  122 + shyLog.setOperator(sessionUser.getUserName() + "(" + sessionUser.getUserId() + ")");
  123 + shyLog.setOperationTime(new Date());
  124 + shyLog.setOperationType("注销");
  125 + shyLog.setRemark(sessionUser.getUserName() + "--" + "注销");
  126 + shyLogService.addShyLog(shyLog);
  127 + }
116 session.invalidate(); 128 session.invalidate();
117 return "redirect:" + CAS_SERVER_URL_PREFIX + "/logout?service=" + SERVICE_LOGIN; 129 return "redirect:" + CAS_SERVER_URL_PREFIX + "/logout?service=" + SERVICE_LOGIN;
118 } 130 }