!84 租户优化

YunaiV · gitee-org · commit d0613987d5b9 · 2022-02-26T18:44:39.000Z
Merge pull request !84 from 芋道源码/feature/tenant_op
diff --git a/.env.development b/.env.development
@@ -10,3 +10,6 @@ VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
diff --git a/src/api/system/tenantPackage.js b/src/api/system/tenantPackage.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建租户套餐
+export function createTenantPackage(data) {
+  return request({
+    url: '/system/tenant-package/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新租户套餐
+export function updateTenantPackage(data) {
+  return request({
+    url: '/system/tenant-package/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除租户套餐
+export function deleteTenantPackage(id) {
+  return request({
+    url: '/system/tenant-package/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得租户套餐
+export function getTenantPackage(id) {
+  return request({
+    url: '/system/tenant-package/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得租户套餐分页
+export function getTenantPackagePage(query) {
+  return request({
+    url: '/system/tenant-package/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取租户套餐精简信息列表
+export function getTenantPackageList() {
+  return request({
+    url: '/system/tenant-package/get-simple-list',
+    method: 'get'
+  })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
@@ -4,6 +4,7 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import Cookies from "js-cookie";
+import {getTenantEnable} from "@/utils/ruoyi";
 
 // 是否显示重新登录
 let isReloginShow;
@@ -24,9 +25,11 @@ service.interceptors.request.use(config => {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // 设置租户
-  const tenantId = Cookies.get('tenantId');
-  if (tenantId) {
-    config.headers['tenant-id'] = tenantId;
+  if (getTenantEnable()) {
+    const tenantId = Cookies.get('tenantId');
+    if (tenantId) {
+      config.headers['tenant-id'] = tenantId;
+    }
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
@@ -170,3 +170,17 @@ export function getNowDateTime(timeStr) {
   let seconds = now.getSeconds().toString().padStart(2, "0") // 得到秒;
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
+
+/**
+ * 获得租户功能是否开启
+ */
+export function getTenantEnable() {
+  console.log("enable: " + process.env.VUE_APP_TENANT_ENABLE)
+  if (process.env.VUE_APP_TENANT_ENABLE === "true") {
+    return true;
+  }
+  if (process.env.VUE_APP_TENANT_ENABLE === "false") {
+    return false;
+  }
+  return process.env.VUE_APP_TENANT_ENABLE || true;
+}
diff --git a/src/views/login.vue b/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">芋道后台管理系统</h3>
-      <el-form-item prop="tenantName">
+      <el-form-item prop="tenantName" v-if="tenantEnable">
         <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
           <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon" />
         </el-input>
@@ -54,14 +54,16 @@ import { getCodeImg,socialAuthRedirect } from "@/api/login";
 import { getTenantIdByName } from "@/api/system/tenant";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import {InfraApiErrorLogProcessStatusEnum, SystemUserSocialTypeEnum} from "@/utils/constants";
+import {SystemUserSocialTypeEnum} from "@/utils/constants";
+import { getTenantEnable } from "@/utils/ruoyi";
 
 export default {
   name: "Login",
   data() {
     return {
       codeUrl: "",
       captchaEnable: true,
+      tenantEnable: true,
       loginForm: {
         username: "admin",
         password: "admin123",
@@ -71,6 +73,13 @@ export default {
         tenantName: "芋道源码",
       },
       loginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "用户名不能为空" }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "密码不能为空" }
+        ],
+        code: [{ required: true, trigger: "change", message: "验证码不能为空" }],
         tenantName: [
           { required: true, trigger: "blur", message: "租户不能为空" },
           {
@@ -90,13 +99,6 @@ export default {
             trigger: 'blur'
           }
         ],
-        username: [
-          { required: true, trigger: "blur", message: "用户名不能为空" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "密码不能为空" }
-        ],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
       },
       loading: false,
       redirect: undefined,
@@ -113,6 +115,8 @@ export default {
   //   }
   // },
   created() {
+    // 租户开关
+    this.tenantEnable = getTenantEnable();
     // 重定向地址
     this.redirect = this.$route.query.redirect;
     this.getCode();
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
@@ -57,7 +57,7 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
+          <el-col :span="24">
             <el-form-item label="上级部门" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
             </el-form-item>
@@ -152,9 +152,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],
@@ -278,6 +275,9 @@ export default {
       this.reset();
       getDept(row.id).then(response => {
         this.form = response.data;
+        if (this.form.parentId === 0) { // 无父部门时，标记为 undefined，避免展示为 Unknown
+          this.form.parentId = undefined;
+        }
         this.open = true;
         this.title = "修改部门";
       });
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
@@ -149,16 +149,8 @@
         <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-tree
-              class="tree-border"
-              :data="menuOptions"
-              show-checkbox
-              ref="menu"
-              node-key="id"
-              :check-strictly="form.menuCheckStrictly"
-              empty-text="加载中，请稍后"
-              :props="defaultProps"
-          ></el-tree>
+          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id"
+              :check-strictly="form.menuCheckStrictly" empty-text="加载中，请稍后" :props="defaultProps"></el-tree>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
@@ -18,10 +18,6 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRangeCreateTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -45,8 +41,25 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="租户编号" align="center" prop="id" />
       <el-table-column label="租户名" align="center" prop="name" />
+      <el-table-column label="租户套餐" align="center" prop="packageId">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
+          <el-tag v-else> {{getPackageName(scope.row.packageId)}} </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="联系人" align="center" prop="contactName" />
       <el-table-column label="联系手机" align="center" prop="contactMobile" />
+      <el-table-column label="账号额度" align="center" prop="accountCount">
+        <template slot-scope="scope">
+          <el-tag> {{scope.row.accountCount}} </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expireTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
       <el-table-column label="租户状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
@@ -76,12 +89,33 @@
         <el-form-item label="租户名" prop="name">
           <el-input v-model="form.name" placeholder="请输入租户名" />
         </el-form-item>
+        <el-form-item label="租户套餐" prop="packageId">
+          <el-select v-model="form.packageId" placeholder="请选择租户套餐" clearable size="small">
+            <el-option v-for="item in packageList" :key="item.id" :label="item.name" :value="item.id"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="联系人" prop="contactName">
           <el-input v-model="form.contactName" placeholder="请输入联系人" />
         </el-form-item>
         <el-form-item label="联系手机" prop="contactMobile">
           <el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
         </el-form-item>
+        <el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
+          <el-input v-model="form.username" placeholder="请输入用户名称" />
+        </el-form-item>
+        <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
+        </el-form-item>
+        <el-form-item label="账号额度" prop="accountCount">
+          <el-input-number v-model="form.accountCount" placeholder="请输入账号额度" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="过期时间" prop="expireTime">
+          <el-date-picker clearable size="small" v-model="form.expireTime" type="date"
+                          value-format="timestamp" 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="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
@@ -100,6 +134,7 @@
 <script>
 import { createTenant, updateTenant, deleteTenant, getTenant, getTenantPage, exportTenantExcel } from "@/api/system/tenant";
 import { CommonStatusEnum } from '@/utils/constants'
+import {getTenantPackageList} from "@/api/system/tenantPackage";
 
 export default {
   name: "Tenant",
@@ -117,6 +152,8 @@ export default {
       total: 0,
       // 租户列表
       list: [],
+      // 租户套餐列表
+      packageList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -136,13 +173,23 @@ export default {
       // 表单校验
       rules: {
         name: [{ required: true, message: "租户名不能为空", trigger: "blur" }],
+        packageId: [{ required: true, message: "租户套餐不能为空", trigger: "blur" }],
         contactName: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
-        status: [{ required: true, message: "租户状态（0正常 1停用）不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "租户状态不能为空", trigger: "blur" }],
+        accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
+        expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
+        domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
+        username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
+        password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
       }
     };
   },
   created() {
     this.getList();
+    // 获得租户套餐列表
+    getTenantPackageList().then(response => {
+      this.packageList = response.data;
+    })
   },
   methods: {
     /** 查询列表 */
@@ -168,8 +215,12 @@ export default {
       this.form = {
         id: undefined,
         name: undefined,
+        packageId: undefined,
         contactName: undefined,
         contactMobile: undefined,
+        accountCount: undefined,
+        expireTime: undefined,
+        domain: undefined,
         status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");
@@ -249,6 +300,15 @@ export default {
           this.$download.excel(response, '租户.xls');
           this.exportLoading = false;
       }).catch(() => {});
+    },
+    /** 套餐名格式化 */
+    getPackageName(packageId) {
+      for (const item of this.packageList) {
+        if (item.id === packageId) {
+          return item.name;
+        }
+      }
+      return '未知套餐';
     }
   }
 };
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
