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

修改包名

Browse Source
This commit is contained in:
xgc 2024-05-23 11:17:38 +08:00
parent 567c475722
commit 466bbebb95
62 changed files with 198 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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"
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>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-core-demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>milvus-core-demo</name>
@ -15,7 +15,7 @@
</properties>
<dependencies>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-core</artifactId>
<version>2.4.0-SNAPSHOT</version>
</dependency>
@ -49,7 +49,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<mainClass>io.github.javpower.milvus.demo.MilvusDemoApplication</mainClass>
<mainClass>org. dromara.milvus.demo.MilvusDemoApplication</mainClass>
<skip>true</skip>
</configuration>
<executions>

19
milvus-core-demo/src/main/java/io/github/javpower/milvus/demo/java/JavaTest.java → milvus-core-demo/src/main/java/org/dromara/milvus/demo/java/JavaTest.java
View File

@ -1,13 +1,13 @@
package io.github.javpower.milvus.demo.java;
package org.dromara.milvus.demo.java;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import io.github.javpower.milvus.demo.model.Face;
import io.github.javpower.milvus.plus.core.mapper.BaseMilvusMapper;
import io.github.javpower.milvus.plus.model.MilvusProperties;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import io.github.javpower.milvus.plus.service.impl.MilvusClientBuild;
import org.dromara.milvus.demo.model.Face;
import org.dromara.milvus.plus.core.mapper.BaseMilvusMapper;
import org.dromara.milvus.plus.model.MilvusProperties;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import org.dromara.milvus.plus.service.impl.MilvusClientBuild;
import io.milvus.v2.client.MilvusClientV2;
import java.util.List;
@ -16,8 +16,8 @@ public class JavaTest {
public static void main(String[] args) throws InterruptedException {
MilvusProperties properties=new MilvusProperties();
properties.setEnable(true);
properties.setUri("xxxxx");
properties.setToken("xxxx");
properties.setUri("https://in03-a5357975ab80da7.api.gcp-us-west1.zillizcloud.com");
properties.setToken("xxx");
properties.setPackages(Lists.newArrayList("io.github.javpower.milvus.demo.model"));
MilvusClientBuild build = new MilvusClientBuild(properties);
build.initialize();
@ -31,6 +31,7 @@ public class JavaTest {
//标量查询
MilvusResp<List<MilvusResult<Face>>> query2 = mapper.queryWrapper()
.eq(Face::getPersonId, 2L)
.partition("face_01")
.topK(3)
.query();
System.out.println("标量查询 query--queryWrapper---{}"+JSONObject.toJSONString(query2));

4
milvus-core-demo/src/main/java/io/github/javpower/milvus/demo/model/Face.java → milvus-core-demo/src/main/java/org/dromara/milvus/demo/model/Face.java
View File

@ -1,9 +1,9 @@
package io.github.javpower.milvus.demo.model;
package org.dromara.milvus.demo.model;
import io.github.javpower.milvus.plus.annotation.*;
import io.milvus.v2.common.DataType;
import io.milvus.v2.common.IndexParam;
import lombok.Data;
import org.dromara.milvus.plus.annotation.*;
import java.util.List;

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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath>
@ -21,7 +21,7 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-core</artifactId>
</dependency>
<dependency>

2
milvus-plus-boot-starter/src/main/java/io/github/javpower/milvus/plus/entity/MilvusProperties.java → milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/entity/MilvusProperties.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.entity;
package org.dromara.milvus.plus.entity;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

6
milvus-plus-boot-starter/src/main/java/io/github/javpower/milvus/plus/mapper/MilvusMapper.java → milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/mapper/MilvusMapper.java
View File

@ -1,7 +1,7 @@
package io.github.javpower.milvus.plus.mapper;
package org.dromara.milvus.plus.mapper;
import io.github.javpower.milvus.plus.core.mapper.BaseMilvusMapper;
import io.github.javpower.milvus.plus.util.SpringUtils;
import org.dromara.milvus.plus.core.mapper.BaseMilvusMapper;
import org.dromara.milvus.plus.util.SpringUtils;
import io.milvus.v2.client.MilvusClientV2;
import org.springframework.stereotype.Component;

6
milvus-plus-boot-starter/src/main/java/io/github/javpower/milvus/plus/service/MilvusInit.java → milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/service/MilvusInit.java
View File

@ -1,6 +1,6 @@
package io.github.javpower.milvus.plus.service;
package org.dromara.milvus.plus.service;
import io.github.javpower.milvus.plus.entity.MilvusProperties;
import org.dromara.milvus.plus.entity.MilvusProperties;
import io.milvus.v2.client.MilvusClientV2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -20,7 +20,7 @@ public class MilvusInit extends AbstractMilvusClientBuilder {
// Spring会调用这个方法来初始化client
@PostConstruct
public void initialize() {
io.github.javpower.milvus.plus.model.MilvusProperties milvusProperties1=new io.github.javpower.milvus.plus.model.MilvusProperties();
org.dromara.milvus.plus.model.MilvusProperties milvusProperties1=new org.dromara.milvus.plus.model.MilvusProperties();
BeanUtils.copyProperties(milvusProperties,milvusProperties1);
super.setProperties(milvusProperties1);
super.initialize();

2
milvus-plus-boot-starter/src/main/java/io/github/javpower/milvus/plus/util/SpringUtils.java → milvus-plus-boot-starter/src/main/java/org/dromara/milvus/plus/util/SpringUtils.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.util;
package org.dromara.milvus.plus.util;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;

2
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath>

12
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/service/impl/MilvusClientBuild.java
View File

@ -1,12 +0,0 @@
package io.github.javpower.milvus.plus.service.impl;
import io.github.javpower.milvus.plus.model.MilvusProperties;
import io.github.javpower.milvus.plus.service.AbstractMilvusClientBuilder;
public class MilvusClientBuild extends AbstractMilvusClientBuilder {
public MilvusClientBuild(MilvusProperties properties) {
super.setProperties(properties);
}
}

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/annotation/ExtraParam.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/annotation/ExtraParam.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.annotation;
package org.dromara.milvus.plus.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/annotation/MilvusCollection.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/annotation/MilvusCollection.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.annotation;
package org.dromara.milvus.plus.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/annotation/MilvusField.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/annotation/MilvusField.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.annotation;
package org.dromara.milvus.plus.annotation;
import io.milvus.v2.common.DataType;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/annotation/MilvusIndex.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/annotation/MilvusIndex.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.annotation;
package org.dromara.milvus.plus.annotation;
import io.milvus.v2.common.IndexParam;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/annotation/MilvusPartition.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/annotation/MilvusPartition.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.annotation;
package org.dromara.milvus.plus.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/builder/CollectionSchemaBuilder.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/builder/CollectionSchemaBuilder.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.builder;
package org.dromara.milvus.plus.builder;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/cache/CollectionToPrimaryCache.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/cache/CollectionToPrimaryCache.java vendored
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.cache;
package org.dromara.milvus.plus.cache;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

4
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/cache/ConversionCache.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/cache/ConversionCache.java vendored
View File

@ -1,6 +1,6 @@
package io.github.javpower.milvus.plus.cache;
package org.dromara.milvus.plus.cache;
import io.github.javpower.milvus.plus.model.MilvusEntity;
import org.dromara.milvus.plus.model.MilvusEntity;
import lombok.Data;
/**
* @author xgc

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/cache/MilvusCache.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/cache/MilvusCache.java vendored
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.cache;
package org.dromara.milvus.plus.cache;
import lombok.Data;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/cache/PropertyCache.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/cache/PropertyCache.java vendored
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.cache;
package org.dromara.milvus.plus.cache;
import java.util.HashMap;
import java.util.Map;

16
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/converter/MilvusConverter.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/converter/MilvusConverter.java
View File

@ -1,14 +1,14 @@
package io.github.javpower.milvus.plus.converter;
package org.dromara.milvus.plus.converter;
import com.google.common.collect.Lists;
import io.github.javpower.milvus.plus.annotation.*;
import io.github.javpower.milvus.plus.builder.CollectionSchemaBuilder;
import io.github.javpower.milvus.plus.cache.CollectionToPrimaryCache;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.MilvusCache;
import io.github.javpower.milvus.plus.cache.PropertyCache;
import io.github.javpower.milvus.plus.model.MilvusEntity;
import org.dromara.milvus.plus.annotation.*;
import org.dromara.milvus.plus.builder.CollectionSchemaBuilder;
import org.dromara.milvus.plus.cache.CollectionToPrimaryCache;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.MilvusCache;
import org.dromara.milvus.plus.cache.PropertyCache;
import org.dromara.milvus.plus.model.MilvusEntity;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.common.IndexParam;
import io.milvus.v2.service.collection.request.AddFieldReq;

12
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/converter/SearchRespConverter.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/converter/SearchRespConverter.java
View File

@ -1,14 +1,14 @@
package io.github.javpower.milvus.plus.converter;
package org.dromara.milvus.plus.converter;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.MilvusCache;
import io.github.javpower.milvus.plus.cache.PropertyCache;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import io.milvus.v2.service.vector.response.GetResp;
import io.milvus.v2.service.vector.response.QueryResp;
import io.milvus.v2.service.vector.response.SearchResp;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.MilvusCache;
import org.dromara.milvus.plus.cache.PropertyCache;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import java.util.ArrayList;
import java.util.HashMap;

8
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/FieldFunction.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/FieldFunction.java
View File

@ -1,8 +1,8 @@
package io.github.javpower.milvus.plus.core;
package org.dromara.milvus.plus.core;
import io.github.javpower.milvus.plus.annotation.MilvusField;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.MilvusCache;
import org.dromara.milvus.plus.annotation.MilvusField;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.MilvusCache;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/AbstractChainWrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/AbstractChainWrapper.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import lombok.Data;

4
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/ConditionBuilder.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/ConditionBuilder.java
View File

@ -1,6 +1,6 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import io.github.javpower.milvus.plus.core.FieldFunction;
import org.dromara.milvus.plus.core.FieldFunction;
import java.lang.reflect.Field;
import java.util.ArrayList;

8
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/LambdaDeleteWrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaDeleteWrapper.java
View File

@ -1,9 +1,9 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import com.alibaba.fastjson.JSON;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.core.FieldFunction;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.core.FieldFunction;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.vector.request.DeleteReq;

10
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/LambdaInsertWrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaInsertWrapper.java
View File

@ -1,11 +1,11 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.PropertyCache;
import io.github.javpower.milvus.plus.core.FieldFunction;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.PropertyCache;
import org.dromara.milvus.plus.core.FieldFunction;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.vector.request.InsertReq;

14
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/LambdaQueryWrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaQueryWrapper.java
View File

@ -1,11 +1,11 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import com.alibaba.fastjson.JSON;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.converter.SearchRespConverter;
import io.github.javpower.milvus.plus.core.FieldFunction;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.converter.SearchRespConverter;
import org.dromara.milvus.plus.core.FieldFunction;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.common.ConsistencyLevel;
@ -66,7 +66,7 @@ public class LambdaQueryWrapper<T> extends AbstractChainWrapper<T> implements Wr
}
return this;
}
public LambdaQueryWrapper<T> partition(FieldFunction<T,?> ... partitionName){
public LambdaQueryWrapper<T> partition(FieldFunction<T,?>... partitionName){
for (FieldFunction<T, ?> p : partitionName) {
this.partitionNames.add(p.getFieldName(p));
}

12
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/LambdaUpdateWrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/LambdaUpdateWrapper.java
View File

@ -1,12 +1,12 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.github.javpower.milvus.plus.cache.CollectionToPrimaryCache;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.PropertyCache;
import io.github.javpower.milvus.plus.core.FieldFunction;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.cache.CollectionToPrimaryCache;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.PropertyCache;
import org.dromara.milvus.plus.core.FieldFunction;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.vector.request.SearchReq;

4
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/conditions/Wrapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/conditions/Wrapper.java
View File

@ -1,6 +1,6 @@
package io.github.javpower.milvus.plus.core.conditions;
package org.dromara.milvus.plus.core.conditions;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.ConversionCache;
import io.milvus.v2.client.MilvusClientV2;
/**

16
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/core/mapper/BaseMilvusMapper.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/core/mapper/BaseMilvusMapper.java
View File

@ -1,17 +1,17 @@
package io.github.javpower.milvus.plus.core.mapper;
package org.dromara.milvus.plus.core.mapper;
import io.github.javpower.milvus.plus.annotation.MilvusCollection;
import io.github.javpower.milvus.plus.cache.ConversionCache;
import io.github.javpower.milvus.plus.cache.MilvusCache;
import io.github.javpower.milvus.plus.core.conditions.*;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import io.github.javpower.milvus.plus.service.IAMService;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.vector.response.DeleteResp;
import io.milvus.v2.service.vector.response.InsertResp;
import io.milvus.v2.service.vector.response.UpsertResp;
import lombok.extern.slf4j.Slf4j;
import org.dromara.milvus.plus.annotation.MilvusCollection;
import org.dromara.milvus.plus.cache.ConversionCache;
import org.dromara.milvus.plus.cache.MilvusCache;
import org.dromara.milvus.plus.core.conditions.*;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import org.dromara.milvus.plus.service.IAMService;
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/model/MilvusEntity.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/model/MilvusEntity.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.model;
package org.dromara.milvus.plus.model;
import io.milvus.v2.common.IndexParam;
import io.milvus.v2.service.collection.request.AddFieldReq;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/model/MilvusField.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/model/MilvusField.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.model;
package org.dromara.milvus.plus.model;
import io.milvus.v2.common.DataType;
import io.milvus.v2.service.collection.request.AddFieldReq;
import lombok.AllArgsConstructor;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/model/MilvusProperties.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/model/MilvusProperties.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.model;
package org.dromara.milvus.plus.model;
import lombok.Data;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/model/vo/MilvusResp.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/model/vo/MilvusResp.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.model.vo;
package org.dromara.milvus.plus.model.vo;
import lombok.Data;
/**

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/model/vo/MilvusResult.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/model/vo/MilvusResult.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.model.vo;
package org.dromara.milvus.plus.model.vo;
import lombok.Data;
/**

8
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/service/AbstractMilvusClientBuilder.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/AbstractMilvusClientBuilder.java
View File

@ -1,8 +1,8 @@
package io.github.javpower.milvus.plus.service;
package org.dromara.milvus.plus.service;
import io.github.javpower.milvus.plus.annotation.MilvusCollection;
import io.github.javpower.milvus.plus.cache.CollectionToPrimaryCache;
import io.github.javpower.milvus.plus.model.MilvusProperties;
import org.dromara.milvus.plus.annotation.MilvusCollection;
import org.dromara.milvus.plus.cache.CollectionToPrimaryCache;
import org.dromara.milvus.plus.model.MilvusProperties;
import io.milvus.v2.client.ConnectConfig;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.collection.request.ReleaseCollectionReq;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/service/IAMService.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/IAMService.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.service;
package org.dromara.milvus.plus.service;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.rbac.request.*;

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

@ -1,7 +1,7 @@
package io.github.javpower.milvus.plus.service;
package org.dromara.milvus.plus.service;
import io.github.javpower.milvus.plus.converter.MilvusConverter;
import io.github.javpower.milvus.plus.model.MilvusEntity;
import org.dromara.milvus.plus.converter.MilvusConverter;
import org.dromara.milvus.plus.model.MilvusEntity;
import io.milvus.exception.MilvusException;
import io.milvus.v2.client.MilvusClientV2;
import io.milvus.v2.service.collection.request.HasCollectionReq;

2
milvus-plus-core/src/main/java/io/github/javpower/milvus/plus/service/MilvusClientBuilder.java → milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/MilvusClientBuilder.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.milvus.plus.service;
package org.dromara.milvus.plus.service;
import io.milvus.v2.client.MilvusClientV2;

12
milvus-plus-core/src/main/java/org/dromara/milvus/plus/service/impl/MilvusClientBuild.java Normal file
View File

@ -0,0 +1,12 @@
package org.dromara.milvus.plus.service.impl;
import org.dromara.milvus.plus.model.MilvusProperties;
import org.dromara.milvus.plus.service.AbstractMilvusClientBuilder;
public class MilvusClientBuild extends AbstractMilvusClientBuilder {
public MilvusClientBuild(MilvusProperties properties) {
super.setProperties(properties);
}
}

8
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"
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>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
@ -49,17 +49,17 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-boot-starter</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId>
<version>${revision}</version>
</dependency>

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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-parent</artifactId>
<version>${revision}</version>
<relativePath>../milvus-plus-parent/pom.xml</relativePath>
@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-core</artifactId>
</dependency>

6
milvus-plus-solon-plugin/src/main/java/io/github/javpower/solon/XPlugin.java → milvus-plus-solon-plugin/src/main/java/org/dromara/solon/XPlugin.java
View File

@ -1,7 +1,7 @@
package io.github.javpower.solon;
package org.dromara.solon;
import io.github.javpower.solon.entity.MilvusProperties;
import io.github.javpower.solon.service.MilvusInit;
import org.dromara.solon.entity.MilvusProperties;
import org.dromara.solon.service.MilvusInit;
import org.noear.solon.core.AppContext;
import org.noear.solon.core.Plugin;

2
milvus-plus-solon-plugin/src/main/java/io/github/javpower/solon/entity/MilvusProperties.java → milvus-plus-solon-plugin/src/main/java/org/dromara/solon/entity/MilvusProperties.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.solon.entity;
package org.dromara.solon.entity;
import lombok.Data;
import org.noear.solon.annotation.Configuration;

4
milvus-plus-solon-plugin/src/main/java/io/github/javpower/solon/mapper/MilvusMapper.java → milvus-plus-solon-plugin/src/main/java/org/dromara/solon/mapper/MilvusMapper.java
View File

@ -1,6 +1,6 @@
package io.github.javpower.solon.mapper;
package org.dromara.solon.mapper;
import io.github.javpower.milvus.plus.core.mapper.BaseMilvusMapper;
import org.dromara.milvus.plus.core.mapper.BaseMilvusMapper;
import io.milvus.v2.client.MilvusClientV2;
import org.noear.solon.Solon;

8
milvus-plus-solon-plugin/src/main/java/io/github/javpower/solon/service/MilvusInit.java → milvus-plus-solon-plugin/src/main/java/org/dromara/solon/service/MilvusInit.java
View File

@ -1,7 +1,7 @@
package io.github.javpower.solon.service;
package org.dromara.solon.service;
import io.github.javpower.milvus.plus.service.AbstractMilvusClientBuilder;
import io.github.javpower.solon.entity.MilvusProperties;
import org.dromara.milvus.plus.service.AbstractMilvusClientBuilder;
import org.dromara.solon.entity.MilvusProperties;
import io.milvus.v2.client.MilvusClientV2;
import org.noear.solon.annotation.*;
import org.noear.solon.core.bean.LifecycleBean;
@ -13,7 +13,7 @@ public class MilvusInit extends AbstractMilvusClientBuilder implements Lifecycle
//see https://solon.noear.org/article/324
@Bean
public MilvusClientV2 init(MilvusProperties milvusProperties) {
io.github.javpower.milvus.plus.model.MilvusProperties milvusProperties1 = new io.github.javpower.milvus.plus.model.MilvusProperties();
org.dromara.milvus.plus.model.MilvusProperties milvusProperties1 = new org.dromara.milvus.plus.model.MilvusProperties();
BeanUtils.copyProperties(milvusProperties, milvusProperties1);
super.setProperties(milvusProperties1);
super.initialize();

2
milvus-plus-solon-plugin/src/main/resources/META-INF/solon/milvus-plus-solon-plugin.properties
View File

@ -1,2 +1,2 @@
solon.plugin=io.github.javpower.solon.XPlugin
solon.plugin=org.dromara.solon.XPlugin
solon.plugin.priority=1

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

@ -11,7 +11,7 @@
<relativePath />
</parent>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-solon-demo</artifactId>
<version>1.0</version>
@ -26,7 +26,7 @@
<dependencies>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-solon-plugin</artifactId>
<version>2.4.0-SNAPSHOT</version>
</dependency>

11
milvus-solon-demo/src/main/java/io/github/javpower/solon/test/test/FaceMilvusMapper.java
View File

@ -1,11 +0,0 @@
package io.github.javpower.solon.test.test;
import io.github.javpower.solon.mapper.MilvusMapper;
import io.github.javpower.solon.test.model.Face;
import org.noear.solon.annotation.Component;
@Component
public class FaceMilvusMapper extends MilvusMapper<Face> {
}

2
milvus-solon-demo/src/main/java/io/github/javpower/solon/App.java → milvus-solon-demo/src/main/java/org/dromara/solon/App.java
View File

@ -1,4 +1,4 @@
package io.github.javpower.solon;
package org.dromara.solon;
import org.noear.solon.Solon;
import org.noear.solon.annotation.SolonMain;

16
milvus-solon-demo/src/main/java/io/github/javpower/solon/DemoController.java → milvus-solon-demo/src/main/java/org/dromara/solon/DemoController.java
View File

@ -1,10 +1,10 @@
package io.github.javpower.solon;
package org.dromara.solon;
import com.alibaba.fastjson.JSONObject;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import io.github.javpower.solon.test.model.Face;
import io.github.javpower.solon.test.test.FaceMilvusMapper;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import org.dromara.solon.test.model.Face;
import org.dromara.solon.test.test.FaceMilvusMapper;
import io.milvus.v2.service.vector.response.DeleteResp;
import io.milvus.v2.service.vector.response.InsertResp;
import io.milvus.v2.service.vector.response.UpsertResp;
@ -25,6 +25,11 @@ public class DemoController {
@Mapping("/test")
@Get
public void hello() {
}
private void face(){
Face face=new Face();
List<Float> vector = new ArrayList<>();
for (int i = 0; i < 128; i++) {
@ -74,6 +79,5 @@ public class DemoController {
//查询
MilvusResp<List<MilvusResult<Face>>> query4 = mapper.getById(1L);log.info("query--{}", JSONObject.toJSONString(query4));
}
}

10
milvus-solon-demo/src/main/java/io/github/javpower/solon/test/model/Face.java → milvus-solon-demo/src/main/java/org/dromara/solon/test/model/Face.java
View File

@ -1,9 +1,9 @@
package io.github.javpower.solon.test.model;
package org.dromara.solon.test.model;
import io.github.javpower.milvus.plus.annotation.ExtraParam;
import io.github.javpower.milvus.plus.annotation.MilvusCollection;
import io.github.javpower.milvus.plus.annotation.MilvusField;
import io.github.javpower.milvus.plus.annotation.MilvusIndex;
import org.dromara.milvus.plus.annotation.ExtraParam;
import org.dromara.milvus.plus.annotation.MilvusCollection;
import org.dromara.milvus.plus.annotation.MilvusField;
import org.dromara.milvus.plus.annotation.MilvusIndex;
import io.milvus.v2.common.DataType;
import io.milvus.v2.common.IndexParam;
import lombok.Data;

11
milvus-solon-demo/src/main/java/org/dromara/solon/test/test/FaceMilvusMapper.java Normal file
View File

@ -0,0 +1,11 @@
package org.dromara.solon.test.test;
import org.dromara.solon.mapper.MilvusMapper;
import org.dromara.solon.test.model.Face;
import org.noear.solon.annotation.Component;
@Component
public class FaceMilvusMapper extends MilvusMapper<Face> {
}

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

@ -10,4 +10,4 @@ milvus:
token: xxxx
enable: true
packages:
- io.github.javpower.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"
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>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-spring-demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>milvus-spring-demo</name>
@ -19,7 +19,7 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>milvus-plus-boot-starter</artifactId>
<version>2.4.0-SNAPSHOT</version>
</dependency>
@ -53,7 +53,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<mainClass>io.github.javpower.milvus.demo.MilvusDemoApplication</mainClass>
<mainClass>org.dromara.milvus.demo.MilvusDemoApplication</mainClass>
<skip>true</skip>
</configuration>
<executions>

10
milvus-spring-demo/src/main/java/io/github/javpower/milvus/demo/test/FaceMilvusMapper.java
View File

@ -1,10 +0,0 @@
package io.github.javpower.milvus.demo.test;
import io.github.javpower.milvus.demo.model.Face;
import io.github.javpower.milvus.plus.mapper.MilvusMapper;
import org.springframework.stereotype.Component;
@Component
public class FaceMilvusMapper extends MilvusMapper<Face> {
}

37
milvus-spring-demo/src/main/java/io/github/javpower/milvus/demo/ApplicationRunnerTest.java → milvus-spring-demo/src/main/java/org/dromara/milvus/demo/ApplicationRunnerTest.java
View File

@ -1,16 +1,12 @@
package io.github.javpower.milvus.demo;
package org.dromara.milvus.demo;
import com.alibaba.fastjson.JSONObject;
import io.github.javpower.milvus.demo.model.Face;
import io.github.javpower.milvus.demo.test.FaceMilvusMapper;
import io.github.javpower.milvus.demo.test.QaMilvusMapper;
import io.github.javpower.milvus.plus.model.vo.MilvusResp;
import io.github.javpower.milvus.plus.model.vo.MilvusResult;
import io.milvus.v2.service.vector.response.DeleteResp;
import org.dromara.milvus.demo.model.Face;
import org.dromara.milvus.demo.test.FaceMilvusMapper;
import org.dromara.milvus.plus.model.vo.MilvusResp;
import org.dromara.milvus.plus.model.vo.MilvusResult;
import io.milvus.v2.service.vector.response.InsertResp;
import io.milvus.v2.service.vector.response.UpsertResp;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
@ -22,8 +18,6 @@ import java.util.List;
@Slf4j
public class ApplicationRunnerTest implements ApplicationRunner {
private final FaceMilvusMapper mapper;
@Autowired
private QaMilvusMapper qaMilvusMapper;
public ApplicationRunnerTest(FaceMilvusMapper mapper) {
this.mapper = mapper;
@ -51,6 +45,11 @@ public class ApplicationRunnerTest implements ApplicationRunner {
vector1.add((float) (Math.random() * 100)); // 这里仅作为示例使用随机数
}
face1.setFaceVector(vector1);
if(i%2==0){
face1.setPersonName("张三"+i);
}else {
face1.setPersonName("李四"+i);
}
faces.add(face1);
}
MilvusResp<InsertResp> insert = mapper.insertWrapper().partition("face_001").insert(faces.toArray(new Face[0]));
@ -62,28 +61,16 @@ public class ApplicationRunnerTest implements ApplicationRunner {
//向量查询
MilvusResp<List<MilvusResult<Face>>> query1 = mapper.queryWrapper()
.vector(Face::getFaceVector, vector)
.ne(Face::getPersonId, 1L)
.like(Face::getPersonName, "张三")
.topK(3)
.query();
log.info("向量查询 query--queryWrapper---{}", JSONObject.toJSONString(query1));
//标量查询
MilvusResp<List<MilvusResult<Face>>> query2 = mapper.queryWrapper()
.eq(Face::getPersonId, 2L)
.topK(3)
.limit(3l)
.query();
log.info("标量查询 query--queryWrapper---{}", JSONObject.toJSONString(query2));
//更新
vector.clear();
for (int i = 0; i < 128; i++) {
vector.add((float) (Math.random() * 100)); // 这里仅作为示例使用随机数
}
MilvusResp<UpsertResp> update = mapper.updateById(face);log.info("update--{}", JSONObject.toJSONString(update));
//id查询
MilvusResp<List<MilvusResult<Face>>> query3 = mapper.getById(1L);log.info("query--getById---{}", JSONObject.toJSONString(query3));
//删除
MilvusResp<DeleteResp> remove = mapper.removeById(1L);log.info("remove--{}", JSONObject.toJSONString(remove));
//查询
MilvusResp<List<MilvusResult<Face>>> query4 = mapper.getById(1L);log.info("query--{}", JSONObject.toJSONString(query4));
}
}

5
milvus-spring-demo/src/main/java/io/github/javpower/milvus/demo/MilvusDemoApplication.java → milvus-spring-demo/src/main/java/org/dromara/milvus/demo/MilvusDemoApplication.java
View File

@ -1,10 +1,7 @@
package io.github.javpower.milvus.demo;
package org.dromara.milvus.demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Component;
@SpringBootApplication
public class MilvusDemoApplication {

10
milvus-spring-demo/src/main/java/io/github/javpower/milvus/demo/model/Face.java → milvus-spring-demo/src/main/java/org/dromara/milvus/demo/model/Face.java
View File

@ -1,9 +1,9 @@
package io.github.javpower.milvus.demo.model;
package org.dromara.milvus.demo.model;
import io.github.javpower.milvus.plus.annotation.*;
import io.milvus.v2.common.DataType;
import io.milvus.v2.common.IndexParam;
import lombok.Data;
import org.dromara.milvus.plus.annotation.*;
import java.util.List;
@ -19,6 +19,12 @@ public class Face {
)
private Long personId; // 人员的唯一标识符
@MilvusField(
name = "person_name",
dataType = DataType.VarChar
)
private String personName; // 人员姓名
@MilvusField(
name = "face_vector", // 字段名称
dataType = DataType.FloatVector, // 数据类型为浮点型向量

10
milvus-spring-demo/src/main/java/org/dromara/milvus/demo/test/FaceMilvusMapper.java Normal file
View File

@ -0,0 +1,10 @@
package org.dromara.milvus.demo.test;
import org.dromara.milvus.demo.model.Face;
import org.dromara.milvus.plus.mapper.MilvusMapper;
import org.springframework.stereotype.Component;
@Component
public class FaceMilvusMapper extends MilvusMapper<Face> {
}

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"
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>
<groupId>io.github.javpower</groupId>
<groupId>org.dromara</groupId>
<artifactId>MilvusPlus</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>milvus-plus</name>