Merge branches 'dev' and 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0

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

@@ -66,8 +66,8 @@ public class GovWebServiceImpl implements GovWebService {
         boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
         if (!flag) {
             logger.error(String.format("用户%s登录，验证码输入错误，暂时放行", formDTO.getPhone()));
-            //暂时关闭验证码校验 TODO
-            //throw new RenException(EpmetErrorCode.ERR10019.getCode());
+            //开启验证码校验
+            throw new RenException(EpmetErrorCode.ERR10019.getCode());
         }
         //3.校验登陆账号是否存在
         //根据客户Id和手机号查询登陆用户信息(此处不需要判断登陆人是否是有效客户以及是否是客户的根管理员，前一接口获取登陆手机号对应客户列表已经判断了)

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -117,12 +117,12 @@ public class CodeServiceImpl implements CodeService {
 		if (null == authInfo) {
 			throw new RenException("未授权");
 		}
-		CustomerDTO customerFormDTO = new CustomerDTO();
+		/*CustomerDTO customerFormDTO = new CustomerDTO();
 		customerFormDTO.setId(formDTO.getCustomerId());
 		Result<CustomerDTO> result = operCrmOpenFeignClient.getCustomerInfo(customerFormDTO);
 		if (!result.success()) {
 			throw new RenException(result.getCode(), result.getMsg());
-		}
+		}*/
 		//获取小程序居民端与工作端名称
 		String resiName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.RESI);
 		String workName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.WORK);
@@ -132,7 +132,8 @@ public class CodeServiceImpl implements CodeService {
 		wxExtJson.getExt().setExtAppid(authInfo.getAuthorizerAppid());
 		wxExtJson.getExt().setResiName(resiName);
 		wxExtJson.getExt().setWorkName(workName);
-		wxExtJson.getExt().setCustomerName(null == result.getData().getCustomerName()?"":result.getData().getCustomerName());
+		//wxExtJson.getExt().setCustomerName(null == result.getData().getCustomerName()?"":result.getData().getCustomerName());
+		wxExtJson.getExt().setCustomerName("");
 		if (CodeConstant.RESI.equals(formDTO.getClientType())) {
 			wxExtJson.getWindow().setNavigationBarTitleText(resiName);
 		} else {

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.11__alter_code_ext.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `code_ext`
+ADD PRIMARY KEY (`ID`);
+