diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts deleted file mode 100644 index 7fa6138..0000000 --- a/src/api/system/tenant/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { defHttp } from '@/utils/http/axios' - -export interface TenantVO { - id: number - name: string - contactName: string - contactMobile: string - status: number - domain: string - packageId: number - username: string - password: string - expireTime: Date - accountCount: number - createTime: Date -} - -export interface TenantPageReqVO extends PageParam { - name?: string - contactName?: string - contactMobile?: string - status?: number - createTime?: Date[] -} - -export interface TenantExportReqVO { - name?: string - contactName?: string - contactMobile?: string - status?: number - createTime?: Date[] -} - -// 查询租户列表 -export function getTenantPage(params: TenantPageReqVO) { - return defHttp.get({ url: '/system/tenant/page', params }) -} - -// 查询租户详情 -export function getTenant(id: number) { - return defHttp.get({ url: `/system/tenant/get?id=${id}` }) -} - -// 新增租户 -export function createTenant(data: TenantVO) { - return defHttp.post({ url: '/system/tenant/create', data }) -} - -// 修改租户 -export function updateTenant(data: TenantVO) { - return defHttp.put({ url: '/system/tenant/update', data }) -} - -// 删除租户 -export function deleteTenant(id: number) { - return defHttp.delete({ url: `/system/tenant/delete?id=${id}` }) -} - -// 导出租户 -export function exportTenant(params: TenantExportReqVO) { - return defHttp.download({ url: '/system/tenant/export-excel', params }, '租户.xls') -} diff --git a/src/api/system/tenantPackage/index.ts b/src/api/system/tenantPackage/index.ts deleted file mode 100644 index 853a234..0000000 --- a/src/api/system/tenantPackage/index.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { defHttp } from '@/utils/http/axios' - -export interface TenantPackageVO { - id: number - name: string - status: number - remark: string - creator: string - updater: string - updateTime: string - menuIds: number[] - createTime: Date -} - -export interface TenantPackagePageReqVO extends PageParam { - name?: string - status?: number - remark?: string - createTime?: Date[] -} - -// 查询租户套餐列表 -export function getTenantPackagePage(params: TenantPackagePageReqVO) { - return defHttp.get({ url: '/system/tenant-package/page', params }) -} - -// 获得租户 -export function getTenantPackage(id: number) { - return defHttp.get({ url: `/system/tenant-package/get?id=${id}` }) -} - -// 新增租户套餐 -export function createTenantPackage(data: TenantPackageVO) { - return defHttp.post({ url: '/system/tenant-package/create', data }) -} - -// 修改租户套餐 -export function updateTenantPackage(data: TenantPackageVO) { - return defHttp.put({ url: '/system/tenant-package/update', data }) -} - -// 删除租户套餐 -export function deleteTenantPackage(id: number) { - return defHttp.delete({ url: `/system/tenant-package/delete?id=${id}` }) -} -// 获取租户套餐精简信息列表 -export function getTenantPackageList() { - return defHttp.get({ url: '/system/tenant-package/get-simple-list' }) -} diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue index f8a3781..d892ff2 100644 --- a/src/views/base/login/LoginForm.vue +++ b/src/views/base/login/LoginForm.vue @@ -18,7 +18,6 @@ import { useDesign } from '@/hooks/web/useDesign' import * as authUtil from '@/utils/auth' import { Verify } from '@/components/Verifition' -import { getTenantByWebsite, getTenantIdByName } from '@/api/base/login' const FormItem = Form.Item const InputPassword = Input.Password @@ -29,7 +28,7 @@ const { prefixCls } = useDesign('login') const userStore = useUserStore() const permissionStore = usePermissionStore() -const { tenantEnable, captchaEnable } = useGlobSetting() +const { captchaEnable } = useGlobSetting() const { setLoginState, getLoginState } = useLoginState() const { getFormRules } = useFormRules() @@ -42,7 +41,7 @@ const verify = ref() const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 const formData = reactive({ - tenantName: '芋道源码', + // tenantName: '芋道源码', username: 'admin', password: 'admin123', captchaVerification: '', @@ -68,24 +67,24 @@ async function getCode() { } // 根据域名,获得租户信息 && 获取租户ID -async function getTenantId() { - if (tenantEnable === 'true') { - const website = location.host - const tenant = await getTenantByWebsite(website) - if (tenant) { - formData.tenantName = tenant.name - authUtil.setTenantId(tenant.id) - } - else { - const res = await getTenantIdByName(formData.tenantName) - console.log(res) - authUtil.setTenantId(res) - } - } -} +// async function getTenantId() { +// if (tenantEnable === 'true') { +// const website = location.host +// const tenant = await getTenantByWebsite(website) +// if (tenant) { +// formData.tenantName = tenant.name +// authUtil.setTenantId(tenant.id) +// } +// else { +// const res = await getTenantIdByName(formData.tenantName) +// console.log(res) +// authUtil.setTenantId(res) +// } +// } +// } async function handleLogin(params) { - await getTenantId() + // await getTenantId() const data = await validForm() if (!data) return @@ -125,7 +124,7 @@ async function handleLogin(params) { v-show="getShow" ref="formRef" class="enter-x p-4" :model="formData" :rules="getFormRules" @keypress.enter="handleLogin" > - + - - + - - + + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 5e820b7..95d37f9 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -72,8 +72,8 @@ async function handleDelete(record: Recordable) {