wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,553 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

1484 Commits

Author SHA1 Message Date
wangliwen 380cf848e3 Merge branch 'master' into docker_package 2022-08-03 15:10:03 +08:00
wangliwen 46ccea4556 被驳回 消息通知 2022-08-03 15:09:49 +08:00
wangliwen f091b24110 Merge branch 'master' into docker_package 2022-08-03 14:41:39 +08:00
wangliwen 527266a9b5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 14:41:08 +08:00
wangliwen 1ec9b2db5c 被驳回时发送消息通知 2022-08-03 14:40:42 +08:00
huangweixiong 259f1b757a Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  ..
  1、修改获取基础设施-视频资源的相关sql操作的表为cache表
  发起者终止流程
  存在欺诈行为？
  npe
  删除所有运行中的流程接口
  ...
  npe
  屮
  ..
  。。。
  ？？？
  用户主动终止流程
  1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix
  通过实例id 终止流程
  1、修改因为合并代码出现的基础设施-视频资源，点击左侧树报错的问题，原因是sql语句去组织cache表中查询了
  Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
  ..
  超级管理员挂载能力时 无部门id问题

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/gateway/service/MonitorServiceV2.java
 2022-08-03 14:27:30 +08:00
huangweixiong 04db7c6dc5 网关重启数据失效适配 2022-08-03 14:24:35 +08:00
dinggang af5e237b3d .. 2022-08-03 11:04:53 +08:00
wangliwen e803835bbf Merge branch 'master' into docker_package 2022-08-03 09:14:14 +08:00
yitonglei 975d6654ce 1、修改获取基础设施-视频资源的相关sql操作的表为cache表 2022-08-02 18:13:25 +08:00
wangliwen b359c02bcc Merge branch 'master' into docker_package 2022-08-02 16:59:03 +08:00
wangliwen d0df922c62 发起者终止流程 2022-08-02 16:58:48 +08:00
wangliwen 1fba85a1aa Merge branch 'master' into docker_package 2022-08-02 15:56:14 +08:00
wangliwen a04745eaab 存在欺诈行为？ 2022-08-02 15:55:58 +08:00
wangliwen f4a36e8a22 Merge branch 'master' into docker_package 2022-08-02 15:41:23 +08:00
wangliwen d170f9c177 npe 2022-08-02 15:40:46 +08:00
wangliwen 3074526828 Merge branch 'master' into docker_package 2022-08-02 15:32:25 +08:00
wangliwen 95989cc59c 删除所有运行中的流程接口 2022-08-02 15:32:08 +08:00
wangliwen 4606a21ab3 Merge branch 'master' into docker_package 2022-08-02 15:08:17 +08:00
wangliwen d96f797813 ... 2022-08-02 15:08:01 +08:00
wangliwen 06fc61a4fe Merge branch 'master' into docker_package 2022-08-02 14:50:22 +08:00
wangliwen cbd91df644 npe 2022-08-02 14:49:03 +08:00
wangliwen a652a9a03b Merge branch 'master' into docker_package 2022-08-02 14:09:14 +08:00
wangliwen bbf677b513 屮 2022-08-02 14:08:57 +08:00
wangliwen 9d6df94f63 Merge branch 'master' into docker_package 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
 2022-08-02 13:48:30 +08:00
wangliwen ef450bbf01 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-02 13:46:03 +08:00
dinggang 508c73df6b .. 2022-08-02 13:45:31 +08:00
wangliwen d21c3b7099 。。。 2022-08-02 13:44:53 +08:00
wangliwen 7a15b30d26 Merge branch 'master' into docker_package 2022-08-02 12:00:58 +08:00
wangliwen 6a12463098 ？？？ 2022-08-02 12:00:40 +08:00
wangliwen 1c067cde9f Merge branch 'master' into docker_package 2022-08-02 11:29:50 +08:00
wangliwen 621920daf9 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 11:29:32 +08:00
wangliwen d5fd0d2858 用户主动终止流程 2022-08-02 11:29:24 +08:00
dinggang 8f183162b5 1.编目更新 
2.工作台部门待办列表查询增加申请人姓名bugfix
 2022-08-02 10:39:32 +08:00
wangliwen 390828b619 Merge branch 'master' into docker_package 2022-08-02 09:29:06 +08:00
wangliwen fe7b406f52 Merge remote-tracking branch 'origin/dev' into dev 2022-08-02 09:28:35 +08:00
wangliwen 5174a75b35 通过实例id 终止流程 2022-08-02 09:28:12 +08:00
yitonglei 95eb94f885 1、修改因为合并代码出现的基础设施-视频资源，点击左侧树报错的问题，原因是sql语句去组织cache表中查询了 2022-08-02 09:23:13 +08:00
wangliwen ea27fa60b1 Merge branch 'master' into docker_package 2022-08-02 08:53:20 +08:00
yitonglei ca9133004a Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-01 16:17:54 +08:00
dinggang 4d8f0c63ae .. 2022-08-01 16:11:59 +08:00
wangliwen 3d9ccca9c3 Merge branch 'master' into docker_package 2022-08-01 14:41:20 +08:00
wangliwen bb3d25d62f Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-01 14:40:48 +08:00
wangliwen 89821d9d55 Merge branch 'master' into docker_package 2022-08-01 14:37:21 +08:00
wangliwen 124940fc04 超级管理员挂载能力时 无部门id问题 2022-08-01 14:36:59 +08:00
huangweixiong a4e6dad451 Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform 
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (80 commits)
  1.配置文件修改 2.融合服务bugfix
  1、修改大数据局配置文件，在最后增加了一个同步label标签表的数据库连接 2、简单修改了获取视频资源的部分代码
  1、flyway提交的sql改版本号为4.4
  配置文件修改
  西海岸基础设施视频资源来源修改
  西海岸基础设施视频资源来源修改
  1、增加获取视频资源过程中2张缓存表的定义
  ..
  融合服务完善
  1、代码注释的修改
  ..
  no message
  1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的（主要是重新配置超时时间）
  ..
  1、根据新的流程重新梳理获取视频资源（地区和通道信息）
  西海岸基础设施需求修改
  发送站内信 加点异常日志
  发送站内信There is no session 的处理
  bugfix
  bugfix
  ...

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
#	renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java
#	renren-admin/src/main/resources/application-prod.yml
 2022-08-01 14:33:05 +08:00
huangweixiong 9279ecf139 网关第二次对接 2022-08-01 11:41:12 +08:00
wangliwen 5a14646104 Merge branch 'master' into docker_package 2022-08-01 11:35:47 +08:00
dinggang 8b51c0f378 1.配置文件修改 
2.融合服务bugfix
 2022-08-01 11:22:29 +08:00
yitonglei 8628a34b1e 1、修改大数据局配置文件，在最后增加了一个同步label标签表的数据库连接 
2、简单修改了获取视频资源的部分代码
 2022-08-01 11:02:26 +08:00
huangweixiong 61898cbcdc 修复没有满足网关申请数据时的审批标注 2022-08-01 11:02:00 +08:00
wangliwen a0a4e0fb7f 调整ip 2022-08-01 10:15:04 +08:00
wangliwen 8ea4e4fbe4 Merge branch 'master' into docker_package 2022-08-01 10:14:07 +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 a26fce4ddb Merge remote-tracking branch 'origin/dev' into dev 2022-07-29 18:04:09 +08:00
wangliwen 1d12345410 Merge remote-tracking branch '备份/dev' into docker_package 2022-07-29 18:03:49 +08:00
wangliwen 7421c08dc8 Merge remote-tracking branch 'origin/dev' into docker_package 2022-07-29 18:03:41 +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 bd7e3848a4 Merge branch 'master' into docker_package 2022-07-29 13:55:16 +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 a218187d9c Merge branch 'master' into docker_package 2022-07-29 09:59:06 +08:00
yitonglei 0ccdf069f8 1、根据新的流程重新梳理获取视频资源（地区和通道信息） 2022-07-29 09:31:47 +08:00
wangliwen e0d48f1f3d Merge branch 'master' into docker_package 2022-07-28 20:06:48 +08:00
dinggang 7586127226 西海岸基础设施需求修改 2022-07-28 20:03:59 +08:00
wangliwen 648ce5ced7 Merge branch 'dev' into docker_package 2022-07-28 19:01:03 +08:00
wangliwen e74cc546f1 发送站内信 加点异常日志 2022-07-28 19:00:55 +08:00
wangliwen 41b80c5772 Merge branch 'master' into docker_package 2022-07-28 17:41:20 +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 22cb72b0bf Merge branch 'master' into docker_package 2022-07-28 16:31:26 +08:00
dinggang 1f606f0c18 1.西海岸基础设施需求修改 
2.shiro的jsessionid问题修复V1.0
3.新增基础设施sql导入
 2022-07-28 16:28:34 +08:00
wangliwen 311713f895 Merge branch 'master' into docker_package 2022-07-28 10:44:37 +08:00
wangliwen ee1d2550d3 ... 2022-07-28 10:44:11 +08:00
wangliwen 209303821b 。。。 2022-07-28 09:33:25 +08:00
wangliwen 4def91b45f 换jdk 17 2022-07-28 09:13:42 +08:00
wangliwen 7bacc9b245 Merge branch 'master' into docker_package 2022-07-27 17:10:21 +08:00
dinggang 5eb0184bd4 西海岸基础设施需求修改 2022-07-27 17:07:58 +08:00
wangliwen 1ff30d3d13 Merge branch 'master' into docker_package 2022-07-27 14:21:06 +08:00
wangliwen 3281c72fff ... 2022-07-27 14:20:50 +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 ab08469ac2 Merge branch 'master' into docker_package 2022-07-27 10:23:02 +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
wangliwen ed237c62ee Merge branch 'master' into docker_package 2022-07-27 10:07:53 +08:00
dinggang 26830e19e8 前台退出未清除后台登录用户bugfix-1.0 2022-07-27 10:06:31 +08:00
wangliwen f997270565 Merge branch 'master' into docker_package 2022-07-26 19:45:40 +08:00
wangliwen 559a1a4f55 ... 2022-07-26 19:45:27 +08:00
wangliwen 0959ac88f4 Merge branch 'master' into docker_package 2022-07-26 19:07:05 +08:00
yitonglei 68cf80df1f 手动获取视频地区信息后保存地区信息前先清空表格t_camera_organization 2022-07-26 17:55:37 +08:00
wangliwen 7ea6145f61 Merge branch 'master' into docker_package 2022-07-26 17:08:20 +08:00
wangliwen 4f03039109 ... 2022-07-26 17:08:06 +08:00
wangliwen c2e64e630b Merge branch 'master' into docker_package 2022-07-26 17:03:58 +08:00
wangliwen df86ed661f websocket定时心跳 2022-07-26 17:03:38 +08:00
wangliwen cc50527b4b Merge branch 'master' into docker_package 2022-07-26 16:29:28 +08:00
wangliwen ec20e986fa ... 2022-07-26 16:29:15 +08:00
wangliwen 1969a1c0bd Merge branch 'dev' into docker_package 2022-07-26 16:26:05 +08:00
wangliwen 8968c1017d 定时清理操作日志 2022-07-26 16:25:53 +08:00
wangliwen 3c5c26b7de Merge branch 'master' into docker_package 2022-07-26 16:13:18 +08:00
wangliwen b314c05072 ... 2022-07-26 16:13:02 +08:00
wangliwen 83f6fb67df Merge branch 'master' into docker_package 2022-07-26 15:37:11 +08:00
dinggang efdda05ec2 门户首页-推荐能力-去除重复能力 2022-07-26 15:34:13 +08:00
wangliwen eb4c402866 换一下初始镜像 2022-07-26 14:07:12 +08:00
wangliwen 31cae23036 Merge branch 'master' into docker_package 2022-07-26 10:29:36 +08:00
wangliwen a68d24f687 npe 2022-07-26 10:29:22 +08:00
wangliwen ef5bb41a0f Merge branch 'master' into docker_package 2022-07-25 19:04:54 +08:00
wangliwen d61043f00d Merge remote-tracking branch 'origin/dev' into dev 2022-07-25 19:04:36 +08:00
yitonglei 4d2141d807 增加视频资源申请时查询该资源是否在库中的判断cameraChannelService.checkCameraIfExists 2022-07-25 18:00:29 +08:00
dinggang 115944b8e8 管理系统-能力挂接列表新增显示所属部门字段 2022-07-25 17:19:23 +08:00
wangliwen 1a2c909f4c Merge branch 'master' into docker_package 2022-07-25 16:00:27 +08:00
wangliwen 6fedef22c0 屮 2022-07-25 16:00:10 +08:00
wangliwen 37d511742c Merge remote-tracking branch '备份/dev' into docker_package 2022-07-25 14:14:12 +08:00
wangliwen 88c75d5022 docker 启动调整jvm参数 2022-07-25 14:13:54 +08:00
yitonglei f0cc8cc5a9 1、能力超市、基础设施、视频资源的列表查询增加gps坐标为空的判断 2022-07-25 14:01:45 +08:00
wangliwen 62c023a046 Merge branch 'master' into docker_package 2022-07-25 11:47:20 +08:00
wangliwen 5d1b7da56a 批量申请时 businesskey只记录5条id 2022-07-25 11:47:03 +08:00
wangliwen cc70512cdd Merge branch 'master' into docker_package 2022-07-25 10:52:06 +08:00
wangliwen d113c6ec7a 已办任务接口，能力下架增加申请内容为 能力名称 2022-07-25 10:51:43 +08:00
wangliwen 3f9405ab88 Merge branch 'master' into docker_package 2022-07-25 10:20:45 +08:00
wangliwen 0b2844e246 能力上架审核被拒绝时，能力状态不正确的bug fix 2022-07-25 10:20:08 +08:00
wangliwen 001bae1711 Merge branch 'master' into docker_package 2022-07-22 18:44:17 +08:00
wangliwen afaa8cb26c .。 2022-07-22 18:44:04 +08:00
wangliwen ca0bb90e1f 调整 2022-07-22 18:43:45 +08:00
wangliwen 9b0cbc88e6 Merge branch 'master' into docker_package 2022-07-22 17:54:29 +08:00
wangliwen 51ab0f7c78 屮 2022-07-22 17:54:17 +08:00
wangliwen 762dccbb91 Merge branch 'master' into docker_package 2022-07-22 17:35:50 +08:00
wangliwen 47e873ecab 。。。 2022-07-22 17:35:29 +08:00
wangliwen 488b42719f Merge branch 'master' into docker_package 2022-07-22 17:21:58 +08:00
wangliwen 573c55687c 能力详情出是否通过 2022-07-22 17:21:45 +08:00
wangliwen 5092055091 Merge branch 'master' into docker_package 2022-07-22 17:14:03 +08:00
wangliwen aad23ca5ee 资源详情返回 是否加入申购车 2022-07-22 17:11:21 +08:00
wangliwen 0d6347c964 Merge branch 'master' into docker_package 2022-07-22 16:47:50 +08:00
wangliwen 676a1d2e17 是否为基础设施的判断 2022-07-22 16:47:32 +08:00
wangliwen 555c023476 Merge branch 'master' into docker_package 2022-07-22 16:11:40 +08:00
wangliwen 4a4d21bf87 Merge remote-tracking branch '备份/dev' into dev 2022-07-22 16:11:22 +08:00
wangliwen 373af4ba93 Merge remote-tracking branch '备份/dev' into docker_package 2022-07-22 16:10:43 +08:00
wangliwen 888e148fb4 。。。 2022-07-22 16:10:33 +08:00
yitonglei 72cf26ec72 1、能力集市-基础设施页面的列表查询的sql语句增加 check_status 为空的判断 2022-07-22 16:06:44 +08:00
wangliwen fe3c6bb939 Merge branch 'master' into docker_package 2022-07-22 15:45:47 +08:00
wangliwen 6c06060b16 Merge branch 'master' into dev 2022-07-22 15:45:34 +08:00
wangliwen aa54a9a8fc pageWithAttr增加是否加入申购车 2022-07-22 15:45:11 +08:00
dinggang 81b5b28743 1.修复金宏环境-能力统计-资源图谱-能力类型-能力集-按照数据资源查数据接口调用错误 2022-07-22 14:43:04 +08:00
wangliwen 0dc2b4eac3 Merge branch 'master' into docker_package 2022-07-22 13:32:40 +08:00
wangliwen c950efc96e 已办流程查询流程内参数 2022-07-22 13:32:23 +08:00
wangliwen 05d77742d1 Merge branch 'master' into docker_package 2022-07-22 12:04:36 +08:00
yitonglei 375d482ce2 1、flyway V4.1 改为V4.2，语句的文件存放地址改为resources/db下 2022-07-22 12:03:23 +08:00
wangliwen a00131421d Merge branch 'master' into docker_package 2022-07-22 11:58:42 +08:00
wangliwen 7f59e33101 Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev 2022-07-22 11:57:54 +08:00
wangliwen af7c18df12 已办任务内出现待办的问题解决 2022-07-22 11:57:28 +08:00
yitonglei 6f72e38a56 1、flyway增加V4.1，新增表t_region 
2、修改基础设施页面地图中根据区域聚合查询的方法，区市信息以t_region表为准
 2022-07-22 11:22:39 +08:00
wangliwen 622da8f4e5 Merge branch 'master' into docker_package 2022-07-22 10:28:57 +08:00
wangliwen 1ebd70df03 调整mysql 全文索引使用自然语言搜索模式 2022-07-22 10:28:37 +08:00
wangliwen f3dc7ca4d5 Merge branch 'master' into docker_package 2022-07-22 08:56:04 +08:00
yitonglei fc66ef062b 同步摄像头通道信息后删除掉经纬度有空的通道 2022-07-21 18:18:26 +08:00
wangliwen f41ef8a3ba Merge branch 'master' into docker_package 2022-07-21 17:30:31 +08:00
wangliwen 8de4de904f Merge remote-tracking branch 'origin/dev' into dev 2022-07-21 17:30:17 +08:00
wangliwen 1af2b0e48e Merge branch 'master' into docker_package 2022-07-21 17:29:38 +08:00
wangliwen 66ae7d2fe6 ... 2022-07-21 17:29:08 +08:00
dinggang 6bdd4b3c30 1.能力统计部门数统计逻辑修改 2022-07-21 17:28:13 +08:00
wangliwen aa4b0d3d70 Merge branch 'master' into docker_package 2022-07-21 16:58:23 +08:00
wangliwen 92dc144d7d 拆单 是否完成 2022-07-21 16:58:03 +08:00
wangliwen 120e5cb13a Merge branch 'master' into docker_package 2022-07-21 16:33:34 +08:00
wangliwen 7bdbecfe63 。。。 2022-07-21 16:33:20 +08:00
wangliwen 412ef1cc78 拆单审核所有流程是否完成 2022-07-21 16:31:22 +08:00
wangliwen de73c653b0 Merge branch 'master' into docker_package 2022-07-21 16:00:20 +08:00
wangliwen 0ac8ef8940 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-21 15:59:57 +08:00
wangliwen 544a673f2a ...websocket先收到消息？ 2022-07-21 15:59:36 +08:00
dinggang 67f8811b21 ... 2022-07-21 15:40:52 +08:00
wangliwen 20851412a4 Merge branch 'master' into docker_package 2022-07-21 15:34:13 +08:00
wangliwen 4b99279d87 审核结束消息通知bug与能力申请节点不进入能力申请异常 2022-07-21 15:33:59 +08:00
wangliwen 826f327482 Merge branch 'master' into docker_package 2022-07-21 15:18:44 +08:00
wangliwen 6fae1071ff ... 2022-07-21 15:18:31 +08:00
wangliwen 53589991ea Merge branch 'master' into docker_package 2022-07-21 14:28:08 +08:00
wangliwen 2b6165be0f websocket 发送站内信通知 2022-07-21 14:27:24 +08:00
wangliwen 3941260b63 Merge branch 'master' into docker_package 2022-07-21 11:44:46 +08:00
wangliwen abbabe2e9a npe 2022-07-21 11:44:27 +08:00
wangliwen e5c683de8b Merge branch 'master' into docker_package 2022-07-21 11:04:29 +08:00
wangliwen 6a50553545 jackson允许出现特殊字符和转义符 2022-07-21 11:04:11 +08:00
wangliwen 20b7a2dccd 站内信通知异常 2022-07-21 10:54:25 +08:00
wangliwen d9de090df4 Merge branch 'master' into docker_package 2022-07-21 10:41:58 +08:00
wangliwen aad70245d8 前端无法展示异常信息 2022-07-21 10:41:46 +08:00
wangliwen 0f01dd82a5 Merge branch 'master' into docker_package 2022-07-21 10:02:49 +08:00
wangliwen 7e53cac06c Merge branch 'master' into dev 2022-07-21 10:02:30 +08:00
wangliwen 76255c5ff3 ... 2022-07-21 10:02:03 +08:00
dinggang 55ac3b8a60 1.编目更新 
2.bugfix
 2022-07-21 09:51:32 +08:00
wangliwen a5278aed91 Merge branch 'dev' into docker_package 2022-07-21 09:41:07 +08:00
wangliwen 162b016d36 下架支持附件 2022-07-21 09:40:55 +08:00
wangliwen 24207a2843 Merge branch 'dev' into docker_package 2022-07-21 09:08:22 +08:00
dinggang 7632d92ac2 Merge remote-tracking branch 'origin/dev' into dev 2022-07-20 18:15:03 +08:00
dinggang d7c0fa6dc2 1.新增菜单初始化数据sql 
2.编目更新
3.bugfix
 2022-07-20 18:14:34 +08:00
wangliwen 02322bdbb3 Merge branch 'master' into docker_package 2022-07-20 18:14:19 +08:00
wangliwen 935f8f1588 ... 2022-07-20 18:14:05 +08:00
wangliwen a960e9c894 Merge branch 'master' into docker_package 2022-07-20 17:46:39 +08:00
wangliwen 41a06c660c ... 2022-07-20 17:35:46 +08:00
wangliwen d297b6c6e1 Merge branch 'master' into docker_package 2022-07-20 17:18:14 +08:00
wangliwen 9f510817ff tabilityapplication/in_use_page 参数缺少注解 2022-07-20 17:17:58 +08:00
huangweixiong e729b95d2d Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform 
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (29 commits)
  屮
  ...
  ???
  。。。
  西海岸获取hls流地址更正
  增加 根据能力资源id获取该能力申请使用分页接口
  申购车模糊查询
  .
  新增日志清除任务
  能力申请全为免批资源时，流程节点默认审核通过
  1、 修改flyway 4.0语句
  1、同步摄像头标签信息时数据库配置增加默认值
  deal with
  。。。
  屮
  dev环境配置文件调整
  1、增加同步视频摄像头标签--配置文件
  1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
  deptToDoTaskPage接口优化
  ...
  ...
 2022-07-20 17:00:21 +08:00
huangweixiong c925cfdad3 线上上产环境配置文件同步 2022-07-20 16:57:52 +08:00
huangweixiong 9c720dff85 网关新接口 2022-07-20 16:56:54 +08:00
wangliwen 7fd83391fb Merge branch 'master' into docker_package 2022-07-20 16:34:28 +08:00
wangliwen 84d9562041 屮 2022-07-20 16:34:09 +08:00
wangliwen 16b12761b7 Merge branch 'master' into docker_package 2022-07-20 15:46:54 +08:00
wangliwen c3658aceb0 ... 2022-07-20 15:46:28 +08:00
wangliwen fe109a8890 Merge branch 'master' into docker_package 2022-07-20 15:44:52 +08:00
wangliwen 46a30be29a ??? 2022-07-20 15:44:24 +08:00
wangliwen 6d733c3c48 Merge branch 'master' into docker_package 2022-07-20 14:51:13 +08:00
wangliwen dc51b673a1 Merge remote-tracking branch 'origin/dev' into dev 2022-07-20 14:50:52 +08:00
wangliwen c44bb2df88 。。。 2022-07-20 14:50:35 +08:00
dinggang 6aaa0d13ad 西海岸获取hls流地址更正 2022-07-20 11:23:43 +08:00
wangliwen 88f72d0fc7 Merge branch 'master' into docker_package 2022-07-20 09:21:53 +08:00
wangliwen d0d2afeaf3 增加 根据能力资源id获取该能力申请使用分页接口 2022-07-20 09:21:28 +08:00
wangliwen a4c697474d Merge branch 'master' into docker_package 2022-07-19 20:05:30 +08:00
wangliwen 76068f2ab5 申购车模糊查询 2022-07-19 20:04:51 +08:00
wangliwen 70c7d9c039 Merge branch 'master' into docker_package 2022-07-19 19:17:26 +08:00
dinggang b306ce533d . 2022-07-19 19:16:19 +08:00
dinggang 5536f25c8f 新增日志清除任务 2022-07-19 19:14:23 +08:00
wangliwen 7d862de2cb Merge branch 'master' into docker_package 2022-07-19 18:06:15 +08:00
wangliwen 20007761eb 能力申请全为免批资源时，流程节点默认审核通过 2022-07-19 18:05:31 +08:00
yitonglei 6da7fa0665 1、同步摄像头标签信息时数据库配置增加默认值 2022-07-19 16:59:48 +08:00
wangliwen dbd4164e4c Merge branch 'master' into docker_package 2022-07-19 16:52:57 +08:00
wangliwen 6954af5ba4 deal with 2022-07-19 16:52:40 +08:00
wangliwen 58ba499f79 。。。 2022-07-19 16:47:13 +08:00
wangliwen 62231a0d92 Merge branch 'master' into docker_package 2022-07-19 16:24:52 +08:00
wangliwen 0cd5c87689 屮 2022-07-19 16:24:16 +08:00
wangliwen c3c4a8025b dev环境配置文件调整 2022-07-19 16:03:43 +08:00
wangliwen ef86c15598 Merge branch 'master' into docker_package 2022-07-19 15:53:29 +08:00
yitonglei e98a470d7e 1、增加同步视频摄像头标签--配置文件 2022-07-19 15:51:15 +08:00
wangliwen dc62d53ca5 Merge branch 'master' into docker_package 2022-07-19 15:42:32 +08:00
yitonglei 561c481949 1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息 2022-07-19 15:30:44 +08:00
wangliwen c9137ee369 Merge branch 'master' into docker_package 2022-07-19 15:07:29 +08:00
wangliwen df7e2a3824 deptToDoTaskPage接口优化 2022-07-19 15:06:38 +08:00
wangliwen cbc0018a36 Merge branch 'master' into docker_package 2022-07-19 13:59:24 +08:00
dinggang b843f76d0f ... 2022-07-19 13:57:37 +08:00
wangliwen bbedac70f0 Merge branch 'dev' into docker_package 2022-07-19 13:42:10 +08:00
wangliwen 2ff63afa00 ... 2022-07-19 13:41:52 +08:00
wangliwen 1749b66ed9 Merge branch 'master' into docker_package 2022-07-19 13:38:10 +08:00
yitonglei 75a51451fb 1、去掉所有t_camera_channel01和t_camera_organization02的后缀。并添加sql版本为t_camera_channel和t_camera_organization增加字段 2022-07-19 12:03:05 +08:00
wangliwen 75e84b35d9 Merge branch 'master' into docker_package 2022-07-19 11:46:08 +08:00