diff --git a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Author.java b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Author.java index 0ccbdf9e..193fc75e 100644 --- a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Author.java +++ b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Author.java @@ -5,6 +5,7 @@ import lombok.Data; import org.dromara.easyes.annotation.IndexField; import org.dromara.easyes.annotation.IndexId; import org.dromara.easyes.annotation.rely.FieldType; +import org.dromara.easyes.common.join.BaseJoin; /** @@ -13,7 +14,7 @@ import org.dromara.easyes.annotation.rely.FieldType; * Copyright © 2024 xpc1024 All Rights Reserved **/ @Data -public class Author { +public class Author extends BaseJoin { /** * 作者id */ diff --git a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Comment.java b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Comment.java index d3390e78..4e639fbb 100644 --- a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Comment.java +++ b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Comment.java @@ -7,6 +7,7 @@ import org.dromara.easyes.annotation.IndexName; import org.dromara.easyes.annotation.rely.Analyzer; import org.dromara.easyes.annotation.rely.FieldType; import org.dromara.easyes.annotation.rely.JoinField; +import org.dromara.easyes.common.join.BaseJoin; /** @@ -15,7 +16,7 @@ import org.dromara.easyes.annotation.rely.JoinField; * Copyright © 2021 xpc1024 All Rights Reserved **/ @Data -public class Comment { +public class Comment extends BaseJoin { /** * 评论id */ diff --git a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Contact.java b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Contact.java index 2de73225..3a6d0085 100644 --- a/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Contact.java +++ b/easy-es-springboot-test/src/main/java/org/dromara/easyes/test/entity/Contact.java @@ -5,6 +5,7 @@ import lombok.Data; import org.dromara.easyes.annotation.IndexField; import org.dromara.easyes.annotation.IndexId; import org.dromara.easyes.annotation.rely.FieldType; +import org.dromara.easyes.common.join.BaseJoin; /** @@ -13,7 +14,7 @@ import org.dromara.easyes.annotation.rely.FieldType; * Copyright © 2024 xpc1024 All Rights Reserved **/ @Data -public class Contact { +public class Contact extends BaseJoin { /** * 联系人id */ diff --git a/easy-es-springboot-test/src/test/java/org/dromara/easyes/test/nested/NestedTest.java b/easy-es-springboot-test/src/test/java/org/dromara/easyes/test/nested/NestedTest.java index c3cf3434..38d96a11 100644 --- a/easy-es-springboot-test/src/test/java/org/dromara/easyes/test/nested/NestedTest.java +++ b/easy-es-springboot-test/src/test/java/org/dromara/easyes/test/nested/NestedTest.java @@ -128,7 +128,7 @@ public class NestedTest { System.out.println(documents2); LambdaEsQueryWrapper wrapper3 = new LambdaEsQueryWrapper<>(); - wrapper3.nested("users.faqs", w -> w.match("users.faqs.faq_name", "q3").or().match("users.faqs.faq_name", "q4")); + wrapper3.nested("users.faqs", w -> w.match("users.faqs.faq_name", "q2").or().match("users.faqs.faq_name", "q4")); List documents3 = documentMapper.selectList(wrapper3); System.out.println(documents3); } diff --git a/easy-es-springboot-test/src/test/resources/application.yml b/easy-es-springboot-test/src/test/resources/application.yml index 436c888e..bfafedae 100644 --- a/easy-es-springboot-test/src/test/resources/application.yml +++ b/easy-es-springboot-test/src/test/resources/application.yml @@ -1,9 +1,9 @@ easy-es: # enable: true - address: 192.168.1.16:30156 + address: 10.18.2.45:9200 # schema: http - username: elastic - password: mg123456 +# username: elastic +# password: mg123456 keep-alive-millis: 18000 global-config: i-kun-mode: false @@ -11,7 +11,7 @@ easy-es: async-process-index-blocking: true print-dsl: true db-config: - map-underscore-to-camel-case: false + map-underscore-to-camel-case: true id-type: customize field-strategy: not_empty refresh-policy: immediate @@ -25,6 +25,7 @@ easy-es: # address: 10.18.2.45:9200 # 数据源2 #username: '若无可去掉此行' #password: '若无可去掉此行' + compatible: true #logging: # level: # tracer: trace