Просмотр исходного кода

Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
24a13cc804
2 измененных файлов: 11 добавлений и 11 удалений
  1. +2
    -2
      mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java
  2. +9
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java

+ 2
- 2
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");


+ 9
- 9
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<WxMsgValidationcode> 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<WxMsgValidationcode> 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();


Загрузка…
Отмена
Сохранить