From 23e3c2309304cc34330022db57ba180e06eb0a34 Mon Sep 17 00:00:00 2001 From: JIUNG GU <60885635+JIUNG9@users.noreply.github.com> Date: Wed, 20 Dec 2023 14:45:29 +0900 Subject: [PATCH 1/4] chore: fix the yml setting --- .../flower/user/admin/dto/SettlementDto.java | 20 --------- .../lotte/flower/user/admin/dto/StoreDto.java | 21 --------- .../dto/response/SettlementResponse.java | 21 --------- .../controller/SystemAdminRestController.java | 43 ++++--------------- .../http/service/SystemManagementService.java | 11 +++++ .../lotte/flower/user/dto/StoreInfoDto.java | 24 ----------- .../flower/user/dto/StoreInfoResponse.java | 14 ------ src/main/resources/application-dev.yml | 4 ++ src/main/resources/application-local.yml | 24 ++--------- src/main/resources/application-prod.yml | 11 ++--- 10 files changed, 30 insertions(+), 163 deletions(-) delete mode 100644 src/main/java/com/bit/lotte/flower/user/admin/dto/SettlementDto.java delete mode 100644 src/main/java/com/bit/lotte/flower/user/admin/dto/StoreDto.java delete mode 100644 src/main/java/com/bit/lotte/flower/user/admin/dto/response/SettlementResponse.java create mode 100644 src/main/java/com/bit/lotte/flower/user/admin/http/service/SystemManagementService.java delete mode 100644 src/main/java/com/bit/lotte/flower/user/dto/StoreInfoDto.java delete mode 100644 src/main/java/com/bit/lotte/flower/user/dto/StoreInfoResponse.java diff --git a/src/main/java/com/bit/lotte/flower/user/admin/dto/SettlementDto.java b/src/main/java/com/bit/lotte/flower/user/admin/dto/SettlementDto.java deleted file mode 100644 index 292f181..0000000 --- a/src/main/java/com/bit/lotte/flower/user/admin/dto/SettlementDto.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.bit.lotte.flower.user.admin.dto; - -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -public class SettlementDto { - - private Long key; - private String storeName; - private Date settlementDate; - private Long settlementAmount; - private String bankName; - private String accountNumber; - -} diff --git a/src/main/java/com/bit/lotte/flower/user/admin/dto/StoreDto.java b/src/main/java/com/bit/lotte/flower/user/admin/dto/StoreDto.java deleted file mode 100644 index 7985c4f..0000000 --- a/src/main/java/com/bit/lotte/flower/user/admin/dto/StoreDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.bit.lotte.flower.user.admin.dto; - -import com.bit.lotte.flower.user.common.valueobject.StoreId; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -public class StoreDto { - private ID storeId; - private String storeCode; - private String storeName; - private String detailInfo; - private String storeThumbnailInfo; - private Float averageRating; - private String phoneNumber; - private String accountNumber; - private String bank; -} diff --git a/src/main/java/com/bit/lotte/flower/user/admin/dto/response/SettlementResponse.java b/src/main/java/com/bit/lotte/flower/user/admin/dto/response/SettlementResponse.java deleted file mode 100644 index 99373f9..0000000 --- a/src/main/java/com/bit/lotte/flower/user/admin/dto/response/SettlementResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.bit.lotte.flower.user.admin.dto.response; - -import com.bit.lotte.flower.user.admin.dto.SettlementDto; -import com.bit.lotte.flower.user.admin.dto.StoreDto; -import com.bit.lotte.flower.user.common.valueobject.StoreId; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -public class SettlementResponse { - - private Integer totalCnt; - private Integer year; - private Integer month; - private StoreDto store; - List settlementDtoList; -} diff --git a/src/main/java/com/bit/lotte/flower/user/admin/http/controller/SystemAdminRestController.java b/src/main/java/com/bit/lotte/flower/user/admin/http/controller/SystemAdminRestController.java index fbe5980..1bc3ad5 100644 --- a/src/main/java/com/bit/lotte/flower/user/admin/http/controller/SystemAdminRestController.java +++ b/src/main/java/com/bit/lotte/flower/user/admin/http/controller/SystemAdminRestController.java @@ -17,47 +17,20 @@ public class SystemAdminRestController { private final GetStoreManagerApplicationService getStoreManagerApplicationService; - private final GetUserApplicationByIdRequest request; + private final GetUserApplicationByIdRequest getUserApplicationByIdRequest; - @GetMapping("/admin/store-manager/applications") + + @GetMapping("/admin/store-managers/applications") public ResponseEntity getStoreManagerApplications( @RequestParam(defaultValue = "ROLE_STORE_MANAGER_PENDING") StoreManagerStatus status, - Pageable pageable) { - List storeUserListByStatus = request.request(status); - return ResponseEntity.ok(getStoreManagerApplicationService.getApplications(storeUserListByStatus, pageable)); + Pageable pageable) { + List storeUserListByStatus = getUserApplicationByIdRequest.request(status); + return ResponseEntity.ok( + getStoreManagerApplicationService.getApplications(storeUserListByStatus, pageable)); } -// -// @GetMapping("/admin/settlement") -// public CommonResponse> getSettlements( -// @RequestParam int year, -// @RequestParam int month, -// @RequestParam Long storeId, -// @RequestParam Pageable pageable) { -// -// } -// -// @GetMapping("/admin/stores") -// public CommonResponse getStoreInfo( -// @RequestParam String sido, -// @RequestParam String gugun, -// @RequestParam Pageable pageable) { -// -// } -// -// @GetMapping("/admin/store-managers/applications") -// public CommonResponse getStroeManagerApplications( -// @RequestParam StoreManagerStatus status, -// @RequestParam Pageable pageable) { -// -// } -// -// -// @GetMapping("/admin/sales") -// public CommonResponse getSalesTop10() { -// -// } + } diff --git a/src/main/java/com/bit/lotte/flower/user/admin/http/service/SystemManagementService.java b/src/main/java/com/bit/lotte/flower/user/admin/http/service/SystemManagementService.java new file mode 100644 index 0000000..a40df2e --- /dev/null +++ b/src/main/java/com/bit/lotte/flower/user/admin/http/service/SystemManagementService.java @@ -0,0 +1,11 @@ +package com.bit.lotte.flower.user.admin.http.service; + +import org.springframework.stereotype.Component; + +@Component +public class SystemManagementService { + + + + +} diff --git a/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoDto.java b/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoDto.java deleted file mode 100644 index 112cf0c..0000000 --- a/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.bit.lotte.flower.user.dto; - -import com.bit.lotte.flower.user.common.valueobject.StoreId; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -public class StoreInfoDto { - - private ID key; - private String storeCode; - private String storeName; - private String phoneNumber; - private String bank; - private String accountNumber; - private String averageRating; - private String totalAmount; - private Date regDate; - -} diff --git a/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoResponse.java b/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoResponse.java deleted file mode 100644 index 15bf85d..0000000 --- a/src/main/java/com/bit/lotte/flower/user/dto/StoreInfoResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.bit.lotte.flower.user.dto; - -import com.bit.lotte.flower.user.common.valueobject.StoreId; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@Getter -@NoArgsConstructor -public class StoreInfoResponse { - private Integer totalCnt; - private StoreInfoDto storeInfoDto; -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 49c4038..5719fcb 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,9 @@ server: port: 8600 spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher application: name: user-service config: @@ -15,3 +18,4 @@ management: include: - "refresh" - "bus-refresh" + - "health" diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0899e1a..bfbdaf2 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,8 +1,9 @@ - server: port: 8600 - spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher application: name: user-service config: @@ -10,17 +11,6 @@ spring: on-profile: local import: optional:configserver:http://localhost:8888 - datasource: - url: jdbc:mysql://localhost:3306/develop?serverTimezone=Asia/Seoul&useUnicode=true&characterEncoding=utf8 - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - - jpa: - hibernate: - ddl-auto: create - show-sql: true - management: endpoints: web: @@ -28,10 +18,4 @@ management: include: - "refresh" - "bus-refresh" -service: - store: - domain : http://localhost:8700 - likes: - domain : http://localhost:8500 - auth: - domain : http://localhost:9000 \ No newline at end of file + - "health" diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 566240e..057e4ea 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,9 @@ server: port: 8600 spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher application: name: user-service config: @@ -9,14 +12,6 @@ spring: import: optional:configserver:http://config-service:8888 -feign: - client: - config: - default: - connectTimeout: 5000 - readTimeout: 5000 - loggerLevel: basic - management: endpoints: web: From 3065310d5ce79f843fc753014e74a256596a3f55 Mon Sep 17 00:00:00 2001 From: JIUNG GU <60885635+JIUNG9@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:21:55 +0900 Subject: [PATCH 2/4] add: add the webConfig --- .../lotte/flower/user/common/WebConfig.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/com/bit/lotte/flower/user/common/WebConfig.java diff --git a/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java b/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java new file mode 100644 index 0000000..b28b812 --- /dev/null +++ b/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java @@ -0,0 +1,18 @@ +package com.bit.lotte.flower.user.common; + +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost:3000", "http://localhost:3001", "http://localhost:3002") + .allowedMethods("*") + .allowedHeaders("*") + .exposedHeaders("*") + .allowCredentials(true); + + } +} From 1ce27d1aecd662ba3177953cdd23600ad0a8d3db Mon Sep 17 00:00:00 2001 From: JIUNG GU <60885635+JIUNG9@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:22:40 +0900 Subject: [PATCH 3/4] fix: add the configuration annotation at webConfig --- src/main/java/com/bit/lotte/flower/user/common/WebConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java b/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java index b28b812..83480f6 100644 --- a/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java +++ b/src/main/java/com/bit/lotte/flower/user/common/WebConfig.java @@ -1,8 +1,10 @@ package com.bit.lotte.flower.user.common; +import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +@Configuration public class WebConfig implements WebMvcConfigurer { @Override From 6525483d556c3fce68a2f19690244998dab2210e Mon Sep 17 00:00:00 2001 From: JIUNG GU <60885635+JIUNG9@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:33:40 +0900 Subject: [PATCH 4/4] fix: fux the generated auto at socialUser Entity --- .../java/com/bit/lotte/flower/user/social/entity/SocialUser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bit/lotte/flower/user/social/entity/SocialUser.java b/src/main/java/com/bit/lotte/flower/user/social/entity/SocialUser.java index 466651d..03450f7 100644 --- a/src/main/java/com/bit/lotte/flower/user/social/entity/SocialUser.java +++ b/src/main/java/com/bit/lotte/flower/user/social/entity/SocialUser.java @@ -19,7 +19,6 @@ public class SocialUser { @Id - @GeneratedValue(strategy = GenerationType.AUTO) private Long id; private Long oauthId; private String email;