diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java index e88dd2d5..118a355a 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java @@ -9,7 +9,6 @@ import com.jeesite.common.collect.MapUtils; import com.jeesite.common.config.Global; import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.lang.TimeUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.cms.entity.Article; import com.jeesite.modules.cms.entity.Category; @@ -19,7 +18,6 @@ import com.jeesite.modules.cms.service.FileTempleteService; import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.utils.DictUtils; -import com.jeesite.modules.sys.utils.UserUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -325,7 +323,7 @@ public class CategoryController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(Category category) { - if (!UserUtils.getUser().isAdmin()) { + if (!category.currentUser().isAdmin()) { return renderResult(Global.FALSE, "操作失败,只有管理员才能进行修复!"); } categoryService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java index 6ca9f215..3be20ef0 100644 --- a/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java +++ b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java @@ -12,7 +12,6 @@ import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.biz.entity.BizCategory; import com.jeesite.modules.biz.service.BizCategoryService; -import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -236,7 +235,7 @@ public class BizCategoryController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(BizCategory bizCategory){ - if (!UserUtils.getUser().isAdmin()){ + if (!bizCategory.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败,只有管理员才能进行修复!"); } bizCategoryService.fixTreeData(); diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index d8d3ddeb..09614b0d 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; <% }else{ %> import com.jeesite.common.entity.Page; <% } %> @@ -368,7 +367,7 @@ public class ${ClassName}Controller extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(${ClassName} ${className}){ - if (!UserUtils.getUser().isAdmin()){ + if (!${className}.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败,只有管理员才能进行修复!"); } ${className}Service.fixTreeData(); diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml index 3f02048e..a9b0d1e5 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml @@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; <% }else{ %> import com.jeesite.common.entity.Page; <% } %> @@ -370,7 +369,7 @@ public class ${ClassName}Controller extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(${ClassName} ${className}){ - if (!UserUtils.getUser().isAdmin()){ + if (!${className}.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败,只有管理员才能进行修复!"); } ${className}Service.fixTreeData(); diff --git a/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java index a93002eb..208112c0 100644 --- a/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java +++ b/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java @@ -4,9 +4,14 @@ */ package com.jeesite.modules.test.web; -import java.util.List; -import java.util.Map; - +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.collect.MapUtils; +import com.jeesite.common.config.Global; +import com.jeesite.common.idgen.IdGen; +import com.jeesite.common.lang.StringUtils; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.test.entity.TestTree; +import com.jeesite.modules.test.service.TestTreeService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,15 +22,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.jeesite.common.config.Global; -import com.jeesite.common.collect.ListUtils; -import com.jeesite.common.collect.MapUtils; -import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; -import com.jeesite.common.web.BaseController; -import com.jeesite.modules.test.entity.TestTree; -import com.jeesite.modules.test.service.TestTreeService; +import java.util.List; +import java.util.Map; /** * 测试树表Controller @@ -214,7 +212,7 @@ public class TestTreeController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(TestTree testTree){ - if (!UserUtils.getUser().isAdmin()){ + if (!testTree.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败,只有管理员才能进行修复!"); } testTreeService.fixTreeData();