From dfec0257c8a662fec8e3f27667355f9b1ca09a20 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 30 五月 2023 09:50:38 +0800
Subject: [PATCH] 解决api配置冲突
---
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 457db9e..c885818 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -23,26 +23,9 @@
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.vci.ubcs</groupId>-->
-<!-- <artifactId>ubcs-ddl</artifactId>-->
-<!-- <version>3.0.1.RELEASE</version>-->
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>com.vci</groupId>-->
-<!-- <artifactId>vci-starter-word</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
-<!-- </dependency>-->
<dependency>
<groupId>com.vci.ubcs</groupId>
- <artifactId>ubcs-omd-api</artifactId>
- <version>3.0.1.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.vci.ubcs</groupId>
- <artifactId>ubcs-util-api</artifactId>
+ <artifactId>ubcs-ddl</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
<dependency>
@@ -62,9 +45,41 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>${mybatisplus.join.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+ <version>3.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--<dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-webservice</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>-->
</dependencies>
-
<build>
<plugins>
<plugin>
--
Gitblit v1.9.3