Merge remote-tracking branch 'origin/master'

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformGoodsClient.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(value = "4dkankan-center-platform", contextId = "platformGoodsClient")
+@FeignClient(value = "4dkankan-center-platform",contextId = "platformGoodsClient")
 @RequestMapping("/platform/feign/goods")
 public interface PlatformGoodsClient {
 
@@ -39,19 +39,4 @@ public interface PlatformGoodsClient {
      */
     @PostMapping("/getCameraBySnCode")
     ResultData<Camera> getCameraBySnCode(@RequestParam(value = "snCode", required = false) String snCode);
-
-    /**
-     *
-     * @return Camera
-     */
-    @PostMapping("/getByChildNameAndChildPassword")
-    ResultData<Camera> getByChildNameAndChildPassword(@RequestParam(value = "appUserName") String appUserName,
-                                                       @RequestParam(value = "appPassword") String appPassword);
-
-    /**
-     *
-     * @return Camera
-     */
-    @PostMapping("/getCameraById")
-    ResultData<Camera> getCameraById(@RequestParam(value = "cameraId") Long cameraId);
 }

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformOrderClient.java

@@ -3,7 +3,7 @@ package com.fdkankan.platform.api.feign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(value = "4dkankan-center-platform", contextId = "platformOrderClient")
+@FeignClient(value = "4dkankan-center-platform",contextId = "platformOrderClient")
 @RequestMapping("/platform/feign/order")
 public interface PlatformOrderClient {
 }

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformUserClient.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(value = "4dkankan-center-platform", contextId = "platformUserClient")
+@FeignClient(value = "4dkankan-center-platform",contextId = "platformUserClient")
 @RequestMapping("/platform/feign/user")
 public interface PlatformUserClient {
     /**

4dkankan-center-platform/src/main/resources/bootstrap.yml

@@ -1,6 +1,4 @@
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: 4dkankan-center-platform
   cloud: