2.0依赖升级完成

Xiong Neng · Xiong Neng · commit 483b642ca0ab · 2018-09-09T22:16:56.000+08:00
diff --git a/springboot-async/pom.xml b/springboot-async/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-batch/pom.xml b/springboot-batch/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-cache/pom.xml b/springboot-cache/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-cxf/pom.xml b/springboot-cxf/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-echarts/pom.xml b/springboot-echarts/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-hibernate/pom.xml b/springboot-hibernate/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-jwt/README.md b/springboot-jwt/README.md
@@ -3,7 +3,7 @@
 
 一般来讲，对于RESTful API都会有认证(Authentication)和授权(Authorization)过程，保证API的安全性。
 
-采用TOKEN认证，这种方式也是再HTTP头中，使用Authorization: Bearer <token>，使用最广泛的TOKEN是JWT，通过签名过的TOKEN。
+采用TOKEN认证，这种方式也是再HTTP头中，使用`Authorization: Bearer <token>`，使用最广泛的TOKEN是JWT，通过签名过的TOKEN。
 
 基于Shiro+JWT可实现Token认证方式
 
@@ -60,31 +60,9 @@ GET http://localhost:9095/api/v1/join?imei=imei
 
 ```
 Content-Type: application/json
-Authorization: 'Bearer ' + token
+Authorization: "上面拿到的token值"
 ```
 
-*Body参数*
-
-``` json
-{
-	"username": "admin",
-	"password": "12345678",
-	"appid": "111",
-	"imei": "imei"
-}
-```
-
-返回值：
-
-``` json
-{
-    "success": true,
-    "msg": "Login success",
-    "data": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhcHBpZCI6IjExMSIsImltZWkiOiJpbWVpIiwiZXhwIjoxNTM2NDg3NTM1LCJ1c2VybmFtZSI6ImFkbWluIn0.uat7rvVLwC7bcM-jRs329RWdHIFC6P-YN7YdJrdRUHE"
-}
-```
-
-
 ## 许可证
 
 Copyright (c) 2018 Xiong Neng
diff --git a/springboot-jwt/pom.xml b/springboot-jwt/pom.xml
@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.4.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
diff --git a/springboot-mongodb/pom.xml b/springboot-mongodb/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-multisource/pom.xml b/springboot-multisource/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-multisource/src/main/java/com/xncoding/pos/common/aop/MultiSourceExAop.java b/springboot-multisource/src/main/java/com/xncoding/pos/common/aop/MultiSourceExAop.java
@@ -3,13 +3,14 @@
 import com.xncoding.pos.common.annotion.DataSource;
 import com.xncoding.pos.common.mutidatesource.DSEnum;
 import com.xncoding.pos.common.mutidatesource.DataSourceContextHolder;
-import org.apache.log4j.Logger;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
@@ -27,7 +28,7 @@
 @ConditionalOnProperty(prefix = "xncoding", name = "muti-datasource-open", havingValue = "true")
 public class MultiSourceExAop implements Ordered {
 
-    private Logger log = Logger.getLogger(this.getClass());
+    private Logger log = LoggerFactory.getLogger(this.getClass());
 
     @Pointcut(value = "@annotation(com.xncoding.pos.common.annotion.DataSource)")
     private void cut() {
diff --git a/springboot-mybatis/pom.xml b/springboot-mybatis/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
@@ -26,10 +25,15 @@
     </properties>
 
     <dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-amqp</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.6</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/src/main/java/com/xncoding/pos/server/AsyncRPCServer.java b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/src/main/java/com/xncoding/pos/server/AsyncRPCServer.java
@@ -72,7 +72,7 @@ public void processAsyncRpcFixed(User user,
             public void onSuccess(String result) {
                 amqpTemplate.convertAndSend(replyTo, (Object) result, m -> {
                     //https://stackoverflow.com/questions/42382307/messageproperties-setcorrelationidstring-is-not-working
-                    m.getMessageProperties().setCorrelationId(correlationId);
+                    m.getMessageProperties().setCorrelationId(new String(correlationId));
                     return m;
                 });
             }
diff --git a/springboot-rabbitmq/pom.xml b/springboot-rabbitmq/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-redis/pom.xml b/springboot-redis/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-restful/pom.xml b/springboot-restful/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-resttemplate/pom.xml b/springboot-resttemplate/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
@@ -50,12 +49,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/springboot-resttemplate/src/main/java/com/xncoding/pos/config/RestClientConfig.java b/springboot-resttemplate/src/main/java/com/xncoding/pos/config/RestClientConfig.java
@@ -40,6 +40,8 @@
  */
 @Configuration
 public class RestClientConfig {
+
+    private Logger log = LoggerFactory.getLogger(this.getClass());
     @Bean
     public RestTemplate restTemplate() {
         RestTemplate restTemplate = new RestTemplate();
diff --git a/springboot-resttemplate/src/test/java/com/xncoding/pos/ApplicationTests.java b/springboot-resttemplate/src/test/java/com/xncoding/pos/ApplicationTests.java
@@ -8,8 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
diff --git a/springboot-schedule/pom.xml b/springboot-schedule/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-shiro/pom.xml b/springboot-shiro/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-socketio/pom.xml b/springboot-socketio/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-swagger2/pom.xml b/springboot-swagger2/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-thymeleaf/pom.xml b/springboot-thymeleaf/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-transaction/pom.xml b/springboot-transaction/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/springboot-websocket/pom.xml b/springboot-websocket/pom.xml
@@ -15,8 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
-        <relativePath/>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
