diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Store.java b/src/main/java/com/readyvery/readyverydemo/domain/Store.java index c39786e..8b5aa10 100644 --- a/src/main/java/com/readyvery/readyverydemo/domain/Store.java +++ b/src/main/java/com/readyvery/readyverydemo/domain/Store.java @@ -63,6 +63,10 @@ public class Store extends BaseTimeEntity { @Column private String engName; + // 가게 이벤트 메세지 + @Column + private String eventMessage; + //가게 등급 @Column @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/readyvery/readyverydemo/src/board/dto/BoardMapper.java b/src/main/java/com/readyvery/readyverydemo/src/board/dto/BoardMapper.java index 60cca00..9519131 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/board/dto/BoardMapper.java +++ b/src/main/java/com/readyvery/readyverydemo/src/board/dto/BoardMapper.java @@ -44,6 +44,8 @@ private StoreDto toSearchStoreDto(Store store) { .findFirst() .map(storeImg -> IMG_URL + store.getEngName() + "/" + storeImg.getImgUrl()) .orElse(null)) + .eventMessage(store.getEventMessage()) + .status(store.isStatus()) .build(); } @@ -57,6 +59,8 @@ private StoreDto toStoreDto(Store store) { .findFirst() .map(storeImg -> IMG_URL + store.getEngName() + "/" + storeImg.getImgUrl()) .orElse(null)) + .eventMessage(store.getEventMessage()) + .status(store.isStatus()) .build(); } } diff --git a/src/main/java/com/readyvery/readyverydemo/src/board/dto/StoreDto.java b/src/main/java/com/readyvery/readyverydemo/src/board/dto/StoreDto.java index 5be5dd2..fae8c24 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/board/dto/StoreDto.java +++ b/src/main/java/com/readyvery/readyverydemo/src/board/dto/StoreDto.java @@ -10,4 +10,6 @@ public class StoreDto { private String name; private String address; private String imgUrl; + private String eventMessage; + private boolean status; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bd2b58a..881d405 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,9 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/readyvery -#spring.datasource.url=jdbc:mysql://test.readyvery.com:33306/readyvery -spring.datasource.username=root -#spring.datasource.username=ready -spring.datasource.password=12345678 -#spring.datasource.password=readyverytestuser23! +#spring.datasource.url=jdbc:mysql://localhost:3306/readyvery +spring.datasource.url=jdbc:mysql://test.readyvery.com:33306/readyvery +#spring.datasource.username=root +spring.datasource.username=ready +#spring.datasource.password=12345678 +spring.datasource.password=readyverytestuser23! spring.jpa.hibernate.ddl-auto=update spring.jpa.generate-ddl=true spring.jpa.show-sql=true @@ -14,7 +14,7 @@ jwt.access.expiration=86400 jwt.access.cookie=accessToken jwt.refresh.expiration=604800 jwt.refresh.cookie=refreshToken -jwt.redirect-uri=http://localhost:3000/login +jwt.redirect-uri=http://localhost:3000/ jwt.access.cookie.domain=localhost jwt.refresh.cookie.domain=localhost # Kakao