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 |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 cf939cf..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
@@ -99,6 +99,18 @@
 	 */
 	private String mediaServerId;
 
+	/**
+	 * 棣栨娉ㄥ唽
+	 */
+	private boolean firsRegister;
+
+	/**
+	 * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+	 */
+	private String charset ;
+
+
+
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -242,4 +254,20 @@
 	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