[infra] docker파일 수정, docker compose 파일 수정 및 xml 매핑 에러 해결

Author: MinCodeHub

.idea/workspace.xml

@@ -1,5 +1,23 @@
-FROM openjdk:17-jdk-slim
+# 1. 빌드 단계
+FROM maven:3.9.3-eclipse-temurin-17 AS build
 WORKDIR /app
-COPY . .
+
+# Maven pom.xml 먼저 복사 후 의존성 다운로드
+COPY demo/pom.xml .
+RUN mvn dependency:go-offline -B
+
+# 소스 복사
+COPY demo/src ./src
+
+# JAR 빌드
+RUN mvn clean package -DskipTests
+
+# 2. 실행 단계
+FROM eclipse-temurin:17-jdk-focal
+WORKDIR /app
+
+# 빌드된 JAR만 복사
+COPY --from=build /app/target/demo-0.0.1-SNAPSHOT.jar app.jar
+
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "demo-0.0.1-SNAPSHOT.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile

@@ -0,0 +1,23 @@
+//package com.example.moviezip.config;
+//
+//import lombok.Data;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * JWT 토큰 관련 설정값을 application.yml에서 읽어오는 클래스입니다.
+// * 모든 속성은 'token' 접두사를 사용합니다.
+// */
+//@Configuration
+//@ConfigurationProperties(prefix = "token")
+//@Data
+//public class TokenConfig {
+//    // 토큰 서명에 사용되는 비밀 키
+//    private String secret;
+//
+//    // 액세스 토큰 만료 시간 (밀리초)
+//    private Long accessTokenExpireTime;
+//
+//    // 리프레시 토큰 만료 시간 (밀리초)
+//    private Long refreshTokenExpireTime;
+//}

demo/src/main/java/com/example/moviezip/config/TokenConfig.java

@@ -1,8 +1,16 @@
 package com.example.moviezip.domain;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.ibatis.type.Alias;
+
 import java.io.Serializable;
 import java.util.List;
 
+@Getter
+@Setter
+@Alias("Movie")
 public class Movie implements Serializable {
 
     private Long mvId;

demo/src/main/java/com/example/moviezip/domain/Movie.java

@@ -1,7 +1,10 @@
 package com.example.moviezip.domain;
 
+import org.apache.ibatis.type.Alias;
+
 import java.io.Serializable;
 
+@Alias("Review")
 public class Review extends Movie {
     private Long rvId;
     private int rvStar;

demo/src/main/java/com/example/moviezip/domain/Review.java

@@ -1,26 +1,15 @@
 package com.example.moviezip.domain;
 
-import com.example.moviezip.domain.chat.ChatRoom;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import java.util.Collection;
-import java.util.List;
-
+import org.apache.ibatis.type.Alias;
 
 @Getter
 @Setter
 @NoArgsConstructor
-@Entity
-@Table(name = "USER_TABLE")
-public class User  {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+@Alias("User")
+public class User {
     private Long id;
     private String userId;
     private String password;
@@ -31,10 +20,9 @@ public class User  {
     public User(Long id) {
         this.id = id;
     }
-    public User( String userId, String password) {
+
+    public User(String userId, String password) {
         this.userId = userId;
         this.password = password;
     }
-
-
-}
+}

demo/src/main/java/com/example/moviezip/domain/User.java

@@ -22,9 +22,8 @@ public class jwtUtil {
     private long ACCESS_TOKEN_EXPIRATION;
     @Value("${token.refresh-token-expire-time}")
     private long REFRESH_TOKEN_EXPIRATION;
-    @Autowired
-    private CustomUserDetailsService customUserDetailsService;
-    //JWT 토큰 생성
+
+     //JWT 토큰 생성
     public String createAccessToken(Long userId, String username, String role) {
         Claims claims = Jwts.claims().setSubject(username);
         claims.put("userId", userId);

demo/src/main/java/com/example/moviezip/util/jwtUtil.java

@@ -19,3 +19,7 @@ spring:
 
 jwt:
   secret: VlwEyVBsYt9V7zq57TejMnVUyzblYcfPQye08f7MGVA9XkHa
+
+token:
+  access-token-expire-time: 3000000
+  refresh-token-expire-time: 604800000

demo/src/main/resources/application-dev.yml

@@ -1,3 +1,12 @@
 spring:
   application:
     name: moviezip
+mybatis:
+  type-aliases-package: com.example.moviezip.domain
+
+jwt:
+  secret: VlwEyVBsYt9V7zq57TejMnVUyzblYcfPQye08f7MGVA9XkHa
+
+token:
+  access-token-expire-time: 3000000
+  refresh-token-expire-time: 604800000

demo/src/main/resources/application.yml

@@ -4,7 +4,7 @@
 <mapper namespace="com.example.moviezip.dao.mybatis.mapper.UserMapper">
 
     <!-- 사용자를 가져옴 -->
-    <select id="getUserById" resultType="User">
+    <select id="getUserById" resultType="com.example.moviezip.domain.User">
         SELECT * FROM USER_TABLE WHERE ID = #{id}
     </select>
 
@@ -16,19 +16,19 @@
         UPDATE USER_TABLE SET PASSWORD = #{newPassword} WHERE ID = #{id}
     </update>
 
-    <select id="findUser" resultType="User">
+    <select id="findUser" resultType="com.example.moviezip.domain.User">
         SELECT * FROM USER_TABLE WHERE HINT = #{hint} AND NICKNAME = #{nickname}
     </select>
     <update id="updateUserNickname">
         UPDATE USER_TABLE SET NICKNAME = #{newNickname} WHERE ID = #{id}
     </update>
-    <select id="existingUserNickname" resultType="User">
+    <select id="existingUserNickname" resultType="com.example.moviezip.domain.User">
         SELECT * FROM USER_TABLE WHERE NICKNAME = #{nickname}
     </select>
     <delete id="deleteUser">
         DELETE FROM USER_TABLE WHERE ID = #{id}
     </delete>
-    <select id="findAllUser" resultType="User">
+    <select id="findAllUser" resultType="com.example.moviezip.domain.User">
         SELECT * FROM USER_TABLE
     </select>
 
@@ -49,7 +49,7 @@
     <update id="updateInterest">
         UPDATE INTEREST SET GENRE = #{genre} WHERE ID = #{id}
     </update>
-    <insert id="addUser" parameterType="User">
+    <insert id="addUser" parameterType="com.example.moviezip.domain.User">
         <selectKey keyProperty="id" resultType="java.lang.Long" order="BEFORE">
             SELECT SEQUENCE_USERID.NEXTVAL FROM DUAL
         </selectKey>
@@ -59,7 +59,7 @@
         (#{id}, #{userId, jdbcType=VARCHAR}, #{password, jdbcType=VARCHAR}, #{nickname, jdbcType=VARCHAR}, #{hint, jdbcType=VARCHAR})
     </insert>
 
-    <select id="findAllUserInterest" resultType="User">
+    <select id="findAllUserInterest" resultType="com.example.moviezip.domain.User">
         --         SELECT USER_TABLE.ID AS id, USER_TABLE.USER_ID AS user_id, USER_TABLE.PASSWORD AS password, USER_TABLE.NICKNAME AS nickname, USER_TABLE.HINT AS hint, INTEREST.GENRE AS interest
         SELECT USER_TABLE.ID AS id, USER_TABLE.UserId AS UserId, USER_TABLE.PASSWORD AS password, USER_TABLE.NICKNAME AS nickname, USER_TABLE.HINT AS hint, GENRE AS "interest.genre"
         FROM USER_TABLE
@@ -73,13 +73,13 @@
         WHERE MOVIE_TITLE LIKE '%' || #{keyword} || '%'
     </select>
 
-    <select id="findByUserId" resultType="User">
+    <select id="findByUserId" resultType="com.example.moviezip.domain.User">
         SELECT *
         FROM USER_TABLE
         WHERE USERID =  #{userId, jdbcType=VARCHAR}
     </select>
 
-    <select id="getUserById2" resultType="User">
+    <select id="getUserById2" resultType="com.example.moviezip.domain.User">
         SELECT * FROM USER_TABLE WHERE ID = #{id}
     </select>