remove tenant

This commit is contained in:
quantulr
2023-08-10 17:29:07 +08:00
parent 4d928cb019
commit 2a60039aa0
7 changed files with 10 additions and 1815 deletions

View File

@ -72,13 +72,3 @@ export const getRouters = () => {
});
};
export const getTenantNormalList = (query) => {
return request({
url: "/tenant/normal-list",
headers: {
isToken: false,
},
params: query,
method: "get",
});
};

View File

@ -1,31 +0,0 @@
import request from "@/utils/request";
export const check = (tenantId) => {
return request({
url: `/tenant/init/check/${tenantId}`,
method: "POST",
});
};
export const createTables = (tenantId) => {
return request({
url: `/tenant/init/createTables/${tenantId}`,
method: "POST",
});
};
export const initData = (tenantId) => {
return request({
url: `/tenant/init/initData/${tenantId}`,
method: "POST",
timeout: 0,
});
};
// 初始化完毕
export const initCompleted = (tenantId) => {
return request({
url: `/tenant/init/initCompleted/${tenantId}`,
method: "POST",
});
};

View File

@ -1,139 +0,0 @@
import request from "@/utils/request";
// 查询租户列表
export function listTenant(query) {
return request({
url: "/tenant/list",
method: "get",
params: query,
});
}
// 查询租户详细
export function getTenant(tenantId) {
return request({
url: "/tenant/" + tenantId,
method: "get",
});
}
// 新增租户
export function addTenant(data) {
return request({
url: "/tenant",
method: "post",
data: data,
});
}
// 修改租户
export function updateTenant(data) {
return request({
url: "/tenant",
method: "put",
data: data,
});
}
// 删除租户
export function delTenant(tenantId) {
return request({
url: "/tenant/" + tenantId,
method: "delete",
});
}
// 查看设置
export function getSetting(tenantId) {
return request({
url: `/tenant/getSetting/${tenantId}`,
method: "get",
});
}
// 刷新参数缓存
export function refreshCache() {
return request({
url: "/tenant/refreshCache",
method: "delete",
});
}
// 租户模式设置
export function updateMode(params) {
return request({
url: "/tenant/update-mode",
method: "put",
params,
});
}
/**
* 获取数据源列表
* @return {*}
*/
export function datasourceList(tenantId) {
return request({
url: "/tenant/datasource/list",
method: "GET",
params: { tenantId },
});
}
/**
* 添加数据源
* @param data
* @return {*}
*/
export function insertDatasource(data) {
return request({
url: "/tenant/datasource",
method: "POST",
data,
});
}
/**
* 修改数据源
* @param data
* @return {*}
*/
export function updateDatasource(data) {
return request({
url: "/tenant/datasource",
method: "PUT",
data,
});
}
/**
* 删除数据源
* @param ids
* @return {*}
*/
export function deleteDatasource(ids) {
return request({
url: `/tenant/datasource/${ids}`,
method: "DELETE",
});
}
// 切换为主数据源
export const switchPrimary = (tenantId, id) => {
return request({
url: `/tenant/datasource/switchPrimary/${tenantId}/${id}`,
method: "PUT",
});
};
// 修改租户状态
export const updateStatus = (tenantId, status) => {
return request({
url: "/tenant/update-status",
method: "put",
params: {
tenantId,
status,
},
});
};

View File

@ -9,9 +9,6 @@ const useUserStore = defineStore("user", {
name: "",
avatar: "",
roles: [],
tenant: "" /*登录后*/,
tempTenant: null /*临时的tenant*/,
tempTenantName: null,
permissions: [],
userInfoRes: null,
}),
@ -23,11 +20,9 @@ const useUserStore = defineStore("user", {
login(userInfo) {
const username = userInfo.username.trim();
const password = userInfo.password;
const tenant = userInfo.tenant;
const code = userInfo.code;
const uuid = userInfo.uuid;
return new Promise((resolve, reject) => {
this.tenant = tenant;
login(username, password, code, uuid)
.then((res) => {
setToken(res.token);
@ -78,7 +73,6 @@ const useUserStore = defineStore("user", {
this.roles = [];
this.permissions = [];
this.userInfoRes = null;
this.tenant = null;
removeToken();
resolve();
})
@ -98,17 +92,8 @@ const useUserStore = defineStore("user", {
resolve();
});
},
setTempTenant(tenant) {
this.tempTenant = tenant.tenantId;
this.tempTenantName = tenant.companyName;
},
},
persist: [
{
paths: ["tenant" /*"userInfoRes"*/, "tempTenant", "tempTenantName"],
storage: localStorage,
},
],
});
export default useUserStore;

View File

@ -3,9 +3,9 @@
<div class="login-card">
<div class="login-banner">
<!-- 主标题 -->
<h2 class="title">若依后台管理系统</h2>
<!-- <h2 class="title">若依后台管理系统</h2>-->
<!-- 副标题 -->
<p class="sub-title">前后端分离的后台管理系统架构</p>
<!-- <p class="sub-title">前后端分离的后台管理系统架构</p>-->
<el-image class="banner-image" :src="loginLeftBanner"/>
</div>
<el-form
@ -14,7 +14,7 @@
:rules="loginRules"
class="login-form"
>
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -99,12 +99,12 @@
<script setup>
import loginLeftBanner from "@/assets/images/login-left-banner.png";
import {getCodeImg, getTenantNormalList} from "@/api/login";
import {getCodeImg} from "@/api/login";
import Cookies from "js-cookie";
import {decrypt, encrypt} from "@/utils/jsencrypt";
import useUserStore from "@/store/modules/user";
import PagedSelect from "@/components/InfiniteSelect";
import {getCurrentInstance, ref, watchEffect} from "vue";
import {getCurrentInstance, ref} from "vue";
import {useRouter} from "vue-router";
const userStore = useUserStore();
const router = useRouter();
@ -222,7 +222,9 @@ getCookie();
padding: 0 20px 0;
display: none;
@media (min-width: 768px) {
display: inline-block;
display: flex;
flex-direction: column;
justify-content: center;
}
.title,

File diff suppressed because it is too large Load Diff

View File

@ -1,544 +0,0 @@
<template>
<div class="app-container">
<el-steps
:active="activeStep"
:process-status="
currentStepStatus === 0
? 'error'
: currentStepStatus === 1
? 'process'
: 'success'
"
align-center
class="init-steps"
finish-status="success"
>
<el-step title="开始" />
<el-step title="检查" />
<el-step title="创建表" />
<el-step title="导入数据" />
</el-steps>
<!-- 错误提示 -->
<el-alert
v-if="currentStepStatus === 0"
:closable="false"
:type="
currentStepStatus === 0
? 'error'
: currentStepStatus === 1
? 'info'
: 'success'
"
show-icon
>{{
activeStep === 1
? "错误码: " +
tenantInitCheckResult.result +
", 错误信息: " +
tenantInitCheckResult.msg
: activeStep === 2
? "错误码: " +
createTablesResult.result +
", 错误信息: " +
createTablesResult.msg
: activeStep === 3
? "错误码: " +
initDataResult.result +
", 错误信息: " +
initDataResult.msg
: ""
}}
</el-alert>
<!-- 数据库配置信息 -->
<el-row
v-if="Object.keys(tenantInitCheckResult).length"
style="margin: 36px 36px 0"
>
<el-col :span="12">
<div class="data-card init-check-base-data">
<div class="card-title">
<span>基础数据</span>
</div>
<div class="card-content">
<div class="card-content-item">
<span class="card-content-item-title">租户名称:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.tenantName
}}</span>
</div>
<!--模式-->
<div class="card-content-item">
<span class="card-content-item-title">模式:</span>
<span class="card-content-item-value">{{
tenant_mode_dict.find(
(item) => item.value === tenantInitCheckResult.mode
)?.label
}}</span>
</div>
</div>
</div>
</el-col>
<el-col :span="12">
<div
v-if="tenantInitCheckResult.datasource"
class="data-card init-check-base-data"
style="margin-left: 24px"
>
<div class="card-title">
<span>数据源数据</span>
</div>
<div class="card-content">
<div class="card-content-item">
<span class="card-content-item-title">数据库IP:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.ip
}}</span>
</div>
<!-- 端口-->
<div class="card-content-item">
<span class="card-content-item-title">端口:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.port
}}</span>
</div>
<!--模式-->
<div class="card-content-item">
<span class="card-content-item-title">类型:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.type
}}</span>
</div>
<!-- 数据库名称-->
<div class="card-content-item">
<span class="card-content-item-title">数据库名称:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.dbName
}}</span>
</div>
<!-- 用户名-->
<div class="card-content-item">
<span class="card-content-item-title">用户名:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.username
}}</span>
</div>
<!-- 密码-->
<div class="card-content-item">
<span class="card-content-item-title">密码:</span>
<span class="card-content-item-value">{{
tenantInitCheckResult.datasource.password
}}</span>
</div>
</div>
</div>
</el-col>
</el-row>
<!-- spinner -->
<el-row v-if="loading" justify="center">
<el-col :span="1.5">
<div class="btn-loading">
<el-icon size="80">
<refresh />
</el-icon>
</div>
</el-col>
</el-row>
<div v-else class="steps-content">
<div v-if="activeStep === 0" class="start-step">
<el-row justify="center">
<el-col :span="1.5">
<div class="circle-button" @click="initTenant">开始</div>
</el-col>
</el-row>
</div>
<div v-else-if="activeStep === 1">
<el-row justify="center">
<el-col :span="1.5">
<div
v-if="currentStepStatus === 0"
class="circle-button error"
@click="router.push({ path: '/tenant/tenant' })"
>
关闭
</div>
<div
v-else-if="currentStepStatus === 2"
class="circle-button"
@click="initTenant"
>
创建库
</div>
</el-col>
</el-row>
</div>
<template v-else-if="activeStep === 2">
<el-row justify="center">
<el-col :span="1.5">
<div
v-if="currentStepStatus === 0"
class="circle-button error"
@click="router.push({ path: '/tenant/tenant' })"
>
关闭
</div>
<div
v-else-if="currentStepStatus === 2"
class="circle-button"
@click="initTenant"
>
<span>导入数据</span>
</div>
</el-col>
</el-row>
</template>
<template v-else-if="activeStep === 3">
<el-row justify="center">
<el-col :span="1.5">
<div
v-if="currentStepStatus === 0"
class="circle-button error"
@click="router.push({ path: '/tenant/tenant' })"
>
关闭
</div>
<div
v-else-if="currentStepStatus === 2"
class="circle-button finish"
@click="router.push({ path: '/tenant/tenant' })"
>
完成
</div>
</el-col>
</el-row>
</template>
</div>
</div>
</template>
<script setup>
import { onMounted, reactive, ref, toRefs, watchEffect } from "vue";
import {
check,
createTables,
initCompleted,
initData,
} from "@/api/tenant/init";
import { useRoute, useRouter } from "vue-router";
import { tenant_mode_dict } from "@/constant/dict";
import { Refresh } from "@element-plus/icons-vue";
const route = useRoute();
const router = useRouter();
const activeStep = ref(0);
const currentStepStatus = ref(1); // 0: error 1: process 2: finish
const tenantId = ref(undefined);
const loading = ref(false);
if (route.query.id) {
tenantId.value = route.query.id;
} else {
router.push({ path: "/tenant/tenant" });
}
const data = reactive({
tenantInitCheckResult: {},
createTablesResult: {},
initDataResult: {},
});
const { tenantInitCheckResult, createTablesResult, initDataResult } =
toRefs(data);
const initTenant = async () => {
loading.value = true;
const promiseList = [tenantInitCheck, createDatabase, importData];
for (const promise of promiseList.slice(activeStep.value)) {
try {
await promise();
} catch (e) {
loading.value = false;
break;
}
}
loading.value = false;
};
const tenantInitCheck = () => {
activeStep.value = 1;
currentStepStatus.value = 1;
return check(tenantId.value)
.catch(() => {
currentStepStatus.value = 2;
activeStep.value = 0;
throw new Error("租户初始化检查失败");
})
.then((resp) => {
tenantInitCheckResult.value = resp;
if (resp.result === 200) {
currentStepStatus.value = 2;
} else {
currentStepStatus.value = 0;
throw new Error("租户初始化检查失败");
}
});
};
// 第二步: 创建数据库
const createDatabase = () => {
// loading.value = true;
activeStep.value = 2;
currentStepStatus.value = 1;
return createTables(tenantId.value)
.catch(() => {
currentStepStatus.value = 2;
activeStep.value = 1;
throw new Error("创建数据库失败");
})
.then((resp) => {
createTablesResult.value = resp;
if (resp.result === 200) {
currentStepStatus.value = 2;
} else {
currentStepStatus.value = 0;
throw new Error("创建数据库失败");
}
});
};
// 第三步,导入数据
const importData = () => {
// loading.value = true;
activeStep.value = 3;
currentStepStatus.value = 1;
return initData(tenantId.value)
.catch(() => {
currentStepStatus.value = 2;
activeStep.value = 2;
throw new Error("导入数据失败");
})
.then((resp) => {
initDataResult.value = resp;
if (resp.result === 200) {
currentStepStatus.value = 2;
initCompleted(tenantId.value);
} else {
currentStepStatus.value = 0;
throw new Error("导入数据失败");
}
});
};
onMounted(() => {
watchEffect(() => {
let progressLineWidth =
(activeStep.value - 1) * 100 +
Math.abs(currentStepStatus.value - 1) * 30 +
70;
progressLineWidth = progressLineWidth < 100 ? 0 : progressLineWidth;
let progressLineColor;
if (currentStepStatus.value === 0) {
const percent = ((activeStep.value - 1) / activeStep.value) * 100;
progressLineColor = `linear-gradient(to right, #67c23a ${percent}%, #f56c6c ${percent}%)`;
// 进度条颜色
} else {
progressLineColor = `linear-gradient(to right, #67c23a ${100}%, #f56c6c ${100}%)`;
}
document
.querySelector(".app-container")
.style.setProperty("--progress-line-color", progressLineColor);
document
.querySelector(".app-container")
.style.setProperty("--progress-line-width", progressLineWidth + "%");
});
});
</script>
<style lang="scss" scoped>
:deep(.init-steps) {
margin-top: 120px;
.el-step__icon {
z-index: 9999;
}
.el-step:first-child {
.el-step__head.is-success {
.el-step__line::before {
content: "";
display: block;
position: absolute;
left: 12px;
top: 0;
height: 2px;
width: var(--progress-line-width);
z-index: 99;
background: var(--progress-line-color);
transition: all 1s linear;
}
.el-step__line::after {
content: "";
display: block;
position: absolute;
left: calc(var(--progress-line-width) - 7px);
top: -6px;
width: 14px;
height: 14px;
transition: all 1s linear;
border-radius: 50%;
z-index: 99;
background: var(--progress-line-color);
}
}
}
}
.steps-content {
margin-top: 80px;
padding: 0 60px;
.start-step {
}
.check-step {
display: flex;
}
}
.btn-loading {
margin-top: 80px;
width: 100px;
height: 100px;
border-radius: 50%;
background-color: #4a5dff;
display: flex;
justify-content: center;
align-items: center;
.el-icon {
animation: spin 1s linear infinite;
color: white;
}
}
.circle-button {
width: 100px;
height: 100px;
border-radius: 50%;
background-color: #4a5dff;
color: #fff;
text-align: center;
line-height: 100px;
cursor: pointer;
box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.2);
user-select: none;
&:hover {
background-color: #66b1ff;
}
// 按钮按下时
&:active {
background-color: #3a8ee6;
box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.2) inset;
}
&.error {
background-color: #f56c6c;
&:hover {
background-color: #f78989;
}
&:active {
background-color: #f56c6c;
box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.2) inset;
}
}
&.finish {
background-color: #67c23a;
&:hover {
background-color: #85ce61;
}
&:active {
background-color: #67c23a;
box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.2) inset;
}
}
}
.data-card {
width: 100%;
height: 100%;
background-color: #fff;
border-radius: 4px;
border: 1px solid #ebeef5;
min-height: 120px;
position: relative;
padding: 16px;
.card-title {
position: absolute;
top: -10px;
left: 10px;
background-color: #fff;
//禁止选中
user-select: none;
// 水平方向padding 10px
padding: 0 5px;
font-size: 12px;
// 浅灰色字体
color: #606266;
border-radius: 12px;
}
.card-content {
display: flex;
flex-direction: column;
justify-content: start;
height: 100%;
.card-content-item {
display: flex;
justify-content: space-between;
&:not(:last-child) {
margin-bottom: 10px;
}
}
.card-content-item-title {
font-size: 14px;
font-weight: 500;
color: #606266;
}
.card-content-item-value {
font-size: 14px;
color: #909399;
}
}
}
@keyframes spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
:deep(.el-step__head.is-success) {
transition: all 1s linear;
}
:deep(.el-step__title) {
font-size: 20px;
}
</style>