From 0941e5e4b815081edce568000030990e3fb04491 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 18 九月 2024 10:39:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pom.xml b/pms-parent/pom.xml
index 5524354..902c8ca 100644
--- a/pms-parent/pom.xml
+++ b/pms-parent/pom.xml
@@ -26,8 +26,10 @@
<module>pms-web-other</module>
<module>pms-web-platform</module>
<module>pms-web-product</module>
+ <module>pms-web-report</module>
<module>pms-web-sso</module>
<module>pms-web-station</module>
+ <module>pms-test</module>
</modules>
<properties>
@@ -60,6 +62,10 @@
<thumbnailator.version>0.4.20</thumbnailator.version>
<!-- google zxing 鐢熸垚浜岀淮鐮� -->
<google.zxing.version>3.5.3</google.zxing.version>
+
+ <!-- 鑾峰緱绯荤粺淇℃伅 -->
+ <com.github.oshi-core.version>6.6.2</com.github.oshi-core.version>
+ <net.java.dev.jna.version>5.12.1</net.java.dev.jna.version>
<spring-boot-maven-plugin.version>3.2.0</spring-boot-maven-plugin.version>
<maven-jar-plugin-plugin.version>3.3.0</maven-jar-plugin-plugin.version>
@@ -229,6 +235,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!--閽夐拤娑堟伅鎺ㄩ��-->
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+ <version>2.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- vo po杞崲 -->
<dependency>
<groupId>org.mapstruct</groupId>
@@ -318,6 +332,30 @@
<scope>import</scope>
</dependency>
+
+ <!-- 鑾峰緱绯荤粺淇℃伅 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>${com.github.oshi-core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${net.java.dev.jna.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>${net.java.dev.jna.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Hutool鏄竴涓皬鑰屽叏鐨凧ava宸ュ叿绫诲簱(https://github.com/dromara/hutool) -->
<dependency>
<groupId>cn.hutool</groupId>
--
Gitblit v1.8.0