weizhihong
|
63f23cf14e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-28 16:32:58 +08:00 |
|
weizhihong
|
bfbfcf4b3e
|
【项目结构调整，MINIO增加客户端管理服务类，项目project表结构变更sql】
|
2022-09-28 16:32:52 +08:00 |
|
xzb
|
29d9d76e7d
|
paper company id
|
2022-09-28 15:36:48 +08:00 |
|
xzb
|
69014b0c71
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-28 14:49:45 +08:00 |
|
xzb
|
b2086a4c81
|
paper
|
2022-09-28 14:49:24 +08:00 |
|
tiger_zhou
|
87de6cb800
|
语音识别，合成重构
|
2022-09-28 13:57:32 +08:00 |
|
weizhihong
|
42eaa75d65
|
【minio工具类增加全路径查询文件，修改返回值类型】
|
2022-09-28 13:37:10 +08:00 |
|
weizhihong
|
2e44fce9f4
|
【项目信息编辑属性修改】
|
2022-09-28 09:58:56 +08:00 |
|
weizhihong
|
cb6b6e6516
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-28 09:42:07 +08:00 |
|
weizhihong
|
6637a945fa
|
【minio 上传文件】
|
2022-09-28 09:42:01 +08:00 |
|
xzb
|
4301c32b49
|
paper
|
2022-09-27 18:01:48 +08:00 |
|
xzb
|
91e23d36ae
|
paper
|
2022-09-27 17:59:16 +08:00 |
|
tiger_zhou
|
6d2faad0ae
|
理论试题管理代码调整
|
2022-09-27 15:33:47 +08:00 |
|
tiger_zhou
|
f28d92f793
|
Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/dao/paper/PaperQuestionDAO.java
# src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
|
2022-09-27 15:29:35 +08:00 |
|
tiger_zhou
|
66bf5f7549
|
理论试题管理代码调整
|
2022-09-27 15:28:57 +08:00 |
|
xzb
|
9fe24f7230
|
paper
|
2022-09-27 15:27:03 +08:00 |
|
xzb
|
7ae3346ad7
|
paper
|
2022-09-27 15:13:21 +08:00 |
|
tiger_zhou
|
ff172cf784
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-27 15:12:22 +08:00 |
|
xzb
|
7b6ab5608e
|
paper
|
2022-09-27 15:11:03 +08:00 |
|
tiger_zhou
|
9930d5b754
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-27 15:10:00 +08:00 |
|
xzb
|
6fcf7ca003
|
paper
|
2022-09-27 14:54:41 +08:00 |
|
xzb
|
1af3786341
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-27 14:53:29 +08:00 |
|
tiger_zhou
|
cbc12523bc
|
理论试题管理代码调整
|
2022-09-27 14:51:30 +08:00 |
|
tiger_zhou
|
b5497d4cd3
|
理论试题管理代码调整
|
2022-09-27 14:47:26 +08:00 |
|
tiger_zhou
|
77ffde8c08
|
理论试题管理代码调整
|
2022-09-27 14:44:48 +08:00 |
|
tiger_zhou
|
207246c5b2
|
理论试题管理代码调整
|
2022-09-27 14:42:55 +08:00 |
|
xzb
|
c90d5d2394
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-27 14:22:10 +08:00 |
|
xzb
|
7c3ca92216
|
paper
|
2022-09-27 14:21:41 +08:00 |
|
tiger_zhou
|
9cbe835f2b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-27 14:21:11 +08:00 |
|
tiger_zhou
|
3489df9245
|
理论试题管理代码调整
|
2022-09-27 14:20:29 +08:00 |
|
xzb
|
30386dc5f6
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-26 18:06:18 +08:00 |
|
xzb
|
f12ceb3fce
|
paper
|
2022-09-26 18:06:02 +08:00 |
|
weizhihong
|
40678cbc72
|
【清空步骤时，清空最后运行背景】
|
2022-09-26 13:21:03 +08:00 |
|
tiger_zhou
|
d8079d98f2
|
理论试题管理代码调整
|
2022-09-26 13:03:34 +08:00 |
|
weizhihong
|
e6721d69ac
|
【项目前端设置请求修改】
|
2022-09-26 11:19:30 +08:00 |
|
weizhihong
|
f2ab1f945d
|
【项目前端配置中增加图标连接信息】
|
2022-09-26 10:11:11 +08:00 |
|
tiger_zhou
|
35fd58eb1d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-26 09:57:05 +08:00 |
|
tiger_zhou
|
293588d6cf
|
修改 project code 参数
|
2022-09-26 09:56:33 +08:00 |
|
weizhihong
|
17e3268667
|
【增加项目缓存读取、删除】
|
2022-09-26 09:52:05 +08:00 |
|
tiger_zhou
|
bfa9b06475
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapElement.java
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java
src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java
src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
src/main/java/club/joylink/rtss/websocket/interceptor/VSimpleInterceptor.java
|
2022-09-26 09:50:34 +08:00 |
|
tiger_zhou
|
77f02453f4
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-26 09:44:37 +08:00 |
|
tiger_zhou
|
ad8e8963c6
|
正式环境 ws config 对象属性 ISysUserService 造成循环依赖 添加lazy注解
|
2022-09-26 09:42:13 +08:00 |
|
xzb
|
f3e409d430
|
dis cmd注释
|
2022-09-26 09:16:37 +08:00 |
|
xzb
|
f48d48f121
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-23 18:01:31 +08:00 |
|
xzb
|
a4865e667a
|
paper
|
2022-09-23 18:01:07 +08:00 |
|
tiger_zhou
|
6ff6eeffec
|
理论试题管理代码调整
|
2022-09-23 17:31:22 +08:00 |
|
weizhihong
|
c1f81a6fdf
|
【创建仿真时，项目为空默认处理；调度台设备为空处理；】
|
2022-09-23 17:14:39 +08:00 |
|
weizhihong
|
6178310259
|
【去除sql文件中的编码设置】
|
2022-09-23 17:01:24 +08:00 |
|
weizhihong
|
b580ca0313
|
【sql文件说明】
|
2022-09-23 16:58:25 +08:00 |
|
weizhihong
|
b666ac0bd7
|
【将項目前端配置与后端配置分离，处理重新处理表结构】
|
2022-09-23 16:48:48 +08:00 |
|