فهرست منبع

修复登录信息显示;修复点击签到表详情问题

ting.yin 5 سال پیش
والد
کامیت
e07eb0ad68

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ExamController.java

@@ -178,6 +178,7 @@ public class ExamController extends BaseParameterController {
         ExamInfoVO packages = new ExamInfoVO();
         packages.setName("签到表");
         packages.setAttr("共导入 " + packageCount + " 个签到表");
+        packages.setUrl("/admin/exam/scan/package");
 
         ExamInfoVO marker = new ExamInfoVO();
         marker.setName("评卷员");

+ 11 - 6
stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -152,7 +153,8 @@ public class LoginController extends BaseController{
                 return markerLogin(request, marker, user.getPassword());
             }
             if(loginType!=null){
-                session.setParameter("message", "帐号不存在");
+                HttpSession httpSession = request.getSession();
+                httpSession.setAttribute("message", "帐号不存在");
                 ModelAndView view = new ModelAndView("redirect:/mark-login");
                 return view;
             }
@@ -243,15 +245,17 @@ public class LoginController extends BaseController{
     public ModelAndView loginInit(HttpServletRequest request) {
         StmmsSession session = RequestUtils.getSession(request);
         session.setParameter(LOGIN_TYPE_KEY, "mark-login");
-        String message = session.getParameter("message");
-        session.setParameter("message", null);
+        HttpSession httpSession = request.getSession();
+        String message = (String) httpSession.getAttribute("message");
         if ("aopeng".equals(appIndex)) {
             ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
             aPview.addObject("message", StringUtils.trimToNull(message));
+            httpSession.removeAttribute("message");
             return aPview;
         }
         ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
         modelAndView.addObject("message", StringUtils.trimToNull(message));
+        httpSession.removeAttribute("message");
         modelAndView.addObject(LOGIN_TYPE_KEY, "mark-login");
         modelAndView.addObject("indexLogo", indexLogo);
         return modelAndView;
@@ -267,6 +271,7 @@ public class LoginController extends BaseController{
      */
     public ModelAndView markerLogin(HttpServletRequest request, Marker marker, String password) {
         StmmsSession session = RequestUtils.getSession(request);
+        HttpSession httpSession = request.getSession();
         String loginType = session.getParameter(LOGIN_TYPE_KEY);
         ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
         modelAndView.addObject("indexLogo", indexLogo);
@@ -275,12 +280,12 @@ public class LoginController extends BaseController{
             modelAndView = new ModelAndView("redirect:/mark-login");
         }
         if (!marker.getPassword().equals(password)) {
-            session.setParameter("message", "密码错误");
+            httpSession.setAttribute("message", "密码错误");
             modelAndView.addObject("message", "密码错误");
             return modelAndView;
         }
         if (marker.isEnable() == false) {
-            session.setParameter("message", "帐号已禁用");
+            httpSession.setAttribute("message", "帐号已禁用");
             modelAndView.addObject("message", "帐号已禁用");
             return modelAndView;
         }
@@ -291,7 +296,7 @@ public class LoginController extends BaseController{
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String start = exam.getStartTime() == null ? "" : " 开始时间:" + sdf.format(exam.getStartTime());
             String end = exam.getEndTime() == null ? "" : " 结束时间:" + sdf.format(exam.getEndTime());
-            session.setParameter("message", "不在评卷时间范围 " + start + " " + end);
+            httpSession.setAttribute("message", "不在评卷时间范围 " + start + " " + end);
             modelAndView.addObject("message", "不在评卷时间范围 " + start + " " + end);
             return modelAndView;
         }