wangliwen
|
da126a9921
|
Merge branch 'dev'
|
2022-08-01 10:13:54 +08:00 |
|
wangliwen
|
b68daeda1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-01 10:13:33 +08:00 |
 yitonglei
|
ff3e590dda
|
1、flyway提交的sql改版本号为4.4
|
2022-08-01 10:04:45 +08:00 |
 dinggang
|
00651bc910
|
配置文件修改
|
2022-08-01 10:00:40 +08:00 |
|
dinggang
|
bb13969a1a
|
西海岸基础设施视频资源来源修改
|
2022-08-01 09:56:31 +08:00 |
|
dinggang
|
0e6984fb85
|
西海岸基础设施视频资源来源修改
|
2022-07-30 18:53:36 +08:00 |
|
wangliwen
|
a5a2b95113
|
Merge branch 'dev'
|
2022-07-29 18:04:18 +08:00 |
|
wangliwen
|
a26fce4ddb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 18:04:09 +08:00 |
|
yitonglei
|
e1327c7fee
|
1、增加获取视频资源过程中2张缓存表的定义
|
2022-07-29 17:57:29 +08:00 |
|
dinggang
|
4760fa1898
|
..
|
2022-07-29 17:52:26 +08:00 |
 lizhicheng
|
b525a1d50a
|
融合服务完善
|
2022-07-29 16:48:23 +08:00 |
|
wangliwen
|
dc9395aa62
|
Merge branch 'dev'
|
2022-07-29 13:55:08 +08:00 |
|
wangliwen
|
79807f44e2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 13:55:00 +08:00 |
|
yitonglei
|
c874e7f9cf
|
1、代码注释的修改
|
2022-07-29 12:05:22 +08:00 |
|
dinggang
|
20c21aabf7
|
..
|
2022-07-29 11:30:17 +08:00 |
|
yitonglei
|
353485ee04
|
no message
|
2022-07-29 11:30:09 +08:00 |
|
yitonglei
|
63125fa2c5
|
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的（主要是重新配置超时时间）
|
2022-07-29 11:29:18 +08:00 |
|
dinggang
|
52c4715b8f
|
..
|
2022-07-29 10:43:29 +08:00 |
|
wangliwen
|
8fcdbff2f1
|
Merge branch 'dev'
|
2022-07-29 09:58:58 +08:00 |
|
yitonglei
|
0ccdf069f8
|
1、根据新的流程重新梳理获取视频资源（地区和通道信息）
|
2022-07-29 09:31:47 +08:00 |
|
wangliwen
|
baab5ac0b3
|
Merge branch 'dev'
|
2022-07-28 20:06:42 +08:00 |
|
dinggang
|
7586127226
|
西海岸基础设施需求修改
|
2022-07-28 20:03:59 +08:00 |
|
wangliwen
|
7bf0b2a33e
|
Merge branch 'dev'
|
2022-07-28 19:01:10 +08:00 |
|
wangliwen
|
e74cc546f1
|
发送站内信 加点异常日志
|
2022-07-28 19:00:55 +08:00 |
|
wangliwen
|
1e624749cb
|
Merge branch 'dev'
|
2022-07-28 17:41:13 +08:00 |
|
wangliwen
|
fdbf32c47c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-28 17:41:05 +08:00 |
|
wangliwen
|
47888777f8
|
发送站内信There is no session 的处理
|
2022-07-28 17:40:52 +08:00 |
|
dinggang
|
0628d738c4
|
bugfix
|
2022-07-28 17:30:13 +08:00 |
|
dinggang
|
645368398d
|
bugfix
|
2022-07-28 16:55:04 +08:00 |
|
wangliwen
|
6602e9c07d
|
Merge branch 'dev'
|
2022-07-28 16:31:19 +08:00 |
|
dinggang
|
1f606f0c18
|
1.西海岸基础设施需求修改
2.shiro的jsessionid问题修复V1.0
3.新增基础设施sql导入
|
2022-07-28 16:28:34 +08:00 |
|
wangliwen
|
5349c03e91
|
Merge branch 'dev'
|
2022-07-28 10:44:26 +08:00 |
|
wangliwen
|
ee1d2550d3
|
...
|
2022-07-28 10:44:11 +08:00 |
|
wangliwen
|
ac4347687f
|
Merge branch 'dev'
|
2022-07-27 17:10:13 +08:00 |
|
dinggang
|
5eb0184bd4
|
西海岸基础设施需求修改
|
2022-07-27 17:07:58 +08:00 |
|
wangliwen
|
b1aaf5e5bc
|
Merge branch 'dev'
|
2022-07-27 14:20:59 +08:00 |
|
wangliwen
|
3281c72fff
|
...
|
2022-07-27 14:20:50 +08:00 |
|
wangliwen
|
58f9ecc762
|
Merge branch 'dev'
|
2022-07-27 10:24:51 +08:00 |
|
wangliwen
|
fdac3a7a86
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-27 10:24:36 +08:00 |
|
wangliwen
|
1b26354533
|
Merge branch 'dev'
|
2022-07-27 10:22:54 +08:00 |
|
wangliwen
|
32f9558052
|
....
|
2022-07-27 10:21:45 +08:00 |
|
dinggang
|
26830e19e8
|
前台退出未清除后台登录用户bugfix-1.0
|
2022-07-27 10:06:31 +08:00 |
|
wangliwen
|
559a1a4f55
|
...
|
2022-07-26 19:45:27 +08:00 |
|
yitonglei
|
68cf80df1f
|
手动获取视频地区信息后保存地区信息前先清空表格t_camera_organization
|
2022-07-26 17:55:37 +08:00 |
|
wangliwen
|
4f03039109
|
...
|
2022-07-26 17:08:06 +08:00 |
|
wangliwen
|
df86ed661f
|
websocket定时心跳
|
2022-07-26 17:03:38 +08:00 |
|
wangliwen
|
ec20e986fa
|
...
|
2022-07-26 16:29:15 +08:00 |
|
wangliwen
|
8968c1017d
|
定时清理操作日志
|
2022-07-26 16:25:53 +08:00 |
|
wangliwen
|
b314c05072
|
...
|
2022-07-26 16:13:02 +08:00 |
|
dinggang
|
efdda05ec2
|
门户首页-推荐能力-去除重复能力
|
2022-07-26 15:34:13 +08:00 |