first commit

2023-06-12 22:49:55 +08:00
parent c931657a8a
commit 95bae3f9b3
11 changed files with 172 additions and 58 deletions
--- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filters/DynamicDataSourceFilter.java
+++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filters/DynamicDataSourceFilter.java
@ -2,14 +2,12 @@ package com.qiaoba.module.tenant.filters;

 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.qiaoba.auth.properties.AuthConfigProperties;
 import com.qiaoba.common.base.code.TenantErrorCode;
 import com.qiaoba.common.base.constants.TenantConstant;
 import com.qiaoba.common.base.context.BaseContext;
 import com.qiaoba.common.database.config.DynamicDataSourceConfig;
 import com.qiaoba.common.database.constants.DynamicDatasourceConstant;
 import com.qiaoba.common.web.utils.ResponseUtil;
-import com.qiaoba.common.web.utils.UriUtil;
 import com.qiaoba.module.tenant.entity.SysTenant;
 import com.qiaoba.module.tenant.enums.TenantStatusEnum;
 import com.qiaoba.module.tenant.service.SysTenantService;
@ -43,17 +41,14 @@ public class DynamicDataSourceFilter extends OncePerRequestFilter {
    private SysTenantService sysTenantService;
    @Resource
    private DynamicDataSourceConfig dynamicDataSourceConfig;
-    @Resource
-    private AuthConfigProperties authConfigProperties;

-    private final String LOGIN_TENANT_LIST_URI = "/tenant/normal-list";

    @Override
    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
        log.debug(StrUtil.format("Start run DynamicDataSourceFilter, Uri: {}", request.getRequestURI()));
        String tenantId = request.getHeader(TenantConstant.HEADER_KEY_TENANT);
        // 主系统 or 登录入口获取租户列表
-        if (TenantConstant.DEFAULT_TENANT_ID.equals(tenantId) || LOGIN_TENANT_LIST_URI.equals(request.getRequestURI())) {
+        if (TenantConstant.DEFAULT_TENANT_ID.equals(tenantId) || TenantConstant.LOGIN_TENANT_LIST_URI.equals(request.getRequestURI())) {
            dynamicDataSourceConfig.setDefaultSetting();
            filterChain.doFilter(request, response);
            after();
@ -61,7 +56,7 @@ public class DynamicDataSourceFilter extends OncePerRequestFilter {
        }


-        SysTenant sysTenant = sysTenantService.selectById(tenantId);
+        SysTenant sysTenant = sysTenantService.selectFromCache(tenantId);
        // 检查租户是否允许访问
        if (checkTenantIsNotAllow(response, sysTenant)) {
            return;
--- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java
+++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java
@ -50,6 +50,14 @@ public interface SysTenantService {
     */
    SysTenant selectById(String tenantId);

+    /**
+     * 在缓存中查询详情
+     *
+     * @param tenantId tenantId
+     * @return info
+     */
+    SysTenant selectFromCache(String tenantId);
+
    /**
     * 获取设置信息
     *
@ -73,4 +81,9 @@ public interface SysTenantService {
     * @param status   status
     */
    void updateStatus(String tenantId, String status);
+
+    /**
+     * 更新缓存
+     */
+    void resetCache();
 }
--- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java
+++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java
@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiaoba.auth.utils.SecurityUtil;
 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.enums.BaseEnum;
 import com.qiaoba.common.base.enums.DataBaseEnum;
 import com.qiaoba.common.base.exceptions.ServiceException;
@ -12,6 +14,7 @@ import com.qiaoba.common.database.entity.PageQuery;
 import com.qiaoba.common.database.entity.TableDataInfo;
 import com.qiaoba.common.database.properties.PoolInfo;
 import com.qiaoba.common.database.utils.JdbcUtil;
+import com.qiaoba.common.redis.service.RedisService;
 import com.qiaoba.module.tenant.entity.SysTenant;
 import com.qiaoba.module.tenant.entity.SysTenantDatasource;
 import com.qiaoba.module.tenant.entity.param.SysTenantParam;
@ -24,6 +27,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

+import javax.annotation.PostConstruct;
 import java.sql.Connection;
 import java.util.Date;
 import java.util.List;
@ -54,20 +58,36 @@ public class SysTenantServiceImpl implements SysTenantService {
    private final SysTenantMapper sysTenantMapper;
    private final SysTenantDatasourceService sysTenantDatasourceService;
    private final DynamicDataSourceConfig dynamicDataSourceConfig;
+    private final RedisService redisService;
+
+    @PostConstruct
+    public void init() {
+        BaseContext.setTenantId(TenantConstant.DEFAULT_TENANT_ID);
+        resetCache();
+        BaseContext.clearTenantId();
+    }

    @Override
    public int insert(SysTenant sysTenant) {
        sysTenant.setCreateTime(new Date());
        sysTenant.setCreateUser(SecurityUtil.getLoginUsername());
        sysTenant.setStatus(BaseEnum.NORMAL.getCode());
-        return sysTenantMapper.insert(sysTenant);
+        int result = sysTenantMapper.insert(sysTenant);
+        if (result > BaseConstant.HANDLE_ERROR) {
+            toCache(sysTenant);
+        }
+        return result;
    }

    @Override
    public int update(SysTenant sysTenant) {
        sysTenant.setUpdateTime(new Date());
        sysTenant.setUpdateUser(SecurityUtil.getLoginUsername());
-        return sysTenantMapper.updateById(sysTenant);
+        int result = sysTenantMapper.updateById(sysTenant);
+        if (result > BaseConstant.HANDLE_ERROR) {
+            toCache(sysTenant);
+        }
+        return result;
    }

    @Override
@ -80,6 +100,14 @@ public class SysTenantServiceImpl implements SysTenantService {
        return sysTenantMapper.selectById(tenantId);
    }

+    @Override
+    public SysTenant selectFromCache(String tenantId) {
+        BaseContext.setTenantId(TenantConstant.DEFAULT_TENANT_ID);
+        SysTenant sysTenant = redisService.getObject(TenantConstant.TENANT_INFO_KEY_PREFIX + tenantId, SysTenant.class);
+        BaseContext.clearTenantId();
+        return sysTenant;
+    }
+
    @Override
    public TenantSettingVo getSetting(String tenantId) {
        SysTenant sysTenant = selectById(tenantId);
@ -118,6 +146,15 @@ public class SysTenantServiceImpl implements SysTenantService {
    @Override
    public void updateStatus(String tenantId, String status) {
        sysTenantMapper.updateById(new SysTenant(tenantId, status));
+        toCache(selectById(tenantId));
+    }
+
+    @Override
+    public void resetCache() {
+        List<SysTenant> sysTenants = sysTenantMapper.selectList(param2Wrapper(new SysTenantParam()));
+        for (SysTenant sysTenant : sysTenants) {
+            toCache(sysTenant);
+        }
    }

    private QueryWrapper<SysTenant> param2Wrapper(SysTenantParam param) {
@ -184,4 +221,7 @@ public class SysTenantServiceImpl implements SysTenantService {
        return JdbcUtil.getConnection(DataBaseEnum.getDriver(master.getType()), DataBaseEnum.getUrl(master.getType(), master.getIp(), master.getPort(), master.getName()), master.getUsername(), master.getPassword());
    }

+    private void toCache(SysTenant sysTenant) {
+        redisService.set(TenantConstant.TENANT_INFO_KEY_PREFIX + sysTenant.getTenantId(), sysTenant);
+    }
 }