From a4e9550ac1f85466799b370aa6ce1a70eb873d4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 15 七月 2024 12:10:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index abf47d7..e427737 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -16,11 +16,17 @@
package com.doumee.config.Jwt;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Member;
import io.jsonwebtoken.*;
import org.apache.commons.lang3.StringUtils;
+import javax.annotation.Resource;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* <p>鍚庡彴绯荤粺jwt token宸ュ叿绫�</p>
@@ -43,8 +49,6 @@
public static final String HEADER_KEY = "token";
//鍙栧�煎悕绉�
public static final String UserId_Name = "AppUserId";
- //鍙栧�煎悕绉�
- public static final String MEMBER = "MEMBER";
//鍔犲瘑瀵嗛挜
private final static String jwtSecret = "MhAjU9poLf8ko54K25XBDtonaL33vtt1";
//杩囨湡鏃堕棿(s) 86400L=1澶� 604800L=7澶�
@@ -56,7 +60,7 @@
public static String generateToken(JwtPayLoad jwtPayLoad) {
Long expiredSeconds = getExpireSeconds();
final Date expirationDate = new Date(System.currentTimeMillis() + expiredSeconds * 1000);
- return generateToken(jwtPayLoad.getMemberId(), expirationDate, jwtPayLoad.toMap());
+ return generateToken(jwtPayLoad.getUserId(), expirationDate, jwtPayLoad.toMap());
}
/**
@@ -77,7 +81,7 @@
public static String generateTokenOld(JwtPayLoad jwtPayLoad) {
Long expiredSeconds = getExpireSeconds();
final Date expirationDate = new Date(System.currentTimeMillis() + expiredSeconds * 1000);
- return generateToken(jwtPayLoad.getMemberId(), expirationDate, jwtPayLoad.toMap());
+ return generateToken(jwtPayLoad.getUserId(), expirationDate, jwtPayLoad.toMap());
}
/**
@@ -128,7 +132,7 @@
/**
* 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
*/
- public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
+ public static String generateToken(Long userId, Date exppiredDate, Map<String, Object> claims) {
final Date createdDate = new Date();
String secret = getJwtSecret();
@@ -151,6 +155,8 @@
}
}
+
+
/**
* 鑾峰彇jwt鐨刾ayload閮ㄥ垎
*/
--
Gitblit v1.9.3