From ce920867ae3a55d17ce5caf30961b6d51e2a7078 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 七月 2025 09:03:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/pom.xml |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index ac678e0..38b3e63 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -6,9 +6,16 @@
   <groupId>com.doumee</groupId>
   <artifactId>jinkuai</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>war</packaging>
+  <packaging>pom</packaging>
+
   <name>jinkuai</name>
   <description></description>
+
+  <modules>
+    <module>admin</module>
+    <module>web</module>
+    <module>services</module>
+  </modules>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -30,6 +37,7 @@
     <jna.version>5.7.0</jna.version>
     <poi.version>5.0.0</poi.version>
     <jjwt.version>0.9.1</jjwt.version>
+    <weixin-java-pay.version>4.1.0</weixin-java-pay.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -223,6 +231,24 @@
       <artifactId>bcprov-jdk15on</artifactId>
       <version>1.60</version>
     </dependency>
+
+    <!-- WeChat 灏忕▼搴� -->
+    <dependency>
+      <groupId>com.github.binarywang</groupId>
+      <artifactId>weixin-java-miniapp</artifactId>
+      <version>4.7.0</version>
+    </dependency>
+    <!-- WeChat 鏀粯 -->
+    <dependency>
+      <groupId>com.github.binarywang</groupId>
+      <artifactId>weixin-java-pay</artifactId>
+      <version>${weixin-java-pay.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.wechatpay-apiv3</groupId>
+      <artifactId>wechatpay-java</artifactId>
+      <version>0.2.12</version>
+    </dependency>
  <!--   <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
@@ -235,20 +261,12 @@
   </dependencies>
 
   <build>
-    <finalName>jinkuai</finalName>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <mainClass>com.doumee.JKApplication</mainClass>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>

--
Gitblit v1.9.3