yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/1/head
YunaiV 2019-05-04 17:30:48 +08:00
parent c5ea4a51af bb7c7efc22
commit 6d239b7524
11 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pay/pay-application/pom.xml
View File

@ -45,13 +45,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.alibaba.boot</groupId> <!--<groupId>com.alibaba.boot</groupId>-->
<artifactId>dubbo-spring-boot-starter</artifactId> <!--<artifactId>dubbo-spring-boot-starter</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>

10
pay/pay-service-impl/pom.xml
View File

@ -13,7 +13,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -69,10 +69,10 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.alibaba.boot</groupId> <!-- 引入该包，为了写单元测试用 --> <!--<groupId>com.alibaba.boot</groupId> &lt;!&ndash; 引入该包，为了写单元测试用 &ndash;&gt;-->
<artifactId>dubbo-spring-boot-starter</artifactId> <!--<artifactId>dubbo-spring-boot-starter</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <!-- 引入该包，为了写单元测试用 --> <groupId>org.apache.curator</groupId> <!-- 引入该包，为了写单元测试用 -->
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>

4
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java
View File

@ -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.PayRefundDO;
import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
import org.apache.fastjson.JSON; import com.alibaba.fastjson.JSON;
import org.apache.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.pingplusplus.Pingpp; import com.pingplusplus.Pingpp;
import com.pingplusplus.exception.*; import com.pingplusplus.exception.*;

2
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java
View File

@ -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.dao.PayNotifyTaskMapper;
import cn.iocoder.mall.pay.biz.dataobject.PayNotifyLogDO; import cn.iocoder.mall.pay.biz.dataobject.PayNotifyLogDO;
import cn.iocoder.mall.pay.biz.dataobject.PayNotifyTaskDO; 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.apache.rocketmq.spring.core.RocketMQListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

2
pom.xml
View File

@ -18,7 +18,7 @@
<module>order</module> <module>order</module>
<module>user</module> <module>user</module>
<module>common</module> <module>common</module>
<module>admin</module> <module>system</module>
<module>ops</module> <module>ops</module>
<module>pay</module> <module>pay</module>
<module>promotion</module> <module>promotion</module>

9
promotion/pom.xml
View File

@ -17,4 +17,13 @@
<module>promotion-application</module> <module>promotion-application</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>

10
promotion/promotion-application/pom.xml
View File

@ -57,13 +57,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.alibaba.boot</groupId> <!--<groupId>com.alibaba.boot</groupId>-->
<artifactId>dubbo-spring-boot-starter</artifactId> <!--<artifactId>dubbo-spring-boot-starter</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>

2
promotion/promotion-service-impl/pom.xml
View File

@ -29,7 +29,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>

10
search/pom.xml
View File

@ -17,5 +17,13 @@
<module>search-service-impl</module> <module>search-service-impl</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>

10
search/search-application/pom.xml
View File

@ -39,13 +39,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.alibaba.boot</groupId> <!--<groupId>com.alibaba.boot</groupId>-->
<artifactId>dubbo-spring-boot-starter</artifactId> <!--<artifactId>dubbo-spring-boot-starter</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>

10
search/search-service-impl/pom.xml
View File

@ -29,7 +29,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
</dependency> </dependency>
@ -54,10 +54,10 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.alibaba.boot</groupId> <!-- 引入该包，为了写单元测试用 --> <!--<groupId>com.alibaba.boot</groupId> &lt;!&ndash; 引入该包，为了写单元测试用 &ndash;&gt;-->
<artifactId>dubbo-spring-boot-starter</artifactId> <!--<artifactId>dubbo-spring-boot-starter</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <!-- 引入该包，为了写单元测试用 --> <groupId>org.apache.curator</groupId> <!-- 引入该包，为了写单元测试用 -->
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>