Merge branches 'dev_ic_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

 Conflicts:

	epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -62,12 +62,12 @@ public class GovWebServiceImpl implements GovWebService {
             throw new RenException("当前接口只适用于PC工作端运营管理后台");
         }
         //2.验证码校验
-        //boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
-        //if (!flag) {
-        //    logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
-        //    //开启验证码校验
-        //    throw new RenException(EpmetErrorCode.ERR10019.getCode());
-        //}
+        boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
+        if (!flag) {
+            logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
+            //开启验证码校验
+            throw new RenException(EpmetErrorCode.ERR10019.getCode());
+        }
         //3.校验登陆账号是否存在
         //根据客户Id和手机号查询登陆用户信息(此处不需要判断登陆人是否是有效客户以及是否是客户的根管理员，前一接口获取登陆手机号对应客户列表已经判断了)
         GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO();
@@ -125,7 +125,7 @@ public class GovWebServiceImpl implements GovWebService {
         tokenDto.setGridIdList(thirdLoginService.getGridIdList(userId));
         tokenDto.setRoleList(thirdLoginService.queryGovStaffRoles(userId, orgIdPathParts[orgIdPathParts.length - 1]));
         tokenDto.setOrgIdPath(orgIdPath);
-        
+
         cpUserDetailRedis.set(tokenDto, expire);
         logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
         return token;