wangliwen
|
fbf0c5150e
|
Merge branch 'dev'
|
2022-08-02 12:00:51 +08:00 |
|
wangliwen
|
6a12463098
|
？？？
|
2022-08-02 12:00:40 +08:00 |
|
wangliwen
|
d90b813367
|
Merge branch 'dev'
|
2022-08-02 11:29:42 +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
|
1c1aa5a5c2
|
Merge branch 'dev'
|
2022-08-02 09:28:58 +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
|
87340acccd
|
Merge branch 'dev'
|
2022-08-02 08:53:11 +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
|
57737a6092
|
Merge branch 'dev'
|
2022-08-01 14:41:09 +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
|
a0e5760970
|
Merge branch 'dev'
|
2022-08-01 14:37:13 +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
|
3e23b48581
|
Merge branch 'dev'
|
2022-08-01 11:35:37 +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
|
da126a9921
|
Merge branch 'dev'
|
2022-08-01 10:13:54 +08:00 |
|
wangliwen
|
b68daeda1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-01 10:13:33 +08:00 |
|
yitonglei
|
ff3e590dda
|
1、flyway提交的sql改版本号为4.4
|
2022-08-01 10:04:45 +08:00 |
|
dinggang
|
00651bc910
|
配置文件修改
|
2022-08-01 10:00:40 +08:00 |
|
dinggang
|
bb13969a1a
|
西海岸基础设施视频资源来源修改
|
2022-08-01 09:56:31 +08:00 |
|
dinggang
|
0e6984fb85
|
西海岸基础设施视频资源来源修改
|
2022-07-30 18:53:36 +08:00 |
|
wangliwen
|
a5a2b95113
|
Merge branch 'dev'
|
2022-07-29 18:04:18 +08:00 |
|
wangliwen
|
a26fce4ddb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 18:04:09 +08:00 |
|
yitonglei
|
e1327c7fee
|
1、增加获取视频资源过程中2张缓存表的定义
|
2022-07-29 17:57:29 +08:00 |
|
dinggang
|
4760fa1898
|
..
|
2022-07-29 17:52:26 +08:00 |
 lizhicheng
|
b525a1d50a
|
融合服务完善
|
2022-07-29 16:48:23 +08:00 |
|
wangliwen
|
dc9395aa62
|
Merge branch 'dev'
|
2022-07-29 13:55:08 +08:00 |
|
wangliwen
|
79807f44e2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 13:55:00 +08:00 |
|
yitonglei
|
c874e7f9cf
|
1、代码注释的修改
|
2022-07-29 12:05:22 +08:00 |
|
dinggang
|
20c21aabf7
|
..
|
2022-07-29 11:30:17 +08:00 |
|
yitonglei
|
353485ee04
|
no message
|
2022-07-29 11:30:09 +08:00 |
|
yitonglei
|
63125fa2c5
|
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的（主要是重新配置超时时间）
|
2022-07-29 11:29:18 +08:00 |
|
dinggang
|
52c4715b8f
|
..
|
2022-07-29 10:43:29 +08:00 |
|
wangliwen
|
8fcdbff2f1
|
Merge branch 'dev'
|
2022-07-29 09:58:58 +08:00 |
|
yitonglei
|
0ccdf069f8
|
1、根据新的流程重新梳理获取视频资源（地区和通道信息）
|
2022-07-29 09:31:47 +08:00 |
|
wangliwen
|
baab5ac0b3
|
Merge branch 'dev'
|
2022-07-28 20:06:42 +08:00 |
|
dinggang
|
7586127226
|
西海岸基础设施需求修改
|
2022-07-28 20:03:59 +08:00 |
|
wangliwen
|
7bf0b2a33e
|
Merge branch 'dev'
|
2022-07-28 19:01:10 +08:00 |
|
wangliwen
|
e74cc546f1
|
发送站内信 加点异常日志
|
2022-07-28 19:00:55 +08:00 |
|
wangliwen
|
1e624749cb
|
Merge branch 'dev'
|
2022-07-28 17:41:13 +08:00 |
|
wangliwen
|
fdbf32c47c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-28 17:41:05 +08:00 |
|
wangliwen
|
47888777f8
|
发送站内信There is no session 的处理
|
2022-07-28 17:40:52 +08:00 |