From fe8ee11732622919869d3db7f26b0779e8a818fd Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 21 二月 2025 15:13:19 +0800 Subject: [PATCH] 小程序管理员接口 --- ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java | 34 ++++++++++++++++++++++------------ ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 26 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java index 954a2ed..a06e738 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java @@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; +import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; /** @@ -30,13 +32,17 @@ public void insertFill(MetaObject metaObject) { // 获取登录信息 String userName = SecurityUtils.getUsername(); - if (StringUtils.isNotBlank(userName)) { - this.setFieldValByName("createBy", userName, metaObject); - this.setFieldValByName("updateBy", userName, metaObject); - } else { - this.setFieldValByName("createBy", "", metaObject); - this.setFieldValByName("updateBy", "", metaObject); + String userName2 = SecurityUtils.getUsernameApplet(); + if (StringUtils.isNotBlank(userName)||StringUtils.isNotBlank(userName2)){ + if (StringUtils.isNotBlank(userName)) { + this.setFieldValByName("createBy", userName, metaObject); + this.setFieldValByName("updateBy", userName, metaObject); + } else { + this.setFieldValByName("createBy", userName2, metaObject); + this.setFieldValByName("updateBy", userName2, metaObject); + } } + } /** @@ -48,12 +54,16 @@ public void updateFill(MetaObject metaObject) { // 获取登录信息 String userName = SecurityUtils.getUsername(); - if (StringUtils.isNotBlank(userName)) { - this.setFieldValByName("createBy", userName, metaObject); - this.setFieldValByName("updateBy", userName, metaObject); - } else { - this.setFieldValByName("createBy", "", metaObject); - this.setFieldValByName("updateBy", "", metaObject); + String userName2 = SecurityUtils.getUsernameApplet(); + if (StringUtils.isNotBlank(userName)||StringUtils.isNotBlank(userName2)){ + if (StringUtils.isNotBlank(userName)) { + this.setFieldValByName("createBy", userName, metaObject); + this.setFieldValByName("updateBy", userName, metaObject); + } else { + this.setFieldValByName("createBy", userName2, metaObject); + this.setFieldValByName("updateBy", userName2, metaObject); + } } + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index a6f3d53..adea656 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import com.ruoyi.common.core.domain.model.LoginUserApplet; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -58,6 +59,20 @@ throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED); } } + /** + * 获取用户账户小程序 + **/ + public static String getUsernameApplet() + { + try + { + return getLoginUserApplet().getUsername(); + } + catch (Exception e) + { + throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED); + } + } /** * 获取用户 @@ -73,6 +88,17 @@ throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED); } } + public static LoginUserApplet getLoginUserApplet() + { + try + { + return (LoginUserApplet) getAuthentication().getPrincipal(); + } + catch (Exception e) + { + throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED); + } + } /** * 获取Authentication -- Gitblit v1.7.1