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

1827 Commits

Author SHA1 Message Date
wangliwen d143699684 ... 2022-09-02 11:32:15 +08:00
zhangzhikang 2b1bc48814 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-09-02 11:09:11 +08:00
zhangzhikang 4f33fac986 0902会议室禅道问题修改 2022-09-02 11:08:54 +08:00
wangliwen c542c51e5c ... 2022-09-02 09:20:13 +08:00
Koi-tsk 087b1ca78f 停用账号不分配审批bug修复 2022-09-01 17:10:47 +08:00
wangliwen 7865ebbd27 能力申请V3 免批判断 2022-09-01 17:04:09 +08:00
wangliwen f3a155c44d Merge remote-tracking branch 'origin/dev' into dev 2022-09-01 13:48:11 +08:00
wangliwen 82a96dba99 ... 2022-09-01 13:47:55 +08:00
dinggang 7bdbc7dcb1 编目更新 2022-09-01 11:51:48 +08:00
zhangzhikang 28f4558fa6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 18:27:44 +08:00
zhangzhikang 9c7470a123 0831会议室禅道问题修改 2022-08-31 18:27:31 +08:00
wangliwen e251ae518f Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 16:54:09 +08:00
wangliwen be6968c78f 发送消息到亚微 2022-08-31 16:53:43 +08:00
yitonglei 82ca10d9eb no message 2022-08-31 16:19:43 +08:00
yitonglei cdca90474d Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 15:48:50 +08:00
yitonglei aa9f756f2c 添加注释，并删掉无用的注释 2022-08-31 15:48:15 +08:00
Koi-tsk c62cfc25a6 自动审批通过的节点不发消息 2022-08-31 15:31:01 +08:00
yitonglei d452ddb4fb 修改从金宏网获取用户的方法，增加自动任务调度功能 2022-08-31 13:50:46 +08:00
wangliwen ce1bce47c5 ... 2022-08-31 09:47:46 +08:00
wangliwen c7adca34bd 使用索引替换 2022-08-30 15:20:35 +08:00
wangliwen f95d2d0157 ... 2022-08-30 13:30:28 +08:00
wangliwen 35f004a75d ... 2022-08-30 13:03:34 +08:00
wangliwen b3074d25ad Merge remote-tracking branch 'origin/dev' into dev 2022-08-30 12:54:56 +08:00
wangliwen 77099bd434 是否申请的状态 2022-08-30 12:54:42 +08:00
Koi-tsk 795d890cd6 1.停用用户不分配审批 
2.连续重复只审批一次
 2022-08-30 11:50:40 +08:00
wangliwen fb95b0cfa7 ... 2022-08-30 11:30:24 +08:00
wangliwen d8e44a1f49 ... 2022-08-30 10:41:01 +08:00
wangliwen b835ce3f73 知识库左边树数据异常 2022-08-30 10:08:30 +08:00
Koi-tsk 13934c1da9 融合服务-数据资源bug修复 2022-08-29 10:08:10 +08:00
yitonglei 0f20088c46 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 18:29:47 +08:00
yitonglei 664a22ce4b no message 2022-08-26 18:28:08 +08:00
Koi-tsk c2a949ad13 融合服务-数据资源暂时注释 2022-08-26 18:16:34 +08:00
yitonglei 246bc4b4df Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 17:59:37 +08:00
yitonglei 0bfef296ab 从金宏获取用户增加更新能力 2022-08-26 17:59:02 +08:00
huangweixiong 73b02e3ce6 视频token失效重试 2022-08-26 17:56:13 +08:00
huangweixiong 12861d1c24 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:
  v3审批：当前审批与申请人一样，默认通过
  融合服务修改
  删除不需要的注释
  。。。
 2022-08-26 17:39:32 +08:00
huangweixiong 1e321145ac 视频流token失效重试 2022-08-26 17:39:19 +08:00
Koi-tsk fdc9019a4b v3审批：当前审批与申请人一样，默认通过 2022-08-26 16:26:18 +08:00
Koi-tsk ffe1b86a28 融合服务修改 2022-08-26 14:47:55 +08:00
yitonglei bc6dfd164d 删除不需要的注释 2022-08-26 14:32:44 +08:00
wangliwen 2590638c22 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 14:12:23 +08:00
wangliwen 8ce17a5601 。。。 2022-08-26 14:12:13 +08:00
huangweixiong 951923b551 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:
  同步知识库问题
  。。。
  user表新增字段
  融合服务修改
  修改获从金宏网获取用户信息，但是还是获取不到guid
  同步知识库的优化
  能力申请v3-bug fix
  ...
  ...
  调整跨区判断
  更新能力申请模型v3
  接口开启gzip压缩
  区、市监听器:修改表单字段获取逻辑
  applyState 字段返回值不一致的问题fix
  npe fix

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
 2022-08-26 13:47:12 +08:00
huangweixiong bf8a701e57 金宏待办推送对接 2022-08-26 13:44:04 +08:00
wangliwen 841cb32035 同步知识库问题 2022-08-26 11:36:42 +08:00
wangliwen 5727a36b3f 。。。 2022-08-26 11:27:37 +08:00
yitonglei 1f6438086c Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 11:03:23 +08:00
yitonglei e7ce6d3a1c user表新增字段 2022-08-26 11:02:03 +08:00
Koi-tsk 1336f6d5e4 融合服务修改 2022-08-26 10:37:20 +08:00
yitonglei 2d403dcc9e 修改获从金宏网获取用户信息，但是还是获取不到guid 2022-08-26 09:05:38 +08:00