diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java new file mode 100644 index 0000000..b0aa6e4 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java @@ -0,0 +1,38 @@ +package cn.fateverse.admin.entity; + +import cn.fateverse.admin.vo.IpBackVo; +import cn.fateverse.common.core.annotaion.EnableAutoField; +import cn.fateverse.common.core.entity.BaseEntity; +import lombok.Data; + +/** + * @author Clay + * @date 2023-10-22 + */ +@Data +@EnableAutoField +public class IpBack extends BaseEntity { + /** + * 主键id + */ + private Long id; + /** + * ip地址 + */ + private String ipAddr; + /** + * ip类型 ipv4 ipv6 + */ + private String type; + + public IpBackVo toIPBackVo(){ + return IpBackVo.builder() + .id(id) + .ipAddr(ipAddr) + .type(type) + .createTime(getCreateTime()) + .remark(getRemark()) + .build(); + } + +} diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java index ebb3ae7..721421f 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java @@ -87,19 +87,23 @@ public class MappingSwitchVo { private String operName; public static MappingSwitchVo toMappingSwitchVo(MappingSwitchInfo mappingSwitchInfo) { - return MappingSwitchVo.builder() + MappingSwitchVo mappingSwitchVo = MappingSwitchVo.builder() .key(mappingSwitchInfo.getKey()) .applicationName(mappingSwitchInfo.getApplicationName()) .className(mappingSwitchInfo.getClassName()) .description(mappingSwitchInfo.getDescription()) .methodName(mappingSwitchInfo.getMethodName()) .uris(mappingSwitchInfo.getUris()) - .type(mappingSwitchInfo.getType().toString()) .httpMethods(mappingSwitchInfo.getHttpMethods()) .state(mappingSwitchInfo.getState()) .operName(mappingSwitchInfo.getOperName()) .operTime(mappingSwitchInfo.getOperTime()) .build(); + MappingSwitchInfo.MappingSwitchType switchType = mappingSwitchInfo.getType(); + if (switchType != null) { + mappingSwitchVo.setType(switchType.name()); + } + return mappingSwitchVo; } diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java index 4036c19..5a1571d 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java @@ -307,7 +307,6 @@ public class UserServiceImpl implements UserService { batchUserPost(dto, Boolean.TRUE); dto.setPassword(null); UserBase user = dto.toUser(); - return userMapper.update(user); }