From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置： 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数 2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index f587e75..bfbf547 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -66,18 +66,50 @@
/**
* 娉ㄥ唽鏃堕棿
*/
- private Long registerTimeMillis;
+ private String registerTime;
/**
* 蹇冭烦鏃堕棿
*/
- private Long KeepaliveTimeMillis;
+ private String keepaliveTime;
/**
* 閫氶亾涓暟
*/
private int channelCount;
+
+ /**
+ * 娉ㄥ唽鏈夋晥鏈�
+ */
+ private int expires;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
+
+ /**
+ * 璁惧浣跨敤鐨勫獟浣搃d, 榛樿涓簄ull
+ */
+ private String mediaServerId;
+
+ /**
+ * 棣栨娉ㄥ唽
+ */
+ private boolean firsRegister;
+
+ /**
+ * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+ */
+ private String charset ;
+
+
public String getDeviceId() {
return deviceId;
@@ -175,19 +207,67 @@
this.channelCount = channelCount;
}
- public Long getRegisterTimeMillis() {
- return registerTimeMillis;
+ public String getRegisterTime() {
+ return registerTime;
}
- public void setRegisterTimeMillis(Long registerTimeMillis) {
- this.registerTimeMillis = registerTimeMillis;
+ public void setRegisterTime(String registerTime) {
+ this.registerTime = registerTime;
}
- public Long getKeepaliveTimeMillis() {
- return KeepaliveTimeMillis;
+ public String getKeepaliveTime() {
+ return keepaliveTime;
}
- public void setKeepaliveTimeMillis(Long keepaliveTimeMillis) {
- KeepaliveTimeMillis = keepaliveTimeMillis;
+ public void setKeepaliveTime(String keepaliveTime) {
+ this.keepaliveTime = keepaliveTime;
+ }
+
+ public int getExpires() {
+ return expires;
+ }
+
+ public void setExpires(int expires) {
+ this.expires = expires;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
+
+ public boolean isFirsRegister() {
+ return firsRegister;
+ }
+
+ public void setFirsRegister(boolean firsRegister) {
+ this.firsRegister = firsRegister;
+ }
+
+ public String getCharset() {
+ return charset;
+ }
+
+ public void setCharset(String charset) {
+ this.charset = charset;
}
}
--
Gitblit v1.8.0