diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin index a115aef..24811c6 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin differ diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock index 6da25b1..9ca6ec6 100644 Binary files a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock and b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin index 51de700..dae08ca 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.bin differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock index e1c4e33..efe2f55 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock and b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock differ diff --git a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 77e9864..e2f3671 100644 Binary files a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ diff --git a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9574328..61fd890 100644 Binary files a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class index 7e7e192..0e90d69 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class differ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class index f0a87b1..384a499 100644 Binary files a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class and b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class differ diff --git a/main_vm/build/tmp/compileJava/previous-compilation-data.bin b/main_vm/build/tmp/compileJava/previous-compilation-data.bin index b2d0fd7..d4da241 100644 Binary files a/main_vm/build/tmp/compileJava/previous-compilation-data.bin and b/main_vm/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java index 382ce26..3ad4835 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java @@ -73,6 +73,7 @@ public class LoginController { @RequestMapping(value = "/adm/main/actionMain.do") public String actionMain(ModelMap model) { return loginService.actionMain(model); +// return new ModelAndView(loginService.actionMain(model)); } @GetMapping("/adm/main/actionLogout.do") diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java index b203596..9743fb4 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java @@ -74,7 +74,8 @@ public class LoginService { @Transactional public String LoginValidService(LoginReq dto, ModelMap model) { //기본 리턴은 로그인페이지 - String result = "adm/signin/signin"; +// String result = "adm/signin/signin"; + String result = "/layout/signin"; TbBotUser userSelect = null; TbBotUser user = tbBotUserRepo.findByUserIdAndUseYn(dto.getUserId(), "Y") @@ -96,7 +97,8 @@ public class LoginService { sessionSetting(user); LoginVO userResult = user.toLoginVO(); - return "forward:/adm/main/actionMain.do"; +// return "forward:/adm/main/actionMain.do"; + return "/layout/adm/common/dashboard"; } else { log.info("Fail!"); }