diff --git a/mens-api/src/main/java/kr/xit/core/biz/mapper/IAuthApiMapper.java b/mens-api/src/main/java/kr/xit/core/biz/mapper/IAuthApiMapper.java
index 125e016..f2dfb0d 100644
--- a/mens-api/src/main/java/kr/xit/core/biz/mapper/IAuthApiMapper.java
+++ b/mens-api/src/main/java/kr/xit/core/biz/mapper/IAuthApiMapper.java
@@ -1,9 +1,8 @@
package kr.xit.core.biz.mapper;
+import egovframework.com.cmm.model.LoginVO;
import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
-import egovframework.com.cmm.LoginVO;
-
/**
*
* description :
diff --git a/mens-api/src/main/java/kr/xit/core/biz/service/AuthApiService.java b/mens-api/src/main/java/kr/xit/core/biz/service/AuthApiService.java
index 5e076ef..5a6b274 100644
--- a/mens-api/src/main/java/kr/xit/core/biz/service/AuthApiService.java
+++ b/mens-api/src/main/java/kr/xit/core/biz/service/AuthApiService.java
@@ -1,14 +1,12 @@
package kr.xit.core.biz.service;
-import javax.annotation.Resource;
-
+import egovframework.com.cmm.model.LoginVO;
import egovframework.com.cmm.util.EgovFileScrty;
+import javax.annotation.Resource;
+import kr.xit.core.biz.mapper.IAuthApiMapper;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
import org.springframework.stereotype.Service;
-import egovframework.com.cmm.LoginVO;
-import kr.xit.core.biz.mapper.IAuthApiMapper;
-
@Service
public class AuthApiService extends EgovAbstractServiceImpl implements IAuthApiService {
diff --git a/mens-api/src/main/java/kr/xit/core/biz/service/IAuthApiService.java b/mens-api/src/main/java/kr/xit/core/biz/service/IAuthApiService.java
index b0b6eef..3092c8f 100644
--- a/mens-api/src/main/java/kr/xit/core/biz/service/IAuthApiService.java
+++ b/mens-api/src/main/java/kr/xit/core/biz/service/IAuthApiService.java
@@ -1,6 +1,6 @@
package kr.xit.core.biz.service;
-import egovframework.com.cmm.LoginVO;
+import egovframework.com.cmm.model.LoginVO;
/**
* 일반 로그인을 처리하는 비즈니스 구현 클래스
diff --git a/mens-api/src/main/java/kr/xit/core/biz/web/AuthApiController.java b/mens-api/src/main/java/kr/xit/core/biz/web/AuthApiController.java
index 4ee5622..e721107 100644
--- a/mens-api/src/main/java/kr/xit/core/biz/web/AuthApiController.java
+++ b/mens-api/src/main/java/kr/xit/core/biz/web/AuthApiController.java
@@ -1,7 +1,6 @@
package kr.xit.core.biz.web;
-import egovframework.com.cmm.LoginVO;
-import egovframework.com.jwt.EgovJwtTokenUtil;
+import egovframework.com.cmm.model.LoginVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -13,6 +12,8 @@ import kr.xit.core.biz.service.IAuthApiService;
import kr.xit.core.consts.Constants;
import kr.xit.core.model.ApiResponseDTO;
import kr.xit.core.model.IApiResponse;
+import kr.xit.core.model.TokenDTO;
+import kr.xit.core.spring.auth.jwt.JwtTokenProvider;
import kr.xit.core.spring.util.MessageUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
@@ -56,7 +57,7 @@ public class AuthApiController {
/** EgovMessageSource */
private final MessageUtil messageUtil;
- private final EgovJwtTokenUtil egovJwtTokenUtil;
+ private final JwtTokenProvider jwtTokenProvider;
/**
* 일반 로그인을 처리한다
@@ -136,10 +137,11 @@ public class AuthApiController {
Map claimsMap = new HashMap<>();
// claimsMap.put("dkkdk", "kdkkdkdkd");
- String jwtToken = egovJwtTokenUtil.generateToken(loginVO, claimsMap);
- // String jwtToken = egovJwtTokenUtil.generateToken(loginVO.getId());
+ TokenDTO tokenDTO = jwtTokenProvider.generateTokenDto(claimsMap, String.format("{}{}",loginVO.getUserSe(), loginVO.getId()));
- String username = egovJwtTokenUtil.getUsernameFromToken(jwtToken);
+ // String jwtToken = egovJwtTokenUtil.generateToken(loginVO.getId());
+
+ String username = jwtTokenProvider.getUsernameFromToken(tokenDTO.getAccessToken());
// System.out.println("Dec jwtToken username = "+username);
@@ -172,7 +174,7 @@ public class AuthApiController {
//String jwtToken = jwtTokenProvider.generateJwtAccessToken(loginVO.getId(), "ROLE_USER");
resultMap.put("resultVO", loginResultVO);
- resultMap.put("token", jwtToken);
+ resultMap.put("token", tokenDTO);
return ApiResponseDTO.success(resultMap);
}
diff --git a/mens-api/src/main/resources/egovframework/mapper/core/auth-mysql-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/core/auth-mysql-mapper.xml
index f4a3684..18e0048 100644
--- a/mens-api/src/main/resources/egovframework/mapper/core/auth-mysql-mapper.xml
+++ b/mens-api/src/main/resources/egovframework/mapper/core/auth-mysql-mapper.xml
@@ -4,7 +4,7 @@
-