admin/MilvusPlus
1
0
Fork 0
mirror of https://gitee.com/dromara/MilvusPlus.git synced 2025-12-07 01:18:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

!40 dev to main

Browse Source 
Merge pull request !40 from xgc/dev
This commit is contained in:
xgc 2024-11-25 10:17:27 +00:00 committed by Gitee
commit 6e66ab96ae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
15 changed files with 77 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.cn.md
View File

@ -29,9 +29,9 @@
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```
@ -39,9 +39,9 @@ Spring应用支持：
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-boot-starter</artifactId> <artifactId>milvus-plus-boot-starter</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```
@ -49,14 +49,14 @@ Solon应用支持：
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId> <artifactId>milvus-plus-solon-plugin</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```
## 需知 ## 需知
- 2.1.7版本之后groupId修改为 org.dromara.milvus-plus，版本之前为 org.dromara
- 2.0.0版本必须使用索引注解定义索引，不然启动报错后，再添加无效，需要先删除集合 - 2.0.0版本必须使用索引注解定义索引，不然启动报错后，再添加无效，需要先删除集合
- 2.0.0版本暂未发布 MilvusService 功能 - 2.0.0版本暂未发布 MilvusService 功能
@ -538,7 +538,7 @@ public class ApplicationRunnerTest implements ApplicationRunner {
} }
``` ```
## 联系 # 联系
如有问题或需要支持，请联系(备注 milvusplus) 如有问题或需要支持，请联系(备注 milvusplus)

12
README.md
View File

@ -27,9 +27,9 @@ Custom extension support:
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```
@ -37,9 +37,9 @@ Spring application support:
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-boot-starter</artifactId> <artifactId>milvus-plus-boot-starter</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```
@ -47,9 +47,9 @@ Solon application support:
``` ```
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId> <artifactId>milvus-plus-solon-plugin</artifactId>
<version>2.1.6</version> <version>2.1.8</version>
</dependency> </dependency>
``` ```

6
milvus-core-demo/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-core-demo</artifactId> <artifactId>milvus-core-demo</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>milvus-core-demo</name> <name>milvus-core-demo</name>
@ -15,9 +15,9 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
<version>2.1.1</version> <version>2.1.7</version>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

4
milvus-plus-boot-starter/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-parent</artifactId> <artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath> <relativePath>../milvus-plus-parent/pom.xml</relativePath>
@ -21,7 +21,7 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>

4
milvus-plus-core/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-parent</artifactId> <artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath> <relativePath>../milvus-plus-parent/pom.xml</relativePath>
@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>io.milvus</groupId> <groupId>io.milvus</groupId>
<artifactId>milvus-sdk-java</artifactId> <artifactId>milvus-sdk-java</artifactId>
<version>2.4.2</version> <version>2.4.4</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>

2
milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java
View File

@ -75,7 +75,7 @@ public class LambdaInsertWrapper<T> extends AbstractChainWrapper<T> implements
private MilvusResp<InsertResp> insert(List<JsonObject> jsonObjects){ private MilvusResp<InsertResp> insert(List<JsonObject> jsonObjects){
return executeWithRetry( return executeWithRetry(
() -> { () -> {
log.info("update data--->{}", GsonUtil.toJson(jsonObjects)); log.info("insert data--->{}", GsonUtil.toJson(jsonObjects));
InsertReq.InsertReqBuilder<?, ?> builder = InsertReq.builder() InsertReq.InsertReqBuilder<?, ?> builder = InsertReq.builder()
.collectionName(collectionName) .collectionName(collectionName)
.data(jsonObjects); .data(jsonObjects);

6
milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/ICMService.java
View File

@ -122,12 +122,6 @@ public interface ICMService {
.collectionName(collectionName) .collectionName(collectionName)
.build(); .build();
client.dropCollection(dropCollectionReq); client.dropCollection(dropCollectionReq);
// 检查集合是否已被删除
boolean isDropped = hasCollection(collectionName);
if (!isDropped) {
throw new RuntimeException("Failed to drop collection: " + collectionName);
}
} }
/** /**

55
milvus-plus-parent/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-parent</artifactId> <artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -30,7 +30,7 @@
</developer> </developer>
</developers> </developers>
<properties> <properties>
<revision>2.1.6</revision> <revision>2.1.8</revision>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven-compiler.version>3.11.0</maven-compiler.version> <maven-compiler.version>3.11.0</maven-compiler.version>
@ -52,17 +52,17 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-boot-starter</artifactId> <artifactId>milvus-plus-boot-starter</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId> <artifactId>milvus-plus-solon-plugin</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
@ -76,16 +76,16 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<distributionManagement> <!-- <distributionManagement>-->
<repository> <!-- <snapshotRepository>-->
<id>oss</id> <!-- <id>ossrh</id>-->
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> <!-- <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
</repository> <!-- </snapshotRepository>-->
<snapshotRepository> <!-- <repository>-->
<id>oss</id> <!-- <id>ossrh</id>-->
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> <!-- <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>-->
</snapshotRepository> <!-- </repository>-->
</distributionManagement> <!-- </distributionManagement>-->
<build> <build>
<plugins> <plugins>
@ -104,18 +104,29 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
</plugin> </plugin>
<!-- <plugin>-->
<!-- <groupId>org.sonatype.plugins</groupId>-->
<!-- <artifactId>nexus-staging-maven-plugin</artifactId>-->
<!-- <version>${nexus-staging-maven-plugin.version}</version>-->
<!-- <extensions>true</extensions>-->
<!-- <configuration>-->
<!-- <serverId>ossrh</serverId>-->
<!-- <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>-->
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
<!-- <stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>-->
<!-- </configuration>-->
<!-- </plugin>-->
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.central</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>central-publishing-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version> <version>0.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<serverId>oss</serverId> <publishingServerId>central</publishingServerId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl> <tokenAuth>true</tokenAuth>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId> org.apache.maven.plugins</groupId> <groupId> org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>

4
milvus-plus-solon-plugin/pom.xml
View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-parent</artifactId> <artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath> <relativePath>../milvus-plus-parent/pom.xml</relativePath>
@ -15,7 +15,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-core</artifactId> <artifactId>milvus-plus-core</artifactId>
</dependency> </dependency>

6
milvus-solon-demo/pom.xml
View File

@ -11,7 +11,7 @@
<relativePath /> <relativePath />
</parent> </parent>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-solon-demo</artifactId> <artifactId>milvus-solon-demo</artifactId>
<version>1.0</version> <version>1.0</version>
@ -26,9 +26,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId> <artifactId>milvus-plus-solon-plugin</artifactId>
<version>2.1.1</version> <version>2.1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.noear</groupId> <groupId>org.noear</groupId>

2
milvus-solon-demo/src/main/resources/app.yml
View File

@ -7,7 +7,7 @@ solon.app:
milvus: milvus:
uri: https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com uri: https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com
token: xxxx token: 6fab5641a3156d2666feba14390e4ef4b6d376b5dce91faed303eec91a4bdb82239b70b29eb252b981daa3170516245818d4ee12
enable: true enable: true
packages: packages:
- org.dromara.solon.test.model - org.dromara.solon.test.model

6
milvus-spring-demo/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-spring-demo</artifactId> <artifactId>milvus-spring-demo</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>milvus-spring-demo</name> <name>milvus-spring-demo</name>
@ -19,9 +19,9 @@
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>milvus-plus-boot-starter</artifactId> <artifactId>milvus-plus-boot-starter</artifactId>
<version>2.1.4</version> <version>2.1.7</version>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

7
milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java
View File

@ -37,16 +37,17 @@ public class ApplicationRunnerTest implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws InterruptedException { public void run(ApplicationArguments args) throws InterruptedException {
milvusService.dropCollection("face_collection");
// insertFace(); // insertFace();
// selectFace(12); // selectFace(12);
// selectFace(11); //// selectFace(11);
// delFace(11); // delFace(11);
// Thread.sleep(10000); // Thread.sleep(10000);
countFace(22); // countFace(22);
// getByIdTest(); // getByIdTest();
// vectorQuery(); // vectorQuery();
// scalarQuery(); // scalarQuery();
// update(); //update();
} }
private void selectFace(Integer temp){ private void selectFace(Integer temp){

10
milvus-spring-demo/src/main/resources/application.yml
View File

@ -2,8 +2,14 @@ server:
port: 8131 port: 8131
milvus: milvus:
uri: https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com # uri: https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com
uri: http://xxxx:19530
token: xxx token: xxx
# token: 6fab5641a3156d2666feba14390e4ef4b6d376b5dce91faed303eec91a4bdb82239b70b29eb252b981daa3170516245818d4ee12
enable: true enable: true
packages: packages:
- io.github.javpower.milvus.demo.model - org.dromara.milvus.demo.model
open-log: true
# log-level: WARN
# username: db_a5357975ab80da7
# password: mima@123

2
pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId> <groupId>org.dromara.milvus-plus</groupId>
<artifactId>MilvusPlus</artifactId> <artifactId>MilvusPlus</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>milvus-plus</name> <name>milvus-plus</name>