From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index e368861..a94a60c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -43,6 +43,8 @@
     public static final String HEADER_KEY = "token";
     //鍙栧�煎悕绉�
     public static final String UserId_Name = "AppUserId";
+    //鍙栧�煎悕绉�
+    public static final String ShopId_Name = "AppShopId";
     //鍔犲瘑瀵嗛挜
     private final static String jwtSecret = "MhAjU9poLf8ko54K25XBDtonaL33vtt1";
     //杩囨湡鏃堕棿(s) 86400L=1澶� 604800L=7澶�
@@ -126,14 +128,14 @@
     /**
      * 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
      */
-    public static String generateToken(Integer userId, Date exppiredDate, Map<String, Object> claims) {
+    public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
 
         final Date createdDate = new Date();
         String secret = getJwtSecret();
 
         if (claims == null) {
             return Jwts.builder()
-                    .setSubject(userId.toString())
+                    .setSubject(userId)
                     .setIssuedAt(createdDate)
                     .setExpiration(exppiredDate)
                     .signWith(SignatureAlgorithm.HS512, secret)
@@ -141,7 +143,7 @@
         } else {
             return Jwts.builder()
                     .setClaims(claims)
-                    .setSubject(userId.toString())
+                    .setSubject(userId)
                     .setIssuedAt(createdDate)
                     .setExpiration(exppiredDate)
                     .signWith(SignatureAlgorithm.HS512, secret)

--
Gitblit v1.9.3