joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/device/PlcGateway.java
View File

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

8
src/main/resources/application.yml
View File

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