manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

语法变更 getCurrentUser、setCurrentUser 函数替换为 currentUser

Browse Source
This commit is contained in:
thinkgem
2023-02-23 19:08:00 +08:00
parent b658ac5473
commit b22f4cd5de
10 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java
View File

@@ -4,22 +4,6 @@
*/ */
package com.jeesite.modules.cms.web; 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.config.Global;
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
import com.jeesite.common.lang.StringUtils; 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.service.FileTempleteService;
import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.cms.utils.CmsUtils;
import com.jeesite.modules.sys.utils.UserUtils; 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 * 文章表Controller
@@ -100,12 +98,12 @@ public class ArticleController extends BaseController {
if (!(isAll != null && isAll)) { if (!(isAll != null && isAll)) {
articleService.addDataScopeFilter(article); articleService.addDataScopeFilter(article);
} }
if (!article.getCurrentUser().isAdmin()) { if (!article.currentUser().isAdmin()) {
// 如果没有审核权限，或者 草稿状态的文章 则只查看自己创建的文章。 // 如果没有审核权限，或者 草稿状态的文章 则只查看自己创建的文章。
if (!UserUtils.getSubject().isPermitted("cms:article:audit")) { 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())) { } else if (Article.STATUS_DRAFT.equals(article.getStatus())) {
article.setCreateBy(article.getCurrentUser().getUserCode()); article.setCreateBy(article.currentUser().getUserCode());
} }
} }
Page<Article> page = articleService.findPage(article); Page<Article> page = articleService.findPage(article);

4
modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
View File

@@ -83,7 +83,7 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
@Transactional @Transactional
public void save(MsgInner msgInner) { public void save(MsgInner msgInner) {
if (msgInner.getIsNewRecord()){ if (msgInner.getIsNewRecord()){
User user = msgInner.getCurrentUser(); User user = msgInner.currentUser();
msgInner.setSendUserCode(user.getUserCode()); msgInner.setSendUserCode(user.getUserCode());
msgInner.setSendUserName(user.getUserName()); msgInner.setSendUserName(user.getUserName());
// 没有设置状态，则默认新增后是草稿状态 // 没有设置状态，则默认新增后是草稿状态
@@ -206,7 +206,7 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
public void readMsgInnerRecord(MsgInner msgInner){ public void readMsgInnerRecord(MsgInner msgInner){
MsgInnerRecord msgInnerRecord = new MsgInnerRecord(); MsgInnerRecord msgInnerRecord = new MsgInnerRecord();
msgInnerRecord.setMsgInnerId(msgInner.getId()); msgInnerRecord.setMsgInnerId(msgInner.getId());
msgInnerRecord.setReceiveUserCode(msgInner.getCurrentUser().getUserCode()); msgInnerRecord.setReceiveUserCode(msgInner.currentUser().getUserCode());
msgInnerRecord.setReadStatus(MsgInnerRecord.READ_STATUS_READ); msgInnerRecord.setReadStatus(MsgInnerRecord.READ_STATUS_READ);
msgInnerRecord.setReadDate(new Date()); msgInnerRecord.setReadDate(new Date());
msgInnerRecordDao.updateReadStatus(msgInnerRecord); msgInnerRecordDao.updateReadStatus(msgInnerRecord);

2
modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java
View File

@@ -67,7 +67,7 @@ public class MsgInnerController extends BaseController {
public Page<MsgInner> listData(MsgInner msgInner, HttpServletRequest request, HttpServletResponse response) { public Page<MsgInner> listData(MsgInner msgInner, HttpServletRequest request, HttpServletResponse response) {
msgInner.setPage(new Page<>(request, response)); msgInner.setPage(new Page<>(request, response));
msgInner.setRecord(new MsgInnerRecord()); msgInner.setRecord(new MsgInnerRecord());
msgInner.getRecord().setReceiveUserCode(msgInner.getCurrentUser().getUserCode()); msgInner.getRecord().setReceiveUserCode(msgInner.currentUser().getUserCode());
Page<MsgInner> page = msgInnerService.findPage(msgInner); Page<MsgInner> page = msgInnerService.findPage(msgInner);
return page; return page;
} }

2
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
View File

@@ -310,7 +310,7 @@ public class InitCoreData extends BaseInitDataTests {
entity.setIsNewRecord(true); entity.setIsNewRecord(true);
empUserService.save(entity); empUserService.save(entity);
// 设置当前为管理员，否则无法保存用户角色关系 // 设置当前为管理员，否则无法保存用户角色关系
entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE)); entity.currentUser(new User(User.SUPER_ADMIN_CODE));
userService.saveAuth(entity); userService.saveAuth(entity);
return null; return null;
} }

4
modules/core/src/main/java/com/jeesite/modules/sys/service/support/LogServiceSupport.java
View File

@@ -34,8 +34,8 @@ public class LogServiceSupport extends CrudService<LogDao, Log>
// log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); // log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1));
// } // }
// 普通用户看自己的，管理员看全部的。 // 普通用户看自己的，管理员看全部的。
if (!log.getCurrentUser().isAdmin()){ if (!log.currentUser().isAdmin()){
log.setCreateBy(log.getCurrentUser().getUserCode()); log.setCreateBy(log.currentUser().getUserCode());
} }
return super.findPage(log); return super.findPage(log);
} }

2
modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
View File

@@ -103,7 +103,7 @@ public class LogUtils {
log.setCorpName(user.getCorpName()); log.setCorpName(user.getCorpName());
} }
log.setExecuteTime(executeTime); log.setExecuteTime(executeTime);
log.setCurrentUser(user); log.currentUser(user);
log.preInsert(); log.preInsert();
// 获取异常对象 // 获取异常对象

10
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -65,8 +65,8 @@ public class CorpAdminController extends BaseController {
user.setCorpCode(null); user.setCorpCode(null);
user.setCorpName(null); user.setCorpName(null);
model.addAttribute("user", user); model.addAttribute("user", user);
model.addAttribute("currentCorpCode", user.getCurrentUser().getCorpCode_()); model.addAttribute("currentCorpCode", user.currentUser().getCorpCode_());
model.addAttribute("currentCorpName", user.getCurrentUser().getCorpName_()); model.addAttribute("currentCorpName", user.currentUser().getCorpName_());
model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false")); model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false"));
return "modules/sys/user/corpAdminList"; return "modules/sys/user/corpAdminList";
} }
@@ -113,7 +113,7 @@ public class CorpAdminController extends BaseController {
@PostMapping(value = "save") @PostMapping(value = "save")
@ResponseBody @ResponseBody
public String save(@Validated User user, String op, HttpServletRequest request) { public String save(@Validated User user, String op, HttpServletRequest request) {
if (!user.getCurrentUser().isSuperAdmin()){ if (!user.currentUser().isSuperAdmin()){
return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！")); return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！"));
} }
if (User.isSuperAdmin(user.getUserCode())) { if (User.isSuperAdmin(user.getUserCode())) {
@@ -175,7 +175,7 @@ public class CorpAdminController extends BaseController {
if (User.isSuperAdmin(user.getUserCode())) { if (User.isSuperAdmin(user.getUserCode())) {
return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！")); return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！"));
} }
if (user.getCurrentUser().getUserCode().equals(user.getUserCode())) { if (user.currentUser().getUserCode().equals(user.getUserCode())) {
return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户")); return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户"));
} }
user.setStatus(User.STATUS_DISABLE); user.setStatus(User.STATUS_DISABLE);
@@ -228,7 +228,7 @@ public class CorpAdminController extends BaseController {
if (User.isSuperAdmin(user.getUserCode())) { if (User.isSuperAdmin(user.getUserCode())) {
return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！")); return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！"));
} }
if (user.getCurrentUser().getUserCode().equals(user.getUserCode())) { if (user.currentUser().getUserCode().equals(user.getUserCode())) {
return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户")); return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户"));
} }
if (User.USER_TYPE_NONE.equals(user.getUserType())){ if (User.USER_TYPE_NONE.equals(user.getUserType())){

4
modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
View File

@@ -286,7 +286,7 @@ public class EmpUserController extends BaseController {
if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){ if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){
return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
} }
if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { if (empUser.currentUser().getUserCode().equals(empUser.getUserCode())) {
return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户")); return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户"));
} }
empUser.setStatus(User.STATUS_DISABLE); empUser.setStatus(User.STATUS_DISABLE);
@@ -350,7 +350,7 @@ public class EmpUserController extends BaseController {
if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){ if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){
return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
} }
if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { if (empUser.currentUser().getUserCode().equals(empUser.getUserCode())) {
return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户")); return renderResult(Global.FALSE, text("删除用户失败，不允许删除当前用户"));
} }
empUserService.delete(empUser); empUserService.delete(empUser);

3
modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java
View File

@@ -7,7 +7,6 @@ package com.jeesite.modules.sys.web.user;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -56,7 +55,7 @@ public class UserController extends BaseController {
// if (User.USER_TYPE_NONE.equals(user.getUserType())){ // if (User.USER_TYPE_NONE.equals(user.getUserType())){
// return new Page<User>(request, response); // return new Page<User>(request, response);
// } // }
if (Global.isStrictMode() && !user.getCurrentUser().isAdmin()){ if (Global.isStrictMode() && !user.currentUser().isAdmin()){
return new Page<User>(request, response); return new Page<User>(request, response);
} }
user.setPage(new Page<>(request, response)); user.setPage(new Page<>(request, response));

1
modules/core/src/main/resources/config/beetl-core.properties
View File

@@ -104,6 +104,7 @@ FN.hasRole = com.jeesite.common.beetl.ext.fn.HasRole
FN.cookie = com.jeesite.common.beetl.ext.fn.Cookie FN.cookie = com.jeesite.common.beetl.ext.fn.Cookie
FN.lang = com.jeesite.common.beetl.ext.fn.Lang FN.lang = com.jeesite.common.beetl.ext.fn.Lang
FN.text = com.jeesite.common.beetl.ext.fn.Text 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 FNP.strutil = org.beetl.ext.fn.StringUtil