refactor: convert all timestamps from milliseconds to seconds
- Modified LessonTask entity timestamps - Updated UserService timestamp handling - Adjusted JWT token timestamp generation - Updated TokenBlacklistService to use seconds
This commit is contained in:
@ -51,7 +51,7 @@ public class LessonTask implements Serializable {
|
|||||||
logger.info("创建新课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}",
|
logger.info("创建新课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}",
|
||||||
this.courseName, this.microLessonName, this.userId);
|
this.courseName, this.microLessonName, this.userId);
|
||||||
progressStatus = 1;
|
progressStatus = 1;
|
||||||
long now = System.currentTimeMillis();
|
long now = System.currentTimeMillis() / 1000;
|
||||||
createdAt = now;
|
createdAt = now;
|
||||||
updatedAt = now;
|
updatedAt = now;
|
||||||
logger.info("创建课程任务成功 - 进度状态: {}, 创建时间: {}, 更新时间: {}",
|
logger.info("创建课程任务成功 - 进度状态: {}, 创建时间: {}, 更新时间: {}",
|
||||||
@ -62,7 +62,7 @@ public class LessonTask implements Serializable {
|
|||||||
protected void onUpdate() {
|
protected void onUpdate() {
|
||||||
logger.info("更新课程任务 - ID: {}, 课程名称: {}, 小课名称: {}",
|
logger.info("更新课程任务 - ID: {}, 课程名称: {}, 小课名称: {}",
|
||||||
this.id, this.courseName, this.microLessonName);
|
this.id, this.courseName, this.microLessonName);
|
||||||
updatedAt = System.currentTimeMillis();
|
updatedAt = System.currentTimeMillis() / 1000;
|
||||||
logger.info("更新课程任务成功 - ID: {}, 更新时间: {}", id, updatedAt);
|
logger.info("更新课程任务成功 - ID: {}, 更新时间: {}", id, updatedAt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,8 +46,8 @@ public class JwtService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String generateToken(Map<String, Object> extraClaims, UserDetails userDetails) {
|
public String generateToken(Map<String, Object> extraClaims, UserDetails userDetails) {
|
||||||
Date issuedAt = new Date(System.currentTimeMillis());
|
Date issuedAt = new Date(System.currentTimeMillis() / 1000 * 1000);
|
||||||
Date expiration = new Date(System.currentTimeMillis() + jwtExpiration);
|
Date expiration = new Date((System.currentTimeMillis() / 1000 + jwtExpiration / 1000) * 1000);
|
||||||
logger.debug("Generating token for user: {}, expiration: {}, jwtExpiration: {}", userDetails.getUsername(),
|
logger.debug("Generating token for user: {}, expiration: {}, jwtExpiration: {}", userDetails.getUsername(),
|
||||||
expiration, jwtExpiration);
|
expiration, jwtExpiration);
|
||||||
|
|
||||||
|
@ -22,15 +22,15 @@ public class TokenBlacklistService {
|
|||||||
* 将令牌添加到黑名单
|
* 将令牌添加到黑名单
|
||||||
*
|
*
|
||||||
* @param token JWT令牌
|
* @param token JWT令牌
|
||||||
* @param expiration 过期时间(毫秒)
|
* @param expiration 过期时间(秒)
|
||||||
*/
|
*/
|
||||||
public void addToBlacklist(String token, long expiration) {
|
public void addToBlacklist(String token, long expiration) {
|
||||||
logger.info("将令牌加入黑名单 - 过期时间: {}", new Date(expiration));
|
logger.info("将令牌加入黑名单 - 过期时间: {}", new Date(expiration * 1000));
|
||||||
try {
|
try {
|
||||||
String key = BLACKLIST_PREFIX + token;
|
String key = BLACKLIST_PREFIX + token;
|
||||||
long ttl = expiration - System.currentTimeMillis();
|
long ttl = expiration - System.currentTimeMillis() / 1000;
|
||||||
if (ttl > 0) {
|
if (ttl > 0) {
|
||||||
redisTemplate.opsForValue().set(key, "blacklisted", ttl, TimeUnit.MILLISECONDS);
|
redisTemplate.opsForValue().set(key, "blacklisted", ttl, TimeUnit.SECONDS);
|
||||||
logger.info("令牌已成功加入黑名单");
|
logger.info("令牌已成功加入黑名单");
|
||||||
} else {
|
} else {
|
||||||
logger.warn("令牌已过期,无需加入黑名单");
|
logger.warn("令牌已过期,无需加入黑名单");
|
||||||
|
@ -76,8 +76,8 @@ public class UserService implements UserDetailsService {
|
|||||||
user.setJobs(request.getJobs());
|
user.setJobs(request.getJobs());
|
||||||
user.setCreatorId(request.getCreatorId());
|
user.setCreatorId(request.getCreatorId());
|
||||||
user.setStatus(1);
|
user.setStatus(1);
|
||||||
user.setCreatedAt(System.currentTimeMillis());
|
user.setCreatedAt(System.currentTimeMillis() / 1000);
|
||||||
user.setUpdatedAt(System.currentTimeMillis());
|
user.setUpdatedAt(System.currentTimeMillis() / 1000);
|
||||||
|
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
|
|
||||||
@ -158,8 +158,8 @@ public class UserService implements UserDetailsService {
|
|||||||
// 加密密码
|
// 加密密码
|
||||||
user.setPassword(passwordEncoder.encode(user.getPassword()));
|
user.setPassword(passwordEncoder.encode(user.getPassword()));
|
||||||
user.setStatus(1);
|
user.setStatus(1);
|
||||||
user.setCreatedAt(System.currentTimeMillis());
|
user.setCreatedAt(System.currentTimeMillis() / 1000);
|
||||||
user.setUpdatedAt(System.currentTimeMillis());
|
user.setUpdatedAt(System.currentTimeMillis() / 1000);
|
||||||
|
|
||||||
// 保存用户
|
// 保存用户
|
||||||
User savedUser = userRepository.save(user);
|
User savedUser = userRepository.save(user);
|
||||||
|
@ -88,8 +88,8 @@ public class JwtUtil {
|
|||||||
String token = Jwts.builder()
|
String token = Jwts.builder()
|
||||||
.setClaims(claims)
|
.setClaims(claims)
|
||||||
.setSubject(userName)
|
.setSubject(userName)
|
||||||
.setIssuedAt(new Date(System.currentTimeMillis()))
|
.setIssuedAt(new Date(System.currentTimeMillis() / 1000 * 1000))
|
||||||
.setExpiration(new Date(System.currentTimeMillis() + jwtExpiration))
|
.setExpiration(new Date((System.currentTimeMillis() / 1000 + jwtExpiration / 1000) * 1000))
|
||||||
.signWith(getSignKey(), SignatureAlgorithm.HS384)
|
.signWith(getSignKey(), SignatureAlgorithm.HS384)
|
||||||
.compact();
|
.compact();
|
||||||
logger.debug("token创建成功");
|
logger.debug("token创建成功");
|
||||||
|
Reference in New Issue
Block a user