Skip to content

Commit 47fccad

Browse files
authored
Merge pull request #84 from Leets-Official/refactor/#83
refactor: 인증/공통 도메인 마이그레이션 및 Kotlin 마이그레이션 최종 마무리
2 parents e83d912 + 2f39d22 commit 47fccad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+465
-632
lines changed

.github/workflows/ci-cd.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ env:
1212

1313
jobs:
1414
build-with-gradle:
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

20-
- name: JDK 17 설정
21-
uses: actions/setup-java@v4
20+
- name: JDK 21 설정
21+
uses: actions/setup-java@v5
2222
with:
23-
java-version: '17'
23+
java-version: '21'
2424
distribution: 'corretto'
2525

2626
- name: applications.yml 환경변수 설정
@@ -42,8 +42,8 @@ jobs:
4242

4343
- name: 도커 이미지 빌드 및 푸시
4444
run: |
45-
docker build -t ayeonii/leets-be:latest .
46-
docker push ayeonii/leets-be:latest
45+
docker build -t leetsland/leets-be:latest .
46+
docker push leetsland/leets-be:latest
4747
4848
deploy-dev:
4949
needs: build-with-gradle

.github/workflows/pr-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: PR Test
22

33
on:
44
pull_request:
5-
branches: [ "main", "develop", "master" ]
5+
branches: [ "main", "develop" ]
66

77
permissions:
88
contents: read
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v6
1616

17-
- name: Set up JDK 17
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@v5
1919
with:
20-
java-version: '17'
20+
java-version: '21'
2121
distribution: 'corretto'
2222

2323
- name: Setup Gradle

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:17-jre
1+
FROM amazoncorretto:21
22

33
ARG JAR_FILE=./build/libs/leets-0.0.1-SNAPSHOT.jar
44

README.md

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,23 @@
1-
# [Leets](https://leets.land)
1+
# [Leets](https://leets.land) : 함께 도전하며 우리의 가치를 증명하는 곳
22

3-
- 가천대학교 IT 학술 동아리 `Leets`의 활동과 모집을 위한 홈페이지 레포지토리입니다.
4-
- Elite에서 파생된 단어 Leet은 엘리트의 의미를 담고 있습니다.
5-
- `Leets`는 여러 엘리트가 모인 공동체입니다.
3+
<div align="center">
4+
<img width="2580" height="1200" alt="Frame 19" src="https://github.com/user-attachments/assets/c33c8c32-b706-4623-a5e3-2fbd3d61de11" />
65

7-
<br>
6+
가천대학교 IT 창업 동아리 **Leets**의 활동과 모집을 위한 랜딩 레포지토리입니다.<br/>
87

9-
# 기술스택
10-
+ 프레임워크 : SpringBoot 3.0.9
11-
+ 언어 : Java 17
12-
+ 데이터베이스 : MySQL
13-
+ 인프라 : AWS EC2
14-
+ CI/CD: GitHub Actions
8+
Leets는 가천대학교 내에서 IT 서비스에 관심을 가진 이들의 첫 도전이 되고, 세상을 넓게 바라볼 수 있는 시야를 만들어주는 동아리가 되고자 합니다.
159

1610
<br>
1711

18-
# Environment
19-
```
20-
# Cors 관련 환경변수
21-
CORS_ORIGIN_DEVELOPMENT=
22-
CORS_ORIGIN_PRODUCTION=
23-
24-
# Database 관련 환경변수
25-
DATABASE_PASSWORD=
26-
DATABASE_URL=
27-
DATABASE_USERNAME=
28-
29-
# Oauth2 관련 환경변수
30-
GOOGLE_AUTH_URL=
31-
GOOGLE_ID=
32-
GOOGLE_LOGIN_URL=
33-
GOOGLE_PASSWORD=
34-
GOOGLE_REDIRECT_URL=
35-
36-
# Jwt 관련 환경변수
37-
JWT_ACCESS_SECRET=
38-
JWT_REFRESH_SECRET=
39-
40-
# 메일 관련 환경변수
41-
MAIL_HOST=
42-
MAIL_USERNAME=
43-
44-
# Url 관련 환경변수
45-
TARGET_URL_DEV=
46-
TARGET_URL_PROD=
47-
```
48-
12+
<img src="https://img.shields.io/badge/SpringBoot-4.0.0-6DB33F?style=for-the-badge&logo=springboot&logoColor=white">
13+
<img src="https://img.shields.io/badge/Kotlin-JDK%2021-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white">
14+
<img src="https://img.shields.io/badge/MySQL-4479A1?style=for-the-badge&logo=mysql&logoColor=white">
15+
<img src="https://img.shields.io/badge/AWS%20EC2-FF9900?style=for-the-badge&logo=amazon-aws&logoColor=white">
16+
<img src="https://img.shields.io/badge/GitHub%20Actions-2088FF?style=for-the-badge&logo=github-actions&logoColor=white">
4917

18+
</div>
5019
<br>
5120

52-
# 관련 Repository
53-
[Leets 공식 홈페이지 프론트엔드](https://github.com/Leets-Official/Leets-FE)
21+
## 🔗 관련 Repository
22+
23+
- [Leets 공식 홈페이지 프론트엔드](https://github.com/Leets-Official/Leets-FE)

build.gradle.kts

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id("java")
32
id("org.springframework.boot") version "4.0.0"
43
id("io.spring.dependency-management") version "1.1.6"
54
id("org.jetbrains.kotlin.jvm") version "2.2.0"
@@ -10,17 +9,6 @@ plugins {
109
group = "land"
1110
version = "0.0.1-SNAPSHOT"
1211

13-
java {
14-
sourceCompatibility = JavaVersion.VERSION_17
15-
targetCompatibility = JavaVersion.VERSION_17
16-
}
17-
18-
configurations {
19-
compileOnly {
20-
extendsFrom(configurations.annotationProcessor.get())
21-
}
22-
}
23-
2412
repositories {
2513
mavenCentral()
2614
}
@@ -35,9 +23,6 @@ dependencies {
3523
implementation("org.jetbrains.kotlin:kotlin-reflect")
3624
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
3725

38-
compileOnly("org.projectlombok:lombok")
39-
annotationProcessor("org.projectlombok:lombok")
40-
4126
runtimeOnly("com.mysql:mysql-connector-j")
4227

4328
testImplementation("org.springframework.boot:spring-boot-starter-test")
@@ -52,6 +37,8 @@ dependencies {
5237

5338
implementation("com.google.api-client:google-api-client:2.8.1")
5439

40+
implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
41+
5542
testImplementation("com.squareup.okhttp3:mockwebserver:5.3.2")
5643
testImplementation("com.h2database:h2")
5744

@@ -65,20 +52,16 @@ tasks.named<Test>("test") {
6552
useJUnitPlatform()
6653
}
6754

68-
tasks.withType<JavaCompile>().configureEach {
69-
options.generatedSourceOutputDirectory.set(
70-
layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main")
71-
)
72-
}
73-
7455
tasks.withType<AbstractTestTask>().configureEach {
7556
failOnNoDiscoveredTests = false
7657
}
7758

7859
kotlin {
7960
compilerOptions {
80-
freeCompilerArgs.addAll("-Xjsr305=strict")
81-
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
82-
freeCompilerArgs.set(listOf("-Xannotation-default-target=param-property"))
61+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
62+
freeCompilerArgs.addAll(
63+
"-Xjsr305=strict",
64+
"-Xannotation-default-target=param-property"
65+
)
8366
}
8467
}

src/main/java/land/leets/domain/auth/AdminAuthDetailsService.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/java/land/leets/domain/auth/AuthDetails.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/java/land/leets/domain/auth/AuthService.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)