整理client调用代码
diff --git a/samples/client/pom.xml b/samples/client/pom.xml
index 5bc48d9..a8f4003 100644
--- a/samples/client/pom.xml
+++ b/samples/client/pom.xml
@@ -101,6 +101,12 @@
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+
+
<!-- Test things -->
<dependency>
<groupId>org.testng</groupId>
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/controller/web/admin/WebAdminUserController.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/controller/web/admin/WebAdminUserController.java
index d3a3fb0..b19e712 100644
--- a/samples/client/src/main/java/com/supwisdom/leaveschool/client/controller/web/admin/WebAdminUserController.java
+++ b/samples/client/src/main/java/com/supwisdom/leaveschool/client/controller/web/admin/WebAdminUserController.java
@@ -1,14 +1,14 @@
package com.supwisdom.leaveschool.client.controller.web.admin;
-import java.util.Map;
+import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import com.supwisdom.leaveschool.client.service.UserRemoteService;
+import com.supwisdom.leaveschool.client.service.SampleUser1AdminUserRemoteService;
import com.supwisdom.leaveschool.client.util.AuthenticationUtil;
@Controller
@@ -18,19 +18,25 @@
private static final Logger logger = LoggerFactory.getLogger(WebAdminUserController.class);
@Autowired
- UserRemoteService userRemoteService;
+ SampleUser1AdminUserRemoteService sampleUser1AdminUserRemoteService;
@RequestMapping("/index")
public String userIndex() {
logger.debug(AuthenticationUtil.currentUsername());
+ Object object = sampleUser1AdminUserRemoteService.list();
+
+ logger.debug("list is {}, {}", object==null?"":object.getClass().getName(), object);
+
+ /*
Map<String, Object> map = userRemoteService.greeting("abcd");
if (map != null) {
logger.debug("message is " + map.get("message"));
} else {
logger.debug("message is null");
}
+ */
return "web/admin/user/index";
}
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/UserRemoteService.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/DemoUserRemoteService.java
similarity index 73%
rename from samples/client/src/main/java/com/supwisdom/leaveschool/client/service/UserRemoteService.java
rename to samples/client/src/main/java/com/supwisdom/leaveschool/client/service/DemoUserRemoteService.java
index 5a64da2..ff16ff2 100644
--- a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/UserRemoteService.java
+++ b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/DemoUserRemoteService.java
@@ -8,14 +8,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import com.supwisdom.leaveschool.client.service.fallback.UserRemoteHystrix;
+import com.supwisdom.leaveschool.client.service.fallback.DemoUserRemoteHystrix;
@FeignClient(
name = "sample-user",
- url = "${gateway.api.url}/sample-user/admin/users",
- fallback = UserRemoteHystrix.class
+ url = "${gateway.api.url}/sample-user/api/demo/users",
+ fallback = DemoUserRemoteHystrix.class
)
-public interface UserRemoteService {
+public interface DemoUserRemoteService {
@RequestMapping(method = RequestMethod.GET, value = "/greeting/{name}", produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
Map<String, Object> greeting(@PathVariable("name") String name);
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/SampleUser1AdminUserRemoteService.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/SampleUser1AdminUserRemoteService.java
new file mode 100644
index 0000000..86962a3
--- /dev/null
+++ b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/SampleUser1AdminUserRemoteService.java
@@ -0,0 +1,22 @@
+package com.supwisdom.leaveschool.client.service;
+
+import org.json.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.util.MimeTypeUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.supwisdom.leaveschool.client.service.fallback.SampleUser1AdminUserRemoteHystrix;
+
+@FeignClient(
+ name = "sample-user-1-admin-user",
+ url = "${gateway.api.url}/sample-user/api/v1/admin/users",
+ fallback = SampleUser1AdminUserRemoteHystrix.class
+)
+public interface SampleUser1AdminUserRemoteService {
+
+ @RequestMapping(method = RequestMethod.GET, produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+ public Object list();
+
+}
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/DemoUserRemoteHystrix.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/DemoUserRemoteHystrix.java
new file mode 100644
index 0000000..00dd73d
--- /dev/null
+++ b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/DemoUserRemoteHystrix.java
@@ -0,0 +1,22 @@
+package com.supwisdom.leaveschool.client.service.fallback;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.supwisdom.leaveschool.client.service.DemoUserRemoteService;
+
+@Component
+public class DemoUserRemoteHystrix implements DemoUserRemoteService {
+
+ private static final Logger logger = LoggerFactory.getLogger(DemoUserRemoteHystrix.class);
+
+ @Override
+ public Map<String, Object> greeting(String name) {
+ logger.debug("greeting failure!");
+ return null;
+ }
+
+}
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/SampleUser1AdminUserRemoteHystrix.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/SampleUser1AdminUserRemoteHystrix.java
new file mode 100644
index 0000000..fbc86bf
--- /dev/null
+++ b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/SampleUser1AdminUserRemoteHystrix.java
@@ -0,0 +1,20 @@
+package com.supwisdom.leaveschool.client.service.fallback;
+
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.supwisdom.leaveschool.client.service.SampleUser1AdminUserRemoteService;
+
+@Component
+public class SampleUser1AdminUserRemoteHystrix implements SampleUser1AdminUserRemoteService {
+
+ private static final Logger logger = LoggerFactory.getLogger(SampleUser1AdminUserRemoteHystrix.class);
+
+ @Override
+ public Object list() {
+ return null;
+ }
+
+}
diff --git a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/UserRemoteHystrix.java b/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/UserRemoteHystrix.java
deleted file mode 100644
index 7a2846c..0000000
--- a/samples/client/src/main/java/com/supwisdom/leaveschool/client/service/fallback/UserRemoteHystrix.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.supwisdom.leaveschool.client.service.fallback;
-
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import com.supwisdom.leaveschool.client.service.UserRemoteService;
-
-@Component
-public class UserRemoteHystrix implements UserRemoteService {
-
- private static final Logger logger = LoggerFactory.getLogger(UserRemoteHystrix.class);
-
- @Override
- public Map<String, Object> greeting(String name) {
- logger.debug("greeting failure!");
- return null;
- }
-
-}
diff --git a/samples/client/src/main/resources/application.yml b/samples/client/src/main/resources/application.yml
index 9c58458..f23f73c 100755
--- a/samples/client/src/main/resources/application.yml
+++ b/samples/client/src/main/resources/application.yml
@@ -20,8 +20,8 @@
client:
config:
default:
- connectTimeout: 5000
- readTimeout: 5000
+ connectTimeout: 12000
+ readTimeout: 12000
loggerLevel: full
hystrix:
enabled: true
@@ -34,6 +34,6 @@
enabled: true
isolation:
thread:
- timeoutInMilliseconds: 5000
+ timeoutInMilliseconds: 12000
-gateway.api.url: http://localhost:5555/api
+gateway.api.url: http://localhost:5555
diff --git a/samples/pom.xml b/samples/pom.xml
index a2c7c5e..8a6c81a 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -52,6 +52,13 @@
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20180130</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>