Commit Graph

  • fc910297a0 Merge remote-tracking branch 'origin/dev' into dev v0.8.1.2.release(西海岸部署修复) yitonglei 2022-07-01 12:09:35 +0800
  • 92d08a0a3c 1、修改能力统计列表和详情-应用资源-发布端应用情况的sql yitonglei 2022-07-01 12:09:27 +0800
  • aea576a204 Merge branch 'master' into docker_package wangliwen 2022-07-01 11:37:55 +0800
  • 410ac4c964 我发起的流程、已办任务 可按流程类型过滤 wangliwen 2022-07-01 11:36:09 +0800
  • ea62505f8d 调整 启动环境 wangliwen 2022-07-01 11:34:11 +0800
  • 68f9685daa Merge branch 'master' into docker_package wangliwen 2022-07-01 11:16:06 +0800
  • 3b44fa36a0 ... dinggang 2022-07-01 10:46:57 +0800
  • 66356dd6c6 Merge remote-tracking branch 'origin/dev' into dev v0.8.1.1.release(本地测试环境测试) yitonglei 2022-07-01 10:42:44 +0800
  • 45952427fc 1、修改能力统计列表和详情-优化贡献组件分别被多少应用使用的sql yitonglei 2022-07-01 10:42:39 +0800
  • b21210e36f ... wangliwen 2022-07-01 10:42:11 +0800
  • a092e6b00f 申请摄像头通知异常的解决 wangliwen 2022-07-01 10:30:54 +0800
  • 1547954471 Merge branch 'master' into docker_package wangliwen 2022-07-01 10:03:23 +0800
  • e610457d13 申请的表单 camera_list 查询不出的问题 wangliwen 2022-07-01 10:02:39 +0800
  • ef1cbe93fc ... wangliwen 2022-07-01 09:57:29 +0800
  • 03dee6f380 已办任务支持能力批量申请 wangliwen 2022-07-01 09:50:48 +0800
  • 31d11b8009 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-07-01 09:40:39 +0800
  • f7f04f90e0 1、修改能力统计列表和详情-使用情况统计的sql yitonglei 2022-07-01 09:38:48 +0800
  • 7c1988cde5 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-07-01 09:31:29 +0800
  • 220d3d9f0e 1、修改能力统计列表和详情-使用情况统计的sql yitonglei 2022-07-01 09:31:22 +0800
  • 357ed71dbe 摄像头申请 我的申请名字特殊处理 wangliwen 2022-07-01 09:28:40 +0800
  • 3cb9e083ed 我的待办 所有类型都为获取到时,直接输出 wangliwen 2022-07-01 08:57:52 +0800
  • 8cf701aeef Merge branch 'master' into docker_package wangliwen 2022-06-30 18:59:55 +0800
  • 87cc41c22b 1.共享门户和能力统计对资源等信息统计逻辑修改 2.需求中心按时间倒序 dinggang 2022-06-30 18:41:44 +0800
  • f67de9cf52 1、修改能力统计列表和详情-部分查询的条件限制 yitonglei 2022-06-30 18:26:06 +0800
  • 5cbc508655 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-06-30 17:56:50 +0800
  • 274b11639f 1、修改能力统计列表和详情-部分查询的条件限制 yitonglei 2022-06-30 17:56:40 +0800
  • 409b9b865e Merge branch 'master' into docker_package wangliwen 2022-06-30 17:47:07 +0800
  • d72e30308f Merge branch 'master' into dev wangliwen 2022-06-30 17:46:01 +0800
  • 9d04ba4113 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-06-30 17:21:30 +0800
  • 75b7de0052 1、修改能力统计列表和详情-部分查询的条件限制 yitonglei 2022-06-30 17:21:24 +0800
  • 8fb6924557 。。。 wangliwen 2022-06-30 17:02:26 +0800
  • 19d1cdde41 文案调整 wangliwen 2022-06-30 16:46:34 +0800
  • eea490071b Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-06-30 16:39:40 +0800
  • 20a426cb9a 处理pageWithAttr接口返回缺失infoList字段的问题 wangliwen 2022-06-30 16:37:38 +0800
  • a57b280270 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-06-30 16:34:11 +0800
  • 511bcc7850 1、修改能力统计列表和详情-应用资源的发布情况和应用资源使用情况关于登录用户的判断,解决空指针问题 yitonglei 2022-06-30 16:33:53 +0800
  • 6005903b1a 工作台:前端联调补充 lizhicheng 2022-06-30 16:31:22 +0800
  • 1e370568a7 Merge branch 'master' into docker_package wangliwen 2022-06-30 16:10:28 +0800
  • 70f4756f9e 1、修改能力统计列表和详情-应用资源的发布情况增加收藏字段,修改五大资源发布情况的sql语句 yitonglei 2022-06-30 16:10:24 +0800
  • 30206c5867 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-06-30 16:07:29 +0800
  • 3e78aec4d3 二级缓存的调整 wangliwen 2022-06-30 16:06:08 +0800
  • da41776d98 Merge branch 'master' into docker_package wangliwen 2022-06-30 16:00:39 +0800
  • aba372676d 1.基础设施摄像头申请流程修改 2.申购车查询摄像头列表数据新增字段 dinggang 2022-06-30 16:00:02 +0800
  • 093dc5ba91 docker 镜像 wangliwen 2022-06-30 15:58:43 +0800
  • 3e4716a432 1、修改能力统计列表和详情-应用资源的贡献组件分别被多少应用使用 yitonglei 2022-06-30 15:38:49 +0800
  • 22bdb9c4dc TODO docker打包 wangliwen 2022-06-30 14:16:06 +0800
  • 91fc811ed6 Merge remote-tracking branch 'origin/dev' into dev v0.8.0.1 yitonglei 2022-06-30 12:04:25 +0800
  • 4c463e922f 1、修改能力统计列表和详情-应用资源的应用贡献组件数量分布(算法、图层、开发、业务)和 应用贡献组件数量分布 yitonglei 2022-06-30 12:04:17 +0800
  • b1774b9875 所有能力资源infoList交给本表字段处理、保存 wangliwen 2022-06-30 11:58:35 +0800
  • 48e9eecbd3 能力导入默认为大数据局 wangliwen 2022-06-30 11:50:24 +0800
  • 44233d80de wangliwen 2022-06-30 11:22:43 +0800
  • a959af6fa7 。。。 wangliwen 2022-06-30 10:56:11 +0800
  • 204eb8d5e3 dto 内 json 字段特殊处理 wangliwen 2022-06-30 10:45:10 +0800
  • 26307f6d0d 单点登录调整的启用配置 wangliwen 2022-06-30 10:19:04 +0800
  • 214bf4bc61 cas单点登录 huangweixiong 2022-06-30 09:41:38 +0800
  • d9222f25e1 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev v0.8.0 huangweixiong 2022-06-30 09:34:54 +0800
  • 7ee146eaa9 单点登录重构,新增cas单点登录 huangweixiong 2022-06-30 09:34:33 +0800
  • d886019cb9 Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-30 09:26:40 +0800
  • e7ee2632e0 。。。 wangliwen 2022-06-30 09:26:04 +0800
  • 67387e1451 1、修改shiro的关于/census/center/v3/**的配置顺序,移到/census/center/**配置之前 yitonglei 2022-06-30 09:24:56 +0800
  • 14474061cd Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-06-30 09:00:29 +0800
  • cc7b22b304 ObjectMapper 线程安全,减少new wangliwen 2022-06-30 08:58:54 +0800
  • e0d472a9a8 新增api:查询资源按申请次数排名、查询部门需求 lizhicheng 2022-06-29 20:50:41 +0800
  • 17415e4a07 。。。 wangliwen 2022-06-29 19:49:20 +0800
  • 0039b8b776 ... dinggang 2022-06-29 19:25:11 +0800
  • 09ae34cf61 。。。 wangliwen 2022-06-29 19:21:23 +0800
  • c8df1c2468 。。。 wangliwen 2022-06-29 19:03:08 +0800
  • b012861c51 Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-29 18:57:31 +0800
  • f5ecfb1fcd 基础设施特殊处理 wangliwen 2022-06-29 18:56:19 +0800
  • 2f8761fec1 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-06-29 18:19:36 +0800
  • fce552600b 1、修改一处拼写错误 yitonglei 2022-06-29 18:19:29 +0800
  • 0b50439f43 流程图放开 wangliwen 2022-06-29 18:11:17 +0800
  • 6b756c6963 Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-29 18:08:19 +0800
  • f1da551b13 批量能力申请 我的申请页 wangliwen 2022-06-29 18:07:01 +0800
  • 17a3c32c86 1、修改一处拼写错误 yitonglei 2022-06-29 17:50:43 +0800
  • a58c74caea ... wangliwen 2022-06-29 17:37:22 +0800
  • 18ab6f6697 Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-29 16:43:21 +0800
  • 22c626aa55 ... wangliwen 2022-06-29 16:40:09 +0800
  • fa280cb83c 新增api:部门申请、部门申请统计 lizhicheng 2022-06-29 16:10:35 +0800
  • b5316c85eb Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-29 15:48:15 +0800
  • bd2c5b951b 批量申请时 手动填充发起人id wangliwen 2022-06-29 15:46:35 +0800
  • 1340f9b2cd 1、修改字符串转换成数字方法,由转成int改为long yitonglei 2022-06-29 15:38:41 +0800
  • ad98c9b0dc 1、修改鉴权ShiroConfig,增加filterMap.put("/census/center/v3/**", "oauth2"); yitonglei 2022-06-29 15:29:54 +0800
  • a2cf04b5fd npe wangliwen 2022-06-29 15:11:35 +0800
  • e2a14c2ad5 Merge remote-tracking branch 'origin/dev' wangliwen 2022-06-29 14:48:52 +0800
  • 7d5eaa62d7 ... dinggang 2022-06-29 14:43:38 +0800
  • 98976ae620 Merge remote-tracking branch 'origin/dev' into dev yitonglei 2022-06-29 14:11:34 +0800
  • 58088236ab 1、能力统计列表及详情页CensusControllerV3的列表查询方法做了改动,部门id从登录用户获取 2、删除了SysDeptController中新增的查询部门树方法 yitonglei 2022-06-29 14:08:50 +0800
  • cf4545a266 businessKey直接出task内部参数 wangliwen 2022-06-29 11:56:38 +0800
  • eaf2e3b289 调整申请表单应用场景支持多选 wangliwen 2022-06-29 11:42:52 +0800
  • fc4210442a Merge branch 'master' into dev wangliwen 2022-06-29 10:55:08 +0800
  • 63cc759ac4 基础设施摄像头批量申请 dinggang 2022-06-29 10:28:40 +0800
  • 1a07719063 ... wangliwen 2022-06-29 10:15:06 +0800
  • d16113cd48 新增api:部门上架、部门上架统计 lizhicheng 2022-06-29 10:11:03 +0800
  • 400fb77529 ... wangliwen 2022-06-29 09:48:24 +0800
  • f953b77294 批量申请流程申请接口处理 wangliwen 2022-06-29 09:39:41 +0800
  • 8577b7f1e4 数据库切换回 238 wangliwen 2022-06-29 09:08:42 +0800
  • f435bb8d49 Merge branch 'dev' wangliwen 2022-06-28 20:13:40 +0800
  • 00031c475f 启动脚本 调大堆栈 wangliwen 2022-06-28 20:13:00 +0800
  • 87b74e303a ... wangliwen 2022-06-28 19:31:23 +0800