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

1573 Commits

Author SHA1 Message Date
wangliwen 151a34f456 Merge branch 'master' into docker_package 2022-08-19 11:21:09 +08:00
wangliwen 13db3a21bc 能力申请V3补充 2022-08-19 11:20:53 +08:00
wangliwen bc760323fa Merge branch 'master' into docker_package 2022-08-19 10:04:28 +08:00
wangliwen 08c05a2a55 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-19 10:04:04 +08:00
wangliwen ea21ee8c76 Merge branch 'master' into docker_package 2022-08-19 10:03:24 +08:00
dinggang a20fd1f5c8 cim模块 2022-08-19 10:03:14 +08:00
wangliwen 633339f64b 能力申请 V3 2022-08-19 10:03:06 +08:00
wangliwen 43cd2c492a Merge branch 'master' into docker_package 2022-08-18 18:14:23 +08:00
wangliwen 368d78f48f ... 2022-08-18 18:14:08 +08:00
wangliwen fc11b15fbf Merge branch 'master' into docker_package 2022-08-18 14:53:58 +08:00
wangliwen 92542c2ad8 TODO 调整 2022-08-18 14:53:41 +08:00
wangliwen 069a42e0c0 ... 2022-08-18 10:17:46 +08:00
wangliwen 7fccba5008 Merge branch 'master' into docker_package 2022-08-18 10:01:26 +08:00
wangliwen 964bf55f12 TODO abilityprocess_v3 能力申请流程的发起 2022-08-18 10:01:04 +08:00
wangliwen 00592c3242 Merge branch 'master' into docker_package 2022-08-17 18:09:43 +08:00
Koi-tsk 617ecd64c8 初步完成区、市审批流程监听器 2022-08-17 17:41:55 +08:00
wangliwen 8337e4320d Merge branch 'master' into docker_package 2022-08-17 16:27:24 +08:00
wangliwen 4446657af2 500了 2022-08-17 16:27:11 +08:00
wangliwen 806dcb3d80 Merge branch 'master' into docker_package 2022-08-17 16:04:35 +08:00
wangliwen 0eb62c0885 增加下架附件文件名 2022-08-17 16:04:23 +08:00
wangliwen 0b0278a9fb Merge branch 'master' into docker_package 2022-08-17 15:44:38 +08:00
wangliwen 4028588ea7 下架新增录入字段 2022-08-17 15:43:27 +08:00
wangliwen f5c66771be Merge branch 'master' into docker_package 2022-08-17 11:17:08 +08:00
wangliwen b7ce167d5f 增加取消置顶接口 2022-08-17 11:16:34 +08:00
wangliwen 37adee5850 Merge branch 'master' into docker_package 2022-08-17 11:05:59 +08:00
huangweixiong 9bcdd78bae 网关重启适配 2022-08-17 11:04:49 +08:00
wangliwen 45cf2f747f Merge branch 'master' into docker_package 2022-08-17 11:02:43 +08:00
huangweixiong 98a18a1ddd 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: (25 commits)
  置顶存在缓存
  ...
  会议室预约的表描述字段扩增
  菜单新增会议室
  会议室预约的新增表
  能力广场和能力集市资源排序按指定方式排序修改 门户首页最新，最热查询排除知识库
  total 排序将置顶放前面
  ...
  能力广场和能力集市资源排序按指定方式排序
  npe
  ...
  npe
  npe
  归并为一个排序
  屮
  ...
  ...
  屮
  stream 的排序模式
  。。。
  ...
 2022-08-17 11:01:16 +08:00
huangweixiong ebe3d33994 适配网关重启 2022-08-17 11:00:59 +08:00
wangliwen 5d83ef8fd2 Merge branch 'master' into docker_package 2022-08-17 10:17:21 +08:00
wangliwen 1f7d1e69db 置顶存在缓存 2022-08-17 10:17:02 +08:00
wangliwen 5c1a887024 Merge branch 'master' into docker_package 2022-08-17 09:13:27 +08:00
wangliwen afbfd42c07 ... 2022-08-17 09:13:05 +08:00
zhangzhikang 3697fbf5ee 会议室预约的表描述字段扩增 2022-08-16 17:39:34 +08:00
wangliwen 6470c2e3fb Merge branch 'master' into docker_package 2022-08-16 17:35:57 +08:00
wangliwen 74888c915b Merge branch 'master' into docker_package 2022-08-16 14:00:10 +08:00
dinggang 1e5231a197 菜单新增会议室 2022-08-16 13:59:13 +08:00
zhangzhikang b780ea9ad8 会议室预约的新增表 2022-08-16 14:02:48 +08:00
wangliwen 16a06c51a5 Merge branch 'master' into docker_package 2022-08-16 10:55:17 +08:00
dinggang 408baba4af 能力广场和能力集市资源排序按指定方式排序修改 
门户首页最新，最热查询排除知识库
 2022-08-16 10:26:47 +08:00
wangliwen 4b657ea0d3 Merge branch 'master' into docker_package 2022-08-16 10:18:15 +08:00
wangliwen 42d7d1a27c total 排序将置顶放前面 2022-08-16 10:17:37 +08:00
wangliwen 367a70209c Merge branch 'master' into docker_package 2022-08-15 18:56:34 +08:00
wangliwen 4000c2d30e Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-15 18:56:17 +08:00
wangliwen fb1eaef889 ... 2022-08-15 18:56:04 +08:00
dinggang 9e362f3ae9 能力广场和能力集市资源排序按指定方式排序 2022-08-15 18:55:05 +08:00
wangliwen e93234e7ec Merge branch 'master' into docker_package 2022-08-15 18:45:20 +08:00
wangliwen 8574f26607 npe 2022-08-15 18:44:57 +08:00
wangliwen 64d7563cb2 Merge branch 'master' into docker_package 2022-08-15 18:37:23 +08:00
wangliwen 6a9ae0e939 ... 2022-08-15 18:37:10 +08:00
wangliwen b0e7330961 Merge branch 'master' into docker_package 2022-08-15 18:19:17 +08:00
wangliwen 469a0d9d32 npe 2022-08-15 18:18:44 +08:00
wangliwen 29adf34a3e Merge branch 'master' into docker_package 2022-08-15 18:12:32 +08:00
wangliwen d79578665f npe 2022-08-15 18:12:18 +08:00
wangliwen 26f194e914 Merge branch 'master' into docker_package 2022-08-15 18:01:21 +08:00
wangliwen d7b4075e7f 归并为一个排序 2022-08-15 18:01:09 +08:00
wangliwen a75dc249c9 屮 2022-08-15 17:47:33 +08:00
wangliwen 0e18c338e8 Merge branch 'master' into docker_package 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
 2022-08-15 17:39:45 +08:00
wangliwen 4fa7825bcd ... 2022-08-15 17:37:48 +08:00
wangliwen 3430e57229 。。。 2022-08-15 17:28:08 +08:00
wangliwen b07798e6af 。。。 2022-08-15 17:16:27 +08:00
wangliwen ec9b9cad87 Merge branch 'master' into docker_package 2022-08-15 17:05:47 +08:00
wangliwen 6e9868e0f7 ... 2022-08-15 17:05:33 +08:00
wangliwen 7ef59e72bb Merge branch 'master' into docker_package 2022-08-15 16:51:09 +08:00
wangliwen 4b308ed69f 屮 2022-08-15 16:50:52 +08:00
wangliwen 7f8cd71ad1 Merge branch 'master' into docker_package 2022-08-15 16:34:48 +08:00
wangliwen a8cd7f8436 stream 的排序模式 2022-08-15 16:34:11 +08:00
wangliwen 1198ca9a09 Merge branch 'master' into docker_package 2022-08-15 16:11:20 +08:00
wangliwen 5b63e648e2 。。。 2022-08-15 16:11:06 +08:00
wangliwen 37251fa0d8 Merge branch 'master' into docker_package 2022-08-15 16:03:32 +08:00
wangliwen a26819491d 屮 2022-08-15 16:03:20 +08:00
wangliwen 00327fc8a1 Merge branch 'master' into docker_package 2022-08-15 15:47:21 +08:00
wangliwen bda6596caa .... 2022-08-15 15:47:06 +08:00
wangliwen 7a7c81194e Merge branch 'master' into docker_package 2022-08-15 15:30:07 +08:00
wangliwen 9565b4fe82 结果分页的排序 2022-08-15 15:29:54 +08:00
wangliwen 638105a035 Merge branch 'master' into docker_package 2022-08-15 15:17:13 +08:00
wangliwen b3b4ca16a6 屮 2022-08-15 15:16:59 +08:00
wangliwen 107ef702b0 Merge branch 'master' into docker_package 2022-08-15 15:09:18 +08:00
wangliwen ce881d43de total排序时，置顶优于total 2022-08-15 15:08:20 +08:00
huangweixiong ed20fbd0a4 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:
  补充置顶状态与置顶时间
  屮
  全局搜索统计各类型能力数量
  ...
  ..
  ..
  增加置顶接口
  排序修改
  sql
  ...
  增加能力置顶字段
  parallelStream 使用自定义 ForkJoinPool防止任务堆积
  屮
  ...
  ...
  会议室功能后端开发
 2022-08-15 14:07:41 +08:00
huangweixiong d5ca1cee4c 网关配置ip与监控ip分开 2022-08-15 14:07:22 +08:00
wangliwen e1bf97ff70 Merge branch 'master' into docker_package 2022-08-15 10:48:24 +08:00
wangliwen 42f5f3e46a 补充置顶状态与置顶时间 2022-08-15 10:48:10 +08:00
wangliwen cf13470a00 Merge branch 'master' into docker_package 2022-08-15 10:23:39 +08:00
wangliwen 61995e999e Merge remote-tracking branch 'origin/dev' into dev 2022-08-15 10:23:23 +08:00
wangliwen 5b5ec4d05d 屮 2022-08-15 10:23:10 +08:00
dinggang 2241e2808d 全局搜索统计各类型能力数量 2022-08-15 09:30:39 +08:00
wangliwen 22a066e319 Merge branch 'master' into docker_package 2022-08-12 17:48:10 +08:00
wangliwen e602317a7a ... 2022-08-12 17:47:53 +08:00
wangliwen 9e6b0d4ecd Merge branch 'master' into docker_package 2022-08-12 17:37:29 +08:00
dinggang c7ff499956 .. 2022-08-12 17:35:04 +08:00
wangliwen f33f32161e Merge branch 'master' into docker_package 2022-08-12 17:22:24 +08:00
dinggang ce07b0ea32 .. 2022-08-12 17:21:35 +08:00
wangliwen f823e24e6c Merge branch 'master' into docker_package 2022-08-12 17:18:59 +08:00
wangliwen 81e13e7824 Merge branch 'master' into dev 2022-08-12 17:18:43 +08:00
wangliwen 7d4f3cdb57 增加置顶接口 2022-08-12 17:18:20 +08:00
dinggang e51668cc4d 排序修改 2022-08-12 16:58:35 +08:00
wangliwen c6c63b05c5 Merge branch 'master' into docker_package 2022-08-12 16:30:01 +08:00
wangliwen 6e7c224109 sql 2022-08-12 16:29:48 +08:00
wangliwen 20436f27dc Merge branch 'master' into docker_package 2022-08-12 16:26:37 +08:00
wangliwen ab11836c23 ... 2022-08-12 16:26:22 +08:00
wangliwen d07ec6d360 Merge branch 'master' into docker_package 2022-08-12 16:13:04 +08:00
wangliwen 2ccc878eda 增加能力置顶字段 2022-08-12 16:12:50 +08:00
wangliwen 4692653705 Merge branch 'master' into docker_package 2022-08-12 14:11:51 +08:00
wangliwen f45e3ea2f4 parallelStream 使用自定义 ForkJoinPool防止任务堆积 2022-08-12 14:11:34 +08:00
wangliwen 05f6d8fb5f Merge branch 'master' into docker_package 2022-08-12 10:41:29 +08:00
wangliwen 8980f61b1c 屮 2022-08-12 10:41:11 +08:00
wangliwen 32b7d27772 Merge branch 'master' into docker_package 2022-08-11 14:56:28 +08:00
dinggang f6509b5e19 ... 2022-08-11 14:55:20 +08:00
wangliwen a27757f18c Merge branch 'master' into docker_package 2022-08-11 14:21:53 +08:00
dinggang 4aee184562 ... 2022-08-11 14:02:35 +08:00
wangliwen 60e20399c0 Merge branch 'master' into docker_package 2022-08-11 11:31:35 +08:00
zhangzhikang 6b98b44d48 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-11 09:27:35 +08:00
zhangzhikang e4ba0fcbea 会议室功能后端开发 2022-08-11 09:20:29 +08:00
lizhicheng a01ecfc0fb 融合服务接口优化 2022-08-10 19:43:17 +08:00
dinggang 65dc6fae91 ... 2022-08-10 14:02:19 +08:00
huangweixiong 201a092ed0 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-08-10 11:56:10 +08:00
huangweixiong bbefe4fff1 增加网关注册接口 2022-08-10 11:55:54 +08:00
wangliwen 4c5d961b65 Merge branch 'master' into docker_package 2022-08-09 17:11:26 +08:00
dinggang 0f493bb87c 能力广场-应用资源列表查询 2022-08-09 16:52:04 +08:00
wangliwen d5a0859a1a Merge branch 'master' into docker_package 2022-08-09 10:03:59 +08:00
dinggang 1dee7f1edc 编目更新 2022-08-09 10:02:53 +08:00
wangliwen 0d9092ed99 Merge branch 'master' into docker_package 2022-08-08 18:02:35 +08:00
huangweixiong b071097e96 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-08-08 16:48:12 +08:00
huangweixiong 51fac0eb09 网关测试用接口 2022-08-08 16:45:46 +08:00
wangliwen f8d3af0dc0 Merge branch 'master' into docker_package 2022-08-08 16:26:25 +08:00
dinggang a94fce5066 管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段 2022-08-08 15:36:33 +08:00
huangweixiong 1e8c970c39 能力挂接注册网关 2022-08-08 15:17:03 +08:00
wangliwen f590c05463 Merge branch 'master' into docker_package 2022-08-08 14:47:31 +08:00
wangliwen f7af710466 npe 2022-08-08 14:47:15 +08:00
wangliwen 693fbe9a5b Merge branch 'master' into docker_package 2022-08-08 10:46:27 +08:00
wangliwen 33c2b30a60 ... 2022-08-08 10:46:13 +08:00
wangliwen f0eb0e7740 Merge branch 'master' into docker_package 2022-08-08 09:59:00 +08:00
wangliwen c1cd6de9e3 屮 2022-08-08 09:58:47 +08:00
wangliwen f07753a143 Merge branch 'master' into docker_package 2022-08-08 09:44:12 +08:00
wangliwen 4d53ef4c99 TODO 异步优化 2022-08-08 09:43:57 +08:00
wangliwen 3de584e7e3 Merge branch 'master' into docker_package 2022-08-06 09:48:59 +08:00
wangliwen 50696e2617 新赋予部门审批人权限用户分配审批去啊权重更大 2022-08-06 09:48:45 +08:00
wangliwen 8d15d7efc9 Merge branch 'master' into docker_package 2022-08-05 18:06:06 +08:00
dinggang e5da46fd4d sql更新 2022-08-05 17:34:53 +08:00
wangliwen 3f2a769542 Merge branch 'master' into docker_package 2022-08-05 17:15:05 +08:00
wangliwen b9a489beac Merge remote-tracking branch 'origin/dev' into dev 2022-08-05 17:14:49 +08:00
wangliwen 16df18cddf 异步处理 能力申请 2022-08-05 17:14:44 +08:00
yitonglei 20c73efac5 修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域' 2022-08-05 15:10:27 +08:00
wangliwen 0d50ad1e4b Merge branch 'master' into docker_package 2022-08-05 12:48:21 +08:00
wangliwen 1047569a77 。。。 2022-08-05 12:48:03 +08:00
wangliwen da785822e0 Merge branch 'master' into docker_package 2022-08-05 11:56:44 +08:00
wangliwen 36ad699d38 Merge remote-tracking branch 'origin/dev' into dev 2022-08-05 11:56:26 +08:00
wangliwen c065c04703 资源部门被删 2022-08-05 11:56:16 +08:00
dinggang 603d107b65 ... 2022-08-05 10:41:55 +08:00