Merge branch 'dev_1.3.15' into release_1.3.15

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markerList.jsp

@@ -646,8 +646,8 @@
         if (password.length == 0) {
             wrongMessage.html('密码不能为空！');
             return false;
-        } else if (password.length < 4) {
-            wrongMessage.html('密码至少4位！');
+        } else if (password.length > 12 || password.length < 6) {
+            wrongMessage.html('密码至少6位，不能大于12位');
             return false;
         }
         $.ajax({

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp

@@ -44,7 +44,7 @@
                     showError($.i18n.prop("user.reset.password"));
                     return false;
                 }
-                if (password.length > 8 || password.length < 4) {
+                if (password.length > 12 || password.length < 6) {
                     showError($.i18n.prop("user.reset.password.length"));
                     return false;
                 }

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/reset.jsp

@@ -44,7 +44,7 @@
                     showError($.i18n.prop("user.reset.password"));
                     return false;
                 }
-                if (password.length > 8 || password.length < 4) {
+                if (password.length > 12 || password.length < 6) {
                     showError($.i18n.prop("user.reset.password.length"));
                     return false;
                 }

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -346,8 +346,8 @@
         if (password.length == 0) {
             wrongMessage.html('密码不能为空！');
             return false;
-        } else if (password.length < 4) {
-            wrongMessage.html('密码至少4位！');
+        } else if (password.length > 12 || password.length < 6) {
+            wrongMessage.html('密码至少6位，不能大于12位');
             return false;
         }
         $.ajax({