From 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 13:43:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/pom.xml |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index 11bccf4..6710c6c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -29,7 +29,7 @@
     <java.version>1.8</java.version>
     <swagger.version>2.9.2</swagger.version>
     <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
-    <fastjson.version>1.2.70</fastjson.version>
+    <fastjson.version>2.0.52</fastjson.version>
     <druid.version>1.2.0</druid.version>
     <mybatis.plus.version>3.5.7</mybatis.plus.version>
     <apache.shiro.version>1.7.0</apache.shiro.version>
@@ -201,12 +201,12 @@
       <artifactId>pinyin4j</artifactId>
       <version>2.5.1</version>
     </dependency>
-<!--    &lt;!&ndash; WeChat 灏忕▼搴� &ndash;&gt;-->
-<!--    <dependency>-->
-<!--      <groupId>com.github.binarywang</groupId>-->
-<!--      <artifactId>weixin-java-miniapp</artifactId>-->
-<!--      <version>${weixin-java-miniapp.version}</version>-->
-<!--    </dependency>-->
+    <!-- WeChat 灏忕▼搴� -->
+    <dependency>
+      <groupId>com.github.binarywang</groupId>
+      <artifactId>weixin-java-miniapp</artifactId>
+      <version>${weixin-java-miniapp.version}</version>
+    </dependency>
 <!--    &lt;!&ndash; WeChat 鏀粯 &ndash;&gt;-->
 <!--    <dependency>-->
 <!--      <groupId>com.github.binarywang</groupId>-->
@@ -220,7 +220,11 @@
       <artifactId>aliyun-sdk-oss</artifactId>
       <version>${aliyun-oss.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.13.1</version>
+    </dependency>
     <!-- aliyun sms SDK -->
     <dependency>
       <groupId>com.aliyun</groupId>

--
Gitblit v1.9.3