🎉 2.4.0.RELEASE

README.md

@@ -1,7 +1,7 @@
  <p align="center">
   <img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
-   <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR1-blue.svg" alt="Coverage Status">
+   <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
-   <img src="https://img.shields.io/badge/Spring%20Boot-2.1.5.RELEASE-blue.svg" alt="Downloads">
+   <img src="https://img.shields.io/badge/Spring%20Boot-2.1.6.RELEASE-blue.svg" alt="Downloads">
  </p>  
 
 ## SpringBlade微服务开发平台
@@ -68,6 +68,16 @@ SpringBlade
 * 禁止直接将本项目挂淘宝等商业平台出售。
 * 非界面代码50%以上相似度的二次开源，二次开源需先联系作者。
 
+## 如何启动
+```
+$ git clone https://gitee.com/smallc/Saber.git
+$ cd Saber
+# 安装
+$ yarn install
+# 启动
+$ yarn run serve     
+```
+
 # 界面
 
 ## [BladeX](https://bladex.vip/#/vip) 工作流一览

package.json

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

src/App.vue

@@ -21,7 +21,7 @@ export default {
         '<p>若要商用强烈推荐高度定制的商业化框架，具体授权信息请访问如下地址。️</p>' +
         '</br>' +
         '<p>BladeX 授权地址：<a target="_blank" href="https://bladex.vip/#/vip">点击授权</a></p>' +
-        '<p>AvueX 授权地址：<a target="_blank" href="https://avuex.avue.top/#/vip">点击授权</a></p>',
+        '<p>AvueX 授权地址：<a target="_blank" href="https://avue.top/vip">点击授权</a></p>',
       duration: 20000,
       type: "success"
     });

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,11 +1,11 @@
 import request from '@/router/axios';
 import {baseUrl} from '@/config/env';
 
-export const loginByUsername = (tenantCode, account, password, type) => request({
+export const loginByUsername = (tenantId, account, password, type) => request({
   url: '/api/blade-auth/token',
   method: 'post',
   params: {
-    tenantCode,
+    tenantId,
     account,
     password,
     type

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: '企业级开发平台',
-    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 @@
       return {
         tenantMode: website.tenantMode,
         loginForm: {
-          tenantCode: "000000",
+          tenantId: "000000",
           username: "admin",
           password: "admin",
           type: "account"
         },
         loginRules: {
-          tenantCode: [
+          tenantId: [
-            { required: false, message: "请输入租户编号", trigger: "blur" }
+            { required: false, message: "请输入租户ID", trigger: "blur" }
           ],
           username: [
             { required: true, message: "请输入用户名", trigger: "blur" }

src/store/modules/user.js

@@ -41,7 +41,7 @@ const user = {
         //根据用户名登录
         LoginByUsername({ commit }, userInfo) {
             return new Promise((resolve, reject) => {
-                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.data;
                     commit('SET_TOKEN', data.accessToken);
                     commit('SET_USERIFNO', data);

src/views/system/dept.vue

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

src/views/system/role.vue

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

src/views/system/tenant.vue

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

src/views/system/user.vue

@@ -110,12 +110,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,
@@ -246,13 +246,13 @@
       };
     },
     watch: {
-      'form.tenantCode'() {
+      'form.tenantId'() {
-        if (this.form.tenantCode !== '') {
+        if (this.form.tenantId !== '') {
-          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;
           });
@@ -407,11 +407,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;
         });