 liheting
|
21703b3189
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
 zzj
|
c7f714629c
添加分站连接和断开时的日志
|
6 years ago |
 chensongchao
|
a3017796ba
修改禁止人员下井功能
|
6 years ago |
|
chensongchao
|
6f6e83f113
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
5820dcb5dc
修改禁止人员下井功能。。解决可能多线程导致的问题
|
6 years ago |
 lixioayao
|
0dc4010092
fix conflict
|
6 years ago |
|
lixioayao
|
4c0918a89c
wsTimer.
|
6 years ago |
|
zzj
|
7692dbbdd0
添加报文太大、太小时报错及关闭连接的功能
|
6 years ago |
|
lixioayao
|
3a4e0c0744
fix log
|
6 years ago |
|
zzj
|
be91fa8d4c
处理 websocket 登录时异步回调问题
|
6 years ago |
|
lixioayao
|
aea6dc288f
回退card_message
|
6 years ago |
|
lixioayao
|
bc5e6642ef
net 日期 月份+1
|
6 years ago |
|
lixioayao
|
1f6fd1f591
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
13de702069
message.h
|
6 years ago |
|
zzj
|
b9dfb72271
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
b2fe96926b
添加分站时间戳、分站CT日志
|
6 years ago |
|
lixioayao
|
046323dac3
修改手动升井逻辑，不在盲区的卡，不允许升井
|
6 years ago |
|
lixioayao
|
bdba3f219e
前端推送时间间隔修复为1s一次
|
6 years ago |
|
lixioayao
|
ec809e00ad
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
97390d4bbb
add CHAR_LOCATEDATASMALL_TOF_EXTEND
|
6 years ago |
|
zzj
|
4cacfcec12
时间戳检查移动到 site 类
|
6 years ago |
|
lixioayao
|
42dfe4e53f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
d72622530e
add log for db
|
6 years ago |
|
zzj
|
4f78658f4d
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
6466e775ff
1、区域修改业务类型，
|
6 years ago |
|
liheting
|
44111b2029
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
|
chensongchao
|
cb7ff6c56a
修改初始化人员及车辆的接口参数由int64->string。修改对应的代码
|
6 years ago |
|
chensongchao
|
a2add260df
合并是不小心把web连接去掉了。加回来
|
6 years ago |
|
chensongchao
|
8f42ffd877
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
chensongchao
|
345b916eed
web实时修改人员及车辆信息,调试。新增禁止指定人员下井web更改通知采集服务器
|
6 years ago |
