Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update docean-plugin-es-antlr4 ipv4 #574

Merged
merged 3 commits into from
Aug 8, 2023
Merged

update docean-plugin-es-antlr4 ipv4 #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2316846
feat:update docean-plugin-es-antlr4 ipv4
wtt40122 Aug 7, 2023
1b1a1be
feat: add .
wtt40122 Aug 7, 2023
29690bf
feat:clean code
wtt40122 Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...an-plugin-es-antlr4/src/main/java/com/xiaomi/youpin/docean/plugin/es/antlr4/g4/EsQuery.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ NUMBER
;

SEGMENT
: ([0-9] | [1-9][0-9] | '1'[0-9][0-9] | '2'[0-4]'5' | [1-2]'5'[0-4] )
: ([0-9] | [1-9][0-9] | '1'[0-9][0-9] | '2'[0-4]'5' | '2'[0-4][0-4] | [1-2]'5'[0-4] )
| '*'
;

Expand Down
2 changes: 1 addition & 1 deletion ...-antlr4/src/main/java/com/xiaomi/youpin/docean/plugin/es/antlr4/query/EsQueryLexer.interp
View file
Open in desktop

Large diffs are not rendered by default.

468 changes: 235 additions & 233 deletions ...es-antlr4/src/main/java/com/xiaomi/youpin/docean/plugin/es/antlr4/query/EsQueryLexer.java
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions ...plugin-es-antlr4/src/test/java/com/xiaomi/youpin/docean/plugin/es/antlr4/EsQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,18 @@ public void test10() throws IOException {
searchResponse = client.search(searchRequest);
System.out.println(esQuery);
}

@Test
public void test11(){
String str = " (not http) and 8088";
String esQuery = EsQueryUtils.getEsQuery(str);
System.out.println(esQuery);
}

@Test
public void test12(){
String str = "10.38.201.233";
String esQuery = EsQueryUtils.getEsQuery(str);
System.out.println(esQuery);
}
}
8 changes: 4 additions & 4 deletions ...plugin-test/src/test/java/com/xiaomi/youpin/docean/plugin/test/service/HealthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.xiaomi.youpin.docean.anno.Service;
import com.xiaomi.youpin.docean.plugin.config.anno.Value;
import com.xiaomi.youpin.docean.plugin.dmesh.anno.MeshReference;
import com.youpin.xiaomi.tesla.service.TeslaGatewayService;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Resource;
Expand Down Expand Up @@ -40,8 +39,8 @@ public class HealthService {
private boolean kk;


@MeshReference(interfaceClass = TeslaGatewayService.class)
private TeslaGatewayService apiService;
// @MeshReference(interfaceClass = TeslaGatewayService.class)
// private TeslaGatewayService apiService;


@MeshReference(interfaceClass = DemoMeshService.class, app = "demo_app")
Expand All @@ -53,7 +52,8 @@ public class HealthService {

public String health() {
try {
return "ok:" + apiService.ping();
// return "ok:" + apiService.ping();
return "ok:";
} catch (Throwable ex) {
return ex.getMessage();
}
Expand Down
2 changes: 0 additions & 2 deletions jcommon/docean/src/main/java/com/xiaomi/youpin/docean/common/EnvUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.xiaomi.youpin.docean.common;

import org.springframework.util.StringUtils;

/**
* @author [email protected]
*/
Expand Down