Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

# Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
2023-06-15 11:10:20 +08:00
parent 05cc0d14f1 319cdd2151
commit 652489b47e
44 changed files with 645 additions and 270 deletions
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -43,10 +43,6 @@ spring:
            idle-timeout: 300000                  # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
            max-lifetime: 1200000                 # 是池中连接关闭后的最长生命周期（以毫秒为单位)

-# 修改为数据库字段下划线分隔直接对应java驼峰命名
-mybatis:
-    configuration:
-        map-underscore-to-camel-case: true

 # 修改分页插件为 postgresql， 数据库类型为mysql不需要
 #pagehelper: