Skip to content

Commit

Permalink
[Merge] dev-client <- dev
Browse files Browse the repository at this point in the history
  • Loading branch information
yjy8501 committed Sep 19, 2023
2 parents 2bd927e + 6867204 commit 90d50cd
Show file tree
Hide file tree
Showing 132 changed files with 6,276 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

11 changes: 11 additions & 0 deletions .idea/aws.xml

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

17 changes: 17 additions & 0 deletions .idea/compiler.xml

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

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

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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

10 changes: 10 additions & 0 deletions .idea/misc.xml

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

10 changes: 10 additions & 0 deletions .idea/modules.xml

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

8 changes: 8 additions & 0 deletions .idea/modules/008main_project.main.iml

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

9 changes: 9 additions & 0 deletions .idea/modules/008main_project.test.iml

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

9 changes: 9 additions & 0 deletions .idea/seb45_main_008.iml

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

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

54 changes: 53 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,53 @@
READMD 파일
<img src="https://cdn.discordapp.com/attachments/1144140016281473055/1146001477249269851/2023-08-29_5.27.59.png">

## 45연대 8특임대

| 양재용 <br> (BE 팀장) | 이강욱 <br> (BE) | 이준석 <br> (BE) | 조현덕 <br> (BE) | 김병현 <br> (FE 부팀장) | 김영학 <br> (FE) | 신중원 <br> (FE) |
|----------------------------------------------------------------------------------------------------------------------------|-----------|--------------------------------------------|--------------------------------------------|----------------------------------------------|----------------------------------------------|---------------|
| [@yjy8501](https://github.com/yjy8501) | [@rkddnr05](https://github.com/rkddnr05) | [@IncheonLee](https://github.com/IncheonLee) | [@ChoHD](https://github.com/ChoHD) | [@sirloinbh](https://github.com/shimdokite) | [@novice1993](https://github.com/novice1993) |[@sinjw ](https://github.com/sinjw)|

### 배포 주소
http://seb008stockholm.s3-website.ap-northeast-2.amazonaws.com/

### Tools

[![stackticon](https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1695089957938?alt=media&token=b049edc2-83f9-4d29-b205-9f5f9b3492f1)](https://github.com/msdio/stackticon)

### 기술 스택

### BE

[![stackticon](https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1695133984245?alt=media&token=fef31d2b-813d-41ba-a173-eae6e8c6f19b)](https://github.com/msdio/stackticon)

### FE

[![stackticon](https://firebasestorage.googleapis.com/v0/b/stackticon-81399.appspot.com/o/images%2F1695134306560?alt=media&token=13e75353-3e07-4228-85a7-261c00e1b47f)](https://github.com/msdio/stackticon)

## API 명세서
http://ec2-13-125-246-160.ap-northeast-2.compute.amazonaws.com:8080/swagger-ui/index.html

## USER Flow
https://drive.google.com/file/d/1ej4sYQusG8g3uFPHRILq7Khd8m1evz4X/view?usp=sharing

## 화면 정의서
https://docs.google.com/presentation/d/1yyUBoyX8Yo7ZQxZXg2CFiZDh6W0j4_jSM8UTPLbnvy8/edit?usp=sharing

## 요구 사항 정의서
https://docs.google.com/spreadsheets/d/1SYxtZdxv-H4Cm4O124we4IPbjh4eNBDV/edit#gid=1436212772

## ERD
![화면 캡처 2023-09-20 000142](https://github.com/codestates-seb/seb45_main_008/assets/130031798/0d52cc8e-2eac-47a5-baec-1d19d98c9d08)


## Github Rule

### Commit Convention

| Message | 설명 |
| :--------: | :---------------------------------------------------- |
| `feat` | 새로운 기능 추가 |
| `fix` | 버그 수정 |
| `refactor` | 코드 리팩토링 |
| `style` | 코드 포맷팅, 세미콜론 누락, 코드 스타일 변경 등 |
| `remove` | 사용하지 않는 파일 또는 폴더 삭제 |
| `rename` | 파일 또는 폴더명 수정 |
26 changes: 26 additions & 0 deletions server/008main_project/.github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Java CI with Gradle

on:
pull_request:
branches: [ dev-server ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'zulu'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- name: Docker build
run: |
docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
docker buildx build --push --platform linux/amd64,linux/arm64 -t ${{ secrets.DOCKER_HUB_USERNAME }}/stockholm:${GITHUB_SHA::7} .
11 changes: 11 additions & 0 deletions server/008main_project/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# (1) base-image
FROM openjdk:11

# (2) COPY에서 사용될 경로 변수
ARG JAR_FILE=build/libs/*-SNAPSHOT.jar

# (3) jar 빌드 파일을 도커 컨테이너로 복사
COPY ${JAR_FILE} app.jar

# (4) jar 파일 실행
ENTRYPOINT ["java","-jar","/app.jar"]
Loading

0 comments on commit 90d50cd

Please sign in to comment.