resolve conflict

This commit is contained in:
djeon
2025-10-24 09:40:26 +09:00
45 changed files with 9189 additions and 3002 deletions
+3 -1
View File
@@ -21,12 +21,14 @@ spring:
# JPA Configuration
jpa:
show-sql: ${SHOW_SQL:true}
database-platform: org.hibernate.dialect.PostgreSQLDialect
properties:
hibernate:
format_sql: true
use_sql_comments: true
dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: ${DDL_AUTO:update}
ddl-auto: ${JPA_DDL_AUTO:update}
# Redis Configuration
data:
@@ -51,7 +51,7 @@ public class JwtTokenProvider {
public boolean validateToken(String token) {
try {
Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token);
return true;
@@ -72,7 +72,7 @@ public class JwtTokenProvider {
*/
public String getUserId(String token) {
Claims claims = Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token)
.getBody();
@@ -85,7 +85,7 @@ public class JwtTokenProvider {
*/
public String getUsername(String token) {
Claims claims = Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token)
.getBody();
@@ -98,7 +98,7 @@ public class JwtTokenProvider {
*/
public String getAuthority(String token) {
Claims claims = Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token)
.getBody();
@@ -112,7 +112,7 @@ public class JwtTokenProvider {
public boolean isTokenExpired(String token) {
try {
Claims claims = Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token)
.getBody();
@@ -128,7 +128,7 @@ public class JwtTokenProvider {
*/
public Date getExpirationDate(String token) {
Claims claims = Jwts.parser()
.setSigningKey(secretKey)
.verifyWith(secretKey)
.build()
.parseClaimsJws(token)
.getBody();