丁云鹏 4 bulan lalu
induk
melakukan
37ffa9c05a

+ 22 - 23
recommend-model-produce/pom.xml

@@ -21,7 +21,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>
+        <grpc.version>1.59.1</grpc.version>
 
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -199,7 +199,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.4.5</version>
+            <version>2.4.8</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-pool2</artifactId>
@@ -225,6 +225,10 @@
                     <artifactId>protobuf-java</artifactId>
                     <groupId>com.google.protobuf</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -278,17 +282,33 @@
                     <artifactId>protobuf-java</artifactId>
                     <groupId>com.google.protobuf</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
             <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -338,27 +358,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- maven-assembly-plugin配置 -->
-            <!--            <plugin>-->
-            <!--                <groupId>org.apache.maven.plugins</groupId>-->
-            <!--                <artifactId>maven-assembly-plugin</artifactId>-->
-            <!--                <version>2.5.5</version>-->
-            <!--                <configuration>-->
-            <!--                    <descriptorRefs>-->
-            <!--                        <descriptorRef>jar-with-dependencies</descriptorRef>-->
-            <!--                    </descriptorRefs>-->
-            <!--                    <finalName>${project.name}</finalName>-->
-            <!--                </configuration>-->
-            <!--                <executions>-->
-            <!--                    <execution>-->
-            <!--                        <id>make-assembly</id>-->
-            <!--                        <phase>package</phase>-->
-            <!--                        <goals>-->
-            <!--                            <goal>single</goal>-->
-            <!--                        </goals>-->
-            <!--                    </execution>-->
-            <!--                </executions>-->
-            <!--            </plugin>-->
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>

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

@@ -69,8 +69,8 @@ public class I2IMilvusDataImport {
         rdd.foreachPartition(lines -> {
             ConnectParam connectParam = ConnectParam.newBuilder()
                     .withUri(finalMilvusUrl)
-                    //.withToken(finalMilvusToken)
-                    .withAuthorization("emr", "Qingqu@2024")
+                    .withToken(finalMilvusToken)
+                    //.withAuthorization("emr", "Qingqu@2024")
                     //.withConnectTimeout(60L, TimeUnit.SECONDS)
                     .build();
             RetryParam retryParam = RetryParam.newBuilder()