Merge branch 'master' of https://github.com/chubaostream/joyqueue

jd-opensource · Dec 29, 2020 · 2378f6f · 2378f6f
2 parents c3ed5db + 435a700
commit 2378f6f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...ole/joyqueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/query/QBroker.java b/...ole/joyqueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/query/QBroker.java
@@ -37,6 +37,8 @@ public class QBroker implements Query {
 
     private String keyword;
 
+    private Boolean fuzzy;
+
     @Deprecated
     private List<Integer> brokerGroupIds;
 
@@ -116,4 +118,11 @@ public void setInBrokerIds(List<Integer> inBrokerIds) {
         this.inBrokerIds = inBrokerIds;
     }
 
+    public Boolean getFuzzy() {
+        return fuzzy;
+    }
+
+    public void setFuzzy(Boolean fuzzy) {
+        this.fuzzy = fuzzy;
+    }
 }
diff --git a/...oyqueue-data-service/src/main/java/org/joyqueue/nsr/impl/BrokerNameServerServiceImpl.java b/...oyqueue-data-service/src/main/java/org/joyqueue/nsr/impl/BrokerNameServerServiceImpl.java
@@ -167,6 +167,7 @@ private BrokerQuery brokerQueryConvert(QBroker query){
             brokerQuery.setIp(query.getIp());
             brokerQuery.setKeyword(query.getKeyword());
             brokerQuery.setBrokerList(query.getInBrokerIds());
+            brokerQuery.setFuzzy(query.getFuzzy());
         }
         return brokerQuery;
     }

diff --git a/...-nsr/joyqueue-nsr-sql/src/main/java/org/joyqueue/nsr/sql/repository/BrokerRepository.java b/...-nsr/joyqueue-nsr-sql/src/main/java/org/joyqueue/nsr/sql/repository/BrokerRepository.java
@@ -128,9 +128,7 @@ protected String getSearchSql(String prefix, BrokerQuery query, List<Object> par
             } else {
                 if (query.getFuzzy() != null && query.getFuzzy()) {
                     sql.append(" AND `ip` LIKE ?");
-                    params.add("%");
-                    params.add(query.getKeyword());
-                    params.add("%");
+                    params.add("%" + query.getKeyword() + "%");
                 } else {
                     sql.append(" AND `ip` = ?");
                     params.add(query.getKeyword());