gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity
194 Commits
4 Branches
41 Tags
52 MiB
Commit Graph

107 Commits (522a1327508f2bb853613c626c3c5357e4544eb6)

Author SHA1 Message Date
huangyao acc28aa372 字典类型添加编辑； 
字典列表；
字典树；
 2021-01-10 18:36:45 +08:00
liuhanqing cceee80bfd 【message】修改message展示界面 2021-01-10 18:06:10 +08:00
fengshuonan e567f77da7 删除druid的自动配置，转移到kernel包 2021-01-10 13:54:19 +08:00
huangyao 04a76c1409 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-10 13:05:32 +08:00
fengshuonan 1c61eb8417 Merge remote-tracking branch 'origin/group7-monitor' 
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/application-local.yml
 2021-01-09 20:41:58 +08:00
fengshuonan c8b7aebf01 Merge remote-tracking branch 'origin/group5-log' 2021-01-09 20:39:41 +08:00
fengshuonan 2c4cbe0946 Merge remote-tracking branch 'origin/group3-timer' 2021-01-09 20:38:56 +08:00
fengshuonan dd1f2fea3a Merge remote-tracking branch 'origin/group1-role' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/role/RoleViewController.java
 2021-01-09 20:37:32 +08:00
huangyao e27dade3b1 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-09 20:06:08 +08:00
fengshuonan 193d58bf8c 完善角色修改数据范围的界面 2021-01-09 19:23:34 +08:00
rays 05abaf4209 1.新增角色菜单和按钮授权以及接口授权 
2.新增资源详情
 2021-01-09 19:19:41 +08:00
TSQ 306724a394 完善日志管理列表 2021-01-09 17:11:00 +08:00
fengshuonan 08af106329 Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:29:49 +08:00
q18idc 4bd57e8cb0 【system】更新菜单按钮管理控制器注释 2021-01-09 16:13:37 +08:00
fengshuonan 86cda799f0 Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:11:14 +08:00
q18idc 9a00b19ffe 【system】完成菜单按钮管理界面 2021-01-09 15:17:19 +08:00
fengshuonan faf00cf394 Merge remote-tracking branch 'origin/group2-user' 2021-01-09 12:37:09 +08:00
fengshuonan 074703b161 增加角色管理界面的按钮绑定权限 2021-01-09 12:08:00 +08:00
fengshuonan a82021ab9b 更新资源管理界面 2021-01-08 22:25:43 +08:00
fengshuonan f6556c0637 更新角色列表，新增，修改功能 2021-01-08 21:54:19 +08:00
陈立 37658803c8 修改配置并将druid配置放到bean里 2021-01-08 18:49:38 +08:00
@阿坤同学 3aadb055dc 【定时模块】新增视图返回接口，新增CRUD页面 2021-01-08 17:08:25 +08:00
chenjinlong 407386485a 【UserViewController】增加视图控制器 2021-01-07 19:27:53 +08:00
chenjinlong dc3c688868 【hr_organization】功能调整优化 2021-01-07 19:27:11 +08:00
huangyao d960e748ab Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-06 22:14:38 +08:00
huangyao df8afb97f6 字典类型视图； 
字典类型添加（字典业务编码待添加）；
 2021-01-06 22:11:46 +08:00
TSQ c1d7c9c9c8 调整日志视图控制器命名规范 2021-01-06 21:44:35 +08:00
TSQ 6b3fa84872 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-06 21:29:27 +08:00
fengshuonan 10c862e1de Merge remote-tracking branch 'origin/group1-config' 2021-01-06 20:53:18 +08:00
fengshuonan c829c6cea8 更新菜单列表，查询，删除 2021-01-06 20:31:53 +08:00
fengshuonan cbcbd85a8c 更新通用tree选择器 2021-01-06 20:31:18 +08:00
fengshuonan 5622fe502e 更新app界面 2021-01-06 16:37:40 +08:00
fengshuonan 5c5901eb1b 更改dashboard名称 2021-01-06 13:34:52 +08:00
jiawei 12aa666a51 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-config 2021-01-05 20:49:14 +08:00
jiawei 7168036c49 系统参数模块开发 2021-01-05 20:46:19 +08:00
陈立 8893b0fb0d group7-陈立 性能监控——服务器信息、SQL监控两个模块，合并的时候注意一下application.yml里面druid的配置不能删 2021-01-05 16:08:56 +08:00
TSQ fa246c707f 日志控制器 2021-01-05 16:08:36 +08:00
TSQ 5600e36f6a 登陆日志控制器 2021-01-05 16:00:13 +08:00
TSQ 2d0c45d6b0 业务操作控制器分支 2021-01-05 15:46:34 +08:00
TSQ efe2490f73 业务操作控制器 2021-01-05 15:31:25 +08:00
fengshuonan e0a505eac9 修改视图控制器的url以/view开头 2021-01-05 15:10:25 +08:00
chenjinlong 3a70322904 Merge remote-tracking branch 'origin/group2' into group2 2021-01-04 10:01:34 +08:00
chenjinlong bc2500c518 Merge branch 'master' into group2 
# Conflicts:
#	src/main/webapp/assets/common/js/common.js
 2021-01-04 09:46:26 +08:00
fengshuonan 3e049fc14d 1.增加session超时的跳转 
2.从新整理过滤器，refreshSession放到base拦截器
3.全局异常拦截器，特殊考虑session超时情况
 2021-01-02 22:24:02 +08:00
fengshuonan aeefbfb84d 更新404页面，改为不渲染json，渲染html页面 2021-01-02 10:29:52 +08:00
fengshuonan 26e761a710 整理首页信息获取封装到service 2021-01-01 20:24:29 +08:00
fengshuonan 3c4ad004c8 更新工作台的url，更新异常拦截返回的http状态码为500 2021-01-01 16:55:18 +08:00
chenjinlong d9b8eca541 【Position】功能完善并且增加easyweb新组件用于copy 2020-12-31 00:52:25 +08:00
chenjinlong b5b8d75da2 【Organization】增加组织架构页面，功能暂未实现 2020-12-31 00:51:20 +08:00
chenjinlong d001335855 【ajaxUtil.js】ajax工具 2020-12-30 20:36:05 +08:00
chenjinlong 680c697d4b Merge remote-tracking branch 'origin/master' into group2 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java
 2020-12-30 17:01:49 +08:00
fengshuonan da60c89600 新增个人信息界面和修改密码界面，待联调接口 2020-12-29 22:33:56 +08:00
chenjinlong 9c18bb4afa 【position】增加职位管理 2020-12-29 21:56:12 +08:00
fengshuonan e2f1c75d3f 更新退出接口 2020-12-29 21:40:41 +08:00
fengshuonan 0de7eee12f 更新工作台和分析页两个界面，更新锁屏界面 2020-12-29 21:38:11 +08:00
fengshuonan 31f9a6ef0f 初步调通登录和首页的界面 2020-12-27 20:00:09 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00