From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
ruoyi-common/ruoyi-common-core/pom.xml | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 36bd0d8..5293467 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -47,42 +47,16 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
+ <!-- hutool宸ュ叿妯″潡 -->
<dependency>
<groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-http</artifactId>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-extra</artifactId>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-json</artifactId>
- <scope>provided</scope>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>weixin-java-cp</artifactId>
- <version>${weixin-java-miniapp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>weixin-java-cp</artifactId>
- <version>${weixin-java-cp.version}</version>
</dependency>
<!-- 鑷姩鐢熸垚YML閰嶇疆鍏宠仈JSON鏂囦欢 -->
@@ -108,6 +82,11 @@
<artifactId>ip2region</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-cp</artifactId>
+ <version>${weixin-java-cp.version}</version>
+ </dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
@@ -130,16 +109,19 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-sse</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
</dependencies>
--
Gitblit v1.9.3