Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin

This commit is contained in:
tiger_zhou 2023-03-13 09:17:37 +08:00
commit 05a8045679
2 changed files with 6 additions and 4 deletions

View File

@ -44,6 +44,6 @@ public class PlcGateway extends RealDeviceConfig {
@Override
public String findDeviceCode() {
return config.findDeviceCode();
return config == null ? null : config.findDeviceCode();
}
}

View File

@ -230,12 +230,14 @@ logging:
tencent-cloud:
allow-send: false
minio:
endpoint: https://joylink.club
endpoint: http://192.168.1.254
accessKey: jladmin
secretKey: Joylink@0503
bucket: oss-rtss
replaceHttps: false
replaceHttps: true
common:
env: prd
env: local
license-secret-key: joylink
# 环境连接配置 end