Commit Graph

500 Commits

Author SHA1 Message Date
Zhaoyang 2da863a475 在预览返回的数据中增加header的mapList信息 2020-03-06 14:48:33 +08:00
Zhaoyang d858e724fa Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java
2020-03-06 14:47:49 +08:00
Zhaoyang 4bdc4237d6 在预览返回的数据中增加header的mapList信息 2020-03-06 14:46:42 +08:00
mazhicheng 8ab8ad20d9 优化excel预览逻辑 2020-03-06 14:23:00 +08:00
mazhicheng f3cd640ab3 优化excel预览逻辑 2020-03-06 14:21:33 +08:00
mazhicheng e16aecb8d5 Merge remote-tracking branch 'origin/develop' into develop 2020-03-06 13:23:54 +08:00
mazhicheng 22d52ac529 优化excel预览逻辑 2020-03-06 13:22:59 +08:00
Zhaoyang e47051511e 添加原文件名常量 2020-03-05 17:03:57 +08:00
Zhaoyang de4d8d8357 清理iam组件中对fastjson的配置 2020-03-05 15:02:51 +08:00
Zhaoyang aaa762a5f9 Merge remote-tracking branch 'origin/develop' into develop 2020-03-04 22:10:42 +08:00
Zhaoyang 2139be951c IamUser用户可以脱离系统用户单独管理 2020-03-04 22:10:15 +08:00
mazhicheng 11315eca05 调整baseController的方法参数类型 2020-03-02 21:12:14 +08:00
mazhicheng a64af338c5 Merge remote-tracking branch 'origin/develop' into develop 2020-03-02 11:28:59 +08:00
mazhicheng eb0f411148 remove duplicate api 2020-03-02 11:28:39 +08:00
Zhaoyang 43be263768 Merge remote-tracking branch 'origin/develop' into develop 2020-03-02 09:36:06 +08:00
Zhaoyang 72f44ed966 增加权限排序功能 2020-03-02 09:35:54 +08:00
mazhicheng f40ccf83ae BaseService增加批量更新的接口updateEntities 2020-03-01 19:50:47 +08:00
Zhaoyang 6349895d35 角色详情中展示已授权的权限列表 2020-02-29 23:25:05 +08:00
mazhicheng 95ed4ebbaf binder增加单对象绑定接口 2020-02-29 12:31:14 +08:00
mazhicheng 4bf89f5989 buildTree增加自身关联告警 2020-02-29 12:27:03 +08:00
mazhicheng 27fae91b3a 用户资源权限校验相关代码优化 2020-02-29 12:25:02 +08:00
Zhaoyang d7e290867b 添加前端权限管理相关基础代码 2020-02-28 18:20:11 +08:00
Zhaoyang 88ab1054ce 收集的接口信息返回与授权URI相同的数据字段 2020-02-28 15:54:50 +08:00
mazhicheng 56d997cfda 注解权限提取逻辑优化 2020-02-28 15:12:45 +08:00
mazhicheng 5ab061a767 密码验证类增加验证码属性 2020-02-24 15:00:17 +08:00
mazhicheng 8581e478e7 JsonResult增加Status状态码对应的静态初始化方法 2020-02-24 14:40:38 +08:00
mazhicheng 9fc755ed69 优化BusinessException异常捕获 2020-02-24 11:31:38 +08:00
Zhaoyang 1311cfaa89 返回前端的角色中增加编码信息 2020-02-24 09:33:38 +08:00
mazhicheng 4c549a934d 修改权限校验逻辑 2020-02-22 19:18:59 +08:00
mazhicheng c4a2e630b5 + core优化 2020-02-22 16:58:24 +08:00
mazhicheng e38d3bfb19 + core优化 2020-02-22 16:50:50 +08:00
mazhicheng 40f5111ab5 + 文档优化 2020-02-22 16:38:04 +08:00
mazhicheng 92553a56d2 Merge remote-tracking branch 'origin/develop' into develop 2020-02-22 16:00:01 +08:00
mazhicheng cf1ef4cc48 + 文件组件代码重构 2020-02-22 15:26:39 +08:00
mazhicheng cfb1e2591f + 文件组件代码重构 2020-02-21 17:34:17 +08:00
mazhicheng 6bd2f13196 + 文件组件代码重构 2020-02-21 16:14:08 +08:00
mazhicheng 6ffae82640 + 文件组件代码重构 2020-02-21 12:07:12 +08:00
Zhaoyang d1519bbe87 新增账户时增加对是否具有密码的检测 2020-02-19 14:31:18 +08:00
Zhaoyang d4c8a90c04 新增账户时增加对是否具有密码的检测 2020-02-19 14:04:57 +08:00
Zhaoyang c9e2c934dc Merge remote-tracking branch 'origin/develop' into develop 2020-02-18 11:45:09 +08:00
Zhaoyang 74b2161b9d 增加更改密码接口 2020-02-18 11:44:42 +08:00
mazhicheng 67476269e6 Merge remote-tracking branch 'origin/develop' into develop 2020-02-18 11:15:29 +08:00
mazhicheng e8a4c05440 + 角色权限的判断优化 2020-02-18 11:14:27 +08:00
Zhaoyang 96414b8615 Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2020-02-17 14:09:44 +08:00
Zhaoyang 6ee4b23f43 更改diboot官网菜单导航;添加优秀案例页面。 2020-02-14 18:27:03 +08:00
mazhicheng f3ad400d57 + 公益统计工具链接 2020-02-14 10:53:51 +08:00
mazhicheng 2c8bd5c471 Merge remote-tracking branch 'origin/develop' into develop 2020-02-05 10:03:35 +08:00
mazhicheng 3ac1edc863 修改链接 2020-02-05 10:03:11 +08:00
Zhaoyang 2906d10ba3 角色增加判断是否为超级管理员的方法 2020-02-04 16:14:48 +08:00
Zhaoyang dd6eb9f28c 登录日志记录关联认证类型数据字典 2020-02-04 15:01:21 +08:00