This commit is contained in:
2023-06-05 16:01:00 +08:00
parent 951a08a0a1
commit f2457ff1d8
20 changed files with 156 additions and 100 deletions

View File

@ -59,18 +59,14 @@ public class BaseConstant {
*/
public static final String YES = "Y";
/**
* 否
*/
public static final String NO = "N";
/**
* 处理失败 个数 0
*/
public static final Integer HANDLE_ERROR = 0;
/**
* 租户 key 前缀
*/
public static final String TENANT_KEY_PREFIX = "tenant_";
/**
* header 租户 key
*/
public static final String HEADER_KEY_TENANT = "tenant";
}

View File

@ -0,0 +1,16 @@
package com.qiaoba.common.base.constants;
/**
* 字典常量
*
* @author ailanyin
* @version 1.0
* @since 2023-04-23 15:37:43
*/
public class DictConstant {
/**
* 字典 redis key
*/
public static final String SYS_DICT_KEY = "sys_dict:";
}

View File

@ -0,0 +1,21 @@
package com.qiaoba.common.base.constants;
/**
* 租户常量
*
* @author ailanyin
* @version 1.0
* @since 2023-04-23 15:37:43
*/
public class TenantConstant {
/**
* 租户 key 前缀
*/
public static final String TENANT_KEY_PREFIX = "tenant_";
/**
* header 租户 key
*/
public static final String HEADER_KEY_TENANT = "tenant";
}

View File

@ -62,10 +62,20 @@ public class BasePage<T> implements Serializable {
return basePage;
}
public static <T> BasePage<T> build(Long total, List<T> list) {
BasePage<T> basePage = new BasePage<>();
basePage.setCode(HttpStatus.HTTP_OK);
basePage.setMsg("查询成功");
basePage.setRows(list);
basePage.setTotal(total);
return basePage;
}
public static <T> BasePage<T> build() {
BasePage<T> basePage = new BasePage<>();
basePage.setCode(HttpStatus.HTTP_OK);
basePage.setMsg("查询成功");
return basePage;
}
}

View File

@ -1,6 +1,7 @@
package com.qiaoba.common.database.filters;
import com.qiaoba.common.base.constants.BaseConstant;
import com.qiaoba.common.base.constants.TenantConstant;
import com.qiaoba.common.base.context.BaseContext;
import com.qiaoba.common.database.config.DynamicDataSourceContext;
import com.qiaoba.common.database.constants.DynamicDatasourceConstant;
@ -45,7 +46,7 @@ public class DynamicDataSourceFilter extends OncePerRequestFilter {
}
private void before(HttpServletRequest request) {
String tenantId = request.getHeader(BaseConstant.HEADER_KEY_TENANT);
String tenantId = request.getHeader(TenantConstant.HEADER_KEY_TENANT);
// todo
//设置当前租户对应的数据源
BaseContext.setDataSource(DynamicDatasourceConstant.DEFAULT_MASTER_DATASOURCE_KEY);

View File

@ -1,51 +0,0 @@
package com.qiaoba.common.redis.constants;
/**
* 缓存的key 常量
*
* @author ailanyin
* @version 1.0
* @since 2021/10/2 0002 下午 17:41
*/
public class CacheConstant {
/**
* 登录用户 redis key
*/
public static final String LOGIN_USER_KEY = "login_users:";
/**
* 验证码 redis key
*/
public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
/**
* 参数管理 cache key
*/
public static final String SYS_CONFIG_KEY = "sys_config:";
/**
* 字典管理 cache key
*/
public static final String SYS_DICT_KEY = "sys_dict:";
/**
* 防重提交 redis key
*/
public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
/**
* 限流 redis key
*/
public static final String RATE_LIMIT_KEY = "rate_limit:";
/**
* 登录账户密码错误次数 redis key
*/
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
/**
* 角色拥有的权限Set
*/
public static final String ROLE_PERMS = "role_perms:role_";
}

View File

@ -2,6 +2,7 @@ package com.qiaoba.common.redis.service.impl;
import com.qiaoba.common.base.constants.BaseConstant;
import com.qiaoba.common.base.constants.TenantConstant;
import com.qiaoba.common.base.context.BaseContext;
import com.qiaoba.common.base.entity.BasePage;
import com.qiaoba.common.redis.service.RedisService;
@ -253,14 +254,14 @@ public class RedisServiceImpl implements RedisService {
@Override
public String addTenantPrefix(String key) {
StringBuilder sb = new StringBuilder();
sb.append(BaseConstant.TENANT_KEY_PREFIX).append(BaseContext.getTenantId()).append(BaseConstant.COLON_JOIN_STR).append(key);
sb.append(TenantConstant.TENANT_KEY_PREFIX).append(BaseContext.getTenantId()).append(BaseConstant.COLON_JOIN_STR).append(key);
return sb.toString();
}
@Override
public String removeTenantPrefix(String key) {
StringBuilder sb = new StringBuilder();
sb.append(BaseConstant.TENANT_KEY_PREFIX).append(BaseContext.getTenantId()).append(BaseConstant.COLON_JOIN_STR);
sb.append(TenantConstant.TENANT_KEY_PREFIX).append(BaseContext.getTenantId()).append(BaseConstant.COLON_JOIN_STR);
return key.replace(sb.toString(), "");
}
}