Skip to content

Commit

Permalink
chore: 서버 도메인 이전 (#414)
Browse files Browse the repository at this point in the history
* chore: today -> site 변경

* fix: 차윤범 git id 변경

* fix: on PR docker compose

* fix: build-deploy yml docker compose
  • Loading branch information
char-yb authored Dec 5, 2024
1 parent 5dc5415 commit 5747f90
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @kdomo @uwoobeat @uiurihappy
* @kdomo @uwoobeat @char-yb
2 changes: 1 addition & 1 deletion .github/workflows/develop_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/develop_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/production_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
</br></br>

# 🖥️ Tech
Expand Down Expand Up @@ -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) |
| [김동호](https://github.com/kdomo) | [안재현](https://github.com/uwoobeat) | [차윤범](https://github.com/char-yb) |
2 changes: 1 addition & 1 deletion nginx/default.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
server {
listen 80;
server_name 10mm.today;
server_name 10mm.site;

location / {
proxy_pass http://localhost:8080/;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
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,
@Schema(description = "미션 기록 ID", defaultValue = "1") Long recordId,
@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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 5747f90

Please sign in to comment.