Skip to content

Commit 5aa8867

Browse files
authored
Merge pull request #54 from GTable/fix/#44-multi-module-refactor
Fix: multi module 구조 변경
2 parents b9bb8cb + 2615a2b commit 5aa8867

241 files changed

Lines changed: 648 additions & 2248 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.

.github/workflows/deploy-admin.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ on:
55
branches:
66
- develop
77
paths:
8-
- 'application-admin/**'
9-
- 'application-config/**'
10-
- 'common/**'
11-
- 'domain-*/**'
12-
- 'security-admin/**'
13-
- 'infra-aws/**'
14-
- 'build.gradle'
15-
- 'settings.gradle'
16-
- 'gradle/**'
8+
- 'nowait-app-admin-api/**'
9+
- 'nowait-common/**'
10+
- 'nowait-domain/domain-core-rdb/**'
11+
- 'nowait-domain/domain-admin-rdb/**'
12+
- 'nowait-infra/**'
13+
- 'build.gradle'
14+
- 'settings.gradle'
15+
- 'gradle/**'
1716

1817
env:
1918
PROJECT_NAME: NoWait
@@ -41,22 +40,22 @@ jobs:
4140

4241
- name: Set YML
4342
run: |
44-
mkdir -p application-admin/src/main/resources
43+
mkdir -p nowait-app-admin-api/src/main/resources
4544
echo "${{ secrets.APPLICATION_DEV_ADMIN_YML }}" \
4645
| base64 --decode \
47-
> application-admin/src/main/resources/application-admin.yml
48-
find application-admin/src
46+
> nowait-app-admin-api/src/main/resources/application-admin.yml
47+
find nowait-app-admin-api/src
4948
5049
- name: Build Admin JAR
51-
run: ./gradlew clean :application-admin:bootJar -x test
50+
run: ./gradlew clean :nowait-app-admin-api:bootJar -x test
5251

5352
- name: Prepare deployment package
5453
run: |
5554
rm -rf deploy
5655
mkdir -p deploy/scripts
5756
cp scripts/start-admin.sh scripts/stop-admin.sh deploy/scripts/
5857
cp appspec-admin.yml deploy/appspec.yml
59-
cp application-admin/build/libs/application-admin-*.jar deploy/application-admin.jar
58+
cp nowait-app-admin-api/build/libs/nowait-app-admin-api-*.jar deploy/nowait-app-admin-api.jar
6059
cd deploy
6160
zip -r ../NoWait-admin-${GITHUB_SHA}.zip .
6261
cd ..

.github/workflows/deploy-user.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ on:
55
branches:
66
- develop
77
paths:
8-
- 'application-user/**'
9-
- 'application-config/**'
10-
- 'common/**'
11-
- 'domain-*/**'
12-
- 'security-front/**'
13-
- 'external-oauth/**'
14-
- 'build.gradle'
15-
- 'settings.gradle'
16-
- 'gradle/**'
8+
- 'nowait-app-user-api/**'
9+
- 'nowait-common/**'
10+
- 'nowait-domain/domain-core-rdb/**'
11+
- 'nowait-domain/domain-user-rdb/**'
12+
- 'nowait-infra/**'
13+
- 'build.gradle'
14+
- 'settings.gradle'
15+
- 'gradle/**'
1716

1817
env:
1918
PROJECT_NAME: NoWait
@@ -41,22 +40,22 @@ jobs:
4140

4241
- name: Set YML
4342
run: |
44-
mkdir -p application-user/src/main/resources
43+
mkdir -p nowait-app-user-api/src/main/resources
4544
echo "${{ secrets.APPLICATION_DEV_USER_YML }}" \
4645
| base64 --decode \
47-
> application-user/src/main/resources/application-user.yml
48-
find application-user/src
46+
> nowait-app-user-api/src/main/resources/nowait-app-user-api.yml
47+
find nowait-app-user-api/src
4948
5049
- name: Build User JAR
51-
run: ./gradlew clean :application-user:bootJar -x test
50+
run: ./gradlew clean :nowait-app-user-api:bootJar -x test
5251

5352
- name: Prepare deployment package
5453
run: |
5554
rm -rf deploy
5655
mkdir -p deploy/scripts
5756
cp scripts/start-user.sh scripts/stop-user.sh deploy/scripts/
5857
cp appspec-user.yml deploy/appspec.yml
59-
cp application-user/build/libs/application-user-*.jar deploy/application-user.jar
58+
cp nowait-app-user-api/build/libs/nowait-app-user-api-*.jar deploy/nowait-app-user-api.jar
6059
cd deploy
6160
zip -r ../NoWait-user-${GITHUB_SHA}.zip .
6261
cd ..

application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

application-admin/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

application-admin/src/main/java/com/nowait/applicationadmin/order/dto/OrderStatusUpdateRequestDto.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

application-admin/src/main/java/com/nowait/applicationadmin/order/dto/OrderStatusUpdateResponseDto.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

application-admin/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

application-config/build.gradle

Lines changed: 0 additions & 16 deletions
This file was deleted.

application-config/src/main/java/com/example/applicationconfig/config/AsyncConfig.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

application-config/src/main/java/com/example/applicationconfig/config/CorsConfig.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)