From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/pom.xml | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 032c68e..c8bb428 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -44,13 +44,19 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>1.4.8</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
@@ -130,23 +136,22 @@
</exclusion>
</exclusions>
</dependency>
- <!-- 2.0~2.2 Knife4j 2.0.0 ~ 2.0.6-->
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <!-- 2.0~2.2 Knife4j 2.0.0 ~ 2.0.6-->
<!-- <dependency>-->
- <!-- <groupId>com.github.xiaoymin</groupId>-->
- <!-- <artifactId>knife4j-spring-boot-starter</artifactId>-->
- <!-- <version>2.0.6</version>-->
+ <!-- <groupId>io.springfox</groupId>-->
+ <!-- <artifactId>springfox-swagger2</artifactId>-->
+ <!-- <version>2.7.0</version>-->
<!-- </dependency>-->
-
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.7.0</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.7.0</version>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>io.springfox</groupId>-->
+ <!-- <artifactId>springfox-swagger-ui</artifactId>-->
+ <!-- <version>2.7.0</version>-->
+ <!-- </dependency>-->
<!--hutool java楠岃瘉鏂规硶绫�-->
<dependency>
@@ -161,9 +166,22 @@
<version>1.4.2</version>
</dependency>
+ <!--寮曞叆redis,鎺掗櫎lettuce鐨勫紩鐢�-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.lettuce</groupId>
+ <artifactId>lettuce-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- 寮曞叆Jedis瀹㈡埗绔�-->
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
</dependency>
<dependency>
@@ -171,13 +189,21 @@
<artifactId>fastjson</artifactId>
<version>1.2.33</version>
</dependency>
-
<dependency>
<groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join</artifactId>
- <version>1.2.4</version>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>1.4.12</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
</dependencies>
--
Gitblit v1.8.0