Commit Graph

554 Commits

Author SHA1 Message Date
xzb
c926a4a6b5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 17:06:54 +08:00
xzb
bb9f1d9f5b ncc协议x 2023-06-08 17:06:40 +08:00
tiger_zhou
d3d856d45d 非实时消息 2023-06-08 17:05:43 +08:00
tiger_zhou
836d4b484b Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 15:48:30 +08:00
xzb
e8ca05baa4 ncc协议x 2023-06-08 15:47:48 +08:00
xzb
d3ddc5e158 ncc协议x 2023-06-08 15:42:33 +08:00
tiger_zhou
7735b3e63b Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 15:14:04 +08:00
xzb
78e8c82a46 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 15:14:02 +08:00
xzb
f20698d484 ncc协议x 2023-06-08 15:13:49 +08:00
tiger_zhou
7f72d50572 非实时消息 2023-06-08 15:12:02 +08:00
weizhihong
f1cb61ddf4 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 15:07:47 +08:00
weizhihong
2c3567ff2c 【修改发布图形接口、线路接口】 2023-06-08 15:07:36 +08:00
xzb
67c85e8594 ncc协议x 2023-06-08 14:59:05 +08:00
xzb
98f39938ab ncc协议x 2023-06-08 14:54:43 +08:00
tiger_zhou
6c476e2f90 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 14:27:40 +08:00
tiger_zhou
482d868824 非实时消息 2023-06-08 14:27:20 +08:00
weizhihong
a02837c2a9 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 14:26:00 +08:00
weizhihong
f213530179 【线路管理接口;发布图形接口】 2023-06-08 14:25:51 +08:00
xzb
ef9f091308 ncc协议x 2023-06-08 14:19:50 +08:00
xzb
0ca0971f07 ncc协议x 2023-06-08 14:05:19 +08:00
xzb
0434283e24 ncc协议x 2023-06-08 14:02:50 +08:00
xzb
6f5c63565e ncc协议x 2023-06-08 13:57:16 +08:00
xzb
b2ff6a0334 ncc协议x 2023-06-08 13:47:47 +08:00
xzb
c023c4889a ncc协议x 2023-06-08 13:40:44 +08:00
xzb
f6cc6bcba5 ncc协议x 2023-06-08 13:30:06 +08:00
xzb
631009eff1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 13:20:34 +08:00
xzb
6023ff23ef ncc协议x 2023-06-08 13:20:24 +08:00
tiger_zhou
4b8f32b146 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 13:09:34 +08:00
tiger_zhou
61b15b4cdf 非实时消息 2023-06-08 13:09:16 +08:00
weizhihong
a295a59f06 【线路增删改查】 2023-06-08 13:04:29 +08:00
xzb
873a0d297b ncc协议x 2023-06-08 11:26:06 +08:00
xzb
21567c062f ncc协议x 2023-06-08 11:22:12 +08:00
xzb
bf3267a695 ncc协议x 2023-06-08 11:18:53 +08:00
tiger_zhou
50129e0e87 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 11:09:15 +08:00
tiger_zhou
b7f6e20ce5 非实时消息 2023-06-08 11:08:55 +08:00
xzb
f6f30a083f ncc协议x 2023-06-08 11:03:37 +08:00
tiger_zhou
2c0fbf4193 非实时消息 2023-06-08 10:36:18 +08:00
xzb
a6a09fc920 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 10:35:55 +08:00
xzb
bd6c3a080f ncc协议x 2023-06-08 10:35:35 +08:00
0031c952ba 添加发布图形数据库相关 2023-06-08 10:17:50 +08:00
6582255309 调整OCC客户端及连接、超时重连逻辑
调整OCC测试服务,添加非实时服务
2023-06-07 17:51:49 +08:00
xzb
11827d6b7b ncc协议x 2023-06-07 17:28:16 +08:00
xzb
f63ff8c28a ncc协议x 2023-06-07 17:14:33 +08:00
xzb
10446891eb ncc协议x 2023-06-07 17:07:20 +08:00
xzb
e71876efd7 ncc协议x 2023-06-07 16:31:24 +08:00
xzb
99f101a06f ncc协议x 2023-06-07 16:02:42 +08:00
xzb
7b401840ad ncc协议x 2023-06-07 15:49:35 +08:00
xzb
fa5c8ba927 ncc协议x 2023-06-07 15:18:04 +08:00
tiger_zhou
469f9ba7d2 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
# Conflicts:
#	src/main/java/club/joylink/xiannccda/ats/message/MessageId.java
2023-06-07 15:13:19 +08:00
tiger_zhou
3f44f18645 非实时消息 2023-06-07 15:12:20 +08:00