MOD: get user from session

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/CompetitionController.java

@@ -1,8 +1,6 @@
 package cn.iselab.mooctest.site.web.ctrl;
 
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
-import cn.iselab.mooctest.site.models.Competition;
-import cn.iselab.mooctest.site.models.Competition2Task;
 import cn.iselab.mooctest.site.models.Qualification;
 import cn.iselab.mooctest.site.models.User;
 import cn.iselab.mooctest.site.web.data.AddonsVO;
@@ -24,21 +22,21 @@ public class CompetitionController {
 
     @RequestMapping(value = UrlConstants.API + "competition", method = RequestMethod.GET)
     public List<CompetitionVO> getContest() {
-        User user = (User) SecurityUtils.getSubject().getSession().getAttribute("User");
-        return competitionLogic.getCompetitionList(user.getId());
+        Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute("userId");
+        return competitionLogic.getCompetitionList(userId);
     }
 
     @RequestMapping(value = UrlConstants.API + "competition/enter/{competitionId}", method = RequestMethod.POST)
     public Qualification enterContest(@PathVariable("competitionId") Long competitionId) {
-        User user = (User) SecurityUtils.getSubject().getSession().getAttribute("User");
-        return competitionLogic.enterCompetition(competitionId, user.getId());
+        Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute("userId");
+        return competitionLogic.enterCompetition(competitionId, userId);
     }
 
     @RequestMapping(value = UrlConstants.API + "competition/addons/{qualificationId}/{type}", method = RequestMethod.POST)
     public List<AddonsVO> updateAddons(@PathVariable("qualificationId") Long qualificationId,
                                        @PathVariable("type") Integer type,
                                        @RequestBody List<AddonsVO> addonsVOList) {
-        User user = (User) SecurityUtils.getSubject().getSession().getAttribute("User");
+        Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute("userId");
         if(addonsVOList.size()>3){
             throw new IllegalArgumentException("list size > 3");
         }