:tada: 2.0.3.RELEASE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "saber-admin",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/api/system/dept.js

@@ -46,12 +46,12 @@ export const getDept = (id) => {
     }
   })
 }
-export const getDeptTree = (tenantCode) => {
+export const getDeptTree = (tenantId) => {
   return request({
     url: '/api/blade-system/dept/tree',
     method: 'get',
     params: {
-      tenantCode,
+      tenantId,
     }
   })
 }

src/api/system/role.js

@@ -66,12 +66,12 @@ export const getRole = (roleIds) => {
   })
 }
 
-export const getRoleTree = (tenantCode) => {
+export const getRoleTree = (tenantId) => {
   return request({
     url: '/api/blade-system/role/tree',
     method: 'get',
     params: {
-      tenantCode,
+      tenantId,
     }
   })
 }

src/api/user.js

@@ -1,14 +1,14 @@
 import request from '@/router/axios';
 import { baseUrl } from '@/config/env';
 
-export const loginByUsername = (tenantCode, username, password, type) => request({
+export const loginByUsername = (tenantId, username, password, type) => request({
   url: '/api/blade-auth/oauth/token',
   method: 'post',
   headers: {
-    'Tenant-Code': tenantCode
+    'Tenant-Code': tenantId
   },
   params: {
-    tenantCode,
+    tenantId,
     username,
     password,
     grant_type: "password",

src/lang/en.js

@@ -66,7 +66,7 @@ export default {
   login: {
     title: 'Login ',
     info: 'Enterprise Development Platform',
-    tenantCode: 'Please input tenantCode',
+    tenantId: 'Please input tenantId',
     username: 'Please input username',
     password: 'Please input a password',
     wechat: 'Wechat',

src/lang/zh.js

@@ -66,7 +66,7 @@ export default {
   login: {
     title: '登录 ',
     info: 'BladeX 企业级开发平台',
-    tenantCode: '请输入租户编号',
+    tenantId: '请输入租户ID',
     username: '请输入账号',
     password: '请输入密码',
     wechat: '微信',

src/page/login/userlogin.vue

@@ -5,12 +5,12 @@
            ref="loginForm"
            :model="loginForm"
            label-width="0">
-    <el-form-item v-if="tenantMode" prop="tenantCode">
+    <el-form-item v-if="tenantMode" prop="tenantId">
       <el-input size="small"
                 @keyup.enter.native="handleLogin"
-                v-model="loginForm.tenantCode"
+                v-model="loginForm.tenantId"
                 auto-complete="off"
-                :placeholder="$t('login.tenantCode')">
+                :placeholder="$t('login.tenantId')">
         <i slot="prefix"
            class="icon-quanxian"></i>
       </el-input>
@@ -58,14 +58,14 @@ export default {
     return {
       tenantMode: website.tenantMode,
       loginForm: {
-        tenantCode: "000000",
+        tenantId: "000000",
         username: "admin",
         password: "admin",
         type: "account"
       },
       loginRules: {
-        tenantCode: [
-          { required: false, message: "请输入租户编号", trigger: "blur" }
+        tenantId: [
+          { required: false, message: "请输入租户ID", trigger: "blur" }
         ],
         username: [
           { required: true, message: "请输入用户名", trigger: "blur" }

src/store/modules/user.js

@@ -44,7 +44,7 @@ const user = {
     //根据用户名登录
     LoginByUsername({ commit }, userInfo) {
       return new Promise((resolve) => {
-        loginByUsername(userInfo.tenantCode, userInfo.username, userInfo.password, userInfo.type).then(res => {
+        loginByUsername(userInfo.tenantId, userInfo.username, userInfo.password, userInfo.type).then(res => {
           const data = res.data;
           if (data.error_description) {
             Message({

src/views/system/dept.vue

@@ -70,7 +70,7 @@
             },
             {
               label: "所属租户",
-              prop: "tenantCode",
+              prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
               addDisplay: false,
@@ -79,7 +79,7 @@
               span: 24,
               props: {
                 label: "tenantName",
-                value: "tenantCode"
+                value: "tenantId"
               },
               hide: !website.tenantMode,
               search: website.tenantMode,

src/views/system/role.vue

@@ -105,7 +105,7 @@ export default {
           },
           {
             label: "所属租户",
-            prop: "tenantCode",
+            prop: "tenantId",
             type: "tree",
             dicUrl: "/api/blade-system/tenant/select",
             addDisplay: false,
@@ -114,7 +114,7 @@ export default {
             span: 24,
             props: {
               label: "tenantName",
-              value: "tenantCode"
+              value: "tenantId"
             },
             hide: !website.tenantMode,
             search: website.tenantMode,

src/views/system/tenant.vue

@@ -52,15 +52,15 @@
           dialogHeight: 400,
           column: [
             {
-              label: "租户编号",
-              prop: "tenantCode",
+              label: "租户ID",
+              prop: "tenantId",
               search: true,
               addDisplay: false,
               editDisplay: false,
               span: 24,
               rules: [{
                 required: true,
-                message: "请输入租户编号",
+                message: "请输入租户ID",
                 trigger: "blur"
               }]
             },

src/views/system/user.vue

@@ -109,12 +109,12 @@
             },
             {
               label: "所属租户",
-              prop: "tenantCode",
+              prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
               props: {
                 label: "tenantName",
-                value: "tenantCode"
+                value: "tenantId"
               },
               hide: !website.tenantMode,
               addDisplay: website.tenantMode,
@@ -245,13 +245,13 @@
       };
     },
     watch: {
-      'form.tenantCode'() {
-        if (this.form.tenantCode !== '') {
-          getDeptTree(this.form.tenantCode).then(res => {
+      'form.tenantId'() {
+        if (this.form.tenantId !== '') {
+          getDeptTree(this.form.tenantId).then(res => {
             const index = this.$refs.crud.findColumnIndex("deptId");
             this.option.column[index].dicData = res.data.data;
           });
-          getRoleTree(this.form.tenantCode).then(res => {
+          getRoleTree(this.form.tenantId).then(res => {
             const index = this.$refs.crud.findColumnIndex("roleId");
             this.option.column[index].dicData = res.data.data;
           });
@@ -404,11 +404,11 @@
           this.page.total = data.total;
           this.data = data.records;
         });
-        getDeptTree(this.form.tenantCode).then(res => {
+        getDeptTree(this.form.tenantId).then(res => {
           const index = this.$refs.crud.findColumnIndex("deptId");
           this.option.column[index].dicData = res.data.data;
         });
-        getRoleTree(this.form.tenantCode).then(res => {
+        getRoleTree(this.form.tenantId).then(res => {
           const index = this.$refs.crud.findColumnIndex("roleId");
           this.option.column[index].dicData = res.data.data;
         });