Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -58,10 +58,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserEntity userEntity = null;
         try {
             loginForm.validate();
-            boolean validCode = validCodeService.doCheckImageValidCode(request.getSession().getId(),super.getRequestIP(request),loginForm.getCode());
-            if(!validCode){
-                throw new AppException("验证码错误");
-            }
+//            boolean validCode = validCodeService.doCheckImageValidCode(request.getSession().getId(),super.getRequestIP(request),loginForm.getCode());
+//            if(!validCode){
+//                throw new AppException("验证码错误");
+//            }
             userEntity = userService.userdoLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
             userEntity.setLoginTime(System.currentTimeMillis());