diff --git a/springcloud/第二篇代码/confsvr/pom.xml b/springcloud/第二篇代码/confsvr/pom.xml index 5c8cec2..b3356a1 100644 --- a/springcloud/第二篇代码/confsvr/pom.xml +++ b/springcloud/第二篇代码/confsvr/pom.xml @@ -1,65 +1,65 @@ - - - 4.0.0 - - com.fxb - demo - 0.0.1-SNAPSHOT - jar - - confsvr - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR5 - pom - import - - - - - - UTF-8 - UTF-8 - 1.8 - Camden.SR5 - - - - - org.springframework.cloud - spring-cloud-config-server - - - org.springframework.cloud - spring-cloud-starter-eureka - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - + + + 4.0.0 + + com.fxb + demo + 0.0.1-SNAPSHOT + jar + + confsvr + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.4.4.RELEASE + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR5 + pom + import + + + + + + UTF-8 + UTF-8 + 1.8 + Camden.SR5 + + + + + org.springframework.cloud + spring-cloud-config-server + + + org.springframework.cloud + spring-cloud-starter-eureka + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/springcloud/第二篇代码/confsvr/src/main/java/com/fxb/demo/ConfsvrApplication.java b/springcloud/第二篇代码/confsvr/src/main/java/com/fxb/demo/ConfsvrApplication.java index 3c94900..8c998db 100644 --- a/springcloud/第二篇代码/confsvr/src/main/java/com/fxb/demo/ConfsvrApplication.java +++ b/springcloud/第二篇代码/confsvr/src/main/java/com/fxb/demo/ConfsvrApplication.java @@ -1,16 +1,16 @@ -package com.fxb.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.config.server.EnableConfigServer; - -@SpringBootApplication -@EnableConfigServer -@EnableDiscoveryClient -public class ConfsvrApplication { - - public static void main(String[] args) { - SpringApplication.run(ConfsvrApplication.class, args); - } -} +package com.fxb.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootApplication +@EnableConfigServer +@EnableDiscoveryClient +public class ConfsvrApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfsvrApplication.class, args); + } +} diff --git a/springcloud/第二篇代码/confsvr/src/main/resources/application.yml b/springcloud/第二篇代码/confsvr/src/main/resources/application.yml index 131a36e..528c81c 100644 --- a/springcloud/第二篇代码/confsvr/src/main/resources/application.yml +++ b/springcloud/第二篇代码/confsvr/src/main/resources/application.yml @@ -1,29 +1,29 @@ -server: - port: 8888 - -eureka: - instance: - #注册服务的IP，而不是服务器名 - prefer-ip-address: true - client: - #向eureka注册服务 - register-with-eureka: true - #拉取注册表的本地副本 - fetch-registry: true - service-url: - #Eureka服务的位置(如果有多个注册中心，使用,分隔） - defaultZone: http://localhost:8761/eureka/ - -spring: - profiles: - # 使用文件系统来存储配置信息，需要设置为native - active: native - application: - name: confsvr - cloud: - config: - server: - native: - # 使用文件来存放配置文件,为每个应用程序提供用逗号分隔的文件夹列表 - searchLocations: file:///D:/configFolder/licensingservice,file:///D:/configFolder/organizationservice - +server: + port: 8888 + +eureka: + instance: + #注册服务的IP，而不是服务器名 + prefer-ip-address: true + client: + #向eureka注册服务 + register-with-eureka: true + #拉取注册表的本地副本 + fetch-registry: true + service-url: + #Eureka服务的位置(如果有多个注册中心，使用,分隔） + defaultZone: http://localhost:8761/eureka/ + +spring: + profiles: + # 使用文件系统来存储配置信息，需要设置为native + active: native + application: + name: confsvr + cloud: + config: + server: + native: + # 使用文件来存放配置文件,为每个应用程序提供用逗号分隔的文件夹列表 + searchLocations: file:///D:/configFolder/licensingservice,file:///D:/configFolder/organizationservice + diff --git a/springcloud/第二篇代码/confsvr/src/test/java/com/fxb/demo/ConfsvrApplicationTests.java b/springcloud/第二篇代码/confsvr/src/test/java/com/fxb/demo/ConfsvrApplicationTests.java index 3096743..a0173f1 100644 --- a/springcloud/第二篇代码/confsvr/src/test/java/com/fxb/demo/ConfsvrApplicationTests.java +++ b/springcloud/第二篇代码/confsvr/src/test/java/com/fxb/demo/ConfsvrApplicationTests.java @@ -1,16 +1,16 @@ -package com.fxb.demo; - -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 ConfsvrApplicationTests { - - @Test - public void contextLoads() { - } - -} +package com.fxb.demo; + +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 ConfsvrApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/springcloud/第二篇代码/eurekasvr/pom.xml b/springcloud/第二篇代码/eurekasvr/pom.xml index 5337b2a..260d4d0 100644 --- a/springcloud/第二篇代码/eurekasvr/pom.xml +++ b/springcloud/第二篇代码/eurekasvr/pom.xml @@ -1,72 +1,72 @@ - - - 4.0.0 - - com.fxb - eurekasvr - 0.0.1-SNAPSHOT - jar - - eurekasvr - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR5 - pom - import - - - - - - UTF-8 - UTF-8 - 1.8 - Camden.SR5 - - - - - org.springframework.cloud - spring-cloud-starter-eureka-server - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - + + + 4.0.0 + + com.fxb + eurekasvr + 0.0.1-SNAPSHOT + jar + + eurekasvr + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.4.4.RELEASE + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR5 + pom + import + + + + + + UTF-8 + UTF-8 + 1.8 + Camden.SR5 + + + + + org.springframework.cloud + spring-cloud-starter-eureka-server + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/springcloud/第二篇代码/eurekasvr/src/main/java/com/fxb/eurekasvr/EurekasvrApplication.java b/springcloud/第二篇代码/eurekasvr/src/main/java/com/fxb/eurekasvr/EurekasvrApplication.java index 0ee3302..37ec244 100644 --- a/springcloud/第二篇代码/eurekasvr/src/main/java/com/fxb/eurekasvr/EurekasvrApplication.java +++ b/springcloud/第二篇代码/eurekasvr/src/main/java/com/fxb/eurekasvr/EurekasvrApplication.java @@ -1,14 +1,14 @@ -package com.fxb.eurekasvr; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; - -@SpringBootApplication -@EnableEurekaServer -public class EurekasvrApplication { - - public static void main(String[] args) { - SpringApplication.run(EurekasvrApplication.class, args); - } -} +package com.fxb.eurekasvr; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekasvrApplication { + + public static void main(String[] args) { + SpringApplication.run(EurekasvrApplication.class, args); + } +} diff --git a/springcloud/第二篇代码/eurekasvr/src/main/resources/application.yml b/springcloud/第二篇代码/eurekasvr/src/main/resources/application.yml index b2db060..12cd213 100644 --- a/springcloud/第二篇代码/eurekasvr/src/main/resources/application.yml +++ b/springcloud/第二篇代码/eurekasvr/src/main/resources/application.yml @@ -1,12 +1,12 @@ -server: - port: 8761 - -eureka: - client: - #不注册自己 - register-with-eureka: false - #不在本地缓存注册表信息 - fetch-registry: false - server: - #接受请求前的等待实际，开发模式下不要开启 - #wait-time-in-ms-when-sync-empty: 5 +server: + port: 8761 + +eureka: + client: + #不注册自己 + register-with-eureka: false + #不在本地缓存注册表信息 + fetch-registry: false + server: + #接受请求前的等待实际，开发模式下不要开启 + #wait-time-in-ms-when-sync-empty: 5 diff --git a/springcloud/第二篇代码/eurekasvr/src/test/java/com/fxb/eurekasvr/EurekasvrApplicationTests.java b/springcloud/第二篇代码/eurekasvr/src/test/java/com/fxb/eurekasvr/EurekasvrApplicationTests.java index 3d21ad6..2821943 100644 --- a/springcloud/第二篇代码/eurekasvr/src/test/java/com/fxb/eurekasvr/EurekasvrApplicationTests.java +++ b/springcloud/第二篇代码/eurekasvr/src/test/java/com/fxb/eurekasvr/EurekasvrApplicationTests.java @@ -1,16 +1,16 @@ -package com.fxb.eurekasvr; - -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 EurekasvrApplicationTests { - - @Test - public void contextLoads() { - } - -} +package com.fxb.eurekasvr; + +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 EurekasvrApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/springcloud/第二篇代码/licensingservice/pom.xml b/springcloud/第二篇代码/licensingservice/pom.xml index d261802..9031c46 100644 --- a/springcloud/第二篇代码/licensingservice/pom.xml +++ b/springcloud/第二篇代码/licensingservice/pom.xml @@ -1,69 +1,69 @@ - - - 4.0.0 - - com.fxb - licensingservice - 0.0.1-SNAPSHOT - jar - - licensingservice - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR5 - pom - import - - - - - - UTF-8 - UTF-8 - 1.8 - Camden.SR5 - - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.cloud - spring-cloud-config-client - - - org.springframework.cloud - spring-cloud-starter-feign - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - + + + 4.0.0 + + com.fxb + licensingservice + 0.0.1-SNAPSHOT + jar + + licensingservice + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.4.4.RELEASE + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR5 + pom + import + + + + + + UTF-8 + UTF-8 + 1.8 + Camden.SR5 + + + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.cloud + spring-cloud-config-client + + + org.springframework.cloud + spring-cloud-starter-feign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Licensing.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Licensing.java index c31bc03..f5c5d3b 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Licensing.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Licensing.java @@ -1,31 +1,31 @@ -package com.fxb.licensingservice.Entity; - -import java.io.Serializable; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/22 19:52 - */ -public class Licensing implements Serializable { - private Organization organization; - private boolean isValid; - - public Organization getOrganization() { - return organization; - } - - public void setOrganization(Organization organization) { - this.organization = organization; - } - - public boolean isValid() { - return isValid; - } - - public void setValid(boolean valid) { - isValid = valid; - } -} +package com.fxb.licensingservice.Entity; + +import java.io.Serializable; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/22 19:52 + */ +public class Licensing implements Serializable { + private Organization organization; + private boolean isValid; + + public Organization getOrganization() { + return organization; + } + + public void setOrganization(Organization organization) { + this.organization = organization; + } + + public boolean isValid() { + return isValid; + } + + public void setValid(boolean valid) { + isValid = valid; + } +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Organization.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Organization.java index a2f4097..357bfa3 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Organization.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/Entity/Organization.java @@ -1,40 +1,40 @@ -package com.fxb.licensingservice.Entity; - -import java.io.Serializable; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/22 19:30 - */ -public class Organization implements Serializable { - - private String id; - private String name; - - public Organization() { - } - - public Organization(String id, String name) { - this.id = id; - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} +package com.fxb.licensingservice.Entity; + +import java.io.Serializable; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/22 19:30 + */ +public class Organization implements Serializable { + + private String id; + private String name; + + public Organization() { + } + + public Organization(String id, String name) { + this.id = id; + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/LicensingserviceApplication.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/LicensingserviceApplication.java index 5dde21f..6986b6e 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/LicensingserviceApplication.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/LicensingserviceApplication.java @@ -1,28 +1,28 @@ -package com.fxb.licensingservice; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -@SpringBootApplication -@EnableDiscoveryClient //使用不带Ribbon功能的Spring RestTemplate,其他情况下可删除 -@EnableFeignClients //使用Feign客户端进行服务调用，其他情况下可删除 -public class LicensingserviceApplication { - - /** - * 使用带有Ribbon 功能的Spring RestTemplate，其他情况可删除 - */ - @LoadBalanced - @Bean - public RestTemplate getRestTemplate(){ - return new RestTemplate(); - } - - public static void main(String[] args) { - SpringApplication.run(LicensingserviceApplication.class, args); - } -} +package com.fxb.licensingservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +@SpringBootApplication +@EnableDiscoveryClient //使用不带Ribbon功能的Spring RestTemplate,其他情况下可删除 +@EnableFeignClients //使用Feign客户端进行服务调用，其他情况下可删除 +public class LicensingserviceApplication { + + /** + * 使用带有Ribbon 功能的Spring RestTemplate，其他情况可删除 + */ + @LoadBalanced + @Bean + public RestTemplate getRestTemplate(){ + return new RestTemplate(); + } + + public static void main(String[] args) { + SpringApplication.run(LicensingserviceApplication.class, args); + } +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/client/OrganizationFeignClient.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/client/OrganizationFeignClient.java index 66b7ee1..162ec79 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/client/OrganizationFeignClient.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/client/OrganizationFeignClient.java @@ -1,27 +1,27 @@ -package com.fxb.licensingservice.client; - -import com.fxb.licensingservice.Entity.Organization; -import org.springframework.cloud.netflix.feign.FeignClient; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/23 17:24 - */ -@FeignClient("organizationservice")//使用FeignClient注解指定目标服务 -public interface OrganizationFeignClient { - - /** - * 获取组织信息 - * - * @param orgId 组织id - * @return Organization - */ - @RequestMapping(method = RequestMethod.GET, value = "/organization/{orgId}", consumes = "application/json") - Organization getOrganization(@PathVariable("orgId") String orgId); -} +package com.fxb.licensingservice.client; + +import com.fxb.licensingservice.Entity.Organization; +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/23 17:24 + */ +@FeignClient("organizationservice")//使用FeignClient注解指定目标服务 +public interface OrganizationFeignClient { + + /** + * 获取组织信息 + * + * @param orgId 组织id + * @return Organization + */ + @RequestMapping(method = RequestMethod.GET, value = "/organization/{orgId}", consumes = "application/json") + Organization getOrganization(@PathVariable("orgId") String orgId); +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/controller/LicensingController.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/controller/LicensingController.java index 6ffda79..fd78ec9 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/controller/LicensingController.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/controller/LicensingController.java @@ -1,56 +1,56 @@ -package com.fxb.licensingservice.controller; - -import com.fxb.licensingservice.Entity.Licensing; -import com.fxb.licensingservice.client.OrganizationFeignClient; -import com.fxb.licensingservice.service.OrganizationByRibbonService; -import com.fxb.licensingservice.service.OrganizationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestController; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/22 19:51 - */ -@RestController -public class LicensingController { - - private OrganizationService organizationService; - private OrganizationByRibbonService ribbonService; - private OrganizationFeignClient organizationFeignClient; - - @Autowired - public LicensingController(OrganizationService organizationService, OrganizationByRibbonService ribbonService, OrganizationFeignClient feignClient) { - this.organizationService = organizationService; - this.ribbonService = ribbonService; - this.organizationFeignClient = feignClient; - } - - @GetMapping("/licensing/{orgId}") - public Licensing getLicensing(@PathVariable("orgId") String orgId) { - Licensing licensing = new Licensing(); - licensing.setValid(false); - licensing.setOrganization(organizationService.getOrganization(orgId)); - return licensing; - } - - @GetMapping("/licensingByRibbon/{orgId}") - public Licensing getLicensingByRibbon(@PathVariable("orgId") String orgId) { - Licensing licensing = new Licensing(); - licensing.setValid(false); - licensing.setOrganization(ribbonService.getOrganizationWithRibbon(orgId)); - return licensing; - } - - @GetMapping("/licensingByFeign/{orgId}") - public Licensing getLicensingByFeign(@PathVariable("orgId") String orgId) { - Licensing licensing = new Licensing(); - licensing.setValid(false); - licensing.setOrganization(organizationFeignClient.getOrganization(orgId)); - return licensing; - } -} +package com.fxb.licensingservice.controller; + +import com.fxb.licensingservice.Entity.Licensing; +import com.fxb.licensingservice.client.OrganizationFeignClient; +import com.fxb.licensingservice.service.OrganizationByRibbonService; +import com.fxb.licensingservice.service.OrganizationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/22 19:51 + */ +@RestController +public class LicensingController { + + private OrganizationService organizationService; + private OrganizationByRibbonService ribbonService; + private OrganizationFeignClient organizationFeignClient; + + @Autowired + public LicensingController(OrganizationService organizationService, OrganizationByRibbonService ribbonService, OrganizationFeignClient feignClient) { + this.organizationService = organizationService; + this.ribbonService = ribbonService; + this.organizationFeignClient = feignClient; + } + + @GetMapping("/licensing/{orgId}") + public Licensing getLicensing(@PathVariable("orgId") String orgId) { + Licensing licensing = new Licensing(); + licensing.setValid(false); + licensing.setOrganization(organizationService.getOrganization(orgId)); + return licensing; + } + + @GetMapping("/licensingByRibbon/{orgId}") + public Licensing getLicensingByRibbon(@PathVariable("orgId") String orgId) { + Licensing licensing = new Licensing(); + licensing.setValid(false); + licensing.setOrganization(ribbonService.getOrganizationWithRibbon(orgId)); + return licensing; + } + + @GetMapping("/licensingByFeign/{orgId}") + public Licensing getLicensingByFeign(@PathVariable("orgId") String orgId) { + Licensing licensing = new Licensing(); + licensing.setValid(false); + licensing.setOrganization(organizationFeignClient.getOrganization(orgId)); + return licensing; + } +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationByRibbonService.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationByRibbonService.java index 8aae193..638892f 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationByRibbonService.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationByRibbonService.java @@ -1,32 +1,32 @@ -package com.fxb.licensingservice.service; - -import com.fxb.licensingservice.Entity.Organization; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/23 15:36 - */ -@Component -public class OrganizationByRibbonService { - - private RestTemplate restTemplate; - - @Autowired - public OrganizationByRibbonService(RestTemplate restTemplate) { - this.restTemplate = restTemplate; - } - - public Organization getOrganizationWithRibbon(String id) { - ResponseEntity responseEntity = restTemplate.exchange("http://organizationservice/organization/{id}", - HttpMethod.GET, null, Organization.class, id); - return responseEntity.getBody(); - } -} +package com.fxb.licensingservice.service; + +import com.fxb.licensingservice.Entity.Organization; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/23 15:36 + */ +@Component +public class OrganizationByRibbonService { + + private RestTemplate restTemplate; + + @Autowired + public OrganizationByRibbonService(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + } + + public Organization getOrganizationWithRibbon(String id) { + ResponseEntity responseEntity = restTemplate.exchange("http://organizationservice/organization/{id}", + HttpMethod.GET, null, Organization.class, id); + return responseEntity.getBody(); + } +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationService.java b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationService.java index ac79ce4..39d2327 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationService.java +++ b/springcloud/第二篇代码/licensingservice/src/main/java/com/fxb/licensingservice/service/OrganizationService.java @@ -1,50 +1,50 @@ -package com.fxb.licensingservice.service; - -import com.fxb.licensingservice.Entity.Organization; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; - -import java.util.List; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/22 19:29 - */ -@Service -public class OrganizationService { - - private static final String SERVICE_NAME = "organizationservice"; - private DiscoveryClient discoveryClient; - - @Autowired - public OrganizationService(DiscoveryClient discoveryClient) { - this.discoveryClient = discoveryClient; - } - - /** - * 使用Spring DiscoveryClient查询 - * - * @param id - * @return - */ - public Organization getOrganization(String id) { - RestTemplate restTemplate = new RestTemplate(); - List instances = discoveryClient.getInstances(SERVICE_NAME); - if (instances.size() == 0) { - throw new RuntimeException("无可用的服务"); - } - String serviceUri = String.format("%s/organization/%s", instances.get(0).getUri().toString(), id); - ResponseEntity responseEntity = restTemplate.exchange(serviceUri, HttpMethod.GET - , null, Organization.class, id); - return responseEntity.getBody(); - } - -} +package com.fxb.licensingservice.service; + +import com.fxb.licensingservice.Entity.Organization; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.util.List; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/22 19:29 + */ +@Service +public class OrganizationService { + + private static final String SERVICE_NAME = "organizationservice"; + private DiscoveryClient discoveryClient; + + @Autowired + public OrganizationService(DiscoveryClient discoveryClient) { + this.discoveryClient = discoveryClient; + } + + /** + * 使用Spring DiscoveryClient查询 + * + * @param id + * @return + */ + public Organization getOrganization(String id) { + RestTemplate restTemplate = new RestTemplate(); + List instances = discoveryClient.getInstances(SERVICE_NAME); + if (instances.size() == 0) { + throw new RuntimeException("无可用的服务"); + } + String serviceUri = String.format("%s/organization/%s", instances.get(0).getUri().toString(), id); + ResponseEntity responseEntity = restTemplate.exchange(serviceUri, HttpMethod.GET + , null, Organization.class, id); + return responseEntity.getBody(); + } + +} diff --git a/springcloud/第二篇代码/licensingservice/src/main/resources/bootstrap.yml b/springcloud/第二篇代码/licensingservice/src/main/resources/bootstrap.yml index d75fc7b..38f0059 100644 --- a/springcloud/第二篇代码/licensingservice/src/main/resources/bootstrap.yml +++ b/springcloud/第二篇代码/licensingservice/src/main/resources/bootstrap.yml @@ -1,19 +1,19 @@ -spring: - application: - #指定名称，以便spring cloud config客户端知道查找哪个配置 - name: licensingservice - profiles: - #指定环境 - active: dev - cloud: - config: - enabled: true -eureka: - instance: - prefer-ip-address: true - client: - register-with-eureka: true - fetch-registry: true - service-url: - defaultZone: http://localhost:8761/eureka/ - +spring: + application: + #指定名称，以便spring cloud config客户端知道查找哪个配置 + name: licensingservice + profiles: + #指定环境 + active: dev + cloud: + config: + enabled: true +eureka: + instance: + prefer-ip-address: true + client: + register-with-eureka: true + fetch-registry: true + service-url: + defaultZone: http://localhost:8761/eureka/ + diff --git a/springcloud/第二篇代码/licensingservice/src/test/java/com/fxb/licensingservice/LicensingserviceApplicationTests.java b/springcloud/第二篇代码/licensingservice/src/test/java/com/fxb/licensingservice/LicensingserviceApplicationTests.java index d29b4bf..a39aacc 100644 --- a/springcloud/第二篇代码/licensingservice/src/test/java/com/fxb/licensingservice/LicensingserviceApplicationTests.java +++ b/springcloud/第二篇代码/licensingservice/src/test/java/com/fxb/licensingservice/LicensingserviceApplicationTests.java @@ -1,16 +1,16 @@ -package com.fxb.licensingservice; - -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 LicensingserviceApplicationTests { - - @Test - public void contextLoads() { - } - -} +package com.fxb.licensingservice; + +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 LicensingserviceApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/springcloud/第二篇代码/organizationservice/pom.xml b/springcloud/第二篇代码/organizationservice/pom.xml index 421deea..b7f168d 100644 --- a/springcloud/第二篇代码/organizationservice/pom.xml +++ b/springcloud/第二篇代码/organizationservice/pom.xml @@ -1,65 +1,65 @@ - - - 4.0.0 - - com.fxb - organizationservice - 0.0.1-SNAPSHOT - jar - - organizationservice - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR5 - pom - import - - - - - - UTF-8 - UTF-8 - 1.8 - Camden.SR5 - - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.cloud - spring-cloud-config-client - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - + + + 4.0.0 + + com.fxb + organizationservice + 0.0.1-SNAPSHOT + jar + + organizationservice + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.4.4.RELEASE + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR5 + pom + import + + + + + + UTF-8 + UTF-8 + 1.8 + Camden.SR5 + + + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.cloud + spring-cloud-config-client + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/OrganizationserviceApplication.java b/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/OrganizationserviceApplication.java index 8da4995..6c5c1eb 100644 --- a/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/OrganizationserviceApplication.java +++ b/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/OrganizationserviceApplication.java @@ -1,14 +1,14 @@ -package com.fxb.organizationservice; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -@SpringBootApplication -@EnableDiscoveryClient -public class OrganizationserviceApplication { - - public static void main(String[] args) { - SpringApplication.run(OrganizationserviceApplication.class, args); - } -} +package com.fxb.organizationservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +@EnableDiscoveryClient +public class OrganizationserviceApplication { + + public static void main(String[] args) { + SpringApplication.run(OrganizationserviceApplication.class, args); + } +} diff --git a/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/controller/OrganizationController.java b/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/controller/OrganizationController.java index 6d37cf1..3947cab 100644 --- a/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/controller/OrganizationController.java +++ b/springcloud/第二篇代码/organizationservice/src/main/java/com/fxb/organizationservice/controller/OrganizationController.java @@ -1,27 +1,27 @@ -package com.fxb.organizationservice.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2018/11/22 18:23 - */ -@RestController -public class OrganizationController { - - @GetMapping(value = "/organization/{orgId}") - public Object getOrganizationInfo(@PathVariable("orgId") String orgId) { - Map data = new HashMap<>(2); - data.put("id", orgId); - data.put("name", orgId + "公司"); - return data; - } -} +package com.fxb.organizationservice.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2018/11/22 18:23 + */ +@RestController +public class OrganizationController { + + @GetMapping(value = "/organization/{orgId}") + public Object getOrganizationInfo(@PathVariable("orgId") String orgId) { + Map data = new HashMap<>(2); + data.put("id", orgId); + data.put("name", orgId + "公司"); + return data; + } +} diff --git a/springcloud/第二篇代码/organizationservice/src/main/resources/bootstrap.yml b/springcloud/第二篇代码/organizationservice/src/main/resources/bootstrap.yml index f776ec4..d8e721f 100644 --- a/springcloud/第二篇代码/organizationservice/src/main/resources/bootstrap.yml +++ b/springcloud/第二篇代码/organizationservice/src/main/resources/bootstrap.yml @@ -1,18 +1,18 @@ -spring: - application: - #指定名称，以便spring cloud config客户端知道查找哪个配置 - name: organizationservice - profiles: - #指定环境 - active: dev - cloud: - config: - enabled: true -eureka: - instance: - prefer-ip-address: true - client: - register-with-eureka: true - fetch-registry: true - service-url: +spring: + application: + #指定名称，以便spring cloud config客户端知道查找哪个配置 + name: organizationservice + profiles: + #指定环境 + active: dev + cloud: + config: + enabled: true +eureka: + instance: + prefer-ip-address: true + client: + register-with-eureka: true + fetch-registry: true + service-url: defaultZone: http://localhost:8761/eureka/ \ No newline at end of file diff --git a/springcloud/第二篇代码/organizationservice/src/test/java/com/fxb/organizationservice/OrganizationserviceApplicationTests.java b/springcloud/第二篇代码/organizationservice/src/test/java/com/fxb/organizationservice/OrganizationserviceApplicationTests.java index 8909128..c4a8db7 100644 --- a/springcloud/第二篇代码/organizationservice/src/test/java/com/fxb/organizationservice/OrganizationserviceApplicationTests.java +++ b/springcloud/第二篇代码/organizationservice/src/test/java/com/fxb/organizationservice/OrganizationserviceApplicationTests.java @@ -1,16 +1,16 @@ -package com.fxb.organizationservice; - -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 OrganizationserviceApplicationTests { - - @Test - public void contextLoads() { - } - -} +package com.fxb.organizationservice; + +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 OrganizationserviceApplicationTests { + + @Test + public void contextLoads() { + } + +}