From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/pom.xml | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 79a776c..affa009 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -15,6 +15,7 @@
<modules>
<module>servicebase</module>
<module>springsecurity</module>
+ <module>opcuaClient</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,13 +45,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 +137,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 +167,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,7 +190,21 @@
<artifactId>fastjson</artifactId>
<version>1.2.33</version>
</dependency>
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <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