From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Tue, 27 Oct 2020 14:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
index c04239e..778c34d 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
@@ -116,6 +116,11 @@
<artifactId>spring-cloud-starter-openfeign</artifactId>
<!-- <optional>true</optional>-->
</dependency>
+ <dependency>
+ <groupId>io.github.openfeign</groupId>
+ <artifactId>feign-okhttp</artifactId>
+ <version>10.1.0</version>
+ </dependency>
<!-- hystrix断路器 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -132,9 +137,21 @@
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</dependency>
<!-- 消息总线rabbitMQ -->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-bus-amqp</artifactId>-->
+<!-- </dependency>-->
+ <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.google.zxing/javase -->
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>3.4.0</version>
</dependency>
</dependencies>
--
Gitblit v1.8.0