From c593c2e691a7e1aa13c809fb60f9554eb6e6fb39 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Mon, 12 Aug 2024 14:20:48 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=94=94=EB=B9=84=20=EC=97=B0=EA=B2=B0?= =?UTF-8?q?=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/login/LoginController.java | 11 ++++++++++- .../interplug/qcast/biz/login/LoginMapper.java | 2 ++ .../interplug/qcast/biz/login/LoginService.java | 10 +++++++++- .../qcast/biz/login/dto/UserResponse.java | 12 ++++++++++++ src/main/resources/config/application.yml | 8 ++++---- src/main/resources/mappers/login/loginMapper.xml | 15 ++++++++++++--- .../qcast/config/jasypt/JasyptConfigTest.java | 3 ++- 7 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java diff --git a/src/main/java/com/interplug/qcast/biz/login/LoginController.java b/src/main/java/com/interplug/qcast/biz/login/LoginController.java index c23f07ad..1cc2dde4 100644 --- a/src/main/java/com/interplug/qcast/biz/login/LoginController.java +++ b/src/main/java/com/interplug/qcast/biz/login/LoginController.java @@ -1,6 +1,8 @@ package com.interplug.qcast.biz.login; import com.interplug.qcast.biz.login.dto.LoginUser; +import com.interplug.qcast.biz.login.dto.UserResponse; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -8,8 +10,10 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @RequestMapping("/api/login") +@RequiredArgsConstructor public class LoginController { - @Autowired private LoginService loginService; +// @Autowired private LoginService loginService; + private final LoginService loginService; @PostMapping("/v1.0/login") public void login(@RequestBody LoginUser loginUser) { @@ -20,4 +24,9 @@ public class LoginController { log.debug("isLogin : " + loginService.getLogin(loginUser)); } } + + @PostMapping("/v1.0/user") + public UserResponse getUser(@RequestBody LoginUser loginUser) { + return loginService.getUser(loginUser); + } } diff --git a/src/main/java/com/interplug/qcast/biz/login/LoginMapper.java b/src/main/java/com/interplug/qcast/biz/login/LoginMapper.java index 0f2df01e..1227b0e1 100644 --- a/src/main/java/com/interplug/qcast/biz/login/LoginMapper.java +++ b/src/main/java/com/interplug/qcast/biz/login/LoginMapper.java @@ -1,9 +1,11 @@ package com.interplug.qcast.biz.login; import com.interplug.qcast.biz.login.dto.LoginUser; +import com.interplug.qcast.biz.login.dto.UserResponse; import org.apache.ibatis.annotations.Mapper; @Mapper interface LoginMapper { public boolean getLogin(LoginUser loginUser); + public UserResponse getUser(LoginUser loginUser); } diff --git a/src/main/java/com/interplug/qcast/biz/login/LoginService.java b/src/main/java/com/interplug/qcast/biz/login/LoginService.java index 46b4eea0..605957c2 100644 --- a/src/main/java/com/interplug/qcast/biz/login/LoginService.java +++ b/src/main/java/com/interplug/qcast/biz/login/LoginService.java @@ -1,16 +1,24 @@ package com.interplug.qcast.biz.login; import com.interplug.qcast.biz.login.dto.LoginUser; +import com.interplug.qcast.biz.login.dto.UserResponse; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Slf4j @Service +@RequiredArgsConstructor public class LoginService { - @Autowired LoginMapper loginMapper; +// @Autowired LoginMapper loginMapper; + private final LoginMapper loginMapper; public boolean getLogin(LoginUser loginUser) { return loginMapper.getLogin(loginUser); } + + public UserResponse getUser(LoginUser loginUser) { + return loginMapper.getUser(loginUser); + } } diff --git a/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java new file mode 100644 index 00000000..a50189da --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java @@ -0,0 +1,12 @@ +package com.interplug.qcast.biz.login.dto; + +import lombok.Data; + +@Data +public class UserResponse { + private String userId; + private String saleStoreId; + private String name; + private String mail; + private String tel; +} diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index d82f3060..4e4b5e54 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -14,17 +14,17 @@ spring: datasource: master: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:sqlserver://localhost:1433;databaseName=qcastdb;encrypt=true;trustServerCertificate=true + jdbc-url: jdbc:log4jdbc:sqlserver://mssql.devgrr.kr:1433;databaseName=qcast;encrypt=true;trustServerCertificate=true username: qcast - password: ENC(rg8lFosEDRzKrg3WQjFrrbUDlzLnbsMa) + password: ENC(MIICho4m0EXUeb/QCdYfDr7qNn0B3K0y) maximum-pool-size: 4 pool-name: Master-HikariPool # connection-test-query: SELECT 1 read: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:sqlserver://localhost:1433;databaseName=qcastdb;encrypt=true;trustServerCertificate=true + jdbc-url: jdbc:log4jdbc:sqlserver://mssql.devgrr.kr:1433;databaseName=qcast;encrypt=true;trustServerCertificate=true username: qcast - password: ENC(rg8lFosEDRzKrg3WQjFrrbUDlzLnbsMa) + password: ENC(MIICho4m0EXUeb/QCdYfDr7qNn0B3K0y) maximum-pool-size: 4 pool-name: Read-HikariPool # connection-test-query: SELECT 2 diff --git a/src/main/resources/mappers/login/loginMapper.xml b/src/main/resources/mappers/login/loginMapper.xml index 16f5c42a..aec2bb28 100644 --- a/src/main/resources/mappers/login/loginMapper.xml +++ b/src/main/resources/mappers/login/loginMapper.xml @@ -6,8 +6,17 @@ resultType="boolean"> /* sqlid : com.interplug.qcast.login.findByLoginId */ select 1 - from login_user - where login_id = #{username} - and login_pwd = #{password} + from M_USER + where USER_ID = #{username} + and PASSWORD = #{password} + + + \ No newline at end of file diff --git a/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java b/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java index 8dc7c000..b770878d 100644 --- a/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java +++ b/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; class JasyptConfigTest { @Test void test() { - log.info(JasyptConfig.encrypt("qcast1234!")); +// log.info(JasyptConfig.encrypt("qcast1234!")); + log.info(JasyptConfig.encrypt("Qwertqaz12345")); } }