commmit

Chapter1-1-1/compute-service/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.5.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -42,7 +42,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.RELEASE</version>
+				<version>Dalston.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

Chapter1-1-1/eureka-server/pom.xml

@@ -12,10 +12,10 @@
 	<description>Spring Cloud project</description>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
@@ -43,7 +43,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.RELEASE</version>
+				<version>Dalston.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

Chapter1-1-1/eureka-server/src/main/java/com/didispace/Application.java → Chapter1-1-1/eureka-server/src/main/java/com/didispace/EurekaServerApplication.java

@@ -6,10 +6,10 @@
 
 @EnableEurekaServer
 @SpringBootApplication
-public class Application {
+public class EurekaServerApplication {
 
 	public static void main(String[] args) {
-		new SpringApplicationBuilder(Application.class).web(true).run(args);
+		new SpringApplicationBuilder(EurekaServerApplication.class).web(true).run(args);
 	}
 
 }

Chapter1-1-1/eureka-server/src/main/resources/application.properties

@@ -1,6 +1,12 @@
-server.port=1111
+#server.port=1111
 #eureka.instance.hostname=localhost
+#
+#eureka.client.register-with-eureka=false
+#eureka.client.fetch-registry=false
+#eureka.client.serviceUrl.defaultZone=http://localhost:${server.port}/eureka/
 
+spring.application.name=eureka-server
+server.port=1111
+eureka.instance.hostname=localhost
 eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
-eureka.client.serviceUrl.defaultZone=http://localhost:${server.port}/eureka/
+eureka.client.fetch-registry=false

Chapter1-1-4/config-server/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
+		<version>1.5.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -43,7 +43,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.RELEASE</version>
+				<version>Dalston.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

Chapter1-1-4/config-server/src/main/resources/application.properties

@@ -2,10 +2,10 @@ spring.application.name=config-server
 server.port=7001
 
 # git��������
-spring.cloud.config.server.git.uri=http://git.oschina.net/didispace/SpringBoot-Learning/
-spring.cloud.config.server.git.searchPaths=Chapter9-1-4/config-repo
-spring.cloud.config.server.git.username=username
-spring.cloud.config.server.git.password=password
+spring.cloud.config.server.git.uri=https://gitee.com/pdb2010/config-server
+#spring.cloud.config.server.git.searchPaths=Chapter9-1-4/config-repo
+spring.cloud.config.server.git.username=pangdabo2010@hotmail.com
+spring.cloud.config.server.git.password=ZXCVbnm.123
 
 # ������������
 spring.profiles.active=native

Chapter1-1-7/config-client-eureka-kafka/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.7.RELEASE</version>
+		<version>1.5.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -59,7 +59,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.SR5</version>
+				<version>Dalston.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

Chapter1-1-7/config-client-eureka-kafka/src/main/java/com/didispace/Application.java → Chapter1-1-7/config-client-eureka-kafka/src/main/java/com/didispace/ConfigClientEurekaKafkaApplication.java

@@ -6,10 +6,10 @@
 
 @EnableDiscoveryClient
 @SpringBootApplication
-public class Application {
+public class ConfigClientEurekaKafkaApplication {
 
 	public static void main(String[] args) {
-		new SpringApplicationBuilder(Application.class).web(true).run(args);
+		new SpringApplicationBuilder(ConfigClientEurekaKafkaApplication.class).web(true).run(args);
 	}
 
 }

Chapter1-1-7/config-server-eureka-kafka/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.7.RELEASE</version>
+		<version>1.5.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -43,7 +43,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.SR5</version>
+				<version>Dalston.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

Chapter1-1-7/config-server-eureka-kafka/src/main/java/com/didispace/Application.java → Chapter1-1-7/config-server-eureka-kafka/src/main/java/com/didispace/ConfigServerEurekaKafkaApplication.java

@@ -8,10 +8,10 @@
 @EnableDiscoveryClient
 @EnableConfigServer
 @SpringBootApplication
-public class Application {
+public class ConfigServerEurekaKafkaApplication {
 
 	public static void main(String[] args) {
-		new SpringApplicationBuilder(Application.class).web(true).run(args);
+		new SpringApplicationBuilder(ConfigServerEurekaKafkaApplication.class).web(true).run(args);
 	}
 
 }

Chapter1-1-7/config-server-eureka-kafka/src/main/resources/application.properties

@@ -4,11 +4,16 @@ server.port=7001
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 
 # git��������
-spring.cloud.config.server.git.uri=http://git.oschina.net/didispace/SpringCloud-Learning/
-spring.cloud.config.server.git.searchPaths=Chapter1-1-7/config-repo
-spring.cloud.config.server.git.username=username
-spring.cloud.config.server.git.password=password
+spring.cloud.config.server.git.uri=https://gitee.com/pdb2010/config-server
+#spring.cloud.config.server.git.searchPaths=Chapter1-1-7/config-repo
+spring.cloud.config.server.git.username=pangdabo2010@hotmail.com
+spring.cloud.config.server.git.password=ZXCVbnm.123
 
 #kafka
 spring.cloud.stream.kafka.binder.zk-nodes=localhost:2181
-spring.cloud.stream.kafka.binder.brokers=localhost:9092
+spring.cloud.stream.kafka.binder.brokers=localhost:9092
+
+#spring.cloud.stream.kafka.binder.brokers 	            Kafka�ķ�����б� 	    localhost
+#spring.cloud.stream.kafka.binder.defaultBrokerPort 	Kafka����˵�Ĭ�϶˿ڣ���brokers������û�����ö˿���Ϣʱ���ͻ�ʹ�����Ĭ�϶˿� 	9092
+#spring.cloud.stream.kafka.binder.zkNodes 	            Kafka��������ӵ�ZooKeeper�ڵ��б� 	localhost
+#spring.cloud.stream.kafka.binder.defaultZkPort 	    ZooKeeper�ڵ��Ĭ�϶˿ڣ���zkNodes������û�����ö˿���Ϣʱ���ͻ�ʹ�����Ĭ�϶˿� 	2181