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

2612 Commits

Author SHA1 Message Date
wangliwen 06fc61a4fe Merge branch 'master' into docker_package 2022-08-02 14:50:22 +08:00
wangliwen 819a5a3f6b Merge branch 'dev' 2022-08-02 14:50:16 +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 dcba8d59a8 Merge branch 'dev' 2022-08-02 14:09:06 +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 e6ca8dc1a0 Merge branch 'dev' 2022-08-02 13:46:22 +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 fbf0c5150e Merge branch 'dev' 2022-08-02 12:00:51 +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 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 390828b619 Merge branch 'master' into docker_package 2022-08-02 09:29:06 +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 ea27fa60b1 Merge branch 'master' into docker_package 2022-08-02 08:53:20 +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 3d9ccca9c3 Merge branch 'master' into docker_package 2022-08-01 14:41:20 +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 89821d9d55 Merge branch 'master' into docker_package 2022-08-01 14:37:21 +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 5a14646104 Merge branch 'master' into docker_package 2022-08-01 11:35:47 +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 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 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 c4df90dd14 Merge branch 'master' into docker_package 2022-07-29 18:05:13 +08:00