屏蔽feignclient

pom.xml

@@ -14,8 +14,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
-		<!--<version>1.5.7.RELEASE</version>-->
+		<!--<version>1.3.5.RELEASE</version>-->
+		<version>1.5.7.RELEASE</version>
 		<!--1.5.7会报feign错误-->
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

src/main/java/cn/efunbox/audio/AudioApplication.java

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
-@EnableDiscoveryClient
-@EnableFeignClients
+//@EnableDiscoveryClient
+//@EnableFeignClients
 public class AudioApplication {
 
 	public static void main(String[] args) {

src/main/java/cn/efunbox/audio/clients/UserFeign.java

@@ -1,41 +1,41 @@
-package cn.efunbox.audio.clients;
-
-import cn.efunbox.audio.utils.ApiResult;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Created by yao on 17-10-25.
- */
-//@FeignClient(value = "IAAS-USER", fallback = UserFeignHystrix.class)
-@FeignClient(value = "iaas-user")
-public interface UserFeign {
-
-    @RequestMapping(value = "/v1/users", method = RequestMethod.POST)
-    public String Register(
-//            @RequestHeader(value = "Content-Type",required = false) String contentType,
-            @RequestHeader(value = "bizCode",required = false) String bizCode,
-            @RequestHeader(value = "requestId",required = false) String requestId,
-            @RequestHeader(value = "appCode",required = false) String appCode,
-            @RequestHeader(value = "platform",required = false) String platform,
-            @RequestHeader(value = "os",required = false) String os,
-            @RequestHeader(value = "dist",required = false) String dist,
-            @RequestHeader(value = "userIp",required = false) String userIp,
-            @RequestHeader(value = "appVer",required = false) String appVer,
-            @RequestHeader(value = "terminal",required = false) String terminal,
-            @RequestParam(value = "entry") String entry,
-            @RequestParam(value = "entryType") String entryType,
-            @RequestParam(value = "passwd") String passwd,
-            @RequestParam(value = "avatar") String avatar,
-            @RequestParam(value = "nickname") String nickname);
-
-    @RequestMapping(value = "/v1/users/{uid}", method = RequestMethod.GET)
-    public String getUser(@PathVariable(value = "uid")  String uid);
-
-}
+//package cn.efunbox.audio.clients;
+//
+//import cn.efunbox.audio.utils.ApiResult;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.cloud.netflix.feign.FeignClient;
+//import org.springframework.http.MediaType;
+//import org.springframework.stereotype.Service;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.Map;
+//import java.util.UUID;
+//
+///**
+// * Created by yao on 17-10-25.
+// */
+////@FeignClient(value = "IAAS-USER", fallback = UserFeignHystrix.class)
+//@FeignClient(value = "iaas-user")
+//public interface UserFeign {
+//
+//    @RequestMapping(value = "/v1/users", method = RequestMethod.POST)
+//    public String Register(
+////            @RequestHeader(value = "Content-Type",required = false) String contentType,
+//            @RequestHeader(value = "bizCode",required = false) String bizCode,
+//            @RequestHeader(value = "requestId",required = false) String requestId,
+//            @RequestHeader(value = "appCode",required = false) String appCode,
+//            @RequestHeader(value = "platform",required = false) String platform,
+//            @RequestHeader(value = "os",required = false) String os,
+//            @RequestHeader(value = "dist",required = false) String dist,
+//            @RequestHeader(value = "userIp",required = false) String userIp,
+//            @RequestHeader(value = "appVer",required = false) String appVer,
+//            @RequestHeader(value = "terminal",required = false) String terminal,
+//            @RequestParam(value = "entry") String entry,
+//            @RequestParam(value = "entryType") String entryType,
+//            @RequestParam(value = "passwd") String passwd,
+//            @RequestParam(value = "avatar") String avatar,
+//            @RequestParam(value = "nickname") String nickname);
+//
+//    @RequestMapping(value = "/v1/users/{uid}", method = RequestMethod.GET)
+//    public String getUser(@PathVariable(value = "uid")  String uid);
+//
+//}

src/main/java/cn/efunbox/audio/clients/UserFeignHystrix.java

@@ -1,37 +1,37 @@
-package cn.efunbox.audio.clients;
-
-import cn.efunbox.audio.utils.ApiResult;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@Component
-public class UserFeignHystrix implements UserFeign {
-
-    @Override
-    public String Register(
-//            @RequestHeader(value = "Content-Type") String contentType,
-            @RequestHeader(value = "bizCode") String bizCode,
-            @RequestHeader(value = "requestId") String requestId,
-            @RequestHeader(value = "appCode") String appCode,
-            @RequestHeader(value = "platform") String platform,
-            @RequestHeader(value = "os") String os,
-            @RequestHeader(value = "dist") String dist,
-            @RequestHeader(value = "userIp") String userIp,
-            @RequestHeader(value = "appVer") String appVer,
-            @RequestHeader(value = "terminal") String terminal,
-            @RequestParam(value = "entry") String entry,
-            @RequestParam(value = "entryType") String entryType,
-            @RequestParam(value = "passwd") String passwd,
-            @RequestParam(value = "avatar") String avatar,
-            @RequestParam(value = "nickname") String nickname) {
-
-        return "error";
-    }
-
-    public String getUser(@PathVariable(value = "uid")  String uid){
-        return "error";
-    }
-
-}
+//package cn.efunbox.audio.clients;
+//
+//import cn.efunbox.audio.utils.ApiResult;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.PathVariable;
+//import org.springframework.web.bind.annotation.RequestHeader;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//@Component
+//public class UserFeignHystrix implements UserFeign {
+//
+//    @Override
+//    public String Register(
+////            @RequestHeader(value = "Content-Type") String contentType,
+//            @RequestHeader(value = "bizCode") String bizCode,
+//            @RequestHeader(value = "requestId") String requestId,
+//            @RequestHeader(value = "appCode") String appCode,
+//            @RequestHeader(value = "platform") String platform,
+//            @RequestHeader(value = "os") String os,
+//            @RequestHeader(value = "dist") String dist,
+//            @RequestHeader(value = "userIp") String userIp,
+//            @RequestHeader(value = "appVer") String appVer,
+//            @RequestHeader(value = "terminal") String terminal,
+//            @RequestParam(value = "entry") String entry,
+//            @RequestParam(value = "entryType") String entryType,
+//            @RequestParam(value = "passwd") String passwd,
+//            @RequestParam(value = "avatar") String avatar,
+//            @RequestParam(value = "nickname") String nickname) {
+//
+//        return "error";
+//    }
+//
+//    public String getUser(@PathVariable(value = "uid")  String uid){
+//        return "error";
+//    }
+//
+//}

src/main/java/cn/efunbox/audio/controller/DeviceController.java

@@ -1,6 +1,6 @@
 package cn.efunbox.audio.controller;
 
-import cn.efunbox.audio.clients.UserFeign;
+//import cn.efunbox.audio.clients.UserFeign;
 import cn.efunbox.audio.clients.UserHttp;
 import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
@@ -35,8 +35,8 @@ public class DeviceController {
     @Autowired
     ChannelService channelService;
 
-    @Autowired
-    UserFeign userFeign;
+//    @Autowired
+//    UserFeign userFeign;
     @Autowired
     UserHttp userHttp;
 

src/test/java/cn/efunbox/audio/AudioApplicationTests.java

@@ -1,6 +1,5 @@
 package cn.efunbox.audio;
 
-import cn.efunbox.audio.clients.UserFeign;
 import cn.efunbox.audio.clients.UserHttp;
 import cn.efunbox.audio.entity.Device;
 import cn.efunbox.audio.plugin.AliStsOssAuth;
@@ -10,6 +9,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -18,7 +18,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import java.util.UUID;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-//@SpringBootTest	//1.5.7才支持
+@SpringBootTest    //1.5.7才支持
 public class AudioApplicationTests {
 
 	@Autowired