diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java index eadefbb8..ad65abc0 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java @@ -4,22 +4,6 @@ */ package com.jeesite.modules.cms.web; -import java.io.IOException; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.ModelAttribute; -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.entity.Page; import com.jeesite.common.lang.StringUtils; @@ -33,6 +17,20 @@ import com.jeesite.modules.cms.service.CategoryService; import com.jeesite.modules.cms.service.FileTempleteService; import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.sys.utils.UserUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; /** * 文章表Controller @@ -100,12 +98,12 @@ public class ArticleController extends BaseController { if (!(isAll != null && isAll)) { articleService.addDataScopeFilter(article); } - if (!article.getCurrentUser().isAdmin()) { + if (!article.currentUser().isAdmin()) { // 如果没有审核权限，或者 草稿状态的文章 则只查看自己创建的文章。 if (!UserUtils.getSubject().isPermitted("cms:article:audit")) { - article.setCreateBy(article.getCurrentUser().getUserCode()); + article.setCreateBy(article.currentUser().getUserCode()); } else if (Article.STATUS_DRAFT.equals(article.getStatus())) { - article.setCreateBy(article.getCurrentUser().getUserCode()); + article.setCreateBy(article.currentUser().getUserCode()); } } Page
page = articleService.findPage(article); diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java index ab31dc15..f594e1ef 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java @@ -83,7 +83,7 @@ public class MsgInnerService extends CrudService { @Transactional public void save(MsgInner msgInner) { if (msgInner.getIsNewRecord()){ - User user = msgInner.getCurrentUser(); + User user = msgInner.currentUser(); msgInner.setSendUserCode(user.getUserCode()); msgInner.setSendUserName(user.getUserName()); // 没有设置状态，则默认新增后是草稿状态 @@ -206,7 +206,7 @@ public class MsgInnerService extends CrudService { public void readMsgInnerRecord(MsgInner msgInner){ MsgInnerRecord msgInnerRecord = new MsgInnerRecord(); msgInnerRecord.setMsgInnerId(msgInner.getId()); - msgInnerRecord.setReceiveUserCode(msgInner.getCurrentUser().getUserCode()); + msgInnerRecord.setReceiveUserCode(msgInner.currentUser().getUserCode()); msgInnerRecord.setReadStatus(MsgInnerRecord.READ_STATUS_READ); msgInnerRecord.setReadDate(new Date()); msgInnerRecordDao.updateReadStatus(msgInnerRecord); diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java index f0042ea9..cee559e2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java @@ -67,7 +67,7 @@ public class MsgInnerController extends BaseController { public Page listData(MsgInner msgInner, HttpServletRequest request, HttpServletResponse response) { msgInner.setPage(new Page<>(request, response)); msgInner.setRecord(new MsgInnerRecord()); - msgInner.getRecord().setReceiveUserCode(msgInner.getCurrentUser().getUserCode()); + msgInner.getRecord().setReceiveUserCode(msgInner.currentUser().getUserCode()); Page page = msgInnerService.findPage(msgInner); return page; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index 182b0966..79b719ec 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -310,7 +310,7 @@ public class InitCoreData extends BaseInitDataTests { entity.setIsNewRecord(true); empUserService.save(entity); // 设置当前为管理员，否则无法保存用户角色关系 - entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE)); + entity.currentUser(new User(User.SUPER_ADMIN_CODE)); userService.saveAuth(entity); return null; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/LogServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/LogServiceSupport.java index d348a01e..862ce037 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/LogServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/LogServiceSupport.java @@ -34,8 +34,8 @@ public class LogServiceSupport extends CrudService // log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); // } // 普通用户看自己的，管理员看全部的。 - if (!log.getCurrentUser().isAdmin()){ - log.setCreateBy(log.getCurrentUser().getUserCode()); + if (!log.currentUser().isAdmin()){ + log.setCreateBy(log.currentUser().getUserCode()); } return super.findPage(log); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index 89596f95..7d537771 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java @@ -103,7 +103,7 @@ public class LogUtils { log.setCorpName(user.getCorpName()); } log.setExecuteTime(executeTime); - log.setCurrentUser(user); + log.currentUser(user); log.preInsert(); // 获取异常对象 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 81ea1013..7705d8c8 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -65,8 +65,8 @@ public class CorpAdminController extends BaseController { user.setCorpCode(null); user.setCorpName(null); model.addAttribute("user", user); - model.addAttribute("currentCorpCode", user.getCurrentUser().getCorpCode_()); - model.addAttribute("currentCorpName", user.getCurrentUser().getCorpName_()); + model.addAttribute("currentCorpCode", user.currentUser().getCorpCode_()); + model.addAttribute("currentCorpName", user.currentUser().getCorpName_()); model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false")); return "modules/sys/user/corpAdminList"; } @@ -113,7 +113,7 @@ public class CorpAdminController extends BaseController { @PostMapping(value = "save") @ResponseBody public String save(@Validated User user, String op, HttpServletRequest request) { - if (!user.getCurrentUser().isSuperAdmin()){ + if (!user.currentUser().isSuperAdmin()){ return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！")); } if (User.isSuperAdmin(user.getUserCode())) { @@ -175,7 +175,7 @@ public class CorpAdminController extends BaseController { if (User.isSuperAdmin(user.getUserCode())) { return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！")); } - if (user.getCurrentUser().getUserCode().equals(user.getUserCode())) { + if (user.currentUser().getUserCode().equals(user.getUserCode())) { return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户")); } user.setStatus(User.STATUS_DISABLE); @@ -228,7 +228,7 @@ public class CorpAdminController extends BaseController { if (User.isSuperAdmin(user.getUserCode())) { return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！")); } - if (user.getCurrentUser().getUserCode().equals(user.getUserCode())) { + if (user.currentUser().getUserCode().equals(user.getUserCode())) { return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户")); } if (User.USER_TYPE_NONE.equals(user.getUserType())){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 7c5a9c47..67b21fc4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -286,7 +286,7 @@ public class EmpUserController extends BaseController { if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){ return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); } - if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { + if (empUser.currentUser().getUserCode().equals(empUser.getUserCode())) { return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户")); } empUser.setStatus(User.STATUS_DISABLE); @@ -350,7 +350,7 @@ public class EmpUserController extends BaseController { if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){ return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); } - if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { + if (empUser.currentUser().getUserCode().equals(empUser.getUserCode())) { return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户")); } empUserService.delete(empUser); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java index 992dfe8f..5961bb1e 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java @@ -7,7 +7,6 @@ package com.jeesite.modules.sys.web.user; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -56,7 +55,7 @@ public class UserController extends BaseController { // if (User.USER_TYPE_NONE.equals(user.getUserType())){ // return new Page(request, response); // } - if (Global.isStrictMode() && !user.getCurrentUser().isAdmin()){ + if (Global.isStrictMode() && !user.currentUser().isAdmin()){ return new Page(request, response); } user.setPage(new Page<>(request, response)); diff --git a/modules/core/src/main/resources/config/beetl-core.properties b/modules/core/src/main/resources/config/beetl-core.properties index 3e3c2714..f7535f46 100644 --- a/modules/core/src/main/resources/config/beetl-core.properties +++ b/modules/core/src/main/resources/config/beetl-core.properties @@ -104,6 +104,7 @@ FN.hasRole = com.jeesite.common.beetl.ext.fn.HasRole FN.cookie = com.jeesite.common.beetl.ext.fn.Cookie FN.lang = com.jeesite.common.beetl.ext.fn.Lang FN.text = com.jeesite.common.beetl.ext.fn.Text +FN.user = com.jeesite.common.beetl.ext.fn.User ##内置的功能包 FNP.strutil = org.beetl.ext.fn.StringUtil