Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
749c115
Merge pull request #128 from Leedong-uk/main
Leedong-uk Jul 29, 2025
96730a8
refactor: ํŒŒ์ผ์ˆ˜์ •
bikdh1109 Jul 30, 2025
eb1ea2e
Merge remote-tracking branch 'upstream/develop' into feature/probability
bikdh1109 Jul 30, 2025
0a6da51
Merge pull request #130 from PJT-16-3/donguk
Leedong-uk Jul 30, 2025
aafe682
Feature : GaScoreController Swagger ์ž‘์„ฑ (#121)
Leedong-uk Jul 30, 2025
a9e184c
Feature : AuthController Swagger ์ž‘์„ฑ (#118)
Leedong-uk Jul 30, 2025
fce831a
๋น„๋ฐ€๋ฒˆํ˜ธ ์ดˆ๊ธฐํ™” ๊ธฐ๋Šฅ
Leedong-uk Jul 30, 2025
f369160
Feature : AuthController Swagger ์ž‘์„ฑ ๋ฐ ํšŒ์›ํƒˆํ‡ด ์•ฝ๊ฐ„ ์ˆ˜์ • (#118)
Leedong-uk Jul 30, 2025
f527eed
Feature : Subscription Swagger ์ž‘์„ฑ ๋ฐ ํšŒ์›ํƒˆํ‡ด ์•ฝ๊ฐ„ ์ˆ˜์ • (#125)
Leedong-uk Jul 30, 2025
b764d54
Feature : AuthController Swagger ์ž‘์„ฑ (#118)
Leedong-uk Jul 30, 2025
ab18e68
Feature : AuthController Swagger ์ž‘์„ฑ (#118)
Leedong-uk Jul 30, 2025
40e3b52
Feature : dd
Leedong-uk Jul 30, 2025
f81c9e3
Merge pull request #132 from Leedong-uk/main
Leedong-uk Jul 30, 2025
97576a2
feat: ์นด์นด์˜ค์ง€๋„ ์ธํ”„๋ผ ์ •๋ณด ๋ฐ›์•„์˜ค๊ธฐ(#117)
bikdh1109 Jul 30, 2025
1f53bdf
Merge remote-tracking branch 'upstream/develop' into feature/probability
bikdh1109 Jul 30, 2025
ed7707c
Merge pull request #9 from bikdh1109/feature/probability
bikdh1109 Jul 30, 2025
101b71e
Merge pull request #133 from bikdh1109/main
bikdh1109 Jul 30, 2025
806dbd4
Feature : AuthController Swagger ์ž‘์„ฑ (#118)
Leedong-uk Jul 30, 2025
fed1a8b
Feature : UserSelectedController Swagger ์ž‘์„ฑ (#118)
Leedong-uk Jul 30, 2025
dfe8d0b
Refactor : Kako๋กœ๊ทธ์ธ ์ˆ˜์ •
Leedong-uk Jul 30, 2025
bfa15ec
Feature : KakaoLoginControllerController Swagger ์ž‘์„ฑ (#123)
Leedong-uk Jul 30, 2025
c3d1f47
Refactor : ์ฆ๊ฒจ์ฐพ๊ธฐ ์ถ”๊ฐ€ ๊ธฐ๋Šฅ (#123)
Leedong-uk Jul 30, 2025
459b44e
Refactor : ์ฆ๊ฒจ์ฐพ๊ธฐ ์‚ญ์ œ ๊ธฐ๋Šฅ (#123)
Leedong-uk Jul 30, 2025
60c084e
Refactor : ์ฆ๊ฒจ์ฐพ๊ธฐ ์˜ˆ์™ธ์ฒ˜๋ฆฌ(#123)
Leedong-uk Jul 30, 2025
f767b06
Refactor : ์ฆ๊ฒจ์ฐพ๊ธฐ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ(#123)
Leedong-uk Jul 30, 2025
b99fbcd
Feature : UserFavoriteController Swagger ์ž‘์„ฑ (#126)
Leedong-uk Jul 30, 2025
1c1af2e
Feature : Swagger ์™„์„ฑ
Leedong-uk Jul 30, 2025
17363bf
Fix : HouseList ๊ณ ์นจ
Leedong-uk Jul 31, 2025
da287b0
Feature : HouseList is_favorite ์ถ”๊ฐ€
Leedong-uk Jul 31, 2025
22a31cd
feat: ์ฒญ์•ฝ ๋‹จ์ง€ ์ฃผ๋ณ€ ์ธํ”„๋ผ ์ •๋ณด ์ €์žฅ(#117)
bikdh1109 Jul 31, 2025
6f482ba
Merge remote-tracking branch 'upstream/develop' into feature/probability
bikdh1109 Jul 31, 2025
dba3b4c
Merge pull request #10 from bikdh1109/feature/probability
bikdh1109 Jul 31, 2025
296dded
Merge pull request #136 from bikdh1109/main
bikdh1109 Jul 31, 2025
552b327
refactor: ํŒŒ์ผ ์ˆ˜์ •
bikdh1109 Jul 31, 2025
c3a54da
Merge branch 'main' of https://github.com/bikdh1109/zibi_BE
bikdh1109 Jul 31, 2025
6b1fc1f
Feature : ์•„ํŒŒํŠธ view_count ์ถ”๊ฐ€ (#137)
Leedong-uk Jul 31, 2025
cdb3d5f
feat: ๊ณ„์ขŒ ์—ฐ๊ฒฐ ํ•ด์ œ ๋ฐ DB ์‚ญ์ œ ๊ธฐ๋Šฅ(#135)
bikdh1109 Jul 31, 2025
c724234
Merge pull request #11 from bikdh1109/feature/deleteAccount
bikdh1109 Jul 31, 2025
0d949a9
Merge pull request #138 from bikdh1109/main
bikdh1109 Jul 31, 2025
4bdb869
Feature : ์ธํ”„๋ผ ์ •๋ณด ๋‹ค ๋ฐ›์•„์˜ค๊ธฐ (#137)
Leedong-uk Jul 31, 2025
68dc492
Feature : ์ธํ”„๋ผ ์ •๋ณด ๋‹ค ๋ฐ›์•„์˜ค๊ธฐ (#137)
Leedong-uk Jul 31, 2025
42e7bf4
refactor: ์˜ˆ์™ธ์ฒ˜๋ฆฌ ์ถ”๊ฐ€
bikdh1109 Jul 31, 2025
3764298
Feature : Officetel ์ธํ”„๋ผ ์ •๋ณด ๋‹ค ๋ฐ›์•„์˜ค๊ธฐ (#137)
Leedong-uk Jul 31, 2025
7487ec3
Merge pull request #139 from PJT-16-3/dohyeonKim
bikdh1109 Jul 31, 2025
b9828ca
๋จธ์ง€์ค‘
Leedong-uk Jul 31, 2025
dac77a4
Feature : Officetel ViewCount ํ•˜๊ธฐ (#137)
Leedong-uk Jul 31, 2025
4cb31ec
Feature : ์ฆ๊ฒจ์ฐพ๊ธฐ ์ „์ œ ์กฐํšŒ ํ•˜๊ธฐ
Leedong-uk Jul 31, 2025
91b8c09
Feature : ์†๋„๊ฐœ์„ 
Leedong-uk Jul 31, 2025
3d2040c
Feature : ์˜คํ”ผ์Šคํ…” ์ฆ์ฐพ์ˆ˜ ๋ณด๋‚ด์ฃผ๊ธฐ ๊ตฌํ˜„
Leedong-uk Jul 31, 2025
7d81e85
refactor: ์˜ˆ์™ธ์ฒ˜๋ฆฌ ๊ธฐ๋Šฅ ์ถ”๊ฐ€
bikdh1109 Aug 1, 2025
f68735e
Merge pull request #12 from bikdh1109/feature/deleteAccount
bikdh1109 Aug 1, 2025
e58773d
Merge remote-tracking branch 'upstream/develop' into feature/filtering
bikdh1109 Aug 1, 2025
8d01051
Merge pull request #141 from Leedong-uk/main
Leedong-uk Aug 1, 2025
594152a
feat: ๊ฐ€์  ์ •๋ณด GET ์š”์ฒญ ๊ธฐ๋Šฅ ๊ตฌํ˜„
bikdh1109 Aug 1, 2025
571d9e5
Merge pull request #13 from bikdh1109/feature/filtering
bikdh1109 Aug 1, 2025
59fc739
Merge pull request #143 from bikdh1109/main
bikdh1109 Aug 1, 2025
eff425d
Merge branch 'develop' into dohyeonKim
bikdh1109 Aug 1, 2025
f25154e
Merge pull request #144 from PJT-16-3/dohyeonKim
bikdh1109 Aug 1, 2025
5729a96
refactor: ์‚ฌ์šฉ์ž ์„ค๋ฌธ ์‘๋‹ต ์–‘์‹ ๋ณ€๊ฒฝ(#145)
bikdh1109 Aug 1, 2025
0218d7e
Merge remote-tracking branch 'upstream/develop' into refactor/gascore
bikdh1109 Aug 1, 2025
658d95d
refactor: ์‚ฌ์šฉ์ž ์„ค๋ฌธ ์‘๋‹ต ์–‘์‹ ๋ณ€๊ฒฝ(#145)
bikdh1109 Aug 1, 2025
5af1cf0
Merge pull request #14 from bikdh1109/refactor/gascore
bikdh1109 Aug 1, 2025
949ff72
Merge pull request #147 from bikdh1109/main
bikdh1109 Aug 1, 2025
106d511
Merge pull request #148 from PJT-16-3/dohyeonKim
bikdh1109 Aug 1, 2025
fcbb4b9
feature: ๋ฌด์ฃผํƒ ๊ธฐ๊ฐ„ ์‚ฐ์ • ๋ฐฉ์‹ ๋ณ€๊ฒฝ(#149)
bikdh1109 Aug 1, 2025
85152cd
Merge pull request #15 from bikdh1109/feature/calculatePeriod
bikdh1109 Aug 1, 2025
8c06b5a
Merge pull request #150 from bikdh1109/main
bikdh1109 Aug 1, 2025
31153f9
Merge pull request #151 from PJT-16-3/dohyeonKim
bikdh1109 Aug 1, 2025
de5fb74
Bug : ๋งํ–ˆ๋‹ค TestCode์— delete test ๋ฌธ ์‹คํ–‰๋˜์„œ db ๋‹ค ๋‚ ๋ผ๊ฐ”๋‹ค
Leedong-uk Aug 2, 2025
3d032ec
ํ•„์š”์—†๋Š”๊ฑฐ ์ œ๊ฑฐ
Leedong-uk Aug 2, 2025
f128001
Feature: CI/CD ๊ตฌํ˜„์ค‘
Leedong-uk Aug 3, 2025
b0d3a21
fix: regenerate gradle wrapper with correct format
Leedong-uk Aug 3, 2025
b39dccf
Test: CI/CD ๊ตฌํ˜„์ค‘ (Test)
Leedong-uk Aug 3, 2025
776d88b
Test: ์ œ๋ฐœ ์ œ๋ฐœ... ์ œ๋ฐœ ์„ฑ๊ณตํ•ด๋ผ
Leedong-uk Aug 3, 2025
e09402c
test
Leedong-uk Aug 4, 2025
a4de6ae
Test
Leedong-uk Aug 4, 2025
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
84 changes: 84 additions & 0 deletions .github/workflows/CI-CD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: CI-CD.yml
on:
pull_request:
branches: ["donguk"]
types:
- closed

jobs:
build:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: ๐Ÿ“ข ๊นƒํ—ˆ๋ธŒ checkout
uses: actions/checkout@v3

- name: ๐Ÿ“ข GitHubAction JDK 17 ์„ค์น˜
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: ๐Ÿ“ข Gradle ์‹คํ–‰ ๊ถŒํ•œ ๋ถ€์—ฌ!
run: chmod +x gradlew

- name: ๐Ÿ“ข Gradle ์บ์‹ฑ
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: ๐Ÿ“ข GitIgnore ํŒŒ์ผ๋“ค ๋„ฃ์–ด์ฃผ๊ธฐ
env:
APPLICATION_PROPERTIES: ${{ secrets.APPLICATION_PROPERTIES}}
EMAIL_PROPERTIES: ${{secrets.EMAIL_PROPERTIES}}
run: |
rm -f src/main/resources/application.properties
rm -f src/main/resources/email.properties
echo "${{ secrets.APPLICATION_PROPERTIES }}" > src/main/resources/application.properties
echo "${{ secrets.EMAIL_PROPERTIES }}" > src/main/resources/email.properties

- name: ๐Ÿ“ข Gradle ๋นŒ๋“œ(war ๋งŒ๋“ค๊ธฐ)
run: ./gradlew clean build

- name: ๐Ÿ“ข Docker image ๋งŒ๋“ค๊ธฐ
run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zibi-backserver .

- name: ๐Ÿ“ข DockerHub์— ๋กœ๊ทธ์ธ
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME}}
password: ${{ secrets.DOCKERHUB_PASSWORD}}

- name: ๐Ÿ“ข DockerHub์— PUSH
run: docker push ${{ secrets.DOCKERHUB_USERNAME}}/zibi-backserver

deploy:
runs-on: ubuntu-latest
needs: build
if: github.event.pull_request.merged == true
steps:
- name: ๐Ÿ“ขSSH๋กœ EC2์— ์ ‘์†ํ•ด๋ณด์ž
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.EC2_HOST}}
username: ${{ secrets.EC2_USERNAME}}
key: ${{ secrets.EC2_PRIVATE_KEY}}
script: |
echo "โœ… EC2 ์—ฐ๊ฒฐ ์„ฑ๊ณต!"
echo "โœ… Docker๋ฅผ ์‹คํ–‰ ์‹œํ‚ค๊ธฐ ์œ„ํ•ด compose.yml ํŒŒ์ผ๋กœ ๊ณ ๊ณ ๋ "
cd ~/zibi

echo "โœ… DockerHub ์—์„œ ์ด๋ฏธ์ง€ ๊ฐ€์ ธ์˜ค๊ธฐ(pull)"
docker pull ${{ secrets.DOCKERHUB_USERNAME }}/zibi-backserver

echo "โœ… ์ด์ œ DockeCompose ๋Œ๋ฆฌ์ž!!"
docker compose down
docker compose up -d

echo "โœ… PortForwarding์„ 8080์œผ๋กœ ํ–ˆ์œผ๋‹ˆ๊น Public IP์˜ 8080ํฌํŠธ๋กœ ๊ฐ€์ž "
echo "โœ… ํฌํŠธ ๋ฒˆํ˜ธ ์ ๊ธฐ ์‹ซ์œผ๋ฉด composeํŒŒ์ผ์—์„œ 80->8080 ์œผ๋กœ ํฌํŠธํฌ์›Œ๋”ฉ ํ•˜๋ฉด ๋จ!!"

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion .idea/dataSources.local.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM tomcat:9.0.107-jdk17-temurin

COPY build/libs/*SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war

EXPOSE 8080

5 changes: 5 additions & 0 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
my-docker-server:
build: .
ports:
- "8080:8080"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading