diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7b8cde7d1..32da5442f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @kdomo @uwoobeat @uiurihappy +* @kdomo @uwoobeat @char-yb diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 43a5b66b4..07368e2d5 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -31,7 +31,7 @@ jobs: # test 돌릴때 레디스 필요 - name: Start containers - run: docker-compose -f ./docker-compose-test.yaml up -d + run: docker compose -f ./docker-compose-test.yaml up -d # Gradlew 실행 허용 - name: Run chmod to make gradlew executable diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 4ae9b7e58..32f005de1 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -20,7 +20,7 @@ jobs: distribution: 'adopt' - name: Start containers # test 돌릴때 레디스 필요 - run: docker-compose -f ./docker-compose-test.yaml up -d + run: docker compose -f ./docker-compose-test.yaml up -d - name: Grant execute permission for gradlew run: chmod +x ./gradlew diff --git a/.github/workflows/production_build_deploy.yml b/.github/workflows/production_build_deploy.yml index d3556302a..75de420b7 100644 --- a/.github/workflows/production_build_deploy.yml +++ b/.github/workflows/production_build_deploy.yml @@ -32,7 +32,7 @@ jobs: # test 돌릴때 레디스 필요 - name: Start containers - run: docker-compose -f ./docker-compose-test.yaml up -d + run: docker compose -f ./docker-compose-test.yaml up -d # Gradlew 실행 허용 - name: Run chmod to make gradlew executable diff --git a/README.md b/README.md index 6c8feabf0..a1ef3cba0 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ ## 📝 직접 사용해보기 - [iOS](https://apps.apple.com/kr/app/10%EB%B6%84%EB%A7%8C-10mm-10%EB%B6%84%EC%9C%BC%EB%A1%9C-%EC%8B%9C%EC%9E%91%ED%95%98%EB%8A%94-%EC%8A%B5%EA%B4%80-%ED%98%95%EC%84%B1/id6475635740) - [AOS](https://play.google.com/store/apps/details?id=com.tenminuteapp) -- [WEB](https://10mm.today/) +- [WEB](https://10mm.site/)

# 🖥️ Tech @@ -77,4 +77,4 @@ ## 🧑🏻‍💻 Developers | ![](https://avatars.githubusercontent.com/u/64088250?v=4) | ![](https://avatars.githubusercontent.com/u/91878695?v=4) |![](https://avatars.githubusercontent.com/u/68099546?v=4) | | :--: | :--: | :--: | -| [김동호](https://github.com/kdomo) | [안재현](https://github.com/uwoobeat) | [차윤범](https://github.com/uiurihappy) | \ No newline at end of file +| [김동호](https://github.com/kdomo) | [안재현](https://github.com/uwoobeat) | [차윤범](https://github.com/char-yb) | diff --git a/nginx/default.conf b/nginx/default.conf index bb26ad398..f84b4642f 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name 10mm.today; + server_name 10mm.site; location / { proxy_pass http://localhost:8080/; diff --git a/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneByProfileResponse.java b/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneByProfileResponse.java index 30fc443fa..04e7590bd 100644 --- a/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneByProfileResponse.java +++ b/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneByProfileResponse.java @@ -12,7 +12,7 @@ public record FeedOneByProfileResponse( @Schema(description = "미션 이름", defaultValue = "default name") String name, @Schema( description = "미션 기록 인증 사진 Url", - defaultValue = "https://image.10mm.today/default.png") + defaultValue = "https://image.10mm.site/default.png") String recordImageUrl, @Schema(description = "미션 수행한 시간", defaultValue = "21") long duration, @Schema(description = "미션 시작한 지 N일차", defaultValue = "3") long sinceDay, diff --git a/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneResponse.java b/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneResponse.java index 14824114f..ac25f467a 100644 --- a/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneResponse.java +++ b/src/main/java/com/depromeet/domain/feed/dto/response/FeedOneResponse.java @@ -19,7 +19,7 @@ public record FeedOneResponse( @Schema(description = "작성자 ID", defaultValue = "1") Long memberId, @Schema(description = "작성자 닉네임", defaultValue = "default name") String nickname, - @Schema(description = "작성자 프로필 이미지", defaultValue = "https://image.10mm.today/default.png") + @Schema(description = "작성자 프로필 이미지", defaultValue = "https://image.10mm.site/default.png") String profileImage, @Schema(description = "미션 ID", defaultValue = "1") Long missionId, @Schema(description = "미션 이름", defaultValue = "default name") String name, @@ -27,7 +27,7 @@ public record FeedOneResponse( @Schema(description = "미션 일지 내용", defaultValue = "default remark") String remark, @Schema( description = "미션 기록 인증 사진 Url", - defaultValue = "https://image.10mm.today/default.png") + defaultValue = "https://image.10mm.site/default.png") String recordImageUrl, @Schema(description = "미션 수행 시간 (분 단위)", defaultValue = "21") long duration, @Schema(description = "미션 시작한 지 N일차", defaultValue = "3") long sinceDay, diff --git a/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindOneResponse.java b/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindOneResponse.java index f9b114169..3cc661c90 100644 --- a/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindOneResponse.java +++ b/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindOneResponse.java @@ -12,7 +12,7 @@ public record MissionRecordFindOneResponse( String remark, @Schema( description = "미션 기록 인증 사진 Url", - defaultValue = "https://image.10mm.today/default.png") + defaultValue = "https://image.10mm.site/default.png") String imageUrl, @Schema(description = "미션 수행한 시간", defaultValue = "21") long duration, @Schema(description = "미션 시작한 지 N일차", defaultValue = "3") long sinceDay, diff --git a/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindResponse.java b/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindResponse.java index 1fdefc3dd..af17eabbf 100644 --- a/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindResponse.java +++ b/src/main/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordFindResponse.java @@ -11,7 +11,7 @@ public record MissionRecordFindResponse( String remark, @Schema( description = "미션 기록 인증 사진 Url", - defaultValue = "https://image.10mm.today/default.png") + defaultValue = "https://image.10mm.site/default.png") String imageUrl, @Schema(description = "미션 시작 일자", defaultValue = "3") int missionDay, @JsonFormat( diff --git a/src/main/java/com/depromeet/global/common/constants/UrlConstants.java b/src/main/java/com/depromeet/global/common/constants/UrlConstants.java index eefb6fb6d..70186b140 100644 --- a/src/main/java/com/depromeet/global/common/constants/UrlConstants.java +++ b/src/main/java/com/depromeet/global/common/constants/UrlConstants.java @@ -6,18 +6,18 @@ @Getter @AllArgsConstructor public enum UrlConstants { - PROD_SERVER_URL("https://api.10mm.today"), - DEV_SERVER_URL("https://dev-api.10mm.today"), + PROD_SERVER_URL("https://api.10mm.site"), + DEV_SERVER_URL("https://dev-api.10mm.site"), LOCAL_SERVER_URL("http://localhost:8080"), - PROD_DOMAIN_URL("https://www.10mm.today"), - DEV_DOMAIN_URL("https://www.dev.10mm.today"), + PROD_DOMAIN_URL("https://www.10mm.site"), + DEV_DOMAIN_URL("https://www.dev.10mm.site"), LOCAL_DOMAIN_URL("http://localhost:3000"), LOCAL_SECURE_DOMAIN_URL("https://localhost:3000"), NGROK_DOMAIN_URL("https://*.ngrok-free.app"), - IMAGE_DOMAIN_URL("https://image.10mm.today"), + IMAGE_DOMAIN_URL("https://image.10mm.site"), ; private String value; diff --git a/src/test/java/com/depromeet/domain/missionRecord/application/MissionRecordServiceTest.java b/src/test/java/com/depromeet/domain/missionRecord/application/MissionRecordServiceTest.java index 611676c81..981af4324 100644 --- a/src/test/java/com/depromeet/domain/missionRecord/application/MissionRecordServiceTest.java +++ b/src/test/java/com/depromeet/domain/missionRecord/application/MissionRecordServiceTest.java @@ -127,7 +127,7 @@ void setUp() { void 미션별_상세_통계_조회한다() { // given long durationMinute = 17; - String defaultImage = "https://image.10mm.today/default.png"; + String defaultImage = "https://image.10mm.site/default.png"; LocalDateTime recordStartedAt = LocalDateTime.of(2024, 1, 25, 22, 58, 53); LocalDateTime recordFinishedAt = recordStartedAt.plusMinutes(durationMinute);