Forráskód Böngészése

fix some version conflict

Mr.qian 1 napja
szülő
commit
415cc80da1
3 módosított fájl, 43 hozzáadás és 39 törlés
  1. 24 25
      mall-service/pom.xml
  2. 1 1
      mall-service/src/main/resources/bootstrap.properties
  3. 18 13
      pom.xml

+ 24 - 25
mall-service/pom.xml

@@ -61,7 +61,6 @@
         <dependency>
             <groupId>com.txz</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -115,9 +114,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
+            <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-serialization-kryo</artifactId>
-            <version>2.7.9</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>
@@ -137,28 +136,28 @@
             <version>2.2.9.RELEASE</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.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
mall-service/src/main/resources/bootstrap.properties

@@ -49,7 +49,7 @@ dubbo.protocol.port=-1
 dubbo.registry.address=nacos://${${spring.profiles.active}.nacos}
 dubbo.scan.base-packages=com.txz.${spring.application.name}.dubbo.impl
 #dubbo.cloud.subscribed-services=cif
-dubbo.application.qos.enable=true
+dubbo.application.qos.enable=false
 dubbo.application.qos.port=28201
 dubbo.application.qos.accept.foreign.ip=true
 

+ 18 - 13
pom.xml

@@ -22,19 +22,24 @@
    <dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2021.0.8</version>
-				<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> -->
+                <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>
+                <version>2021.0.8</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>