Sfoglia il codice sorgente

fix some version conflict

Mr.qian 1 giorno fa
parent
commit
2abaa2feba

+ 19 - 7
cif-api/pom.xml

@@ -18,18 +18,30 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
-            <scope>provided</scope>
+            <groupId>com.txz</groupId>
+            <artifactId>common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>3.0.10</version>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.39</version>
+            <scope>compile</scope>
         </dependency>
 
+        <!-- <dependency> -->
+        <!--     <groupId>org.projectlombok</groupId> -->
+        <!--     <artifactId>lombok</artifactId> -->
+        <!--     <version>1.18.10</version> -->
+        <!--     <scope>provided</scope> -->
+        <!-- </dependency> -->
+
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
+
     </dependencies>
 
     <build>

+ 61 - 47
cif-service/pom.xml

@@ -41,15 +41,21 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>de.javakaffee</groupId>
-            <artifactId>kryo-serializers</artifactId>
-            <version>0.45</version>
+        <!-- <dependency> -->
+        <!--     <groupId>com.esotericsoftware</groupId> -->
+        <!--     <artifactId>kryo</artifactId> -->
+        <!--     <version>4.0.2</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>de.javakaffee</groupId> -->
+        <!--     <artifactId>kryo-serializers</artifactId> -->
+        <!--     <version>0.45</version> -->
+        <!-- </dependency> -->
+
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-kryo</artifactId>
+            <version>1.0.1</version>
         </dependency>
 
 
@@ -84,8 +90,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
+            <version>5.2.4</version>
         </dependency>
 
         <!--        <dependency>-->
@@ -105,9 +110,8 @@
         <dependency>
             <groupId>com.txz</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-
         </dependency>
+
         <dependency>
             <groupId>com.txz</groupId>
             <artifactId>operating-api</artifactId>
@@ -128,7 +132,6 @@
             <groupId>com.txz</groupId>
             <artifactId>operating-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
-
         </dependency>
 
         <!--        <dependency>-->
@@ -238,11 +241,11 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-serialization-kryo</artifactId>
-            <version>2.7.9</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-serialization-kryo</artifactId> -->
+        <!--     <version>2.7.9</version> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -261,34 +264,45 @@
             <version>2.2.9.RELEASE</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>3.0.10</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>2.2.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <!-- 移除tomcat容器-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 替换undertow容器 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba.cloud</groupId> -->
+        <!--     <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> -->
+        <!--     <version>2.2.9.RELEASE</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba.cloud</groupId> -->
+        <!--     <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> -->
+        <!--     <version>2.2.9.RELEASE</version> -->
+        <!-- </dependency> -->
+
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-spring-boot-starter</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
+
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba.nacos</groupId> -->
+        <!--     <artifactId>nacos-client</artifactId> -->
+        <!--     <version>2.2.2</version> -->
+        <!-- </dependency> -->
+
+        <!-- <dependency> -->
+        <!--     <groupId>org.springframework.boot</groupId> -->
+        <!--     <artifactId>spring-boot-starter-web</artifactId> -->
+        <!--     &lt;!&ndash; 移除tomcat容器&ndash;&gt; -->
+        <!--     <exclusions> -->
+        <!--         <exclusion> -->
+        <!--             <groupId>org.springframework.boot</groupId> -->
+        <!--             <artifactId>spring-boot-starter-tomcat</artifactId> -->
+        <!--         </exclusion> -->
+        <!--     </exclusions> -->
+        <!-- </dependency> -->
+        <!-- &lt;!&ndash; 替换undertow容器 &ndash;&gt; -->
+        <!-- <dependency> -->
+        <!--     <groupId>org.springframework.boot</groupId> -->
+        <!--     <artifactId>spring-boot-starter-undertow</artifactId> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>junit</groupId>

+ 1 - 1
cif-service/src/main/java/com/txz/cif/configurer/SwaggerConfig.java

@@ -1,6 +1,6 @@
 package com.txz.cif.configurer;
 
-import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+// import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;

+ 12 - 7
pom.xml

@@ -21,6 +21,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.txz</groupId>
+                <artifactId>common</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -28,13 +33,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- <dependency> -->
-            <!-- 	<groupId>org.springframework.cloud</groupId> -->
-            <!-- 	<artifactId>spring-cloud-alibaba-dependencies</artifactId> -->
-            <!-- 	<version>0.2.2.RELEASE</version> -->
-            <!-- 	<type>pom</type> -->
-            <!-- 	<scope>import</scope> -->
-            <!-- </dependency> -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>2021.0.5.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <distributionManagement>