Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ env:

jobs:
build-with-gradle:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: JDK 17 설정
uses: actions/setup-java@v4
- name: JDK 21 설정
uses: actions/setup-java@v5
with:
java-version: '17'
java-version: '21'
distribution: 'corretto'

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

- name: 도커 이미지 빌드 및 푸시
run: |
docker build -t ayeonii/leets-be:latest .
docker push ayeonii/leets-be:latest
docker build -t leetsland/leets-be:latest .
docker push leetsland/leets-be:latest

deploy-dev:
needs: build-with-gradle
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: PR Test

on:
pull_request:
branches: [ "main", "develop", "master" ]
branches: [ "main", "develop" ]

permissions:
contents: read
Expand All @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: '17'
java-version: '21'
distribution: 'corretto'

- name: Setup Gradle
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM amazoncorretto:21

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

Expand Down
58 changes: 14 additions & 44 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,23 @@
# [Leets](https://leets.land)
# [Leets](https://leets.land) : 함께 도전하며 우리의 가치를 증명하는 곳

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

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

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

<br>

# Environment
```
# Cors 관련 환경변수
CORS_ORIGIN_DEVELOPMENT=
CORS_ORIGIN_PRODUCTION=
# Database 관련 환경변수
DATABASE_PASSWORD=
DATABASE_URL=
DATABASE_USERNAME=
# Oauth2 관련 환경변수
GOOGLE_AUTH_URL=
GOOGLE_ID=
GOOGLE_LOGIN_URL=
GOOGLE_PASSWORD=
GOOGLE_REDIRECT_URL=
# Jwt 관련 환경변수
JWT_ACCESS_SECRET=
JWT_REFRESH_SECRET=
# 메일 관련 환경변수
MAIL_HOST=
MAIL_USERNAME=
# Url 관련 환경변수
TARGET_URL_DEV=
TARGET_URL_PROD=
```

<img src="https://img.shields.io/badge/SpringBoot-4.0.0-6DB33F?style=for-the-badge&logo=springboot&logoColor=white">
<img src="https://img.shields.io/badge/Kotlin-JDK%2021-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white">
<img src="https://img.shields.io/badge/MySQL-4479A1?style=for-the-badge&logo=mysql&logoColor=white">
<img src="https://img.shields.io/badge/AWS%20EC2-FF9900?style=for-the-badge&logo=amazon-aws&logoColor=white">
<img src="https://img.shields.io/badge/GitHub%20Actions-2088FF?style=for-the-badge&logo=github-actions&logoColor=white">

</div>
<br>

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

- [Leets 공식 홈페이지 프론트엔드](https://github.com/Leets-Official/Leets-FE)
31 changes: 7 additions & 24 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id("java")
id("org.springframework.boot") version "4.0.0"
id("io.spring.dependency-management") version "1.1.6"
id("org.jetbrains.kotlin.jvm") version "2.2.0"
Expand All @@ -10,17 +9,6 @@ plugins {
group = "land"
version = "0.0.1-SNAPSHOT"

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

configurations {
compileOnly {
extendsFrom(configurations.annotationProcessor.get())
}
}

repositories {
mavenCentral()
}
Expand All @@ -35,9 +23,6 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

runtimeOnly("com.mysql:mysql-connector-j")

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

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

implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")

testImplementation("com.squareup.okhttp3:mockwebserver:5.3.2")
testImplementation("com.h2database:h2")

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

tasks.withType<JavaCompile>().configureEach {
options.generatedSourceOutputDirectory.set(
layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main")
)
}

tasks.withType<AbstractTestTask>().configureEach {
failOnNoDiscoveredTests = false
}

kotlin {
compilerOptions {
freeCompilerArgs.addAll("-Xjsr305=strict")
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
freeCompilerArgs.set(listOf("-Xannotation-default-target=param-property"))
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
freeCompilerArgs.addAll(
"-Xjsr305=strict",
"-Xannotation-default-target=param-property"
)
}
}
25 changes: 0 additions & 25 deletions src/main/java/land/leets/domain/auth/AdminAuthDetailsService.java

This file was deleted.

70 changes: 0 additions & 70 deletions src/main/java/land/leets/domain/auth/AuthDetails.java

This file was deleted.

101 changes: 0 additions & 101 deletions src/main/java/land/leets/domain/auth/AuthService.java

This file was deleted.

Loading