Merge branch 'wvp-28181-2.0' into wvp-jwt-token

# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/resources/all-application.yml
2023-03-15 22:58:28 +08:00
parent efbc3a31c0 be6666db03
commit 2bf07305aa
30 changed files with 320 additions and 90 deletions
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -199,8 +199,8 @@ user-settings:
    sip-use-source-ip-as-remote-address: false
    # 是否开启sip日志
    sip-log: true
-    # 自动数据库升级，保证表结构完整
-    sync-db: true
+    # 消息通道功能-缺少国标ID是否给所有上级发送消息
+    send-to-platforms-when-id-lost: true
    # 跨域配置，配置你访问前端页面的地址即可， 可以配置多个
    allowed-origins:
        - http://localhost:8008