Skip to content

Commit

Permalink
[BE] docker file timezone 추가 (#349)
Browse files Browse the repository at this point in the history
  • Loading branch information
lvalentine6 committed Jul 19, 2023
2 parents a45d47c + 5ec9673 commit f7f66ef
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Dockerfile.be
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM openjdk:11-slim

ARG JAR_FILE=be/build/libs/SecondHand-0.0.1-SNAPSHOT.jar
RUN apt-get update && apt-get install -y tzdata
ENV TZ=Asia/Seoul
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

ARG JAR_FILE=be/build/libs/SecondHand-0.0.1-SNAPSHOT.jar
COPY ${JAR_FILE} secondhand-be.jar

ENTRYPOINT ["java","-jar","/secondhand-be.jar"]
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import codesquad.secondhand.dto.member.SignUpRequestDto;
import codesquad.secondhand.dto.token.TokenResponse;
import codesquad.secondhand.service.MemberService;
import codesquad.secondhand.util.IpSearcher;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

Expand All @@ -55,11 +56,14 @@ public ResponseDto<?> signUp(@ModelAttribute SignUpRequestDto signUpRequestDto)
}

@PostMapping("/login")
public ResponseDto<TokenResponse> login(@RequestBody LoginRequestDto loginRequestDto) {
public ResponseDto<TokenResponse> login(@RequestBody LoginRequestDto loginRequestDto, HttpServletRequest httpServletRequest) {
MemberIdxTokenDto memberIdxTokenDto = memberService.login(loginRequestDto);
MemberIdxLoginIdImageDto memberIdxLoginIdImage = memberService.getMemberIdxLoginIdImage(
memberIdxTokenDto.getMemberIdx());
String accessToken = memberIdxTokenDto.getToken();

IpSearcher.getClientIP(httpServletRequest);

return ResponseDto.of(RESPONSE_SUCCESS, TokenResponse.of(accessToken, memberIdxLoginIdImage));
}

Expand Down
39 changes: 39 additions & 0 deletions be/src/main/java/codesquad/secondhand/util/IpSearcher.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package codesquad.secondhand.util;

import javax.servlet.http.HttpServletRequest;

import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@UtilityClass
public class IpSearcher {
public static String getClientIP(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
log.info("> X-FORWARDED-FOR : " + ip);

if (ip == null) {
ip = request.getHeader("Proxy-Client-IP");
log.info("> Proxy-Client-IP : " + ip);
}
if (ip == null) {
ip = request.getHeader("WL-Proxy-Client-IP");
log.info("> WL-Proxy-Client-IP : " + ip);
}
if (ip == null) {
ip = request.getHeader("HTTP_CLIENT_IP");
log.info("> HTTP_CLIENT_IP : " + ip);
}
if (ip == null) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
log.info("> HTTP_X_FORWARDED_FOR : " + ip);
}
if (ip == null) {
ip = request.getRemoteAddr();
log.info("> getRemoteAddr : "+ip);
}
log.info("> Result : IP Address : "+ip);

return ip;
}
}

0 comments on commit f7f66ef

Please sign in to comment.