Skip to content
This repository was archived by the owner on Mar 16, 2021. It is now read-only.

Commit 5beeb05

Browse files
734839030734839030
committed
完善权限
1 parent cb5d62d commit 5beeb05

File tree

22 files changed

+138
-63
lines changed

22 files changed

+138
-63
lines changed

‎screenshots/login.png‎

2.73 MB
Loading

‎src/main/java/com/seezoon/framework/common/file/FileHandlerFactory.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
package com.seezoon.framework.common.file;
22

33
import org.apache.commons.lang3.StringUtils;
4-
import org.slf4j.Logger;
5-
import org.slf4j.LoggerFactory;
64

7-
import com.alibaba.fastjson.JSON;
85
import com.seezoon.framework.common.Constants;
96
import com.seezoon.framework.common.file.handler.AliFileFileHandler;
107
import com.seezoon.framework.common.file.handler.FileHandler;
118
import com.seezoon.framework.common.file.handler.LocalFileHandler;
129

1310
public class FileHandlerFactory {
1411

15-
private static Logger logger = LoggerFactory.getLogger(FileHandlerFactory.class);
1612
private static FileHandler fileHandler = null;
1713

1814
// 文件配置
@@ -22,7 +18,6 @@ public static FileHandler getHandler() {
2218
if (null != fileHandler) {
2319
return fileHandler;
2420
}
25-
logger.info(JSON.toJSONString(fileConfig));
2621
String fileStorage = fileConfig.getFileStorage();
2722
if (Constants.FileStorage.LOCAL.getValue().equals(fileStorage)) {// 本地
2823
fileHandler = new LocalFileHandler(fileConfig.getLocalStorePath());

‎src/main/java/com/seezoon/framework/modules/system/shiro/UserFilter.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,36 @@
33
import javax.servlet.ServletRequest;
44
import javax.servlet.ServletResponse;
55
import javax.servlet.http.HttpServletRequest;
6+
import javax.servlet.http.HttpServletResponse;
67

78
import org.springframework.stereotype.Component;
89
import org.springframework.web.bind.annotation.RequestMethod;
910

11+
import com.seezoon.framework.common.web.HttpStatus;
12+
1013
/**
11-
* 账密或者remember 的拦截器
14+
* 账密或者remember 的拦截器
1215
*
1316
* 解决在remember的情况下，跨域请求options 请求无法携带cookie 的问题
14-
*
15-
* @author hdf
16-
* 2018年4月19日
17+
*
18+
* @author hdf 2018年4月19日
1719
*/
1820
@Component
1921
public class UserFilter extends org.apache.shiro.web.filter.authc.UserFilter {
2022

2123
@Override
2224
protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
23-
HttpServletRequest req = (HttpServletRequest)request;
24-
//跨域的options 请求直接过
25+
HttpServletRequest req = (HttpServletRequest) request;
26+
HttpServletResponse res = (HttpServletResponse) response;
27+
// 跨域的options 请求直接过
2528
if (RequestMethod.OPTIONS.name().equalsIgnoreCase(req.getMethod())) {
2629
return true;
30+
} else {
31+
res.setStatus(HttpStatus.NEED_LOGIN.getValue());
32+
//不走后续shiro 默认逻辑
33+
return false;
2734
}
28-
return super.onAccessDenied(request, response);
35+
//return super.onAccessDenied(request, response);
2936
}
3037

3138
@Override

‎src/main/java/com/seezoon/framework/modules/system/web/SysDeptController.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.List;
55

66
import org.apache.commons.lang3.StringUtils;
7+
import org.apache.shiro.authz.annotation.RequiresPermissions;
78
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.validation.BindingResult;
910
import org.springframework.validation.annotation.Validated;
@@ -35,13 +36,13 @@ public ResponeModel qryAll(SysDept sysDept) {
3536
//数据机构调整
3637
return ResponeModel.ok(treeHelper.treeGridList(list));
3738
}
38-
39+
@RequiresPermissions("sys:dept:qry")
3940
@RequestMapping("/get.do")
4041
public ResponeModel get(@RequestParam Serializable id) {
4142
SysDept sysDept = sysDeptService.findById(id);
4243
return ResponeModel.ok(sysDept);
4344
}
44-
45+
@RequiresPermissions("sys:dept:save")
4546
@PostMapping("/save.do")
4647
public ResponeModel save(@Validated SysDept sysDept, BindingResult bindingResult) {
4748
SysDept parent = null;
@@ -52,7 +53,7 @@ public ResponeModel save(@Validated SysDept sysDept, BindingResult bindingResult
5253
int cnt = sysDeptService.save(sysDept);
5354
return ResponeModel.ok(cnt);
5455
}
55-
56+
@RequiresPermissions("sys:dept:update")
5657
@PostMapping("/update.do")
5758
public ResponeModel update(@Validated SysDept sysDept, BindingResult bindingResult) {
5859
SysDept parent = null;
@@ -64,6 +65,7 @@ public ResponeModel update(@Validated SysDept sysDept, BindingResult bindingResu
6465
return ResponeModel.ok(cnt);
6566
}
6667

68+
@RequiresPermissions("sys:dept:delete")
6769
@PostMapping("/delete.do")
6870
public ResponeModel delete(@RequestParam Serializable id) {
6971
int cnt = sysDeptService.deleteById(id);

‎src/main/java/com/seezoon/framework/modules/system/web/SysDictController.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.Serializable;
44

5+
import org.apache.shiro.authz.annotation.RequiresPermissions;
56
import org.springframework.beans.factory.annotation.Autowired;
67
import org.springframework.validation.BindingResult;
78
import org.springframework.validation.annotation.Validated;
@@ -23,35 +24,38 @@ public class SysDictController extends BaseController {
2324
@Autowired
2425
private SysDictService sysDictService;
2526

27+
@RequiresPermissions("sys:dict:qry")
2628
@PostMapping("/qryPage.do")
2729
public ResponeModel qryPage(SysDict sysDict) {
2830
PageInfo<SysDict> page = sysDictService.findByPage(sysDict, sysDict.getPage(), sysDict.getPageSize());
2931
return ResponeModel.ok(page);
3032
}
3133

34+
@RequiresPermissions("sys:dict:qry")
3235
@RequestMapping("/get.do")
3336
public ResponeModel get(@RequestParam Serializable id) {
3437
SysDict sysDict = sysDictService.findById(id);
3538
return ResponeModel.ok(sysDict);
3639
}
37-
40+
@RequiresPermissions("sys:dict:save")
3841
@PostMapping("/save.do")
3942
public ResponeModel save(@Validated SysDict sysDict, BindingResult bindingResult) {
4043
int cnt = sysDictService.save(sysDict);
4144
return ResponeModel.ok(cnt);
4245
}
43-
46+
@RequiresPermissions("sys:dict:update")
4447
@PostMapping("/update.do")
4548
public ResponeModel update(@Validated SysDict sysDict,BindingResult bindingResult) {
4649
int cnt = sysDictService.updateSelective(sysDict);
4750
return ResponeModel.ok(cnt);
4851
}
49-
52+
@RequiresPermissions("sys:dict:delete")
5053
@PostMapping("/delete.do")
5154
public ResponeModel delete(@RequestParam Serializable id) {
5255
int cnt = sysDictService.deleteById(id);
5356
return ResponeModel.ok(cnt);
5457
}
58+
5559
@RequestMapping("/getTypes.do")
5660
public ResponeModel getTypes() {
5761
return ResponeModel.ok(sysDictService.findTypes());

‎src/main/java/com/seezoon/framework/modules/system/web/SysFileController.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.Serializable;
44
import java.util.Date;
55

6+
import org.apache.shiro.authz.annotation.RequiresPermissions;
67
import org.springframework.beans.factory.annotation.Autowired;
78
import org.springframework.web.bind.annotation.PostMapping;
89
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +23,8 @@ public class SysFileController extends BaseController {
2223

2324
@Autowired
2425
private SysFileService sysFileService;
25-
26+
27+
@RequiresPermissions("sys:file:qry")
2628
@PostMapping("/qryPage.do")
2729
public ResponeModel qryPage(SysFile sysFile,@RequestParam(required=false) Date startDate,@RequestParam(required=false) Date endDate) {
2830
sysFile.addProperty("startDate", startDate);
@@ -33,6 +35,8 @@ public ResponeModel qryPage(SysFile sysFile,@RequestParam(required=false) Date s
3335
}
3436
return ResponeModel.ok(page);
3537
}
38+
39+
@RequiresPermissions("sys:file:delete")
3640
@PostMapping("/delete.do")
3741
public ResponeModel delete(@RequestParam Serializable id) {
3842
int cnt = sysFileService.deleteById(id);

‎src/main/java/com/seezoon/framework/modules/system/web/SysMenuController.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.List;
55

66
import org.apache.commons.lang3.StringUtils;
7+
import org.apache.shiro.authz.annotation.RequiresPermissions;
78
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.validation.BindingResult;
910
import org.springframework.validation.annotation.Validated;
@@ -36,13 +37,13 @@ public ResponeModel qryAll(SysMenu sysMenu) {
3637
List<SysMenu> list = sysMenuService.findList(sysMenu);
3738
return ResponeModel.ok(treeHelper.treeGridList(list));
3839
}
39-
40+
@RequiresPermissions("sys:menu:qry")
4041
@RequestMapping("/get.do")
4142
public ResponeModel get(@RequestParam Serializable id) {
4243
SysMenu sysMenu = sysMenuService.findById(id);
4344
return ResponeModel.ok(sysMenu);
4445
}
45-
46+
@RequiresPermissions("sys:menu:save")
4647
@PostMapping("/save.do")
4748
public ResponeModel save(@Validated SysMenu sysMenu, BindingResult bindingResult) {
4849
SysMenu parent = null;
@@ -53,7 +54,7 @@ public ResponeModel save(@Validated SysMenu sysMenu, BindingResult bindingResult
5354
int cnt = sysMenuService.save(sysMenu);
5455
return ResponeModel.ok(cnt);
5556
}
56-
57+
@RequiresPermissions("sys:menu:update")
5758
@PostMapping("/update.do")
5859
public ResponeModel update(@Validated SysMenu sysMenu, BindingResult bindingResult) {
5960
SysMenu parent = null;
@@ -64,12 +65,13 @@ public ResponeModel update(@Validated SysMenu sysMenu, BindingResult bindingResu
6465
int cnt = sysMenuService.updateSelective(sysMenu);
6566
return ResponeModel.ok(cnt);
6667
}
67-
68+
@RequiresPermissions("sys:menu:delete")
6869
@PostMapping("/delete.do")
6970
public ResponeModel delete(@RequestParam Serializable id) {
7071
int cnt = sysMenuService.deleteById(id);
7172
return ResponeModel.ok(cnt);
7273
}
74+
@RequiresPermissions("sys:menu:save")
7375
@PostMapping("/batchSave.do")
7476
public ResponeModel batchSave(@RequestBody List<SysMenu> list ) {
7577
//直接用list接收到的json 参数实际上是jsonObject，强转到SysMenu 会报错,下列性能不好，应该不想循环List 转化

‎src/main/java/com/seezoon/framework/modules/system/web/SysParamController.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.HashMap;
55
import java.util.Map;
66

7+
import org.apache.shiro.authz.annotation.RequiresPermissions;
78
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.validation.BindingResult;
910
import org.springframework.validation.annotation.Validated;
@@ -26,30 +27,31 @@ public class SysParamController extends BaseController {
2627
@Autowired
2728
private SysParamService sysParamService;
2829

30+
@RequiresPermissions("sys:param:qry")
2931
@PostMapping("/qryPage.do")
3032
public ResponeModel qryPage(SysParam sysParam) {
3133
PageInfo<SysParam> page = sysParamService.findByPage(sysParam, sysParam.getPage(), sysParam.getPageSize());
3234
return ResponeModel.ok(page);
3335
}
34-
36+
@RequiresPermissions("sys:param:qry")
3537
@RequestMapping("/get.do")
3638
public ResponeModel get(@RequestParam Serializable id) {
3739
SysParam sysParam = sysParamService.findById(id);
3840
return ResponeModel.ok(sysParam);
3941
}
40-
42+
@RequiresPermissions("sys:param:save")
4143
@PostMapping("/save.do")
4244
public ResponeModel save(@Validated SysParam sysParam, BindingResult bindingResult) {
4345
int cnt = sysParamService.save(sysParam);
4446
return ResponeModel.ok(cnt);
4547
}
46-
48+
@RequiresPermissions("sys:param:update")
4749
@PostMapping("/update.do")
4850
public ResponeModel update(@Validated SysParam sysParam, BindingResult bindingResult) {
4951
int cnt = sysParamService.updateSelective(sysParam);
5052
return ResponeModel.ok(cnt);
5153
}
52-
54+
@RequiresPermissions("sys:param:delete")
5355
@PostMapping("/delete.do")
5456
public ResponeModel delete(@RequestParam Serializable id) {
5557
int cnt = sysParamService.deleteById(id);

‎src/main/java/com/seezoon/framework/modules/system/web/SysRoleController.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.Serializable;
44

5+
import org.apache.shiro.authz.annotation.RequiresPermissions;
56
import org.springframework.beans.factory.annotation.Autowired;
67
import org.springframework.validation.BindingResult;
78
import org.springframework.validation.annotation.Validated;
@@ -23,34 +24,43 @@ public class SysRoleController extends BaseController {
2324
@Autowired
2425
private SysRoleService sysRoleService;
2526

27+
@RequiresPermissions("sys:role:qry")
2628
@PostMapping("/qryPage.do")
2729
public ResponeModel qryPage(SysRole sysRole) {
2830
PageInfo<SysRole> page = sysRoleService.findByPage(sysRole, sysRole.getPage(), sysRole.getPageSize());
2931
return ResponeModel.ok(page);
3032
}
33+
/**
34+
* 添加修改用户时候会调用
35+
* @return
36+
*/
3137
@PostMapping("/qryAll.do")
3238
public ResponeModel qryAll() {
3339
return ResponeModel.ok(this.sysRoleService.findList(null));
3440
}
3541

42+
@RequiresPermissions("sys:role:qry")
3643
@RequestMapping("/get.do")
3744
public ResponeModel get(@RequestParam Serializable id) {
3845
SysRole sysRole = sysRoleService.findById(id);
3946
return ResponeModel.ok(sysRole);
4047
}
4148

49+
@RequiresPermissions("sys:role:save")
4250
@PostMapping("/save.do")
4351
public ResponeModel save(@Validated SysRole sysRole, BindingResult bindingResult) {
4452
int cnt = sysRoleService.save(sysRole);
4553
return ResponeModel.ok(cnt);
4654
}
4755

56+
@RequiresPermissions("sys:role:update")
4857
@PostMapping("/update.do")
4958
public ResponeModel update(@Validated SysRole sysRole, BindingResult bindingResult) {
5059
int cnt = sysRoleService.updateSelective(sysRole);
5160
return ResponeModel.ok(cnt);
5261
}
5362

63+
@RequiresPermissions("sys:role:delete")
5464
@PostMapping("/delete.do")
5565
public ResponeModel delete(@RequestParam Serializable id) {
5666
int cnt = sysRoleService.deleteById(id);

‎src/main/java/com/seezoon/framework/modules/system/web/SysUserController.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.seezoon.framework.modules.system.web;
22

33
import java.io.Serializable;
4-
import java.util.HashMap;
54
import java.util.List;
6-
import java.util.Map;
75

86
import javax.servlet.http.HttpServletRequest;
97

0 commit comments

Comments
 (0)