数据字典授权和菜单授权问题处理

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -338,7 +338,7 @@ public class SysDictController {
 	 */
 	@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
 	@PostMapping("/add")
-	@RequiresPermissions("dict:add")
+	@RequiresPermissions("sys:dict:operation")
 	public Results<Object> add(@RequestBody SysDict sysDict) {
 		try {
 			sysDict.setCreateTime(new Date());
@@ -360,7 +360,7 @@ public class SysDictController {
 	 */
 	@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
 	@PostMapping("/edit")
-	@RequiresPermissions("dict:edit")
+	@RequiresPermissions("sys:dict:operation")
 	public Results<Object> edit(@RequestBody SysDict sysDict) {
 		SysDict sysdict = sysDictService.getById(sysDict.getId());
 		if(sysdict==null) {
@@ -384,7 +384,7 @@ public class SysDictController {
 	 */
 	@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
 	@PostMapping(value = "/delete")
-	@RequiresPermissions("dict:delete")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<Object> delete(@RequestBody Map<String,String> map) {
 		String id = map.get("id");
@@ -406,7 +406,7 @@ public class SysDictController {
 	 */
 	@ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典")
 	@PostMapping(value = "/deleteBatch")
-	@RequiresPermissions("dict:delete")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		if(oConvertUtils.isEmpty(ids)) {
@@ -435,7 +435,7 @@ public class SysDictController {
 	 * @param request
 	 */
 	@RequestMapping(value = "/exportXls")
-	@RequiresPermissions("dict:export")
+	@RequiresPermissions("sys:dict:operation")
 	public ModelAndView exportXls(SysDict sysDict, HttpServletRequest request) {
 		// Step.1 组装查询条件
 		QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
@@ -467,7 +467,7 @@ public class SysDictController {
 
 
 	@PostMapping(value = "/importExcel")
-	@RequiresPermissions("dict:import")
+	@RequiresPermissions("sys:dict:operation")
 	public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) {
  		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
@@ -553,7 +553,7 @@ public class SysDictController {
 	 * @return
 	 */
 	@PostMapping(value = "/deletePhysic/{id}")
-	@RequiresPermissions("dict:delete")
+	@RequiresPermissions("sys:dict:operation")
 	public Results<T> deletePhysic(@PathVariable String id) {
 		try {
 			sysDictService.deleteOneDictPhysically(id);
@@ -570,7 +570,7 @@ public class SysDictController {
 	 * @return
 	 */
 	@PostMapping(value = "/back/{id}")
-	@RequiresPermissions("dict:edit")
+	@RequiresPermissions("sys:dict:operation")
 	public Results<T> back(@PathVariable String id) {
 		try {
 			sysDictService.updateDictDelFlag(0,id);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java

@@ -68,9 +68,8 @@ public class SysDictItemController {
 	 * @功能：新增
 	 * @return
 	 */
-	//@RequiresRoles({"admin"})
-	@RequiresPermissions("sys:dict:list")
 	@PostMapping("/add")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<Object> add(@RequestBody SysDictItem sysDictItem) {
 		try {
@@ -88,9 +87,8 @@ public class SysDictItemController {
 	 * @param sysDictItem
 	 * @return
 	 */
-	//@RequiresRoles({"admin"})
-	@RequiresPermissions("sys:dict:list")
 	@PostMapping("/edit")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<Object> edit(@RequestBody SysDictItem sysDictItem) {
 		SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
@@ -111,9 +109,8 @@ public class SysDictItemController {
 	 * @param map
 	 * @return
 	 */
-	//@RequiresRoles({"admin"})
-	@RequiresPermissions("sys:dict:list")
 	@PostMapping("/delete")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<T> delete(@RequestBody Map<String, String> map) {
 		String id = map.get("id");
@@ -137,9 +134,8 @@ public class SysDictItemController {
 	 * @param map
 	 * @return
 	 */
-	//@RequiresRoles({"admin"})
-	@RequiresPermissions("sys:dict:list")
 	@PostMapping("/deleteBatch")
+	@RequiresPermissions("sys:dict:operation")
 	@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
 	public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
 		String ids = map.get("ids");
@@ -157,7 +153,6 @@ public class SysDictItemController {
 	 * @param request
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@GetMapping("/dictItemCheck")
 	public Results<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
 		int num = 0;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java

@@ -24,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -230,7 +229,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/add")
-	@RequiresPermissions("permission:add")
 	public Results<Object> add(@RequestBody SysPermission permission) {
 		try {
 			permission = PermissionDataUtil.intelligentProcessData(permission);
@@ -248,7 +246,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/edit")
-	@RequiresPermissions("permission:edit")
 	public Results<Object> edit(@RequestBody SysPermission permission) {
 		try {
 			permission = PermissionDataUtil.intelligentProcessData(permission);
@@ -265,9 +262,7 @@ public class SysPermissionController {
 	 * @param map
 	 * @return
 	 */
-	//@RequiresRoles({ "admin" })
 	@PostMapping("/delete")
-	@RequiresPermissions("permission:delete")
 	public Results<T> delete(@RequestBody Map<String, String> map) {
 		String id = map.get("id");
 		if(StringUtils.isBlank(id)){
@@ -287,9 +282,7 @@ public class SysPermissionController {
 	 * @param map
 	 * @return
 	 */
-	//@RequiresRoles({ "admin" })
 	@PostMapping("/deleteBatch")
-	@RequiresPermissions("permission:delete")
 	public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
 		String ids = map.get("ids");
 		if(StringUtils.isBlank(ids)){
@@ -388,7 +381,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/saveRolePermission")
-	@RequiresPermissions("permission:add")
 	public Results<String> saveRolePermission(@RequestBody JSONObject json) {
 		long start = System.currentTimeMillis();
 		try {
@@ -673,7 +665,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/addPermissionRule")
-	@RequiresPermissions("permission:add")
 	public Results<Object> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
 		try {
 			sysPermissionDataRule.setCreateTime(new Date());
@@ -686,7 +677,6 @@ public class SysPermissionController {
 	}
 
 	@PostMapping("/editPermissionRule")
-	@RequiresPermissions("permission:edit")
 	public Results<Object> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
 		try {
 			sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule);
@@ -704,7 +694,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/deletePermissionRule")
-	@RequiresPermissions("permission:delete")
 	public Results<Object> deletePermissionRule(@RequestBody Map<String,String> map) {
 		try {
 			String id = map.get("id");
@@ -760,7 +749,6 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@PostMapping("/saveDepartPermission")
-	@RequiresPermissions("permission:add")
 	public Results<String> saveDepartPermission(@RequestBody JSONObject json) {
 		long start = System.currentTimeMillis();
 		try {