Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/WildcardQueryBuilder.java

@@ -23,7 +23,8 @@ public class WildcardQueryBuilder implements IQueryBuilder{
         String str = "*";
         String s = "";
         if (list.contains(field)) {
-            if (value.length() == 13 || value.length() == 15) {
+            String sub = value.substring(0, 2);
+            if ((value.length() == 13 && !sub.equalsIgnoreCase("JP")) || value.length() == 15) {
                 String frontPart = value.substring(0, value.length() - 1);
                 String afterPart = value.substring(value.length() - 1);
                 String s1 = frontPart + "." + afterPart;

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -510,7 +510,7 @@ public class EsService {
 
         req = UpdateRequest.of(
                 b -> b.index("patent").id(id)
-                        .doc(patent).refresh(Refresh.True).waitForActiveShards(WaitForActiveShards.of(i -> i.count(1)))
+                        .doc(patent).refresh(Refresh.True)
         );
 
         try {
@@ -1451,7 +1451,8 @@ public class EsService {
 
     public Integer deleteByIds(List<String> ids) {
         Query query = QueryBuilders.ids(n -> n.values(ids));
-        DeleteByQueryRequest request = DeleteByQueryRequest.of(i -> i.index("patent").query(query).refresh(true));
+        DeleteByQueryRequest request = DeleteByQueryRequest.of(i -> i.index("patent").query(query)
+                .refresh(true));
         try {
             client.deleteByQuery(request);
             return 1;