From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
pom.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd7b9a2..10090e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,8 @@
<io.springfox.version>2.7.0</io.springfox.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
<spring.kafka.version>2.2.2</spring.kafka.version>
+ <xxl-job.version>2.3.0</xxl-job.version>
+ <aviator.version>5.2.5</aviator.version>
</properties>
@@ -50,7 +52,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
-
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
@@ -88,6 +89,10 @@
<version>${spring.kafka.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${spring.kafka.version}</version>
@@ -108,10 +113,26 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>com.google.code.kaptcha</groupId>
<artifactId>kaptcha</artifactId>
<version>2.3.2</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.xuxueli</groupId>
+ <artifactId>xxl-job-core</artifactId>
+ <version>${xxl-job.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.googlecode.aviator/aviator -->
+ <dependency>
+ <groupId>com.googlecode.aviator</groupId>
+ <artifactId>aviator</artifactId>
+ <version>${aviator.version}</version>
+ </dependency>
+
</dependencies>
--
Gitblit v1.8.0