From b79851a61508130e9d6ef9c5d61dd3d6bfdc7b4a Mon Sep 17 00:00:00 2001
From: ManongJu <469863752@qq.com>
Date: Thu, 11 Jan 2018 10:00:01 +0800
Subject: [PATCH] add simple

---
 auth-center/node-1.bat                                |  1 +
 gateway/node-1.bat                                    |  1 +
 order-service/node-1.bat                              |  1 +
 order-service/node-2.bat                              |  1 +
 .../user/service/controller/SimpleController.java     |  4 ++--
 user-service/src/main/resources/application.yml       | 11 ++++++++++-
 6 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 auth-center/node-1.bat
 create mode 100644 gateway/node-1.bat
 create mode 100644 order-service/node-1.bat
 create mode 100644 order-service/node-2.bat

diff --git a/auth-center/node-1.bat b/auth-center/node-1.bat
new file mode 100644
index 0000000..0f53e1d
--- /dev/null
+++ b/auth-center/node-1.bat
@@ -0,0 +1 @@
+java -jar .\target\Micro-Service-Skeleton-Auth-0.0.1-SNAPSHOT.jar
\ No newline at end of file
diff --git a/gateway/node-1.bat b/gateway/node-1.bat
new file mode 100644
index 0000000..31ca435
--- /dev/null
+++ b/gateway/node-1.bat
@@ -0,0 +1 @@
+java -jar .\target\Micro-Service-Skeleton-Gateway-0.0.1-SNAPSHOT.jar
\ No newline at end of file
diff --git a/order-service/node-1.bat b/order-service/node-1.bat
new file mode 100644
index 0000000..ce7f070
--- /dev/null
+++ b/order-service/node-1.bat
@@ -0,0 +1 @@
+java -jar .\target\Micro-Service-Skeleton-Order-Service-0.0.1-SNAPSHOT.jar --spring.profiles.active=node1
\ No newline at end of file
diff --git a/order-service/node-2.bat b/order-service/node-2.bat
new file mode 100644
index 0000000..4a23887
--- /dev/null
+++ b/order-service/node-2.bat
@@ -0,0 +1 @@
+java -jar .\target\Micro-Service-Skeleton-Order-Service-0.0.1-SNAPSHOT.jar --spring.profiles.active=node2
\ No newline at end of file
diff --git a/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java b/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java
index 67b2907..43a87d9 100644
--- a/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java
+++ b/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java
@@ -19,9 +19,9 @@ public class SimpleController {
 
     @RequestMapping(value = "getWord")
     @HystrixCommand(fallbackMethod = "helloFallback",commandKey = "getWord",groupKey = "SimpleController",threadPoolKey = "SimplePool")
-    @CacheResult(cacheKeyMethod = "getKey")
+//    @CacheResult(cacheKeyMethod = "getKey")
     public String getWord(){
-        return restTemplate.getForEntity("http://order-service/order",String.class).getBody();
+        return restTemplate.getForEntity("http://order-service/hello",String.class).getBody();
     }
     private String helloFallback(){
         return "error";
diff --git a/user-service/src/main/resources/application.yml b/user-service/src/main/resources/application.yml
index 2874370..f60286e 100644
--- a/user-service/src/main/resources/application.yml
+++ b/user-service/src/main/resources/application.yml
@@ -36,4 +36,13 @@ ribbon:
   # 重试其他实例的最大重试次数，不包括首次所选的server
   MaxAutoRetriesNextServer: 2
   # 是否所有操作都进行重试
-  OkToRetryOnAllOperations: true
\ No newline at end of file
+  OkToRetryOnAllOperations: true
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 600000
\ No newline at end of file
-- 
GitLab