Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
This commit is contained in:
commit
05a8045679
@ -44,6 +44,6 @@ public class PlcGateway extends RealDeviceConfig {
|
||||
|
||||
@Override
|
||||
public String findDeviceCode() {
|
||||
return config.findDeviceCode();
|
||||
return config == null ? null : config.findDeviceCode();
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user