diff --git a/auth-center/node-1.bat b/auth-center/node-1.bat new file mode 100644 index 0000000000000000000000000000000000000000..0f53e1d9f49733f77924f2ee14a1aea5e123dcc7 --- /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 0000000000000000000000000000000000000000..31ca435334f3a96b68909a1c3d9cef779f31b449 --- /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 0000000000000000000000000000000000000000..ce7f070394f8bc9fd92423512f7ba75f8eb3dd47 --- /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 0000000000000000000000000000000000000000..4a2388730b8b3c1c54c390f59369db903e62322b --- /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 67b2907ec16a83c6939f7e1127c7155e4b68043c..43a87d98428b5533cdbcdbf84a27d4197acc5e22 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 2874370178b8e3dc183c096de7606d211bc3d0af..f60286eab2f5b0bc1a6ad4cec94ca3cb03cbf838 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