irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-13 17:40:08 +08:00
parent 8a475d795e
commit 9cc27b3ba1
6 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
play-admin/src/main/java/com/starry/admin/common/exception/handler/GlobalExceptionHandler.java
View File

@@ -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());
}
}

5
play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java
View File

@@ -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);

2
play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java
View File

@@ -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"};
/**
* 排除过滤的表前缀

8
play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java
View File

@@ -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;