Merge branch 'bugfix/eval-error' into 'master'

feat: add job without distinct See merge request galaxy/tsg_olap/sip-rtp-correlation!36
feat: add job without distinct
2024-10-31 04:25:07 +00:00 · 2024-10-31 12:21:57 +08:00 · 2024-10-31 02:33:28 +00:00 · 2024-10-31 09:50:43 +08:00 · 2024-10-30 18:39:38 +08:00 · 2024-10-21 06:43:13 +00:00
20 changed files with 2252 additions and 170 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: 192.168.40.153:9080/common/maven:3.8.1-openjdk-11-slim-with-git
+image: 192.168.40.153:8082/common/maven:3.8.1-openjdk-11-slim

 variables:
  MAVEN_CLI_OPTS: "--batch-mode --errors --show-version"
@@ -8,16 +8,10 @@ stages:
  - test
  - build

-snapshot-version:
-  stage: check
-  script:
-    - mvn $MAVEN_CLI_OPTS enforcer:enforce@snapshot-version-check
-  rules:
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" && $CI_PIPELINE_SOURCE == "merge_request_event"
-
-non-snapshot-version:
+release-version-check:
  stage: check
  script:
+    - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
    - mvn $MAVEN_CLI_OPTS enforcer:enforce@release-version-check
    - |-
      if `mvn $MAVEN_CLI_OPTS dependency:get@release-deploy-check > /dev/null 2>&1`; then
@@ -27,21 +21,20 @@ non-snapshot-version:
        echo "The current version has not been deployed."
      fi
  rules:
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /(^master$|^release\/)/ && $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $CI_PIPELINE_SOURCE == "merge_request_event"

 test:
  stage: test
  script:
+    - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
    - mvn $MAVEN_CLI_OPTS clean test
  only:
    - merge_requests

-# Used for building snapshot versions on the develop branch.
 build:
  stage: build
  script:
    - echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
    - mvn clean site deploy -DskipTests
  only:
-    - master
-    - /^release\//
+    - master
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@

    <groupId>com.geedgenetworks.application</groupId>
    <artifactId>sip-rtp-correlation</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-rc9</version>

    <name>Flink : SIP-RTP : Correlation</name>

@@ -19,7 +19,7 @@
        <scala.version>2.12.10</scala.version>
        <scala.binary.version>2.12</scala.binary.version>
        <flink.version>1.13.6</flink.version>
-        <easy.stream.version>1.3-SNAPSHOT</easy.stream.version>
+        <easy.stream.version>1.3-rc2</easy.stream.version>
        <slf4j.version>1.7.32</slf4j.version>
        <log4j.version>2.17.1</log4j.version>
        <junit.version>5.8.0</junit.version>
@@ -28,35 +28,21 @@
    <distributionManagement>
        <repository>
            <id>platform-releases</id>
-            <url>http://192.168.40.153:8099/content/repositories/platform-release</url>
+            <url>http://192.168.40.153:8081/content/repositories/platform-release</url>
            <uniqueVersion>true</uniqueVersion>
        </repository>
        <snapshotRepository>
            <id>platform-snapshots</id>
-            <url>http://192.168.40.153:8099/content/repositories/platform-snapshot</url>
+            <url>http://192.168.40.153:8081/content/repositories/platform-snapshot</url>
        </snapshotRepository>
        <site>
            <id>platform-site</id>
            <url>
-                dav:http://192.168.40.153:8099/content/sites/platform-site/platform/application/sip-rtp-correlate-${project.version}
+                dav:http://192.168.40.153:8081/content/sites/platform-site/platform/application/sip-rtp-correlate-${project.version}
            </url>
        </site>
    </distributionManagement>

-    <repositories>
-        <repository>
-            <id>central</id>
-            <url>http://192.168.40.153:8099/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>snapshots</id>
-            <url>http://192.168.40.153:8099/content/groups/public</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
    <dependencies>
        <dependency>
            <groupId>org.slf4j</groupId>
@@ -76,8 +62,8 @@
        </dependency>

        <dependency>
-            <groupId>com.zdjizhi</groupId>
-            <artifactId>galaxy</artifactId>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
        </dependency>
        <dependency>
            <groupId>xyz.downgoon</groupId>
@@ -253,23 +239,9 @@

            <!--  Common  -->
            <dependency>
-                <groupId>com.zdjizhi</groupId>
-                <artifactId>galaxy</artifactId>
-                <version>1.1.3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-lang3</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>5.8.32</version>
            </dependency>

            <!-- Easy Stream-->
@@ -337,13 +309,13 @@
                <groupId>org.apache.flink</groupId>
                <artifactId>flink-runtime_${scala.binary.version}</artifactId>
                <version>${flink.version}</version>
-                <scope>runtime</scope>
+                <scope>provided</scope>
            </dependency>
            <dependency>
                <groupId>org.apache.flink</groupId>
                <artifactId>flink-runtime-web_${scala.binary.version}</artifactId>
                <version>${flink.version}</version>
-                <scope>runtime</scope>
+                <scope>provided</scope>
            </dependency>

            <dependency>
@@ -587,6 +559,27 @@

        <pluginManagement>
            <plugins>
+                <!-- CI plugins -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.2</version>
+                    <executions>
+                        <execution>
+                            <id>release-deploy-check</id>
+                            <goals>
+                                <goal>get</goal>
+                            </goals>
+                            <configuration>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>easy-stream-common</artifactId>
+                                <version>${project.version}</version>
+                                <remoteRepositories>${project.distributionManagement.repository.url}
+                                </remoteRepositories>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-enforcer-plugin</artifactId>
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/VoipUDFFactory.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/VoipUDFFactory.java
@@ -20,7 +20,9 @@ public class VoipUDFFactory implements UDFFactory {
                put("HAS_EXTERNAL_IP_ADDRESS", new HasExternalIpAddress());

                put("STREAM_DIR", new StreamDir());
+                put("STREAM_DIR_SET", new StreamDirSet());
                put("FIND_NOT_BLANK", new FindNotBlank());
+                put("DISTINCT_CONCAT", new DistinctConcat());
                put("SORT_ADDRESS", new SortAddress());

                put("SNOWFLAKE_ID", new SnowflakeID());
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/DistinctConcat.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/DistinctConcat.java
@@ -0,0 +1,18 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.flink.table.annotation.DataTypeHint;
+import org.apache.flink.table.functions.ScalarFunction;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class DistinctConcat extends ScalarFunction {
+
+    public @DataTypeHint("STRING") String eval(String s1, String s2) {
+        return Stream.of(s1, s2).filter(StringUtils::isNotBlank)
+                .map(StringUtils::trim)
+                .distinct()
+                .collect(Collectors.joining(","));
+    }
+}
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/HasIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/HasIpAddress.java
@@ -1,17 +1,17 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class HasIpAddress extends ScalarFunction {
+public class HasIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String... ipaddr) {
        if (null == ipaddr) {
            return false;
        }
        for (var ip : ipaddr) {
-            return ip != null && IPUtil.isIPAddress(ip);
+            if (ip != null && isIpAddress(ip)) {
+                return true;
+            }
        }
        return false;
    }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IpAddressScalarFunction.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IpAddressScalarFunction.java
@@ -0,0 +1,25 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.net.NetUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.flink.table.functions.ScalarFunction;
+
+public abstract class IpAddressScalarFunction extends ScalarFunction {
+
+    protected static boolean isIpAddress(String ipaddr) {
+        return isIpv4(ipaddr) || isIpv6(ipaddr);
+    }
+
+    protected static boolean isIpv4(String ipaddr) {
+        return Validator.isIpv4(StringUtils.trim(ipaddr));
+    }
+
+    protected static boolean isIpv6(String ipaddr) {
+        return Validator.isIpv6(StringUtils.trim(ipaddr));
+    }
+
+    protected static boolean isInternalIpAddress(String ipaddr) {
+        return NetUtil.isInnerIP(StringUtils.trim(ipaddr));
+    }
+}
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsExternalIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsExternalIpAddress.java
@@ -1,17 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-import static com.zdjizhi.utils.IPUtil.isIPAddress;
-
-public class IsExternalIpAddress extends ScalarFunction {
+public class IsExternalIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
-        if (ipaddr == null || !isIPAddress(ipaddr)) {
+        if (ipaddr == null || !isIpAddress(ipaddr)) {
            return false;
        }
-        return !IPUtil.internalIp(ipaddr);
+        return !isInternalIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsInternalIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsInternalIpAddress.java
@@ -1,17 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-import static com.zdjizhi.utils.IPUtil.isIPAddress;
-
-public class IsInternalIpAddress extends ScalarFunction {
+public class IsInternalIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
-        if (!isIPAddress(ipaddr)) {
+        if (!isIpAddress(ipaddr)) {
            return false;
        }
-        return IPUtil.internalIp(ipaddr);
+        return isInternalIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsIpAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/IsIpAddress.java
@@ -1,15 +1,13 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.zdjizhi.utils.IPUtil;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class IsIpAddress extends ScalarFunction {
+public class IsIpAddress extends IpAddressScalarFunction {

    public @DataTypeHint("BOOLEAN") Boolean eval(String ipaddr) {
        if (null == ipaddr) {
            return false;
        }
-        return IPUtil.isIPAddress(ipaddr);
+        return isIpAddress(ipaddr);
    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/SortAddress.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/SortAddress.java
@@ -1,12 +1,14 @@
 package com.geedgenetworks.flink.easy.application.voip.udf;

-import com.google.common.collect.Lists;
-import com.zdjizhi.utils.IPUtil;
+import cn.hutool.core.net.NetUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.table.annotation.DataTypeHint;
-import org.apache.flink.table.functions.ScalarFunction;

-public class SortAddress extends ScalarFunction {
+import java.util.ArrayList;
+import java.util.List;
+
+public class SortAddress extends IpAddressScalarFunction {

    public @DataTypeHint("STRING")
    String eval(
@@ -16,11 +18,14 @@ public class SortAddress extends ScalarFunction {

    public static String of(
            Tuple2<String, Integer> a1, Tuple2<String, Integer> a2) {
-        var list = Lists.newArrayList(a1, a2);
+        var list = new ArrayList<>(List.of(a1, a2));
+        if (a1.f1 == null || a2.f1 == null || StringUtils.isAnyEmpty(a1.f0, a2.f0)
+                || !isIpAddress(a1.f0) || !isIpAddress(a2.f0)) {
+            return a1.f0 + ":" + a1.f1 + "," + a2.f0 + ":" + a2.f1;
+        }
        list.sort((a, b) -> {
            if (a.f1.equals(b.f1)) {
-                return Long.compare(
-                        IPUtil.getIpDesimal(a.f0), IPUtil.getIpDesimal(b.f0));
+                return compareAddress(a.f0, b.f0);
            } else {
                return a.f1.compareTo(b.f1);
            }
@@ -28,4 +33,16 @@ public class SortAddress extends ScalarFunction {
        return String.format("%s:%s,%s:%s",
                list.get(0).f0, list.get(0).f1, list.get(1).f0, list.get(1).f1);
    }
+
+    private static int compareAddress(String ip1, String ip2) {
+        try {
+            var v1 = isIpv4(ip1) ? NetUtil.ipv4ToLong(ip1) :
+                    NetUtil.ipv6ToBigInteger(ip1).longValue();
+            var v2 = isIpv4(ip2) ? NetUtil.ipv4ToLong(ip2) :
+                    NetUtil.ipv6ToBigInteger(ip2).longValue();
+            return Long.compare(v1, v2);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDir.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDir.java
@@ -18,9 +18,4 @@ public class StreamDir extends ScalarFunction {
        }
        return v;
    }
-
-    public static void main(String[] args) {
-        System.out.println(8192L + 16384L);
-        System.out.println(new StreamDir().eval(8192L + 16384L));
-    }
 }
--- a/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDirSet.java
+++ b/src/main/java/com/geedgenetworks/flink/easy/application/voip/udf/StreamDirSet.java
@@ -0,0 +1,22 @@
+package com.geedgenetworks.flink.easy.application.voip.udf;
+
+import org.apache.flink.table.annotation.DataTypeHint;
+import org.apache.flink.table.functions.ScalarFunction;
+
+public class StreamDirSet extends ScalarFunction {
+
+    public @DataTypeHint("BIGINT") Long eval(Long flags) {
+        if (flags == null) {
+            return 8192 + 16384L;
+        }
+        long r = 0;
+        if ((flags & 8192) == 0) {
+            r += 8192;
+        }
+        if ((flags & 16384) == 0) {
+            r += 16384;
+        }
+        return r;
+    }
+
+}
--- a/src/main/resources/jobs/job-without-distinct.yml
+++ b/src/main/resources/jobs/job-without-distinct.yml
--- a/src/main/resources/jobs/job.yml
+++ b/src/main/resources/jobs/job.yml
@@ -12,18 +12,18 @@ source:
    option:
      topic: VOIP-RECORD
      properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
        group.id: sip-rtp-correlation
        security.protocol: SASL_PLAINTEXT
        sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="EXAMPLE-KAFKA-USERNAME" password="EXAMPLE-KAFKA-PASSWORD";
    format: json
    schema:
      ## General
      - name: recv_time
-        data-type: BIGINT NOT NULL
+        data-type: BIGINT
      - name: log_id
-        data-type: BIGINT NOT NULL
+        data-type: BIGINT
      - name: decoded_as
        data-type: STRING NOT NULL
      - name: session_id
@@ -278,6 +278,8 @@ source:
        data-type: INT
      - name: sip_bye
        data-type: STRING
+      - name: sip_bye_reason
+        data-type: STRING
      ## RTP
      - name: rtp_payload_type_c2s
        data-type: INT
@@ -294,36 +296,36 @@ sink:
    type: kafka
    on: errors-records
    option:
-      topic: VOIP-CONVERSATTON-RECORD
+      topic: VOIP-CONVERSATION-RECORD
      properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
        security.protocol: SASL_PLAINTEXT
        sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="EXAMPLE-KAFKA-USERNAME" password="EXAMPLE-KAFKA-PASSWORD";
    format: json
  # 关联成功的 VOIP
  - name: only-voip-records
    on: voip-fusion.ok
    type: kafka
    option:
-      topic: VOIP-CONVERSATTON-RECORD
+      topic: VOIP-CONVERSATION-RECORD
      properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
        security.protocol: SASL_PLAINTEXT
        sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="EXAMPLE-KAFKA-USERNAME" password="EXAMPLE-KAFKA-PASSWORD";
    format: json
  # 没有关联成功的 SIP 和 RTP
  - name: fusion-fail-records
    on: cannot-fusion-records
    type: kafka
    option:
-      topic: VOIP-CONVERSATTON-RECORD
+      topic: VOIP-CONVERSATION-RECORD
      properties:
-        bootstrap.servers: 192.168.44.12:9094
+        bootstrap.servers: localhost:9092
        security.protocol: SASL_PLAINTEXT
        sasl.mechanism: PLAIN
-        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="galaxy2019";
+        sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="EXAMPLE-KAFKA-USERNAME" password="EXAMPLE-KAFKA-PASSWORD";
    format: json

 pipeline:
@@ -333,17 +335,17 @@ pipeline:
    splits:
      # Invalid ip or port
      - name: error1-records
-        where: NOT(IS_IP_ADDRESS(client_ip)) || NOT(IS_IP_ADDRESS(server_ip)) || client_port <= 0 || server_port <= 0
+        where: NOT(IS_IP_ADDRESS(client_ip)) || NOT(IS_IP_ADDRESS(server_ip)) || client_port.isNull || client_port <= 0 || server_port.isNull || server_port <= 0
      # Invalid stream dir
      - name: error2-records
        where: decoded_as == 'SIP' &&STREAM_DIR(flags) != 1 && STREAM_DIR(flags) != 2 && STREAM_DIR(flags) != 3
      # Invalid: SIP one-way stream and has invalid network address
      - name: error3-records
-        where: decoded_as == 'SIP' && ( NOT(HAS_IP_ADDRESS(sip_originator_sdp_connect_ip, sip_responder_sdp_connect_ip)) || sip_originator_sdp_media_port <= 0 || sip_responder_sdp_media_port <= 0 )
+        where: decoded_as == 'SIP' && ( NOT(HAS_IP_ADDRESS(sip_originator_sdp_connect_ip, sip_responder_sdp_connect_ip)) || sip_originator_sdp_media_port.isNull || sip_originator_sdp_media_port <= 0 || sip_responder_sdp_media_port.isNull && sip_responder_sdp_media_port <= 0 )
      - name: error4-records
        where: decoded_as == 'SIP' && STREAM_DIR(flags) == 3 && ( NOT( IS_IP_ADDRESS(sip_originator_sdp_connect_ip) ) || NOT( IS_IP_ADDRESS(sip_responder_sdp_connect_ip) ) )

-      ### Notes: If internal IP address correlate is needed, please uncomment the following two items
+      ### Notes: If internal IP address correlate is needed, please comment the following two items
  #      # Invalid: SIP one-way stream and internal network address
  #      - name: internal-error1-records
  #        where: decoded_as == 'SIP' && NOT(HAS_EXTERNAL_IP_ADDRESS(sip_originator_sdp_connect_ip, sip_responder_sdp_connect_ip))
@@ -363,13 +365,13 @@ pipeline:
    cache:
      - name: v1
        type: VALUE
-        ttl: 1 minute
+        ttl: 2 minute
        schema:
          ## General
          - name: recv_time
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: log_id
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: decoded_as
            data-type: STRING NOT NULL
          - name: session_id
@@ -623,6 +625,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -639,7 +643,17 @@ pipeline:
          - if: STREAM_DIR(flags) != 3 && @v1.isNotNull && STREAM_DIR(@v1.$flags) != STREAM_DIR(flags)
            then:
              - |-
-                OUTPUT ok FROM withColumns(recv_time to sip_call_id),
+                OUTPUT ok FROM withColumns(recv_time to device_tag), 
+                      DISTINCT_CONCAT(@v1.$data_center, data_center) AS data_center,
+                      DISTINCT_CONCAT(@v1.$device_group, device_group) AS device_group,
+                      withColumns(sled_ip to t_vsys_id),
+                      STREAM_DIR_SET(flags) AS flags,
+                      withColumns(flags_identify_info to decoded_path),
+                      @v1.$sent_pkts + sent_pkts AS sent_pkts, 
+                      @v1.$received_pkts + received_pkts AS received_pkts, 
+                      @v1.$sent_bytes + sent_bytes AS sent_bytes, 
+                      @v1.$received_bytes + received_bytes AS received_bytes ,
+                      withColumns(tcp_c2s_ip_fragments to sip_call_id),
                      FIND_NOT_BLANK(@v1.$sip_originator_description, sip_originator_description) AS sip_originator_description,
                      FIND_NOT_BLANK(@v1.$sip_responder_description, sip_responder_description) AS sip_responder_description,
                      FIND_NOT_BLANK(@v1.$sip_user_agent, sip_user_agent) AS sip_user_agent,
@@ -654,6 +668,7 @@ pipeline:
                      FIND_NOT_BLANK(@v1.$sip_responder_sdp_content, sip_responder_sdp_content) AS sip_responder_sdp_content,
                      @v1.$sip_duration_s + sip_duration_s AS sip_duration_s,
                      FIND_NOT_BLANK(@v1.$sip_bye, sip_bye) AS sip_bye,
+                      FIND_NOT_BLANK(@v1.$sip_bye_reason, sip_bye_reason) AS sip_bye_reason,
                      rtp_payload_type_c2s,
                      rtp_payload_type_s2c,
                      rtp_pcap_path,
@@ -667,7 +682,7 @@ pipeline:
            then:
              - |-
                OUTPUT ok FROM withColumns(recv_time to rtp_originator_dir)
-          - SCHEDULING USING EVENT TIME FOR NOW + 60 * 1000
+          - SCHEDULING USING PROCESS TIME FOR NOW + 60 * 1000
    schedule:
      - if: '@v1.isNotNull'
        then:
@@ -796,6 +811,7 @@ pipeline:
                          @v1.$sip_responder_sdp_content AS sip_responder_sdp_content,
                          @v1.$sip_duration_s AS sip_duration_s,
                          @v1.$sip_bye AS sip_bye,
+                          @v1.$sip_bye_reason AS sip_bye_reason,
                          @v1.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                          @v1.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                          @v1.$rtp_pcap_path AS rtp_pcap_path,
@@ -806,13 +822,13 @@ pipeline:
    cache:
      - name: sip
        type: VALUE
-        ttl: 6 minute
+        ttl: 7 minute
        schema:
          ## General
          - name: recv_time
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: log_id
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: decoded_as
            data-type: STRING NOT NULL
          - name: session_id
@@ -1066,6 +1082,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -1077,13 +1095,13 @@ pipeline:
            data-type: INT
      - name: rtp
        type: LIST
-        ttl: 6 minute
+        ttl: 7 minute
        schema:
          ## General
          - name: recv_time
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: log_id
-            data-type: BIGINT NOT NULL
+            data-type: BIGINT
          - name: decoded_as
            data-type: STRING NOT NULL
          - name: session_id
@@ -1337,6 +1355,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -1358,7 +1378,7 @@ pipeline:
                FLAT OUTPUT ok FOR i IN rtp FROM 
                        @i.$recv_time AS recv_time,
                        @i.$log_id AS log_id,
-                        'VoIP' AS decode_as,
+                        'VoIP' AS decoded_as,
                        @i.$session_id AS session_id,
                        @i.$start_timestamp_ms AS start_timestamp_ms,
                        @i.$end_timestamp_ms AS end_timestamp_ms,
@@ -1371,14 +1391,14 @@ pipeline:
                        @i.$out_link_id AS out_link_id,
                        @i.$in_link_id AS in_link_id,
                        @i.$device_tag AS device_tag,
-                        @i.$data_center AS data_center,
-                        @i.$device_group AS device_group,
+                        DISTINCT_CONCAT(@i.$data_center, data_center) AS data_center,
+                        DISTINCT_CONCAT(@i.$device_group, device_group) AS device_group,
                        @i.$sled_ip AS sled_ip,
                        @i.$address_type AS address_type,
                        @i.$direction AS direction,
                        @i.$vsys_id AS vsys_id,
                        @i.$t_vsys_id AS t_vsys_id,
-                        @i.$flags AS flags,
+                        flags AS flags,
                        @i.$flags_identify_info AS flags_identify_info,
                        
                        @i.$c2s_ttl AS c2s_ttl,
@@ -1406,26 +1426,13 @@ pipeline:
                        
                        @i.$ip_protocol AS ip_protocol,
                        
-                        @i.$sent_pkts AS sent_pkts,
-                        @i.$received_pkts AS received_pkts,
-                        @i.$sent_bytes AS sent_bytes,
-                        @i.$received_bytes AS received_bytes,
+                        @i.$sent_pkts + sent_pkts AS sent_pkts,
+                        @i.$received_pkts + received_pkts AS received_pkts,
+                        @i.$sent_bytes + sent_bytes AS sent_bytes,
+                        @i.$received_bytes + received_bytes AS received_bytes,
                        
-                        @i.$sip_call_id AS sip_call_id,
-                        @i.$sip_originator_description AS sip_originator_description,
-                        @i.$sip_responder_description AS sip_responder_description,
-                        @i.$sip_user_agent AS sip_user_agent,
-                        @i.$sip_server AS sip_server,
-                        @i.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
-                        @i.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
-                        @i.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
-                        @i.$sip_originator_sdp_content AS sip_originator_sdp_content,
-                        @i.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
-                        @i.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
-                        @i.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
-                        @i.$sip_responder_sdp_content AS sip_responder_sdp_content,
-                        @i.$sip_duration_s AS sip_duration_s,
-                        @i.$sip_bye AS sip_bye,
+                        withColumns(sip_call_id to sip_bye_reason), 
+                      
                        @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                        @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                        @i.$rtp_pcap_path AS rtp_pcap_path,
@@ -1443,7 +1450,7 @@ pipeline:
                FLAT OUTPUT ok FOR i IN rtp FROM
                                @i.$recv_time AS recv_time,
                                @i.$log_id AS log_id,
-                                'VoIP' AS decode_as,
+                                'VoIP' AS decoded_as,
                                @i.$session_id AS session_id,
                                @i.$start_timestamp_ms AS start_timestamp_ms,
                                @i.$end_timestamp_ms AS end_timestamp_ms,
@@ -1463,8 +1470,8 @@ pipeline:
                                @i.$direction AS direction,
                                @i.$vsys_id AS vsys_id,
                                @i.$t_vsys_id AS t_vsys_id,
-                                @i.$flags AS flags,
-                                @i.$flags_identify_info AS flags_identify_info,
+                                @sip.$flags AS flags,
+                                @sip.$flags_identify_info AS flags_identify_info,
                                
                                @i.$c2s_ttl AS c2s_ttl,
                                @i.$s2c_ttl AS s2c_ttl,
@@ -1491,30 +1498,32 @@ pipeline:
                                
                                @i.$ip_protocol AS ip_protocol,
                                
-                                @i.$sent_pkts AS sent_pkts,
-                                @i.$received_pkts AS received_pkts,
-                                @i.$sent_bytes AS sent_bytes,
-                                @i.$received_bytes AS received_bytes,
+                                @i.$sent_pkts + sent_pkts AS sent_pkts,
+                                @i.$received_pkts + received_pkts AS received_pkts,
+                                @i.$sent_bytes + sent_bytes AS sent_bytes,
+                                @i.$received_bytes + received_bytes AS received_bytes,
                                
-                                @i.$sip_call_id AS sip_call_id,
-                                @i.$sip_originator_description AS sip_originator_description,
-                                @i.$sip_responder_description AS sip_responder_description,
-                                @i.$sip_user_agent AS sip_user_agent,
-                                @i.$sip_server AS sip_server,
-                                @i.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
-                                @i.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
-                                @i.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
-                                @i.$sip_originator_sdp_content AS sip_originator_sdp_content,
-                                @i.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
-                                @i.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
-                                @i.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
-                                @i.$sip_responder_sdp_content AS sip_responder_sdp_content,
-                                @i.$sip_duration_s AS sip_duration_s,
-                                @i.$sip_bye AS sip_bye,
+                                @sip.$sip_call_id AS sip_call_id,
+                                @sip.$sip_originator_description AS sip_originator_description,
+                                @sip.$sip_responder_description AS sip_responder_description,
+                                @sip.$sip_user_agent AS sip_user_agent,
+                                @sip.$sip_server AS sip_server,
+                                @sip.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
+                                @sip.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
+                                @sip.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
+                                @sip.$sip_originator_sdp_content AS sip_originator_sdp_content,
+                                @sip.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
+                                @sip.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
+                                @sip.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
+                                @sip.$sip_responder_sdp_content AS sip_responder_sdp_content,
+                                @sip.$sip_duration_s AS sip_duration_s,
+                                @sip.$sip_bye AS sip_bye,
+                                @sip.$sip_bye_reason AS sip_bye_reason,
+                
                                @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                                @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                                @i.$rtp_pcap_path AS rtp_pcap_path,
-                                ( @i.$client_ip == sip_originator_sdp_connect_ip).?(1, (@i.$client_ip == sip_responder_sdp_connect_ip).?(2, 0) ) AS rtp_originator_dir
+                                ( @i.$client_ip == @sip.$sip_originator_sdp_connect_ip).?(1, (@i.$client_ip == @sip.$sip_responder_sdp_connect_ip).?(2, 0) ) AS rtp_originator_dir
          - SCHEDULING USING PROCESS TIME FOR NOW + 6 * 60 * 1000
    schedule:
      - if: '@rtp.isNotNull && @rtp.cardinality > 0'
@@ -1644,6 +1653,7 @@ pipeline:
                            @i.$sip_responder_sdp_content AS sip_responder_sdp_content,
                            @i.$sip_duration_s AS sip_duration_s,
                            @i.$sip_bye AS sip_bye,
+                            @i.$sip_bye_reason AS sip_bye_reason,
                            @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                            @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                            @i.$rtp_pcap_path AS rtp_pcap_path,
@@ -1776,6 +1786,7 @@ pipeline:
                        @sip.$sip_responder_sdp_content AS sip_responder_sdp_content,
                        @sip.$sip_duration_s AS sip_duration_s,
                        @sip.$sip_bye AS sip_bye,
+                        @sip.$sip_bye_reason AS sip_bye_reason,
                        @sip.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                        @sip.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                        @sip.$rtp_pcap_path AS rtp_pcap_path,
--- a/src/site/markdown/deploy.md
+++ b/src/site/markdown/deploy.md
@@ -1,13 +1,11 @@
 ## Deploy

 - 准备 JDK ${java.version} 的环境
-
 - 准备 Flink ${flink.version} 的环境
-
 - [下载](./download.html) 对应版本 UDF 依赖 Jar
-
 - [下载](./download.html) 对应版本 Job 配置 (一个 yml 文件)
-
 - 执行命令 `flink run -Dflink.rest.bind-port=8081 -c com.geedgenetworks.flink.easy.core.Runner path/to/sip-rtp-correlation-<version>.jar job.yml`
+- 您将在控制台看到启动日志，同时您可以在 `http://<you-host>:8081` 看到任务 UI。

- 您将在控制台看到启动日志，同时您可以在 `http://<you-host>:8081` 看到任务 UI。
+> 注意：
+> SIP 和 RTP 融合作业强烈建议开启 Checkpoint 机制，否则将会由于丢失数据或重复数据导致业务数据关联错误。 
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -1,8 +1,75 @@
 ## Download

-### Easy Stream ${project.version}
+### ${project.version}

-| UDF Jar                                                                                                                                                                                          | Job             |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --------------- |
-| [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+- 修复 sip 双向关联模块的数据丢失问题。
+- [GAL-684](https://jira.geedge.net/browse/GAL-684) 调整融合后的字段映射，增加更加详细的监控指标。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+
+### 2.0-rc8
+
+- 修复 Extract Key 错误，由于 IpAddress 类型数据校验导致的空指针异常。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc8/sip-rtp-correlation-2.0-rc8.tar.gz.sha1) ) |
+
+
+### 2.0-rc7
+
+- VoIP Record 增加字段: SIP `sip_bye_reason` 相关字段。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc7/sip-rtp-correlation-2.0-rc7.tar.gz.sha1) ) |
+
+
+### 2.0-rc6
+
+- VoIP Record 增加字段: SIP， RTP `protocol` 相关字段。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.sha1) ) |
+
+### 2.0-rc5
+
+- 修复 VoIP 字段错误，使用 `decoded_as` 表示 VoIP 日志。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1     | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz.sha1) ) |
+
+### 2.0-rc4
+
+- 移除对 `log_id`, `recv_time` 字段的强制非空校验, 该字段在后续步骤中处理。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1     | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc4/sip-rtp-correlation-2.0-rc4.tar.gz.sha1) ) |
+
+### 2.0-rc3
+
+- 修复由于 State 过期策略早于 Timer 触发而导致的未关联成功的 RTP 数据未正常输出的问题。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1     | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc3/sip-rtp-correlation-2.0-rc3.tar.gz.sha1) ) |
+
+### 2.0-rc2
+
+- 修复由于 Flink 1.13.6 和 Flink 1.13.1 之间某些 Runtime 不兼容的问题导致的系统无法启动。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 1.3-rc1     | [JAR](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.jar) ( [MD5](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.jar.md5) [SHA1](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.jar.sha1) ) | [YML](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.tar.gz) ( [MD5](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.tar.gz.md5) [SHA1](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc2/sip-rtp-correlation-2.0-rc2.tar.gz.sha1) ) |
+
+### 2.0-rc1
+
+| Easy Stream | UDF Jar                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Job                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+|-------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 1.3-rc1     | [JAR](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.jar) ( [MD5](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.jar.md5) [SHA1](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.jar.sha1) ) | [YML](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.tar.gz) ( [MD5](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.tar.gz.md5) [SHA1](http://192.168.40.153:8099/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc1/sip-rtp-correlation-2.0-rc1.tar.gz.sha1) ) |

--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -7,4 +7,4 @@ SIP RTP Correlation 项目可以用于实时监控和分析 VoIP 通话数据，
 <br/>


-You can download the latest release from [Job Yml](./jobs/job.yml). And you can changelog from [CHANGELOG.md](./changelogs.html).
+You can download the latest release from [Downloads](./download.html). And you can changelog from [Changelogs](./changelogs.html).
--- a/src/test/resources/data/e2e-test-execution.jsonl
+++ b/src/test/resources/data/e2e-test-execution.jsonl
@@ -0,0 +1,4 @@
+{"__timestamp":946681200,"__inputid":"tsg_olap","session_id":10240001,"decoded_as":"RTP","ip_protocol":"udp","address_type":4,"client_ip":"192.168.64.8","server_ip":"192.168.39.62","client_port":25524,"server_port":4580,"t_vsys_id":0,"vsys_id":1024,"data_center":"tsg_olap","device_group":"tsg_olap","device_id":"0000000000000000","sled_ip":"127.0.0.1","app":"unknown","app_transition":"","client_geolocation":"unknown","server_geolocation":"unknown","decoded_path":"ETHERNET.IPv4.UDP.rtp","server_fqdn":"","start_timestamp_ms":1721639438014,"end_timestamp_ms":1721639438014,"tcp_rtt_ms":0,"tcp_client_isn":0,"tcp_server_isn":0,"tcp_handshake_latency_ms":0,"in_link_id":0,"out_link_id":0,"duration_ms":0,"sent_pkts":0,"sent_bytes":0,"received_pkts":0,"received_bytes":0,"flags":24576,"flags_identify_info":[1,1],"fqdn_category_list":[0],"client_os_desc":"Windows","server_os_desc":"Linux","rtp_pcap_path":"123e4567-e89b-12d3-a456-426614174005"}
+{"__timestamp":946681200,"__inputid":"tsg_olap","session_id":10240002,"decoded_as":"SIP","ip_protocol":"udp","address_type":4,"client_ip":"10.0.0.1","server_ip":"192.0.2.1","client_port":1000,"server_port":60000,"t_vsys_id":0,"vsys_id":1024,"data_center":"tsg_olap","device_group":"tsg_olap","device_id":"0000000000000000","sled_ip":"127.0.0.1","app":"unknown","app_transition":"","client_geolocation":"unknown","server_geolocation":"unknown","decoded_path":"ETHERNET.IPv4.UDP.sip","server_fqdn":"","start_timestamp_ms":1721639438014,"end_timestamp_ms":1721639438014,"tcp_rtt_ms":0,"tcp_client_isn":0,"tcp_server_isn":0,"tcp_handshake_latency_ms":0,"in_link_id":0,"out_link_id":0,"duration_ms":0,"sent_pkts":0,"sent_bytes":0,"received_pkts":0,"received_bytes":0,"flags":24584,"flags_identify_info":[1,1],"fqdn_category_list":[0],"client_os_desc":"Windows","server_os_desc":"Linux","sip_call_id":"NGMxZWY3Y2NmMzNlNGE3NzJhODgyZDAwM2YyMzQ4NGI.","sip_originator_description":"\"lina\"<sip:lina@192.0.2.1>;tag=1837055d","sip_responder_description":"\"1075\"<sip:1075@192.0.2.1>","sip_originator_sdp_connect_ip":"192.168.64.8","sip_originator_sdp_media_port":25524,"sip_originator_sdp_media_type":"application/sdp","sip_server":"OpenSIPS (2.4.11 (x86_64/linux))","sip_responder_sdp_connect_ip":"192.168.39.62","sip_responder_sdp_media_port":4580,"sip_responder_sdp_media_type":"application/sdp","sip_duration_s":590,"sip_bye":"responder","sip_cseq":"2 BYE","sip_via":"SIP/2.0/UDP 192.0.2.1:5060;branch=z9hG4bKbe7c.392190f1.0","sip_user_agent":"eyeBeam release 1011d stamp 40820","sip_is_request":0}
+{"__timestamp":946681200,"__inputid":"tsg_olap","session_id":10240003,"decoded_as":"RTP","ip_protocol":"udp","address_type":4,"client_ip":"192.168.164.18","server_ip":"192.168.39.162","client_port":65121,"server_port":4670,"t_vsys_id":0,"vsys_id":1024,"data_center":"tsg_olap","device_group":"tsg_olap","device_id":"0000000000000000","sled_ip":"127.0.0.1","app":"unknown","app_transition":"","client_geolocation":"unknown","server_geolocation":"unknown","decoded_path":"ETHERNET.IPv4.UDP.rtp","server_fqdn":"","start_timestamp_ms":1721639438014,"end_timestamp_ms":1721639438014,"tcp_rtt_ms":0,"tcp_client_isn":0,"tcp_server_isn":0,"tcp_handshake_latency_ms":0,"in_link_id":0,"out_link_id":0,"duration_ms":0,"sent_pkts":0,"sent_bytes":0,"received_pkts":0,"received_bytes":0,"flags":24584,"flags_identify_info":[1,1],"fqdn_category_list":[0],"client_os_desc":"Windows","server_os_desc":"Linux","rtp_pcap_path":"123e4567-e89b-12d3-a456-426614174001"}
+{"__timestamp":946681200,"__inputid":"tsg_olap","session_id":10240004,"decoded_as":"SIP","ip_protocol":"udp","address_type":4,"client_ip":"10.0.0.2","server_ip":"192.0.2.2","client_port":1000,"server_port":60000,"t_vsys_id":0,"vsys_id":1024,"data_center":"tsg_olap","device_group":"tsg_olap","device_id":"0000000000000000","sled_ip":"127.0.0.1","app":"unknown","app_transition":"","client_geolocation":"unknown","server_geolocation":"unknown","decoded_path":"ETHERNET.IPv4.UDP.sip","server_fqdn":"","start_timestamp_ms":1721639438014,"end_timestamp_ms":1721639438014,"tcp_rtt_ms":0,"tcp_client_isn":0,"tcp_server_isn":0,"tcp_handshake_latency_ms":0,"in_link_id":0,"out_link_id":0,"duration_ms":0,"sent_pkts":0,"sent_bytes":0,"received_pkts":0,"received_bytes":0,"flags":24584,"flags_identify_info":[1,1],"fqdn_category_list":[0],"client_os_desc":"Windows","server_os_desc":"Linux","sip_call_id":"CUMxZWY3Y2NmMzNlNGE3NzJhODgyZDAwM2YyMzQ4NGI.","sip_originator_description":"\"lina\"<sip:lina@192.0.2.1>;tag=1837055d","sip_responder_description":"\"1075\"<sip:1075@192.0.2.1>","sip_originator_sdp_connect_ip":"192.68.64.8","sip_originator_sdp_media_port":25524,"sip_originator_sdp_media_type":"application/sdp","sip_server":"OpenSIPS (2.4.11 (x86_64/linux))","sip_responder_sdp_connect_ip":"192.18.39.62","sip_responder_sdp_media_port":4580,"sip_responder_sdp_media_type":"application/sdp","sip_duration_s":590,"sip_bye":"responder","sip_cseq":"2 BYE","sip_via":"SIP/2.0/UDP 192.0.2.1:5060;branch=z9hG4bKbe7c.392190f1.0","sip_user_agent":"eyeBeam release 1011d stamp 40820","sip_is_request":0}
--- a/src/test/resources/data/session-records.jsonl
+++ b/src/test/resources/data/session-records.jsonl
--- a/tools/maven/spotbugs-exclude.xml
+++ b/tools/maven/spotbugs-exclude.xml
@@ -6,6 +6,9 @@
    <Match>
        <Bug pattern="EI_EXPOSE_REP2"/>
    </Match>
+    <Match>
+        <Bug pattern="REC_CATCH_EXCEPTION"/>
+    </Match>
    <Match>
        <Bug pattern="SE_NO_SERIALVERSIONID"/>
    </Match>
Author	SHA1	Message	Date
梁超	5b5de41632	Merge branch 'bugfix/eval-error' into 'master' feat: add job without distinct See merge request galaxy/tsg_olap/sip-rtp-correlation!36	2024-10-31 04:25:07 +00:00
chaochaoc	33a42066cf	feat: add job without distinct	2024-10-31 12:21:57 +08:00
梁超	a9c1d40fdc	Merge branch 'bugfix/eval-error' into 'master' [GAL-684] fix some bugs and update field mapping values See merge request galaxy/tsg_olap/sip-rtp-correlation!35	2024-10-31 02:33:28 +00:00
chaochaoc	ff5aa245bb	chore: update easystream version and docs	2024-10-31 09:50:43 +08:00
chaochaoc	45dafb9dbe	[GAL-684] fix some bugs and update field mapping values	2024-10-30 18:39:38 +08:00
梁超	2954275dd3	Merge branch 'bugfix/eval-error' into 'master' [TSG-22767] fix: fix function exception See merge request galaxy/tsg_olap/sip-rtp-correlation!34	2024-10-21 06:43:13 +00:00
chaochaoc	728e3407e8	fix: init value	2024-10-21 14:41:43 +08:00
chaochaoc	16d71addda	[TSG-22767] fix: fix function exception	2024-10-21 14:37:26 +08:00
梁超	4ef6c25e69	Merge branch 'bugfix/addsipfield' into 'master' bugfix: add sip field "sip_bye_reason" See merge request galaxy/tsg_olap/sip-rtp-correlation!33	2024-08-21 07:46:09 +00:00
wangshuo	2d5f20362b	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:42:46 +08:00
wangshuo	515a0ab312	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:29:27 +08:00
wangshuo	9d0085a57c	bugfix: add sip field "sip_bye_reason"	2024-08-21 14:24:17 +08:00
梁超	000436ec34	Merge branch 'bugfix/voip-fields' into 'master' bugfix: add field for 'VoIP' records See merge request galaxy/tsg_olap/sip-rtp-correlation!32	2024-07-23 07:39:33 +00:00
chaochaoc	319c73ec0a	bugfix: add field for 'VoIP' records	2024-07-23 15:37:48 +08:00
梁超	9a39b814e6	Merge branch 'bugfix/field-error' into 'master' bugfix: modify field 'decode_as' to 'decoded_as' See merge request galaxy/tsg_olap/sip-rtp-correlation!31	2024-07-23 06:21:19 +00:00
chaochaoc	522fb51195	bugfix: modify field 'decode_as' to 'decoded_as'	2024-07-23 14:19:14 +08:00
梁超	59adef9271	Merge branch 'bugfix/e2e-test' into 'master' bugfix: remove `log_id`, `recv_time` non-null constraint See merge request galaxy/tsg_olap/sip-rtp-correlation!30	2024-07-22 10:10:36 +00:00
chaochaoc	7c5c71cb8e	bugfix: remove `log_id`, `recv_time` non-null constraint	2024-07-22 18:08:30 +08:00
梁超	4ec71d4d6f	Merge branch 'bugfix/expired-state' into 'master' bugfix: fix expired state See merge request galaxy/tsg_olap/sip-rtp-correlation!29	2024-07-22 08:54:21 +00:00
chaochaoc	53ffcca70d	chore: update ci	2024-07-22 16:52:56 +08:00
chaochaoc	068124bf3f	chore: update repo	2024-07-22 16:45:26 +08:00
chaochaoc	21a0d8c57e	chore: update docker image	2024-07-22 16:32:45 +08:00
chaochaoc	96a845510d	chore: update docker image	2024-07-22 16:10:04 +08:00
chaochaoc	6b63e26741	chore: update nexus server url	2024-07-22 15:25:02 +08:00
chaochaoc	4ce6c1ba14	bugfix: fix expired state	2024-07-22 15:19:36 +08:00
梁超	8b2f8b4fb8	Merge branch 'release/2.0' into 'master' feat: release 2.0-rc2 See merge request galaxy/tsg_olap/sip-rtp-correlation!28	2024-07-02 03:10:53 +00:00
chaochaoc	9574045662	docs: update doc	2024-07-02 11:08:52 +08:00
chaochaoc	56b0600cc8	chore: exclude runtime dependencies	2024-07-02 11:08:26 +08:00
梁超	2eab8bae49	Merge branch 'release/2.0' into 'master' merge: 2.0 See merge request galaxy/tsg_olap/sip-rtp-correlation!27	2024-07-01 10:10:03 +00:00
chaochaoc	4417df5a7b	chore: update version	2024-07-01 18:08:29 +08:00
chaochaoc	bad0f118d1	chore: update easy version	2024-07-01 18:05:40 +08:00
chaochaoc	05b853ce8e	chore: update ci conf	2024-07-01 17:57:47 +08:00
chaochaoc	3c9a843572	[GAL-602] doc: update download doc	2024-07-01 17:51:10 +08:00
chaochaoc	64a0cf9ba5	[GAL-602] style: update jobs connect info	2024-07-01 17:50:45 +08:00