gfwleak/galaxy-tsg-olap-sip-rtp-correlation
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/expired-state' into 'master'

Browse Source 
bugfix: fix expired state

See merge request galaxy/tsg_olap/sip-rtp-correlation!29
This commit is contained in:
梁超
2024-07-22 08:54:21 +00:00
parent 8b2f8b4fb8 53ffcca70d
commit 4ec71d4d6f
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -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"
@@ -11,6 +11,7 @@ stages:
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
@@ -25,6 +26,7 @@ release-version-check:
test:
stage: test
script:
- echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
- mvn $MAVEN_CLI_OPTS clean test
only:
- merge_requests

22
pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>com.geedgenetworks.application</groupId>
<artifactId>sip-rtp-correlation</artifactId>
<version>2.0-rc2</version>
<version>2.0-rc3</version>
<name>Flink : SIP-RTP : Correlation</name>
@@ -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>

12
src/main/resources/jobs/job.yml
View File

@@ -294,7 +294,7 @@ sink:
type: kafka
on: errors-records
option:
topic: VOIP-CONVERSATTON-RECORD
topic: VOIP-CONVERSATION-RECORD
properties:
bootstrap.servers: localhost:9092
security.protocol: SASL_PLAINTEXT
@@ -306,7 +306,7 @@ sink:
on: voip-fusion.ok
type: kafka
option:
topic: VOIP-CONVERSATTON-RECORD
topic: VOIP-CONVERSATION-RECORD
properties:
bootstrap.servers: localhost:9092
security.protocol: SASL_PLAINTEXT
@@ -318,7 +318,7 @@ sink:
on: cannot-fusion-records
type: kafka
option:
topic: VOIP-CONVERSATTON-RECORD
topic: VOIP-CONVERSATION-RECORD
properties:
bootstrap.servers: localhost:9092
security.protocol: SASL_PLAINTEXT
@@ -363,7 +363,7 @@ pipeline:
cache:
- name: v1
type: VALUE
ttl: 1 minute
ttl: 2 minute
schema:
## General
- name: recv_time
@@ -806,7 +806,7 @@ pipeline:
cache:
- name: sip
type: VALUE
ttl: 6 minute
ttl: 7 minute
schema:
## General
- name: recv_time
@@ -1077,7 +1077,7 @@ pipeline:
data-type: INT
- name: rtp
type: LIST
ttl: 6 minute
ttl: 7 minute
schema:
## General
- name: recv_time

16
src/site/markdown/download.md
View File

@@ -2,7 +2,23 @@
### ${project.version}
- 修复由于 State 过期策略早于 Timer 触发而导致的未关联成功的 RTP 数据未正常输出的问题。
| 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-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) ) |

0
src/test/resources/data/session-records.txt → src/test/resources/data/session-records.jsonl
View File