From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
index 4db67a8..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>
@@ -136,6 +141,18 @@
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-bus-amqp</artifactId>-->
<!-- </dependency>-->
+ <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
+ <dependency>
+ <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>
<build>
--
Gitblit v1.8.0