From 10126a61c4889eaaf1d30eaa2ff921741cfe25a2 Mon Sep 17 00:00:00 2001 From: xgc Date: Mon, 25 Nov 2024 18:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC2.1.8?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=20groupId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 16 +++--- README.md | 12 ++-- milvus-core-demo/pom.xml | 6 +- milvus-plus-boot-starter/pom.xml | 4 +- milvus-plus-core/pom.xml | 4 +- .../core/conditions/LambdaInsertWrapper.java | 2 +- .../milvus/plus/service/ICMService.java | 6 -- milvus-plus-parent/pom.xml | 55 +++++++++++-------- milvus-plus-solon-plugin/pom.xml | 4 +- milvus-solon-demo/pom.xml | 6 +- milvus-solon-demo/src/main/resources/app.yml | 2 +- milvus-spring-demo/pom.xml | 6 +- .../milvus/demo/ApplicationRunnerTest.java | 7 ++- .../src/main/resources/application.yml | 10 +++- pom.xml | 2 +- 15 files changed, 77 insertions(+), 65 deletions(-) diff --git a/README.cn.md b/README.cn.md index ccb0c6a..b471ad5 100644 --- a/README.cn.md +++ b/README.cn.md @@ -29,9 +29,9 @@ ``` - org.dromara + org.dromara.milvus-plus milvus-plus-core - 2.1.6 + 2.1.8 ``` @@ -39,9 +39,9 @@ Spring应用支持： ``` - org.dromara + org.dromara.milvus-plus milvus-plus-boot-starter - 2.1.6 + 2.1.8 ``` @@ -49,14 +49,14 @@ Solon应用支持： ``` - org.dromara + org.dromara.milvus-plus milvus-plus-solon-plugin - 2.1.6 + 2.1.8 ``` ## 需知 - +- 2.1.7版本之后groupId修改为 org.dromara.milvus-plus，版本之前为 org.dromara - 2.0.0版本必须使用索引注解定义索引，不然启动报错后，再添加无效，需要先删除集合 - 2.0.0版本暂未发布 MilvusService 功能 @@ -538,7 +538,7 @@ public class ApplicationRunnerTest implements ApplicationRunner { } ``` -## 联系 +# 联系 如有问题或需要支持，请联系(备注 milvusplus) diff --git a/README.md b/README.md index 8a2d12d..1e9e687 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ Custom extension support: ``` - org.dromara + org.dromara.milvus-plus milvus-plus-core - 2.1.6 + 2.1.8 ``` @@ -37,9 +37,9 @@ Spring application support: ``` - org.dromara + org.dromara.milvus-plus milvus-plus-boot-starter - 2.1.6 + 2.1.8 ``` @@ -47,9 +47,9 @@ Solon application support: ``` - org.dromara + org.dromara.milvus-plus milvus-plus-solon-plugin - 2.1.6 + 2.1.8 ``` diff --git a/milvus-core-demo/pom.xml b/milvus-core-demo/pom.xml index 8094484..944b236 100644 --- a/milvus-core-demo/pom.xml +++ b/milvus-core-demo/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-core-demo 0.0.1-SNAPSHOT milvus-core-demo @@ -15,9 +15,9 @@ - org.dromara + org.dromara.milvus-plus milvus-plus-core - 2.1.1 + 2.1.7 diff --git a/milvus-plus-boot-starter/pom.xml b/milvus-plus-boot-starter/pom.xml index d27e55f..01e5676 100644 --- a/milvus-plus-boot-starter/pom.xml +++ b/milvus-plus-boot-starter/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-plus-parent ${revision} ../milvus-plus-parent/pom.xml @@ -21,7 +21,7 @@ spring-boot-starter-web - org.dromara + org.dromara.milvus-plus milvus-plus-core diff --git a/milvus-plus-core/pom.xml b/milvus-plus-core/pom.xml index 6ce0e9f..c218f35 100644 --- a/milvus-plus-core/pom.xml +++ b/milvus-plus-core/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-plus-parent ${revision} ../milvus-plus-parent/pom.xml @@ -28,7 +28,7 @@ io.milvus milvus-sdk-java - 2.4.2 + 2.4.4 org.apache.logging.log4j diff --git a/milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java b/milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java index 2dcc292..ad392c6 100644 --- a/milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java +++ b/milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java @@ -75,7 +75,7 @@ public class LambdaInsertWrapper extends AbstractChainWrapper implements private MilvusResp insert(List jsonObjects){ return executeWithRetry( () -> { - log.info("update data--->{}", GsonUtil.toJson(jsonObjects)); + log.info("insert data--->{}", GsonUtil.toJson(jsonObjects)); InsertReq.InsertReqBuilder builder = InsertReq.builder() .collectionName(collectionName) .data(jsonObjects); diff --git a/milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/ICMService.java b/milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/ICMService.java index a4665c4..26c31f8 100644 --- a/milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/ICMService.java +++ b/milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/ICMService.java @@ -122,12 +122,6 @@ public interface ICMService { .collectionName(collectionName) .build(); client.dropCollection(dropCollectionReq); - - // 检查集合是否已被删除 - boolean isDropped = hasCollection(collectionName); - if (!isDropped) { - throw new RuntimeException("Failed to drop collection: " + collectionName); - } } /** diff --git a/milvus-plus-parent/pom.xml b/milvus-plus-parent/pom.xml index 8d54c76..16d192f 100644 --- a/milvus-plus-parent/pom.xml +++ b/milvus-plus-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-plus-parent ${revision} pom @@ -30,7 +30,7 @@ - 2.1.6 + 2.1.8 ${java.version} ${java.version} 3.11.0 @@ -52,17 +52,17 @@ - org.dromara + org.dromara.milvus-plus milvus-plus-core ${revision} - org.dromara + org.dromara.milvus-plus milvus-plus-boot-starter ${revision} - org.dromara + org.dromara.milvus-plus milvus-plus-solon-plugin ${revision} @@ -76,16 +76,16 @@ - - - oss - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss - https://oss.sonatype.org/content/repositories/snapshots/ - - + + + + + + + + + + @@ -104,18 +104,29 @@ spring-boot-maven-plugin ${spring-boot.version} + + + + + + + + + + + + - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} + org.sonatype.central + central-publishing-maven-plugin + 0.4.0 true - oss - https://oss.sonatype.org/ - true - 10 + central + true + org.apache.maven.plugins maven-source-plugin diff --git a/milvus-plus-solon-plugin/pom.xml b/milvus-plus-solon-plugin/pom.xml index 6e62fe5..2034244 100755 --- a/milvus-plus-solon-plugin/pom.xml +++ b/milvus-plus-solon-plugin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-plus-parent ${revision} ../milvus-plus-parent/pom.xml @@ -15,7 +15,7 @@ - org.dromara + org.dromara.milvus-plus milvus-plus-core diff --git a/milvus-solon-demo/pom.xml b/milvus-solon-demo/pom.xml index f2415d5..12c061a 100755 --- a/milvus-solon-demo/pom.xml +++ b/milvus-solon-demo/pom.xml @@ -11,7 +11,7 @@ - org.dromara + org.dromara.milvus-plus milvus-solon-demo 1.0 @@ -26,9 +26,9 @@ - org.dromara + org.dromara.milvus-plus milvus-plus-solon-plugin - 2.1.1 + 2.1.7 org.noear diff --git a/milvus-solon-demo/src/main/resources/app.yml b/milvus-solon-demo/src/main/resources/app.yml index a1793c0..fa57b12 100755 --- a/milvus-solon-demo/src/main/resources/app.yml +++ b/milvus-solon-demo/src/main/resources/app.yml @@ -7,7 +7,7 @@ solon.app: milvus: uri: https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com - token: xxxx + token: 6fab5641a3156d2666feba14390e4ef4b6d376b5dce91faed303eec91a4bdb82239b70b29eb252b981daa3170516245818d4ee12 enable: true packages: - org.dromara.solon.test.model \ No newline at end of file diff --git a/milvus-spring-demo/pom.xml b/milvus-spring-demo/pom.xml index 0e2a550..9e6d104 100644 --- a/milvus-spring-demo/pom.xml +++ b/milvus-spring-demo/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.dromara + org.dromara.milvus-plus milvus-spring-demo 0.0.1-SNAPSHOT milvus-spring-demo @@ -19,9 +19,9 @@ spring-boot-starter - org.dromara + org.dromara.milvus-plus milvus-plus-boot-starter - 2.1.4 + 2.1.7 diff --git a/milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java b/milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java index 7374a04..3f0d249 100644 --- a/milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java +++ b/milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java @@ -37,16 +37,17 @@ public class ApplicationRunnerTest implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws InterruptedException { + milvusService.dropCollection("face_collection"); // insertFace(); // selectFace(12); -// selectFace(11); +//// selectFace(11); // delFace(11); // Thread.sleep(10000); - countFace(22); +// countFace(22); // getByIdTest(); // vectorQuery(); // scalarQuery(); -// update(); + //update(); } private void selectFace(Integer temp){ diff --git a/milvus-spring-demo/src/main/resources/application.yml b/milvus-spring-demo/src/main/resources/application.yml index 6fd19d7..9ad2c91 100644 --- a/milvus-spring-demo/src/main/resources/application.yml +++ b/milvus-spring-demo/src/main/resources/application.yml @@ -2,8 +2,14 @@ server: port: 8131 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: 6fab5641a3156d2666feba14390e4ef4b6d376b5dce91faed303eec91a4bdb82239b70b29eb252b981daa3170516245818d4ee12 enable: true packages: - - io.github.javpower.milvus.demo.model \ No newline at end of file + - org.dromara.milvus.demo.model + open-log: true +# log-level: WARN +# username: db_a5357975ab80da7 +# password: mima@123 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9015e26..7238159 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.dromara + org.dromara.milvus-plus MilvusPlus 0.0.1-SNAPSHOT milvus-plus