wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 7d27ab5baa Merge branch 'dev' wangliwen 2022-08-02 15:32:17 +0800
  • 95989cc59c 删除所有运行中的流程接口 wangliwen 2022-08-02 15:32:08 +0800
  • 4606a21ab3 Merge branch 'master' into docker_package wangliwen 2022-08-02 15:08:17 +0800
  • 4dd9840752 Merge branch 'dev' wangliwen 2022-08-02 15:08:10 +0800
  • d96f797813 ... wangliwen 2022-08-02 15:08:01 +0800
  • 06fc61a4fe Merge branch 'master' into docker_package wangliwen 2022-08-02 14:50:22 +0800
  • 819a5a3f6b Merge branch 'dev' wangliwen 2022-08-02 14:50:16 +0800
  • cbd91df644 npe wangliwen 2022-08-02 14:49:03 +0800
  • a652a9a03b Merge branch 'master' into docker_package wangliwen 2022-08-02 14:09:14 +0800
  • dcba8d59a8 Merge branch 'dev' wangliwen 2022-08-02 14:09:06 +0800
  • bbf677b513 屮 wangliwen 2022-08-02 14:08:57 +0800
  • 9d6df94f63 Merge branch 'master' into docker_package wangliwen 2022-08-02 13:48:30 +0800
  • e6ca8dc1a0 Merge branch 'dev' wangliwen 2022-08-02 13:46:22 +0800
  • ef450bbf01 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-08-02 13:46:03 +0800
  • 508c73df6b .. dinggang 2022-08-02 13:45:31 +0800
  • d21c3b7099 。。。 wangliwen 2022-08-02 13:44:53 +0800
  • 7a15b30d26 Merge branch 'master' into docker_package wangliwen 2022-08-02 12:00:58 +0800
  • fbf0c5150e Merge branch 'dev' wangliwen 2022-08-02 12:00:51 +0800
  • 6a12463098 ？？？ wangliwen 2022-08-02 12:00:40 +0800
  • 1c067cde9f Merge branch 'master' into docker_package wangliwen 2022-08-02 11:29:50 +0800
  • d90b813367 Merge branch 'dev' wangliwen 2022-08-02 11:29:42 +0800
  • 621920daf9 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-02 11:29:32 +0800
  • d5fd0d2858 用户主动终止流程 wangliwen 2022-08-02 11:29:24 +0800
  • 8f183162b5 1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix dinggang 2022-08-02 10:39:32 +0800
  • 390828b619 Merge branch 'master' into docker_package wangliwen 2022-08-02 09:29:06 +0800
  • 1c1aa5a5c2 Merge branch 'dev' wangliwen 2022-08-02 09:28:58 +0800
  • fe7b406f52 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-02 09:28:35 +0800
  • 5174a75b35 通过实例id 终止流程 wangliwen 2022-08-02 09:28:12 +0800
  • 95eb94f885 1、修改因为合并代码出现的基础设施-视频资源，点击左侧树报错的问题，原因是sql语句去组织cache表中查询了 yitonglei 2022-08-02 09:23:13 +0800
  • ea27fa60b1 Merge branch 'master' into docker_package wangliwen 2022-08-02 08:53:20 +0800
  • 87340acccd Merge branch 'dev' wangliwen 2022-08-02 08:53:11 +0800
  • ca9133004a Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev yitonglei 2022-08-01 16:17:54 +0800
  • 4d8f0c63ae .. dinggang 2022-08-01 16:11:59 +0800
  • 3d9ccca9c3 Merge branch 'master' into docker_package wangliwen 2022-08-01 14:41:20 +0800
  • 57737a6092 Merge branch 'dev' wangliwen 2022-08-01 14:41:09 +0800
  • bb3d25d62f Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-08-01 14:40:48 +0800
  • 89821d9d55 Merge branch 'master' into docker_package wangliwen 2022-08-01 14:37:21 +0800
  • a0e5760970 Merge branch 'dev' wangliwen 2022-08-01 14:37:13 +0800
  • 124940fc04 超级管理员挂载能力时 无部门id问题 wangliwen 2022-08-01 14:36:59 +0800
  • a4e6dad451 Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform huangweixiong 2022-08-01 14:33:05 +0800
  • 9279ecf139 网关第二次对接 huangweixiong 2022-08-01 11:41:12 +0800
  • 5a14646104 Merge branch 'master' into docker_package wangliwen 2022-08-01 11:35:47 +0800
  • 3e23b48581 Merge branch 'dev' wangliwen 2022-08-01 11:35:37 +0800
  • 8b51c0f378 1.配置文件修改 2.融合服务bugfix dinggang 2022-08-01 11:22:29 +0800
  • 8628a34b1e 1、修改大数据局配置文件，在最后增加了一个同步label标签表的数据库连接 2、简单修改了获取视频资源的部分代码 yitonglei 2022-08-01 11:02:26 +0800
  • 61898cbcdc 修复没有满足网关申请数据时的审批标注 huangweixiong 2022-08-01 11:02:00 +0800
  • a0a4e0fb7f 调整ip wangliwen 2022-08-01 10:15:04 +0800
  • 8ea4e4fbe4 Merge branch 'master' into docker_package wangliwen 2022-08-01 10:14:07 +0800
  • da126a9921 Merge branch 'dev' wangliwen 2022-08-01 10:13:54 +0800
  • b68daeda1c Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-01 10:13:33 +0800
  • ff3e590dda 1、flyway提交的sql改版本号为4.4 yitonglei 2022-08-01 10:04:45 +0800
  • 00651bc910 配置文件修改 dinggang 2022-08-01 10:00:40 +0800
  • bb13969a1a 西海岸基础设施视频资源来源修改 dinggang 2022-08-01 09:56:31 +0800
  • 0e6984fb85 西海岸基础设施视频资源来源修改 dinggang 2022-07-30 18:53:36 +0800
  • c4df90dd14 Merge branch 'master' into docker_package wangliwen 2022-07-29 18:05:13 +0800
  • a5a2b95113 Merge branch 'dev' wangliwen 2022-07-29 18:04:18 +0800
  • a26fce4ddb Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-07-29 18:04:09 +0800
  • 1d12345410 Merge remote-tracking branch '备份/dev' into docker_package wangliwen 2022-07-29 18:03:49 +0800
  • 7421c08dc8 Merge remote-tracking branch 'origin/dev' into docker_package wangliwen 2022-07-29 18:03:41 +0800
  • e1327c7fee 1、增加获取视频资源过程中2张缓存表的定义 yitonglei 2022-07-29 17:57:29 +0800
  • 4760fa1898 .. dinggang 2022-07-29 17:52:26 +0800
  • b525a1d50a 融合服务完善 lizhicheng 2022-07-29 16:48:23 +0800
  • bd7e3848a4 Merge branch 'master' into docker_package wangliwen 2022-07-29 13:55:16 +0800
  • dc9395aa62 Merge branch 'dev' wangliwen 2022-07-29 13:55:08 +0800
  • 79807f44e2 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-07-29 13:55:00 +0800
  • c874e7f9cf 1、代码注释的修改 yitonglei 2022-07-29 12:05:22 +0800
  • 20c21aabf7 .. dinggang 2022-07-29 11:30:17 +0800
  • 353485ee04 no message yitonglei 2022-07-29 11:30:09 +0800
  • 63125fa2c5 1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的（主要是重新配置超时时间） yitonglei 2022-07-29 11:29:18 +0800
  • 52c4715b8f .. dinggang 2022-07-29 10:43:29 +0800
  • a218187d9c Merge branch 'master' into docker_package wangliwen 2022-07-29 09:59:06 +0800
  • 8fcdbff2f1 Merge branch 'dev' wangliwen 2022-07-29 09:58:58 +0800
  • 0ccdf069f8 1、根据新的流程重新梳理获取视频资源（地区和通道信息） yitonglei 2022-07-29 09:31:47 +0800
  • e0d48f1f3d Merge branch 'master' into docker_package wangliwen 2022-07-28 20:06:48 +0800
  • baab5ac0b3 Merge branch 'dev' wangliwen 2022-07-28 20:06:42 +0800
  • 7586127226 西海岸基础设施需求修改 dinggang 2022-07-28 20:03:59 +0800
  • e1a16425b0 Merge branch 'master' into docker_package wangliwen 2022-07-28 19:10:25 +0800
  • 7bf0b2a33e Merge branch 'dev' wangliwen 2022-07-28 19:01:10 +0800
  • 648ce5ced7 Merge branch 'dev' into docker_package wangliwen 2022-07-28 19:01:03 +0800
  • e74cc546f1 发送站内信 加点异常日志 wangliwen 2022-07-28 19:00:55 +0800
  • 41b80c5772 Merge branch 'master' into docker_package wangliwen 2022-07-28 17:41:20 +0800
  • 1e624749cb Merge branch 'dev' wangliwen 2022-07-28 17:41:13 +0800
  • fdbf32c47c Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-07-28 17:41:05 +0800
  • 47888777f8 发送站内信There is no session 的处理 wangliwen 2022-07-28 17:40:52 +0800
  • 0628d738c4 bugfix dinggang 2022-07-28 17:30:13 +0800
  • 645368398d bugfix dinggang 2022-07-28 16:55:04 +0800
  • 22cb72b0bf Merge branch 'master' into docker_package wangliwen 2022-07-28 16:31:26 +0800
  • 6602e9c07d Merge branch 'dev' wangliwen 2022-07-28 16:31:19 +0800
  • 1f606f0c18 1.西海岸基础设施需求修改 2.shiro的jsessionid问题修复V1.0 3.新增基础设施sql导入 dinggang 2022-07-28 16:28:34 +0800
  • 311713f895 Merge branch 'master' into docker_package wangliwen 2022-07-28 10:44:37 +0800
  • 5349c03e91 Merge branch 'dev' wangliwen 2022-07-28 10:44:26 +0800
  • ee1d2550d3 ... wangliwen 2022-07-28 10:44:11 +0800
  • 209303821b 。。。 wangliwen 2022-07-28 09:33:25 +0800
  • 4def91b45f 换jdk 17 wangliwen 2022-07-28 09:13:42 +0800
  • 7bacc9b245 Merge branch 'master' into docker_package wangliwen 2022-07-27 17:10:21 +0800
  • ac4347687f Merge branch 'dev' wangliwen 2022-07-27 17:10:13 +0800
  • 5eb0184bd4 西海岸基础设施需求修改 dinggang 2022-07-27 17:07:58 +0800
  • 1ff30d3d13 Merge branch 'master' into docker_package wangliwen 2022-07-27 14:21:06 +0800
  • b1aaf5e5bc Merge branch 'dev' wangliwen 2022-07-27 14:20:59 +0800
  • 3281c72fff ... wangliwen 2022-07-27 14:20:50 +0800