Ver código fonte

fix some version conflict

Mr.qian 1 dia atrás
pai
commit
a47c7907ad

+ 76 - 49
pom.xml

@@ -40,21 +40,27 @@
         </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>
+            <groupId>com.txz</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0.0-SNAPSHOT</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>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
@@ -201,42 +207,48 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-spring-boot-starter</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </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> -->
 
         <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>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-kryo</artifactId>
+            <version>1.0.1</version>
         </dependency>
 
         <!-- Dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </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> -->
 
         <!-- Dubbo Registry Nacos -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-registry-nacos</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
         <!-- <dependency> -->
         <!--     <groupId>com.alibaba.nacos</groupId> -->
@@ -329,6 +341,21 @@
             <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
         </dependency>
 
+         <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+            <version>1.56.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>1.56.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>1.56.1</version>
+        </dependency>
 
     </dependencies>
 
@@ -341,13 +368,13 @@
                 <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> -->
+            <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>
     <build>

+ 1 - 1
src/main/resources/bootstrap.properties

@@ -35,7 +35,7 @@ dubbo.protocol.port=-1
 dubbo.registry.address=nacos://${${spring.profiles.active}.nacos}
 
 dubbo.cloud.subscribed-services=cif,operating
-dubbo.application.qos.enable=true
+dubbo.application.qos.enable=false
 dubbo.application.qos.port=28110
 dubbo.application.qos.accept.foreign.ip=true
 dubbo.reference.com.foo.BarService.check=false

+ 0 - 27
src/main/resources/mapper/InterfaceMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kameng.project.dao.InterfaceMapper">
-  <resultMap id="BaseResultMap" type="com.kameng.project.model.Interface">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="api_name" jdbcType="VARCHAR" property="apiName" />
-    <result column="api_remark" jdbcType="VARCHAR" property="apiRemark" />
-    <result column="api_memo" jdbcType="VARCHAR" property="apiMemo" />
-    <result column="service_name" jdbcType="VARCHAR" property="serviceName" />
-    <result column="service_path" jdbcType="VARCHAR" property="servicePath" />
-    <result column="connection_timeout" jdbcType="INTEGER" property="connectionTimeout" />
-    <result column="so_timeout" jdbcType="INTEGER" property="soTimeout" />
-    <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
-    <result column="module_name" jdbcType="VARCHAR" property="moduleName" />
-    <result column="authorize_type" jdbcType="VARCHAR" property="authorizeType" />
-    <result column="project_name" jdbcType="VARCHAR" property="projectName" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
-    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
-    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-</mapper>