From 483b642ca0ab6f2481f6c63f1d3eebc0b724649f Mon Sep 17 00:00:00 2001 From: Xiong Neng Date: Sun, 9 Sep 2018 22:16:56 +0800 Subject: [PATCH] =?UTF-8?q?2.0=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springboot-async/pom.xml | 1 - springboot-batch/pom.xml | 1 - springboot-cache/pom.xml | 1 - springboot-cxf/pom.xml | 1 - springboot-echarts/pom.xml | 1 - springboot-hibernate/pom.xml | 1 - springboot-jwt/README.md | 26 ++----------------- springboot-jwt/pom.xml | 1 - springboot-mongodb/pom.xml | 3 +-- springboot-multisource/pom.xml | 3 +-- .../pos/common/aop/MultiSourceExAop.java | 5 ++-- springboot-mybatis/pom.xml | 3 +-- .../springboot-rabbitmq-rpc-client/pom.xml | 3 +-- .../springboot-rabbitmq-rpc-server/pom.xml | 16 +++++++----- .../xncoding/pos/server/AsyncRPCServer.java | 2 +- springboot-rabbitmq/pom.xml | 3 +-- springboot-redis/pom.xml | 3 +-- springboot-restful/pom.xml | 3 +-- springboot-resttemplate/pom.xml | 15 +++++------ .../xncoding/pos/config/RestClientConfig.java | 2 ++ .../com/xncoding/pos/ApplicationTests.java | 2 +- springboot-schedule/pom.xml | 2 +- springboot-shiro/pom.xml | 3 +-- springboot-socketio/pom.xml | 3 +-- springboot-starter/pom.xml | 3 +-- springboot-swagger2/pom.xml | 3 +-- springboot-thymeleaf/pom.xml | 3 +-- springboot-transaction/pom.xml | 3 +-- springboot-websocket/pom.xml | 3 +-- 29 files changed, 41 insertions(+), 78 deletions(-) diff --git a/springboot-async/pom.xml b/springboot-async/pom.xml index bea94aa..f5d533b 100644 --- a/springboot-async/pom.xml +++ b/springboot-async/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-batch/pom.xml b/springboot-batch/pom.xml index 2e92786..734ecc4 100644 --- a/springboot-batch/pom.xml +++ b/springboot-batch/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-cache/pom.xml b/springboot-cache/pom.xml index 6c03c78..71acf41 100644 --- a/springboot-cache/pom.xml +++ b/springboot-cache/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-cxf/pom.xml b/springboot-cxf/pom.xml index 01fcfe3..f3d7c83 100644 --- a/springboot-cxf/pom.xml +++ b/springboot-cxf/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-echarts/pom.xml b/springboot-echarts/pom.xml index 62b7d91..ee0d778 100644 --- a/springboot-echarts/pom.xml +++ b/springboot-echarts/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-hibernate/pom.xml b/springboot-hibernate/pom.xml index fcd1d02..9031ab7 100644 --- a/springboot-hibernate/pom.xml +++ b/springboot-hibernate/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-jwt/README.md b/springboot-jwt/README.md index 0575c19..c03d345 100644 --- a/springboot-jwt/README.md +++ b/springboot-jwt/README.md @@ -3,7 +3,7 @@ 一般来讲，对于RESTful API都会有认证(Authentication)和授权(Authorization)过程，保证API的安全性。 -采用TOKEN认证，这种方式也是再HTTP头中，使用Authorization: Bearer ，使用最广泛的TOKEN是JWT，通过签名过的TOKEN。 +采用TOKEN认证，这种方式也是再HTTP头中，使用`Authorization: Bearer `，使用最广泛的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 index 03ebc71..ac0ee33 100644 --- a/springboot-jwt/pom.xml +++ b/springboot-jwt/pom.xml @@ -16,7 +16,6 @@ org.springframework.boot spring-boot-starter-parent 2.0.4.RELEASE - diff --git a/springboot-mongodb/pom.xml b/springboot-mongodb/pom.xml index 8d1a3d5..bf0b0d7 100644 --- a/springboot-mongodb/pom.xml +++ b/springboot-mongodb/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-multisource/pom.xml b/springboot-multisource/pom.xml index 33b5f7e..8ed9253 100644 --- a/springboot-multisource/pom.xml +++ b/springboot-multisource/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE 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 index f161268..958584c 100644 --- 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 @@ package com.xncoding.pos.common.aop; 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 @@ import java.lang.reflect.Method; @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 index 7d47898..9bfab3c 100644 --- a/springboot-mybatis/pom.xml +++ b/springboot-mybatis/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml index e542231..3d52d94 100644 --- a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml +++ b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-client/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml index 3ebd027..7b31543 100644 --- a/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml +++ b/springboot-rabbitmq-rpc/springboot-rabbitmq-rpc-server/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE @@ -26,10 +25,15 @@ - - org.springframework.boot - spring-boot-starter-amqp - + + org.springframework.boot + spring-boot-starter-amqp + + + com.fasterxml.jackson.core + jackson-databind + 2.9.6 + org.springframework.boot 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 index 3056787..82cfdb2 100644 --- 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 class AsyncRPCServer { 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 index fce9549..ede55fe 100644 --- a/springboot-rabbitmq/pom.xml +++ b/springboot-rabbitmq/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-redis/pom.xml b/springboot-redis/pom.xml index a68f753..a667d9a 100644 --- a/springboot-redis/pom.xml +++ b/springboot-redis/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-restful/pom.xml b/springboot-restful/pom.xml index 406cb03..ca7c97f 100644 --- a/springboot-restful/pom.xml +++ b/springboot-restful/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-resttemplate/pom.xml b/springboot-resttemplate/pom.xml index 9673794..0288a95 100644 --- a/springboot-resttemplate/pom.xml +++ b/springboot-resttemplate/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE @@ -50,12 +49,12 @@ spring-boot-starter-test test - - org.hamcrest - hamcrest-core - 1.3 - test - + + org.hamcrest + hamcrest-core + 1.3 + test + 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 index 1b3728b..22fa007 100644 --- 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 @@ import java.security.cert.X509Certificate; */ @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 index 7c1a7c4..d165dd2 100644 --- 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.junit.runner.RunWith; 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 index db33ecd..00b8f61 100644 --- a/springboot-schedule/pom.xml +++ b/springboot-schedule/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE + 2.0.4.RELEASE diff --git a/springboot-shiro/pom.xml b/springboot-shiro/pom.xml index 9a7ba1b..3e8e2e2 100644 --- a/springboot-shiro/pom.xml +++ b/springboot-shiro/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-socketio/pom.xml b/springboot-socketio/pom.xml index 751c601..3d7da79 100644 --- a/springboot-socketio/pom.xml +++ b/springboot-socketio/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml index 39fe9d6..65199ba 100644 --- a/springboot-starter/pom.xml +++ b/springboot-starter/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-swagger2/pom.xml b/springboot-swagger2/pom.xml index 487a75f..895be86 100644 --- a/springboot-swagger2/pom.xml +++ b/springboot-swagger2/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-thymeleaf/pom.xml b/springboot-thymeleaf/pom.xml index cbae4fc..bd7b6e9 100644 --- a/springboot-thymeleaf/pom.xml +++ b/springboot-thymeleaf/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-transaction/pom.xml b/springboot-transaction/pom.xml index 1cd0053..c76cd2a 100644 --- a/springboot-transaction/pom.xml +++ b/springboot-transaction/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE diff --git a/springboot-websocket/pom.xml b/springboot-websocket/pom.xml index f7c916f..ea83c88 100644 --- a/springboot-websocket/pom.xml +++ b/springboot-websocket/pom.xml @@ -15,8 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.10.RELEASE - + 2.0.4.RELEASE