Inicio Explorar Ayuda
Iniciar sesión
luoshi
/
stmms-ft
1
0
Fork 0
Archivos
Explorar el Código

登录互踢bug修复，并修改提示语

ting.yin hace 4 años
padre
a47d0e297e
commit
4c765d3d6c
Se han modificado 7 ficheros con 16 adiciones y 15 borrados
Unificar vista Mostrar estadísticas de diff
  1. 1 0
      stmms-web/src/main/java/cn/com/qmth/stmms/common/interceptor/SessionInterceptor.java
  2. 7 7
      stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp
  3. 1 1
      stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markNew.jsp
  4. 1 1
      stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markTrack.jsp
  5. 2 2
      stmms-web/src/main/webapp/static/mark-json/js/mark-control.js
  6. 2 2
      stmms-web/src/main/webapp/static/mark-new/js/mark-control.js
  7. 2 2
      stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/common/interceptor/SessionInterceptor.java
Ver fichero 

@@ -56,6 +56,7 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
 
             throws IOException {
 
             throws IOException {
 
         StmmsSession session = RequestUtils.getSession(request);
 
         StmmsSession session = RequestUtils.getSession(request);
 
         session.setInvalid(true);
 
         session.setInvalid(true);
 
+        response.sendError(HttpServletResponse.SC_UNAUTHORIZED, redirectURI);
 
         sessionService.put(request, response, session);
 
         sessionService.put(request, response, session);
 
         response.sendRedirect(request.getContextPath() + redirectURI);
 
         response.sendRedirect(request.getContextPath() + redirectURI);
 
         return false;
 
         return false;

+ 7 - 7
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp
Ver fichero 

@@ -6,27 +6,20 @@
 
     <title>云阅卷高校版</title>
 
     <title>云阅卷高校版</title>
 
     <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css"/>
 
     <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css"/>
 
     <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css"/>
 
     <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css"/>
 
-    
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/json2.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/json2.js"></script>
 
-    
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery-ui.min.js "></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery-ui.min.js "></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery.mousewheel.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/jquery.mousewheel.min.js"></script>
 
-    
     <script type="text/javascript" src="${ctxStatic}/iviewer/jquery.iviewer.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/iviewer/jquery.iviewer.js"></script>
 
     <link rel="stylesheet" href="${ctxStatic}/iviewer/jquery.iviewer.css" rel="stylesheet"/>
 
     <link rel="stylesheet" href="${ctxStatic}/iviewer/jquery.iviewer.css" rel="stylesheet"/>
 
-    
     <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 
     <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 
     <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
     <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
-    
     <script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
 
     <script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
 
     <script src="${ctxStatic}/i18n/load.js" type="text/javascript"></script>
 
     <script src="${ctxStatic}/i18n/load.js" type="text/javascript"></script>
 
-    
     <script src="${ctxStatic}/rich-text/js/render.js"></script>
 
     <script src="${ctxStatic}/rich-text/js/render.js"></script>
 
     <link href="${ctxStatic}/rich-text/css/rich-text.css" rel="stylesheet">
 
     <link href="${ctxStatic}/rich-text/css/rich-text.css" rel="stylesheet">
 
     <script type="text/javascript" src="${ctxStatic}/viewer/viewer.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/viewer/viewer.js"></script>
 
     <link href="${ctxStatic}/viewer/viewer.css" rel="stylesheet">
 
     <link href="${ctxStatic}/viewer/viewer.css" rel="stylesheet">
 
-    
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/mark-control.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/mark-control.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/json-view.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/json-view.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/json-loader.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/mark-json/js/json-loader.js"></script>
 
@@ -45,6 +38,13 @@
 
 <body>
 
 <body>
 
 <div class="container-fluid" id="container"></div>
 
 <div class="container-fluid" id="container"></div>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
+	$(document).ajaxError(function (evt, req, settings) {
 
+	    if (req.status == 401) {
 
+	        alert("账号已在其他地方登录！");
 
+	        window.location.href = req.statusText;
 
+	    }
 
+	});
 
+	
     $(document).ready(function () {
 
     $(document).ready(function () {
 
         var mc = new MarkControl({
 
         var mc = new MarkControl({
 
             container: $('#container'),
 
             container: $('#container'),

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markNew.jsp
Ver fichero 

@@ -46,7 +46,7 @@
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
     $(document).ajaxError(function (evt, req, settings) {
 
     $(document).ajaxError(function (evt, req, settings) {
 
         if (req.status == 401) {
 
         if (req.status == 401) {
 
-            alert("权限失效，请重新登录！");
 
+            alert("账号已在其他地方登录！");
 
             window.location.href = req.statusText;
 
             window.location.href = req.statusText;
 
         }
 
         }
 
     });
 
     });

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markTrack.jsp
Ver fichero 

@@ -39,7 +39,7 @@
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
     $(document).ajaxError(function (evt, req, settings) {
 
     $(document).ajaxError(function (evt, req, settings) {
 
         if (req.status == 401) {
 
         if (req.status == 401) {
 
-            alert("权限失效，请重新登录！");
 
+            alert("账号已在其他地方登录！");
 
             window.location.href = req.statusText;
 
             window.location.href = req.statusText;
 
         }
 
         }
 
     });
 
     });

+ 2 - 2
stmms-web/src/main/webapp/static/mark-json/js/mark-control.js
Ver fichero 

@@ -601,7 +601,7 @@ MarkControl.prototype.submitTask = function (submitUrl) {
 
                     markControl.trigger('task.submit.success');
 
                     markControl.trigger('task.submit.success');
 
                 }
 
                 }
 
             }, function (message) {
 
             }, function (message) {
 
-                markControl.trigger('task.submit.error', getMessage(message));
 
+                markControl.trigger('task.submit.error', getMessage('mark.control.tsak.error'));
 
             });
 
             });
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
             //未定义任务引擎，依赖定义/传入的提交地址
 
             //未定义任务引擎，依赖定义/传入的提交地址
 
@@ -619,7 +619,7 @@ MarkControl.prototype.submitTask = function (submitUrl) {
 
                     }
 
                     }
 
                 },
 
                 },
 
                 error: function (message) {
 
                 error: function (message) {
 
-                    markControl.trigger('task.submit.error', getMessage(message));
 
+                    markControl.trigger('task.submit.error', getMessage('mark.control.tsak.error'));
 
                 }
 
                 }
 
             });
 
             });
 
         } else {
 
         } else {

+ 2 - 2
stmms-web/src/main/webapp/static/mark-new/js/mark-control.js
Ver fichero 

@@ -599,7 +599,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
                     markControl.trigger('task.submit.success');
 
                     markControl.trigger('task.submit.success');
 
                 }
 
                 }
 
             }, function(message) {
 
             }, function(message) {
 
-                markControl.trigger('task.submit.error', getMessage(message));
 
+                markControl.trigger('task.submit.error', getMessage('mark.control.tsak.error'));
 
             });
 
             });
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
             //未定义任务引擎，依赖定义/传入的提交地址
 
             //未定义任务引擎，依赖定义/传入的提交地址
 
@@ -617,7 +617,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
                     }
 
                     }
 
                 },
 
                 },
 
                 error: function(message) {
 
                 error: function(message) {
 
-                    markControl.trigger('task.submit.error', getMessage(message));
 
+                    markControl.trigger('task.submit.error', getMessage('mark.control.tsak.error'));
 
                 }
 
                 }
 
             });
 
             });
 
         } else {
 
         } else {

+ 2 - 2
stmms-web/src/main/webapp/static/mark-track/js/mark-control.js
Ver fichero 

@@ -614,7 +614,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
                 markControl.trigger('mark.specialTag.success');
 
                 markControl.trigger('mark.specialTag.success');
 
                 // markControl.getTask();
 
                 // markControl.getTask();
 
             }, function(message) {
 
             }, function(message) {
 
-                markControl.trigger('task.submit.error',getMessage( message));
 
+                markControl.trigger('task.submit.error',getMessage("mark.control.tsak.error"));
 
             });
 
             });
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
         } else if (submitUrl != undefined && submitUrl.length > 0) {
 
             // 未定义任务引擎，依赖定义/传入的提交地址
 
             // 未定义任务引擎，依赖定义/传入的提交地址
 
@@ -633,7 +633,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
 
                     }
 
                     }
 
                 },
 
                 },
 
                 error: function(message) {
 
                 error: function(message) {
 
-                    markControl.trigger('task.submit.error', getMessage(message));
 
+                    markControl.trigger('task.submit.error', getMessage('mark.control.tsak.error'));
 
                 }
 
                 }
 
             });
 
             });
 
         } else {
 
         } else {