From 2b3475f5370469a178fbb3f056e7b0dc2693d0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 25 Sep 2024 07:47:32 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/base/Const/ResConst.java |  8 +++++
 .../java/com/dsideal/base/Const/RetBean.java  | 32 -------------------
 .../com/dsideal/base/Const/RetJsonArray.java  | 20 ++++++++++++
 .../com/dsideal/base/Const/RetJsonObject.java | 20 ++++++++++++
 .../Controller/LoginPersonController.java     |  1 -
 .../LoginPerson/Model/LoginPersonModel.java   |  2 +-
 6 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 dsBase/src/main/java/com/dsideal/base/Const/ResConst.java
 delete mode 100644 dsBase/src/main/java/com/dsideal/base/Const/RetBean.java
 create mode 100644 dsBase/src/main/java/com/dsideal/base/Const/RetJsonArray.java
 create mode 100644 dsBase/src/main/java/com/dsideal/base/Const/RetJsonObject.java

diff --git a/dsBase/src/main/java/com/dsideal/base/Const/ResConst.java b/dsBase/src/main/java/com/dsideal/base/Const/ResConst.java
new file mode 100644
index 00000000..07e4ecbe
--- /dev/null
+++ b/dsBase/src/main/java/com/dsideal/base/Const/ResConst.java
@@ -0,0 +1,8 @@
+package com.dsideal.base.Const;
+
+public class ResConst {
+    public static final Integer SUCCESS = 200;
+    public static final Integer ERROR = 500;
+    public static final Integer OVERDUE = 401;
+    public static final Integer TIMEOUT = 30000;
+}
diff --git a/dsBase/src/main/java/com/dsideal/base/Const/RetBean.java b/dsBase/src/main/java/com/dsideal/base/Const/RetBean.java
deleted file mode 100644
index b145ad35..00000000
--- a/dsBase/src/main/java/com/dsideal/base/Const/RetBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dsideal.base.Const;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class RetBean {
-    /**
-     * {
-     * "code": 200,
-     * "data": { },
-     * "msg": "成功"
-     * }
-     */
-    private int code;
-    private String msg;
-    private JSONObject data;
-
-    public static final Integer SUCCESS = 200;
-    public static final Integer ERROR = 500;
-    public static final Integer OVERDUE = 401;
-    public static final Integer TIMEOUT = 30000;
-
-    public RetBean(int code, String msg, JSONObject data) {
-        this.code = code;
-        this.msg = msg;
-        this.data = data;
-    }
-
-}
diff --git a/dsBase/src/main/java/com/dsideal/base/Const/RetJsonArray.java b/dsBase/src/main/java/com/dsideal/base/Const/RetJsonArray.java
new file mode 100644
index 00000000..45c9cb56
--- /dev/null
+++ b/dsBase/src/main/java/com/dsideal/base/Const/RetJsonArray.java
@@ -0,0 +1,20 @@
+package com.dsideal.base.Const;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class RetJsonArray {
+    private int code;
+    private String msg;
+    private List<Record> data;
+
+    public RetJsonArray(int code, String msg, List<Record> list) {
+        this.code = code;
+        this.msg = msg;
+        this.data = list;
+    }
+}
diff --git a/dsBase/src/main/java/com/dsideal/base/Const/RetJsonObject.java b/dsBase/src/main/java/com/dsideal/base/Const/RetJsonObject.java
new file mode 100644
index 00000000..31ca7cee
--- /dev/null
+++ b/dsBase/src/main/java/com/dsideal/base/Const/RetJsonObject.java
@@ -0,0 +1,20 @@
+package com.dsideal.base.Const;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class RetJsonObject {
+
+    private int code;
+    private String msg;
+    private JSONObject data;
+
+    public RetJsonObject(int code, String msg, JSONObject data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+}
diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
index bc19f3e8..a8f21f1f 100644
--- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
+++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
@@ -2,7 +2,6 @@ package com.dsideal.base.LoginPerson.Controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.base.BaseApplication;
-import com.dsideal.base.Const.RetBean;
 import com.dsideal.base.Interceptor.*;
 import com.dsideal.base.LoginPerson.Model.LoginPersonModel;
 import com.dsideal.base.Util.*;
diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java
index e7585332..7118eaab 100644
--- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java
+++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Model/LoginPersonModel.java
@@ -333,7 +333,7 @@ public class LoginPersonModel {
         //去掉限制
         RedisKit.del(PassWordKey);
         //防止用户攻击修改Cookie
-        Map _map = new HashMap<String, String>();
+        Map _map = new HashMap<String, Object>();
         _map.put("identity_id", loginMap.get("identity_id"));
         _map.put("person_id", loginMap.get("person_id"));
         _map.put("bureau_id", loginMap.get("bureau_id"));