From 274221b45d59bf3d9f47d966ea81481f74f4a2a3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 18 Sep 2020 13:39:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E5=90=AFPC=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E9=99=86=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C=E3=80=81?= =?UTF-8?q?third=E5=BA=93code=5Fext=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=B8=BB?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/GovWebServiceImpl.java | 4 ++-- .../main/resources/db/migration/V0.0.11__alter_code_ext.sql | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.11__alter_code_ext.sql diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index 12162bfbd3..9631436b98 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/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和手机号查询登陆用户信息(此处不需要判断登陆人是否是有效客户以及是否是客户的根管理员，前一接口获取登陆手机号对应客户列表已经判断了) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.11__alter_code_ext.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.11__alter_code_ext.sql new file mode 100644 index 0000000000..7ffffc084f --- /dev/null +++ b/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`); + From a9b6110f328196fb24f57a853bcc903c9336e47b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 22 Sep 2020 12:16:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDextjson?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0customerName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/CodeServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index f0526f95b9..8f8c57ea58 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/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 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 {