update 删除多租户功能

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'
-  });
-}

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({

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'
   });
 }
 

src/api/system/tenant/index.ts

@@ -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'
-  });
-}

src/api/system/tenant/types.ts

@@ -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;
-}

src/api/system/tenantPackage/index.ts

@@ -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'
-  });
-}

src/api/system/tenantPackage/types.ts

@@ -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;
-}

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[];
-}

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 {*}
  */