diff --git a/src/main/java/ru/serega6531/packmate/repository/PatternRepository.java b/src/main/java/ru/serega6531/packmate/repository/PatternRepository.java index 4cdf665..2fa9035 100644 --- a/src/main/java/ru/serega6531/packmate/repository/PatternRepository.java +++ b/src/main/java/ru/serega6531/packmate/repository/PatternRepository.java @@ -2,12 +2,6 @@ package ru.serega6531.packmate.repository; import org.springframework.data.jpa.repository.JpaRepository; import ru.serega6531.packmate.model.Pattern; -import ru.serega6531.packmate.model.enums.PatternDirectionType; - -import java.util.List; public interface PatternRepository extends JpaRepository { - - List findAllByTypeEqualsOrTypeEquals(PatternDirectionType type, PatternDirectionType both); - } diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java index cf9da0d..17d764a 100644 --- a/src/main/java/ru/serega6531/packmate/service/PatternService.java +++ b/src/main/java/ru/serega6531/packmate/service/PatternService.java @@ -68,13 +68,15 @@ public class PatternService { String content = new String(bytes); final java.util.regex.Pattern regex = compilePattern(pattern); final Matcher matcher = regex.matcher(content); + int startPos = 0; - while (matcher.find()) { + while (matcher.find(startPos)) { found.add(FoundPattern.builder() .patternId(pattern.getId()) .startPosition(matcher.start()) .endPosition(matcher.end()) .build()); + startPos = matcher.end() + 1; } return found; diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java index b336c96..1a1811d 100644 --- a/src/main/java/ru/serega6531/packmate/service/StreamService.java +++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java @@ -43,7 +43,7 @@ public class StreamService { private final boolean ignoreEmptyPackets; private final byte[] GZIP_HEADER = {0x1f, (byte) 0x8b, 0x08}; - private final java.util.regex.Pattern userAgentPattern = java.util.regex.Pattern.compile("User-Agent: (.+)\\n"); + private final java.util.regex.Pattern userAgentPattern = java.util.regex.Pattern.compile("User-Agent: (.+)\\r\\n"); @Autowired public StreamService(StreamRepository repository, diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9fd8eb6..ecac0e0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -20,4 +20,5 @@ account-login: BinaryBears account-password: 123456 udp-stream-timeout: 20 # секунд tcp-stream-timeout: 40 # секунд -timeout-stream-check-interval: 10 # секунд \ No newline at end of file +timeout-stream-check-interval: 10 # секунд +ignore-empty-packets: true \ No newline at end of file