完善密码错误提示，学校添加是否开启学生网页功能

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloud.java

@@ -33,9 +33,6 @@ public class TCloud extends BaseBean {
     //是否需要绑定手机号0不绑定1绑定
     private Integer cloudbindphone;
 
-    //是否有学生网页端0没有1有
-    private Integer stuweb;
-
     //主题色
     private String theme;
 

sapi/src/main/java/com/xhkjedu/sapi/model/system/TSchool.java

@@ -57,13 +57,14 @@ public class TSchool extends BaseBean {
 
     private Integer usernum;//账号数量
 
+    private Integer stuweb;//是否有学生网页端0没有1有
+
     //创建人
     private Integer createid;
 
     //创建时间
     private Integer createtime;
 
-
     @Transient
     //管理员登录账号
     private String loginname;

sapi/src/main/resources/mapper/system/SchoolMapper.xml

@@ -78,7 +78,7 @@
     <update id="updateById">
         update t_school set schoolname=#{school.schoolname},shortname=#{school.shortname},errorrate=#{school.errorrate}
         ,schoolbindmac=#{school.schoolbindmac},docklc=#{school.docklc},usernum=#{school.usernum},livenum=#{school.livenum}
-        ,livetime=#{school.livetime},coordinate=#{school.coordinate},limitenolen=#{school.limitenolen}
+        ,livetime=#{school.livetime},coordinate=#{school.coordinate},limitenolen=#{school.limitenolen},stuweb=#{school.stuweb}
         where schoolid=#{school.schoolid}
     </update>
     <!--根据域名获取学校id-->

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -123,16 +123,25 @@ public class UserService extends JedisUtil {
                 errornum = userVo.getErrornum() + 1;
             }
 
-            if(errornum >= ConfigKey.loginerrornum){
-                //如果密码连续出错次数超过等于或超过限制，锁定帐号
+            //修改码连续出错次数
+            userMapper.updateErrornum(userVo.getUserid(),errornum);
+
+            Integer loginerrornum =  ConfigKey.loginerrornum;
+            int synum = loginerrornum - errornum;//剩余次数
+            if(synum <= 0){
+                //如果密码连续出错次数超过等于或超过限制，锁定账号
                 userMapper.updateUserLock(userVo.getUserid(),1);
             }
 
-            //修改码连续出错次数
-            userMapper.updateErrornum(userVo.getUserid(),errornum);
+            String msg = "密码错误";
+            if(synum>0 && synum <= 5){
+                msg = msg + "，还可以尝试"+ synum +"次，账号将被锁定。";
+            }else if(synum == 0){
+                msg = msg + "，账号已被锁定。";
+            }
 
             //帐号密码登录
-            return new ResultVo(1, "密码错误", userVo);
+            return new ResultVo(1, msg, userVo);
         } else {
             Integer usertype = userVo.getUsertype();
             if (usertype == 999) {
@@ -300,15 +309,24 @@ public class UserService extends JedisUtil {
                 errornum = userVo.getErrornum() + 1;
             }
 
-            if(errornum >= ConfigKey.loginerrornum){
-                //如果密码连续出错次数超过等于或超过限制，锁定帐号
+            //修改码连续出错次数
+            userMapper.updateErrornum(userVo.getUserid(),errornum);
+
+            Integer loginerrornum =  ConfigKey.loginerrornum;
+            int synum = loginerrornum - errornum;//剩余次数
+            if(synum <= 0){
+                //如果密码连续出错次数超过等于或超过限制，锁定账号
                 userMapper.updateUserLock(userVo.getUserid(),1);
             }
 
-            //修改码连续出错次数
-            userMapper.updateErrornum(userVo.getUserid(),errornum);
+            String msg = "密码错误";
+            if(synum>0 && synum <= 5){
+                msg = msg + "，还可以尝试"+ synum +"次，账号将被锁定。";
+            }else if(synum == 0){
+                msg = msg + "，账号已被锁定。";
+            }
 
-            return new ResultVo(1, "密码错误", userVo);
+            return new ResultVo(1, msg, userVo);
         } else {
             Integer sbindmac = userVo.getSbindmac();//学校是否绑定设备0未绑定1绑定
             String mac = user.getMac();

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -7,7 +7,7 @@
         select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,
         u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime,u.userlock
         ,u.errornum,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.schoolbindmac sbindmac,s.errorrate,s.schooldomain
-        ,c.cloudcode,c.stuweb
+        ,c.cloudcode,s.stuweb
         from t_cloud c,t_user u left join t_school s on u.schoolid = s.schoolid
         where binary u.loginname=#{loginname} limit 1
     </select>
@@ -16,7 +16,7 @@
         select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,
             u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime,u.userlock,
             u.errornum,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.schoolbindmac sbindmac,s.errorrate,s.schooldomain
-            ,c.cloudcode,c.stuweb
+            ,c.cloudcode,s.stuweb
         from t_cloud c,t_user u left join t_school s on u.schoolid = s.schoolid
         where u.bindphoned=1 and u.userphone=#{userphone} limit 1
     </select>
@@ -302,7 +302,7 @@
     </select>
     <!--根据手机号获取用户基本信息-->
     <select id="getUserByUserPhone" resultType="com.xhkjedu.vo.system.UserVo">
-        select u.usertype,u.userstate,u.usertime,u.userlock,u.bindphoned,s.schoolstate,c.stuweb
+        select u.usertype,u.userstate,u.usertime,u.userlock,u.bindphoned,s.schoolstate,s.stuweb
         from t_cloud c,t_user u left join t_school s on u.schoolid = s.schoolid
         where u.userphone=#{userphone} limit 1
     </select>