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

341 Commits (bf2608aec74dd9414b6f456058425fa07b83ad8a)

Author SHA1 Message Date
fengshuonan 3ef27a03c7 Merge remote-tracking branch 'origin/group2' 2021-01-14 20:25:34 +08:00
hansson d209613553 【notice】新增消息模块开发，更新tinymce富文本编辑器。 
问题： 1、全局过滤器会过滤掉富文本的html标签
      2、图片上传功能为实现，后台上传接口是否要统一实现
 2021-01-14 15:37:43 +08:00
fengshuonan eedbeb109e 修复一个提示错误，增加日志打印sql的开关 2021-01-13 21:47:23 +08:00
chenjinlong 402a4d58a7 【log_detail.html】form名称修改 2021-01-13 21:08:03 +08:00
chenjinlong 39e5d3ca2f 【resource_detail.html】样式修改 2021-01-13 21:07:28 +08:00
chenjinlong 1dce44a9f6 【func.js】修改弹框方法，ifream内弹出遮罩层 2021-01-13 21:06:58 +08:00
fengshuonan d8e482bc7d Merge remote-tracking branch 'origin/group1-dict' 2021-01-13 20:07:55 +08:00
fengshuonan ca192ef935 Merge remote-tracking branch 'origin/group2-log-loginlog' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/log/LogViewController.java
#	src/main/java/cn/stylefeng/guns/modular/log/LoginLogViewController.java
#	src/main/webapp/assets/modular/system/log/log.js
#	src/main/webapp/pages/modular/system/log/log_detail.html
 2021-01-13 20:06:48 +08:00
chenjinlong eec2c1eb56 【操作日志】【登录日志】功能新增与完善 2021-01-13 19:46:38 +08:00
fengshuonan cd0890d032 更新数据库密码 2021-01-13 18:10:01 +08:00
huangyao 6d46164a62 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-13 15:24:56 +08:00
huangyao 2f26d01864 优化查询； 
添加字典字段；
 2021-01-13 15:24:50 +08:00
fengshuonan 44e42fa764 更新代码 2021-01-13 13:17:59 +08:00
fengshuonan 19ef41a385 Merge remote-tracking branch 'origin/group1-dict' 2021-01-13 13:16:53 +08:00
fengshuonan f8a6db2d3e Merge remote-tracking branch 'origin/group7-file' 2021-01-13 13:15:38 +08:00
fengshuonan da7750591c Merge remote-tracking branch 'origin/group5-notice' 2021-01-13 13:15:11 +08:00
fengshuonan 16b7f09625 Merge remote-tracking branch 'origin/group2-organization' 2021-01-13 13:14:41 +08:00
chenjinlong df7cd394e7 【user】【organization】BUG修复，删除js控制台log 2021-01-12 23:07:32 +08:00
huangyao 4e15a3279f Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 22:53:07 +08:00
huangyao d1d8c9c9f4 将字典树移到底层； 2021-01-12 22:52:58 +08:00
fengshuonan 9b163bb7e4 Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:38:09 +08:00
小庆 aa943e3657 【file】文件管理 预览（未完成） 2021-01-12 22:31:46 +08:00
chenjinlong b12701e9b5 【User】用户管理功能完善 2021-01-12 22:17:11 +08:00
liuhanqing d469603253 【message】首页消息功能完善 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-12 22:11:19 +08:00
fengshuonan dfb121d45a Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:04:12 +08:00
chenjinlong 38c23ebfb2 【User】用户管理功能完善 2021-01-12 22:02:02 +08:00
chenjinlong b60f865cb2 【User】用户管理功能完善 2021-01-12 22:00:57 +08:00
fengshuonan e901c50a98 Merge remote-tracking branch 'origin/group5-log' 2021-01-12 22:00:25 +08:00
chenjinlong c8a22f80c4 【User】用户管理功能完善 2021-01-12 22:00:20 +08:00
liuhanqing df79dd9202 【message】我的消息列表开发 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-12 21:55:06 +08:00
fengshuonan 90ed39e6df 更新url地址 2021-01-12 21:40:43 +08:00
fengshuonan 638c236aed Merge remote-tracking branch 'origin/group2-sysUser' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java
 2021-01-12 21:20:29 +08:00
chenjinlong 2f38eea750 【organization】树控件替换 2021-01-12 20:56:58 +08:00
liuhanqing 3f30c0593a Merge branch 'master' into group5-notice 
# Conflicts:
#	src/main/webapp/assets/modular/frame/message.js
 2021-01-12 20:18:27 +08:00
chenjinlong 057f88699c 【sysUser】分配角色，职务选择功能完善 2021-01-12 19:56:05 +08:00
TSQ e7230f2541 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-12 13:47:24 +08:00
TSQ 329afc5f45 完善日志管理列表功能，完善查看详情，删除日志功能 2021-01-12 13:47:07 +08:00
huangyao c366cc45ad Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 12:52:57 +08:00
fengshuonan 9090c42346 更新在线用户逻辑 2021-01-11 23:11:44 +08:00
huangyao 09e48f3d6e Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-11 21:46:02 +08:00
huangyao ad90aeb696 字典树； 
添加字典；
 2021-01-11 21:45:31 +08:00
liuhanqing 88cfc71b7e 【message】首页消息功能开发 2021-01-11 20:51:45 +08:00
小庆 e21e67faa4 【file】文件管理上传、下载、搜索、删除 2021-01-11 20:20:12 +08:00
小庆 b6b6953c8a 【file】文件管理列表显示 2021-01-11 17:33:19 +08:00
fengshuonan 08d6bfb0bf 整理控制器格式规范，统一修改以/view开头 2021-01-10 19:58:39 +08:00
chenjinlong c3b48bc809 【sysUser】功能完善 2021-01-10 18:40:15 +08:00
huangyao 904837f28b Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-10 18:37:28 +08:00
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 591e0b2345 更新本地库的配置 2021-01-10 09:54:08 +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
fengshuonan 0bec97ae72 调整按钮管理样式 2021-01-09 17:31:28 +08:00
fengshuonan 7ab98189cb 更新格式 2021-01-09 17:21:38 +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 aab7aa4781 【system】添加不允许修改菜单按钮code 2021-01-09 16:23:50 +08:00
fengshuonan 1e62a588e0 更新菜单操作栏宽度 2021-01-09 16:14:44 +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
chenjinlong 6bdc0abcb1 【application-dev.yml】修改beetl版本dev数据库 2021-01-09 12:35:43 +08:00
fengshuonan 074703b161 增加角色管理界面的按钮绑定权限 2021-01-09 12:08:00 +08:00
fengshuonan 0bd88d4e68 更新修改头像接口 2021-01-09 10:53:03 +08:00
陈立 48b90d2b75 修改配置并将druid配置放到bean里 2021-01-09 10:28:47 +08:00
fengshuonan a21d1d451d 更新一个按钮名 2021-01-08 23:01:58 +08:00
fengshuonan 8bda78513a 更新资源管理界面 2021-01-08 22:27:59 +08:00
fengshuonan a82021ab9b 更新资源管理界面 2021-01-08 22:25:43 +08:00
fengshuonan f6556c0637 更新角色列表，新增，修改功能 2021-01-08 21:54:19 +08:00
fengshuonan fd3def6602 更新header的应用列表获取 2021-01-08 20:53:52 +08:00
陈立 37658803c8 修改配置并将druid配置放到bean里 2021-01-08 18:49:38 +08:00
fengshuonan 5bdd0ab2d2 整理修改菜单界面 2021-01-08 18:33:38 +08:00
@阿坤同学 3aadb055dc 【定时模块】新增视图返回接口，新增CRUD页面 2021-01-08 17:08:25 +08:00
TSQ 928dad93b4 Merge branch 'group2-yml' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-08 10:29:20 +08:00
chenjinlong 52bedc3178 【User】用户管理功能完善 2021-01-07 22:31:19 +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
chenjinlong 8116103641 【hr_organization】功能调整优化 2021-01-07 19:08:10 +08:00
chenjinlong c783f0f2ef 【application-dev.yml】修改beetl版本dev数据库 2021-01-07 18:37:08 +08:00
TSQ 91ee8f16ab Merge remote-tracking branch 'origin/master' 2021-01-07 08:59:13 +08:00
fengshuonan 45e340f7be 整理完成新增菜单 2021-01-06 22:36:23 +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 84517ec302 Merge remote-tracking branch 'origin/group2' 2021-01-06 20:45:19 +08:00
fengshuonan c829c6cea8 更新菜单列表，查询，删除 2021-01-06 20:31:53 +08:00
fengshuonan cbcbd85a8c 更新通用tree选择器 2021-01-06 20:31:18 +08:00
fengshuonan 3dd68a7219 更新ztree-object的封装 2021-01-06 17:56:17 +08:00
fengshuonan 4ca1437f66 更新json日期返回前端的格式化 2021-01-06 16:38:10 +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 5b7a807c9b 添加全局禁言样式 2021-01-05 20:47:02 +08:00
jiawei 7168036c49 系统参数模块开发 2021-01-05 20:46:19 +08:00
fengshuonan da1a60f216 视图页面，加上/view开头，菜单列表的字段修改 2021-01-05 16:35: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 336c5fa98b 【Organization】页面修改 
【Position】页面规范整理
 2021-01-05 09:17:44 +08:00
chenjinlong 8ce0dc8842 【Position】HttpRequest 替换 2021-01-04 15:15:11 +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 33c42e144d 整理修改密码的业务逻辑 2021-01-02 11:28:31 +08:00
fengshuonan aeefbfb84d 更新404页面，改为不渲染json，渲染html页面 2021-01-02 10:29:52 +08:00
fengshuonan 891e4e3f94 整理个人信息界面的接口 2021-01-01 22:42:08 +08:00
fengshuonan bc09b61a36 【前端】重构http的请求封装，将登陆和首页调用新的http工具类 2021-01-01 21:54:41 +08:00
fengshuonan 26e761a710 整理首页信息获取封装到service 2021-01-01 20:24:29 +08:00
fengshuonan c3532f7918 删除多语言条 2021-01-01 18:21:17 +08:00
fengshuonan f672d8c167 更新顶部英文名称显示 2021-01-01 18:20:39 +08:00
fengshuonan 8b8ea13891 更新页脚 2021-01-01 17:58:40 +08:00
fengshuonan 3c4ad004c8 更新工作台的url，更新异常拦截返回的http状态码为500 2021-01-01 16:55:18 +08:00
chenjinlong a742c45dab 【Organization】页面修改 2020-12-31 01:06:59 +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 b2ca193586 【ajaxUtil】增加json格式化 2020-12-31 00:50:15 +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
chenjinlong 56ae380659 增加解析数据表格templet列公共方法 2020-12-29 21:55:04 +08:00
fengshuonan e2f1c75d3f 更新退出接口 2020-12-29 21:40:41 +08:00
fengshuonan 0de7eee12f 更新工作台和分析页两个界面，更新锁屏界面 2020-12-29 21:38:11 +08:00
fengshuonan 6e5af0da59 更新头像 2020-12-29 20:22:10 +08:00
chenjinlong 6fd6dc70cf loading的layout引入路径修改 2020-12-28 20:33:43 +08:00
fengshuonan 31f9a6ef0f 初步调通登录和首页的界面 2020-12-27 20:00:09 +08:00
fengshuonan b7f7a9c3e2 更改layout的文件夹名称 2020-12-27 16:17:06 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00