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

232 Commits (4bdc3282a2e84d4986f8f609db912d01a2f7a39e)

Author SHA1 Message Date
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