引用包修改

pcloud-common/pom.xml

@@ -53,6 +53,22 @@
 			<artifactId>spring-cloud-starter-feign</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-ribbon</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-turbine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-hystrix</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
 		</dependency>
@@ -70,12 +86,6 @@
 			<version>1.0.0-rc.2</version>
 		</dependency>
 		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>3.2.0</version>
-		</dependency>
-
-		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-influx</artifactId>
 			<version>1.0.0-rc.2</version>
@@ -90,14 +100,6 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
 		<dependency>
@@ -153,6 +155,12 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>

pom.xml

@@ -49,7 +49,6 @@
 				<pcloud-common-core.version>2.1.0-RELEASE</pcloud-common-core.version>
 			</properties>
 		</profile>
-
 		<!-- 压测环境 -->
 		<profile>
 			<id>perf</id>
@@ -71,8 +70,7 @@
 				<pcloud-common-core.version>2.1.0-RELEASE</pcloud-common-core.version>
 			</properties>
 		</profile>
-
-		<!-- 生产环境 RAYS-->
+		<!-- 生产环境 RAYS -->
 		<profile>
 			<id>prod</id>
 			<build>
@@ -93,35 +91,13 @@
 				<pcloud-common-core.version>2.1.1-RELEASE</pcloud-common-core.version>
 			</properties>
 		</profile>
-
-		<!-- 生产环境 SAYS-->
-		<profile>
-			<id>prodsays</id>
-			<build>
-				<resources>
-					<resource>
-						<directory>src/main/resources</directory>
-					</resource>
-					<resource>
-						<directory>src/main/resources.prodsays</directory>
-					</resource>
-				</resources>
-			</build>
-			<properties>
-				<!-- 部署环境(对应配置文件版本) -->
-				<env>prodsays</env>
-				<pcloud-common.version>2.2.1-RELEASE</pcloud-common.version>
-				<pcloud-common-config.version>2.2.1-RELEASE</pcloud-common-config.version>
-				<pcloud-common-core.version>2.2.1-RELEASE</pcloud-common-core.version>
-			</properties>
-		</profile>
 	</profiles>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Dalston.SR1</spring-cloud.version>
+		<spring-cloud.version>Dalston.SR3</spring-cloud.version>
 		<spring.data.solr.version>2.1.7.RELEASE</spring.data.solr.version>
 
 		<!-- frameworks -->