Commit Graph

246 Commits

Author SHA1 Message Date
Mazc ba0f614636
Merge pull request #32 from dibo-software/develop
Develop
2019-10-29 21:48:51 +08:00
mazhicheng 7d5c2b285f + core打包增加xml等配置文件 2019-10-28 21:07:24 +08:00
mazhicheng 7747f40ee4 + fix: 修改createTime注解,默认交给数据库赋值 2019-10-28 19:15:30 +08:00
Zhaoyang 714e3e891d 解决BaseServiceImpl中强转String可能报错的问题;S中添加valueOf方法。 2019-10-23 21:32:22 +08:00
Mazc a048fb2a55
Merge pull request #31 from dibo-software/develop
Develop
2019-10-23 21:18:41 +08:00
mazhicheng 9b962e91d9 + fix: 绑定注解的condition中有等于字符串附加条件时执行异常的问题 2019-10-23 21:16:45 +08:00
mazhicheng 518ac43623 - 移除不生效的Lambda缓存 2019-10-22 15:42:58 +08:00
wuy 435838223e 修改token认证 2019-10-21 10:17:11 +08:00
wuy 638e395b40 Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2019-10-20 22:04:48 +08:00
wuy e9fb539ee6 修改shiro角色-权限 2019-10-20 22:04:17 +08:00
mazhicheng 5641a2d83a + 中间表关联字段被覆盖情况的告警提示 2019-10-17 21:20:49 +08:00
wyldusername b19885df34 file实体的UUID属性添加set方法 2019-10-17 17:50:33 +08:00
wuy adc0158084 merge 2019-10-17 17:32:39 +08:00
wuy ea734a63ca modify: 账户-角色-权限 关系 2019-10-17 17:29:15 +08:00
mazhicheng a45db40e5d BaseFile继承BaseEntity 2019-10-17 11:43:47 +08:00
mazhicheng 7d75cdd9e4 优化diboot-component相关组件代码与gradle配置 2019-10-16 22:07:51 +08:00
wyldusername 83c9d74cdf Merge remote-tracking branch 'origin/develop' into develop 2019-10-16 16:43:28 +08:00
wyldusername ee51fca98c 消息组件-邮件 2019-10-16 16:42:47 +08:00
wuy 09b7051491 modify: 账户-角色表 增加自定义物理删除 2019-10-16 16:10:47 +08:00
wuy 13180720c7 modify: 账户-角色表 增加自定义物理删除 2019-10-16 16:06:06 +08:00
wuy a33cb19f4b Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2019-10-16 15:22:22 +08:00
wuy 105ccb6c05 modify: 更改shiro用户获取方式 2019-10-16 15:21:41 +08:00
mazhicheng 504ef169a8 依赖hibernate-validator 2019-10-15 18:04:55 +08:00
mazhicheng 2c1a7bc166 Merge remote-tracking branch 'origin/develop' into develop 2019-10-15 17:31:29 +08:00
mazhicheng 1ce30923ae 1.validation数据校验优化 2019-10-15 17:31:15 +08:00
wuy 50239f15eb Merge branch 'develop' into diboot-shiro-iam 2019-10-15 17:20:41 +08:00
wuy ca7981de33 modify: 修改shiro 2019-10-15 17:19:46 +08:00
yaojianfeng 55a218a165 Merge remote-tracking branch 'origin/master' 2019-10-15 16:44:53 +08:00
yaojianfeng c8984f24e6 * 统一异常处理类返回结果的修改 2019-10-15 16:44:12 +08:00
wyldusername 3c6819434b file组件 2019-10-14 18:55:35 +08:00
wuy 054e5a28f4 modify: 移除shiro组件配置,在diboot-v2-starter中增加shiro-starter代替配置 2019-10-12 14:54:53 +08:00
mazhicheng 8f330f624d 1.cloneEntity移至BeanUtils 2. 优化import 2019-10-11 12:21:38 +08:00
Mazc 409137951c
Merge pull request #30 from dibo-software/develop
Develop
2019-10-10 17:26:47 +08:00
mazhicheng b32fa6cb14 + 更新readme 2019-10-10 17:24:00 +08:00
wuy 8d90b658da * 修改绑定列名逻辑 2019-10-09 23:38:57 +08:00
Mazc d4d165afa1
Merge pull request #29 from dibo-software/develop
+ 更新readme,将shiro readme移至子层级中
2019-09-30 11:57:38 +08:00
mazhicheng 743f459c18 + 更新readme,将shiro readme移至子层级中 2019-09-30 11:56:43 +08:00
Mazc 4ecba071a6
Merge pull request #28 from dibo-software/develop
Develop
2019-09-30 10:30:03 +08:00
左春锐 420361456c Merge remote-tracking branch 'origin/develop' into develop 2019-09-27 15:29:28 +08:00
左春锐 ab1a53adc3 编写文档首页内容及相关样式 2019-09-27 15:28:49 +08:00
godchao 1eb7aa8fa4 增加添加层级数据字典的接口 2019-09-26 15:51:40 +08:00
mazhicheng b3333de6e4 + Service批量创建的单元测试; 移除AnnotationBindingManager类; 2019-09-26 07:18:58 +08:00
mazhicheng 28ad735ace 更新example示例sql 2019-09-25 14:41:41 +08:00
左春锐 7025e4e5a8 Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2019-09-25 09:17:17 +08:00
Mazc 32448b9810
Merge pull request #27 from dibo-software/develop
Develop
2019-09-20 16:18:47 +08:00
mazhicheng fc56ff877e 1. 升级依赖版本至最新 2.修改单元测试SQL 2019-09-20 16:17:34 +08:00
左春锐 b05f591c8d Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2019-09-16 14:34:43 +08:00
godchao 1899c796ed 更改shiro配置 2019-09-16 14:03:22 +08:00
左春锐 907ced1755 Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop 2019-09-16 10:24:43 +08:00
mazhicheng e0cf796e55 升级依赖jar版本 2019-09-16 09:43:50 +08:00