升级F版本至Greenwich.SR2

AlgerFan · Nov 27, 2019 · a941e98 · a941e98
1 parent aee0c9d
commit a941e98
Show file tree

Hide file tree

Showing 133 changed files with 48 additions and 158 deletions.
diff --git a/README.md b/README.md
diff --git a/api-gateway/.gitignore b/api-gateway/.gitignore
diff --git a/api-gateway/Dockerfile b/api-gateway/Dockerfile
diff --git a/api-gateway/build.sh b/api-gateway/build.sh
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
     </properties>
 
     <dependencies>

diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/ApiGatewayApplication.java b/api-gateway/src/main/java/cn/algerfan/apigateway/ApiGatewayApplication.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/ZuulConfig.java b/api-gateway/src/main/java/cn/algerfan/apigateway/ZuulConfig.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/config/CorsConfig.java b/api-gateway/src/main/java/cn/algerfan/apigateway/config/CorsConfig.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/constant/CookieConstant.java b/api-gateway/src/main/java/cn/algerfan/apigateway/constant/CookieConstant.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/constant/RedisConstant.java b/api-gateway/src/main/java/cn/algerfan/apigateway/constant/RedisConstant.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AddResponseHeaderFilter.java b/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AddResponseHeaderFilter.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AuthBuyerFilter.java b/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AuthBuyerFilter.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AuthSellerFilter.java b/api-gateway/src/main/java/cn/algerfan/apigateway/filter/AuthSellerFilter.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/filter/RateLimitFilter.java b/api-gateway/src/main/java/cn/algerfan/apigateway/filter/RateLimitFilter.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/filter/TokenFilter.java b/api-gateway/src/main/java/cn/algerfan/apigateway/filter/TokenFilter.java
diff --git a/api-gateway/src/main/java/cn/algerfan/apigateway/util/CookieUtil.java b/api-gateway/src/main/java/cn/algerfan/apigateway/util/CookieUtil.java
diff --git a/api-gateway/src/main/resources/bootstrap.yml b/api-gateway/src/main/resources/bootstrap.yml
diff --git a/api-gateway/src/test/java/cn/algerfan/apigateway/ApiGatewayApplicationTests.java b/api-gateway/src/test/java/cn/algerfan/apigateway/ApiGatewayApplicationTests.java
diff --git a/client/.gitignore b/client/.gitignore
diff --git a/client/pom.xml b/client/pom.xml
diff --git a/client/src/main/java/cn/algerfan/client/ClientApplication.java b/client/src/main/java/cn/algerfan/client/ClientApplication.java
diff --git a/client/src/test/java/cn/algerfan/client/ClientApplicationTests.java b/client/src/test/java/cn/algerfan/client/ClientApplicationTests.java
diff --git a/config/.gitignore b/config/.gitignore
diff --git a/config/Dockerfile b/config/Dockerfile
diff --git a/config/build.sh b/config/build.sh
diff --git a/config/pom.xml b/config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
     </properties>
 
     <dependencies>

diff --git a/config/src/main/java/cn/algerfan/config/ConfigApplication.java b/config/src/main/java/cn/algerfan/config/ConfigApplication.java
diff --git a/config/src/main/resources/application.yml b/config/src/main/resources/application.yml
diff --git a/config/src/test/java/cn/algerfan/config/ConfigApplicationTests.java b/config/src/test/java/cn/algerfan/config/ConfigApplicationTests.java
diff --git a/eureka/.gitignore b/eureka/.gitignore
diff --git a/eureka/Dockerfile b/eureka/Dockerfile
diff --git a/eureka/build.sh b/eureka/build.sh
diff --git a/eureka/pom.xml b/eureka/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
     </properties>
 
     <dependencies>

diff --git a/eureka/src/main/java/cn/algerfan/eureka/EurekaApplication.java b/eureka/src/main/java/cn/algerfan/eureka/EurekaApplication.java
diff --git a/eureka/src/main/resources/application-eureka1.yml b/eureka/src/main/resources/application-eureka1.yml
@@ -0,0 +1,14 @@
+server:
+  port: 8761
+spring:
+  application:
+    name: eureka
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8762/eureka/
+    register-with-eureka: false
+  server:
+    enable-self-preservation: false
+  instance:
+    prefer-ip-address: true
diff --git a/client/src/main/resources/application.yml → ...rc/main/resources/application-eureka2.yml b/client/src/main/resources/application.yml → ...rc/main/resources/application-eureka2.yml
@@ -1,9 +1,14 @@
+server:
+  port: 8762
+spring:
+  application:
+    name: eureka
 eureka:
   client:
     service-url:
       defaultZone: http://localhost:8761/eureka/
+    register-with-eureka: false
+  server:
+    enable-self-preservation: false
   instance:
     prefer-ip-address: true
-spring:
-  application:
-    name: client
diff --git a/eureka/src/main/resources/application.yml b/eureka/src/main/resources/application.yml
@@ -1,14 +1,3 @@
-server:
-  port: 8761
 spring:
-  application:
-    name: eureka
-eureka:
-  client:
-    service-url:
-      defaultZone: http://localhost:8761/eureka/
-    register-with-eureka: false
-  server:
-    enable-self-preservation: false
-  instance:
-    prefer-ip-address: true
+  profiles:
+    active: eureka1
diff --git a/eureka/src/test/java/cn/algerfan/eureka/EurekaApplicationTests.java b/eureka/src/test/java/cn/algerfan/eureka/EurekaApplicationTests.java
diff --git a/order/.gitignore b/order/.gitignore
diff --git a/order/Dockerfile b/order/Dockerfile
diff --git a/order/build.sh b/order/build.sh
diff --git a/order/order-client/pom.xml b/order/order-client/pom.xml
diff --git a/order/order-common/pom.xml b/order/order-common/pom.xml
diff --git a/order/order-server/pom.xml b/order/order-server/pom.xml
@@ -48,7 +48,7 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>
-        <!--     2.0.2.RELEASE没有web依赖-->
+        <!--     spring cloud没有web依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -64,6 +64,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/OrderApplication.java b/order/order-server/src/main/java/cn/algerfan/order/server/OrderApplication.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/bus/GirlConfig.java b/order/order-server/src/main/java/cn/algerfan/order/server/bus/GirlConfig.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/bus/GirlController.java b/order/order-server/src/main/java/cn/algerfan/order/server/bus/GirlController.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/config/RestTemplateConfig.java b/order/order-server/src/main/java/cn/algerfan/order/server/config/RestTemplateConfig.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/controller/ClientController.java b/order/order-server/src/main/java/cn/algerfan/order/server/controller/ClientController.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/controller/EnvController.java b/order/order-server/src/main/java/cn/algerfan/order/server/controller/EnvController.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/controller/HystrixController.java b/order/order-server/src/main/java/cn/algerfan/order/server/controller/HystrixController.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/controller/OrderController.java b/order/order-server/src/main/java/cn/algerfan/order/server/controller/OrderController.java
diff --git a/...order-server/src/main/java/cn/algerfan/order/server/controller/SendMessageController.java b/...order-server/src/main/java/cn/algerfan/order/server/controller/SendMessageController.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/converter/OrderFormToOrderDto.java b/order/order-server/src/main/java/cn/algerfan/order/server/converter/OrderFormToOrderDto.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderDetail.java b/order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderDetail.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderMaster.java b/order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderMaster.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/dto/OrderDto.java b/order/order-server/src/main/java/cn/algerfan/order/server/dto/OrderDto.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/enums/OrderStatus.java b/order/order-server/src/main/java/cn/algerfan/order/server/enums/OrderStatus.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/enums/PayStatus.java b/order/order-server/src/main/java/cn/algerfan/order/server/enums/PayStatus.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/enums/Result.java b/order/order-server/src/main/java/cn/algerfan/order/server/enums/Result.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/exception/OrderException.java b/order/order-server/src/main/java/cn/algerfan/order/server/exception/OrderException.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/form/OrderForm.java b/order/order-server/src/main/java/cn/algerfan/order/server/form/OrderForm.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/message/MqReceiver.java b/order/order-server/src/main/java/cn/algerfan/order/server/message/MqReceiver.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/message/ProductReceiver.java b/order/order-server/src/main/java/cn/algerfan/order/server/message/ProductReceiver.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/message/StreamClient.java b/order/order-server/src/main/java/cn/algerfan/order/server/message/StreamClient.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/message/StreamReceiver.java b/order/order-server/src/main/java/cn/algerfan/order/server/message/StreamReceiver.java
diff --git a/...order-server/src/main/java/cn/algerfan/order/server/repository/OrderDetailRepository.java b/...order-server/src/main/java/cn/algerfan/order/server/repository/OrderDetailRepository.java
diff --git a/...order-server/src/main/java/cn/algerfan/order/server/repository/OrderMasterRepository.java b/...order-server/src/main/java/cn/algerfan/order/server/repository/OrderMasterRepository.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/service/OrderService.java b/order/order-server/src/main/java/cn/algerfan/order/server/service/OrderService.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/service/impl/OrderServiceImpl.java b/order/order-server/src/main/java/cn/algerfan/order/server/service/impl/OrderServiceImpl.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/util/JsonUtil.java b/order/order-server/src/main/java/cn/algerfan/order/server/util/JsonUtil.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/util/KeyUtil.java b/order/order-server/src/main/java/cn/algerfan/order/server/util/KeyUtil.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/util/ResultVoUtil.java b/order/order-server/src/main/java/cn/algerfan/order/server/util/ResultVoUtil.java
diff --git a/order/order-server/src/main/java/cn/algerfan/order/server/vo/ResultVo.java b/order/order-server/src/main/java/cn/algerfan/order/server/vo/ResultVo.java
diff --git a/order/order-server/src/main/resources/bootstrap.yml b/order/order-server/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8082
+  port: 8051
 eureka:
   client:
     service-url:

diff --git a/order/order-server/src/test/java/cn/algerfan/order/server/MySenderTest.java b/order/order-server/src/test/java/cn/algerfan/order/server/MySenderTest.java
diff --git a/order/order-server/src/test/java/cn/algerfan/order/server/OrderApplicationTests.java b/order/order-server/src/test/java/cn/algerfan/order/server/OrderApplicationTests.java
diff --git a/...r-server/src/test/java/cn/algerfan/order/server/repository/OrderDetailRepositoryTest.java b/...r-server/src/test/java/cn/algerfan/order/server/repository/OrderDetailRepositoryTest.java
diff --git a/...r-server/src/test/java/cn/algerfan/order/server/repository/OrderMasterRepositoryTest.java b/...r-server/src/test/java/cn/algerfan/order/server/repository/OrderMasterRepositoryTest.java
diff --git a/order/pom.xml b/order/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/>
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -22,9 +22,10 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
         <product-client.version>0.0.1-SNAPSHOT</product-client.version>
         <product-common.version>0.0.1-SNAPSHOT</product-common.version>
+        <mysql.version>5.1.46</mysql.version>
     </properties>
 
     <dependencyManagement>

diff --git a/product/.gitignore b/product/.gitignore
diff --git a/product/Dockerfile b/product/Dockerfile
diff --git a/product/build.sh b/product/build.sh
diff --git a/product/pom.xml b/product/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/>
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -22,7 +22,8 @@
 
    <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
+       <mysql.version>5.1.46</mysql.version>
     </properties>
 
     <dependencyManagement>

diff --git a/product/product-client/pom.xml b/product/product-client/pom.xml
diff --git a/product/product-client/src/main/java/cn/algerfan/product/client/ProductClient.java b/product/product-client/src/main/java/cn/algerfan/product/client/ProductClient.java
diff --git a/product/product-common/pom.xml b/product/product-common/pom.xml
diff --git a/product/product-common/src/main/java/cn/algerfan/product/common/DecreaseStockOutput.java b/product/product-common/src/main/java/cn/algerfan/product/common/DecreaseStockOutput.java
diff --git a/product/product-common/src/main/java/cn/algerfan/product/common/ProductInfoOutput.java b/product/product-common/src/main/java/cn/algerfan/product/common/ProductInfoOutput.java
diff --git a/product/product-server/pom.xml b/product/product-server/pom.xml
@@ -32,7 +32,7 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>
-        <!--    2.0.2.RELEASE没有web依赖-->
+        <!--    spring cloud没有web依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -44,6 +44,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/ProductApplication.java b/product/product-server/src/main/java/cn/algerfan/product/server/ProductApplication.java
diff --git a/...product-server/src/main/java/cn/algerfan/product/server/controller/ProductController.java b/...product-server/src/main/java/cn/algerfan/product/server/controller/ProductController.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/domain/ProductCategory.java b/product/product-server/src/main/java/cn/algerfan/product/server/domain/ProductCategory.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/domain/ProductInfo.java b/product/product-server/src/main/java/cn/algerfan/product/server/domain/ProductInfo.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/enums/ProductStatusEnum.java b/product/product-server/src/main/java/cn/algerfan/product/server/enums/ProductStatusEnum.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/enums/ResultEnum.java b/product/product-server/src/main/java/cn/algerfan/product/server/enums/ResultEnum.java
diff --git a/...t/product-server/src/main/java/cn/algerfan/product/server/exception/ProductException.java b/...t/product-server/src/main/java/cn/algerfan/product/server/exception/ProductException.java
diff --git a/...server/src/main/java/cn/algerfan/product/server/repository/ProductCategoryRepository.java b/...server/src/main/java/cn/algerfan/product/server/repository/ProductCategoryRepository.java
diff --git a/...uct-server/src/main/java/cn/algerfan/product/server/repository/ProductInfoRepository.java b/...uct-server/src/main/java/cn/algerfan/product/server/repository/ProductInfoRepository.java
diff --git a/...oduct-server/src/main/java/cn/algerfan/product/server/service/ProductCategoryService.java b/...oduct-server/src/main/java/cn/algerfan/product/server/service/ProductCategoryService.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/service/ProductService.java b/product/product-server/src/main/java/cn/algerfan/product/server/service/ProductService.java
diff --git a/...ver/src/main/java/cn/algerfan/product/server/service/impl/ProductCategoryServiceImpl.java b/...ver/src/main/java/cn/algerfan/product/server/service/impl/ProductCategoryServiceImpl.java
diff --git a/...duct-server/src/main/java/cn/algerfan/product/server/service/impl/ProductServiceImpl.java b/...duct-server/src/main/java/cn/algerfan/product/server/service/impl/ProductServiceImpl.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/util/JsonUtil.java b/product/product-server/src/main/java/cn/algerfan/product/server/util/JsonUtil.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/util/ResultVoUtil.java b/product/product-server/src/main/java/cn/algerfan/product/server/util/ResultVoUtil.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/vo/ProductInfoVo.java b/product/product-server/src/main/java/cn/algerfan/product/server/vo/ProductInfoVo.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/vo/ProductVo.java b/product/product-server/src/main/java/cn/algerfan/product/server/vo/ProductVo.java
diff --git a/product/product-server/src/main/java/cn/algerfan/product/server/vo/ResultVo.java b/product/product-server/src/main/java/cn/algerfan/product/server/vo/ResultVo.java
diff --git a/product/product-server/src/main/resources/bootstrap.yml b/product/product-server/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8061
 eureka:
   client:
     service-url:
@@ -15,3 +15,6 @@ spring:
         enabled: true
         service-id: CONFIG
       profile: dev
+# Finchley 升级 Greenwich，这是Spring Boot 2.1 后新增的属性运行bean 覆盖
+  main:
+    allow-bean-definition-overriding: true
diff --git a/product/product-server/src/test/java/cn/algerfan/product/server/ProductApplicationTests.java b/product/product-server/src/test/java/cn/algerfan/product/server/ProductApplicationTests.java
diff --git a/...er/src/test/java/cn/algerfan/product/server/repository/ProductCategoryRepositoryTest.java b/...er/src/test/java/cn/algerfan/product/server/repository/ProductCategoryRepositoryTest.java
diff --git a/...server/src/test/java/cn/algerfan/product/server/repository/ProductInfoRepositoryTest.java b/...server/src/test/java/cn/algerfan/product/server/repository/ProductInfoRepositoryTest.java
diff --git a/...t-server/src/test/java/cn/algerfan/product/server/service/ProductCategoryServiceTest.java b/...t-server/src/test/java/cn/algerfan/product/server/service/ProductCategoryServiceTest.java
diff --git a/...oduct-server/src/test/java/cn/algerfan/product/server/service/ProductServiceImplTest.java b/...oduct-server/src/test/java/cn/algerfan/product/server/service/ProductServiceImplTest.java
diff --git a/user/.gitignore b/user/.gitignore
diff --git a/user/Dockerfile b/user/Dockerfile
diff --git a/user/build.sh b/user/build.sh
diff --git a/user/pom.xml b/user/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cn.algerfan</groupId>
@@ -20,7 +20,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
     </properties>
 
     <dependencyManagement>

diff --git a/user/user-server/pom.xml b/user/user-server/pom.xml
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/UserApplication.java b/user/user-server/src/main/java/cn/algerfan/user/server/UserApplication.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/constant/CookieConstant.java b/user/user-server/src/main/java/cn/algerfan/user/server/constant/CookieConstant.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/constant/RedisConstant.java b/user/user-server/src/main/java/cn/algerfan/user/server/constant/RedisConstant.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/controller/UserController.java b/user/user-server/src/main/java/cn/algerfan/user/server/controller/UserController.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/domain/UserInfo.java b/user/user-server/src/main/java/cn/algerfan/user/server/domain/UserInfo.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/enums/ResultEnum.java b/user/user-server/src/main/java/cn/algerfan/user/server/enums/ResultEnum.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/enums/RoleEnum.java b/user/user-server/src/main/java/cn/algerfan/user/server/enums/RoleEnum.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/repository/UserInfoRepository.java b/user/user-server/src/main/java/cn/algerfan/user/server/repository/UserInfoRepository.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/service/UserService.java b/user/user-server/src/main/java/cn/algerfan/user/server/service/UserService.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/service/impl/UserServiceImpl.java b/user/user-server/src/main/java/cn/algerfan/user/server/service/impl/UserServiceImpl.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/util/CookieUtil.java b/user/user-server/src/main/java/cn/algerfan/user/server/util/CookieUtil.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/util/ResultVoUtil.java b/user/user-server/src/main/java/cn/algerfan/user/server/util/ResultVoUtil.java
diff --git a/user/user-server/src/main/java/cn/algerfan/user/server/vo/ResultVo.java b/user/user-server/src/main/java/cn/algerfan/user/server/vo/ResultVo.java
diff --git a/user/user-server/src/main/resources/bootstrap.yml b/user/user-server/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8083
+  port: 8071
 eureka:
   client:
     service-url: