Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-11-21 fc8bb378deb706e4887eacbc25f9326f74b1757b

Merge branch 'wvp-28181-2.0' into main-dev

 src/main/resources/all-application.yml

@@ -150,9 +150,9 @@
    # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
    record-assist-port: 0

# [可选] 日志配置, 一般不需要改
# [可选] 日志配置, 如果不需要在jar外修改日志内容那么可以不配置此项
logging:
    config: classpath:logback-spring-local.xml
    config: classpath:logback-spring.xml

# [根据业务需求配置]
user-settings:

 src/main/resources/application-dev.yml

@@ -110,7 +110,4 @@
  allowed-origins:
    - http://localhost:8080
    - http://127.0.0.1:8080
# [可选] 日志配置, 一般不需要改
logging:
  config: classpath:logback-spring-local.xml


 src/main/resources/application-docker.yml

@@ -71,10 +71,6 @@
    record-assist-port: 18081
    sdp-ip: ${sip.ip}
    stream-ip: ${sip.ip}
# [可选] 日志配置, 一般不需要改
# [可选] 日志配置, 一般不需要改
logging:
    config: classpath:logback-spring-local.xml

# [根据业务需求配置]
user-settings:

 src/main/resources/logback-spring.xml

File was renamed from src/main/resources/logback-spring-local.xml
@@ -86,7 +86,7 @@


    <!-- 日志输出级别 -->
    <root level="INFO">
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
    </root>