From 027860db2f2049afc5d2c5cfb539cbe396da3050 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Thu, 8 Jun 2023 20:38:10 +0800
Subject: [PATCH] update

---
 .../cool/store/utils/DataSourceHelper.java    | 50 -------------------
 .../store/config/TokenValidateFilter.java     |  4 +-
 .../controller/EnterpriseUserController.java  |  8 ---
 .../store/config/TokenValidateFilter.java     |  1 -
 4 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 coolstore-partner-service/src/main/java/com/cool/store/utils/DataSourceHelper.java

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/utils/DataSourceHelper.java b/coolstore-partner-service/src/main/java/com/cool/store/utils/DataSourceHelper.java
deleted file mode 100644
index 5eb9f889f..000000000
--- a/coolstore-partner-service/src/main/java/com/cool/store/utils/DataSourceHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.cool.store.utils;
-
-import com.cool.store.context.DataSourceContext;
-import com.cool.store.context.UserContext;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Slf4j
-public class DataSourceHelper {
-
-    private static final Logger logger = LoggerFactory.getLogger(DataSourceHelper.class);
-
-    /**
-     * @param
-     * @return void
-     * @throws
-     * @Title changeToMy
-     * @Description 切换到自己的数据库
-     */
-    public static void changeToMy() {
-        DataSourceContext.clearDataSourceType();
-        String dbName = UserContext.getUser().getDbName();
-        DataSourceContext.setDataSourceType(dbName);
-    }
-
-    /**
-     * @param datasource
-     * @return void
-     * @throws
-     * @Title changeToSpecificDataSource
-     * @Description 切换到指定的数据库
-     */
-    public static void changeToSpecificDataSource(String datasource) {
-        DataSourceContext.clearDataSourceType();
-        String dbName = datasource;
-        DataSourceContext.setDataSourceType(dbName);
-    }
-
-    /**
-     * @param
-     * @return void
-     * @throws
-     * @Title reset
-     * @Description 重置链接到主库
-     */
-    public static void reset() {
-        DataSourceContext.clearDataSourceType();
-    }
-}
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
index 8c7989928..b9b726b43 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.context.UserContext;
-import com.cool.store.utils.DataSourceHelper;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.context.CurrentUser;
 import com.google.common.collect.Lists;
@@ -97,7 +96,7 @@ public class TokenValidateFilter implements Filter {
                         ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
                 return;
             }
-            log.info("url:{}, access_token:{}, userId:{}, username:{}, enterpriseId:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName(), currentUser.getEnterpriseId());
+            log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName());
         }
         if(StringUtils.isBlank(userStr) && !isInWhiteList){
             response.setStatus(HttpStatus.OK.value());
@@ -107,7 +106,6 @@ public class TokenValidateFilter implements Filter {
         }
         try {
             UserContext.setUser(userStr);
-            DataSourceHelper.changeToMy();
             filterChain.doFilter(servletRequest, servletResponse);
         } finally {
             UserContext.removeUser();
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
index 394b31236..56b1a92f6 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
@@ -1,18 +1,10 @@
 package com.cool.store.controller;
 
-import com.cool.store.dto.enterprise.EnterpriseUserDTO;
-import com.cool.store.response.ResponseResult;
 import com.cool.store.service.EnterpriseUserService;
-import com.cool.store.utils.DataSourceHelper;
-import com.cool.store.vo.buser.EnterpriseUserPageVO;
-import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author zhangchenbiao
diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/TokenValidateFilter.java
index 85109fe69..2baf5fd66 100644
--- a/coolstore-partner-webc/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -5,7 +5,6 @@ import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.context.CurrentUser;
 import com.cool.store.context.UserContext;
-import com.cool.store.utils.DataSourceHelper;
 import com.cool.store.utils.RedisUtilPool;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;