From 9cc27b3ba10dce3c89f1f05a31b292df6754f995 Mon Sep 17 00:00:00 2001 From: hucs Date: Thu, 13 Jun 2024 17:40:08 +0800 Subject: [PATCH] fix --- .../handler/GlobalExceptionHandler.java | 3 +- .../mybatis/handler/MyMetaObjectHandler.java | 5 +- .../mybatis/handler/MyTenantLineHandler.java | 2 +- .../filter/JwtAuthenticationTokenFilter.java | 8 +++ .../service/impl/SysTenantServiceImpl.java | 49 ++++++++++++++++++- .../modules/system/entity/SysUserEntity.java | 5 +- 6 files changed, 65 insertions(+), 7 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java b/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java index 4460c5c..a9ac1b8 100644 --- a/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java @@ -105,8 +105,7 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(CustomException.class) public R customException(CustomException e) { + log.error(e.getMessage(), e); return R.error(e.getMessage()); } - - } diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java index e25c037..720417a 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java @@ -33,7 +33,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { -// this.setFieldValByName("createdTime", getDate(), metaObject); + + this.setFieldValByName("createdTime", new Date(), metaObject); this.setFieldValByName("deleted", false, metaObject); this.setFieldValByName("version", 1L, metaObject); Object createUser = this.getFieldValByName("createdBy", metaObject); @@ -46,7 +47,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { -// this.setFieldValByName("updatedTime", getDate(), metaObject); + this.setFieldValByName("updatedTime", getDate(), metaObject); Object createUser = this.getFieldValByName("updatedBy", metaObject); if (createUser == null) { this.setFieldValByName("createdBy", getOperatorId(), metaObject); diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java index f84dbc5..b3b0d01 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java @@ -22,7 +22,7 @@ public class MyTenantLineHandler implements TenantLineHandler { /** * 排除过滤的表 */ - private static final String[] TABLE_FILTER = {"sys_login_log", "sys_role", "sys_user", "sys_menu", "sys_tenant_package", "sys_tenant", "sys_dict", "sys_dict_data", "sys_administrative_area_dict_info"}; + private static final String[] TABLE_FILTER = {"sys_login_log", "sys_menu", "sys_tenant_package", "sys_tenant", "sys_dict", "sys_dict_data", "sys_administrative_area_dict_info"}; /** * 排除过滤的表前缀 diff --git a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java index c3e8128..cfa0ec9 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java @@ -1,6 +1,7 @@ package com.starry.admin.common.security.filter; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.starry.admin.common.component.JwtToken; @@ -34,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.io.IOException; import java.util.Arrays; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -192,11 +194,17 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { if (StrUtil.isBlankIfStr(tenantId)) { return false; } + if (tenantId.equals("-1")) { + return true; + } SysTenantEntity entity = sysTenantService.selectSysTenantByTenantId(tenantId); if (entity == null) { return false; } //判断租户是否过期 + if (DateUtil.compare(entity.getTenantTime(), new Date()) < 0) { + return false; + } //... //校验通过 return true; diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java index b5abcbf..8515f3d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java @@ -67,6 +67,8 @@ public class SysTenantServiceImpl extends ServiceImpl menuList = menuMapper.selectMenuList(new SysMenuEntity()); + if (CollectionUtil.isNotEmpty(menuList)) { + List roleMenuEntityList = menuList.stream().map(menu -> { + SysRoleMenuEntity rm = new SysRoleMenuEntity(); + rm.setRoleId(operator.getRoleId()); + rm.setMenuId(menu.getMenuId()); + return rm; + }).collect(Collectors.toList()); + roleMenuService.saveBatch(roleMenuEntityList); + } + } + + private Long createDept(SysTenantEntity sysTenantEntity) { // 创建部门 SysDeptEntity dept = new SysDeptEntity(); @@ -257,7 +303,7 @@ public class SysTenantServiceImpl extends ServiceImpl { @TableId(value = "user_id", type = IdType.AUTO) private String userId; - @ApiModelProperty(value = "用户类型;1:admin;2:会员") + @ApiModelProperty(value = "用户类型;1:admin;2:普通，废弃字段") private Integer userType; + @ApiModelProperty(value = "是否为超管") + private Boolean superAdmin; + @ApiModelProperty(value = "用户名") private String userCode;