From fea50b6b34863d3a342da1acfa3a6b6d1df2317d Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 4 May 2019 16:53:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?-=20admin=20=E6=A8=A1=E5=9D=97=E5=90=8D=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 741f51cdb..885140dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ order user common - admin + system ops pay promotion From 78d1076542b1d0e6d8c6a2a8880d3d659a9a2140 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 4 May 2019 16:53:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20dubbo=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay/pay-application/pom.xml | 10 +++++----- pay/pay-service-impl/pom.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index 9e0734fe5..eb24ff5fe 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -45,13 +45,13 @@ - com.alibaba + org.apache.dubbo dubbo - - com.alibaba.boot - dubbo-spring-boot-starter - + + + + org.apache.curator diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml index 337fe9eff..c68bc73c9 100644 --- a/pay/pay-service-impl/pom.xml +++ b/pay/pay-service-impl/pom.xml @@ -13,7 +13,7 @@ - com.alibaba + org.apache.dubbo dubbo @@ -69,10 +69,10 @@ spring-boot-starter-test test - - com.alibaba.boot - dubbo-spring-boot-starter - + + + + org.apache.curator curator-framework From 76a56d7fc3af3d590ba555c336fe697bac514071 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 4 May 2019 16:56:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9dubbo=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- promotion/pom.xml | 9 +++++++++ promotion/promotion-application/pom.xml | 10 +++++----- promotion/promotion-service-impl/pom.xml | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/promotion/pom.xml b/promotion/pom.xml index 36bb14ba5..85a80cb1a 100644 --- a/promotion/pom.xml +++ b/promotion/pom.xml @@ -17,4 +17,13 @@ promotion-application + + + + org.apache.dubbo + dubbo + 2.7.1 + + + \ No newline at end of file diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index cd4e4d06c..bc2afc061 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -57,13 +57,13 @@ - com.alibaba + org.apache.dubbo dubbo - - com.alibaba.boot - dubbo-spring-boot-starter - + + + + org.apache.curator diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index b0c6d477a..832ae55c6 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -29,7 +29,7 @@ - com.alibaba + org.apache.dubbo dubbo From 497faf8e9cd66dbe0decd4015be86f35a7235fc4 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 4 May 2019 17:01:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20dubbo=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- search/pom.xml | 10 +++++++++- search/search-application/pom.xml | 10 +++++----- search/search-service-impl/pom.xml | 10 +++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/search/pom.xml b/search/pom.xml index fd9f3b1e2..7f1c1129b 100644 --- a/search/pom.xml +++ b/search/pom.xml @@ -17,5 +17,13 @@ search-service-impl - + + + + org.apache.dubbo + dubbo + 2.7.1 + + + diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 5fdb09375..332a3179a 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -39,13 +39,13 @@ - com.alibaba + org.apache.dubbo dubbo - - com.alibaba.boot - dubbo-spring-boot-starter - + + + + org.apache.curator diff --git a/search/search-service-impl/pom.xml b/search/search-service-impl/pom.xml index d7f1928bc..2147e2f55 100644 --- a/search/search-service-impl/pom.xml +++ b/search/search-service-impl/pom.xml @@ -29,7 +29,7 @@ - com.alibaba + org.apache.dubbo dubbo @@ -54,10 +54,10 @@ spring-boot-starter-test test - - com.alibaba.boot - dubbo-spring-boot-starter - + + + + org.apache.curator curator-framework From bb7c7efc22485c4d13a2fe7eaa7b203b1bae7f22 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 4 May 2019 17:09:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?-=20=E9=87=8D=E6=96=B0=20import=20fastjson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java | 4 ++-- .../mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java index c6e6a47c3..9cbbe1102 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java @@ -4,8 +4,8 @@ import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.pay.biz.dataobject.PayRefundDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO; -import org.apache.fastjson.JSON; -import org.apache.fastjson.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.ImmutableMap; import com.pingplusplus.Pingpp; import com.pingplusplus.exception.*; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java index 67b89f678..4ff7343d4 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java @@ -9,7 +9,7 @@ import cn.iocoder.mall.pay.biz.dao.PayNotifyLogMapper; import cn.iocoder.mall.pay.biz.dao.PayNotifyTaskMapper; import cn.iocoder.mall.pay.biz.dataobject.PayNotifyLogDO; import cn.iocoder.mall.pay.biz.dataobject.PayNotifyTaskDO; -import org.apache.fastjson.JSON; +import com.alibaba.fastjson.JSON; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional;