truck-matching 모듈화 및 기존 소스 member 쪽으로 이관

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.2.10'
+	id 'org.springframework.boot' version '3.2.11'
 	id 'io.spring.dependency-management' version '1.1.6'
 }
 
@@ -19,34 +19,30 @@ configurations {
 	}
 }
 
-repositories {
-	mavenCentral()
+allprojects {
+	repositories {
+		mavenCentral()
+	}
 }
 
-dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
-	compileOnly 'org.projectlombok:lombok'
-	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'org.springframework.security:spring-security-test'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
-	// jwt
-	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
-	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
-	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
-
-	// mysql
-	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
-	runtimeOnly 'com.mysql:mysql-connector-j'
-}
+subprojects {
+	apply plugin: 'java'
+	apply plugin: 'java-library'
+	apply plugin: 'org.springframework.boot'
+	apply plugin: 'io.spring.dependency-management'
+
+	configurations {
+		compileOnly {
+			extendsFrom annotationProcessor
+		}
+	}
+
+	dependencies {
+	}
+
+	test {
+		useJUnitPlatform()
+	}
 
-tasks.named('test') {
-	useJUnitPlatform()
 }
+

module-admin/build.gradle

@@ -0,0 +1,53 @@
+plugins {
+    id 'java'
+}
+
+group = 'com.flab'
+version = '0.0.1-SNAPSHOT'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+    runtimeOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    // jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // mysql
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+}
+
+tasks.named('test') {
+    useJUnitPlatform()
+}
+
+jar {
+    archiveBaseName = 'module-admin'
+}

module-admin/src/main/java/com/flab/moduleadmin/ModuleAdminApplication.java

@@ -0,0 +1,13 @@
+package com.flab.moduleadmin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ModuleAdminApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ModuleAdminApplication.class, args);
+    }
+
+}

module-admin/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.application.name=module-admin

module-admin/src/test/java/com/flab/moduleadmin/ModuleAdminApplicationTests.java

@@ -0,0 +1,13 @@
+package com.flab.moduleadmin;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class ModuleAdminApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}

module-member/build.gradle

@@ -0,0 +1,50 @@
+plugins {
+    id 'java'
+    id 'java-library'
+}
+
+group = 'com.flab'
+version = '0.0.1-SNAPSHOT'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+    implementation 'org.projectlombok:lombok'
+    testImplementation 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    // jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // mysql
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+}
+
+tasks.named('test') {
+    useJUnitPlatform()
+}
+
+jar {
+    archiveBaseName = 'module-member'
+}

module-member/src/main/java/com/flab/modulemember/ModuleMemberApplication.java

@@ -0,0 +1,13 @@
+package com.flab.modulemember;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ModuleMemberApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ModuleMemberApplication.class, args);
+    }
+
+}

src/main/java/com/flab/truck_matching/common/auth/CustomAccessDeniedHandler.java → module-member/src/main/java/com/flab/modulemember/auth/CustomAccessDeniedHandler.java

@@ -1,4 +1,4 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.ServletException;

src/main/java/com/flab/truck_matching/common/auth/CustomAuthenticationEntryPoint.java → module-member/src/main/java/com/flab/modulemember/auth/CustomAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.ServletException;

src/main/java/com/flab/truck_matching/common/auth/CustomUserDetails.java → module-member/src/main/java/com/flab/modulemember/auth/CustomUserDetails.java

@@ -1,6 +1,6 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
-import com.flab.truck_matching.member.dto.MemberDTO;
+import com.flab.modulemember.member.dto.MemberDTO;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Getter
 @RequiredArgsConstructor

src/main/java/com/flab/truck_matching/common/auth/ErrorResponseDto.java → module-member/src/main/java/com/flab/modulemember/auth/ErrorResponseDto.java

@@ -1,4 +1,4 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

src/main/java/com/flab/truck_matching/common/auth/JwtAuthFilter.java → module-member/src/main/java/com/flab/modulemember/auth/JwtAuthFilter.java

@@ -1,6 +1,6 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
-import com.flab.truck_matching.common.auth.service.CustomUserDetailService;
+import com.flab.modulemember.auth.service.CustomUserDetailService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/flab/truck_matching/common/auth/JwtUtil.java → module-member/src/main/java/com/flab/modulemember/auth/JwtUtil.java

@@ -1,7 +1,6 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
-import com.flab.truck_matching.member.domain.Member;
-import com.flab.truck_matching.member.dto.MemberDTO;
+import com.flab.modulemember.member.domain.Member;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;

src/main/java/com/flab/truck_matching/common/auth/SecurityConfig.java → module-member/src/main/java/com/flab/modulemember/auth/SecurityConfig.java

@@ -1,6 +1,6 @@
-package com.flab.truck_matching.common.auth;
+package com.flab.modulemember.auth;
 
-import com.flab.truck_matching.common.auth.service.CustomUserDetailService;
+import com.flab.modulemember.auth.service.CustomUserDetailService;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/flab/truck_matching/common/auth/controller/AuthApiController.java → module-member/src/main/java/com/flab/modulemember/auth/controller/AuthApiController.java

@@ -1,7 +1,7 @@
-package com.flab.truck_matching.common.auth.controller;
+package com.flab.modulemember.auth.controller;
 
-import com.flab.truck_matching.common.auth.service.AuthService;
-import com.flab.truck_matching.member.dto.MemberDTO;
+import com.flab.modulemember.auth.service.AuthService;
+import com.flab.modulemember.member.dto.MemberDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/com/flab/truck_matching/common/auth/service/AuthService.java → module-member/src/main/java/com/flab/modulemember/auth/service/AuthService.java

@@ -1,9 +1,9 @@
-package com.flab.truck_matching.common.auth.service;
+package com.flab.modulemember.auth.service;
 
-import com.flab.truck_matching.common.auth.JwtUtil;
-import com.flab.truck_matching.member.domain.Member;
-import com.flab.truck_matching.member.dto.MemberDTO;
-import com.flab.truck_matching.member.repository.MemberRepository;
+import com.flab.modulemember.auth.JwtUtil;
+import com.flab.modulemember.member.domain.Member;
+import com.flab.modulemember.member.dto.MemberDTO;
+import com.flab.modulemember.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;

src/main/java/com/flab/truck_matching/common/auth/service/CustomUserDetailService.java → module-member/src/main/java/com/flab/modulemember/auth/service/CustomUserDetailService.java

@@ -1,9 +1,9 @@
-package com.flab.truck_matching.common.auth.service;
+package com.flab.modulemember.auth.service;
 
-import com.flab.truck_matching.common.auth.CustomUserDetails;
-import com.flab.truck_matching.member.domain.Member;
-import com.flab.truck_matching.member.dto.MemberDTO;
-import com.flab.truck_matching.member.repository.MemberRepository;
+import com.flab.modulemember.auth.CustomUserDetails;
+import com.flab.modulemember.member.domain.Member;
+import com.flab.modulemember.member.dto.MemberDTO;
+import com.flab.modulemember.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/flab/truck_matching/member/controller/MemberApiController.java → module-member/src/main/java/com/flab/modulemember/member/controller/MemberApiController.java

@@ -1,7 +1,7 @@
-package com.flab.truck_matching.member.controller;
+package com.flab.modulemember.member.controller;
 
-import com.flab.truck_matching.member.dto.MemberDTO;
-import com.flab.truck_matching.member.service.MemberService;
+import com.flab.modulemember.member.dto.MemberDTO;
+import com.flab.modulemember.member.service.MemberService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/com/flab/truck_matching/member/domain/Member.java → module-member/src/main/java/com/flab/modulemember/member/domain/Member.java

@@ -1,6 +1,6 @@
-package com.flab.truck_matching.member.domain;
+package com.flab.modulemember.member.domain;
 
-import com.flab.truck_matching.member.dto.MemberDTO;
+import com.flab.modulemember.member.dto.MemberDTO;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;

src/main/java/com/flab/truck_matching/member/dto/MemberDTO.java → module-member/src/main/java/com/flab/modulemember/member/dto/MemberDTO.java

@@ -1,4 +1,4 @@
-package com.flab.truck_matching.member.dto;
+package com.flab.modulemember.member.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/flab/truck_matching/member/repository/MemberRepository.java → module-member/src/main/java/com/flab/modulemember/member/repository/MemberRepository.java

@@ -1,6 +1,7 @@
-package com.flab.truck_matching.member.repository;
+package com.flab.modulemember.member.repository;
 
-import com.flab.truck_matching.member.domain.Member;
+
+import com.flab.modulemember.member.domain.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MemberRepository extends JpaRepository<Member, String> {

src/main/java/com/flab/truck_matching/member/service/MemberService.java → module-member/src/main/java/com/flab/modulemember/member/service/MemberService.java

@@ -1,8 +1,8 @@
-package com.flab.truck_matching.member.service;
+package com.flab.modulemember.member.service;
 
-import com.flab.truck_matching.member.domain.Member;
-import com.flab.truck_matching.member.dto.MemberDTO;
-import com.flab.truck_matching.member.repository.MemberRepository;
+import com.flab.modulemember.member.domain.Member;
+import com.flab.modulemember.member.dto.MemberDTO;
+import com.flab.modulemember.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;

src/main/resources/application.properties → module-member/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.application.name=truck-matching
+spring.application.name=module-member
 
 # mysql
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -8,4 +8,4 @@ spring.datasource.password=123963
 
 #jwt
 jwt.expiration_time=86400000
-jwt.secret=VlwEyVBsYt9V7zq57TejMnVUyzblYcfPQye08f7MGVA9XkHa
+jwt.secret=VlwEyVBsYt9V7zq57TejMnVUyzblYcfPQye08f7MGVA9XkHa

module-member/src/test/java/com/flab/modulemember/ModuleMemberApplicationTests.java

@@ -0,0 +1,13 @@
+package com.flab.modulemember;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = ModuleMemberApplication.class)
+class ModuleMemberApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}