From 42360bfcb0fe1019d5f369a46a71d6c8d372ee0c Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 14:04:03 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96develop?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-server/target/classes/application.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 star-eureka-server/target/classes/application.yml diff --git a/star-eureka-server/target/classes/application.yml b/star-eureka-server/target/classes/application.yml deleted file mode 100644 index 1127543..0000000 --- a/star-eureka-server/target/classes/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -##使用yml配置文件时，读取属性值必须使用@@的方式 -spring: - profiles: - active: 'dev' \ No newline at end of file From 3749e76f3667427c841360e87d9df30138a0cacd Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 14:29:32 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-server/.classpath | 2 +- star-eureka-server/.gitignore | 6 +++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- star-eureka-server/pom.xml | 8 +++----- .../star_eureka_server/EurekaApplication.java | 1 + .../src/main/resources/application-dev.yml | 17 +++++++---------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/star-eureka-server/.classpath b/star-eureka-server/.classpath index e580d60..078648f 100644 --- a/star-eureka-server/.classpath +++ b/star-eureka-server/.classpath @@ -19,7 +19,7 @@ - + diff --git a/star-eureka-server/.gitignore b/star-eureka-server/.gitignore index b83d222..4782c17 100644 --- a/star-eureka-server/.gitignore +++ b/star-eureka-server/.gitignore @@ -1 +1,5 @@ -/target/ +.classpath +.project +.settings/ +target/ +bin/ diff --git a/star-eureka-server/.settings/org.eclipse.jdt.core.prefs b/star-eureka-server/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-eureka-server/.settings/org.eclipse.jdt.core.prefs +++ b/star-eureka-server/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-eureka-server/pom.xml b/star-eureka-server/pom.xml index 5dc45d5..81d6f5e 100644 --- a/star-eureka-server/pom.xml +++ b/star-eureka-server/pom.xml @@ -20,7 +20,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.3.RELEASE + 2.0.5.RELEASE @@ -38,10 +38,9 @@ org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server - junit junit @@ -55,7 +54,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR4 + Finchley.RELEASE pom import @@ -105,7 +104,6 @@ 指定资源，这里是我们生成的jar，将用于启动到容器 / ${project.build.directory} ${project.build.finalName}.jar --> - diff --git a/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java b/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java index 171d857..8e91843 100644 --- a/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java +++ b/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java @@ -22,6 +22,7 @@ public class EurekaApplication { public static void main(String[] args) { SpringApplication.run(EurekaApplication.class, args); + // SpringApplication.run(EurekaApplication.class, // "spring.profiles.active=peer1"); } diff --git a/star-eureka-server/src/main/resources/application-dev.yml b/star-eureka-server/src/main/resources/application-dev.yml index 3f641ca..d31effc 100755 --- a/star-eureka-server/src/main/resources/application-dev.yml +++ b/star-eureka-server/src/main/resources/application-dev.yml @@ -1,6 +1,12 @@ spring: application: name: star-eureka-server + ###为我们的Eureka服务注册和发现中心添加用户认证 + ###添加之后，对应的所有服务提供者和服务消费者，访问的eureka地址都需要做出对应的变更，如：http://william:123456@127.0.0.1:1314/eureka/ + security: + user: + name: william + password: 123456 ###在默认设置下，该服务注册中心也会将自己作为客户端来尝试注册它自己，所以我们需要禁用它的客户端注册行为 server: @@ -13,13 +19,4 @@ eureka: serviceUrl: defaultZone: http://localhost:1314/eureka/ server: - enableSelfPreservation: false - -###为我们的Eureka服务注册和发现中心添加用户认证 -###添加之后，对应的所有服务提供者和服务消费者，访问的eureka地址都需要做出对应的变更，如：http://william:123456@127.0.0.1:1314/eureka/ -security: - basic: - enabled: true - user: - name: william - password: 123456 \ No newline at end of file + enableSelfPreservation: false \ No newline at end of file From 9d286f4982f920347bd29f59333b41f537e25407 Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 16:37:50 +0800 Subject: [PATCH 03/24] =?UTF-8?q?SpringBoot=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-compute-service/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++-- star-compute-service/pom.xml | 12 ++++---- .../config/RedisConfig.java | 7 ++--- .../controller/ComputeController.java | 19 ++++++++++++- .../controller/RabbitMQTestController.java | 4 --- .../src/main/resources/application.yml | 5 +++- .../src/main/resources/bootstrap.yml | 28 ++++++++----------- 8 files changed, 45 insertions(+), 38 deletions(-) diff --git a/star-compute-service/.classpath b/star-compute-service/.classpath index 6aff346..5d2afd4 100644 --- a/star-compute-service/.classpath +++ b/star-compute-service/.classpath @@ -18,7 +18,7 @@ - + diff --git a/star-compute-service/.settings/org.eclipse.jdt.core.prefs b/star-compute-service/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-compute-service/.settings/org.eclipse.jdt.core.prefs +++ b/star-compute-service/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-compute-service/pom.xml b/star-compute-service/pom.xml index 937a221..b31a9fb 100644 --- a/star-compute-service/pom.xml +++ b/star-compute-service/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.5.RELEASE @@ -30,19 +30,18 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client org.springframework.boot spring-boot-starter-data-redis - 2.0.2.RELEASE - redis.clients - jedis + redis.clients + jedis @@ -95,7 +94,6 @@ org.projectlombok lombok - 1.16.6 @@ -120,7 +118,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + Finchley.RELEASE pom import diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java b/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java index 1a2b991..9643a97 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java @@ -52,13 +52,10 @@ public Object generate(Object target, Method method, Object... params) { * @param redisTemplate * @return */ - @SuppressWarnings("rawtypes") @Bean - public CacheManager cacheManager(RedisTemplate redisTemplate) { - RedisCacheManager rcm = new RedisCacheManager(redisTemplate); + public CacheManager cacheManager(RedisConnectionFactory factory) { + RedisCacheManager rcm = RedisCacheManager.create(factory); // 设置缓存过期时间 - rcm.setDefaultExpiration(10000); - return rcm; } diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java index 6bf7312..0384f5f 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java @@ -1,11 +1,14 @@ package com.gui.star_compute_service.controller; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; @@ -38,6 +41,9 @@ public class ComputeController { @Value("${author.age}") private Integer age; + + @Autowired + private Registration registration; @Autowired private DiscoveryClient client; @@ -57,7 +63,7 @@ public class ComputeController { @ApiImplicitParam(name = "b", value = "第二个数", required = true, dataType = "int", paramType = "query") }) @RequestMapping(value = "/add", method = RequestMethod.GET) public Integer add(@RequestParam Integer a, @RequestParam Integer b) { - ServiceInstance instance = client.getLocalServiceInstance(); + ServiceInstance instance = serviceInstance(); Integer r = a + b; logger.info("/add, host:" + instance.getHost() + ", service_id:" + instance.getServiceId() + ", result:" + r); @@ -84,4 +90,15 @@ public void setName(String name) { public void setAge(Integer age) { this.age = age; } + + public ServiceInstance serviceInstance() { + List list = client.getInstances(registration.getServiceId()); + if (list != null && list.size() > 0) { + for(ServiceInstance itm : list){ + if(itm.getPort() == 2001) + return itm; + } + } + return null; + } } diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/RabbitMQTestController.java b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/RabbitMQTestController.java index 49f6c70..2a1e74f 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/RabbitMQTestController.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/RabbitMQTestController.java @@ -1,16 +1,12 @@ package com.gui.star_compute_service.controller; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.gui.star_compute_service.util.RabbitMQUtil; -import com.gui.star_compute_service.util.RedisUtil; -import com.gui.star_compute_service.vo.UserVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/star-compute-service/src/main/resources/application.yml b/star-compute-service/src/main/resources/application.yml index 51b73c7..f4641f9 100755 --- a/star-compute-service/src/main/resources/application.yml +++ b/star-compute-service/src/main/resources/application.yml @@ -2,4 +2,7 @@ ## 设置这些消息是为了测试的时候有个参照，从而确定某个值到底来源于远程的git仓库还是本地保存的值 author: name: WilliamLocal - age: 66 \ No newline at end of file + age: 66 + +server: + port: 5558 \ No newline at end of file diff --git a/star-compute-service/src/main/resources/bootstrap.yml b/star-compute-service/src/main/resources/bootstrap.yml index 94b6a8a..ed4a7f7 100644 --- a/star-compute-service/src/main/resources/bootstrap.yml +++ b/star-compute-service/src/main/resources/bootstrap.yml @@ -5,18 +5,18 @@ #### 注意，最终读取的文件的名字是：name + "-" + profile + ".yml" 文件， 本例中就是读取sample-cloud-client-test.yml文件，这个优先级最高 #### 如果此文件找不到，接着会去找application-test.yml文件，如果这个文件也没有，最后将会从客户端本地读取 spring: -## rabbitmq: -## host: 127.0.0.1 -## port: 5672 -## username: guest -## password: guest + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: guest + password: guest application: name: compute-service - rabbitmq: - host: localhost - port: 5672 - username: guest - password: guest + #rabbitmq: + #host: localhost + #port: 5672 + #username: guest + #password: guest redis: ##Redis数据库索引（默认为0） database: 0 @@ -48,16 +48,12 @@ spring: ## uri: http://127.0.0.1:52099 ## name: sample-cloud-client ## profile: test - -server: - port: 5558 - eureka: client: serviceUrl: - defaultZone: http://william:123456@peer1:1314/eureka/ - ##defaultZone: http://william:123456@localhost:1314/eureka/ + ##defaultZone: http://william:123456@peer1:1314/eureka/ + defaultZone: http:/localhost:1314/eureka/ healthcheck: enabled: true From a4f845e6b00ba853ce330477316dc0f23e87f878 Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 16:39:22 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0git=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-compute-service/.gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/star-compute-service/.gitignore b/star-compute-service/.gitignore index b83d222..4782c17 100644 --- a/star-compute-service/.gitignore +++ b/star-compute-service/.gitignore @@ -1 +1,5 @@ -/target/ +.classpath +.project +.settings/ +target/ +bin/ From 3c17d288270e93b2c786b44a5d0a54a2a2c9834d Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 16:45:53 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0git=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-ribbon/.classpath | 2 +- star-eureka-ribbon/.gitignore | 6 +++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- star-eureka-ribbon/pom.xml | 10 +++++----- star-eureka-ribbon/src/main/resources/application.yml | 3 ++- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/star-eureka-ribbon/.classpath b/star-eureka-ribbon/.classpath index edc9698..9b136af 100644 --- a/star-eureka-ribbon/.classpath +++ b/star-eureka-ribbon/.classpath @@ -17,7 +17,7 @@ - + diff --git a/star-eureka-ribbon/.gitignore b/star-eureka-ribbon/.gitignore index b83d222..4782c17 100644 --- a/star-eureka-ribbon/.gitignore +++ b/star-eureka-ribbon/.gitignore @@ -1 +1,5 @@ -/target/ +.classpath +.project +.settings/ +target/ +bin/ diff --git a/star-eureka-ribbon/.settings/org.eclipse.jdt.core.prefs b/star-eureka-ribbon/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-eureka-ribbon/.settings/org.eclipse.jdt.core.prefs +++ b/star-eureka-ribbon/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-eureka-ribbon/pom.xml b/star-eureka-ribbon/pom.xml index a6f5644..6baa41e 100644 --- a/star-eureka-ribbon/pom.xml +++ b/star-eureka-ribbon/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.5.RELEASE @@ -24,12 +24,12 @@ org.springframework.cloud - spring-cloud-starter-ribbon + spring-cloud-starter-netflix-ribbon org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -51,7 +51,7 @@ org.springframework.cloud - spring-cloud-starter-hystrix + spring-cloud-starter-netflix-hystrix @@ -60,7 +60,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + Finchley.RELEASE pom import diff --git a/star-eureka-ribbon/src/main/resources/application.yml b/star-eureka-ribbon/src/main/resources/application.yml index cb186e7..6a692cc 100755 --- a/star-eureka-ribbon/src/main/resources/application.yml +++ b/star-eureka-ribbon/src/main/resources/application.yml @@ -8,4 +8,5 @@ server: eureka: client: serviceUrl: - defaultZone: http://william:123456@localhost:1314/eureka/ \ No newline at end of file + #defaultZone: http://william:123456@localhost:1314/eureka/ + defaultZone: http://localhost:1314/eureka/ \ No newline at end of file From 6c2f4f1ede4e25ca2614338a9c49a2a695908d72 Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 16:48:20 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-server/pom.xml | 4 ++-- star-eureka-server/src/main/resources/application-dev.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/star-eureka-server/pom.xml b/star-eureka-server/pom.xml index 81d6f5e..5549d96 100644 --- a/star-eureka-server/pom.xml +++ b/star-eureka-server/pom.xml @@ -31,10 +31,10 @@ test - + org.springframework.cloud diff --git a/star-eureka-server/src/main/resources/application-dev.yml b/star-eureka-server/src/main/resources/application-dev.yml index d31effc..0109d2d 100755 --- a/star-eureka-server/src/main/resources/application-dev.yml +++ b/star-eureka-server/src/main/resources/application-dev.yml @@ -3,10 +3,10 @@ spring: name: star-eureka-server ###为我们的Eureka服务注册和发现中心添加用户认证 ###添加之后，对应的所有服务提供者和服务消费者，访问的eureka地址都需要做出对应的变更，如：http://william:123456@127.0.0.1:1314/eureka/ - security: - user: - name: william - password: 123456 + #security: + #user: + #name: william + #password: 123456 ###在默认设置下，该服务注册中心也会将自己作为客户端来尝试注册它自己，所以我们需要禁用它的客户端注册行为 server: From ac2662f97772997c935cfbf7f1973892ef108560 Mon Sep 17 00:00:00 2001 From: williamjava Date: Thu, 27 Dec 2018 18:52:39 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-compute-service/pom.xml | 11 +++- .../ComputeServiceApplication.java | 2 +- .../config/RedisConfig.java | 33 +++++----- .../controller/ComputeController.java | 2 +- .../src/main/resources/application.yml | 66 ++++++++++++++++++- .../src/main/resources/bootstrap.yml | 63 ------------------ .../src/main/resources/logback-spring.xml | 6 +- 7 files changed, 95 insertions(+), 88 deletions(-) delete mode 100644 star-compute-service/src/main/resources/bootstrap.yml diff --git a/star-compute-service/pom.xml b/star-compute-service/pom.xml index b31a9fb..34cf325 100644 --- a/star-compute-service/pom.xml +++ b/star-compute-service/pom.xml @@ -57,11 +57,11 @@ - + @@ -78,12 +78,17 @@ - + org.springframework.boot spring-boot-starter-actuator true + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + junit diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java b/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java index f9c6429..2ca877b 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java @@ -20,6 +20,6 @@ @SpringBootApplication public class ComputeServiceApplication { public static void main(String[] args) { - SpringApplication.run(ComputeServiceApplication.class, args); + SpringApplication.run(ComputeServiceApplication.class, "--server.port=5559"); } } \ No newline at end of file diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java b/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java index 9643a97..12bbc52 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/config/RedisConfig.java @@ -1,11 +1,8 @@ package com.gui.star_compute_service.config; -import java.lang.reflect.Method; - import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.cache.RedisCacheManager; @@ -30,21 +27,21 @@ public class RedisConfig extends CachingConfigurerSupport { /** * 自定义key的生成策略 */ - @Bean - public KeyGenerator keyGenerator() { - return new KeyGenerator() { - @Override - public Object generate(Object target, Method method, Object... params) { - StringBuilder sb = new StringBuilder(); - sb.append(target.getClass().getName()); - sb.append(method.getName()); - for (Object obj : params) { - sb.append(obj.toString()); - } - return sb.toString(); - } - }; - } + // @Bean + // public KeyGenerator keyGenerator() { + // return new KeyGenerator() { + // @Override + // public Object generate(Object target, Method method, Object... params) { + // StringBuilder sb = new StringBuilder(); + // sb.append(target.getClass().getName()); + // sb.append(method.getName()); + // for (Object obj : params) { + // sb.append(obj.toString()); + // } + // return sb.toString(); + // } + // }; + // } /** * 缓存管理器 diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java index 0384f5f..fb2d322 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/ComputeController.java @@ -95,7 +95,7 @@ public ServiceInstance serviceInstance() { List list = client.getInstances(registration.getServiceId()); if (list != null && list.size() > 0) { for(ServiceInstance itm : list){ - if(itm.getPort() == 2001) + if(itm.getPort() == 5558) return itm; } } diff --git a/star-compute-service/src/main/resources/application.yml b/star-compute-service/src/main/resources/application.yml index f4641f9..593ac9f 100755 --- a/star-compute-service/src/main/resources/application.yml +++ b/star-compute-service/src/main/resources/application.yml @@ -4,5 +4,69 @@ author: name: WilliamLocal age: 66 +## uri 这个值一定要和配置服务器保持一致 +## name 指定要从git远程仓库读取哪个文件 +## profile 指定读取文件的哪个版本（比如abc-test.yml 或者 abc-dev.yml文件） +## discovery 服务注册与发现 +#### 注意，最终读取的文件的名字是：name + "-" + profile + ".yml" 文件， 本例中就是读取sample-cloud-client-test.yml文件，这个优先级最高 +#### 如果此文件找不到，接着会去找application-test.yml文件，如果这个文件也没有，最后将会从客户端本地读取 +spring: + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: guest + password: guest + application: + name: compute-service + #rabbitmq: + #host: localhost + #port: 5672 + #username: guest + #password: guest + redis: + ##Redis数据库索引（默认为0） + database: 0 + ##Redis服务器地址 + host: localhost + ##Redis服务器连接端口 + port: 6379 + ##Redis服务器连接密码（默认为空） + password: + ##连接超时时间（毫秒） + timeout: 0 + ##连接池相关参数设置 + pool: + ##连接池最大连接数（使用负值表示没有限制） + max-active: 8 + ##连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1 + ##连接池中的最大空闲连接 + max-idle: 8 + ##连接池中的最小空闲连接 + min-idle: 0 + ##zipkin: + ##base-url: http://localhost:9411 + ##sleuth: + ##sampler: + ##percentage: 1.0 +## cloud: +## config: +## uri: http://127.0.0.1:52099 +## name: sample-cloud-client +## profile: test + server: - port: 5558 \ No newline at end of file + port: 5558 + +eureka: + client: + serviceUrl: + ##defaultZone: http://william:123456@peer1:1314/eureka/ + defaultZone: http://localhost:1314/eureka/ + #healthcheck: + #enabled: true + +logging: + level: + root: INFO + org.springframework.web.servlet.DispatcherServlet: DEBUG \ No newline at end of file diff --git a/star-compute-service/src/main/resources/bootstrap.yml b/star-compute-service/src/main/resources/bootstrap.yml deleted file mode 100644 index ed4a7f7..0000000 --- a/star-compute-service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,63 +0,0 @@ -## uri 这个值一定要和配置服务器保持一致 -## name 指定要从git远程仓库读取哪个文件 -## profile 指定读取文件的哪个版本（比如abc-test.yml 或者 abc-dev.yml文件） -## discovery 服务注册与发现 -#### 注意，最终读取的文件的名字是：name + "-" + profile + ".yml" 文件， 本例中就是读取sample-cloud-client-test.yml文件，这个优先级最高 -#### 如果此文件找不到，接着会去找application-test.yml文件，如果这个文件也没有，最后将会从客户端本地读取 -spring: - rabbitmq: - host: 127.0.0.1 - port: 5672 - username: guest - password: guest - application: - name: compute-service - #rabbitmq: - #host: localhost - #port: 5672 - #username: guest - #password: guest - redis: - ##Redis数据库索引（默认为0） - database: 0 - ##Redis服务器地址 - host: localhost - ##Redis服务器连接端口 - port: 6379 - ##Redis服务器连接密码（默认为空） - password: - ##连接超时时间（毫秒） - timeout: 0 - ##连接池相关参数设置 - pool: - ##连接池最大连接数（使用负值表示没有限制） - max-active: 8 - ##连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1 - ##连接池中的最大空闲连接 - max-idle: 8 - ##连接池中的最小空闲连接 - min-idle: 0 - ##zipkin: - ##base-url: http://localhost:9411 - ##sleuth: - ##sampler: - ##percentage: 1.0 -## cloud: -## config: -## uri: http://127.0.0.1:52099 -## name: sample-cloud-client -## profile: test - -eureka: - client: - serviceUrl: - ##defaultZone: http://william:123456@peer1:1314/eureka/ - defaultZone: http:/localhost:1314/eureka/ - healthcheck: - enabled: true - -logging: - level: - root: INFO - org.springframework.web.servlet.DispatcherServlet: DEBUG \ No newline at end of file diff --git a/star-compute-service/src/main/resources/logback-spring.xml b/star-compute-service/src/main/resources/logback-spring.xml index ebe5bd8..3a2659b 100644 --- a/star-compute-service/src/main/resources/logback-spring.xml +++ b/star-compute-service/src/main/resources/logback-spring.xml @@ -22,6 +22,7 @@ + ​ + ​ - + \ No newline at end of file From e98f8a542d476158fc20cc8a1cc95091fecc1d5f Mon Sep 17 00:00:00 2001 From: williamjava Date: Sat, 29 Dec 2018 08:55:25 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-ribbon/pom.xml | 7 +++++++ .../java/com/gui/star_eureka_server/EurekaApplication.java | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/star-eureka-ribbon/pom.xml b/star-eureka-ribbon/pom.xml index 6baa41e..41fa5d4 100644 --- a/star-eureka-ribbon/pom.xml +++ b/star-eureka-ribbon/pom.xml @@ -53,6 +53,13 @@ org.springframework.cloud spring-cloud-starter-netflix-hystrix + + + + org.springframework.boot + spring-boot-starter-actuator + true + diff --git a/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java b/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java index 8e91843..1705c72 100644 --- a/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java +++ b/star-eureka-server/src/main/java/com/gui/star_eureka_server/EurekaApplication.java @@ -22,8 +22,5 @@ public class EurekaApplication { public static void main(String[] args) { SpringApplication.run(EurekaApplication.class, args); - - // SpringApplication.run(EurekaApplication.class, - // "spring.profiles.active=peer1"); } } \ No newline at end of file From 90068e6354a746d7c948f007d9ee2a045e1fd566 Mon Sep 17 00:00:00 2001 From: williamjava Date: Sat, 29 Dec 2018 09:18:01 +0800 Subject: [PATCH 09/24] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7SpringBoot=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=9B2.=E5=A2=9E=E5=8A=A0git=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-configserver/.classpath | 2 +- star-configserver/.gitignore | 7 ++++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- star-configserver/pom.xml | 14 +++++++------- .../ConfigserverApplication.java | 3 ++- star-eureka-feign/.classpath | 2 +- star-eureka-feign/.gitignore | 7 ++++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- star-eureka-feign/pom.xml | 16 ++++++++-------- .../gui/star_eureka_feign/FeignApplication.java | 2 +- .../star_eureka_feign/face/ComputeClient.java | 2 +- .../ZipkinServerApplication.java | 6 ++++++ star-zuul/.classpath | 2 +- star-zuul/.gitignore | 7 ++++++- star-zuul/.settings/org.eclipse.jdt.core.prefs | 6 +++--- star-zuul/pom.xml | 9 ++++----- .../java/com/gui/star_zuul/ZuulApplication.java | 5 +++-- 17 files changed, 62 insertions(+), 40 deletions(-) diff --git a/star-configserver/.classpath b/star-configserver/.classpath index 6aff346..5d2afd4 100644 --- a/star-configserver/.classpath +++ b/star-configserver/.classpath @@ -18,7 +18,7 @@ - + diff --git a/star-configserver/.gitignore b/star-configserver/.gitignore index b83d222..6ebc895 100644 --- a/star-configserver/.gitignore +++ b/star-configserver/.gitignore @@ -1 +1,6 @@ -/target/ +.classpath +.project +.settings/ +.metadata/ +target/ +bin/ diff --git a/star-configserver/.settings/org.eclipse.jdt.core.prefs b/star-configserver/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-configserver/.settings/org.eclipse.jdt.core.prefs +++ b/star-configserver/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-configserver/pom.xml b/star-configserver/pom.xml index 5b3d23d..b16bf88 100644 --- a/star-configserver/pom.xml +++ b/star-configserver/pom.xml @@ -12,14 +12,14 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.5.RELEASE UTF-8 - williamjian - 0.4.13 + @@ -37,7 +37,7 @@ org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -65,7 +65,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + Finchley.RELEASE pom import @@ -85,7 +85,7 @@ - + diff --git a/star-configserver/src/main/java/com/gui/star_configserver/ConfigserverApplication.java b/star-configserver/src/main/java/com/gui/star_configserver/ConfigserverApplication.java index d4dc900..d6a0df1 100644 --- a/star-configserver/src/main/java/com/gui/star_configserver/ConfigserverApplication.java +++ b/star-configserver/src/main/java/com/gui/star_configserver/ConfigserverApplication.java @@ -1,5 +1,6 @@ package com.gui.star_configserver; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -18,6 +19,6 @@ @SpringBootApplication public class ConfigserverApplication { public static void main(String[] args) { - new SpringApplicationBuilder(ConfigserverApplication.class).web(true).run(args); + new SpringApplicationBuilder(ConfigserverApplication.class).web(WebApplicationType.SERVLET).run(args); } } \ No newline at end of file diff --git a/star-eureka-feign/.classpath b/star-eureka-feign/.classpath index 6aff346..5d2afd4 100644 --- a/star-eureka-feign/.classpath +++ b/star-eureka-feign/.classpath @@ -18,7 +18,7 @@ - + diff --git a/star-eureka-feign/.gitignore b/star-eureka-feign/.gitignore index b83d222..6ebc895 100644 --- a/star-eureka-feign/.gitignore +++ b/star-eureka-feign/.gitignore @@ -1 +1,6 @@ -/target/ +.classpath +.project +.settings/ +.metadata/ +target/ +bin/ diff --git a/star-eureka-feign/.settings/org.eclipse.jdt.core.prefs b/star-eureka-feign/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-eureka-feign/.settings/org.eclipse.jdt.core.prefs +++ b/star-eureka-feign/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-eureka-feign/pom.xml b/star-eureka-feign/pom.xml index 9fcf953..11ed78a 100644 --- a/star-eureka-feign/pom.xml +++ b/star-eureka-feign/pom.xml @@ -11,26 +11,26 @@ UTF-8 - williamjian - 0.4.13 + org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.5.RELEASE org.springframework.cloud - spring-cloud-starter-feign + spring-cloud-starter-openfeign org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -73,7 +73,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + Finchley.RELEASE pom import @@ -93,7 +93,7 @@ - + diff --git a/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/FeignApplication.java b/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/FeignApplication.java index ea38c03..3ad94b4 100644 --- a/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/FeignApplication.java +++ b/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/FeignApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * Feign是一个声明式的Web Service客户端，它使得编写Web Serivce客户端变得更加简单 diff --git a/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/face/ComputeClient.java b/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/face/ComputeClient.java index ee71b2d..42698d0 100644 --- a/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/face/ComputeClient.java +++ b/star-eureka-feign/src/main/java/com/gui/star_eureka_feign/face/ComputeClient.java @@ -1,6 +1,6 @@ package com.gui.star_eureka_feign.face; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/star-zipkin-server/src/main/java/com/gui/star_zipkin_server/ZipkinServerApplication.java b/star-zipkin-server/src/main/java/com/gui/star_zipkin_server/ZipkinServerApplication.java index 601ae51..fb8583b 100644 --- a/star-zipkin-server/src/main/java/com/gui/star_zipkin_server/ZipkinServerApplication.java +++ b/star-zipkin-server/src/main/java/com/gui/star_zipkin_server/ZipkinServerApplication.java @@ -5,6 +5,12 @@ import zipkin.server.EnableZipkinServer; +/** + * SpringBoot2.0之后，zipkin-server不需要自己部署，该项目作废！ + * + * @author wuhoujian + * + */ @EnableZipkinServer @SpringBootApplication public class ZipkinServerApplication { diff --git a/star-zuul/.classpath b/star-zuul/.classpath index edc9698..9b136af 100644 --- a/star-zuul/.classpath +++ b/star-zuul/.classpath @@ -17,7 +17,7 @@ - + diff --git a/star-zuul/.gitignore b/star-zuul/.gitignore index b83d222..6ebc895 100644 --- a/star-zuul/.gitignore +++ b/star-zuul/.gitignore @@ -1 +1,6 @@ -/target/ +.classpath +.project +.settings/ +.metadata/ +target/ +bin/ diff --git a/star-zuul/.settings/org.eclipse.jdt.core.prefs b/star-zuul/.settings/org.eclipse.jdt.core.prefs index 60105c1..714351a 100644 --- a/star-zuul/.settings/org.eclipse.jdt.core.prefs +++ b/star-zuul/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/star-zuul/pom.xml b/star-zuul/pom.xml index 9ae87cb..1b37a23 100644 --- a/star-zuul/pom.xml +++ b/star-zuul/pom.xml @@ -8,7 +8,6 @@ jar star-zuul - http://maven.apache.org UTF-8 @@ -17,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.5.RELEASE @@ -25,12 +24,12 @@ org.springframework.cloud - spring-cloud-starter-zuul + spring-cloud-starter-netflix-zuul org.springframework.cloud - spring-cloud-starter-eureka + spring-cloud-starter-netflix-eureka-client @@ -45,7 +44,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.RELEASE + Finchley.RELEASE pom import diff --git a/star-zuul/src/main/java/com/gui/star_zuul/ZuulApplication.java b/star-zuul/src/main/java/com/gui/star_zuul/ZuulApplication.java index 4c393d7..368d1ba 100644 --- a/star-zuul/src/main/java/com/gui/star_zuul/ZuulApplication.java +++ b/star-zuul/src/main/java/com/gui/star_zuul/ZuulApplication.java @@ -1,5 +1,6 @@ package com.gui.star_zuul; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.netflix.zuul.EnableZuulProxy; @@ -19,9 +20,9 @@ @SpringCloudApplication public class ZuulApplication { public static void main(String[] args) { - new SpringApplicationBuilder(ZuulApplication.class).web(true).run(args); + new SpringApplicationBuilder(ZuulApplication.class).web(WebApplicationType.SERVLET).run(args); } - + @Bean public AccessFilter accessFilter() { return new AccessFilter(); From 772c5219c019bf0747730fdfb4a5f26046af787c Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Mon, 15 Apr 2019 16:05:11 +0800 Subject: [PATCH 10/24] test --- star-eureka-server/.idea/workspace.xml | 396 +++++++++++++++++++++++++ 1 file changed, 396 insertions(+) create mode 100644 star-eureka-server/.idea/workspace.xml diff --git a/star-eureka-server/.idea/workspace.xml b/star-eureka-server/.idea/workspace.xml new file mode 100644 index 0000000..79a8460 --- /dev/null +++ b/star-eureka-server/.idea/workspace.xml @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -56,9 +148,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -212,14 +204,19 @@ - - + + - + + + + + + - + + + + + + + + + + + + @@ -288,15 +306,32 @@ + + + + + 1555322290754 + + + 1555379922630 + + - - @@ -304,7 +339,7 @@ - + @@ -317,8 +352,8 @@ - - + + @@ -337,10 +372,11 @@ + + + - - - @@ -390,189 +426,247 @@ - + - - + + - - + - - + + - - + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + + + + + - + + + + + + + + + + + - - + + - + + + + - - + + - + - - + + - + - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - + + - + - - + + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + + + + + - + - - + + - + - - + + - + - - + + @@ -628,7 +722,7 @@ - star-eureka-ribbon + star-configserver - - @@ -230,7 +209,7 @@ - + - @@ -339,7 +318,7 @@ - + @@ -352,8 +331,8 @@ - - + + @@ -363,7 +342,7 @@ - + @@ -520,13 +499,6 @@ - - - - - - - @@ -583,19 +555,9 @@ - - - - - - - - - - @@ -635,38 +597,55 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + From e4b76f26054657ad80b5de6e743d6f7c2f281898 Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Wed, 17 Apr 2019 18:47:22 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0consul=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E4=B8=8E=E6=B3=A8=E5=86=8C=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-compute-service-consul/.gitignore | 29 ++ .../.mvn/wrapper/MavenWrapperDownloader.java | 114 +++++++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + star-compute-service-consul/mvnw | 286 ++++++++++++++++++ star-compute-service-consul/mvnw.cmd | 161 ++++++++++ star-compute-service-consul/pom.xml | 93 ++++++ .../StarComputeServiceConsulApplication.java | 15 + .../src/main/resources/application.yml | 15 + ...rComputeServiceConsulApplicationTests.java | 16 + star-eureka-server/.idea/workspace.xml | 143 ++++----- 11 files changed, 783 insertions(+), 90 deletions(-) create mode 100644 star-compute-service-consul/.gitignore create mode 100644 star-compute-service-consul/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 star-compute-service-consul/.mvn/wrapper/maven-wrapper.jar create mode 100644 star-compute-service-consul/.mvn/wrapper/maven-wrapper.properties create mode 100644 star-compute-service-consul/mvnw create mode 100644 star-compute-service-consul/mvnw.cmd create mode 100644 star-compute-service-consul/pom.xml create mode 100644 star-compute-service-consul/src/main/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplication.java create mode 100644 star-compute-service-consul/src/main/resources/application.yml create mode 100644 star-compute-service-consul/src/test/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplicationTests.java diff --git a/star-compute-service-consul/.gitignore b/star-compute-service-consul/.gitignore new file mode 100644 index 0000000..153c933 --- /dev/null +++ b/star-compute-service-consul/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ diff --git a/star-compute-service-consul/.mvn/wrapper/MavenWrapperDownloader.java b/star-compute-service-consul/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..7f91a56 --- /dev/null +++ b/star-compute-service-consul/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,114 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: : " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/star-compute-service-consul/.mvn/wrapper/maven-wrapper.jar b/star-compute-service-consul/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/star-compute-service-consul/mvnw.cmd b/star-compute-service-consul/mvnw.cmd new file mode 100644 index 0000000..fef5a8f --- /dev/null +++ b/star-compute-service-consul/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/star-compute-service-consul/pom.xml b/star-compute-service-consul/pom.xml new file mode 100644 index 0000000..f6872ef --- /dev/null +++ b/star-compute-service-consul/pom.xml @@ -0,0 +1,93 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + com.gui + star-compute-service-consul + 0.0.1-SNAPSHOT + star-compute-service-consul + Consul Demo + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.cloud + spring-cloud-starter-consul-discovery + + + + + org.springframework.boot + spring-boot-starter-web + + + + junit + junit + test + + + + org.projectlombok + lombok + 1.16.6 + + + + io.springfox + springfox-swagger-ui + 2.5.0 + + + + io.springfox + springfox-swagger2 + 2.5.0 + + + + + org.springframework.boot + spring-boot-starter-actuator + true + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Greenwich.RELEASE + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/star-compute-service-consul/src/main/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplication.java b/star-compute-service-consul/src/main/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplication.java new file mode 100644 index 0000000..37d8919 --- /dev/null +++ b/star-compute-service-consul/src/main/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplication.java @@ -0,0 +1,15 @@ +package com.gui.star_compute_service_consul; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +@EnableDiscoveryClient +public class StarComputeServiceConsulApplication { + + public static void main(String[] args) { + SpringApplication.run(StarComputeServiceConsulApplication.class, args); + } + +} diff --git a/star-compute-service-consul/src/main/resources/application.yml b/star-compute-service-consul/src/main/resources/application.yml new file mode 100644 index 0000000..1ac029c --- /dev/null +++ b/star-compute-service-consul/src/main/resources/application.yml @@ -0,0 +1,15 @@ +server: + port: 5558 + +spring: + application: + name: compute-service-consul + cloud: + consul: + host: 127.0.0.1 + port: 8500 + discovery: + tags: version=1.0,author=wuhoujian + healthCheckPath: /info.json + healthCheckInterval: 5s + health-check-url: http://${spring.cloud.client.ip-address}:${server.port}/actuator/health \ No newline at end of file diff --git a/star-compute-service-consul/src/test/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplicationTests.java b/star-compute-service-consul/src/test/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplicationTests.java new file mode 100644 index 0000000..9353166 --- /dev/null +++ b/star-compute-service-consul/src/test/java/com/gui/star_compute_service_consul/StarComputeServiceConsulApplicationTests.java @@ -0,0 +1,16 @@ +package com.gui.star_compute_service_consul; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class StarComputeServiceConsulApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/star-eureka-server/.idea/workspace.xml b/star-eureka-server/.idea/workspace.xml index ce1c573..48ab1a9 100644 --- a/star-eureka-server/.idea/workspace.xml +++ b/star-eureka-server/.idea/workspace.xml @@ -1,9 +1,7 @@ - - - + @@ -18,12 +16,30 @@ + + + + + + + + + - + + + + + + + + + + @@ -41,10 +57,10 @@ - + - + @@ -105,7 +121,7 @@ - - + @@ -307,10 +269,11 @@ - - + + @@ -318,7 +281,7 @@ - + @@ -332,7 +295,7 @@ - + @@ -590,13 +553,6 @@ - - - - - - - @@ -604,13 +560,6 @@ - - - - - - - @@ -625,16 +574,6 @@ - - - - - - - - - - @@ -649,6 +588,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + From dbe8fa33928bf1d223ff1d2ef20469c5286a419c Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Thu, 18 Apr 2019 17:34:20 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../star_compute_service/util/RedisUtil.java | 2 +- .../src/main/resources/bootstrap.yml | 23 ++++++++++--------- .../src/main/resources/application-dev.yml | 8 ++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/util/RedisUtil.java b/star-compute-service/src/main/java/com/gui/star_compute_service/util/RedisUtil.java index 589ec2f..1bdbdec 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/util/RedisUtil.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/util/RedisUtil.java @@ -110,7 +110,7 @@ public boolean set(final String key, Object value, Long expireTime) { } result = true; } catch (Exception e) { - log.error("删除redis中存在的一个键出现异常", e); + log.error("set出现异常", e); } return result; diff --git a/star-compute-service/src/main/resources/bootstrap.yml b/star-compute-service/src/main/resources/bootstrap.yml index 09e1f29..6c06aac 100644 --- a/star-compute-service/src/main/resources/bootstrap.yml +++ b/star-compute-service/src/main/resources/bootstrap.yml @@ -21,18 +21,19 @@ spring: port: 6379 ##Redis服务器连接密码（默认为空） password: - ##连接超时时间（毫秒） - timeout: 0 + ##连接超时时间（毫秒）不能设置为0 + timeout: 5000 ##连接池相关参数设置 -# pool: -# ##连接池最大连接数（使用负值表示没有限制） -# max-active: 8 -# ##连接池最大阻塞等待时间（使用负值表示没有限制） -# max-wait: -1 -# ##连接池中的最大空闲连接 -# max-idle: 8 -# ##连接池中的最小空闲连接 -# min-idle: 0 + lettuce: + pool: + ##连接池最大连接数（使用负值表示没有限制） + max-active: 8 + ##连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1 + ##连接池中的最大空闲连接 + max-idle: 8 + ##连接池中的最小空闲连接 + min-idle: 0 ##zipkin: ##base-url: http://localhost:9411 ##sleuth: diff --git a/star-eureka-server/src/main/resources/application-dev.yml b/star-eureka-server/src/main/resources/application-dev.yml index ec2731a..557db3e 100755 --- a/star-eureka-server/src/main/resources/application-dev.yml +++ b/star-eureka-server/src/main/resources/application-dev.yml @@ -14,9 +14,11 @@ server: eureka: client: - registerWithEureka: false - fetchRegistry: false + ##不注册自己 + #registerWithEureka: false + #fetchRegistry: false serviceUrl: defaultZone: http://localhost:1314/eureka/ server: - enableSelfPreservation: false \ No newline at end of file + ##关闭自我保护机制，可以确保服务注册中心不可用的实例及时剔除(不推荐)，不统计上线率；生产环境需要打开； + #enableSelfPreservation: false \ No newline at end of file From c7b0fd82fad1cbe83b498e60964ea14c96de0ca1 Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Fri, 19 Apr 2019 13:45:53 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0redis=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=B6=85=E5=8D=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuyController.java | 83 ++++++++++++++++ .../entity/BuyOrders.java | 18 ++++ .../executor/BuyQueue.java | 11 +++ .../executor/DealQueueThread.java | 96 +++++++++++++++++++ .../star_compute_service/form/BuyRequest.java | 25 +++++ .../service/BuyGoodService.java | 16 ++++ .../service/BuyOrdersService.java | 7 ++ 7 files changed, 256 insertions(+) create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/controller/BuyController.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/entity/BuyOrders.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/executor/BuyQueue.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/executor/DealQueueThread.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/form/BuyRequest.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyGoodService.java create mode 100644 star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyOrdersService.java diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/controller/BuyController.java b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/BuyController.java new file mode 100644 index 0000000..ae75b15 --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/controller/BuyController.java @@ -0,0 +1,83 @@ +package com.gui.star_compute_service.controller; + +import com.gui.star_compute_service.executor.BuyQueue; +import com.gui.star_compute_service.executor.DealQueueThread; +import com.gui.star_compute_service.form.BuyRequest; +import com.gui.star_compute_service.service.BuyGoodService; +import com.gui.star_compute_service.service.BuyOrdersService; +import com.gui.star_compute_service.util.RedisUtil; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + + +@Api(value = "购买管理api", tags = "购买相关操作") +@RestController +@RequestMapping("/buy") +@Slf4j +public class BuyController { + @Autowired + private RedisUtil redisUtil; + + @Autowired + BuyGoodService buyGoodService; + + @Autowired + BuyOrdersService buyOrdersService; + + private static BuyQueue buyqueue =null;//线程安全的请求队列 + + @RequestMapping(value = "/addOrders", method = RequestMethod.POST) + public Object addOrders(BuyRequest buyrequest){ + Map results = new HashMap<>(); + + try { + //下订单之前，先获取商品的剩余数量 + int residue = Integer.valueOf(redisUtil.get("residue"+buyrequest.getGood_id()).toString()); + if(residue<1){//如果剩余数量不足，直接响应客户端“卖完了” + results.put("msg", "卖完了"); + results.put("done", false); + return results; + } + + //如果还有剩余商品,就准备将请求放到请求队列中 + if(buyqueue==null){//第一次初始化请求队列,队列的容量为当前的商品剩余数量 + buyqueue=new BuyQueue(residue); + } + if(buyqueue.remainingCapacity()>0){//当队列的可用容量大于0时,将请求放到请求队列中 + buyqueue.put(buyrequest); + }else{//当请求队列已满,本次请求不能处理,直接响应客户端提示请求队列已满 + results.put("msg", "抢购队列已满，请稍候重试！"); + results.put("done", false); + return results; + } + + if(!DealQueueThread.excute){//如果线程类的当前执行标志为未执行,即空闲状态,通过线程池启动线程 + DealQueueThread dealQueue = new DealQueueThread(buyqueue, redisUtil); + //ThreadPoolUtil.pool.execute(dealQueue); + ExecutorService threadPool = Executors.newFixedThreadPool(3); + threadPool.execute(dealQueue); + log.info("Thread.activeCount()="+Thread.activeCount()); + } + //请求放入到队列中，即完成下单请求 + results.put("done", true); + results.put("msg", "下订单成功"); + + } catch (Exception e) { + results.put("done", false); + results.put("msg", "下单失败"); + //log.info("addOrders results="+JSON.toJSONString(results)); + log.error("addOrders",e); + } + + return results; + } +} \ No newline at end of file diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/entity/BuyOrders.java b/star-compute-service/src/main/java/com/gui/star_compute_service/entity/BuyOrders.java new file mode 100644 index 0000000..485600b --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/entity/BuyOrders.java @@ -0,0 +1,18 @@ +package com.gui.star_compute_service.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "订单信息") +public class BuyOrders { + @ApiModelProperty(value = "商品ID") + private int good_id; + + @ApiModelProperty(value = "订单ID") + private int order_id; + + @ApiModelProperty(value = "用户ID") + private int user_id; +} diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/executor/BuyQueue.java b/star-compute-service/src/main/java/com/gui/star_compute_service/executor/BuyQueue.java new file mode 100644 index 0000000..669b706 --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/executor/BuyQueue.java @@ -0,0 +1,11 @@ +package com.gui.star_compute_service.executor; + +import java.util.concurrent.LinkedBlockingQueue; + +public class BuyQueue extends LinkedBlockingQueue { + private int residue; + + public BuyQueue(int residue){ + this.residue = residue; + } +} diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/executor/DealQueueThread.java b/star-compute-service/src/main/java/com/gui/star_compute_service/executor/DealQueueThread.java new file mode 100644 index 0000000..9683371 --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/executor/DealQueueThread.java @@ -0,0 +1,96 @@ +package com.gui.star_compute_service.executor; + +import com.gui.star_compute_service.entity.BuyOrders; +import com.gui.star_compute_service.form.BuyRequest; +import com.gui.star_compute_service.service.BuyGoodService; +import com.gui.star_compute_service.service.BuyOrdersService; +import com.gui.star_compute_service.util.RedisUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +@Component +@Slf4j +public class DealQueueThread implements Runnable { + private static DealQueueThread dealQueueThread; + + @Autowired + public static RedisUtil redisUtil; + + @Autowired + BuyGoodService buyGoodService; + + @Autowired + BuyOrdersService buyOrdersService; + + private BuyQueue buyqueue; + + public static boolean excute = false;//线程的默认执行标志为未执行,即空闲状态 + + public DealQueueThread() { + + } + + public DealQueueThread(BuyQueue buyqueue, RedisUtil redisUtil) { + this.buyqueue = buyqueue; + this.redisUtil = redisUtil; + } + + @PostConstruct + public void init() { + dealQueueThread = this; + dealQueueThread.buyGoodService = this.buyGoodService; + dealQueueThread.buyOrdersService = this.buyOrdersService; + dealQueueThread.redisUtil = this.redisUtil; + } + + @Override + public void run() { + try { + excute = true;//修改线程的默认执行标志为执行状态 + //开始处理请求队列中的请求,按照队列的FIFO的规则,先处理先放入到队列中的请求 + while (buyqueue != null && buyqueue.size() > 0) { + BuyRequest buyreq = (BuyRequest) buyqueue.take();//取出队列中的请求 + dealWithQueue(buyreq);//处理请求 + } + } catch (InterruptedException e) { + log.error("DealQueueThread:", e); + } finally { + excute = false; + } + } + + public synchronized void dealWithQueue(BuyRequest buyreq) { + log.info("开始处理请求{}", buyreq.getUser_id()); + try { + //为了尽量确保数据的一致性,处理之前先从redis中获取当前抢购商品的剩余数量 + int residue = Integer.valueOf(redisUtil.get("residue" + buyreq.getGood_id()).toString()); + if (residue < 1) {//如果没有剩余商品,就直接返回 + buyreq.setResponse_status(3); + return; + } + //如果有剩余商品,先在redis中将剩余数量减一,再开始下订单 + redisUtil.set("residue" + buyreq.getGood_id(), residue - 1); + //redisUtil.decr("residue" + buyreq.getGood_id()); + //将数据库中将剩余数量减一,这一步处理可以在队列处理完成之后一次性更新剩余数量 + dealQueueThread.buyGoodService.minusResidue(buyreq.getGood_id()); + + //处理请求,下订单 + BuyOrders bo = new BuyOrders(); + bo.setGood_id(buyreq.getGood_id()); + bo.setUser_id(buyreq.getUser_id()); + + //保存订单 + //int order_id = dealQueueThread.buyOrdersService.insert(bo); +// BuyOrders orders = dealQueueThread.buyOrdersService.getById(order_id); +// buyreq.setOrder_id(order_id);//订单id +// buyreq.setBuyOrders(orders);//订单信息 + buyreq.setResponse_status(1);//处理完成状态 + } catch (Exception e) { + buyreq.setResponse_status(2);//异常状态 + log.error("DealQueueThread dealWithQueue:", e); + } + } +} \ No newline at end of file diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/form/BuyRequest.java b/star-compute-service/src/main/java/com/gui/star_compute_service/form/BuyRequest.java new file mode 100644 index 0000000..8f717d3 --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/form/BuyRequest.java @@ -0,0 +1,25 @@ +package com.gui.star_compute_service.form; + +import com.gui.star_compute_service.entity.BuyOrders; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel(value = "请求对象封装") +@Data +public class BuyRequest { + @ApiModelProperty(value = "商品ID") + private int good_id; + + @ApiModelProperty(value = "用户ID") + private int user_id; + + @ApiModelProperty(value = "订单ID") + private int order_id; + + @ApiModelProperty(value = "订单信息") + private BuyOrders buyOrders; + + @ApiModelProperty(value = "0:未处理;1:正常;2:异常") + private int response_status; +} \ No newline at end of file diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyGoodService.java b/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyGoodService.java new file mode 100644 index 0000000..82b0f11 --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyGoodService.java @@ -0,0 +1,16 @@ +package com.gui.star_compute_service.service; + +import org.springframework.stereotype.Service; + +@Service +public class BuyGoodService { + + /** + * 数据库中将剩余数量减一 + * @param good_id + */ + public void minusResidue(int good_id) { + System.out.println("准备将数据库中剩余数量减1"); + //TODO + } +} diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyOrdersService.java b/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyOrdersService.java new file mode 100644 index 0000000..558870e --- /dev/null +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/service/BuyOrdersService.java @@ -0,0 +1,7 @@ +package com.gui.star_compute_service.service; + +import org.springframework.stereotype.Service; + +@Service +public class BuyOrdersService { +} From f5eacdde5cdae04a56a0b26a998e6630440a7865 Mon Sep 17 00:00:00 2001 From: williamjava Date: Wed, 24 Apr 2019 17:12:02 +0800 Subject: [PATCH 20/24] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 510a5bc..bfd50d4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ #My practise on SpringCloud, based on SpringBoot. +分支latest为最新的内容. + It's easy for us to make a micro-service architecture using Spring Cloud. Here we need to know that what's micro-service. Just make it easy, micro-service is a concept. Its purpose is to make a complicate application into many small services. Each service can be built,maintained and extended alone. In my opinion, it's awesome. From c93415064de7e036cf8ee4c0ed987c33d222a2c6 Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Fri, 26 Apr 2019 16:22:06 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-compute-service-consul/src/main/resources/application.yml | 2 +- .../com/gui/star_compute_service/ComputeServiceApplication.java | 2 -- star-compute-service/src/main/resources/bootstrap.yml | 2 +- star-eureka-feign/src/main/resources/application.yml | 2 +- star-eureka-ribbon/src/main/resources/application.yml | 2 +- star-zuul/src/main/resources/application.yml | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/star-compute-service-consul/src/main/resources/application.yml b/star-compute-service-consul/src/main/resources/application.yml index 1ac029c..88fc993 100644 --- a/star-compute-service-consul/src/main/resources/application.yml +++ b/star-compute-service-consul/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 5558 + port: 8524 spring: application: diff --git a/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java b/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java index 291e08e..25cf6df 100644 --- a/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java +++ b/star-compute-service/src/main/java/com/gui/star_compute_service/ComputeServiceApplication.java @@ -3,7 +3,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * 注解@EnableDiscoveryClient的作用： 激活Eureka中的DiscoveryClient实现，用来发现服务注册中心的其他服务 @@ -14,7 +13,6 @@ * */ @EnableCaching -@EnableDiscoveryClient @SpringBootApplication public class ComputeServiceApplication { public static void main(String[] args) { diff --git a/star-compute-service/src/main/resources/bootstrap.yml b/star-compute-service/src/main/resources/bootstrap.yml index 6c06aac..25b0561 100644 --- a/star-compute-service/src/main/resources/bootstrap.yml +++ b/star-compute-service/src/main/resources/bootstrap.yml @@ -49,7 +49,7 @@ spring: service-id: config-server server: - port: 5558 + port: 8520 eureka: client: diff --git a/star-eureka-feign/src/main/resources/application.yml b/star-eureka-feign/src/main/resources/application.yml index 5bc9291..7a21ce0 100755 --- a/star-eureka-feign/src/main/resources/application.yml +++ b/star-eureka-feign/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: percentage: 1.0 server: - port: 8888 + port: 8522 eureka: client: diff --git a/star-eureka-ribbon/src/main/resources/application.yml b/star-eureka-ribbon/src/main/resources/application.yml index 6a692cc..1d52a5f 100755 --- a/star-eureka-ribbon/src/main/resources/application.yml +++ b/star-eureka-ribbon/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: name: ribbon-consumer server: - port: 7777 + port: 8521 eureka: client: diff --git a/star-zuul/src/main/resources/application.yml b/star-zuul/src/main/resources/application.yml index 62f6038..352c188 100755 --- a/star-zuul/src/main/resources/application.yml +++ b/star-zuul/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: name: api-gateway server: - port: 9999 + port: 8523 #### Zuul需要知道我们所有服务的地址，才能完成所有的映射配置。而实际上，我们在实现微服务架构时，服务名与服务实例地址的关系在eureka server中已经存在了， #### 所以只需要将Zuul注册到eureka server上去发现其他服务，我们就可以实现对serviceId的映射。 From 81aff639f684ec2db32b5abb28b6bbf25608e713 Mon Sep 17 00:00:00 2001 From: wuhoujian Date: Sun, 28 Apr 2019 17:35:02 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star-eureka-server/.gitignore | 1 + star-eureka-server/.idea/compiler.xml | 3 + star-eureka-server/.idea/encodings.xml | 1 + star-eureka-server/.idea/misc.xml | 1 + star-eureka-server/.idea/modules.xml | 1 + star-eureka-server/.idea/workspace.xml | 594 +++++++++++++++++-------- 6 files changed, 406 insertions(+), 195 deletions(-) diff --git a/star-eureka-server/.gitignore b/star-eureka-server/.gitignore index 4782c17..f4e4680 100644 --- a/star-eureka-server/.gitignore +++ b/star-eureka-server/.gitignore @@ -1,5 +1,6 @@ .classpath .project +.idea/ .settings/ target/ bin/ diff --git a/star-eureka-server/.idea/compiler.xml b/star-eureka-server/.idea/compiler.xml index feedad6..6194d5d 100644 --- a/star-eureka-server/.idea/compiler.xml +++ b/star-eureka-server/.idea/compiler.xml @@ -7,6 +7,7 @@ + @@ -16,6 +17,7 @@ + @@ -26,6 +28,7 @@ + + + eureka + Event + RefreshScopeRefreshedEvent + + @@ -83,7 +78,6 @@ @@ -117,11 +123,21 @@ - + + + + + + + + + + + + + - @@ -145,16 +201,22 @@ - - + + + - - + + + + + + + @@ -172,6 +234,19 @@ + + + + + @@ -230,6 +312,7 @@ + @@ -250,6 +333,14 @@ + + + + + + + + 1555322290754 @@ -265,14 +356,35 @@ - diff --git a/star-eureka-server/.idea/encodings.xml b/star-eureka-server/.idea/encodings.xml index 38b2fa7..a49c275 100644 --- a/star-eureka-server/.idea/encodings.xml +++ b/star-eureka-server/.idea/encodings.xml @@ -7,6 +7,9 @@ + + + \ No newline at end of file diff --git a/star-eureka-server/.idea/misc.xml b/star-eureka-server/.idea/misc.xml index 14ff250..a80ac33 100644 --- a/star-eureka-server/.idea/misc.xml +++ b/star-eureka-server/.idea/misc.xml @@ -13,6 +13,8 @@ diff --git a/star-eureka-server/.idea/modules.xml b/star-eureka-server/.idea/modules.xml index 04f8013..25c3773 100644 --- a/star-eureka-server/.idea/modules.xml +++ b/star-eureka-server/.idea/modules.xml @@ -8,6 +8,8 @@ + + diff --git a/star-eureka-server/.idea/workspace.xml b/star-eureka-server/.idea/workspace.xml index 4f2ac67..b5f99d3 100644 --- a/star-eureka-server/.idea/workspace.xml +++ b/star-eureka-server/.idea/workspace.xml @@ -2,6 +2,9 @@ + + + @@ -15,6 +18,8 @@ + + - - - - - - - - - - - - - - + - - + + - - + + - - + + @@ -104,6 +96,20 @@ @@ -126,11 +132,20 @@ - + - + + + + + + + + + + @@ -149,6 +164,7 @@ + @@ -158,40 +174,87 @@ - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + +