From e3227f5cc5debba032b6b325dd0aef4f3514351b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 13 Mar 2026 16:11:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E5=A4=9A=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |   2 +-
 README.md                                     |   2 -
 package.json                                  |   2 +-
 src/api/login.ts                              |  13 +-
 src/api/system/menu/index.ts                  |   8 -
 src/api/system/social/auth.ts                 |   8 +-
 src/api/system/tenant/index.ts                | 109 -----
 src/api/system/tenant/types.ts                |  46 ---
 src/api/system/tenantPackage/index.ts         |  67 ---
 src/api/system/tenantPackage/types.ts         |  20 -
 src/api/types.ts                              |  16 -
 src/api/workflow/task/index.ts                |   4 +-
 src/lang/en_US.ts                             |   9 -
 src/lang/zh_CN.ts                             |   9 -
 src/layout/components/Navbar.vue              |  60 +--
 .../components/SocialCallback/index.vue       |  13 -
 src/layout/index.vue                          |   6 -
 src/store/modules/user.ts                     |   3 -
 src/views/index.vue                           |   4 +-
 src/views/login.vue                           |  38 +-
 src/views/register.vue                        |  29 +-
 src/views/system/tenant/index.vue             | 382 ------------------
 src/views/system/tenantPackage/index.vue      | 329 ---------------
 src/views/system/user/profile/thirdParty.vue  |   3 +-
 25 files changed, 18 insertions(+), 1166 deletions(-)
 delete mode 100644 src/api/system/tenant/index.ts
 delete mode 100644 src/api/system/tenant/types.ts
 delete mode 100644 src/api/system/tenantPackage/index.ts
 delete mode 100644 src/api/system/tenantPackage/types.ts
 delete mode 100644 src/views/system/tenant/index.vue
 delete mode 100644 src/views/system/tenantPackage/index.vue

diff --git a/.env.development b/.env.development
index 3737274c..bc93332a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 开发环境配置
diff --git a/.env.production b/.env.production
index 883c8f19..e5532de2 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 生产环境配置
diff --git a/README.md b/README.md
index 1c89bf95..06f37607 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,6 @@ npm run build:prod
 
 | 业务         | 功能说明                                                      | 本框架 | RuoYi                         |
 | ------------ | ------------------------------------------------------------- | ------ | ----------------------------- |
-| 租户管理     | 系统内租户的管理 如:租户套餐、过期时间、用户数量、企业信息等  | 支持   | 无                            |
-| 租户套餐管理 | 系统内租户所能使用的套餐管理 如:套餐内所包含的菜单等          | 支持   | 无                            |
 | 用户管理     | 用户的管理配置 如:新增用户、分配用户所属部门、角色、岗位等    | 支持   | 支持                          |
 | 部门管理     | 配置系统组织机构（公司、部门、小组） 树结构展现支持数据权限   | 支持   | 支持                          |
 | 岗位管理     | 配置系统用户所属担任职务                                      | 支持   | 支持                          |
diff --git a/package.json b/package.json
index 15662640..21b95439 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package",
   "name": "ruoyi-vue-plus",
   "version": "5.5.3-2.5.3",
-  "description": "RuoYi-Vue-Plus多租户管理系统",
+  "description": "RuoYi-Vue-Plus后台管理系统",
   "author": "LionLi",
   "license": "MIT",
   "type": "module",
diff --git a/src/api/login.ts b/src/api/login.ts
index 35e6a4ea..37e5ff6b 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types';
+import { LoginData, LoginResult, VerifyCodeResult } from './types';
 import { UserInfo } from '@/api/system/user/types';
 
 // pc端固定客户端授权id
@@ -100,14 +100,3 @@ export function getInfo(): AxiosPromise<UserInfo> {
     method: 'get'
   });
 }
-
-// 获取租户列表
-export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
-  return request({
-    url: '/auth/tenant/list',
-    headers: {
-      isToken: isToken
-    },
-    method: 'get'
-  });
-}
diff --git a/src/api/system/menu/index.ts b/src/api/system/menu/index.ts
index 81461fdb..0e633d10 100644
--- a/src/api/system/menu/index.ts
+++ b/src/api/system/menu/index.ts
@@ -35,14 +35,6 @@ export const roleMenuTreeselect = (roleId: string | number): AxiosPromise<RoleMe
   });
 };
 
-// 根据角色ID查询菜单下拉树结构
-export const tenantPackageMenuTreeselect = (packageId: string | number): AxiosPromise<RoleMenuTree> => {
-  return request({
-    url: '/system/menu/tenantPackageMenuTreeselect/' + packageId,
-    method: 'get'
-  });
-};
-
 // 新增菜单
 export const addMenu = (data: MenuForm) => {
   return request({
diff --git a/src/api/system/social/auth.ts b/src/api/system/social/auth.ts
index 05471d9f..7ca2433a 100644
--- a/src/api/system/social/auth.ts
+++ b/src/api/system/social/auth.ts
@@ -1,14 +1,10 @@
 import request from '@/utils/request';
 
 // 获取跳转URL
-export function authRouterUrl(source: string, tenantId: string) {
+export function authRouterUrl(source: string) {
   return request({
     url: '/auth/binding/' + source,
-    method: 'get',
-    params: {
-      tenantId: tenantId,
-      domain: window.location.host
-    }
+    method: 'get'
   });
 }
 
diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
deleted file mode 100644
index 675447c6..00000000
--- a/src/api/system/tenant/index.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import request from '@/utils/request';
-import { TenantForm, TenantQuery, TenantVO } from './types';
-import { AxiosPromise } from 'axios';
-
-// 查询租户列表
-export function listTenant(query: TenantQuery): AxiosPromise<TenantVO[]> {
-  return request({
-    url: '/system/tenant/list',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询租户详细
-export function getTenant(id: string | number): AxiosPromise<TenantVO> {
-  return request({
-    url: '/system/tenant/' + id,
-    method: 'get'
-  });
-}
-
-// 新增租户
-export function addTenant(data: TenantForm) {
-  return request({
-    url: '/system/tenant',
-    method: 'post',
-    headers: {
-      isEncrypt: true,
-      repeatSubmit: false
-    },
-    data: data
-  });
-}
-
-// 修改租户
-export function updateTenant(data: TenantForm) {
-  return request({
-    url: '/system/tenant',
-    method: 'put',
-    data: data
-  });
-}
-
-// 租户状态修改
-export function changeTenantStatus(id: string | number, tenantId: string | number, status: string) {
-  const data = {
-    id,
-    tenantId,
-    status
-  };
-  return request({
-    url: '/system/tenant/changeStatus',
-    method: 'put',
-    data: data
-  });
-}
-
-// 删除租户
-export function delTenant(id: string | number | Array<string | number>) {
-  return request({
-    url: '/system/tenant/' + id,
-    method: 'delete'
-  });
-}
-
-// 动态切换租户
-export function dynamicTenant(tenantId: string | number) {
-  return request({
-    url: '/system/tenant/dynamic/' + tenantId,
-    method: 'get'
-  });
-}
-
-// 清除动态租户
-export function dynamicClear() {
-  return request({
-    url: '/system/tenant/dynamic/clear',
-    method: 'get'
-  });
-}
-
-// 同步租户套餐
-export function syncTenantPackage(tenantId: string | number, packageId: string | number) {
-  const data = {
-    tenantId,
-    packageId
-  };
-  return request({
-    url: '/system/tenant/syncTenantPackage',
-    method: 'get',
-    params: data
-  });
-}
-
-// 同步租户字典
-export function syncTenantDict() {
-  return request({
-    url: '/system/tenant/syncTenantDict',
-    method: 'get'
-  });
-}
-
-// 同步租户字典
-export function syncTenantConfig() {
-  return request({
-    url: '/system/tenant/syncTenantConfig',
-    method: 'get'
-  });
-}
diff --git a/src/api/system/tenant/types.ts b/src/api/system/tenant/types.ts
deleted file mode 100644
index 25395fa6..00000000
--- a/src/api/system/tenant/types.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export interface TenantVO extends BaseEntity {
-  id: number | string;
-  tenantId: number | string;
-  username: string;
-  contactUserName: string;
-  contactPhone: string;
-  companyName: string;
-  licenseNumber: string;
-  address: string;
-  domain: string;
-  intro: string;
-  remark: string;
-  packageId: string | number;
-  expireTime: string;
-  accountCount: number;
-  status: string;
-}
-
-export interface TenantQuery extends PageQuery {
-  tenantId: string | number;
-
-  contactUserName: string;
-
-  contactPhone: string;
-
-  companyName: string;
-}
-
-export interface TenantForm {
-  id: number | string | undefined;
-  tenantId: number | string | undefined;
-  username: string;
-  password: string;
-  contactUserName: string;
-  contactPhone: string;
-  companyName: string;
-  licenseNumber: string;
-  domain: string;
-  address: string;
-  intro: string;
-  remark: string;
-  packageId: string | number;
-  expireTime: string;
-  accountCount: number;
-  status: string;
-}
diff --git a/src/api/system/tenantPackage/index.ts b/src/api/system/tenantPackage/index.ts
deleted file mode 100644
index 70d0dab9..00000000
--- a/src/api/system/tenantPackage/index.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import request from '@/utils/request';
-import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from './types';
-import { AxiosPromise } from 'axios';
-
-// 查询租户套餐列表
-export function listTenantPackage(query?: TenantPkgQuery): AxiosPromise<TenantPkgVO[]> {
-  return request({
-    url: '/system/tenant/package/list',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询租户套餐下拉选列表
-export function selectTenantPackage(): AxiosPromise<TenantPkgVO[]> {
-  return request({
-    url: '/system/tenant/package/selectList',
-    method: 'get'
-  });
-}
-
-// 查询租户套餐详细
-export function getTenantPackage(packageId: string | number): AxiosPromise<TenantPkgVO> {
-  return request({
-    url: '/system/tenant/package/' + packageId,
-    method: 'get'
-  });
-}
-
-// 新增租户套餐
-export function addTenantPackage(data: TenantPkgForm) {
-  return request({
-    url: '/system/tenant/package',
-    method: 'post',
-    data: data
-  });
-}
-
-// 修改租户套餐
-export function updateTenantPackage(data: TenantPkgForm) {
-  return request({
-    url: '/system/tenant/package',
-    method: 'put',
-    data: data
-  });
-}
-
-// 租户套餐状态修改
-export function changePackageStatus(packageId: number | string, status: string) {
-  const data = {
-    packageId,
-    status
-  };
-  return request({
-    url: '/system/tenant/package/changeStatus',
-    method: 'put',
-    data: data
-  });
-}
-
-// 删除租户套餐
-export function delTenantPackage(packageId: string | number | Array<string | number>) {
-  return request({
-    url: '/system/tenant/package/' + packageId,
-    method: 'delete'
-  });
-}
diff --git a/src/api/system/tenantPackage/types.ts b/src/api/system/tenantPackage/types.ts
deleted file mode 100644
index c24b8fc3..00000000
--- a/src/api/system/tenantPackage/types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface TenantPkgVO extends BaseEntity {
-  packageId: string | number;
-  packageName: string;
-  menuIds: string;
-  remark: string;
-  menuCheckStrictly: boolean;
-  status: string;
-}
-
-export interface TenantPkgQuery extends PageQuery {
-  packageName: string;
-}
-
-export interface TenantPkgForm {
-  packageId: string | number | undefined;
-  packageName: string;
-  menuIds: string;
-  remark: string;
-  menuCheckStrictly: boolean;
-}
diff --git a/src/api/types.ts b/src/api/types.ts
index 617286c6..06d2da14 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -2,7 +2,6 @@
  * 注册
  */
 export type RegisterForm = {
-  tenantId: string;
   username: string;
   password: string;
   confirmPassword?: string;
@@ -15,7 +14,6 @@ export type RegisterForm = {
  * 登录请求
  */
 export interface LoginData {
-  tenantId?: string;
   username?: string;
   password?: string;
   rememberMe?: boolean;
@@ -43,17 +41,3 @@ export interface VerifyCodeResult {
   uuid?: string;
   img?: string;
 }
-
-/**
- * 租户
- */
-export interface TenantVO {
-  companyName: string;
-  domain: any;
-  tenantId: string;
-}
-
-export interface TenantInfo {
-  tenantEnabled: boolean;
-  voList: TenantVO[];
-}
diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index dc52f62c..9eaf3f58 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -42,7 +42,7 @@ export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> =>
 };
 
 /**
- * 当前租户所有待办任务
+ * 查询全部待办任务
  * @param query
  * @returns {*}
  */
@@ -55,7 +55,7 @@ export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]>
 };
 
 /**
- * 当前租户所有已办任务
+ * 查询全部已办任务
  * @param query
  * @returns {*}
  */
diff --git a/src/lang/en_US.ts b/src/lang/en_US.ts
index b090d3e2..0f6ffac0 100644
--- a/src/lang/en_US.ts
+++ b/src/lang/en_US.ts
@@ -6,7 +6,6 @@ export default {
   },
   // 登录页面国际化
   login: {
-    selectPlaceholder: 'Please select/enter a company name',
     username: 'Username',
     password: 'Password',
     login: 'Login',
@@ -15,9 +14,6 @@ export default {
     rememberPassword: 'Remember me',
     switchRegisterPage: 'Sign up now',
     rule: {
-      tenantId: {
-        required: 'Please enter your tenant id'
-      },
       username: {
         required: 'Please enter your account'
       },
@@ -38,7 +34,6 @@ export default {
   },
   // 注册页面国际化
   register: {
-    selectPlaceholder: 'Please select/enter a company name',
     username: 'Username',
     password: 'Password',
     confirmPassword: 'Confirm Password',
@@ -48,9 +43,6 @@ export default {
     code: 'Verification Code',
     switchLoginPage: 'Log in with an existing account',
     rule: {
-      tenantId: {
-        required: 'Please enter your tenant id'
-      },
       username: {
         required: 'Please enter your account',
         length: 'The length of the user account must be between {min} and {max}'
@@ -77,7 +69,6 @@ export default {
     document: 'Document',
     message: 'Message',
     layoutSize: 'Layout Size',
-    selectTenant: 'Select Tenant',
     layoutSetting: 'Layout Setting',
     personalCenter: 'Personal Center',
     logout: 'Logout'
diff --git a/src/lang/zh_CN.ts b/src/lang/zh_CN.ts
index 3cc98721..6a6e812b 100644
--- a/src/lang/zh_CN.ts
+++ b/src/lang/zh_CN.ts
@@ -6,7 +6,6 @@ export default {
   },
   // 登录页面国际化
   login: {
-    selectPlaceholder: '请选择/输入公司名称',
     username: '用户名',
     password: '密码',
     login: '登 录',
@@ -15,9 +14,6 @@ export default {
     rememberPassword: '记住我',
     switchRegisterPage: '立即注册',
     rule: {
-      tenantId: {
-        required: '请输入您的租户编号'
-      },
       username: {
         required: '请输入您的账号'
       },
@@ -38,7 +34,6 @@ export default {
   },
   // 注册页面国际化
   register: {
-    selectPlaceholder: '请选择/输入公司名称',
     username: '用户名',
     password: '密码',
     confirmPassword: '确认密码',
@@ -48,9 +43,6 @@ export default {
     code: '验证码',
     switchLoginPage: '使用已有账户登录',
     rule: {
-      tenantId: {
-        required: '请输入您的租户编号'
-      },
       username: {
         required: '请输入您的账号',
         length: '用户账号长度必须介于 {min} 和 {max} 之间'
@@ -77,7 +69,6 @@ export default {
     document: '项目文档',
     message: '消息',
     layoutSize: '布局大小',
-    selectTenant: '选择租户',
     layoutSetting: '布局设置',
     personalCenter: '个人中心',
     logout: '退出登录'
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d39c81ad..f61deec4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -11,21 +11,6 @@
     </template>
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
-          v-if="userId === 1 && tenantEnabled"
-          v-model="companyName"
-          class="min-w-244px"
-          clearable
-          filterable
-          reserve-keyword
-          :placeholder="proxy.$t('navbar.selectTenant')"
-          @change="dynamicTenantEvent"
-          @clear="dynamicClearEvent"
-        >
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
-
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">
           <div class="right-menu-item hover-effect" @click="openSearchMenu">
@@ -75,7 +60,7 @@
           </div>
           <template #dropdown>
             <el-dropdown-menu>
-              <router-link v-if="!dynamic" to="/user/profile">
+              <router-link to="/user/profile">
                 <el-dropdown-item>{{ proxy.$t('navbar.personalCenter') }}</el-dropdown-item>
               </router-link>
               <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
@@ -98,15 +83,12 @@ import { useAppStore } from '@/store/modules/app';
 import { useUserStore } from '@/store/modules/user';
 import { useSettingsStore } from '@/store/modules/settings';
 import { useNoticeStore } from '@/store/modules/notice';
-import { getTenantList } from '@/api/login';
-import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
-import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
 import router from '@/router';
 import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import Logo from "@/layout/components/Sidebar/Logo.vue";
-import TopBar from './TopBar'
+import TopBar from './TopBar/index.vue';
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -120,12 +102,6 @@ const userId = ref(userStore.userId);
 const navType = computed(() => settingsStore.navType);
 const showLogo = computed(() => settingsStore.sidebarLogo);
 
-const companyName = ref(undefined);
-const tenantList = ref<TenantVO[]>([]);
-// 是否切换了租户
-const dynamic = ref(false);
-// 租户开关
-const tenantEnabled = ref(true);
 // 搜索菜单
 const searchMenuRef = ref<InstanceType<typeof SearchMenu>>();
 
@@ -133,38 +109,6 @@ const openSearchMenu = () => {
   searchMenuRef.value?.openSearch();
 };
 
-// 动态切换
-const dynamicTenantEvent = async (tenantId: string) => {
-  if (companyName.value != null && companyName.value !== '') {
-    await dynamicTenant(tenantId);
-    dynamic.value = true;
-    await proxy?.$router.push('/');
-    await proxy?.$tab.closeAllPage();
-    await proxy?.$tab.refreshPage();
-  }
-};
-
-const dynamicClearEvent = async () => {
-  await dynamicClear();
-  dynamic.value = false;
-  await proxy?.$router.push('/');
-  await proxy?.$tab.closeAllPage();
-  await proxy?.$tab.refreshPage();
-};
-
-/** 租户列表 */
-const initTenantList = async () => {
-  const { data } = await getTenantList(true);
-  tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
-  if (tenantEnabled.value) {
-    tenantList.value = data.voList;
-  }
-};
-
-defineExpose({
-  initTenantList
-});
-
 const toggleSideBar = () => {
   appStore.toggleSideBar(false);
 };
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index a5cd7683..1c26bd5d 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -17,9 +17,6 @@ const loading = ref(true);
 const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
-const stateJson = JSON.parse(atob(state));
-const tenantId = (stateJson.tenantId as string) ? (stateJson.tenantId as string) : '000000';
-const domain = stateJson.domain as string;
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
@@ -62,19 +59,9 @@ const loginByCode = async (data: LoginData) => {
 };
 
 const init = async () => {
-  // 如果域名不相等 则重定向处理
-  const host = window.location.host;
-  if (domain !== host) {
-    const urlFull = new URL(window.location.href);
-    urlFull.host = domain;
-    window.location.href = urlFull.toString();
-    return;
-  }
-
   const data: LoginData = {
     socialCode: code,
     socialState: state,
-    tenantId: tenantId,
     source: source,
     clientId: import.meta.env.VITE_APP_CLIENT_ID,
     grantType: 'social'
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 51740322..b927b692 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -69,12 +69,6 @@ watchEffect(() => {
 const navbarRef = ref<InstanceType<typeof Navbar>>();
 const settingRef = ref<InstanceType<typeof Settings>>();
 
-onMounted(() => {
-  nextTick(() => {
-    navbarRef.value?.initTenantList();
-  });
-});
-
 onMounted(() => {
   const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
   initWebSocket(protocol + window.location.host + import.meta.env.VITE_APP_BASE_API + '/resource/websocket');
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b714d032..7c501d81 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -11,7 +11,6 @@ export const useUserStore = defineStore('user', () => {
   const name = ref('');
   const nickname = ref('');
   const userId = ref<string | number>('');
-  const tenantId = ref<string>('');
   const avatar = ref('');
   const roles = ref<Array<string>>([]); // 用户角色编码集合 → 判断路由权限
   const permissions = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
@@ -51,7 +50,6 @@ export const useUserStore = defineStore('user', () => {
       nickname.value = user.nickName;
       avatar.value = profile;
       userId.value = user.userId;
-      tenantId.value = user.tenantId;
       return Promise.resolve();
     }
     return Promise.reject(err);
@@ -72,7 +70,6 @@ export const useUserStore = defineStore('user', () => {
 
   return {
     userId,
-    tenantId,
     token,
     nickname,
     avatar,
diff --git a/src/views/index.vue b/src/views/index.vue
index 54689107..87da59a5 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Vue-Plus多租户管理系统</h2>
+        <h2>RuoYi-Vue-Plus后台管理系统</h2>
         <p>
           RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
           <br />
@@ -47,7 +47,7 @@
       </el-col>
 
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Cloud-Plus多租户微服务管理系统</h2>
+        <h2>RuoYi-Cloud-Plus微服务后台管理系统</h2>
         <p>
           RuoYi-Cloud-Plus 微服务通用权限管理系统 重写 RuoYi-Cloud 全方位升级(不兼容原框架)
           <br />
diff --git a/src/views/login.vue b/src/views/login.vue
index a890c633..79829ea0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,12 +5,6 @@
         <h3 class="title">{{ title }}</h3>
         <lang-select />
       </div>
-      <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
-      </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -79,10 +73,10 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, getTenantList } from '@/api/login';
+import { getCodeImg } from '@/api/login';
 import { authRouterUrl } from '@/api/system/social/auth';
 import { useUserStore } from '@/store/modules/user';
-import { LoginData, TenantVO } from '@/api/types';
+import { LoginData } from '@/api/types';
 import { to } from 'await-to-js';
 import { HttpStatus } from '@/enums/RespEnum';
 import { useI18n } from 'vue-i18n';
@@ -95,7 +89,6 @@ const router = useRouter();
 const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
-  tenantId: '000000',
   username: 'admin',
   password: 'admin123',
   rememberMe: false,
@@ -104,7 +97,6 @@ const loginForm = ref<LoginData>({
 } as LoginData);
 
 const loginRules: ElFormRules = {
-  tenantId: [{ required: true, trigger: 'blur', message: t('login.rule.tenantId.required') }],
   username: [{ required: true, trigger: 'blur', message: t('login.rule.username.required') }],
   password: [{ required: true, trigger: 'blur', message: t('login.rule.password.required') }],
   code: [{ required: true, trigger: 'change', message: t('login.rule.code.required') }]
@@ -114,15 +106,10 @@ const codeUrl = ref('');
 const loading = ref(false);
 // 验证码开关
 const captchaEnabled = ref(true);
-// 租户开关
-const tenantEnabled = ref(true);
-
 // 注册开关
 const register = ref(false);
 const redirect = ref('/');
 const loginRef = ref<ElFormInstance>();
-// 租户列表
-const tenantList = ref<TenantVO[]>([]);
 
 watch(
   () => router.currentRoute.value,
@@ -138,13 +125,11 @@ const handleLogin = () => {
       loading.value = true;
       // 勾选了需要记住密码设置在 localStorage 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
-        localStorage.setItem('tenantId', String(loginForm.value.tenantId));
         localStorage.setItem('username', String(loginForm.value.username));
         localStorage.setItem('password', String(loginForm.value.password));
         localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
       } else {
         // 否则移除
-        localStorage.removeItem('tenantId');
         localStorage.removeItem('username');
         localStorage.removeItem('password');
         localStorage.removeItem('rememberMe');
@@ -184,38 +169,22 @@ const getCode = async () => {
 };
 
 const getLoginData = () => {
-  const tenantId = localStorage.getItem('tenantId');
   const username = localStorage.getItem('username');
   const password = localStorage.getItem('password');
   const rememberMe = localStorage.getItem('rememberMe');
   loginForm.value = {
-    tenantId: tenantId === null ? String(loginForm.value.tenantId) : tenantId,
     username: username === null ? String(loginForm.value.username) : username,
     password: password === null ? String(loginForm.value.password) : String(password),
     rememberMe: rememberMe === null ? false : Boolean(rememberMe)
   } as LoginData;
 };
 
-/**
- * 获取租户列表
- */
-const initTenantList = async () => {
-  const { data } = await getTenantList(false);
-  tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
-  if (tenantEnabled.value) {
-    tenantList.value = data.voList;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
-    }
-  }
-};
-
 /**
  * 第三方登录
  * @param type
  */
 const doSocialLogin = (type: string) => {
-  authRouterUrl(type, loginForm.value.tenantId).then((res: any) => {
+  authRouterUrl(type).then((res: any) => {
     if (res.code === HttpStatus.SUCCESS) {
       // 获取授权地址跳转
       window.location.href = res.data;
@@ -227,7 +196,6 @@ const doSocialLogin = (type: string) => {
 
 onMounted(() => {
   getCode();
-  initTenantList();
   getLoginData();
 });
 </script>
diff --git a/src/views/register.vue b/src/views/register.vue
index 45f7a387..6a631d68 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -5,12 +5,6 @@
         <h3 class="title">{{ title }}</h3>
         <lang-select />
       </div>
-      <el-form-item v-if="tenantEnabled" prop="tenantId">
-        <el-select v-model="registerForm.tenantId" filterable :placeholder="proxy.$t('register.selectPlaceholder')" style="width: 100%">
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
-      </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('register.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -73,8 +67,8 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, register, getTenantList } from '@/api/login';
-import { RegisterForm, TenantVO } from '@/api/types';
+import { getCodeImg, register } from '@/api/login';
+import { RegisterForm } from '@/api/types';
 import { to } from 'await-to-js';
 import { useI18n } from 'vue-i18n';
 
@@ -86,7 +80,6 @@ const router = useRouter();
 const { t } = useI18n();
 
 const registerForm = ref<RegisterForm>({
-  tenantId: '',
   username: '',
   password: '',
   confirmPassword: '',
@@ -95,9 +88,6 @@ const registerForm = ref<RegisterForm>({
   userType: 'sys_user'
 });
 
-// 租户开关
-const tenantEnabled = ref(true);
-
 const equalToPassword = (rule: any, value: string, callback: any) => {
   if (registerForm.value.password !== value) {
     callback(new Error(t('register.rule.confirmPassword.equalToPassword')));
@@ -107,7 +97,6 @@ const equalToPassword = (rule: any, value: string, callback: any) => {
 };
 
 const registerRules: ElFormRules = {
-  tenantId: [{ required: true, trigger: 'blur', message: t('register.rule.tenantId.required') }],
   username: [
     { required: true, trigger: 'blur', message: t('register.rule.username.required') },
     { min: 2, max: 20, message: t('register.rule.username.length', { min: 2, max: 20 }), trigger: 'blur' }
@@ -127,8 +116,6 @@ const codeUrl = ref('');
 const loading = ref(false);
 const captchaEnabled = ref(true);
 const registerRef = ref<ElFormInstance>();
-// 租户列表
-const tenantList = ref<TenantVO[]>([]);
 
 const handleRegister = () => {
   registerRef.value?.validate(async (valid: boolean) => {
@@ -163,20 +150,8 @@ const getCode = async () => {
   }
 };
 
-const initTenantList = async () => {
-  const { data } = await getTenantList(false);
-  tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
-  if (tenantEnabled.value) {
-    tenantList.value = data.voList;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      registerForm.value.tenantId = tenantList.value[0].tenantId;
-    }
-  }
-};
-
 onMounted(() => {
   getCode();
-  initTenantList();
 });
 </script>
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
deleted file mode 100644
index dd31700e..00000000
--- a/src/views/system/tenant/index.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="租户编号" prop="tenantId">
-              <el-input v-model="queryParams.tenantId" placeholder="请输入租户编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="联系人" prop="contactUserName">
-              <el-input v-model="queryParams.contactUserName" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="联系电话" prop="contactPhone">
-              <el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="企业名称" prop="companyName">
-              <el-input v-model="queryParams.companyName" placeholder="请输入企业名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="hover">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
-              删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantConfig">同步租户参数配置</el-button>
-          </el-col>
-          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" border :data="tenantList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="false" label="id" align="center" prop="id" />
-        <el-table-column label="租户编号" align="center" prop="tenantId" />
-        <el-table-column label="联系人" align="center" prop="contactUserName" />
-        <el-table-column label="联系电话" align="center" prop="contactPhone" />
-        <el-table-column label="企业名称" align="center" prop="companyName" />
-        <el-table-column label="社会信用代码" align="center" prop="licenseNumber" />
-        <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
-          <template #default="scope">
-            <span>{{ proxy.parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="租户状态" align="center" prop="status">
-          <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column width="150" label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="同步套餐" placement="top">
-              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)">
-              </el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改租户对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="企业名称" prop="companyName">
-          <el-input v-model="form.companyName" placeholder="请输入企业名称" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactUserName">
-          <el-input v-model="form.contactUserName" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactPhone">
-          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item v-if="!form.id" label="用户名" prop="username">
-          <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
-        </el-form-item>
-        <el-form-item v-if="!form.id" label="用户密码" prop="password">
-          <el-input v-model="form.password" type="password" placeholder="请输入系统用户密码" maxlength="20" />
-        </el-form-item>
-        <el-form-item label="租户套餐" prop="packageId">
-          <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="请选择租户套餐" clearable style="width: 100%">
-            <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="过期时间" prop="expireTime">
-          <el-date-picker v-model="form.expireTime" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择过期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="用户数量" prop="accountCount">
-          <el-input v-model="form.accountCount" placeholder="请输入用户数量" />
-        </el-form-item>
-        <el-form-item label="绑定域名" prop="domain">
-          <el-input v-model="form.domain" placeholder="请输入绑定域名" />
-        </el-form-item>
-        <el-form-item label="企业地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入企业地址" />
-        </el-form-item>
-        <el-form-item label="企业代码" prop="licenseNumber">
-          <el-input v-model="form.licenseNumber" placeholder="请输入统一社会信用代码" />
-        </el-form-item>
-        <el-form-item label="企业简介" prop="intro">
-          <el-input v-model="form.intro" type="textarea" placeholder="请输入企业简介" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="Tenant" lang="ts">
-import {
-  listTenant,
-  getTenant,
-  delTenant,
-  addTenant,
-  updateTenant,
-  changeTenantStatus,
-  syncTenantPackage,
-  syncTenantDict,
-  syncTenantConfig
-} from '@/api/system/tenant';
-import { selectTenantPackage } from '@/api/system/tenantPackage';
-import { useUserStore } from '@/store/modules/user';
-import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
-import { TenantPkgVO } from '@/api/system/tenantPackage/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const userStore = useUserStore();
-const userId = ref(userStore.userId);
-const tenantList = ref<TenantVO[]>([]);
-const packageList = ref<TenantPkgVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const tenantFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: TenantForm = {
-  id: undefined,
-  tenantId: undefined,
-  contactUserName: '',
-  contactPhone: '',
-  username: '',
-  password: '',
-  companyName: '',
-  licenseNumber: '',
-  domain: '',
-  address: '',
-  intro: '',
-  remark: '',
-  packageId: '',
-  expireTime: '',
-  accountCount: 0,
-  status: '0'
-};
-const data = reactive<PageData<TenantForm, TenantQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    tenantId: '',
-    contactUserName: '',
-    contactPhone: '',
-    companyName: ''
-  },
-  rules: {
-    id: [{ required: true, message: 'id不能为空', trigger: 'blur' }],
-    tenantId: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
-    contactUserName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-    contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-    companyName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
-    username: [
-      { required: true, message: '用户名不能为空', trigger: 'blur' },
-      { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-    ],
-    password: [
-      { required: true, message: '密码不能为空', trigger: 'blur' },
-      { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-    ]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询所有租户套餐 */
-const getTenantPackage = async () => {
-  const res = await selectTenantPackage();
-  packageList.value = res.data;
-};
-
-/** 查询租户列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listTenant(queryParams.value);
-  tenantList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-// 租户套餐状态修改
-const handleStatusChange = async (row: TenantVO) => {
-  const text = row.status === '0' ? '启用' : '停用';
-  try {
-    await proxy?.$modal.confirm('确认要"' + text + '""' + row.companyName + '"租户吗？');
-    await changeTenantStatus(row.id, row.tenantId, row.status);
-    proxy?.$modal.msgSuccess(text + '成功');
-  } catch {
-    row.status = row.status === '0' ? '1' : '0';
-  }
-};
-
-// 取消按钮
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-// 表单重置
-const reset = () => {
-  form.value = { ...initFormData };
-  tenantFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-// 多选框选中数据
-const handleSelectionChange = (selection: TenantVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  getTenantPackage();
-  dialog.visible = true;
-  dialog.title = '添加租户';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: TenantVO) => {
-  reset();
-  await getTenantPackage();
-  const _id = row?.id || ids.value[0];
-  const res = await getTenant(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改租户';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  tenantFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateTenant(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addTenant(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: TenantVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除租户编号为"' + _ids + '"的数据项？');
-  loading.value = true;
-  await delTenant(_ids).finally(() => (loading.value = false));
-  await getList();
-  proxy?.$modal.msgSuccess('删除成功');
-};
-
-/** 同步租户套餐按钮操作 */
-const handleSyncTenantPackage = async (row: TenantVO) => {
-  try {
-    await proxy?.$modal.confirm('是否确认同步租户套餐租户编号为"' + row.tenantId + '"的数据项？');
-    loading.value = true;
-    await syncTenantPackage(row.tenantId, row.packageId);
-    await getList();
-    proxy?.$modal.msgSuccess('同步成功');
-  } catch {
-    return;
-  } finally {
-    loading.value = false;
-  }
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'system/tenant/export',
-    {
-      ...queryParams.value
-    },
-    `tenant_${new Date().getTime()}.xlsx`
-  );
-};
-
-/**同步租户字典*/
-const handleSyncTenantDict = async () => {
-  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
-  const res = await syncTenantDict();
-  proxy?.$modal.msgSuccess(res.msg);
-};
-
-/**同步租户参数配置*/
-const handleSyncTenantConfig = async () => {
-  await proxy?.$modal.confirm('确认要同步所有租户参数配置吗？');
-  const res = await syncTenantConfig();
-  proxy?.$modal.msgSuccess(res.msg);
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
deleted file mode 100644
index 84a9f2b1..00000000
--- a/src/views/system/tenantPackage/index.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="套餐名称" prop="packageName">
-              <el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="hover">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
-              修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
-              删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">导出 </el-button>
-          </el-col>
-          <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" border :data="tenantPackageList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="false" label="租户套餐id" align="center" prop="packageId" />
-        <el-table-column label="套餐名称" align="center" prop="packageName" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @click="handleStatusChange(scope.row)"></el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:tenantPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
-    </el-card>
-
-    <!-- 添加或修改租户套餐对话框 -->
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="tenantPackageFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="套餐名称" prop="packageName">
-          <el-input v-model="form.packageName" placeholder="请输入套餐名称" />
-        </el-form-item>
-        <el-form-item label="关联菜单">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选 </el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动 </el-checkbox>
-          <el-tree
-            ref="menuTreeRef"
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' } as any"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="TenantPackage" lang="ts">
-import {
-  listTenantPackage,
-  getTenantPackage,
-  delTenantPackage,
-  addTenantPackage,
-  updateTenantPackage,
-  changePackageStatus
-} from '@/api/system/tenantPackage';
-import { tenantPackageMenuTreeselect } from '@/api/system/menu';
-import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types';
-import { MenuTreeOption } from '@/api/system/menu/types';
-import to from 'await-to-js';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const tenantPackageList = ref<TenantPkgVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const menuExpand = ref(false);
-const menuNodeAll = ref(false);
-const menuOptions = ref<MenuTreeOption[]>([]);
-
-const menuTreeRef = ref<ElTreeInstance>();
-const queryFormRef = ref<ElFormInstance>();
-const tenantPackageFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: TenantPkgForm = {
-  packageId: undefined,
-  packageName: '',
-  menuIds: '',
-  remark: '',
-  menuCheckStrictly: true
-};
-const data = reactive<PageData<TenantPkgForm, TenantPkgQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    packageName: ''
-  },
-  rules: {
-    packageId: [{ required: true, message: '租户套餐id不能为空', trigger: 'blur' }],
-    packageName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-// 所有菜单节点数据
-const getMenuAllCheckedKeys = (): any => {
-  // 目前被选中的菜单节点
-  const checkedKeys = menuTreeRef.value?.getCheckedKeys();
-  // 半选中的菜单节点
-  const halfCheckedKeys = menuTreeRef.value?.getHalfCheckedKeys();
-  if (halfCheckedKeys) {
-    checkedKeys?.unshift(...halfCheckedKeys);
-  }
-  return checkedKeys;
-};
-
-/** 根据租户套餐ID查询菜单树结构 */
-const getPackageMenuTreeselect = async (packageId: string | number) => {
-  const res = await tenantPackageMenuTreeselect(packageId);
-  menuOptions.value = res.data.menus;
-  return Promise.resolve(res);
-};
-
-/** 查询租户套餐列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listTenantPackage(queryParams.value);
-  tenantPackageList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-// 租户套餐状态修改
-const handleStatusChange = async (row: TenantPkgVO) => {
-  const text = row.status === '0' ? '启用' : '停用';
-  const [err] = await to(proxy?.$modal.confirm('确认要"' + text + '""' + row.packageName + '"套餐吗？') as Promise<any>);
-  if (err) {
-    row.status = row.status === '0' ? '1' : '0';
-  } else {
-    await changePackageStatus(row.packageId, row.status);
-    proxy?.$modal.msgSuccess(text + '成功');
-  }
-};
-
-// 取消按钮
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-// 表单重置
-const reset = () => {
-  menuTreeRef.value?.setCheckedKeys([]);
-  menuExpand.value = false;
-  menuNodeAll.value = false;
-  form.value = { ...initFormData };
-  tenantPackageFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-// 多选框选中数据
-const handleSelectionChange = (selection: TenantPkgVO[]) => {
-  ids.value = selection.map((item) => item.packageId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-// 树权限（展开/折叠）
-const handleCheckedTreeExpand = (value: CheckboxValueType, type: string) => {
-  if (type == 'menu') {
-    const treeList = menuOptions.value;
-    for (let i = 0; i < treeList.length; i++) {
-      if (menuTreeRef.value) {
-        menuTreeRef.value.store.nodesMap[treeList[i].id].expanded = value as boolean;
-      }
-    }
-  }
-};
-
-// 树权限（全选/全不选）
-const handleCheckedTreeNodeAll = (value: CheckboxValueType, type: string) => {
-  if (type == 'menu') {
-    menuTreeRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
-  }
-};
-
-// 树权限（父子联动）
-const handleCheckedTreeConnect = (value: CheckboxValueType, type: string) => {
-  if (type == 'menu') {
-    form.value.menuCheckStrictly = value as boolean;
-  }
-};
-
-/** 新增按钮操作 */
-const handleAdd = async () => {
-  reset();
-  await getPackageMenuTreeselect(0);
-  dialog.visible = true;
-  dialog.title = '添加租户套餐';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: TenantPkgVO) => {
-  reset();
-  const _packageId = row?.packageId || ids.value[0];
-  const response = await getTenantPackage(_packageId);
-  form.value = response.data;
-  const res = await getPackageMenuTreeselect(_packageId);
-  dialog.visible = true;
-  dialog.title = '修改租户套餐';
-  res.data.checkedKeys.forEach((v) => {
-    nextTick(() => {
-      menuTreeRef.value?.setChecked(v, true, false);
-    });
-  });
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  tenantPackageFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      form.value.menuIds = getMenuAllCheckedKeys();
-      if (form.value.packageId != null) {
-        await updateTenantPackage(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addTenantPackage(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: TenantPkgVO) => {
-  const _packageIds = row?.packageId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除租户套餐编号为"' + _packageIds + '"的数据项？').finally(() => {
-    loading.value = false;
-  });
-  await delTenantPackage(_packageIds);
-  loading.value = true;
-  await getList();
-  proxy?.$modal.msgSuccess('删除成功');
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'system/tenant/package/export',
-    {
-      ...queryParams.value
-    },
-    `tenantPackage_${new Date().getTime()}.xlsx`
-  );
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
index 92665963..cb608bd6 100644
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -58,7 +58,6 @@
 <script setup lang="ts">
 import { authUnlock, authRouterUrl } from '@/api/system/social/auth';
 import { propTypes } from '@/utils/propTypes';
-import { useUserStore } from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -84,7 +83,7 @@ const unlockAuth = (row: any) => {
 };
 
 const authUrl = (source: string) => {
-  authRouterUrl(source, useUserStore().tenantId).then((res: any) => {
+  authRouterUrl(source).then((res: any) => {
     if (res.code === 200) {
       window.location.href = res.data;
     } else {