From c5e5d0720d1f0805963ce218a9bd7e5da5a6e7a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 18 九月 2024 15:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pom.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml
index 114f342..7d26034 100644
--- a/pipIrr-platform/pipIrr-web/pom.xml
+++ b/pipIrr-platform/pipIrr-web/pom.xml
@@ -18,12 +18,19 @@
<description>姝ゆā鍧椾负鍏朵粬web妯″潡鐨勫眬閮ㄥ叏灞�妯″潡锛屽彧瀹氫箟渚濊禆</description>
<modules>
- <module>pipIrr-web-demo</module>
+ <module>pipIrr-mwTest-rtu</module>
+ <module>pipIrr-mwTest-web</module>
<module>pipIrr-web-sso</module>
<module>pipIrr-web-base</module>
<module>pipIrr-web-remote</module>
<module>pipIrr-web-statistics</module>
<module>pipIrr-web-gis</module>
+ <module>pipIrr-web-sell</module>
+ <module>pipIrr-web-project</module>
+ <module>pipIrr-web-irrigate</module>
+ <module>pipIrr-web-wechat</module>
+ <module>pipIrr-web-app</module>
+ <module>pipIrr-web-operation</module>
</modules>
<dependencies>
@@ -59,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</dependency>
@@ -80,6 +92,12 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 绯荤粺鐩戠 -->
@@ -162,6 +180,43 @@
<artifactId>jdom2</artifactId>
</dependency>
+ <!-- bean鍜宮ap浜掕浆鎹� -->
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>3.2.7</version>
+ <exclusions>
+<!-- <exclusion>-->
+<!-- <groupId>io.netty</groupId>-->
+<!-- <artifactId>netty-all</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>org.yaml</groupId>-->
+<!-- <artifactId>snakeyaml</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>org.springframework</groupId>-->
+<!-- <artifactId>spring-context</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.alibaba.spring</groupId>-->
+<!-- <artifactId>spring-context-support</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.alibaba.fastjson2</groupId>-->
+<!-- <artifactId>fastjson2</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.alibaba</groupId>-->
+<!-- <artifactId>hessian-lite</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <groupId>org.javassist</groupId>-->
+<!-- <artifactId>javassist</artifactId>-->
+<!-- </exclusion>-->
+ </exclusions>
+ </dependency>
+
<!-- 娴嬭瘯 -->
<dependency>
<groupId>org.springframework.boot</groupId>
--
Gitblit v1.8.0