租户基础信息和登录改造

package.json

@@ -100,7 +100,9 @@
     "image-conversion": "^2.1.1",
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
+    "js-yaml": "^4.1.1",
     "jsencrypt": "3.0.0-rc.1",
+    "monaco-editor": "^0.55.1",
     "nprogress": "0.2.0",
     "qrcodejs2": "0.0.2",
     "quill": "1.3.7",
@@ -115,6 +117,7 @@
     "vue-jsonp": "^2.0.0",
     "vue-meta": "^2.4.0",
     "vue-mobile-calendar": "^3.3.0",
+    "vue-monaco": "^1.2.2",
     "vue-router": "3.4.9",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.0",

src/api/login.js

@@ -1,12 +1,13 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid,tenantCode) {
   const data = {
     username,
     password,
     code,
-    uuid
+    uuid,
+    tenantCode
   }
   return request({
     url: '/login',
@@ -68,12 +69,13 @@ export function checkWechatScan(ticket) {
   })
 }
 
-export function checkIsNeedCheck(username, password, code, uuid) {
+export function checkIsNeedCheck(username, password, code, uuid, tenantCode) {
   const data = {
     username,
     password,
     code,
-    uuid
+    uuid,
+    tenantCode
   }
   return request({
     url: '/checkIsNeedCheck',

src/api/tenant/tenant.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询租户基础信息列表
+export function listTenant(query) {
+  return request({
+    url: '/tenant/tenant/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询租户基础信息详细
+export function getTenant(id) {
+  return request({
+    url: '/tenant/tenant/' + id,
+    method: 'get'
+  })
+}
+
+// 新增租户基础信息
+export function addTenant(data) {
+  return request({
+    url: '/tenant/tenant',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改租户基础信息
+export function updateTenant(data) {
+  return request({
+    url: '/tenant/tenant',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除租户基础信息
+export function delTenant(id) {
+  return request({
+    url: '/tenant/tenant/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出租户基础信息
+export function exportTenant(query) {
+  return request({
+    url: '/tenant/tenant/export',
+    method: 'get',
+    params: query
+  })
+}

src/store/modules/user.js

@@ -47,12 +47,13 @@ const user = {
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
+      const tenantCode = userInfo.tenantCode;
       return new Promise((resolve, reject) => {
-        checkIsNeedCheck(username,password,code,uuid).then(resp => {
+        checkIsNeedCheck(username,password,code,uuid,tenantCode).then(resp => {
           console.log("检查是否需要验证", resp)
           if (!resp){
             // 不需要短信验证，直接登录
-            login(username, password, code, uuid).then(res => {
+            login(username, password, code, uuid,tenantCode).then(res => {
               setToken(res.token)
               commit('SET_TOKEN', res.token)
               resolve({needSms: false})

src/views/login.vue

@@ -15,6 +15,11 @@
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <div class="title">{{vueAppTitle}}</div>
         <div class="title-line"></div>
+        <el-form-item prop="tenantCode">
+          <el-input v-model="loginForm.tenantCode" type="text" auto-complete="off" placeholder="企业名称" class="tenantCode" >
+            <img slot="prefix" src="../assets/images/user.png" class="input-icon "/>
+          </el-input>
+        </el-form-item>
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号" class="username" >
             <img slot="prefix" src="../assets/images/user.png" class="input-icon "/>
@@ -107,9 +112,13 @@ export default {
         password: "",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
+        tenantCode: "",
       },
       loginRules: {
+        tenantCode: [
+          { required: true, trigger: "blur", message: "企业名称不能为空" }
+        ],
         username: [
           { required: true, trigger: "blur", message: "用户名不能为空" }
         ],
@@ -170,10 +179,12 @@ export default {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
             Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
             Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set('tenantCode', this.loginForm.tenantCode, { expires: 30 });
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
             Cookies.remove('rememberMe');
+            Cookies.remove('tenantCode');
           }
           this.$store
             .dispatch("Login", this.loginForm)

src/views/saas/tenant/config/index.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="项目配置" name="projectConfig">
+        <div class="monaco-block">
+          <!-- ⭐ 高度控制容器 -->
+          <div class="monaco-wrapper">
+            <monaco-editor
+              ref="wxEditor"
+              v-model="projectYaml"
+              language="yaml"
+              theme="vs-dark"
+              :options="monacoOptions"
+            />
+          </div>
+
+          <div class="footer">
+            <el-button type="primary" @click="submitProject">
+              保存
+            </el-button>
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import {getConfigByKey, updateConfigByKey} from '@/api/system/config';
+import yaml from "js-yaml";
+import MonacoEditor from "vue-monaco";
+
+export default {
+  name: "ProjectConfigPage",
+
+  components: {
+    MonacoEditor
+  },
+
+  data() {
+    return {
+      activeName: "projectConfig",
+      projectYaml: "",
+      tenantId: null,
+      monacoOptions: {
+        automaticLayout: true,
+        minimap: { enabled: false },
+        fontSize: 14,
+        tabSize: 2,
+        scrollBeyondLastLine: true,
+        padding: {
+          bottom: 40
+        }
+      },
+      configId: null,
+    };
+  },
+
+  created() {
+    this.loadConfig(this.activeName);
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    loadConfig(key) {
+      getConfigByKey(key).then(response => {
+        if (!response.data) {
+          this.configId = null;
+          this.projectYaml = '';
+          return;
+        }
+
+        const data = response.data;
+        this.configId = data.configId;
+
+        // JSON.parse 将 JSON 字符串变对象，再用 yaml.dump 转 YAML 字符串
+        const obj = JSON.parse(data.configValue);
+        this.projectYaml = yaml.dump(obj);
+      });
+    },
+
+    /** Tab 切换时强制 layout */
+    handleClick(tab) {
+      if (tab.name === "projectConfig") {
+        this.$nextTick(() => {
+          const editor = this.$refs.wxEditor?.editor;
+          editor && editor.layout();
+        });
+      }
+    },
+
+    submitProject() {
+      try {
+        const json = yaml.load(this.projectYaml);
+        if (!json || typeof json !== "object") {
+          throw new Error("配置必须是对象");
+        }
+        const param = { configId: this.configId, configKey: this.activeName, configValue: JSON.stringify(json) }
+
+        updateConfigByKey(param).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess('修改成功')
+          }
+        })
+      } catch (e) {
+        this.$message.error("YAML 格式错误：" + e.message);
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.monaco-block {
+  margin-top: 10px;
+}
+
+/* ⭐ 关键高度容器 */
+.monaco-wrapper {
+  height: 600px;
+  width: 100%;
+  border: 1px solid #ebeef5;
+}
+
+/* ⭐ 强制 vue-monaco 根节点撑满高度 */
+.monaco-wrapper > div {
+  height: 100% !important;
+}
+
+/* 底部按钮 */
+.footer {
+  margin-top: 16px;
+  text-align: right;
+}
+</style>

src/views/saas/tenant/index.vue

@@ -0,0 +1,368 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="租户编码" prop="tenantCode">
+        <el-input
+          v-model="queryParams.tenantCode"
+          placeholder="请输入租户编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="租户名称" prop="tenantName">
+        <el-input
+          v-model="queryParams.tenantName"
+          placeholder="请输入租户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态：" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态：1-启用，0-禁用" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['tenant:tenant:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['tenant:tenant:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['tenant:tenant:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['tenant:tenant:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="租户唯一ID" align="center" prop="id" />
+      <el-table-column label="租户编码" align="center" prop="tenantCode" />
+      <el-table-column label="租户名称" align="center" prop="tenantName" />
+      <el-table-column label="状态：" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="租户有效期" align="center" prop="expireTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="数据库连接地址" align="center" prop="dbUrl" />
+      <el-table-column label="数据库帐号" align="center" prop="dbAccount" />
+      <el-table-column label="数据库密码" align="center" prop="dbPwd" />
+      <el-table-column label="联系电话" align="center" prop="contactPhone" />
+      <el-table-column label="联系人" align="center" prop="contactName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['tenant:tenant:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['tenant:tenant:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改租户基础信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="租户编码" prop="tenantCode">
+          <el-input v-model="form.tenantCode" placeholder="请输入租户编码" />
+        </el-form-item>
+        <el-form-item label="租户名称" prop="tenantName">
+          <el-input v-model="form.tenantName" placeholder="请输入租户名称" />
+        </el-form-item>
+        <el-form-item label="状态：">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="parseInt(dict.dictValue)"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="租户有效期" prop="expireTime">
+          <el-date-picker clearable size="small"
+                          v-model="form.expireTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择租户有效期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="数据库连接地址" prop="dbUrl">
+          <el-input v-model="form.dbUrl" placeholder="请输入数据库连接地址" />
+        </el-form-item>
+        <el-form-item label="数据库帐号" prop="dbAccount">
+          <el-input v-model="form.dbAccount" placeholder="请输入数据库帐号" />
+        </el-form-item>
+        <el-form-item label="数据库密码" prop="dbPwd">
+          <el-input v-model="form.dbPwd" placeholder="请输入数据库密码" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactPhone">
+          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactName">
+          <el-input v-model="form.contactName" placeholder="请输入联系人" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTenant, getTenant, delTenant, addTenant, updateTenant, exportTenant } from "@/api/tenant/tenant";
+
+export default {
+  name: "Tenant",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 租户基础信息表格数据
+      tenantList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态：1-启用，0-禁用字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tenantCode: null,
+        tenantName: null,
+        status: null,
+        expireTime: null,
+        dbUrl: null,
+        dbAccount: null,
+        dbPwd: null,
+        contactPhone: null,
+        contactName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        tenantCode: [
+          { required: true, message: "租户编码不能为空", trigger: "blur" }
+        ],
+        tenantName: [
+          { required: true, message: "租户名称不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态：1-启用，0-禁用不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("tenant_info_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询租户基础信息列表 */
+    getList() {
+      this.loading = true;
+      listTenant(this.queryParams).then(response => {
+        this.tenantList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tenantCode: null,
+        tenantName: null,
+        status: 0,
+        expireTime: null,
+        dbUrl: null,
+        dbAccount: null,
+        dbPwd: null,
+        createTime: null,
+        updateTime: null,
+        contactPhone: null,
+        contactName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加租户基础信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTenant(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改租户基础信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTenant(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTenant(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除租户基础信息编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delTenant(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有租户基础信息数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportTenant(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>