From 68a4179dffd9a993766a332698086f2d65ad1451 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 16:03:24 +0800
Subject: [PATCH] 'commit'

---
 .../Controller/LoginPersonController.java          | 14 ++++----------
 .../main/java/com/dsideal/dsBase/Util/JwtUtil.java |  4 ++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java
index 985df1bc..8f2d9813 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java
@@ -154,15 +154,9 @@ public class LoginPersonController extends Controller {
                 return;
             }
         }
-        //写入Session信息
-//        SessionKit.set(getRequest(), getResponse(), "identity_id", loginMap.get("identity_id").toString());
-//        SessionKit.set(getRequest(), getResponse(), "person_id", loginMap.get("person_id").toString());
-//        SessionKit.set(getRequest(), getResponse(), "bureau_id", loginMap.get("bureau_id").toString());
-//        SessionKit.set(getRequest(), getResponse(), "org_code", loginMap.get("org_code").toString());
-//        SessionKit.set(getRequest(), getResponse(), "city_id", loginMap.get("city_id").toString());
-//        SessionKit.set(getRequest(), getResponse(), "area_id", loginMap.get("area_id").toString());
-        //TODO
-
+        //生成JWT的Token,并且写入到Cookie中
+        String token = JwtUtil.generateToken(Integer.parseInt(loginMap.get("identity_id").toString()), loginMap.get("person_id").toString(), loginMap.get("bureau_id").toString());
+        CookieUtil.set(getResponse(), "jwt-token", token, false, true);
         //返回相关信息
         resultJson.put("success", true);
         resultJson.put("identity_id", loginMap.get("identity_id").toString());
@@ -539,7 +533,7 @@ public class LoginPersonController extends Controller {
      * @param email     邮箱
      */
     @Before(POST.class)
-
+    @EmptyInterface({"telephone", "email"})
     public void updateTelephoneEmail(String telephone, String email) {
         Record rPerson = JwtUtil.getPersonInfo(getRequest());
         String personId = rPerson.getStr("person_id");
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/JwtUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/JwtUtil.java
index 8861ac2e..fad50f01 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Util/JwtUtil.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Util/JwtUtil.java
@@ -70,6 +70,10 @@ public class JwtUtil {
      */
     public static Record getPersonInfo(HttpServletRequest req) {
         String jwtToken = req.getHeader("Authorization");
+        if (jwtToken == null) {
+            //尝试从Cookie中获取jwt-token
+            jwtToken = CookieUtil.getValue(req, "jwt-token");
+        }
         Record record = new Record();
         Claims claims = getClaims(jwtToken);
         if (claims != null) {