Skip to content

Commit bc869fd

Browse files
committed
[Merge] Dev 브랜치 병합
2 parents da38707 + 0201ee1 commit bc869fd

111 files changed

Lines changed: 5538 additions & 3 deletions

File tree

Some content is hidden

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

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/gradlew text eol=lf
2+
*.bat text eol=crlf
3+
*.jar binary

.github/workflows/backend-cd.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name: Java CD with Gradle
99

1010
on:
1111
push:
12-
branches: [ "TESTCD" ]
12+
branches: [ "main" ]
1313
jobs:
1414
deploy:
1515
runs-on: ubuntu-latest
@@ -25,8 +25,9 @@ jobs:
2525
port: ${{ secrets.REMOTE_SSH_PORT }}
2626
script: |
2727
whoami
28+
sudo su
2829
cd /home/ec2-user/backend/
29-
git pull origin Dev
30+
git pull origin main
3031
chmod +x ./gradlew
3132
./gradlew build
32-
systemctl restart devpals
33+
sudo systemctl restart devpals

.gitignore

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
HELP.md
2+
.gradle
3+
build/
4+
!gradle/wrapper/gradle-wrapper.jar
5+
!**/src/main/**/build/
6+
!**/src/test/**/build/
7+
8+
### STS ###
9+
.apt_generated
10+
.classpath
11+
.factorypath
12+
.project
13+
.settings
14+
.springBeans
15+
.sts4-cache
16+
bin/
17+
!**/src/main/**/bin/
18+
!**/src/test/**/bin/
19+
20+
### IntelliJ IDEA ###
21+
.idea
22+
*.iws
23+
*.iml
24+
*.ipr
25+
out/
26+
!**/src/main/**/out/
27+
!**/src/test/**/out/
28+
29+
### NetBeans ###
30+
/nbproject/private/
31+
/nbbuild/
32+
/dist/
33+
/nbdist/
34+
/.nb-gradle/
35+
36+
### VS Code ###
37+
.vscode/
38+
39+
# Spring Boot 환경 설정 파일 제외
40+
application.properties
41+
src/main/resources/application.properties

build.gradle

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id 'java'
3+
id 'org.springframework.boot' version '3.4.2'
4+
id 'io.spring.dependency-management' version '1.1.7'
5+
}
6+
7+
group = 'hs.kr.backend'
8+
version = '0.0.1-SNAPSHOT'
9+
10+
java {
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(17)
13+
}
14+
}
15+
16+
repositories {
17+
mavenCentral()
18+
}
19+
20+
dependencies {
21+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // JPA
22+
implementation 'org.springframework.boot:spring-boot-starter-web'
23+
implementation 'mysql:mysql-connector-java:8.0.33' // MYSQL
24+
implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
25+
implementation 'org.glassfish:jakarta.el:4.0.2'
26+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
27+
implementation 'org.springframework.boot:spring-boot-starter-security' // Spring Security
28+
implementation platform('io.awspring.cloud:spring-cloud-aws-dependencies:3.1.1') // Aws S3
29+
implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3' // Aws S3
30+
compileOnly 'org.projectlombok:lombok' // lombok
31+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '3.4.3'// Mail
32+
developmentOnly 'org.springframework.boot:spring-boot-devtools'
33+
annotationProcessor 'org.projectlombok:lombok'
34+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
35+
// JWT
36+
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
37+
implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
38+
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
39+
}
40+
41+
tasks.named('test') {
42+
useJUnitPlatform()
43+
}

gradle/wrapper/gradle-wrapper.jar

42.6 KB
Binary file not shown.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

gradlew

Lines changed: 252 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)