diff --git a/README.md b/README.md index d11f56f..be6132b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Build Status - Coverage Status - Downloads + Coverage Status + Downloads

## 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) 工作流一览 diff --git a/package.json b/package.json index a4709f0..3172066 100644 --- a/package.json +++ b/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", diff --git a/src/App.vue b/src/App.vue index cdf942f..0a9d543 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ export default { '

若要商用强烈推荐高度定制的商业化框架，具体授权信息请访问如下地址。️

' + '
' + '

BladeX 授权地址：点击授权

' + - '

AvueX 授权地址：点击授权

', + '

AvueX 授权地址：点击授权

', duration: 20000, type: "success" }); diff --git a/src/api/system/dept.js b/src/api/system/dept.js index df1a538..4cc2d4e 100644 --- a/src/api/system/dept.js +++ b/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, } }) } diff --git a/src/api/system/role.js b/src/api/system/role.js index b4773ed..2e677c5 100644 --- a/src/api/system/role.js +++ b/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, } }) } diff --git a/src/api/user.js b/src/api/user.js index 2bf81d4..9dda3d1 100644 --- a/src/api/user.js +++ b/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 diff --git a/src/lang/en.js b/src/lang/en.js index 99df88f..98ff77f 100644 --- a/src/lang/en.js +++ b/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', diff --git a/src/lang/zh.js b/src/lang/zh.js index a2bd366..f0aa8bb 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -66,7 +66,7 @@ export default { login: { title: '登录 ', info: '企业级开发平台', - tenantCode: '请输入租户编号', + tenantId: '请输入租户ID', username: '请输入账号', password: '请输入密码', wechat: '微信', diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 792b464..61495c2 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -5,12 +5,12 @@ ref="loginForm" :model="loginForm" label-width="0"> - + + :placeholder="$t('login.tenantId')"> @@ -58,14 +58,14 @@ 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" } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 420eee4..5a6d290 100644 --- a/src/store/modules/user.js +++ b/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); diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index f33d3ad..6aef652 100644 --- a/src/views/system/dept.vue +++ b/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, diff --git a/src/views/system/role.vue b/src/views/system/role.vue index c199756..1ca5709 100644 --- a/src/views/system/role.vue +++ b/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, diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue index e1296ee..82e7c0e 100644 --- a/src/views/system/tenant.vue +++ b/src/views/system/tenant.vue @@ -53,15 +53,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" }] }, diff --git a/src/views/system/user.vue b/src/views/system/user.vue index bb23899..df808c1 100644 --- a/src/views/system/user.vue +++ b/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'() { - 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; }); @@ -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; });