Compare commits

...

3 Commits

Author SHA1 Message Date
山海守门人
0a57b92a27
Pre Merge pull request !44 from 山海守门人/dev_260107 2026-03-30 03:10:40 +00:00
lin
60b1c687ea 添加异步处理的心跳回复方法 2026-03-30 11:05:51 +08:00
紫穹
bed4e79061 fix: 修改编译版本为jdk21 2026-01-07 07:46:49 +08:00
3 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,4 @@
FROM ringcentral/jdk:11 AS builder FROM ringcentral/jdk:21 AS builder
EXPOSE 18978/tcp EXPOSE 18978/tcp
EXPOSE 8116/tcp EXPOSE 8116/tcp
@ -56,11 +56,11 @@ COPY . /build
WORKDIR /build WORKDIR /build
RUN ls && mvn clean package -Dmaven.test.skip=true RUN ls && mvn clean package -Dmaven.test.skip=true
WORKDIR /build/target WORKDIR /build/target
#确保文件名一致 #确保文件名一致
RUN mv wvp-pro-*.jar wvp.jar RUN mv wvp-pro-*.jar wvp.jar
FROM ringcentral/jdk:11 FROM ringcentral/jdk:21
RUN mkdir -p /opt/wvp RUN mkdir -p /opt/wvp
WORKDIR /opt/wvp WORKDIR /opt/wvp
COPY --from=builder /build/target /opt/wvp COPY --from=builder /build/target /opt/wvp

View File

@ -13,6 +13,7 @@ import org.dom4j.DocumentException;
import org.dom4j.Element; import org.dom4j.Element;
import org.dom4j.io.SAXReader; import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import javax.sip.*; import javax.sip.*;
@ -30,10 +31,10 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* @description:处理接收IPCamera发来的SIP协议请求消息 * @description:处理接收IPCamera发来的SIP协议请求消息
* @author: songww * @author: songww
* @date: 2020年5月3日 下午4:42:22 * @date: 2020年5月3日 下午4:42:22
*/ */
@Slf4j @Slf4j
public abstract class SIPRequestProcessorParent { public abstract class SIPRequestProcessorParent {
@ -77,6 +78,11 @@ public abstract class SIPRequestProcessorParent {
return responseAck(sipRequest, statusCode, null); return responseAck(sipRequest, statusCode, null);
} }
@Async("taskExecutor")
public void responseAckAsync(SIPRequest sipRequest, int statusCode) throws SipException, InvalidArgumentException, ParseException {
responseAck(sipRequest, statusCode, null);
}
public SIPResponse responseAck(SIPRequest sipRequest, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException { public SIPResponse responseAck(SIPRequest sipRequest, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
return responseAck(sipRequest, statusCode, msg, null); return responseAck(sipRequest, statusCode, msg, null);
} }

View File

@ -96,7 +96,7 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp
RequestEvent evt = sipMsgInfo.getEvt(); RequestEvent evt = sipMsgInfo.getEvt();
// 回复200 OK // 回复200 OK
try { try {
responseAck((SIPRequest) evt.getRequest(), Response.OK); responseAckAsync((SIPRequest) evt.getRequest(), Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) { } catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 心跳回复: {}", e.getMessage()); log.error("[命令发送失败] 心跳回复: {}", e.getMessage());
} }