From 27ead40bb36893cd3e10700e1ae3394a0f87b5d4 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 8 Mar 2024 21:30:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20IpBack.java=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/fateverse/admin/entity/IpBack.java     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java

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

From c0e7c5b3495280c890082ea796902c087c1f3f19 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 9 Mar 2024 13:59:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/fateverse/admin/entity/vo/MappingSwitchVo.java     | 8 ++++++--
 .../cn/fateverse/admin/service/impl/UserServiceImpl.java  | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

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);
     }