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

1628 Commits

Author SHA1 Message Date
wangliwen 2d18bcbe58 Merge branch 'master' into docker_package 2022-08-25 09:00:43 +08:00
wangliwen 12393ec5cc 更新能力申请模型v3 2022-08-25 09:00:21 +08:00
wangliwen cf513627b2 Merge branch 'master' into docker_package 2022-08-24 18:54:37 +08:00
wangliwen 94c012ee44 Merge branch 'dev' 2022-08-24 18:54:11 +08:00
wangliwen 515ad62bd6 接口开启gzip压缩 2022-08-24 18:53:52 +08:00
lizhicheng e1d1d964ab 区、市监听器:修改表单字段获取逻辑 2022-08-24 18:10:21 +08:00
wangliwen 9747d50be0 Merge branch 'master' into docker_package 2022-08-24 17:13:46 +08:00
wangliwen 738208ba2e applyState 字段返回值不一致的问题fix 2022-08-24 17:13:10 +08:00
wangliwen 6da1b5b6b1 npe fix 2022-08-24 16:22:02 +08:00
wangliwen be82f34ad1 Merge branch 'master' into docker_package 2022-08-24 15:57:49 +08:00
huangweixiong 9b2d222ebf 修改日志输出级别 2022-08-24 15:30:56 +08:00
huangweixiong 16c0d2ad69 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: (32 commits)
  编目更新
  ...
  ...
  能力申请v3 未查到审批人时，使用配置文件预设默认审核人
  ...
  区、市审批流程监听器完善
  能力申请模型更新
  ...
  能力申请v3 新增监听器
  ...
  npe
  java.lang.NumberFormatException
  修改getImgServices的子查询sql语句为兼容mysql5.7
  修改sql
  。。
  增加能力申请V3 模型
  整理代码
  ...
  cim 根据应用领域查询图层服务 和 查询智能算法组件
  1.cim模块统计查询及列表查询 2.编目及字典更新
  ...
 2022-08-24 15:01:16 +08:00
huangweixiong 4c7df1cfb4 监控视频失效重试 2022-08-24 15:00:59 +08:00
huangweixiong 55e3b4a44e 网关重启适配 2022-08-24 15:00:40 +08:00
wangliwen 0d63eec758 Merge branch 'master' into docker_package 2022-08-24 13:39:50 +08:00
dinggang 0ac54c1207 编目更新 2022-08-24 10:37:25 +08:00
wangliwen b83db53c6a Merge branch 'master' into docker_package 2022-08-24 09:33:43 +08:00
wangliwen b41e48528d ... 2022-08-24 09:33:27 +08:00
wangliwen 8b182edada Merge branch 'master' into docker_package 2022-08-23 11:50:45 +08:00
wangliwen 2e79af48c1 ... 2022-08-23 11:50:28 +08:00
wangliwen 5aa5ac0e37 Merge branch 'master' into docker_package 2022-08-23 10:32:54 +08:00
wangliwen 6e7f17b48a 能力申请v3 未查到审批人时，使用配置文件预设默认审核人 2022-08-23 10:32:38 +08:00
wangliwen 1bca2163f3 Merge branch 'master' into docker_package 2022-08-22 18:21:29 +08:00
wangliwen 09e2c34e31 ... 2022-08-22 18:21:16 +08:00
wangliwen e77bd6fa11 Merge branch 'master' into docker_package 2022-08-22 18:08:45 +08:00
Koi-tsk c5ab16e7f9 区、市审批流程监听器完善 2022-08-22 17:59:18 +08:00
wangliwen 5ed9fdba9e Merge branch 'master' into docker_package 2022-08-22 16:44:44 +08:00
wangliwen d4c88b8d20 能力申请模型更新 2022-08-22 16:44:30 +08:00
wangliwen 95152006e7 Merge branch 'master' into docker_package 2022-08-22 13:59:55 +08:00
wangliwen e88e596699 ... 2022-08-22 13:59:40 +08:00
wangliwen 2c063fb813 Merge branch 'master' into docker_package 2022-08-22 11:33:29 +08:00
wangliwen 183a64c7ac 能力申请v3 新增监听器 2022-08-22 11:32:47 +08:00
huangweixiong c51e335f9f 网关重启适配 2022-08-22 11:11:02 +08:00
wangliwen 31367f9789 Merge branch 'master' into docker_package 2022-08-22 10:38:12 +08:00
wangliwen 9abb064ece ... 2022-08-22 10:37:58 +08:00
wangliwen 3e18ec9b8e Merge branch 'master' into docker_package 2022-08-22 10:14:36 +08:00
wangliwen 81db400dec npe 2022-08-22 10:14:22 +08:00
wangliwen cad9bf4ae0 Merge branch 'master' into docker_package 2022-08-22 09:54:39 +08:00
wangliwen 28e28430f0 Merge remote-tracking branch 'origin/dev' into dev 2022-08-22 09:54:25 +08:00
wangliwen 857681bcac java.lang.NumberFormatException 2022-08-22 09:54:00 +08:00
yitonglei 26ee20e34c 修改getImgServices的子查询sql语句为兼容mysql5.7 2022-08-22 09:01:26 +08:00
wangliwen 305183cf9f Merge branch 'master' into docker_package 2022-08-19 17:09:44 +08:00
yitonglei b428b74e90 修改sql 2022-08-19 16:25:52 +08:00
dinggang f65347f39f 。。 2022-08-19 16:02:56 +08:00
wangliwen 22f897ddb9 Merge branch 'master' into docker_package 2022-08-19 15:53:52 +08:00
wangliwen aa3a132421 Merge branch 'master' into dev 2022-08-19 15:53:32 +08:00
wangliwen 1816f2b9de 增加能力申请V3 模型 2022-08-19 15:53:08 +08:00
yitonglei f1d87b3907 整理代码 2022-08-19 14:35:56 +08:00
wangliwen fcfff400fc Merge branch 'master' into docker_package 2022-08-19 14:22:39 +08:00
wangliwen 1f7a61a601 Merge remote-tracking branch 'origin/dev' into dev 2022-08-19 14:22:19 +08:00
wangliwen 999c265c7e ... 2022-08-19 14:22:10 +08:00
yitonglei e503565a85 cim 根据应用领域查询图层服务 和 查询智能算法组件 2022-08-19 14:11:06 +08:00
dinggang 6dcee405c5 1.cim模块统计查询及列表查询 
2.编目及字典更新
 2022-08-19 11:59:05 +08:00
wangliwen 29a5dffb65 Merge branch 'master' into docker_package 2022-08-19 11:29:40 +08:00
wangliwen f4418bae13 能力申请V3 批量进行能力申请 2022-08-19 11:29:23 +08:00
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