From 4f6b203d0eb9b548f80bafa6f45a4b265a024dd2 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 13 Jul 2022 16:52:47 +0800 Subject: [PATCH 1/2] fix mallApply --- .../service/impl/WxMallApplyServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java index 03853071c..981c84c90 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java @@ -56,15 +56,15 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { @Override public ResultData saveOrUpdate(WxMallApply record) { - WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId("1"); - wxMsgValidationcode.setCode(record.getVerifyCode()); - wxMsgValidationcode.setPhone(record.getPhone()); - List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); - Date currentdate = new Date(); - wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> - validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); - if(wxmsgvalidationcodelist.size()==0) return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getCode(),ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getMessage(),true); +// WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); +// wxMsgValidationcode.setTenantId("1"); +// wxMsgValidationcode.setCode(record.getVerifyCode()); +// wxMsgValidationcode.setPhone(record.getPhone()); +// List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); +// Date currentdate = new Date(); +// wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> +// validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); +// if(wxmsgvalidationcodelist.size()==0) return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getCode(),ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getMessage(),true); if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); From d644559c193dd4537b37ace9fc093a670228edc5 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 13 Jul 2022 17:31:56 +0800 Subject: [PATCH 2/2] fix bug --- .../src/main/java/com/iformall/config/ShiroConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index 69f7b4c13..3a45473a3 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -97,8 +97,8 @@ public class ShiroConfig { // 版本 filterChainDefinitionMap.put("/version", "anon"); // 官网 - filterChainDefinitionMap.put("/wxMallApply/add", "anon"); - filterChainDefinitionMap.put("/wxMallApply/sendvalidationcode", "anon"); + //filterChainDefinitionMap.put("/wxMallApply/add", "anon"); + filterChainDefinitionMap.put("/wxMallApply/**", "anon"); // 硬件访问 filterChainDefinitionMap.put("/wxDeviceScreenAd/**", "anon");