Skip to content

Commit

Permalink
#267 [feat] 모놀리식으로 복구
Browse files Browse the repository at this point in the history
  • Loading branch information
KWY0218 committed Jul 3, 2024
1 parent 344f1fb commit 5b2d61a
Show file tree
Hide file tree
Showing 149 changed files with 90 additions and 648 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/dev-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ jobs:
- name: Build with Gradle # 실제 application build 테스트 제외
run: ./gradlew build -x test

# 디렉토리 생성
- name: Make Directory
run: mkdir -p deploy
# Jar 파일 복사
- name: Copy Jar
run: cp ./build/libs/*.jar ./deploy
# appspec.yml 파일 복사
- name: Copy appspec.yml
run: cp appspec.yml ./deploy

# script files 복사
- name: Copy script
run: cp ./scripts/*.sh ./deploy
- name: Make zip file
run: zip -r ./asap_dev_server.zip ./deploy
shell: bash
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2
- name: Upload to S3
run: aws s3 cp --region ap-northeast-2 ./asap_dev_server.zip s3://$S3_BUCKET_NAME/
# # 디렉토리 생성
# - name: Make Directory
# run: mkdir -p deploy
#
# # Jar 파일 복사
# - name: Copy Jar
# run: cp ./build/libs/*.jar ./deploy
#
# # appspec.yml 파일 복사
# - name: Copy appspec.yml
# run: cp appspec.yml ./deploy
#
# # script files 복사
# - name: Copy script
# run: cp ./scripts/*.sh ./deploy
#
# - name: Make zip file
# run: zip -r ./asap_dev_server.zip ./deploy
# shell: bash
#
# - name: Configure AWS credentials
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
# aws-region: ap-northeast-2
#
# - name: Upload to S3
# run: aws s3 cp --region ap-northeast-2 ./asap_dev_server.zip s3://$S3_BUCKET_NAME/

# # Deploy
# - name: Deploy
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ jobs:
- name: make application.properties 파일 생성
run: |
## create application.yml
rm -r ./asap-java/src/main/resources
mkdir ./asap-java/src/main/resources
cd ./asap-java/src/main/resources
rm -r ./src/main/resources
mkdir ./src/main/resources
cd ./src/main/resources
# application.yml 파일 생성
touch ./application.yml
Expand All @@ -72,4 +72,4 @@ jobs:
done
- name: Build with Gradle # 실제 application build
run: ./gradlew :asap-java:build
run: ./gradlew clean build
28 changes: 14 additions & 14 deletions .github/workflows/prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
runs-on: ubuntu-latest

steps:

# 1) 워크플로우 실행 전 기본적으로 체크아웃 필요
- name: checkout
uses: actions/checkout@v3

# 2) JDK 11버전 설치, 다른 JDK 버전을 사용하다면 수정
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

# 3) 환경변수 파일 생성
- name: make application.properties 파일 생성
run: |
Expand All @@ -44,44 +44,44 @@ jobs:
# application.yml 파일 확인
cat ./application.yml
shell: bash

# 이 워크플로우는 gradle build
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle # 실제 application build(-x 옵션을 통해 test는 제외)
run: ./gradlew build -x test

# 디렉토리 생성
- name: Make Directory
run: mkdir -p deploy

# Jar 파일 복사
- name: Copy Jar
run: cp ./build/libs/*.jar ./deploy

# appspec.yml 파일 복사
- name: Copy appspec.yml
run: cp appspec.yml ./deploy

# script files 복사
- name: Copy script
run: cp ./scripts/*.sh ./deploy

- name: Make zip file
run: zip -r ./asap_server.zip ./deploy
shell: bash

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Upload to S3
run: aws s3 cp --region ap-northeast-2 ./asap_server.zip s3://$S3_BUCKET_NAME/

# Deploy
- name: Deploy
env:
Expand All @@ -90,7 +90,7 @@ jobs:
run:
aws deploy create-deployment
--application-name asap-prod-code-deploy
--deployment-group-name asap-prod-server
--deployment-group-name asap-prod-code-deploy-group
--file-exists-behavior OVERWRITE
--s3-location bucket=asap-server,bundleType=zip,key=asap_server.zip
--s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=asap_server.zip
--region ap-northeast-2
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ output/
# either the 3rd party diff or IDEA:
*.java.orig

/src/main/resources/application.yml

# Package Files
**/build/libs/*.jar
*.war
Expand All @@ -36,4 +38,4 @@ output/
*.log-*.gz
logs/

asap-java/src/main/resources/application.yml
/src/main/resources/application.yml
23 changes: 14 additions & 9 deletions asap-java/build.gradle → build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.1.2'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
}

group = 'com.asap'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '17'
}
Expand All @@ -8,8 +17,11 @@ configurations {
}
}

repositories {
mavenCentral()
}

dependencies {
implementation project(':presentation')
implementation "org.redisson:redisson:3.29.0"

// QueryDSL Implementation
Expand All @@ -24,6 +36,7 @@ dependencies {
implementation 'org.springframework.security:spring-security-crypto:5.7.9'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'

// VALIDATION
implementation 'org.springframework.boot:spring-boot-starter-validation'
Expand Down Expand Up @@ -51,11 +64,3 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
}

jar {
enabled = false
}

bootJar {
enabled = true
}
45 changes: 0 additions & 45 deletions build.gradle.kts

This file was deleted.

3 changes: 0 additions & 3 deletions common/build.gradle.kts

This file was deleted.

62 changes: 0 additions & 62 deletions common/src/main/java/com/asap/server/exception/Error.kt

This file was deleted.

26 changes: 0 additions & 26 deletions common/src/main/java/com/asap/server/exception/Success.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5b2d61a

Please sign in to comment.