diff --git a/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/NanopartConstant.java b/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/NanopartConstant.java index d7245dd4..bd12bdf2 100644 --- a/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/NanopartConstant.java +++ b/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/NanopartConstant.java @@ -8,5 +8,7 @@ package cn.axzo.nanopart.api.constant; * @version: 1.0 */ public class NanopartConstant { + + public static final String BASIC_FEIGN_PACKAGE = "cn.axzo.nanopart.api"; public static final String PHONE_REGEXP = "^1[3456789]\\d{9}$"; } \ No newline at end of file diff --git a/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/request/BlackAndWhiteListReq.java b/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/request/BlackAndWhiteListReq.java index 4ef71002..1b2e0b8e 100644 --- a/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/request/BlackAndWhiteListReq.java +++ b/black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/request/BlackAndWhiteListReq.java @@ -17,11 +17,20 @@ import java.util.Map; @Data public class BlackAndWhiteListReq { + /** + * 名单类型,0为黑名单,1为白名单 + */ @NotNull(message = "名单类型错误") private ListTypeEnum type; + /** + * 模块名,自主定义,例:cms-login + */ @NotBlank(message = "模块名不能为空") private String module; + /** + * 限制条件,如:phone:13698745673 + */ private Map param; } diff --git a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/dao/repository/BlackAndWhiteListRepository.java b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/dao/repository/BlackAndWhiteListRepository.java index 0b161857..1bfbeddf 100644 --- a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/dao/repository/BlackAndWhiteListRepository.java +++ b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/dao/repository/BlackAndWhiteListRepository.java @@ -59,7 +59,8 @@ public class BlackAndWhiteListRepository extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",req.getType().getValue()) .eq(StringUtils.isNotBlank(req.getModule()),"module",req.getModule()) - .eq("is_delete",0); + .eq("is_delete",0) + .groupBy("type","param"); buildQueryWrapper(queryWrapper, req.getParam(), ""); return blackAndWhiteListMapper.selectList(queryWrapper); }