From cb9bc5daaa7ee5978c07d5107d3301473617f367 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 25 Jul 2020 17:14:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml | 16 ++++++++++++++--
1 files changed, 14 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..0b61cbf 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
@@ -132,9 +132,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