From b280c02adfbe35f6ce667eb43c2f5a5698389efc714cb15ec7a57ff71d88f930 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 14 Nov 2025 17:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/component/EbikeTenantFactory.java    | 50 -------------------
 .../user/config/MyBatisFlexConfiguration.java | 12 -----
 .../user/controller/EbikeUserController.java  | 21 --------
 3 files changed, 83 deletions(-)
 delete mode 100644 ebike-user/src/main/java/com/cdzy/user/component/EbikeTenantFactory.java

diff --git a/ebike-user/src/main/java/com/cdzy/user/component/EbikeTenantFactory.java b/ebike-user/src/main/java/com/cdzy/user/component/EbikeTenantFactory.java
deleted file mode 100644
index 71bd3e1..0000000
--- a/ebike-user/src/main/java/com/cdzy/user/component/EbikeTenantFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.cdzy.user.component;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.cdzy.common.model.response.CommonEbikeRole;
-import com.cdzy.common.model.response.CommonStaffInfo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.mybatisflex.core.tenant.TenantFactory;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-
-import java.util.List;
-import java.util.TimeZone;
-
-public class EbikeTenantFactory implements TenantFactory {
-
-    public Object[] getTenantIds() {
-        if (StpUtil.isLogin()) {
-            RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
-            Object attribute = attributes.getAttribute("tenantId", RequestAttributes.SCOPE_REQUEST);
-            if (attribute != null) {
-                String id = (String) StpUtil.getLoginId();
-                Object object = StpUtil.getSessionByLoginId(id).get(id);
-                ObjectMapper objectMapper = new ObjectMapper()
-                        .registerModule(new JavaTimeModule())
-                        .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-                        .setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-                CommonStaffInfo staffInfo = objectMapper.convertValue(object, CommonStaffInfo.class);
-                List<CommonEbikeRole> roles = staffInfo.getRoles();
-                boolean isSysAdmin = false;
-                for (CommonEbikeRole role : roles) {
-                    if (role.getSysAdmin()) {
-                        isSysAdmin = true;
-                        break;
-                    }
-                }
-                long tenantId = Long.parseLong(attribute.toString());
-                //系统管理员
-                if (isSysAdmin) {
-                    return null;
-                } else {
-                    return new Object[]{tenantId};
-                }
-            }
-
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java b/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
index 27cc8f4..63d2477 100644
--- a/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
+++ b/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
@@ -1,7 +1,6 @@
 package com.cdzy.user.config;
 
 import com.cdzy.common.enums.EbikeContents;
-import com.cdzy.user.component.EbikeTenantFactory;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.audit.AuditManager;
@@ -54,15 +53,4 @@ public class MyBatisFlexConfiguration {
         //设置数据已被删除时的值
         globalConfig.setDeletedValueOfLogicDelete(Boolean.TRUE);
     }
-
-    /**
-     * 详细的租户工厂配置
-     */
-    @Bean
-    public static TenantFactory tenantFactory() {
-        logger.info("开始初始化租户工厂");
-        EbikeTenantFactory factory = new EbikeTenantFactory();
-        TenantManager.setTenantFactory(factory);
-        return new EbikeTenantFactory();
-    }
 }
\ No newline at end of file
diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java
index 12da526..5cf91b0 100644
--- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java
+++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java
@@ -90,15 +90,6 @@ public class EbikeUserController {
         return JsonResult.success();
     }
 
-    /**
-     * 用户退出登录
-     */
-    @GetMapping("logout")
-    public JsonResult<?> logout() {
-        StpUtil.logout();
-        return JsonResult.success();
-    }
-
     /**
      * 用户实名验证
      *
@@ -110,18 +101,6 @@ public class EbikeUserController {
         return verifyUtil.verifyRealName(userValidateDto);
     }
 
-    /**
-     * 根据主键删除用户信息。
-     *
-     * @param userId 主键
-     * @return {@code true} 删除成功，{@code false} 删除失败
-     */
-    @PostMapping("remove")
-    public JsonResult<?> remove(@RequestParam(name = "userId") Long userId) {
-        ebikeUserService.removeById(userId);
-        return JsonResult.success();
-    }
-
     /**
      * 注销用户信息。
      *