Merge pull request #11 from lotteon2/dev-user-admin

Dev user admin

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<StoreManagerApplicationFormResponse> getStoreManagerApplications(
       @RequestParam(defaultValue = "ROLE_STORE_MANAGER_PENDING") StoreManagerStatus status,
-       Pageable pageable) {
-    List<Long> storeUserListByStatus = request.request(status);
-    return ResponseEntity.ok(getStoreManagerApplicationService.getApplications(storeUserListByStatus, pageable));
+      Pageable pageable) {
+    List<Long> storeUserListByStatus = getUserApplicationByIdRequest.request(status);
+    return ResponseEntity.ok(
+        getStoreManagerApplicationService.getApplications(storeUserListByStatus, pageable));
 
   }
 
-//
-//  @GetMapping("/admin/settlement")
-//  public CommonResponse<SettlementResponse<StoreId>> getSettlements(
-//      @RequestParam int year,
-//      @RequestParam int month,
-//      @RequestParam Long storeId,
-//      @RequestParam Pageable pageable) {
-//
-//  }
-//
-//  @GetMapping("/admin/stores")
-//  public CommonResponse<StoreInfoResponse> getStoreInfo(
-//      @RequestParam String sido,
-//      @RequestParam String gugun,
-//      @RequestParam Pageable pageable) {
-//
-//  }
-//
-//  @GetMapping("/admin/store-managers/applications")
-//  public CommonResponse<StoreInfoResponse> getStroeManagerApplications(
-//      @RequestParam StoreManagerStatus status,
-//      @RequestParam Pageable pageable) {
-//
-//  }
-//
-//
-//    @GetMapping("/admin/sales")
-//  public CommonResponse<StoreInfoResponse> getSalesTop10() {
-//
-//  }
+
 
 
 }

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 {
+
+
+
+
+}

src/main/java/com/bit/lotte/flower/user/common/WebConfig.java

@@ -0,0 +1,20 @@
+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
+  public void addCorsMappings(CorsRegistry registry) {
+    registry.addMapping("/**")
+        .allowedOrigins("http://localhost:3000", "http://localhost:3001", "http://localhost:3002")
+        .allowedMethods("*")
+        .allowedHeaders("*")
+        .exposedHeaders("*")
+        .allowCredentials(true);
+
+  }
+}

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;

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"

src/main/resources/application-local.yml

@@ -1,37 +1,21 @@
-
 server:
   port: 8600
-
 spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   application:
     name: user-service
   config:
     activate:
       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:
       exposure:
         include:
           - "refresh"
           - "bus-refresh"
-service:
-  store:
-    domain : http://localhost:8700
-  likes:
-    domain : http://localhost:8500
-  auth:
-    domain : http://localhost:9000
+          - "health"

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: