丁云鹏 пре 4 месеци
родитељ
комит
24ed112394

+ 38 - 8
recommend-model-produce/pom.xml

@@ -20,6 +20,7 @@
         <java.version>1.8</java.version>
         <fastjson.version>1.2.45</fastjson.version>
         <guava.version>29.0-jre</guava.version>
+        <grpc.version>1.30.0</grpc.version>
 
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -212,13 +213,17 @@
                     <groupId>io.grpc</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>grpc-stub</artifactId>
+                    <artifactId>grpc-core</artifactId>
                     <groupId>io.grpc</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>grpc-core</artifactId>
+                    <artifactId>grpc-stub</artifactId>
                     <groupId>io.grpc</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>protobuf-java</artifactId>
+                    <groupId>com.google.protobuf</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -255,7 +260,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-core</artifactId>
-            <version>1.30.0</version>
+            <version>${grpc.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -263,11 +268,32 @@
                 </exclusion>
             </exclusions>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.google.protobuf</groupId>-->
-<!--            <artifactId>protobuf-java</artifactId>-->
-<!--            <version>3.24.0</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>protobuf-java</artifactId>
+                    <groupId>com.google.protobuf</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty-shaded</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.24.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -294,6 +320,10 @@
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>shade.com.google.common</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.protobuf</pattern>
+                                    <shadedPattern>shade.com.google.protobuf</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>

+ 1 - 1
recommend-model-produce/src/main/java/com/tzld/piaoquan/recommend/model/produce/i2i/I2IMilvusDataImport.java

@@ -47,7 +47,7 @@ public class I2IMilvusDataImport {
         int batchSize = NumberUtils.toInt(argMap.get("batchSize"), 5000);
 
 //        file = "recommend-server/pom.xml";
-//        milvusUrl = "in01-bf9dcd371016170.ali-cn-hangzhou.vectordb.zilliz.com.cn:19530";
+//        milvusUrl = "https://in01-bf9dcd371016170.ali-cn-hangzhou.vectordb.zilliz.com.cn:19530";
 //        milvusToken = "423a29de63a907e6662b9493c4f95caf799f64f8701cc70db930bb6da7f05914e6ed2374342dc438a8b9d37da0bf164c8ee531bd";
 //
 //        SparkSession spark = SparkSession.builder()