Merge branch 'feature/event' into develop

This commit is contained in:
merrycoral
2025-10-28 16:40:57 +09:00
8 changed files with 836 additions and 250 deletions
@@ -113,9 +113,9 @@ public class JwtTokenProvider {
public UserPrincipal getUserPrincipalFromToken(String token) {
Claims claims = parseToken(token);
Long userId = Long.parseLong(claims.getSubject());
UUID userId = UUID.fromString(claims.getSubject());
String storeIdStr = claims.get("storeId", String.class);
Long storeId = storeIdStr != null ? Long.parseLong(storeIdStr) : null;
UUID storeId = storeIdStr != null ? UUID.fromString(storeIdStr) : null;
String email = claims.get("email", String.class);
String name = claims.get("name", String.class);
@SuppressWarnings("unchecked")
@@ -24,12 +24,12 @@ public class UserPrincipal implements UserDetails {
/**
* 사용자 ID
*/
private final Long userId;
private final UUID userId;
/**
* 매장 ID
*/
private final Long storeId;
private final UUID storeId;
/**
* 사용자 이메일