Commit Graph

1192 Commits

Author SHA1 Message Date
zhouhao
e35052ce4b 优化定时调度和脚本 2017-08-29 18:05:54 +08:00
zhouhao
83c0f89e4c 修改配置数据地址 2017-08-29 18:05:25 +08:00
zhouhao
bd10ab113a clob 2017-08-29 16:21:49 +08:00
zhouhao
c115e3154b 修复依赖错误 2017-08-28 18:30:07 +08:00
zhouhao
acdcefc3a8 增加动态数据源crud 2017-08-28 18:29:41 +08:00
zhouhao
270dea02e8 增加动态脚本 crud 2017-08-28 18:21:50 +08:00
zhouhao
18bdc3c9cc 增加定时调度增删改查 2017-08-28 18:18:25 +08:00
zhouhao
fcb5880455 优化缓存策略 2017-08-25 17:44:53 +08:00
zhouhao
ddef2f71a4 DisableCircularReferenceDetect 2017-08-25 17:41:13 +08:00
zhouhao
dfbcfc5c19 优化说明 2017-08-25 09:41:46 +08:00
zhouhao
49b91ce5e5 增加工具类 2017-08-25 09:38:34 +08:00
zhouhao
17d27c3794 增加mapResponseMessage ,用于构造响应map 2017-08-25 09:22:35 +08:00
zhouhao
56ff18fec4 Merge branch 'master' of github.com:/hs-web/hsweb-framework 2017-08-25 09:13:21 +08:00
zhouhao
88d891d14a 优化oauth2 2017-08-24 22:06:12 +08:00
zhouhao
a237108210 to java8 and fix test error 2017-08-24 14:26:28 +08:00
zhouhao
81671d5085 修复id属性错误 2017-08-24 10:15:19 +08:00
zhouhao
a2ce6564e7 删除设计器,移到 https://github.com/hs-web/hsweb-flowable-modeler 2017-08-24 10:02:23 +08:00
zhouhao
884fd60b85 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable-modeler/src/main/java/org/hswebframework/web/workflow/flowable/modeler/FlowableDeploymentController.java
2017-08-23 12:31:05 +08:00
zhouhao
3646abce00 优化api 2017-08-23 12:29:59 +08:00
wangwei
5ad3655c2b 完善单元测试,流程流转,modeller集成 2017-08-23 11:41:46 +08:00
wangwei
70f8635330 去掉重复文件 2017-08-23 11:15:59 +08:00
wangwei
fc54362d65 完善单元测试,流程流转,modeller集成 2017-08-23 10:59:55 +08:00
wangwei
c4e5535a44 完善单元测试,流程流转,modeller集成 2017-08-23 10:32:49 +08:00
wangwei
7e219bcadd 完善单元测试,流程流转,modeller集成 2017-08-23 10:32:15 +08:00
wangwei
ec01ba5ace #50 修复地址错误 2017-08-23 10:30:42 +08:00
wangwei
5f2c431fe1 Merge remote-tracking branch 'origin/master' 2017-08-23 10:25:49 +08:00
wangwei
a46de69856 完善单元测试,流程流转 2017-08-23 10:25:27 +08:00
zhouhao
f354226273 Merge branch 'master' of github.com:/hs-web/hsweb-framework 2017-08-22 11:18:09 +08:00
wangwei
473a354eca Merge branch 'master' of https://github.com/hs-web/hsweb-framework 2017-08-22 09:23:52 +08:00
wangwei
aa74bcbcd9 完善单元测试,流程流转 2017-08-22 09:23:40 +08:00
zhouhao
5ca3354e00 修复精度错误 2017-08-21 14:57:32 +08:00
zhouhao
68ad79b5ac 优化默认parentId 2017-08-21 14:06:37 +08:00
zhouhao
45ffd59a21 优化权限缓存 2017-08-19 18:22:46 +08:00
zhouhao
0531c30075 ignore->merge 2017-08-19 17:41:03 +08:00
zhouhao
88f70fe3d4 修复权限merge无效的问题 2017-08-19 17:36:11 +08:00
zhouhao
921ae0a3d4 修改说明 2017-08-18 18:30:55 +08:00
zhouhao
88b3a0f88e required=false -> UserTokenManager 2017-08-18 18:26:25 +08:00
zhouhao
694b9ecf30 修改菜单的permission_id数据长度 2017-08-18 18:15:57 +08:00
zhouhao
f342de5bb8 shiro被砍,basic顶替. 2017-08-18 17:55:11 +08:00
zhouhao
b5a8cf712c 继续优化权限 2017-08-18 17:06:13 +08:00
zhouhao
5e1b2ec689 优化map装换 2017-08-18 16:09:53 +08:00
zhouhao
898eff85c1 增加validate 2017-08-18 15:47:04 +08:00
zhouhao
4c6108550a 修改异常命名 2017-08-18 15:21:23 +08:00
zhouhao
d7f84f399b 修改异常命名 2017-08-18 15:20:55 +08:00
zhouhao
35c903c7e6 增加自定义权限控制配置 2017-08-17 22:33:16 +08:00
zhouhao
653d079382 优化权限控制 2017-08-17 21:16:03 +08:00
zhouhao
c42e492751 Merge branch 'master' of github.com:/hs-web/hsweb-framework
# Conflicts:
#	hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleFieldFilterDataAccessConfig.java
2017-08-17 21:15:40 +08:00
zhouhao
43cef61ba4 Merge remote-tracking branch 'origin/master' 2017-08-17 18:29:48 +08:00
zhouhao
7c60686cd4 优化组织架构权限控制 2017-08-17 18:26:13 +08:00
wangwei
923da85815 完善单元测试,流程流转 2017-08-17 18:06:45 +08:00