login 수정(5)

src/main/java/com/wb/domainserver/domain/admin/login/AdminLoginController.java

@@ -116,6 +116,10 @@ public class AdminLoginController {
 
        loginRequest.setConectBrwsr(browser);
 
+       String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+       log.debug("admin loginProcess accessUrl :: {}", accessUrl);
+       loginRequest.setAccessUrl(accessUrl);
+
        loginUser = service.adminLogin(loginRequest);
        loginUser.setSysDvCd("02");
 
@@ -262,6 +266,10 @@ public class AdminLoginController {
         vo.setMngrId(loginRequest.getUsername());
         vo.setPassword(loginRequest.getPassword());
 
+        String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+        log.debug("admin loginCheck accessUrl :: {}", accessUrl);
+        loginRequest.setAccessUrl(accessUrl);
+
         String secretKey = commonService.selectSecretkey();
         vo.setSecretKey(secretKey);
 

src/main/java/com/wb/domainserver/domain/gcone/login/service/LoginService.java

@@ -223,6 +223,7 @@ public class LoginService {
         LoginRequest req = new LoginRequest();
         req.setUserInnb(userInnb);
         String accessUrl = UrlExtractor.getOriginalHost(request);
+        accessUrl = UrlExtractor.getOriginalHost(accessUrl);
         req.setAccessUrl(accessUrl);
         log.debug("createRenewLoginToken accessUrl:{}",accessUrl);
         req.setSopmalCd(request.getParameter("authSopmalCd"));

src/main/java/com/wb/domainserver/domain/mngr/login/MngrLoginController.java

@@ -13,6 +13,7 @@ import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
 import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
 import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService;
 import com.wb.domainserver.realm.RealmContextHolder;
+import com.wb.domainserver.realm.util.UrlExtractor;
 import com.wb.domainserver.response.ApiResponse;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
@@ -126,6 +127,10 @@ public class MngrLoginController {
 
         loginRequest.setConectBrwsr(browser);
 
+		String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+		log.debug("mngr loginProcess accessUrl :: {}", accessUrl);
+		loginRequest.setAccessUrl(accessUrl);
+
 		log.debug("mngr :: /login/mngr :: loginRequest  :: {}", loginRequest);
 
        loginUser = service.mngrLogin(loginRequest);
@@ -227,11 +232,18 @@ public class MngrLoginController {
 
 		String queryString = request.getParameter("authSopmalCd");
 		log.debug("mngr loginCheck getParameter authSopmalCd  :: {}", queryString);
+//		if(queryString == null || queryString.isEmpty()){
+//
+//		}
 
 		BOJobUserVO vo = new BOJobUserVO();
 		vo.setMngrId(loginRequest.getUsername());
 		vo.setPassword(loginRequest.getPassword());
 
+		String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+		log.debug("mngr loginCheck accessUrl :: {}", accessUrl);
+		loginRequest.setAccessUrl(accessUrl);
+
 		String secretKey = commonService.selectSecretkey();
 		vo.setSecretKey(secretKey);
 

src/main/java/com/wb/domainserver/realm/util/UrlExtractor.java

@@ -87,14 +87,14 @@ public class UrlExtractor {
         String host = url.replaceFirst("https?://", "");
 
         // 로컬 혹은 개발 서브도메인 제거
-/*      서브도메인 구분
+        //서브도메인 구분
         if (host.startsWith("loc.")) {
             host = host.replaceFirst("loc\\.", "");
         }
         if (host.startsWith("dev.")) {
             host = host.replaceFirst("dev\\.", "");
         }
-*/
+
 
         // 포트번호 제거
         int portIndex = host.indexOf(":");

src/main/java/com/wb/domainserver/security/filter/JwtAuthenticationFilter.java

@@ -40,6 +40,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         response.setCharacterEncoding(StandardCharsets.UTF_8.name());
 
         String realm = RealmContextHolder.getRealm().toLowerCase();
+        log.debug("request realm: {}", realm);
 
         try {
 

src/main/resources/mybatis/xml/mapper/gcone/login/LoginMapper.xml

@@ -48,7 +48,7 @@
              ,TELNB
              ,MBTLNB
              , MNGR_DV
-             ,(SELECT SYS_DV_CD FROM site WHERE #{accessUrl} LIKE CONCAT('%',URL,'%')) AS SYS_DV_CD
+             ,(SELECT SYS_DV_CD FROM site WHERE URL = #{accessUrl}) AS SYS_DV_CD
              ,#{sopmalCd} AS SOPMAL_CD
           FROM GC_MANAGER
           WHERE 1=1