diff --git a/.github/ISSUE_TEMPLATE/solve.md b/.github/ISSUE_TEMPLATE/solve.md
index 75a0eed7..473dbd19 100644
--- a/.github/ISSUE_TEMPLATE/solve.md
+++ b/.github/ISSUE_TEMPLATE/solve.md
@@ -16,7 +16,7 @@ assignees: ''
  - 5. 是否使用https
  - 6. 方便的话提供下使用的设备品牌或平台
  - 7. 你做过哪些尝试
- - 8. 代码更新时间
+ - 8. 代码更新时间（旧版本请更新最新版本代码测试）
 
 
 **内容描述:**
diff --git a/doc/_content/introduction/deployment.md b/doc/_content/introduction/deployment.md
index f11fe7f2..822bb110 100644
--- a/doc/_content/introduction/deployment.md
+++ b/doc/_content/introduction/deployment.md
@@ -44,4 +44,8 @@ window.baseUrl = "http://xxx.com:18080"
 ```
 `这里的地址是需要客户电脑能访问到的，因为请求是客户端电脑发起，与代理不同`  
 [接入设备](./_content/ability/device.md)
+### 默认账号和密码
+部署完毕后，可以通过访问 ip加端口的方式访问 WVP ，WVP的默认登录账号和密码均为 admin。
+
+
 
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
index 488ed52b..6336a6d6 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
@@ -398,7 +398,7 @@ public class DeviceServiceImpl implements IDeviceService {
 
         String now = DateUtil.getNow();
         device.setUpdateTime(now);
-        device.setCharset(device.getCharset().toUpperCase());
+        device.setCharset(device.getCharset() == null ? "" : device.getCharset().toUpperCase());
         device.setUpdateTime(DateUtil.getNow());
         if (deviceMapper.update(device) > 0) {
             redisCatchStorage.updateDevice(device);
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
index 863919c5..6a11455c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
@@ -233,6 +233,12 @@ public class ZLMMediaServerStatusManger {
         if (mediaServerItem.getRtpProxyPort() == 0) {
             mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
         }
+        if (mediaServerItem.getFlvSSLPort() == 0) {
+            mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport());
+        }
+        if (mediaServerItem.getWsFlvSSLPort() == 0) {
+            mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
+        }
         mediaServerItem.setHookAliveInterval(10F);
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index 168a5778..8bfeab78 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -29,7 +29,7 @@ public interface UserMapper {
     @Delete("DELETE from wvp_user WHERE id != 1 and id=#{id}")
     int delete(int id);
 
-    @Select("select u.*, r.id as role_id, r.name as roleName, r.authority as roleAuthority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username} AND u.password=#{password}")
+    @Select("select u.*,  r.name as roleName, r.authority as roleAuthority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username} AND u.password=#{password}")
     @Results(id = "roleMap", value = {
             @Result(column = "role_id", property = "role.id"),
             @Result(column = "role_name", property = "role.name"),
@@ -39,19 +39,19 @@ public interface UserMapper {
     })
     User select(@Param("username") String username, @Param("password") String password);
 
-    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}")
+    @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}")
     @ResultMap(value="roleMap")
     User selectById(int id);
 
-    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username}")
+    @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username}")
     @ResultMap(value="roleMap")
     User getUserByUsername(String username);
 
-    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id")
+    @Select("select u.*, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id")
     @ResultMap(value="roleMap")
     List<User> selectAll();
 
-    @Select("select u.id, u.username,u.push_key,u.role_id, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u join wvp_user_role r on u.role_id=r.id")
+    @Select("select u.id, u.username,u.push_key,u.role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u join wvp_user_role r on u.role_id=r.id")
     @ResultMap(value="roleMap")
     List<User> getUsers();
 
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index acf96fab..d9a1c483 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -11,6 +11,7 @@ import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper;
 import com.genersoft.iot.vmp.media.bean.MediaInfo;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
diff --git a/数据库/2.7.2/初始化-mysql-2.7.2.sql b/数据库/2.7.3/初始化-mysql-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.2/初始化-mysql-2.7.2.sql
rename to 数据库/2.7.3/初始化-mysql-2.7.3.sql
diff --git a/数据库/2.7.2/初始化-postgresql-kingbase-2.7.2.sql b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.2/初始化-postgresql-kingbase-2.7.2.sql
rename to 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
diff --git a/数据库/2.7.2/更新-mysql-2.7.2.sql b/数据库/2.7.3/更新-mysql-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.2/更新-mysql-2.7.2.sql
rename to 数据库/2.7.3/更新-mysql-2.7.3.sql
diff --git a/数据库/2.7.2/更新-postgresql-kingbase-2.7.2.sql b/数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.2/更新-postgresql-kingbase-2.7.2.sql
rename to 数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql