 huangweixiong
|
8e69ca0526
|
网关总数同步
|
2022-08-03 18:04:47 +08:00 |
wangliwen
|
357ad936f2
|
Merge branch 'master' into docker_package
|
2022-08-03 17:49:20 +08:00 |
|
wangliwen
|
c27816d13a
|
资源上架异常
|
2022-08-03 17:49:04 +08:00 |
|
wangliwen
|
0c2409488a
|
Merge branch 'master' into docker_package
|
2022-08-03 16:50:13 +08:00 |
|
wangliwen
|
6159b3b1ba
|
。。。
|
2022-08-03 16:49:52 +08:00 |
|
wangliwen
|
a09db3a28e
|
Merge branch 'master' into docker_package
|
2022-08-03 16:39:49 +08:00 |
|
wangliwen
|
654ef21298
|
pageWithAttrs补充返回approveStatus字段值
|
2022-08-03 16:39:33 +08:00 |
|
wangliwen
|
7d634eefdf
|
Merge branch 'master' into docker_package
|
2022-08-03 16:28:34 +08:00 |
|
wangliwen
|
d59ebd507b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 16:28:18 +08:00 |
|
wangliwen
|
8b40e077d1
|
。。。
|
2022-08-03 16:27:54 +08:00 |
 dinggang
|
d945bad3a5
|
配置文件新增默认审批人id
|
2022-08-03 16:26:04 +08:00 |
|
wangliwen
|
6425515e28
|
Merge branch 'master' into docker_package
|
2022-08-03 15:51:25 +08:00 |
|
dinggang
|
d0c8b4ae5f
|
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
|
2022-08-03 15:22:03 +08:00 |
|
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 |
|
yitonglei
|
b3e4b77447
|
1、修改个人中心-我的浏览接口
|
2022-07-19 11:19:05 +08:00 |
|
wangliwen
|
b38653e2c5
|
Merge branch 'dev' into docker_package
|
2022-07-19 11:06:31 +08:00 |
|
dinggang
|
b23afc8029
|
1.编目更新
2.后台管理-工作台-部门待办新增用户名称
|
2022-07-19 10:58:30 +08:00 |
|
dinggang
|
de822a40ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-19 10:37:00 +08:00 |
|
dinggang
|
4e6e9cdd42
|
谨记
|
2022-07-19 10:36:24 +08:00 |
|
wangliwen
|
32ce62afeb
|
Merge branch 'dev' into docker_package
|
2022-07-19 10:35:07 +08:00 |
|
wangliwen
|
18dad09f8f
|
调整sql
|
2022-07-19 10:34:58 +08:00 |
|
wangliwen
|
93766456dc
|
Merge branch 'dev' into docker_package
|
2022-07-19 09:56:40 +08:00 |
|
wangliwen
|
fdf7922d9b
|
。。
|
2022-07-19 09:56:32 +08:00 |
|
wangliwen
|
ee2e372c1f
|
Merge branch 'dev' into docker_package
|
2022-07-19 09:53:52 +08:00 |
|
wangliwen
|
916aef738c
|
分页不传ended时的处理
|
2022-07-19 09:53:44 +08:00 |
|
wangliwen
|
359df7a17b
|
Merge branch 'master' into docker_package
|
2022-07-19 09:26:55 +08:00 |
|
wangliwen
|
56e20ef9ae
|
...
|
2022-07-19 09:26:39 +08:00 |
|
wangliwen
|
409b0b3b9b
|
Merge branch 'master' into docker_package
|
2022-07-19 09:04:47 +08:00 |
|
huangweixiong
|
9b94a3b913
|
我的配置修改
|
2022-07-18 20:51:11 +08:00 |
|
huangweixiong
|
f6fb190ade
|
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 2.bugfix
。。。
批量申请异步处理
。。。
资源所属部门为空时的处理
...
fix bug
批量进行所有应用资源
排除特殊项目配置
|
2022-07-18 20:49:30 +08:00 |
|
huangweixiong
|
7dce8c0326
|
按部门申请网关
|
2022-07-18 20:48:59 +08:00 |
|
wangliwen
|
480fdec445
|
Merge branch 'master' into docker_package
|
2022-07-18 18:53:10 +08:00 |
|
wangliwen
|
3bd433fc1c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:52:50 +08:00 |
|
wangliwen
|
46576aa4fa
|
Merge branch 'dev' into docker_package
|
2022-07-18 18:52:12 +08:00 |
|
wangliwen
|
236162b861
|
。。。屮
|
2022-07-18 18:51:59 +08:00 |
|
dinggang
|
c8afb955a1
|
门户首页-热门能力筛选去除赋能案例
|
2022-07-18 18:39:47 +08:00 |
|
wangliwen
|
beb8fc93d9
|
Merge branch 'master' into docker_package
|
2022-07-18 18:29:21 +08:00 |
|
wangliwen
|
56fa006d82
|
审核状态不正确的处理
|
2022-07-18 18:28:25 +08:00 |
|
wangliwen
|
ac3622a039
|
Merge branch 'master' into docker_package
|
2022-07-18 18:16:56 +08:00 |
|
wangliwen
|
a503a961e0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:16:26 +08:00 |
|
wangliwen
|
fd02f8ea2d
|
Merge branch 'master' into docker_package
|
2022-07-18 18:15:05 +08:00 |
|
wangliwen
|
fe35973785
|
拆单内流程是否完成
|
2022-07-18 18:11:03 +08:00 |
|
dinggang
|
2b7cf13bfb
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 17:57:55 +08:00 |
|
dinggang
|
f165418650
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 17:54:49 +08:00 |
|
wangliwen
|
ca1a10c8ae
|
屮
|
2022-07-18 17:54:39 +08:00 |
|
dinggang
|
474976439b
|
1.编目和字典表初始化数据sql
2.bugfix
|
2022-07-18 17:54:19 +08:00 |
|
wangliwen
|
b911e4068e
|
。。。
|
2022-07-18 17:47:28 +08:00 |
|
wangliwen
|
a3e320ea4c
|
Merge branch 'master' into docker_package
|
2022-07-18 17:22:49 +08:00 |
|
wangliwen
|
115bb063b8
|
批量申请异步处理
|
2022-07-18 17:20:38 +08:00 |
|
wangliwen
|
76f2f4a323
|
。。。
|
2022-07-18 17:11:09 +08:00 |
|
wangliwen
|
24d104e904
|
资源所属部门为空时的处理
|
2022-07-18 17:06:56 +08:00 |
|
wangliwen
|
edf383ab8c
|
...
|
2022-07-18 16:55:37 +08:00 |
|
wangliwen
|
869e3c9d4c
|
Merge branch 'master' into docker_package
|
2022-07-18 16:37:08 +08:00 |
|
wangliwen
|
e62756b431
|
fix bug
|
2022-07-18 16:36:28 +08:00 |
|
wangliwen
|
6a2a13aa20
|
Merge branch 'master' into docker_package
|
2022-07-18 16:12:30 +08:00 |
|
wangliwen
|
da6901392c
|
批量进行所有应用资源
|
2022-07-18 16:11:21 +08:00 |
|
wangliwen
|
7cbbc369bb
|
排除特殊项目配置
|
2022-07-18 15:07:10 +08:00 |
|
wangliwen
|
c2b0982710
|
Merge branch 'master' into docker_package
|
2022-07-18 14:29:52 +08:00 |
|
wangliwen
|
7cfe1ce192
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 14:17:10 +08:00 |
|
wangliwen
|
adc72fb15d
|
sql文件名调整
|
2022-07-18 14:16:54 +08:00 |
|
dinggang
|
6420e23271
|
...
|
2022-07-18 13:55:19 +08:00 |
|
wangliwen
|
175d51aebe
|
Merge branch 'master' into docker_package
|
2022-07-18 13:41:46 +08:00 |
|
dinggang
|
071233b34e
|
bugfix
|
2022-07-18 12:48:40 +08:00 |
|
dinggang
|
99ee0fa9a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 12:04:52 +08:00 |
|
wangliwen
|
847a55b79f
|
Merge branch 'master' into docker_package
|
2022-07-18 12:01:11 +08:00 |
|
wangliwen
|
c4bacec4bd
|
是否申请 bug fix
|
2022-07-18 11:57:01 +08:00 |
|
wangliwen
|
1338bd64ff
|
模型全量调整
|
2022-07-18 11:02:31 +08:00 |
|
wangliwen
|
641fcacc17
|
。。。
|
2022-07-18 10:30:46 +08:00 |
|
wangliwen
|
f5e0bac27d
|
申购车不再只限制出组件服务
|
2022-07-18 10:04:32 +08:00 |
|
wangliwen
|
8a782ee314
|
Merge branch 'master' into docker_package
|
2022-07-18 09:47:44 +08:00 |
|
yitonglei
|
2cf7198a09
|
1、配置修改
|
2022-07-18 09:41:32 +08:00 |
|
yitonglei
|
0c8e905501
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:33:21 +08:00 |
|
wangliwen
|
8cb469de89
|
。。。
|
2022-07-18 09:26:29 +08:00 |
|
dinggang
|
9c3623757b
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:20:53 +08:00 |
|
dinggang
|
b1be59a581
|
bugfix
|
2022-07-18 09:20:25 +08:00 |
|
yitonglei
|
89161843d0
|
1、修改能力超市/基础设施的地图下面的列表查询语句，优化查询速度
|
2022-07-15 19:07:37 +08:00 |
|
wangliwen
|
e335b27933
|
Merge branch 'dev' into docker_package
|
2022-07-15 17:19:42 +08:00 |
|
wangliwen
|
6b63979594
|
统一okhttp客户端
|
2022-07-15 16:54:33 +08:00 |
|
wangliwen
|
0d5257c994
|
Merge branch 'dev' into docker_package
|
2022-07-15 16:44:27 +08:00 |
|
wangliwen
|
c3d971e56d
|
。。。
|
2022-07-15 16:44:14 +08:00 |
|
wangliwen
|
46b445eba9
|
西海岸视频预览加日志输出
|
2022-07-15 16:35:37 +08:00 |
|
wangliwen
|
cf0ee02aeb
|
Merge branch 'master' into docker_package
|
2022-07-15 16:29:51 +08:00 |
|
wangliwen
|
33d2595974
|
设置流水号传参的调整
|
2022-07-15 16:24:19 +08:00 |
|
wangliwen
|
9cc5b5eda1
|
Merge branch 'master' into docker_package
|
2022-07-15 15:25:43 +08:00 |
|
wangliwen
|
b8b4623a8f
|
能力申请特殊处理
|
2022-07-15 15:25:12 +08:00 |
|
wangliwen
|
ad93b162ec
|
Merge branch 'master' into docker_package
|
2022-07-15 12:00:46 +08:00 |
|
wangliwen
|
4c696eb196
|
...
|
2022-07-15 12:00:29 +08:00 |
|
wangliwen
|
fe612f5901
|
Merge branch 'dev' into docker_package
|
2022-07-15 11:48:04 +08:00 |
|
wangliwen
|
87988942fa
|
npe
|
2022-07-15 11:47:40 +08:00 |
|
wangliwen
|
6af7f2edc1
|
Merge branch 'master' into docker_package
|
2022-07-15 11:27:54 +08:00 |
|
wangliwen
|
d7a45b2d17
|
...
|
2022-07-15 11:27:35 +08:00 |
|
wangliwen
|
5707d6948f
|
Merge branch 'master' into docker_package
|
2022-07-15 10:23:10 +08:00 |
|
wangliwen
|
6ba099605d
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-15 10:12:52 +08:00 |
|
wangliwen
|
5ef9763cae
|
能力使用申请可用流程是否结束来进行过滤
|
2022-07-15 10:01:10 +08:00 |
|
yitonglei
|
f24b7070fc
|
1、新增的能力超市/基础设施的地图下面的列表查询语句进行修改
|
2022-07-15 09:53:54 +08:00 |
|
wangliwen
|
15998bcc48
|
Merge branch 'master' into docker_package
|
2022-07-15 09:17:08 +08:00 |
|
wangliwen
|
40477d75c4
|
流程流水号生成调整
|
2022-07-15 09:16:49 +08:00 |
|
wangliwen
|
35d8b7715a
|
Merge branch 'master' into docker_package
|
2022-07-14 18:32:31 +08:00 |
|
wangliwen
|
5e07068442
|
TODO 写流水号使加锁
|
2022-07-14 18:31:33 +08:00 |
|
wangliwen
|
22ba83eefe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 16:17:43 +08:00 |
|
wangliwen
|
81e41c2449
|
Merge branch 'dev' into docker_package
|
2022-07-14 16:17:24 +08:00 |
|
wangliwen
|
8cedffa8e7
|
Merge remote-tracking branch 'origin/dev' into docker_package
|
2022-07-14 16:17:18 +08:00 |
|
wangliwen
|
56316a2ce2
|
。。。补充部门名
|
2022-07-14 16:17:05 +08:00 |
|
lizhicheng
|
647adaf461
|
初步完成赋能场景、开发文档，融合服务修复
|
2022-07-14 15:37:19 +08:00 |
|
wangliwen
|
0b87db85d6
|
Merge branch 'master' into docker_package
|
2022-07-14 15:29:45 +08:00 |
|
dinggang
|
bc44f875b2
|
...
|
2022-07-14 15:19:34 +08:00 |
|
wangliwen
|
0cdc4b50a1
|
Merge branch 'master' into docker_package
|
2022-07-14 14:45:05 +08:00 |
|
dinggang
|
5ff1ab946f
|
...
|
2022-07-14 14:44:18 +08:00 |
|
wangliwen
|
29d8975c87
|
Merge branch 'master' into docker_package
|
2022-07-14 14:13:56 +08:00 |
|
dinggang
|
c1e165135b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 14:12:51 +08:00 |
|
dinggang
|
ffd3d24b6a
|
...
|
2022-07-14 14:12:17 +08:00 |
|
wangliwen
|
23b16f1c3e
|
Merge branch 'master' into docker_package
|
2022-07-14 13:37:31 +08:00 |
|
wangliwen
|
37e3ca34a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 13:37:12 +08:00 |
|
wangliwen
|
712fdf8265
|
。。
|
2022-07-14 13:37:01 +08:00 |
|
yitonglei
|
455f5b71d9
|
改
|
2022-07-14 12:54:22 +08:00 |
|
yitonglei
|
3b0e930aa9
|
1、摄像头根据区域聚合查询的sql修改
|
2022-07-14 12:43:59 +08:00 |
|
wangliwen
|
85750e766d
|
Merge branch 'master' into docker_package
|
2022-07-14 11:52:31 +08:00 |
|
dinggang
|
e3f451b375
|
...
|
2022-07-14 11:51:31 +08:00 |
|
dinggang
|
2bdc46db62
|
...
|
2022-07-14 11:50:45 +08:00 |
|
wangliwen
|
4e370a94ee
|
Merge branch 'master' into docker_package
|
2022-07-14 11:47:43 +08:00 |
|
wangliwen
|
dfaeb397da
|
需求评论tip
|
2022-07-14 11:47:29 +08:00 |
|
wangliwen
|
49ce333723
|
Merge branch 'master' into docker_package
|
2022-07-14 11:39:19 +08:00 |
|
dinggang
|
311cadef3e
|
...
|
2022-07-14 11:38:30 +08:00 |
|
wangliwen
|
53798a2e7f
|
Merge branch 'master' into docker_package
|
2022-07-14 11:09:19 +08:00 |
|
wangliwen
|
74edb1ef0c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 11:08:56 +08:00 |
|
wangliwen
|
136e4453ce
|
流程记录返回申请单号
|
2022-07-14 11:08:31 +08:00 |
|
dinggang
|
1a4d495af5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 11:02:30 +08:00 |
|
dinggang
|
861483a477
|
...
|
2022-07-14 11:01:49 +08:00 |
|
wangliwen
|
e6f2e3e5b2
|
Merge branch 'master' into docker_package
|
2022-07-14 10:43:29 +08:00 |
|
wangliwen
|
a001fd5963
|
状态
|
2022-07-14 10:41:47 +08:00 |
|
wangliwen
|
2149d0b5e5
|
Merge branch 'master' into docker_package
|
2022-07-14 09:56:15 +08:00 |
|
wangliwen
|
92eb9d542e
|
日志
|
2022-07-14 09:55:46 +08:00 |
|
wangliwen
|
a9c39f4f02
|
Merge branch 'master' into docker_package
|
2022-07-14 09:53:42 +08:00 |
|
wangliwen
|
5cefbe1a0f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 09:53:15 +08:00 |
|
dinggang
|
cfe6c9f240
|
...
|
2022-07-14 09:52:36 +08:00 |
|
wangliwen
|
35c938ef3b
|
。。。
|
2022-07-14 09:52:19 +08:00 |
|
wangliwen
|
4fde0bc273
|
Merge branch 'master' into docker_package
|
2022-07-14 09:37:45 +08:00 |
|
wangliwen
|
589f03a103
|
使用单例枚举保证流水号工具类为全局单例
|
2022-07-14 09:35:59 +08:00 |
|
wangliwen
|
75060f9947
|
Merge branch 'master' into docker_package
|
2022-07-14 09:12:38 +08:00 |
|
wangliwen
|
b27ebec5ba
|
...
|
2022-07-14 09:11:51 +08:00 |
|
wangliwen
|
3f5934bca6
|
Merge branch 'master' into docker_package
|
2022-07-13 18:48:19 +08:00 |
|
wangliwen
|
223c449417
|
流水号加锁
|
2022-07-13 18:29:22 +08:00 |
|
wangliwen
|
c9edff06dd
|
Merge branch 'master' into docker_package
|
2022-07-13 18:15:48 +08:00 |
|
wangliwen
|
0d61729d4a
|
TODO 流水号生成加锁
|
2022-07-13 18:15:20 +08:00 |
|
wangliwen
|
c0676abb1b
|
Merge branch 'master' into docker_package
|
2022-07-13 18:12:13 +08:00 |
|
dinggang
|
8afd024265
|
...
|
2022-07-13 18:11:51 +08:00 |
|
wangliwen
|
a0a238b894
|
...
|
2022-07-13 18:00:51 +08:00 |
|
wangliwen
|
c3531a5b8f
|
Merge branch 'master' into docker_package
|
2022-07-13 17:14:23 +08:00 |
|
wangliwen
|
91355094ee
|
...
|
2022-07-13 16:29:33 +08:00 |
|
wangliwen
|
c81eb20845
|
能力资源更新infolist
|
2022-07-13 16:16:58 +08:00 |
|
wangliwen
|
9296dd1ce5
|
申请单号
|
2022-07-13 16:00:32 +08:00 |
|
wangliwen
|
97d26d9e1a
|
能力申请增加申请时间
|
2022-07-13 15:44:30 +08:00 |
|
huangweixiong
|
508aef594f
|
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、新增摄像头聚合展示
普通资源的npe问题
。。。
配置文件的调整
...
|
2022-07-13 15:26:54 +08:00 |
|
huangweixiong
|
bf8d191f52
|
hwx配置文件更新
|
2022-07-13 15:26:38 +08:00 |
|
dinggang
|
e5dc75844c
|
...
|
2022-07-13 15:17:10 +08:00 |
|
yitonglei
|
1290072076
|
1、新增摄像头聚合展示
|
2022-07-13 15:10:02 +08:00 |
|
wangliwen
|
6e328843a8
|
普通资源的npe问题
|
2022-07-13 15:02:56 +08:00 |
|
wangliwen
|
2ac2149cf8
|
。。。
|
2022-07-13 12:54:39 +08:00 |
|
wangliwen
|
ad5e567250
|
配置文件的调整
|
2022-07-13 11:43:34 +08:00 |
|
wangliwen
|
956d062428
|
...
|
2022-07-13 11:38:24 +08:00 |
|
wangliwen
|
ce4b2e8310
|
Merge branch 'master' into docker_package
|
2022-07-13 11:08:50 +08:00 |
|
wangliwen
|
63d23588f5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-13 11:08:07 +08:00 |
|
wangliwen
|
218d42ad9b
|
。。。instanceId逆序失效的处理
|
2022-07-13 11:07:24 +08:00 |
|
huangweixiong
|
99822463e7
|
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:
文案调整
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:47:43 +08:00 |
|
huangweixiong
|
af6cc27fcd
|
【单账号多地登录】初版
|
2022-07-13 10:47:23 +08:00 |
|
wangliwen
|
61ab58b704
|
文案调整
|
2022-07-13 10:47:21 +08:00 |
|
wangliwen
|
bd13ed4b62
|
文案调整
|
2022-07-13 10:46:09 +08:00 |
|
wangliwen
|
60f4e1ae14
|
Merge branch 'master' into docker_package
|
2022-07-13 10:20:27 +08:00 |
|
wangliwen
|
31cdc17236
|
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:19:46 +08:00 |
|
wangliwen
|
24cb34d98e
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:56:46 +08:00 |
|
wangliwen
|
9426860495
|
npe
|
2022-07-12 14:56:31 +08:00 |
|
wangliwen
|
923bf8b1ca
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:38:30 +08:00 |
|
dinggang
|
5a603f5cf0
|
...
|
2022-07-12 14:08:53 +08:00 |
|
wangliwen
|
60d3505364
|
Merge branch 'master' into docker_package
|
2022-07-12 14:03:46 +08:00 |
|
wangliwen
|
5a2e6727f7
|
...
|
2022-07-12 14:02:40 +08:00 |
|
wangliwen
|
e0a6369b5a
|
Merge branch 'master' into docker_package
|
2022-07-12 11:38:01 +08:00 |
|
wangliwen
|
454b0c5ed6
|
处理摄像头
|
2022-07-12 11:36:56 +08:00 |
|
wangliwen
|
4e063c2408
|
Merge branch 'master' into docker_package
|
2022-07-12 10:43:26 +08:00 |
|
wangliwen
|
44abdc3c2f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
|
2022-07-12 10:42:47 +08:00 |
|
wangliwen
|
45be93e850
|
根据申请标识获取本次申请详情(信息、流程、部门)
|
2022-07-12 10:40:30 +08:00 |
|
dinggang
|
4dda8aaf1b
|
1.dev配置mysql空闲回收时间为1分钟
2.操作日志新增操作数据表字段，日志注解增加操作数据表属性，修改涉及到数据修改接口的日志注解
3.ucs编码生成工具类
4.涉及到流程的增加申请单号字段
|
2022-07-12 10:24:51 +08:00 |
|
wangliwen
|
64e82a94fa
|
Merge branch 'master' into docker_package
|
2022-07-11 18:12:54 +08:00 |
|
wangliwen
|
15cc666261
|
根据申请标识获取本次申请的分部门申请信息
|
2022-07-11 17:52:43 +08:00 |
|
wangliwen
|
c27d2c9c78
|
流程流转异常
|
2022-07-11 15:43:40 +08:00 |
|
wangliwen
|
6ac753b68b
|
Merge branch 'master' into docker_package
|
2022-07-11 15:33:57 +08:00 |
|
wangliwen
|
588b41669d
|
resource 更新失败
|
2022-07-11 15:33:23 +08:00 |
|
wangliwen
|
447760f509
|
Merge branch 'master' into docker_package
|
2022-07-11 14:33:40 +08:00 |
|
wangliwen
|
7a15f3ad92
|
同一次批量申请做好标识
|
2022-07-11 14:32:25 +08:00 |
|
wangliwen
|
bbffe9a6e5
|
Merge branch 'master' into docker_package
|
2022-07-11 13:49:22 +08:00 |
|
wangliwen
|
e43e86b30b
|
能力下线对各类统计的影响
|
2022-07-11 13:48:49 +08:00 |
|
wangliwen
|
92ab97f795
|
Merge branch 'master' into docker_package
|
2022-07-11 11:27:45 +08:00 |
|
wangliwen
|
9abc6bf96e
|
npe
|
2022-07-11 11:27:04 +08:00 |
|
wangliwen
|
b8de1070fc
|
...
|
2022-07-11 11:08:21 +08:00 |
|
wangliwen
|
6b5a55881c
|
Merge branch 'master' into docker_package
|
2022-07-11 11:06:46 +08:00 |
|
wangliwen
|
99a945e33f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-11 11:03:43 +08:00 |
|
wangliwen
|
1b46f676f2
|
查询部门信息 by name
|
2022-07-11 11:02:39 +08:00 |
|
lizhicheng
|
c3737733f7
|
完成融合服务功能开发
|
2022-07-11 09:17:28 +08:00 |
|
wangliwen
|
da499d088d
|
Merge branch 'master' into docker_package
|
2022-07-08 17:44:44 +08:00 |
|
wangliwen
|
c7a4e1219c
|
站内信消息通知异常解决
|
2022-07-08 17:44:10 +08:00 |
|
wangliwen
|
0df88251da
|
...
|
2022-07-08 17:32:17 +08:00 |
|
wangliwen
|
30e60deda8
|
Merge branch 'dev' into docker_package
|
2022-07-08 17:21:14 +08:00 |
|
wangliwen
|
510afd01cc
|
。。。
|
2022-07-08 17:20:46 +08:00 |
|
wangliwen
|
1df08939cb
|
Merge branch 'master' into docker_package
|
2022-07-08 11:30:32 +08:00 |
|
wangliwen
|
2ab4b169f5
|
。。。
|
2022-07-08 11:29:39 +08:00 |
|
wangliwen
|
fb1ff312ec
|
Merge branch 'master' into docker_package
|
2022-07-08 11:27:37 +08:00 |
|
wangliwen
|
76584319d4
|
根据流程定义key获取对应已办任务
|
2022-07-08 11:22:29 +08:00 |
|
wangliwen
|
fe69f08765
|
Merge branch 'dev' into docker_package
|
2022-07-08 11:00:42 +08:00 |
|
wangliwen
|
a34e254e79
|
二级缓存策略调整
|
2022-07-08 11:00:17 +08:00 |
|
wangliwen
|
9fbe1a69e9
|
Merge branch 'master' into docker_package
|
2022-07-08 10:31:39 +08:00 |
|
wangliwen
|
44dd889936
|
timeout too small.
|
2022-07-08 10:31:08 +08:00 |
|
wangliwen
|
5a88770943
|
Merge branch 'master' into docker_package
|
2022-07-08 10:13:04 +08:00 |
|
wangliwen
|
73dd3535bd
|
Merge branch 'master' into dev
|
2022-07-08 10:11:43 +08:00 |
|
wangliwen
|
90b62a9f8f
|
调整知识库http客户端线程池
|
2022-07-08 10:11:16 +08:00 |
|
wangliwen
|
486c9b8d02
|
Merge branch 'master' into docker_package
|
2022-07-08 09:38:33 +08:00 |
|
wangliwen
|
e1329442cb
|
调整pageWithAttrs 接口代码结构
|
2022-07-08 09:37:28 +08:00 |
|
wangliwen
|
0f980cf238
|
解决能力集市 筛选各类排序失效（内部二级缓存）
|
2022-07-08 09:18:03 +08:00 |
|
wangliwen
|
9be7dd5f28
|
Merge branch 'master' into docker_package
|
2022-07-07 19:56:28 +08:00 |
|
wangliwen
|
ec6597ba35
|
按总体评分 逆序与顺序
|
2022-07-07 19:55:54 +08:00 |
|
wangliwen
|
408920d950
|
Merge branch 'master' into docker_package
|
2022-07-07 19:50:55 +08:00 |
|
wangliwen
|
861e5413e5
|
排序失败
|
2022-07-07 19:49:56 +08:00 |
|
wangliwen
|
27e7aa8654
|
Merge branch 'master' into docker_package
|
2022-07-07 19:26:26 +08:00 |
|
wangliwen
|
d9511cb1c6
|
...
|
2022-07-07 19:25:19 +08:00 |
|
wangliwen
|
77722d8226
|
Merge branch 'master' into docker_package
|
2022-07-07 18:57:53 +08:00 |
|
wangliwen
|
213f25085e
|
查询所有部门
|
2022-07-07 18:57:09 +08:00 |
|
wangliwen
|
88707274d3
|
Merge branch 'master' into docker_package
|
2022-07-07 18:32:30 +08:00 |
|
wangliwen
|
4cc31af90e
|
...
|
2022-07-07 18:32:05 +08:00 |
|
wangliwen
|
b349a87010
|
Merge branch 'master' into docker_package
|
2022-07-07 18:17:15 +08:00 |
|
wangliwen
|
7dec63c6c8
|
能力申请方 能力集数目异常
|
2022-07-07 18:16:14 +08:00 |
|
wangliwen
|
75b10cd9d1
|
Merge branch 'dev' into docker_package
|
2022-07-07 17:40:03 +08:00 |
|
wangliwen
|
d84737dbd6
|
线程池调整
|
2022-07-07 17:38:58 +08:00 |
|
wangliwen
|
3189d96992
|
Merge branch 'master' into docker_package
|
2022-07-07 16:51:31 +08:00 |
|
wangliwen
|
cd87eb6072
|
sql调整
|
2022-07-07 16:50:01 +08:00 |
|
wangliwen
|
e6a6d64d38
|
Merge branch 'dev' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
|
2022-07-07 16:05:13 +08:00 |
|
wangliwen
|
0ee54db89e
|
评论自动通过时状态异常
|
2022-07-07 16:04:08 +08:00 |
|
yitonglei
|
6b5c67f60e
|
1、修改 能力统计列表和详情-所有详情展示的sql语句，统计以当前部门为准，不包含其下级部门
|
2022-07-07 15:59:58 +08:00 |
|
wangliwen
|
4842aa936f
|
自动通过的评论状态不对？
|
2022-07-07 15:39:09 +08:00 |
|
wangliwen
|
0a0f3543c7
|
Merge branch 'dev' into docker_package
|
2022-07-07 15:18:38 +08:00 |
|
wangliwen
|
7c5362464e
|
。。。
|
2022-07-07 15:18:18 +08:00 |
|
wangliwen
|
80356dff2d
|
Merge branch 'dev' into docker_package
|
2022-07-07 14:58:54 +08:00 |
|
wangliwen
|
cdebffd2b5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-07 14:58:27 +08:00 |
|
wangliwen
|
ca667cb116
|
捕获站内信通知异常
|
2022-07-07 14:58:09 +08:00 |
|
yitonglei
|
3d49aae51d
|
1、修改 能力统计列表和详情-组件服务-应用领域分布情况的sql语句
|
2022-07-07 14:23:10 +08:00 |
|
wangliwen
|
fa34ec0c2b
|
Merge branch 'dev' into docker_package
|
2022-07-07 14:18:04 +08:00 |
|
wangliwen
|
2041c6b558
|
...调整
|
2022-07-07 14:17:49 +08:00 |
|
wangliwen
|
c69f7ea262
|
Merge branch 'dev' into docker_package
|
2022-07-07 13:57:14 +08:00 |
|
wangliwen
|
9226d20e7a
|
。。。
|
2022-07-07 13:57:02 +08:00 |
|
wangliwen
|
a29c377456
|
Merge branch 'master' into docker_package
|
2022-07-07 12:37:30 +08:00 |
|
wangliwen
|
e494a94c57
|
异步更新访问量
|
2022-07-07 12:00:42 +08:00 |
|
wangliwen
|
8844a9fdf2
|
Merge branch 'dev' into docker_package
|
2022-07-07 11:53:56 +08:00 |
|
wangliwen
|
fc715c9cd4
|
屮
|
2022-07-07 11:53:46 +08:00 |
|
wangliwen
|
816bf600ad
|
Merge branch 'dev' into docker_package
|
2022-07-07 11:38:51 +08:00 |
|
wangliwen
|
8371b085f4
|
。。。
|
2022-07-07 11:38:35 +08:00 |
|
wangliwen
|
d568739dfa
|
Merge branch 'dev' into docker_package
|
2022-07-07 10:29:51 +08:00 |
|
wangliwen
|
ac7f9f5b68
|
所有流程审核人为发起人时，默认审核通过
|
2022-07-07 10:29:28 +08:00 |
|
wangliwen
|
2dc4a978ed
|
Merge branch 'dev' into docker_package
|
2022-07-07 10:07:56 +08:00 |
|
wangliwen
|
08e3b2d09a
|
字体缺失，镜像内处理
|
2022-07-07 10:07:49 +08:00 |
|
wangliwen
|
03129a13c2
|
需求审核人为发起人时，默认通过
|
2022-07-07 10:04:06 +08:00 |
|
wangliwen
|
446a0928bc
|
容器内字体缺失
|
2022-07-07 09:54:02 +08:00 |
|
wangliwen
|
ceb5c5fdea
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:58:36 +08:00 |
|
wangliwen
|
ec7da281e6
|
...
|
2022-07-06 17:58:24 +08:00 |
|
wangliwen
|
eaaac41e48
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:47:04 +08:00 |
|
wangliwen
|
fb28534f56
|
工作台异常
|
2022-07-06 17:46:51 +08:00 |
|
wangliwen
|
f553d9de0b
|
Merge branch 'dev' into docker_package
|
2022-07-06 17:25:38 +08:00 |
|
wangliwen
|
fbb5fa3bc3
|
npe
|
2022-07-06 17:25:16 +08:00 |
|
wangliwen
|
17c54835f4
|
Merge branch 'dev' into docker_package
|
2022-07-06 16:30:18 +08:00 |
|
wangliwen
|
089ff2bb3a
|
npe
|
2022-07-06 16:30:07 +08:00 |
|
wangliwen
|
49d7d2d1f0
|
Merge branch 'master' into docker_package
|
2022-07-06 15:59:27 +08:00 |
|
wangliwen
|
c4bd9a2baa
|
部门待办防止重复
|
2022-07-06 15:56:12 +08:00 |
|
wangliwen
|
898e1c5ae5
|
浏览记录的处理
|
2022-07-06 15:45:12 +08:00 |
|
wangliwen
|
419ad451bd
|
浏览记录添加
|
2022-07-06 15:12:28 +08:00 |
|
wangliwen
|
e606ec0499
|
Merge branch 'master' into docker_package
|
2022-07-06 11:51:26 +08:00 |
|
wangliwen
|
0610457207
|
...
|
2022-07-06 11:03:27 +08:00 |
|
wangliwen
|
8da1f87d46
|
category/getCategoryTree 加上二级缓存
|
2022-07-06 10:30:22 +08:00 |
|
wangliwen
|
11829cfc75
|
dev配置调大连接池线程池数目
|
2022-07-06 10:22:55 +08:00 |
|
wangliwen
|
7141447306
|
。。。
|
2022-07-06 09:14:52 +08:00 |
|
wangliwen
|
11f2d4d835
|
容器内调试
|
2022-07-05 19:33:23 +08:00 |
|
wangliwen
|
45fb520d1a
|
...
|
2022-07-05 19:22:34 +08:00 |
|
wangliwen
|
8a2fa967e2
|
Merge branch 'master' into docker_package
|
2022-07-05 18:23:23 +08:00 |
|
wangliwen
|
6eb4596a66
|
...
|
2022-07-05 18:22:20 +08:00 |
|
wangliwen
|
a5418338a2
|
Merge branch 'master' into docker_package
|
2022-07-05 17:33:28 +08:00 |
|
huangweixiong
|
079c3b4eb4
|
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:
...
...
|
2022-07-05 17:19:44 +08:00 |
|
huangweixiong
|
9831f7725e
|
兼容能力主次表数据不一致
|
2022-07-05 17:19:00 +08:00 |
|
wangliwen
|
96cebb55ba
|
Merge remote-tracking branch 'origin/dev'
|
2022-07-05 16:54:10 +08:00 |
|
wangliwen
|
e57bc3feac
|
...
|
2022-07-05 16:53:32 +08:00 |
|
huangweixiong
|
45787c0fa3
|
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: (22 commits)
1、修改/resource/selectTotal方法，在548行增加代码删除“基础设施”的数据
申购车脏数据处理（资源不存在时）
重复收藏时更新收藏时间
npe
需求 不展示问题
CompletableFuture 使用自定义线程池
使用自定义线程池
能力申请V2模型导入
姜永超增加应用上架关联组件；增加服务融合冗余接口，以后用的话可以用
常用校验token加上二级缓存
申购车摄像头sql
...
...
姜永超增加能力上架 组件类型关联应用
数据库死锁解决
1、修改能力统计列表和详情-知识库-知识库发布时间统计的sql
评论审核通过，通知评论人
更新日志文件
1、修改能力统计列表和详情-基础设施-发布情况列表的查询
。。。
...
# Conflicts:
# renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
|
2022-07-05 16:50:36 +08:00 |
|
huangweixiong
|
0bd1259e6d
|
云图统计优化
|
2022-07-05 16:48:03 +08:00 |
|
wangliwen
|
b65abbdd04
|
...
|
2022-07-05 16:32:02 +08:00 |
|
wangliwen
|
4a6879b91a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-05 16:10:09 +08:00 |
|
yitonglei
|
f1cb8158ea
|
1、修改/resource/selectTotal方法，在548行增加代码删除“基础设施”的数据
|
2022-07-05 16:08:08 +08:00 |
|
wangliwen
|
eb287b4f3d
|
Merge branch 'master' into docker_package
|
2022-07-05 15:57:47 +08:00 |
|
wangliwen
|
6276b29333
|
申购车脏数据处理（资源不存在时）
|
2022-07-05 15:26:13 +08:00 |
|
wangliwen
|
6b6ebf6fc1
|
重复收藏时更新收藏时间
|
2022-07-05 14:55:06 +08:00 |
|
wangliwen
|
d4d51f997a
|
npe
|
2022-07-05 14:42:34 +08:00 |
|
wangliwen
|
92c4658f76
|
需求 不展示问题
|
2022-07-05 14:32:20 +08:00 |
|
wangliwen
|
3d08431a33
|
Merge branch 'master' into docker_package
|
2022-07-05 14:21:03 +08:00 |
|
wangliwen
|
04365958fc
|
CompletableFuture 使用自定义线程池
|
2022-07-05 14:13:16 +08:00 |
|
wangliwen
|
a2e5a0d4ff
|
使用自定义线程池
|
2022-07-05 11:52:16 +08:00 |
|
wangliwen
|
c8ce2d4ce2
|
能力申请V2模型导入
|
2022-07-05 10:35:59 +08:00 |
|
wangliwen
|
5a820c653f
|
Merge branch 'dev'
|
2022-07-05 10:25:33 +08:00 |
|
dinggang
|
4b8765d2f7
|
姜永超增加应用上架关联组件；增加服务融合冗余接口，以后用的话可以用
|
2022-07-05 10:10:34 +08:00 |
|
wangliwen
|
c69efa101f
|
常用校验token加上二级缓存
|
2022-07-05 09:21:03 +08:00 |
|
wangliwen
|
0f25b9414e
|
申购车摄像头sql
|
2022-07-04 17:40:25 +08:00 |
|
wangliwen
|
02cad2750c
|
...
|
2022-07-04 16:38:41 +08:00 |
|
dinggang
|
55737c2d3d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-04 16:15:15 +08:00 |
|
wangliwen
|
54dfab4198
|
...
|
2022-07-04 16:14:46 +08:00 |
|
dinggang
|
330f9ea2ce
|
姜永超增加能力上架 组件类型关联应用
|
2022-07-04 16:14:33 +08:00 |
|
wangliwen
|
cc72976528
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-04 16:06:12 +08:00 |
|
wangliwen
|
c0b8856fe5
|
数据库死锁解决
|
2022-07-04 16:02:20 +08:00 |
|
yitonglei
|
901b6ad0a0
|
1、修改能力统计列表和详情-知识库-知识库发布时间统计的sql
|
2022-07-04 15:58:46 +08:00 |
|
wangliwen
|
5b4bddca10
|
评论审核通过，通知评论人
|
2022-07-04 15:48:54 +08:00 |
|
wangliwen
|
d6139676ff
|
Merge branch 'release' into dev
|
2022-07-04 15:37:35 +08:00 |
|
yitonglei
|
a087c7b955
|
1、修改能力统计列表和详情-基础设施-发布情况列表的查询
|
2022-07-04 15:32:26 +08:00 |
|
wangliwen
|
6ee0f4fbc8
|
。。。
|
2022-07-04 15:16:51 +08:00 |
|
wangliwen
|
1bd2ae80cf
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-04 14:49:31 +08:00 |
|
wangliwen
|
cd01826d3c
|
一些状态补充
|
2022-07-04 14:49:01 +08:00 |
|
lizhicheng
|
d839710432
|
新增功能：融合服务
|
2022-07-04 14:44:20 +08:00 |
|
huangweixiong
|
6d1dc16896
|
修复摄像头预览接口报错
|
2022-07-04 11:29:43 +08:00 |
|
huangweixiong
|
0b1f82f933
|
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: (47 commits)
bug修复
bug修复： 1.能力统计-基础设施来源修改 2.申购车查询逻辑修改 3.排序失效修复
1、修改能力统计列表和详情-组件服务-使用情况统计相关代码修改为统计调用数和使用数
补充 发表需求评论
1、修改能力统计列表和详情-TOP5使用组件
异步优化
1、修改能力统计列表和详情-组件服务-使用情况统计列表的查询字段名称
工作台bug修复
异步多线程优化
1、修改能力统计列表和详情-组件服务-使用情况统计-使用组件评分TOP5的sql
1.申购车查询结果新增字段 2.根据申请查询摄像头列表修改 3.修改新增收藏因为异步导致的数据库死锁
1、修改能力统计列表和详情-组件服务-使用情况统计-top5使用组件的sql
...
sql 调整
1、修改能力统计列表和详情-应用资源-发布端应用情况的sql
我发起的流程、已办任务 可按流程类型过滤
...
1、修改能力统计列表和详情-优化贡献组件分别被多少应用使用的sql
...
申请摄像头通知异常的解决
...
|
2022-07-04 11:09:42 +08:00 |
|
huangweixiong
|
d3342276c7
|
网关统计bug修复
|
2022-07-04 11:08:58 +08:00 |
|
dinggang
|
90dbc0d9f4
|
bug修复
|
2022-07-01 19:55:13 +08:00 |
|
wangliwen
|
01da3378a1
|
Merge branch 'master' into docker_package
|
2022-07-01 18:44:47 +08:00 |
|
wangliwen
|
9e2e7fdbdd
|
Merge branch 'master' into docker_package
|
2022-07-01 18:32:29 +08:00 |
|
dinggang
|
52edb4edcd
|
bug修复：
1.能力统计-基础设施来源修改
2.申购车查询逻辑修改
3.排序失效修复
|
2022-07-01 18:27:31 +08:00 |
|
yitonglei
|
4f2ba4d710
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 18:21:01 +08:00 |
|
yitonglei
|
f367009215
|
1、修改能力统计列表和详情-组件服务-使用情况统计相关代码修改为统计调用数和使用数
|
2022-07-01 18:20:54 +08:00 |
|
wangliwen
|
8d15ad35de
|
补充 发表需求评论
|
2022-07-01 18:02:56 +08:00 |
|
yitonglei
|
a5954e286e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 17:29:30 +08:00 |
|
yitonglei
|
e75208a8cb
|
1、修改能力统计列表和详情-TOP5使用组件
|
2022-07-01 17:29:24 +08:00 |
|
wangliwen
|
26e6c2d157
|
Merge branch 'master' into docker_package
|
2022-07-01 17:18:12 +08:00 |
|
wangliwen
|
d9ed300609
|
Merge remote-tracking branch 'origin/dev'
|
2022-07-01 17:00:40 +08:00 |
|
wangliwen
|
a15f79cece
|
异步优化
|
2022-07-01 17:00:12 +08:00 |
|
yitonglei
|
ff808b022b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 16:09:22 +08:00 |
|
yitonglei
|
2992eb2792
|
1、修改能力统计列表和详情-组件服务-使用情况统计列表的查询字段名称
|
2022-07-01 16:08:09 +08:00 |
|
lizhicheng
|
eecbdbcf52
|
工作台bug修复
|
2022-07-01 15:55:09 +08:00 |
|
wangliwen
|
4e32f0c58e
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-01 14:41:15 +08:00 |
|
wangliwen
|
bc68b6d0af
|
异步多线程优化
|
2022-07-01 14:40:56 +08:00 |
|
yitonglei
|
46ea3faede
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 14:38:17 +08:00 |
|
yitonglei
|
c72f598780
|
1、修改能力统计列表和详情-组件服务-使用情况统计-使用组件评分TOP5的sql
|
2022-07-01 14:38:11 +08:00 |
|
dinggang
|
7511a9d9f2
|
1.申购车查询结果新增字段
2.根据申请查询摄像头列表修改
3.修改新增收藏因为异步导致的数据库死锁
|
2022-07-01 14:35:24 +08:00 |
|
yitonglei
|
fa9f22628b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 14:06:36 +08:00 |
|
yitonglei
|
797ee5f59f
|
1、修改能力统计列表和详情-组件服务-使用情况统计-top5使用组件的sql
|
2022-07-01 14:06:29 +08:00 |
|
wangliwen
|
e78b5ca35f
|
Merge branch 'dev' into docker_package
|
2022-07-01 13:34:58 +08:00 |
|
wangliwen
|
c0962e670c
|
sql 调整
|
2022-07-01 13:18:18 +08:00 |
|
yitonglei
|
fc910297a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 12:09:35 +08:00 |
|
yitonglei
|
92d08a0a3c
|
1、修改能力统计列表和详情-应用资源-发布端应用情况的sql
|
2022-07-01 12:09:27 +08:00 |
|
wangliwen
|
aea576a204
|
Merge branch 'master' into docker_package
|
2022-07-01 11:37:55 +08:00 |
|
wangliwen
|
410ac4c964
|
我发起的流程、已办任务 可按流程类型过滤
|
2022-07-01 11:36:09 +08:00 |
|
wangliwen
|
ea62505f8d
|
调整 启动环境
|
2022-07-01 11:34:11 +08:00 |
|
wangliwen
|
68f9685daa
|
Merge branch 'master' into docker_package
|
2022-07-01 11:16:06 +08:00 |
|
dinggang
|
3b44fa36a0
|
...
|
2022-07-01 10:46:57 +08:00 |
|
yitonglei
|
66356dd6c6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 10:42:44 +08:00 |
|
yitonglei
|
45952427fc
|
1、修改能力统计列表和详情-优化贡献组件分别被多少应用使用的sql
|
2022-07-01 10:42:39 +08:00 |
|
wangliwen
|
b21210e36f
|
...
|
2022-07-01 10:42:11 +08:00 |
|
wangliwen
|
a092e6b00f
|
申请摄像头通知异常的解决
|
2022-07-01 10:30:54 +08:00 |
|
wangliwen
|
1547954471
|
Merge branch 'master' into docker_package
|
2022-07-01 10:03:23 +08:00 |
|
wangliwen
|
e610457d13
|
申请的表单 camera_list 查询不出的问题
|
2022-07-01 10:02:39 +08:00 |
|
wangliwen
|
ef1cbe93fc
|
...
|
2022-07-01 09:57:29 +08:00 |
|
wangliwen
|
03dee6f380
|
已办任务支持能力批量申请
|
2022-07-01 09:50:48 +08:00 |
|
wangliwen
|
31d11b8009
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-01 09:40:39 +08:00 |
|
yitonglei
|
f7f04f90e0
|
1、修改能力统计列表和详情-使用情况统计的sql
|
2022-07-01 09:38:48 +08:00 |
|
yitonglei
|
7c1988cde5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 09:31:29 +08:00 |
|
yitonglei
|
220d3d9f0e
|
1、修改能力统计列表和详情-使用情况统计的sql
|
2022-07-01 09:31:22 +08:00 |
|
wangliwen
|
357ed71dbe
|
摄像头申请 我的申请名字特殊处理
|
2022-07-01 09:28:40 +08:00 |
|
wangliwen
|
3cb9e083ed
|
我的待办 所有类型都为获取到时，直接输出
|
2022-07-01 08:57:52 +08:00 |
|
wangliwen
|
8cf701aeef
|
Merge branch 'master' into docker_package
|
2022-06-30 18:59:55 +08:00 |
|
dinggang
|
87cc41c22b
|
1.共享门户和能力统计对资源等信息统计逻辑修改
2.需求中心按时间倒序
|
2022-06-30 18:41:44 +08:00 |
|
yitonglei
|
f67de9cf52
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 18:26:06 +08:00 |
|
yitonglei
|
5cbc508655
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 17:56:50 +08:00 |
|
yitonglei
|
274b11639f
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 17:56:40 +08:00 |
|
wangliwen
|
409b9b865e
|
Merge branch 'master' into docker_package
|
2022-06-30 17:47:07 +08:00 |
|
wangliwen
|
d72e30308f
|
Merge branch 'master' into dev
|
2022-06-30 17:46:01 +08:00 |
|
yitonglei
|
9d04ba4113
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 17:21:30 +08:00 |
|
yitonglei
|
75b7de0052
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 17:21:24 +08:00 |
|
wangliwen
|
8fb6924557
|
。。。
|
2022-06-30 17:02:26 +08:00 |
|
wangliwen
|
19d1cdde41
|
文案调整
|
2022-06-30 16:46:34 +08:00 |
|
wangliwen
|
eea490071b
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-06-30 16:39:40 +08:00 |
|
wangliwen
|
20a426cb9a
|
处理pageWithAttr接口返回缺失infoList字段的问题
|
2022-06-30 16:37:38 +08:00 |
|
yitonglei
|
a57b280270
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 16:34:11 +08:00 |
|
yitonglei
|
511bcc7850
|
1、修改能力统计列表和详情-应用资源的发布情况和应用资源使用情况关于登录用户的判断，解决空指针问题
|
2022-06-30 16:33:53 +08:00 |
|
lizhicheng
|
6005903b1a
|
工作台：前端联调补充
|
2022-06-30 16:31:22 +08:00 |
|
wangliwen
|
1e370568a7
|
Merge branch 'master' into docker_package
|
2022-06-30 16:10:28 +08:00 |
|
yitonglei
|
70f4756f9e
|
1、修改能力统计列表和详情-应用资源的发布情况增加收藏字段，修改五大资源发布情况的sql语句
|
2022-06-30 16:10:24 +08:00 |
|
wangliwen
|
30206c5867
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 16:07:29 +08:00 |
|
wangliwen
|
3e78aec4d3
|
二级缓存的调整
|
2022-06-30 16:06:08 +08:00 |
|
wangliwen
|
da41776d98
|
Merge branch 'master' into docker_package
|
2022-06-30 16:00:39 +08:00 |
|
dinggang
|
aba372676d
|
1.基础设施摄像头申请流程修改
2.申购车查询摄像头列表数据新增字段
|
2022-06-30 16:00:02 +08:00 |
|
wangliwen
|
093dc5ba91
|
docker 镜像
|
2022-06-30 15:58:43 +08:00 |
|
yitonglei
|
3e4716a432
|
1、修改能力统计列表和详情-应用资源的贡献组件分别被多少应用使用
|
2022-06-30 15:38:49 +08:00 |
|
wangliwen
|
22bdb9c4dc
|
TODO docker打包
|
2022-06-30 14:16:06 +08:00 |
|
yitonglei
|
91fc811ed6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 12:04:25 +08:00 |
|
yitonglei
|
4c463e922f
|
1、修改能力统计列表和详情-应用资源的应用贡献组件数量分布（算法、图层、开发、业务）和 应用贡献组件数量分布
|
2022-06-30 12:04:17 +08:00 |
|
wangliwen
|
b1774b9875
|
所有能力资源infoList交给本表字段处理、保存
|
2022-06-30 11:58:35 +08:00 |
|
wangliwen
|
48e9eecbd3
|
能力导入默认为大数据局
|
2022-06-30 11:50:24 +08:00 |
|
wangliwen
|
44233d80de
|
屮
|
2022-06-30 11:22:43 +08:00 |
|
wangliwen
|
a959af6fa7
|
。。。
|
2022-06-30 10:56:11 +08:00 |
|
wangliwen
|
204eb8d5e3
|
dto 内 json 字段特殊处理
|
2022-06-30 10:45:10 +08:00 |
|
wangliwen
|
26307f6d0d
|
单点登录调整的启用配置
|
2022-06-30 10:19:04 +08:00 |
|
huangweixiong
|
214bf4bc61
|
cas单点登录
|
2022-06-30 09:41:38 +08:00 |
|
huangweixiong
|
d9222f25e1
|
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: (77 commits)
。。。
1、修改shiro的关于/census/center/v3/**的配置顺序，移到/census/center/**配置之前
ObjectMapper 线程安全，减少new
新增api：查询资源按申请次数排名、查询部门需求
。。。
...
。。。
。。。
基础设施特殊处理
1、修改一处拼写错误
流程图放开
批量能力申请 我的申请页
1、修改一处拼写错误
...
...
新增api：部门申请、部门申请统计
批量申请时 手动填充发起人id
1、修改字符串转换成数字方法，由转成int改为long
1、修改鉴权ShiroConfig,增加filterMap.put("/census/center/v3/**", "oauth2");
npe
...
|
2022-06-30 09:34:54 +08:00 |
|
huangweixiong
|
7ee146eaa9
|
单点登录重构，新增cas单点登录
|
2022-06-30 09:34:33 +08:00 |
|
wangliwen
|
d886019cb9
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-30 09:26:40 +08:00 |
|
wangliwen
|
e7ee2632e0
|
。。。
|
2022-06-30 09:26:04 +08:00 |
|
yitonglei
|
67387e1451
|
1、修改shiro的关于/census/center/v3/**的配置顺序，移到/census/center/**配置之前
|
2022-06-30 09:24:56 +08:00 |
|
wangliwen
|
14474061cd
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-06-30 09:00:29 +08:00 |
|
wangliwen
|
cc7b22b304
|
ObjectMapper 线程安全，减少new
|
2022-06-30 08:58:54 +08:00 |
|
lizhicheng
|
e0d472a9a8
|
新增api：查询资源按申请次数排名、查询部门需求
|
2022-06-29 20:50:41 +08:00 |
|
wangliwen
|
17415e4a07
|
。。。
|
2022-06-29 19:49:20 +08:00 |
|
dinggang
|
0039b8b776
|
...
|
2022-06-29 19:25:11 +08:00 |
|
wangliwen
|
09ae34cf61
|
。。。
|
2022-06-29 19:21:23 +08:00 |
|
wangliwen
|
c8df1c2468
|
。。。
|
2022-06-29 19:03:08 +08:00 |
|
wangliwen
|
b012861c51
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 18:57:31 +08:00 |
|
wangliwen
|
f5ecfb1fcd
|
基础设施特殊处理
|
2022-06-29 18:56:19 +08:00 |
|
yitonglei
|
2f8761fec1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-29 18:19:36 +08:00 |
|
yitonglei
|
fce552600b
|
1、修改一处拼写错误
|
2022-06-29 18:19:29 +08:00 |
|
wangliwen
|
0b50439f43
|
流程图放开
|
2022-06-29 18:11:17 +08:00 |
|
wangliwen
|
6b756c6963
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 18:08:19 +08:00 |
|
wangliwen
|
f1da551b13
|
批量能力申请 我的申请页
|
2022-06-29 18:07:01 +08:00 |
|
yitonglei
|
17a3c32c86
|
1、修改一处拼写错误
|
2022-06-29 17:50:43 +08:00 |
|
wangliwen
|
a58c74caea
|
...
|
2022-06-29 17:37:22 +08:00 |
|
wangliwen
|
18ab6f6697
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 16:43:21 +08:00 |
|
wangliwen
|
22c626aa55
|
...
|
2022-06-29 16:40:09 +08:00 |
|
lizhicheng
|
fa280cb83c
|
新增api：部门申请、部门申请统计
|
2022-06-29 16:10:35 +08:00 |
|
wangliwen
|
b5316c85eb
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 15:48:15 +08:00 |
|
wangliwen
|
bd2c5b951b
|
批量申请时 手动填充发起人id
|
2022-06-29 15:46:35 +08:00 |
|
yitonglei
|
1340f9b2cd
|
1、修改字符串转换成数字方法，由转成int改为long
|
2022-06-29 15:38:41 +08:00 |
|
yitonglei
|
ad98c9b0dc
|
1、修改鉴权ShiroConfig,增加filterMap.put("/census/center/v3/**", "oauth2");
|
2022-06-29 15:29:54 +08:00 |
|
wangliwen
|
a2cf04b5fd
|
npe
|
2022-06-29 15:11:35 +08:00 |
|
wangliwen
|
e2a14c2ad5
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 14:48:52 +08:00 |
|
dinggang
|
7d5eaa62d7
|
...
|
2022-06-29 14:43:38 +08:00 |
|
yitonglei
|
98976ae620
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-29 14:11:34 +08:00 |
|
yitonglei
|
58088236ab
|
1、能力统计列表及详情页CensusControllerV3的列表查询方法做了改动，部门id从登录用户获取
2、删除了SysDeptController中新增的查询部门树方法
|
2022-06-29 14:08:50 +08:00 |
|
wangliwen
|
cf4545a266
|
businessKey直接出task内部参数
|
2022-06-29 11:56:38 +08:00 |
|
wangliwen
|
eaf2e3b289
|
调整申请表单应用场景支持多选
|
2022-06-29 11:42:52 +08:00 |
|
wangliwen
|
fc4210442a
|
Merge branch 'master' into dev
|
2022-06-29 10:55:08 +08:00 |
|
dinggang
|
63cc759ac4
|
基础设施摄像头批量申请
|
2022-06-29 10:28:40 +08:00 |
|
wangliwen
|
1a07719063
|
...
|
2022-06-29 10:15:06 +08:00 |
|
lizhicheng
|
d16113cd48
|
新增api：部门上架、部门上架统计
|
2022-06-29 10:11:03 +08:00 |
|
wangliwen
|
400fb77529
|
...
|
2022-06-29 09:48:24 +08:00 |
|
wangliwen
|
f953b77294
|
批量申请流程申请接口处理
|
2022-06-29 09:39:41 +08:00 |
|
wangliwen
|
8577b7f1e4
|
数据库切换回 238
|
2022-06-29 09:08:42 +08:00 |
|
wangliwen
|
f435bb8d49
|
Merge branch 'dev'
|
2022-06-28 20:13:40 +08:00 |
|
wangliwen
|
00031c475f
|
启动脚本 调大堆栈
|
2022-06-28 20:13:00 +08:00 |
|
wangliwen
|
87b74e303a
|
...
|
2022-06-28 19:31:23 +08:00 |
|
wangliwen
|
bfbcbceaac
|
...
|
2022-06-28 19:29:29 +08:00 |
|
wangliwen
|
73f3101477
|
selectWithAttrs 二级缓存
|
2022-06-28 19:18:39 +08:00 |
|
wangliwen
|
4ae2d62670
|
总体评分逆序
|
2022-06-28 19:13:38 +08:00 |
|
dinggang
|
a9b5f6f22d
|
1.基础设施摄像头列表查询修改
2.申购车根据流程ID查询申请的摄像头列表
|
2022-06-28 19:12:52 +08:00 |
|
wangliwen
|
eb362e16df
|
二级缓存缓存 按总体评价排序
|
2022-06-28 19:00:57 +08:00 |
|
wangliwen
|
a92a53b850
|
...
|
2022-06-28 18:12:55 +08:00 |
|
wangliwen
|
4fddf96687
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-06-28 18:11:59 +08:00 |
|
wangliwen
|
0a8fcd3d8f
|
npe
|
2022-06-28 18:09:00 +08:00 |
|
yitonglei
|
9b3dbc53cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 17:48:36 +08:00 |
|
wangliwen
|
27d2757f9d
|
总体评价特殊处理，防止sql 卡顿
|
2022-06-28 17:48:29 +08:00 |
|
yitonglei
|
d27039cf07
|
1、部门发布情况增加分页能力
|
2022-06-28 17:48:26 +08:00 |
|
wangliwen
|
03f1e20a46
|
...
|
2022-06-28 17:05:21 +08:00 |
|
wangliwen
|
926bc78395
|
。。。
|
2022-06-28 16:52:57 +08:00 |
|
wangliwen
|
4a9dbdceb9
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 16:49:13 +08:00 |
|
wangliwen
|
97b5f7c79b
|
总体评价更新
|
2022-06-28 16:48:50 +08:00 |
|
yitonglei
|
4e13cb093a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:52:28 +08:00 |
|
yitonglei
|
ee22d1d8fc
|
1、组件使用情况统计的查询方法--修改了基础设置列表、基础设施使用情况、知识库相关方法
|
2022-06-28 15:50:46 +08:00 |
|
HISENSE\lizhicheng2
|
fd3c2a7a4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:35:45 +08:00 |
|
Unknown
|
95365f1901
|
新增api：部门待办、部门已办
|
2022-06-28 15:35:15 +08:00 |
|
wangliwen
|
f52e462e18
|
二级缓存调整
|
2022-06-28 14:00:18 +08:00 |
|
wangliwen
|
ed81a9807a
|
。。。
|
2022-06-28 13:53:29 +08:00 |
|
wangliwen
|
1d5567d493
|
。。。
|
2022-06-28 13:48:13 +08:00 |
|
wangliwen
|
d10367c4c6
|
使用冗余字段代替sql函数计算
|
2022-06-28 13:40:59 +08:00 |
|
wangliwen
|
d16d7add39
|
selectDeptList 使用全异步处理与加二级缓存
|
2022-06-28 11:49:54 +08:00 |
|
wangliwen
|
2954ede07a
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 11:04:12 +08:00 |
|
wangliwen
|
0562a1548f
|
selectDeptList 使用并行减少io
|
2022-06-28 11:03:51 +08:00 |
|
yitonglei
|
0adb6b095c
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:43:20 +08:00 |
|
yitonglei
|
8efd7866aa
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
|
2022-06-28 10:40:32 +08:00 |
|
yitonglei
|
ceb9c747e2
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:33:09 +08:00 |
|
wangliwen
|
4058089bcd
|
...
|
2022-06-28 09:33:10 +08:00 |
|
wangliwen
|
73f0607099
|
selectWithAttrs 减少sql返回字段
|
2022-06-28 09:27:35 +08:00 |
|
wangliwen
|
5176f58ac8
|
selectWithAttrs 使用流分页
|
2022-06-28 09:16:40 +08:00 |
|
wangliwen
|
99bb41556d
|
按条件出条件总数
|
2022-06-27 19:58:24 +08:00 |
|
wangliwen
|
7288012bf6
|
资源表sql 中 规避使用 * 进行查询
|
2022-06-27 19:42:02 +08:00 |
|
wangliwen
|
46b17e96c2
|
修改本地dev环境下数据库访问地址（238数据库io慢）
|
2022-06-27 18:36:58 +08:00 |
|
dinggang
|
54a9ce5d62
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
|
2022-06-27 18:11:29 +08:00 |
|
dinggang
|
cb134396b3
|
1.申购车分页查询修改
2.删除system.out代码
|
2022-06-27 18:05:44 +08:00 |
|
yitonglei
|
9f704ea01d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-27 18:04:43 +08:00 |
|
wangliwen
|
d6df42fe7b
|
...
|
2022-06-27 18:04:01 +08:00 |
|
wangliwen
|
f4670d45cd
|
二级缓存手动清理
|
2022-06-27 17:59:30 +08:00 |
|
wangliwen
|
e1fb7b0b9e
|
云图 接口异常时 默认数据
|
2022-06-27 17:44:01 +08:00 |
|
wangliwen
|
1e38a30eb5
|
npe
|
2022-06-27 17:40:55 +08:00 |
|
wangliwen
|
78286468fa
|
资源入库时 更新infoList字段
|
2022-06-27 17:33:03 +08:00 |
|
yitonglei
|
142ab2d84a
|
1、继续修改代码
|
2022-06-27 17:30:14 +08:00 |
|
wangliwen
|
d8611fb957
|
流程通知日志
|
2022-06-27 17:26:31 +08:00 |
|
wangliwen
|
316adc2c4a
|
...
|
2022-06-27 16:56:35 +08:00 |
|
wangliwen
|
293c007cfa
|
部门树二级缓存key调整
|
2022-06-27 16:50:43 +08:00 |
|
wangliwen
|
5e6b01256b
|
...
|
2022-06-27 16:43:21 +08:00 |
|
wangliwen
|
d7e947f086
|
selectDeptList 增加二级缓存
|
2022-06-27 16:38:29 +08:00 |
|
wangliwen
|
d5e66e60b5
|
创建索引前，先期删除索引
|
2022-06-27 15:51:04 +08:00 |
|
wangliwen
|
f967285913
|
资源表使用全文索引替换like查询
|
2022-06-27 15:44:18 +08:00 |
|
wangliwen
|
6a784f705c
|
我的待办使用流程定义key过滤
|
2022-06-27 15:03:15 +08:00 |
|
wangliwen
|
038857a149
|
加索引
|
2022-06-27 15:02:44 +08:00 |
|
wangliwen
|
41517968a3
|
索引的增加
|
2022-06-27 14:20:41 +08:00 |
|
huangweixiong
|
ca1cf2517c
|
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: (53 commits)
批量申请处理
...
接口增加日志注解记录用户操作日志
...
TODO 批量申请流程
1、继续新增新能力统计页面部分后台代码
项目使用能力和贡献能力明细接口修改
TODO 批量申请的任务监听器
增加批量发起能力申请时按部门发起批量审核流程
1、继续新增新能力统计页面部分后台代码--新增了贡献组件被多少应用调用
1、继续新增新能力统计页面部分后台代码
1、继续新增新能力统计页面部分后台代码
数据资源统计修改1
数据资源统计修改
数据资源统计修改
市局数据资源对接修改
前端传输用户信息改为加密
npe
。。。
包头配置
...
|
2022-06-27 14:13:25 +08:00 |
|
huangweixiong
|
09091205f5
|
网关监控指标转发
|
2022-06-27 13:49:03 +08:00 |
|
wangliwen
|
c5aaf590f2
|
Merge remote-tracking branch 'origin/master'
|
2022-06-27 11:00:03 +08:00 |
|
wangliwen
|
0f9b368e53
|
批量申请处理
|
2022-06-27 10:58:23 +08:00 |
|
dinggang
|
da6de038c6
|
...
|
2022-06-27 10:49:45 +08:00 |
|
dinggang
|
a0ec36c887
|
接口增加日志注解记录用户操作日志
|
2022-06-27 10:48:24 +08:00 |
|
wangliwen
|
5b88c15aca
|
Merge remote-tracking branch 'origin/master'
|
2022-06-27 10:38:03 +08:00 |
|
wangliwen
|
ae3e7c80a1
|
...
|
2022-06-27 10:37:56 +08:00 |
|
wangliwen
|
481b4a4fec
|
TODO 批量申请流程
|
2022-06-27 10:35:59 +08:00 |
|
yitonglei
|
c98f73b8ec
|
Merge remote-tracking branch 'origin/master'
|
2022-06-27 10:34:08 +08:00 |
|
yitonglei
|
1be5641717
|
1、继续新增新能力统计页面部分后台代码
|
2022-06-27 10:33:59 +08:00 |
|
liyongbo2
|
1127c066ce
|
项目使用能力和贡献能力明细接口修改
|
2022-06-27 09:12:06 +08:00 |
|
wangliwen
|
f5cc6c10b0
|
TODO 批量申请的任务监听器
|
2022-06-26 15:31:57 +08:00 |
|
wangliwen
|
e2036397cf
|
增加批量发起能力申请时按部门发起批量审核流程
|
2022-06-26 13:35:01 +08:00 |
|
yitonglei
|
9a6358bd5d
|
1、继续新增新能力统计页面部分后台代码--新增了贡献组件被多少应用调用
|
2022-06-25 14:50:43 +08:00 |
|
yitonglei
|
a18d98e0b3
|
1、继续新增新能力统计页面部分后台代码
|
2022-06-25 09:24:30 +08:00 |
|
yitonglei
|
510c2806cb
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-06-25 09:01:31 +08:00 |
|
yitonglei
|
1396b9ea71
|
1、继续新增新能力统计页面部分后台代码
|
2022-06-25 08:58:04 +08:00 |
|
dinggang
|
274e1bbfa8
|
数据资源统计修改1
|
2022-06-24 20:49:20 +08:00 |
|
dinggang
|
dfd3cbadb6
|
数据资源统计修改
|
2022-06-24 20:22:31 +08:00 |
|
dinggang
|
f4d0001b85
|
数据资源统计修改
|
2022-06-24 19:54:20 +08:00 |
|
dinggang
|
bf5628d97f
|
市局数据资源对接修改
|
2022-06-24 19:10:51 +08:00 |
|
dinggang
|
c5f8697a43
|
前端传输用户信息改为加密
|
2022-06-24 18:00:02 +08:00 |
|
wangliwen
|
f185f943de
|
npe
|
2022-06-24 17:40:56 +08:00 |
|
wangliwen
|
d95fd0496a
|
。。。
|
2022-06-24 17:02:46 +08:00 |
|
wangliwen
|
6e4c75927e
|
Merge remote-tracking branch 'origin/master'
|
2022-06-24 16:49:42 +08:00 |
|
wangliwen
|
8a53c3f624
|
包头配置
|
2022-06-24 16:38:36 +08:00 |
|
yitonglei
|
9e807ed118
|
Merge remote-tracking branch 'origin/master'
|
2022-06-24 16:37:22 +08:00 |
|
yitonglei
|
d06b2c9ec3
|
1、新能力统计页面部分后台代码
|
2022-06-24 16:37:14 +08:00 |
|
wangliwen
|
d41c642108
|
Merge remote-tracking branch 'origin/master'
|
2022-06-24 15:55:53 +08:00 |
|
wangliwen
|
b279459972
|
西海岸配置文件调整为现场正式配置
|
2022-06-24 15:55:25 +08:00 |
|
dinggang
|
08423a1f89
|
市局对接数据资源修改
|
2022-06-24 15:19:09 +08:00 |
|
wangliwen
|
bb8e2e5759
|
西海岸的处理
|
2022-06-24 15:01:40 +08:00 |
|
wangliwen
|
ce43a9fced
|
西海岸接口ip调整
|
2022-06-24 14:04:02 +08:00 |
|
dinggang
|
aefa138f22
|
市局对接数据资源
|
2022-06-24 10:29:34 +08:00 |
|
liyongbo2
|
162e2ec97f
|
项目列表相关接口和应用资源与其他资源关联相关接口
|
2022-06-24 09:40:23 +08:00 |
|
wangliwen
|
6f960da803
|
。。。
|
2022-06-24 09:20:34 +08:00 |
|
wangliwen
|
628e22eedc
|
西海岸处理
|
2022-06-24 09:01:09 +08:00 |
|
wangliwen
|
1531d85695
|
评论的待办
|
2022-06-23 20:33:03 +08:00 |
|
wangliwen
|
da8340d41e
|
npe
|
2022-06-23 20:05:23 +08:00 |
|
wangliwen
|
f3d482707e
|
...
|
2022-06-23 20:03:10 +08:00 |
|
wangliwen
|
3fbe2ea2ff
|
西海岸接口日志输出
|
2022-06-23 19:12:45 +08:00 |
|
wangliwen
|
4ac7dfecd3
|
。。。
|
2022-06-23 18:46:03 +08:00 |
|
wangliwen
|
cda11901c7
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
|
2022-06-23 18:44:57 +08:00 |
|
wangliwen
|
8ade504226
|
未通过的评论不显示
|
2022-06-23 18:44:14 +08:00 |
|
dinggang
|
5e536dc812
|
一、操作日志升级：
1.日志记录新增返回结果字段
2.日志查询增加支持按操作人，操作时间及操作名称来查询
3.增加日志删除接口（批量删除）
二、给部分方法加上日志注解记录日志
三、日志表sql修改语句
|
2022-06-23 18:43:58 +08:00 |
|
wangliwen
|
8f640f66e6
|
通知优化 。。
|
2022-06-23 17:59:22 +08:00 |
|
wangliwen
|
d0cca3951c
|
通知优化
|
2022-06-23 15:21:44 +08:00 |
|
wangliwen
|
a911fdeee9
|
评论审核流程
|
2022-06-23 14:42:54 +08:00 |
|
wangliwen
|
6f394a3f99
|
...
|
2022-06-23 11:48:28 +08:00 |
|
wangliwen
|
35a87b2f3d
|
Merge remote-tracking branch 'origin/project-qiaosen-0621'
|
2022-06-23 11:45:37 +08:00 |
|
wangliwen
|
b5d084128c
|
需求评论增加删除标识
|
2022-06-23 11:45:19 +08:00 |
|
qiaosen
|
f6a8112a04
|
添加建表sql
|
2022-06-23 10:45:46 +08:00 |
|
wangliwen
|
40ccd4e356
|
...
|
2022-06-23 10:40:46 +08:00 |
|
wangliwen
|
b140d7f4d6
|
配置文件内不需统计的资源 排除接口出数据
|
2022-06-23 10:29:07 +08:00 |
|
qiaosen
|
f35e726d54
|
新增项目管理
|
2022-06-23 10:21:48 +08:00 |
|
wangliwen
|
e43cc1bfdb
|
西海岸基础设施
|
2022-06-23 09:31:06 +08:00 |
|
wangliwen
|
a4500ca2bb
|
西海岸特殊处理
|
2022-06-23 09:25:29 +08:00 |
|
wangliwen
|
ecdd006c4e
|
npe!
|
2022-06-22 20:04:36 +08:00 |
|
wangliwen
|
e8e6d5396a
|
。。。
|
2022-06-22 19:41:10 +08:00 |
|
wangliwen
|
de75da4b68
|
各地配置外置
|
2022-06-22 19:33:20 +08:00 |
|
dinggang
|
2d18cbbf9a
|
npe
|
2022-06-22 18:40:11 +08:00 |
|
dinggang
|
83d9b7b4db
|
...
|
2022-06-22 17:36:36 +08:00 |
|
dinggang
|
c4a121464b
|
资源云图-数据资源增加数据
|
2022-06-22 17:19:42 +08:00 |
|
huangweixiong
|
fd406c9bfd
|
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:
去除市局部门搜索条件
...
...
标识为已读支持批量
站内信来源标注为 其它
npe
。。。
...
站内信通知区分来源
sql
我的通知来源分类
配置统计时，资源是否归属上级
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
|
2022-06-22 17:16:58 +08:00 |
|
dinggang
|
ab9e30b755
|
去除市局部门搜索条件
|
2022-06-22 17:00:37 +08:00 |
|
huangweixiong
|
cf658307a8
|
去除部门搜索
|
2022-06-22 17:00:35 +08:00 |
|
wangliwen
|
75683440de
|
...
|
2022-06-22 13:54:47 +08:00 |
|
wangliwen
|
e12f4f0a62
|
标识为已读支持批量
|
2022-06-22 11:23:25 +08:00 |
|
wangliwen
|
f2ec0b118d
|
站内信来源标注为 其它
|
2022-06-22 11:14:20 +08:00 |
|
wangliwen
|
2189f6a3f0
|
npe
|
2022-06-22 11:00:02 +08:00 |
|
wangliwen
|
5333b18711
|
。。。
|
2022-06-22 10:51:42 +08:00 |
|
wangliwen
|
aaeda5f9bd
|
...
|
2022-06-22 10:45:42 +08:00 |
|
wangliwen
|
40817f2ddf
|
站内信通知区分来源
|
2022-06-22 10:22:48 +08:00 |
|
wangliwen
|
8ac9091f9b
|
sql
|
2022-06-22 09:57:38 +08:00 |
|
wangliwen
|
c81aaa34b0
|
我的通知来源分类
|
2022-06-22 09:49:17 +08:00 |
|
wangliwen
|
1c9a83fcd2
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
|
2022-06-22 09:12:02 +08:00 |
|
wangliwen
|
6a07620ba3
|
配置统计时，资源是否归属上级
|
2022-06-22 09:11:39 +08:00 |
|
huangweixiong
|
5b2f0bef95
|
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:
总应用数目
知识库 文件类型导入问题
|
2022-06-21 21:31:42 +08:00 |
|
huangweixiong
|
b531192f91
|
市局数据资源实现
|
2022-06-21 21:31:23 +08:00 |
|
wangliwen
|
3dc4676491
|
Merge remote-tracking branch 'origin/master'
|
2022-06-21 21:12:41 +08:00 |
|
huangweixiong
|
8e87eb848f
|
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:
修改数据资源对接方式
|
2022-06-21 20:54:04 +08:00 |
|
huangweixiong
|
b1e489bc27
|
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: (49 commits)
标识所有未读资源为已读
排查加日志
屮
。。。
通知的历史数据 来源处理
通知来源类型
基础设施
用户表加字段
云图数据资源总况
1、修改获取金宏数据库中用户名和地区信息，将 JhUserTask和JhDeptTask删除，改为在SysUserController中分别通过/getDeptInfoFromJH和/getUserInfoFromJH手动调用。
。。。
1、将金宏数据库中用户和地区信息整合进来，并做成任务调度 JhUserTask和JhDeptTask，需要通过前端配置一下才能启动。
基础设施统计接口
。。。
...
获取预览地址接口
视频预览 工厂模式下各区域的实现
....
...
现有区域配置文件 加入
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-06-21 20:53:46 +08:00 |
|
dinggang
|
27218ae82b
|
修改数据资源对接方式
|
2022-06-21 20:47:58 +08:00 |
|
huangweixiong
|
2a5334dc81
|
资源目录分页，排序，模糊查询
|
2022-06-21 20:47:14 +08:00 |
|
wangliwen
|
e057a5550c
|
总应用数目
|
2022-06-21 19:59:18 +08:00 |
|
wangliwen
|
0c8b2f1f57
|
知识库 文件类型导入问题
|
2022-06-21 19:34:01 +08:00 |
|
wangliwen
|
64e37fcbb8
|
标识所有未读资源为已读
|
2022-06-21 19:09:49 +08:00 |
|
wangliwen
|
36db201d67
|
排查加日志
|
2022-06-21 18:41:30 +08:00 |
|
wangliwen
|
0462d36d97
|
屮
|
2022-06-21 18:34:03 +08:00 |
|
wangliwen
|
f1f404c45b
|
。。。
|
2022-06-21 18:28:26 +08:00 |
|
wangliwen
|
848ee0cb4e
|
通知的历史数据 来源处理
|
2022-06-21 17:53:29 +08:00 |
|
wangliwen
|
5627a804da
|
通知来源类型
|
2022-06-21 17:41:14 +08:00 |
|
wangliwen
|
6d400ff9ae
|
基础设施
|
2022-06-21 17:00:56 +08:00 |
|
wangliwen
|
b029bac595
|
用户表加字段
|
2022-06-21 16:24:24 +08:00 |
|
wangliwen
|
a8e4c6871a
|
Merge remote-tracking branch 'origin/master' into wangliwen
|
2022-06-21 16:11:03 +08:00 |
|
wangliwen
|
0b7d80da4a
|
云图数据资源总况
|
2022-06-21 16:06:20 +08:00 |
|
yitonglei
|
47ad0aa074
|
Merge remote-tracking branch 'origin/master'
|
2022-06-21 15:38:29 +08:00 |
|
yitonglei
|
55a304519f
|
1、修改获取金宏数据库中用户名和地区信息，将 JhUserTask和JhDeptTask删除，改为在SysUserController中分别通过/getDeptInfoFromJH和/getUserInfoFromJH手动调用。
|
2022-06-21 15:37:24 +08:00 |
|
wangliwen
|
0f554f188d
|
。。。
|
2022-06-21 15:20:57 +08:00 |
|
yitonglei
|
fbdd40e9f4
|
Merge remote-tracking branch 'origin/master'
|
2022-06-21 15:15:12 +08:00 |
|
yitonglei
|
1a3827c7e4
|
1、将金宏数据库中用户和地区信息整合进来，并做成任务调度 JhUserTask和JhDeptTask，需要通过前端配置一下才能启动。
|
2022-06-21 15:13:40 +08:00 |
|
wangliwen
|
a7de7fa61a
|
基础设施统计接口
|
2022-06-21 14:44:29 +08:00 |
|
wangliwen
|
1b320e74e4
|
。。。
|
2022-06-21 14:07:50 +08:00 |
|
wangliwen
|
dface05dfb
|
...
|
2022-06-21 13:55:07 +08:00 |
|
wangliwen
|
3b90fb7a4a
|
获取预览地址接口
|
2022-06-21 12:02:13 +08:00 |
|
wangliwen
|
5045213674
|
视频预览 工厂模式下各区域的实现
|
2022-06-21 11:55:26 +08:00 |
|
wangliwen
|
2d677cfefc
|
....
|
2022-06-21 10:17:07 +08:00 |
|
wangliwen
|
42690164fb
|
...
|
2022-06-21 10:08:01 +08:00 |
|
wangliwen
|
b4af15eab1
|
现有区域配置文件 加入
|
2022-06-21 10:05:18 +08:00 |
|
wangliwen
|
ae66fffc8d
|
包头配置文件引入
|
2022-06-21 09:57:12 +08:00 |
|
wangliwen
|
21603f50fa
|
默认部署 青岛市区
|
2022-06-21 09:48:36 +08:00 |
|
wangliwen
|
ae61f7fcc5
|
增加地点枚举
|
2022-06-21 09:47:04 +08:00 |
|
wangliwen
|
2d41de0c66
|
...
|
2022-06-20 18:25:05 +08:00 |
|
dinggang
|
db03b24e76
|
新增西海岸和包头配置文件
|
2022-06-20 16:24:14 +08:00 |
|
wangliwen
|
9598af3564
|
模板的暂时调整
|
2022-06-20 16:03:23 +08:00 |
|
wangliwen
|
45c5bf7489
|
调整一下sql
|
2022-06-20 14:35:41 +08:00 |
|
liyongbo2
|
47e19db5de
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 14:30:12 +08:00 |
|
liyongbo2
|
413f62c395
|
版本重复，修改名称
|
2022-06-20 14:28:10 +08:00 |
|
wangliwen
|
0aac656f83
|
Merge remote-tracking branch 'origin/master'
|
2022-06-20 14:27:25 +08:00 |
|
wangliwen
|
b165e91663
|
系统操作日志使用异步插入，解决平台所有日志阻塞问题！！ 屮
|
2022-06-20 14:25:07 +08:00 |
|
liyongbo2
|
e6b17da32a
|
修改工作动态备用字段1注释，改为摘要
|
2022-06-20 11:44:02 +08:00 |
|
wangliwen
|
e1edb302f5
|
能力资源导入模板的添加
|
2022-06-20 10:47:59 +08:00 |
|
wangliwen
|
0063546e5e
|
ResourceEntity 增加infoList json字段
|
2022-06-20 10:23:37 +08:00 |
|
wangliwen
|
5b66808e7c
|
替换使用 CopyOnWriteArrayList
|
2022-06-20 09:18:52 +08:00 |
|
dinggang
|
e090c4fd8a
|
sql修改
|
2022-06-19 18:41:07 +08:00 |
|
wangliwen
|
64398d8926
|
...
|
2022-06-19 17:33:25 +08:00 |
|
dinggang
|
44d99b4e21
|
统计2.0-组件服务排名
|
2022-06-19 17:14:53 +08:00 |
|
wangliwen
|
edda52f387
|
jenkins 打包会替换 user.dir
|
2022-06-19 14:49:57 +08:00 |
|
wangliwen
|
633a131619
|
组件服务、知识库 统计接口
|
2022-06-19 14:36:21 +08:00 |
|
wangliwen
|
04a4be0294
|
cv一下
|
2022-06-19 13:12:06 +08:00 |
|
wangliwen
|
7d0760eb68
|
。。。
|
2022-06-19 13:02:14 +08:00 |
|
wangliwen
|
593516266a
|
区市、委办局 两类应用资源排名接口
|
2022-06-19 12:52:07 +08:00 |
|
wangliwen
|
46de17be45
|
。。。
|
2022-06-19 12:17:17 +08:00 |
|
wangliwen
|
8138361207
|
新加一个统计控制器
|
2022-06-19 11:46:04 +08:00 |
|
wangliwen
|
089e507426
|
处理falyway使用的sql文件被打包忽略外置时的问题
|
2022-06-19 10:03:17 +08:00 |
|
wangliwen
|
2c99eb5590
|
...
|
2022-06-19 09:56:16 +08:00 |
|
wangliwen
|
802a5b83ec
|
打更新包时忽略prod环境配置文件；一些sql文件调整
|
2022-06-19 09:31:12 +08:00 |
|
wangliwen
|
da765470e0
|
...
|
2022-06-17 18:33:27 +08:00 |
|
wangliwen
|
fb33764365
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 18:26:58 +08:00 |
|
wangliwen
|
b780d1bdc3
|
打包排除生产环境
|
2022-06-17 18:26:23 +08:00 |
|
huangweixiong
|
508047c9a4
|
资源目录列表增加分页总数
|
2022-06-17 18:09:05 +08:00 |
|
huangweixiong
|
593aa55e24
|
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:
能力导入采用全异步；所属部门不存在时默认deptId 为1
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-06-17 15:04:25 +08:00 |
|
huangweixiong
|
7fa6cb05e5
|
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:
导入表头升序处理
...
web导入能力实现
能力数据导入
屮
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-06-17 14:58:38 +08:00 |
|
wangliwen
|
e1c7d34edc
|
能力导入采用全异步；所属部门不存在时默认deptId 为1
|
2022-06-17 14:18:25 +08:00 |
|
huangweixiong
|
c01f7c913d
|
目录资源转发对接
|
2022-06-17 11:31:11 +08:00 |
|
wangliwen
|
64b44da859
|
导入表头升序处理
|
2022-06-16 15:53:19 +08:00 |
|
wangliwen
|
e034129167
|
...
|
2022-06-16 15:47:28 +08:00 |
|
wangliwen
|
4b7bb257ba
|
web导入能力实现
|
2022-06-16 15:24:35 +08:00 |
|
wangliwen
|
6b5f35e283
|
能力数据导入
|
2022-06-16 14:54:12 +08:00 |
|
wangliwen
|
e13ea7939e
|
屮
|
2022-06-16 11:45:44 +08:00 |
|
wangliwen
|
84014eb3fa
|
。。。
|
2022-06-15 17:07:59 +08:00 |
|
wangliwen
|
6dd28b106e
|
生产环境为了数据安全默认关闭flyway
|
2022-06-15 16:56:43 +08:00 |
|
wangliwen
|
29f6216864
|
资源挂载申请使用mybatis json字段 保存资源信息
|
2022-06-15 16:56:06 +08:00 |
|
wangliwen
|
15fda12059
|
flyway 设置默认开启
|
2022-06-15 15:27:06 +08:00 |
|
wangliwen
|
789abbcc04
|
...
|
2022-06-15 14:23:09 +08:00 |
|
wangliwen
|
c31ea91477
|
屮
|
2022-06-14 20:13:13 +08:00 |
|
wangliwen
|
c6a1ac6c3e
|
...
|
2022-06-14 16:27:57 +08:00 |
|
wangliwen
|
a63f63bb66
|
加入flyway管理数据库版本；后端有字段变动或数据迁移时请使用flyway！！
|
2022-06-14 16:05:27 +08:00 |
|
dinggang
|
3f88a03a8f
|
sql語句錯誤
|
2022-06-14 09:32:40 +08:00 |
|
dinggang
|
c009850d30
|
一些無用的改動
|
2022-06-13 17:11:58 +08:00 |
|
wangliwen
|
8af8d1282f
|
...
|
2022-06-13 15:26:34 +08:00 |
|
wangliwen
|
cc21e26ab6
|
知识库同步定时任务化
|
2022-06-13 15:11:18 +08:00 |
|
wangliwen
|
53653ffec3
|
异步导入知识库的实现
|
2022-06-13 14:00:27 +08:00 |
|
DESKTOP-VA9NQUP\liwen
|
d3149c3ca9
|
对接知识库使用okhttp客户端
|
2022-06-11 19:05:22 +08:00 |
|
wangliwen
|
657cfc0915
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
|
2022-06-10 18:01:05 +08:00 |
|
wangliwen
|
185bfc0591
|
TODO 多线程处理知识库同步
|
2022-06-10 18:00:11 +08:00 |
|
huangweixiong
|
a5c64df504
|
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:
单点登录亚微退出问题
|
2022-06-10 14:45:55 +08:00 |
|
huangweixiong
|
a5acf77073
|
商汤算法图片解决跨域问题
|
2022-06-10 14:45:39 +08:00 |
|
huangweixiong
|
a0749f2573
|
更新生产环境的网关地址
|
2022-06-10 09:57:18 +08:00 |
|
wangliwen
|
4308dcec36
|
单点登录亚微退出问题
|
2022-06-10 09:39:06 +08:00 |
|
huangweixiong
|
46b38e4edb
|
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:
npe
npe
删除无用代码，清除system.out代码，去除无用import
|
2022-06-10 09:29:25 +08:00 |
|
wangliwen
|
8b295bcbcb
|
npe
|
2022-06-10 09:27:00 +08:00 |
|
wangliwen
|
18e27f3038
|
npe
|
2022-06-10 09:14:09 +08:00 |
|
dinggang
|
87ac346c28
|
删除无用代码，清除system.out代码，去除无用import
|
2022-06-09 20:40:56 +08:00 |
|
huangweixiong
|
cb67a8ee60
|
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:
硬编码改为配置文件
编译异常
删除无用代码，清除system.out代码，去除无用import
|
2022-06-09 16:41:32 +08:00 |
|
huangweixiong
|
43524dc5d9
|
申请单去重
|
2022-06-09 16:27:29 +08:00 |
|
wangliwen
|
17bc8f1442
|
硬编码改为配置文件
|
2022-06-09 15:29:06 +08:00 |
|
wangliwen
|
f6a72a41db
|
编译异常
|
2022-06-08 17:35:13 +08:00 |
|
dinggang
|
f52ebe6e99
|
删除无用代码，清除system.out代码，去除无用import
|
2022-06-08 16:08:51 +08:00 |
|
huangweixiong
|
d64d2744d9
|
Merge branch 'master' of http://124.222.94.39:3000/wangliwen/share-platform
* 'master' of http://124.222.94.39:3000/wangliwen/share-platform:
定时任务集群关闭
dev 配置文件关闭亚微单点登录
编目修改字段，修改属性表对应字段的值
...
...
不要阻塞程序启动！！！
...
|
2022-06-08 14:31:00 +08:00 |
|
wangliwen
|
9ba72dbd48
|
定时任务集群关闭
|
2022-06-07 17:36:50 +08:00 |
|
wangliwen
|
4af58b0572
|
dev 配置文件关闭亚微单点登录
|
2022-06-07 09:11:50 +08:00 |
|
dinggang
|
1c20988f72
|
编目修改字段，修改属性表对应字段的值
|
2022-06-06 18:16:37 +08:00 |
|
wangliwen
|
c56ba6400e
|
...
|
2022-06-06 15:59:45 +08:00 |
|
wangliwen
|
615130451e
|
...
|
2022-06-04 18:01:10 +08:00 |
|
huangweixiong
|
c283299fc8
|
【单点登录】未找到用户处理
|
2022-06-03 18:05:06 +08:00 |
|
wangliwen
|
ddc3417007
|
不要阻塞程序启动！！！
|
2022-06-03 16:36:30 +08:00 |
|
wangliwen
|
cd082d34d2
|
...
|
2022-06-03 16:21:08 +08:00 |
|
huangweixiong
|
95e59c82f4
|
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:
...
fix bug
selectDTOById 查出多条数据
申购车不需要出attr
...
一些优化
...
...
屮...
查询能力列表去除infoList 统一门户及其他页面查询能力条件 新增知识库对接 ...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
# renren-admin/src/main/resources/application.yml
|
2022-06-03 14:41:12 +08:00 |
|
huangweixiong
|
a64bdb60ce
|
【单点登录】支持配置文件是否启用单点逻辑
|
2022-06-03 14:27:12 +08:00 |
|
wangliwen
|
5c693de554
|
...
|
2022-06-03 14:06:21 +08:00 |
|
wangliwen
|
21dae97a3e
|
fix bug
|
2022-06-03 10:55:59 +08:00 |
|
wangliwen
|
fb9bb36175
|
selectDTOById 查出多条数据
|
2022-06-03 10:39:21 +08:00 |
|
wangliwen
|
df2890cf4e
|
申购车不需要出attr
|
2022-06-03 10:02:39 +08:00 |
|
dinggang
|
e2801315c6
|
一些优化
|
2022-06-02 17:42:57 +08:00 |
|
wangliwen
|
628337e97d
|
...
|
2022-06-02 17:10:42 +08:00 |
|
wangliwen
|
70af116d5f
|
...
|
2022-06-02 17:09:12 +08:00 |
|
wangliwen
|
54b395580b
|
Merge remote-tracking branch 'origin/master'
|
2022-06-02 16:56:43 +08:00 |
|
wangliwen
|
37229a1743
|
屮...
|
2022-06-02 16:56:22 +08:00 |
|
dinggang
|
02d108d0d3
|
查询能力列表去除infoList
统一门户及其他页面查询能力条件
新增知识库对接
...
|
2022-06-02 16:55:00 +08:00 |
|
huangweixiong
|
3555b6ca05
|
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:
需求评论通知
...
跨域 屮·
大数据部门负责人的通知
通知重放的事件类型区分处理
文案调整
...
|
2022-06-02 15:47:17 +08:00 |
|
wangliwen
|
2a21a57ede
|
需求评论通知
|
2022-06-02 15:39:18 +08:00 |
|
huangweixiong
|
d6f61c9fcc
|
【单点登录】临时处理跨域名情况下没有session问题
|
2022-06-02 15:07:36 +08:00 |
|
huangweixiong
|
e7b1b1cfd6
|
【单点登录】不清楚之前怎么处理跨域，先自己加上跨域
|
2022-06-02 15:05:45 +08:00 |
|
wangliwen
|
91b6e7ff8f
|
...
|
2022-06-02 14:15:14 +08:00 |
|
wangliwen
|
641e6ea2d8
|
跨域 屮·
|
2022-06-02 13:53:40 +08:00 |
|
wangliwen
|
5a41ac20c7
|
大数据部门负责人的通知
|
2022-06-02 11:17:40 +08:00 |
|
wangliwen
|
331cfbe3fc
|
通知重放的事件类型区分处理
|
2022-06-02 11:03:14 +08:00 |
|
wangliwen
|
823008f348
|
文案调整
|
2022-06-02 10:42:20 +08:00 |
|
wangliwen
|
1431dbbb47
|
Merge branch 'master' into wangliwen
# Conflicts:
# lib/yawei-pso-2.0.2.jar
# renren-admin/src/main/java/io/renren/AdminApplication.java
# renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
|
2022-06-01 19:16:09 +08:00 |
|
wangliwen
|
3734453796
|
...
|
2022-06-01 19:12:31 +08:00 |
|
wangliwen
|
7d69521fa4
|
屮
|
2022-06-01 18:26:21 +08:00 |
|
wangliwen
|
7f8a4f9d43
|
javaCV排除无用依赖
|
2022-06-01 18:19:08 +08:00 |
|
wangliwen
|
83bfde121d
|
根配置文件不要随便改！！！！
|
2022-06-01 17:41:58 +08:00 |
|
wangliwen
|
7924c095ce
|
Merge branch 'wangliwen'
|
2022-06-01 17:13:38 +08:00 |
|
wangliwen
|
a88d8abe1c
|
Merge remote-tracking branch 'origin/monitor'
|
2022-06-01 17:13:30 +08:00 |
|
huangweixiong
|
01f6af921a
|
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:
节点流转通知与文案调整
|
2022-06-01 16:54:54 +08:00 |
|
huangweixiong
|
a69cc1d6e5
|
【视频监控，创城合并】迁移pom依赖包
|
2022-06-01 16:52:51 +08:00 |
|
wangliwen
|
20f3f1077d
|
...
|
2022-06-01 16:30:15 +08:00 |
|
wangliwen
|
5ded243ea9
|
Merge branch 'wangliwen'
|
2022-06-01 16:14:20 +08:00 |
|
wangliwen
|
bf824e6643
|
节点流转通知与文案调整
|
2022-06-01 16:13:44 +08:00 |
|
huangweixiong
|
41eb043a06
|
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: (46 commits)
npe
...
消息通知注解加入执行监听器支持
出通知内容
我的站内信根据阅读状态过滤
开启定时任务，每隔一分钟更新任务列表
站内信消息通知优化
解决调用大数据接口请求返回异常
审核人也接受消息通知
线程安全
重放处理的优化
屮
出现重放 加以解决
消息发送者 显示异常
...
消息通知发起人
调整注解位置
...
审批节点分配审批人时事件注解
告警信息查询信息按时间倒序展示
...
|
2022-06-01 15:53:08 +08:00 |
|
huangweixiong
|
676710f382
|
Merge branch 'monitor'
* monitor:
【视频监控，创城合并】配置文件修改
整合monitor到renren框架
# Conflicts:
# renren-admin/pom.xml
# renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java
|
2022-06-01 15:52:45 +08:00 |
|
huangweixiong
|
743b4883ce
|
【单点登录】找不到用户处理
|
2022-06-01 15:20:27 +08:00 |
|
wangliwen
|
b05a371a0a
|
npe
|
2022-06-01 14:00:25 +08:00 |
|
wangliwen
|
73e824fe7d
|
...
|
2022-06-01 11:53:33 +08:00 |
|
wangliwen
|
22391d1fc6
|
消息通知注解加入执行监听器支持
|
2022-06-01 11:38:47 +08:00 |
|
wangliwen
|
71bfdf5faa
|
出通知内容
|
2022-06-01 11:19:53 +08:00 |
|
wangliwen
|
fb6dd0cc35
|
Merge remote-tracking branch 'origin/zhangjunhe'
|
2022-06-01 10:58:59 +08:00 |
|
wangliwen
|
d3acb25a6c
|
我的站内信根据阅读状态过滤
|
2022-06-01 10:56:45 +08:00 |
|
JunheZhang
|
c0b0138ddb
|
开启定时任务，每隔一分钟更新任务列表
|
2022-06-01 10:55:36 +08:00 |
|
huangweixiong
|
d503bba7dd
|
【视频监控，创城合并】配置文件修改
|
2022-06-01 09:53:17 +08:00 |
|
wuweida
|
8647759032
|
添加注释
|
2022-05-31 14:59:52 +08:00 |
|
huangweixiong
|
fead8c3958
|
【监控视频同步】同步自己的监控摄像头
|
2022-05-31 11:33:07 +08:00 |
|
huangweixiong
|
6be1ab699e
|
【单点登录】兼容自己的登录逻辑
|
2022-05-31 11:32:16 +08:00 |
|
wuweida
|
ebd57157c8
|
整合monitor到renren框架
|
2022-05-31 11:11:13 +08:00 |
|
wangliwen
|
425f6d30a6
|
站内信消息通知优化
|
2022-05-31 10:20:20 +08:00 |
|
dinggang
|
12dcb9910d
|
解决调用大数据接口请求返回异常
|
2022-05-30 18:59:33 +08:00 |
|
wangliwen
|
10b9bf8906
|
审核人也接受消息通知
|
2022-05-30 18:12:34 +08:00 |
|
wangliwen
|
c4e2427668
|
线程安全
|
2022-05-30 18:04:37 +08:00 |
|
wangliwen
|
b2ab1d5a9e
|
重放处理的优化
|
2022-05-30 15:47:00 +08:00 |
|
wangliwen
|
632ed9a6e3
|
屮
|
2022-05-30 15:26:57 +08:00 |
|
wangliwen
|
abacd77904
|
出现重放 加以解决
|
2022-05-30 15:16:49 +08:00 |
|
wangliwen
|
80a0dbb73b
|
消息发送者 显示异常
|
2022-05-30 14:44:25 +08:00 |
|
wangliwen
|
aa27a8ad5a
|
...
|
2022-05-30 14:22:40 +08:00 |
|
wangliwen
|
b5498b1a80
|
消息通知发起人
|
2022-05-30 14:05:07 +08:00 |
|
wangliwen
|
d714038dfb
|
调整注解位置
|
2022-05-30 11:32:01 +08:00 |
|
wangliwen
|
ca3c963981
|
...
|
2022-05-30 11:15:40 +08:00 |
|
wangliwen
|
4e0e39da8d
|
审批节点分配审批人时事件注解
|
2022-05-30 11:11:02 +08:00 |
|
JunheZhang
|
9eeab30dcf
|
告警信息查询信息按时间倒序展示
|
2022-05-27 14:08:43 +08:00 |
|
wangliwen
|
03db648aee
|
...
|
2022-05-27 14:01:24 +08:00 |
|
wangliwen
|
61db8a5f7d
|
...
|
2022-05-27 11:11:53 +08:00 |
|
wangliwen
|
698576ad9a
|
我的申请模糊查询
|
2022-05-27 10:43:32 +08:00 |
|
wangliwen
|
7f7fadbafc
|
Merge remote-tracking branch 'origin/zhangjunhe'
|
2022-05-26 19:43:56 +08:00 |
|
wangliwen
|
1b67c7865a
|
屮
|
2022-05-26 19:38:54 +08:00 |
|
wangliwen
|
7ba6af7f05
|
分页的处理
|
2022-05-26 19:26:44 +08:00 |
|
wangliwen
|
ecd78da476
|
...
|
2022-05-26 19:18:13 +08:00 |
|
wangliwen
|
68ea4d03a0
|
试一试
|
2022-05-26 19:17:24 +08:00 |
|
wangliwen
|
c49d8ed1ba
|
...
|
2022-05-26 19:10:43 +08:00 |
|
JunheZhang
|
d4b544e1b9
|
增加了任务列表查询，告警信息查询
|
2022-05-26 18:59:34 +08:00 |
|
wangliwen
|
7429fb7a31
|
我的申请模糊查询bug？
|
2022-05-26 18:43:00 +08:00 |
|
wangliwen
|
6d11d96360
|
免批资源的判断
|
2022-05-26 16:17:54 +08:00 |
|
dinggang
|
dabf8dca50
|
能力统计-资源图谱
|
2022-05-26 11:02:57 +08:00 |
|
dinggang
|
90dbf582a4
|
能力统计-资源图谱
|
2022-05-26 10:32:42 +08:00 |
|
wangliwen
|
0b9632fc71
|
...
|
2022-05-25 14:51:49 +08:00 |
|
wangliwen
|
9ff764fd9d
|
...
|
2022-05-25 13:49:37 +08:00 |
|
dinggang
|
3444868612
|
能力统计-资源图谱
|
2022-05-25 11:13:25 +08:00 |
|
wangliwen
|
2a6e4959b3
|
排序优化
|
2022-05-25 10:04:42 +08:00 |
|
wangliwen
|
db8319022e
|
申请应用领域分词
|
2022-05-25 09:53:41 +08:00 |
|
wangliwen
|
05ad116e04
|
资源提供方应用领域分词
|
2022-05-25 09:44:09 +08:00 |
|
wangliwen
|
08bde6f597
|
Merge remote-tracking branch 'origin/master'
|
2022-05-25 08:59:33 +08:00 |
|
wangliwen
|
61ec67c9a1
|
topN按数目逆序
|
2022-05-25 08:56:53 +08:00 |
|
dinggang
|
6e5c80e48f
|
能力统计-资源图谱
|
2022-05-24 21:08:43 +08:00 |
|
dinggang
|
b1e9fd607e
|
能力统计-资源图谱
|
2022-05-24 19:49:37 +08:00 |
|
wangliwen
|
9129b115ff
|
..
|
2022-05-24 18:43:08 +08:00 |
|
wangliwen
|
86b7ecc0e5
|
过滤掉其他
|
2022-05-24 18:39:19 +08:00 |
|
wangliwen
|
bcf940114c
|
部门名
|
2022-05-24 18:14:52 +08:00 |
|
wangliwen
|
381c32fd30
|
Merge branch 'wangliwen'
|
2022-05-24 18:02:24 +08:00 |
|
wangliwen
|
d9026207e1
|
能力共享方-应用领域接口；能力申请方-应用领域；
|
2022-05-24 18:01:31 +08:00 |
|
huangweixiong
|
1ca0606cc3
|
资源统计接口转发
|
2022-05-24 16:04:57 +08:00 |
|
huangweixiong
|
042ed549f5
|
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: (82 commits)
需求接口出评论数目
...
兼容已经重复提交过下架的资源
...
资源重复下线错误提示
资源重复下架
....
被覆盖？
。。。
...
该资源已发起下架，重复发起下架时 抛出异常
...
...
统计资源访问量
...
我的待办查出流转状态
资源下架申请中状态仍然为正常
指定编译目标为jdk1.8
能力申请若为大数据负责人申请，大数据级别申请默认通过；若申请者为资源所属部门审批人，默认通过；
我的待办只出仍然在运行的任务
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-05-24 15:33:26 +08:00 |
|
huangweixiong
|
f6e52a5c59
|
资源数据转发
|
2022-05-24 15:29:25 +08:00 |
|
wangliwen
|
da1cc12fe9
|
Merge remote-tracking branch 'origin/master' into wangliwen
|
2022-05-24 09:09:41 +08:00 |
|
wangliwen
|
cea2901afa
|
需求接口出评论数目
|
2022-05-24 09:09:22 +08:00 |
|
dinggang
|
ba372c2386
|
...
|
2022-05-23 18:28:02 +08:00 |
|
wangliwen
|
59d13aadc8
|
兼容已经重复提交过下架的资源
|
2022-05-23 10:47:02 +08:00 |
|
wangliwen
|
e6093fb62a
|
...
|
2022-05-23 10:24:50 +08:00 |
|
wangliwen
|
1c7e2dcdc1
|
资源重复下线错误提示
|
2022-05-23 09:45:53 +08:00 |
|
wangliwen
|
27d692f575
|
资源重复下架
|
2022-05-20 18:35:47 +08:00 |
|
wangliwen
|
07711e2928
|
....
|
2022-05-20 18:29:59 +08:00 |
|
wangliwen
|
1091344da1
|
被覆盖？
|
2022-05-20 18:24:21 +08:00 |
|
wangliwen
|
2d40ab3eb1
|
。。。
|
2022-05-20 18:18:23 +08:00 |
|
wangliwen
|
31a6998a57
|
...
|
2022-05-20 18:12:03 +08:00 |
|
wangliwen
|
e994527810
|
该资源已发起下架，重复发起下架时 抛出异常
|
2022-05-20 18:11:14 +08:00 |
|
wangliwen
|
8cdefe07de
|
...
|
2022-05-20 18:03:16 +08:00 |
|
wangliwen
|
9801eb50f4
|
...
|
2022-05-20 12:03:19 +08:00 |
|
wangliwen
|
8aa344d8a3
|
统计资源访问量
|
2022-05-20 11:30:29 +08:00 |
|
wangliwen
|
46851b85f9
|
...
|
2022-05-20 11:05:35 +08:00 |
|
wangliwen
|
6423f22b42
|
我的待办查出流转状态
|
2022-05-20 10:53:59 +08:00 |
|
wangliwen
|
ab36bb4f77
|
资源下架申请中状态仍然为正常
|
2022-05-20 10:31:37 +08:00 |
|
wangliwen
|
7f5521484b
|
指定编译目标为jdk1.8
|
2022-05-20 10:23:52 +08:00 |
|
wangliwen
|
10173db6d1
|
能力申请若为大数据负责人申请，大数据级别申请默认通过；若申请者为资源所属部门审批人，默认通过；
|
2022-05-20 10:16:51 +08:00 |
|
wangliwen
|
0978d219df
|
Merge branch 'wangliwen'
|
2022-05-20 09:58:00 +08:00 |
|
wangliwen
|
83434616ce
|
我的待办只出仍然在运行的任务
|
2022-05-20 09:57:46 +08:00 |
|
dinggang
|
093d51efab
|
...
|
2022-05-19 17:22:53 +08:00 |
|
dinggang
|
e7a36f02b9
|
...
|
2022-05-19 15:11:41 +08:00 |
|
dinggang
|
19bbf0f606
|
二级搜索左侧根据部门搜索，统计浏览统计接口
|
2022-05-19 15:07:23 +08:00 |
|
dinggang
|
767968d01f
|
...
|
2022-05-18 18:06:47 +08:00 |
|
wangliwen
|
c2d82d8ddc
|
需求审批通过
|
2022-05-18 17:19:14 +08:00 |
|
wangliwen
|
a68dd97428
|
查询资源失败时的补充
|
2022-05-18 17:05:47 +08:00 |
|
wangliwen
|
27639c1832
|
fix npe
|
2022-05-18 16:39:42 +08:00 |
|
wangliwen
|
ee641f3008
|
...
|
2022-05-18 16:30:08 +08:00 |
|
wangliwen
|
248f4aecb7
|
特殊处理资源DTO在流程引擎内的值
|
2022-05-18 16:21:15 +08:00 |
|
wangliwen
|
1168f08172
|
资源下架被驳回时重新录入表单
|
2022-05-18 16:13:51 +08:00 |
|
wangliwen
|
479cf97d8d
|
驳回 对能力上架表单进行特殊处理
|
2022-05-18 15:18:11 +08:00 |
|
wangliwen
|
dc0c5bb726
|
....
|
2022-05-18 14:38:33 +08:00 |
|
wangliwen
|
a37f557870
|
...
|
2022-05-18 13:47:19 +08:00 |
|
wangliwen
|
d6540e250e
|
...
|
2022-05-18 11:29:40 +08:00 |
|
wangliwen
|
fec55086b6
|
需求驳回、拒绝时 状态
|
2022-05-18 11:23:26 +08:00 |
|
wangliwen
|
ef50bd85b3
|
驳回重新提交后各标志位重置
|
2022-05-18 10:24:44 +08:00 |
|
wangliwen
|
02fa716c48
|
前台页面驳回后，重新提交表单发起流程
|
2022-05-18 10:09:01 +08:00 |
|
dinggang
|
c073b8fe41
|
新增浏览记录，算法仓查询接口，修复能力修改bug
|
2022-05-17 18:13:13 +08:00 |
|
wangliwen
|
b49f52b121
|
资源挂载加入资源id标志
|
2022-05-17 17:39:56 +08:00 |
|
wangliwen
|
ae454b942a
|
资源录入加日志
|
2022-05-17 15:54:50 +08:00 |
|
wangliwen
|
4941922a1f
|
npe
|
2022-05-17 15:42:27 +08:00 |
|
wangliwen
|
469cc7fac7
|
npe
|
2022-05-17 15:24:57 +08:00 |
|
wangliwen
|
d07326244e
|
npe
|
2022-05-17 14:43:06 +08:00 |
|
wangliwen
|
ba93c270b0
|
提取驳回标志
|
2022-05-17 11:05:52 +08:00 |
|
wangliwen
|
494fa2c379
|
流程节点通过时，标识驳回为false
|
2022-05-17 11:01:21 +08:00 |
|
wangliwen
|
d9c3b28ec5
|
...
|
2022-05-17 10:54:23 +08:00 |
|
wangliwen
|
35bd409045
|
...
|
2022-05-17 10:49:43 +08:00 |
|
wangliwen
|
08f028e0a1
|
...
|
2022-05-17 10:40:33 +08:00 |
|
wangliwen
|
9cbba2477b
|
我发起的流程 添加 是否驳回到第一节点
|
2022-05-17 10:34:00 +08:00 |
|
wangliwen
|
3aef51ab1d
|
TODO 驳回后，重新录入流程表单?
|
2022-05-16 17:49:26 +08:00 |
|
wangliwen
|
f0f86ae32d
|
...
|
2022-05-16 17:34:00 +08:00 |
|
wangliwen
|
b6d3aff11e
|
日志级别修改
|
2022-05-16 16:51:28 +08:00 |
|
wangliwen
|
e0783aac0a
|
...
|
2022-05-16 16:47:48 +08:00 |
|
wangliwen
|
396a7b5c6b
|
加入公共录入表单（作为所有流程第一个用户任务）处理
|
2022-05-16 16:33:36 +08:00 |
|
wangliwen
|
34fd01f208
|
直接终止拒绝时，各类审批流程的处理
|
2022-05-16 15:47:24 +08:00 |
|
wangliwen
|
9d06c43739
|
...
|
2022-05-16 14:46:52 +08:00 |
|
wangliwen
|
51949f672d
|
加入审核公用dto
|
2022-05-16 14:46:40 +08:00 |
|
wangliwen
|
f1b1063044
|
。。。
|
2022-05-13 18:02:33 +08:00 |
|
wangliwen
|
80769609ea
|
...
|
2022-05-13 17:48:37 +08:00 |
|
dinggang
|
c2a9881317
|
新增演示环境，修改门户查询逻辑
|
2022-05-13 17:30:05 +08:00 |
|
dinggang
|
dda2c6c6b5
|
新增演示环境，修改门户查询逻辑
|
2022-05-13 11:17:21 +08:00 |
|
wangliwen
|
ddc5932938
|
...
|
2022-05-13 10:53:34 +08:00 |
|
wangliwen
|
4c25b8ab4b
|
发布应用到网关失败 防止流程阻塞
|
2022-05-13 10:42:25 +08:00 |
|
wangliwen
|
1cce4f9888
|
gson 时间戳问题
|
2022-05-13 10:23:20 +08:00 |
|
wangliwen
|
d34303b92f
|
fixbug #139 我的申请，免批申请的资源，查看流程时，无法展示资源部门负责人
|
2022-05-13 10:15:30 +08:00 |
|
wangliwen
|
7edd5ae2fd
|
...
|
2022-05-13 10:03:57 +08:00 |
|
wangliwen
|
10899efa6c
|
时间戳序列化问题
|
2022-05-13 09:35:49 +08:00 |
|
dinggang
|
9e155eaf73
|
门户搜索修改
|
2022-05-12 18:10:13 +08:00 |
|
wangliwen
|
77628f982b
|
统计各类资源申请数目
|
2022-05-12 15:15:22 +08:00 |
|
dinggang
|
1abc8a883e
|
门户搜索修改
|
2022-05-12 13:48:47 +08:00 |
|
wangliwen
|
a73228e07e
|
亚微打包问题
|
2022-05-12 12:38:34 +08:00 |
|
wangliwen
|
d5f249ccb6
|
...
|
2022-05-12 11:31:48 +08:00 |
|
wangliwen
|
5583c2b609
|
...
|
2022-05-12 10:55:08 +08:00 |
|
wangliwen
|
9652a63dd5
|
npe
|
2022-05-12 10:50:44 +08:00 |
|
dinggang
|
939864d0f6
|
门户搜索修改
|
2022-05-11 20:52:48 +08:00 |
|
dinggang
|
ba2cf96791
|
新增工作动态,门户搜索修改
|
2022-05-11 20:19:31 +08:00 |
|
dinggang
|
20d8ceb860
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 20:06:42 +08:00 |
|
wangliwen
|
564728efc2
|
找回
|
2022-05-11 18:18:22 +08:00 |
|
wangliwen
|
6d0aec6686
|
...
|
2022-05-11 18:13:45 +08:00 |
|
wangliwen
|
5b1c97b802
|
...
|
2022-05-11 17:25:21 +08:00 |
|
wangliwen
|
d6b9fa0677
|
统计的补充
|
2022-05-11 16:57:59 +08:00 |
|
wangliwen
|
68eeb69bc7
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 16:33:23 +08:00 |
|
wangliwen
|
fd132c749c
|
申请情况加入资源的存续情况
|
2022-05-11 16:32:59 +08:00 |
|
huangweixiong
|
56cc7cfbf4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
# renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java
|
2022-05-11 16:27:32 +08:00 |
|
huangweixiong
|
06085b9eea
|
【网关对接】修改申请字段以及流程调整
|
2022-05-11 16:26:06 +08:00 |
|
wangliwen
|
39b76c5c76
|
审核状态不正确的处理
|
2022-05-11 16:10:13 +08:00 |
|
wangliwen
|
7c99310df7
|
...
|
2022-05-11 16:01:46 +08:00 |
|
wangliwen
|
0014610f58
|
...
|
2022-05-11 16:00:58 +08:00 |
|
wangliwen
|
53efbf246e
|
...
|
2022-05-11 15:58:41 +08:00 |
|
wangliwen
|
105b6b536c
|
资源数目统计
|
2022-05-11 15:31:48 +08:00 |
|
wangliwen
|
cd7831e68c
|
...
|
2022-05-11 12:53:04 +08:00 |
|
wangliwen
|
b59b830beb
|
...
|
2022-05-11 11:51:57 +08:00 |
|
wangliwen
|
aeaffb269f
|
...
|
2022-05-11 11:48:30 +08:00 |
|
wangliwen
|
0f92ae06e5
|
...
|
2022-05-11 11:39:11 +08:00 |
|
wangliwen
|
a2eefd990d
|
...
|
2022-05-11 11:33:24 +08:00 |
|
wangliwen
|
c5377cb7f3
|
防止覆盖前端参数
|
2022-05-11 11:28:19 +08:00 |
|
dinggang
|
f82fdcd5f3
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 11:20:44 +08:00 |
|
wangliwen
|
87e93469e8
|
应用简略信息
|
2022-05-11 11:19:37 +08:00 |
|
wangliwen
|
8684700c19
|
...
|
2022-05-11 10:45:03 +08:00 |
|
wangliwen
|
49bf48472a
|
...
|
2022-05-11 10:22:47 +08:00 |
|
wangliwen
|
a00007992a
|
免批资源申请默认审核通过
|
2022-05-11 09:59:39 +08:00 |
|
dinggang
|
8822dbac56
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 09:49:48 +08:00 |
|
wangliwen
|
830c09feaf
|
下架通过 资源状态改变
|
2022-05-11 09:47:23 +08:00 |
|
wangliwen
|
a53b817aec
|
资源基础信息
|
2022-05-11 09:13:40 +08:00 |
|
wangliwen
|
d0ae226585
|
记录资源下架发起人姓名
|
2022-05-10 17:21:57 +08:00 |
|
wangliwen
|
dd261257b8
|
npe 管理员的部门id不存在的情况
|
2022-05-10 16:17:05 +08:00 |
|
wangliwen
|
fd645cffeb
|
资源下架流程
|
2022-05-10 15:37:56 +08:00 |
|
dinggang
|
912275a01f
|
Merge remote-tracking branch 'origin/master'
|
2022-05-10 11:15:01 +08:00 |
|
wangliwen
|
104d3b5129
|
...
|
2022-05-10 10:15:46 +08:00 |
|
wangliwen
|
dedb813021
|
资源的状态加入枚举
|
2022-05-10 09:57:18 +08:00 |
|
huangweixiong
|
917bd4521e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
# renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
|
2022-05-09 15:34:49 +08:00 |
|
huangweixiong
|
4815e9f3f5
|
【统一单点】修改登录逻辑
|
2022-05-09 15:31:24 +08:00 |
|
huangweixiong
|
fd0a070abc
|
【能力上架申请】添加api网关集成
|
2022-05-09 15:30:52 +08:00 |
|
wangliwen
|
6e5d988f16
|
打包安装包时 排除prod配置环境
|
2022-05-09 10:47:03 +08:00 |
|
dinggang
|
856b62fdc4
|
Merge remote-tracking branch 'origin/master'
|
2022-05-07 11:48:53 +08:00 |
|
wangliwen
|
3d9e860a46
|
资源所有者审核通过后 资源申请审核状态变化
|
2022-05-07 10:18:39 +08:00 |
|
wangliwen
|
3fe2162412
|
...
|
2022-05-06 20:33:48 +08:00 |
|
wangliwen
|
4a94caddd3
|
...
|
2022-05-06 20:32:36 +08:00 |
|
dinggang
|
e9e2354a16
|
Merge remote-tracking branch 'origin/master'
|
2022-05-06 17:05:56 +08:00 |
|
wangliwen
|
497a9b6d43
|
...
|
2022-05-06 17:03:05 +08:00 |
|
wangliwen
|
25baa8b775
|
忽略把当前项目的输出jar包并使用
|
2022-05-06 17:00:37 +08:00 |
|
wangliwen
|
048861c2c6
|
运行脚本
|
2022-05-06 16:49:14 +08:00 |
|
dinggang
|
2b65f9f9d8
|
新增工作动态
|
2022-05-06 16:49:09 +08:00 |
|
wangliwen
|
d957021bd2
|
使用assembly 分离依赖与配置文件
|
2022-05-06 16:35:03 +08:00 |
|
wangliwen
|
41e0508179
|
对评论内容也做模糊查询
|
2022-05-06 11:15:23 +08:00 |
|
wangliwen
|
5071dfed4a
|
npe
|
2022-05-06 11:09:17 +08:00 |
|
wangliwen
|
953f4b628d
|
...
|
2022-05-06 11:04:14 +08:00 |
|
wangliwen
|
ac5aecf518
|
需求主题模糊查询与需求评论模糊查询
|
2022-05-06 10:59:27 +08:00 |
|
wangliwen
|
4566c0303b
|
...
|
2022-05-06 10:06:36 +08:00 |
|
wangliwen
|
01d4ff1157
|
我的评论（需求评论）
|
2022-05-06 09:50:04 +08:00 |
|
wangliwen
|
efb58708e6
|
pom 调整
|
2022-05-05 16:43:58 +08:00 |
|
wangliwen
|
d9da76cea0
|
...
|
2022-05-05 14:22:14 +08:00 |
|
wangliwen
|
b04d8c86c9
|
...
|
2022-05-05 14:06:27 +08:00 |
|
wangliwen
|
3b0ecebdfb
|
附件的补充
|
2022-05-05 13:54:07 +08:00 |
|
wangliwen
|
8c33300983
|
日志保存时间调整
|
2022-05-05 11:54:43 +08:00 |
|
wangliwen
|
22415f8a43
|
能力申请 增加附件
|
2022-05-05 11:28:52 +08:00 |
|
wangliwen
|
45c87076c5
|
能力上架申请 增加附件
|
2022-05-05 10:56:35 +08:00 |
|
wangliwen
|
ca33bb0576
|
能力资源上架 审批历史增加字段显示
|
2022-05-05 10:35:02 +08:00 |
|
wangliwen
|
4785caa2f5
|
结束整个流程end事件监听
|
2022-05-05 10:05:58 +08:00 |
|
wangliwen
|
113d7b482a
|
加日志
|
2022-05-05 10:04:50 +08:00 |
|
wangliwen
|
94c46eadb2
|
...
|
2022-05-05 09:54:35 +08:00 |
|
wangliwen
|
8b4966349e
|
del_flag 的过滤
|
2022-05-05 09:12:17 +08:00 |
|
wangliwen
|
c994be67d2
|
...
|
2022-04-29 17:57:49 +08:00 |
|
wangliwen
|
604ddc049e
|
npe
|
2022-04-29 16:47:34 +08:00 |
|
wangliwen
|
a64b56dd14
|
审批监听结束事件end事件
|
2022-04-29 15:45:40 +08:00 |
|
dinggang
|
ed92e3568f
|
查询我的发布
|
2022-04-29 15:06:18 +08:00 |
|
wangliwen
|
dec5ac235f
|
能力资源上架 通过后
|
2022-04-29 12:00:17 +08:00 |
|
dinggang
|
828d6baae4
|
查询我的发布
|
2022-04-29 11:24:29 +08:00 |
|
wangliwen
|
f4090ec01c
|
npe
|
2022-04-28 21:37:47 +08:00 |
|
wangliwen
|
7da01b64ad
|
Merge remote-tracking branch 'origin/master'
|
2022-04-28 21:35:38 +08:00 |
|
wangliwen
|
11e2ca64d3
|
...
|
2022-04-28 21:34:56 +08:00 |
|
dinggang
|
65f0f31276
|
bug修复
|
2022-04-28 20:19:09 +08:00 |
|
wangliwen
|
5e80283fde
|
...
|
2022-04-28 13:22:11 +08:00 |
|
wangliwen
|
ed4bb8d71f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-28 11:36:25 +08:00 |
|
huangweixiong
|
27afac32a7
|
【能力上架申请】审批通过后网关注册成功只更新groupid字段
|
2022-04-28 11:24:51 +08:00 |
|
huangweixiong
|
84cc1b43f2
|
能力申请保存当前用户
|
2022-04-28 11:18:45 +08:00 |
|
wangliwen
|
7f7c4d2b15
|
一点优化
|
2022-04-28 09:18:24 +08:00 |
|
wangliwen
|
940fc384aa
|
ie 的支持
|
2022-04-27 20:29:51 +08:00 |
|
wangliwen
|
85931f3e0e
|
npe
|
2022-04-27 20:29:34 +08:00 |
|
wangliwen
|
c7c5f52b1e
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 19:09:57 +08:00 |
|
wangliwen
|
bb26b9ba61
|
补充字段信息
|
2022-04-27 19:09:41 +08:00 |
|
dinggang
|
b5ba97c55f
|
门户首页及二级搜索页面排序实现
|
2022-04-27 19:01:04 +08:00 |
|
wangliwen
|
2e45b8f47b
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 18:44:08 +08:00 |
|
wangliwen
|
afbab8b012
|
...
|
2022-04-27 18:43:54 +08:00 |
|
dinggang
|
39602c3fbe
|
门户首页及二级搜索页面排序实现
|
2022-04-27 18:05:47 +08:00 |
|
wangliwen
|
f7eff75ad7
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 16:53:12 +08:00 |
|
wangliwen
|
80cb1b7570
|
...
|
2022-04-27 16:52:59 +08:00 |
|
dinggang
|
a519811d4c
|
门户首页及二级搜索页面排序实现
|
2022-04-27 16:50:16 +08:00 |
|
huangweixiong
|
4638a6ad94
|
上架审批结束推送api网关
|
2022-04-27 16:32:58 +08:00 |
|
wangliwen
|
a09436b162
|
...
|
2022-04-27 14:08:54 +08:00 |
|
wangliwen
|
989f1586b4
|
终极审批人（啥都查不到）更换为崔腾
|
2022-04-27 11:28:30 +08:00 |
|
wangliwen
|
3d97d7a2be
|
未填资源所属部门时，指定提交人部门审核人审核
|
2022-04-27 11:06:38 +08:00 |
|
wangliwen
|
fec96155a0
|
sql 生成异常
|
2022-04-27 10:47:04 +08:00 |
|
dinggang
|
63a0c20343
|
开发指南文件上传修改
|
2022-04-26 20:37:19 +08:00 |
|
wangliwen
|
66e50fd582
|
一些权限限制的去除
|
2022-04-26 19:48:10 +08:00 |
|
wangliwen
|
444b96b312
|
...
|
2022-04-26 19:33:24 +08:00 |
|
wangliwen
|
d533df53c0
|
...
|
2022-04-26 17:52:18 +08:00 |
|
wangliwen
|
e0c38aca8e
|
排查日志
|
2022-04-26 17:16:13 +08:00 |
|
wangliwen
|
ca018b7855
|
反序列化
|
2022-04-26 16:53:08 +08:00 |
|
wangliwen
|
9e8401ea8e
|
...
|
2022-04-26 16:32:26 +08:00 |
|
wangliwen
|
aff4b37d5c
|
...
|
2022-04-26 15:13:26 +08:00 |
|
wangliwen
|
77faae8e73
|
Merge remote-tracking branch 'origin/master'
|
2022-04-26 15:11:10 +08:00 |
|
wangliwen
|
8532b21999
|
...
|
2022-04-26 15:10:58 +08:00 |
|
dinggang
|
98c5978c7a
|
开发指南文件上传修改
|
2022-04-26 15:09:51 +08:00 |
|
wangliwen
|
299d0cc19b
|
。。。
|
2022-04-26 15:04:27 +08:00 |
|
dinggang
|
816ec82d45
|
能力表修改
|
2022-04-26 11:51:08 +08:00 |
|
dinggang
|
e525007c0c
|
开发指南修改
|
2022-04-26 11:41:15 +08:00 |
|
wangliwen
|
e5cea2d03b
|
Gson报错Invalid time zone indicator 的处理
|
2022-04-26 11:35:39 +08:00 |
|
wangliwen
|
eb72e3fb74
|
提供需求创建者分页查询
|
2022-04-26 11:06:33 +08:00 |
|
dinggang
|
3e3183c511
|
编目新增一级分类创建保存开发指南文件的文件夹
|
2022-04-26 10:47:18 +08:00 |
|
wangliwen
|
d1d2e5ed65
|
...
|
2022-04-26 10:13:49 +08:00 |
|
wangliwen
|
406826f14e
|
Merge remote-tracking branch 'origin/master'
|
2022-04-26 09:53:35 +08:00 |
|
wangliwen
|
0ae65d020d
|
加入需求评论
|
2022-04-26 09:53:13 +08:00 |
|
dinggang
|
4eade083b9
|
编目新增一级分类创建保存开发指南文件的文件夹
|
2022-04-26 09:52:39 +08:00 |
|
wangliwen
|
19f628ee58
|
...
|
2022-04-26 09:26:21 +08:00 |
|
wangliwen
|
258dcbb57a
|
npe
|
2022-04-26 09:01:33 +08:00 |
|
DingGang
|
88150d1c63
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 22:26:33 +08:00 |
|
DingGang
|
416b27074a
|
开发指南文件获取，保存
|
2022-04-25 22:21:56 +08:00 |
|
wangliwen
|
a551408bc7
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 19:59:56 +08:00 |
|
wangliwen
|
9312095dfa
|
....
|
2022-04-25 19:59:40 +08:00 |
|
dinggang
|
94cf76e322
|
能力表字段修改，开发指南文件相关功能
|
2022-04-25 17:53:08 +08:00 |
|
wangliwen
|
2ff2137b81
|
...
|
2022-04-25 17:31:53 +08:00 |
|
wangliwen
|
6768f8567f
|
...
|
2022-04-25 17:25:15 +08:00 |
|
wangliwen
|
01728a8cfb
|
需求申请监听器
|
2022-04-25 17:05:48 +08:00 |
|
wangliwen
|
2756ed523b
|
...
|
2022-04-25 15:51:59 +08:00 |
|
wangliwen
|
f4a756ec19
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 14:19:09 +08:00 |
|
wangliwen
|
8d44b59fe5
|
..
|
2022-04-25 14:19:02 +08:00 |
|
dinggang
|
b5dd0c91f8
|
门户首页查询最新能力，最热能力实现修改，编目字段表新增字段，能力资源表字段修改
|
2022-04-25 14:08:34 +08:00 |
|
wangliwen
|
60685c8878
|
资源录入区分前端与管理后台录入
|
2022-04-25 12:39:10 +08:00 |
|
wangliwen
|
cd0aca28c8
|
...
|
2022-04-25 09:58:12 +08:00 |
|
wangliwen
|
453dc0a6d6
|
能力上架 所有部门审批人 动态设置
|
2022-04-24 17:57:24 +08:00 |
|
wangliwen
|
f059f2b76a
|
资源上架 申请功能
|
2022-04-24 17:19:07 +08:00 |
|
wangliwen
|
4c23160773
|
Merge remote-tracking branch 'origin/master'
|
2022-04-24 16:32:45 +08:00 |
|
wangliwen
|
bb13945d43
|
资源上架 流程初始化
|
2022-04-24 16:32:32 +08:00 |
|
dinggang
|
8dab238003
|
门户首页各种条件查询能力，新增我的收藏和评分功能
|
2022-04-24 16:30:15 +08:00 |
|
wangliwen
|
0d1036c3d7
|
...
|
2022-04-24 11:57:59 +08:00 |
|
wangliwen
|
4fb3b092cf
|
npe
|
2022-04-24 11:27:04 +08:00 |
|
wangliwen
|
21e45f919b
|
加点字段
|
2022-04-24 10:37:37 +08:00 |
|
wangliwen
|
f57681856c
|
能力申请 使用配置文件进行配置
|
2022-04-24 09:45:43 +08:00 |
|
wangliwen
|
368e33b0d5
|
Merge remote-tracking branch 'origin/master'
|
2022-04-24 08:43:05 +08:00 |
|
wangliwen
|
997e2a7fa2
|
加上自动通过的意见
|
2022-04-24 08:42:32 +08:00 |
|
DingGang
|
c28ec496f1
|
门户查询最新及最热能力
|
2022-04-23 18:51:52 +08:00 |
|
dinggang
|
d70cb67c06
|
Merge remote-tracking branch 'origin/master'
|
2022-04-22 18:21:45 +08:00 |
|
dinggang
|
b123adda7a
|
前台跳转登录后台管理系统权限
|
2022-04-22 18:20:24 +08:00 |
|
wangliwen
|
4d21104623
|
...
|
2022-04-22 18:07:43 +08:00 |
|
wangliwen
|
5f2317e6fa
|
我的代办加上 申请时的表单信息
|
2022-04-22 17:29:25 +08:00 |
|
wangliwen
|
d7735a4fdf
|
二级审批为大数据时，直接审核通过
|
2022-04-22 17:04:34 +08:00 |
|
wangliwen
|
3decf28405
|
流程各节点加上审批人姓名
|
2022-04-22 16:15:17 +08:00 |
|
wangliwen
|
9c39989591
|
...
|
2022-04-22 14:31:31 +08:00 |
|
wangliwen
|
292b800a6a
|
清晰点的部门审批流程节点日志
|
2022-04-22 14:29:11 +08:00 |
|
dinggang
|
93ffea6021
|
修复查询用户时未添加岗位筛选条件时查询数据不对
|
2022-04-22 11:37:05 +08:00 |
|
dinggang
|
53a4af2bb8
|
加申购车参数校验
|
2022-04-22 10:10:58 +08:00 |
|
wangliwen
|
dcb415763e
|
配置文件
|
2022-04-21 20:51:45 +08:00 |
|
wangliwen
|
a1c2bc2c89
|
...
|
2022-04-21 20:31:26 +08:00 |
|
wangliwen
|
b0b7d752ae
|
npe
|
2022-04-21 20:18:12 +08:00 |
|
wangliwen
|
36220f9e70
|
npe
|
2022-04-21 20:05:54 +08:00 |
|
wangliwen
|
80648e1f59
|
入参的调整
|
2022-04-21 18:55:45 +08:00 |
|
wangliwen
|
424140dd0f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-21 18:00:53 +08:00 |
|
wangliwen
|
8a594d2180
|
增加大数据动态审批人
|
2022-04-21 18:00:32 +08:00 |
|
dinggang
|
5932ba8f8e
|
加申购车参数校验
|
2022-04-21 17:05:19 +08:00 |
|
dinggang
|
3deac71914
|
文件保存位置配置
|
2022-04-21 15:28:10 +08:00 |
|
wangliwen
|
b4bbdd1194
|
亚微 jar
|
2022-04-21 15:16:26 +08:00 |
|
dinggang
|
eeb9627347
|
开发指南测试
|
2022-04-21 14:16:31 +08:00 |
|
dinggang
|
80260a9fa0
|
开发指南测试
|
2022-04-21 10:29:35 +08:00 |
|
wangliwen
|
22133a83da
|
fix npe
|
2022-04-21 08:45:16 +08:00 |
|
wangliwen
|
f070be4ed8
|
...
|
2022-04-20 20:23:04 +08:00 |
|
dinggang
|
d51c1e701f
|
申购车功能，门户相关接口
|
2022-04-20 19:05:35 +08:00 |
|
dinggang
|
42c64253f8
|
申购车功能，门户相关接口
|
2022-04-20 17:34:34 +08:00 |
|
dinggang
|
c1cfa1781e
|
申购车功能，门户相关接口
|
2022-04-20 17:31:48 +08:00 |
|
wangliwen
|
db9a819aba
|
getMyProcessInstancePage接口字段的补充
|
2022-04-20 16:51:15 +08:00 |
|
wangliwen
|
cc1778e40b
|
根据申请填写的部门动态分配流程审批人
|
2022-04-20 15:05:19 +08:00 |
|
wangliwen
|
004537b865
|
加点日志文件的写入
|
2022-04-20 14:51:39 +08:00 |
|
wangliwen
|
d2439cd096
|
...
|
2022-04-20 10:50:43 +08:00 |
|
huangweixiong
|
57477cba83
|
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:
...
...
批量进行能力申请接口（一个接口搞定）
本地存储资源上传与访问
编目管理接口，资源管理接口修改
编目管理接口，资源管理接口修改
|
2022-04-19 10:07:37 +08:00 |
|
wangliwen
|
8ce7a18999
|
...
|
2022-04-19 10:04:47 +08:00 |
|
wangliwen
|
1e2a8a64cb
|
...
|
2022-04-18 17:12:14 +08:00 |
|
wangliwen
|
e0e3450a86
|
批量进行能力申请接口（一个接口搞定）
|
2022-04-18 17:12:06 +08:00 |
|
wangliwen
|
e1c935a254
|
本地存储资源上传与访问
|
2022-04-18 13:59:25 +08:00 |
|
dinggang
|
5f2bd3aeab
|
编目管理接口，资源管理接口修改
|
2022-04-15 11:49:50 +08:00 |
|
dinggang
|
c7e119ab1f
|
编目管理接口，资源管理接口修改
|
2022-04-14 23:51:01 +08:00 |
|
huangweixiong
|
388267109a
|
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:
删除人人开源注释，新增编目管理接口，资源管理接口
|
2022-04-14 19:30:08 +08:00 |
|
huangweixiong
|
ab6ee44ac9
|
流程钩子
|
2022-04-14 19:29:38 +08:00 |
|
dinggang
|
42b318b471
|
删除人人开源注释，新增编目管理接口，资源管理接口
|
2022-04-14 13:58:19 +08:00 |
|
huangweixiong
|
7e0481b0ee
|
ignore init
|
2022-04-14 10:35:02 +08:00 |
|
weixiong_huang
|
ed53a011b2
|
能力申请表单及流程接口
|
2022-04-14 10:10:40 +08:00 |
|
weixiong_huang
|
fd4fc9016b
|
Initial commit
|
2022-04-11 15:03:55 +08:00 |