mirror of
https://github.com/chillzhuang/Saber.git
synced 2025-04-04 03:57:16 +08:00
🎉 4.5.0.RELEASE 新增账号锁定与解锁功能，新增腾讯云对象存储支持
This commit is contained in:
smallchill
parent
5f22a5a288
commit
3f7deefd53
30
README.md
30
README.md
@ -1,5 +1,5 @@
|
||||
<p align="center">
|
||||
<img src="https://img.shields.io/badge/Release-V4.3.0-green.svg" alt="Downloads">
|
||||
<img src="https://img.shields.io/badge/Release-V4.5.0-green.svg" alt="Downloads">
|
||||
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
|
||||
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
|
||||
@ -33,8 +33,8 @@
|
||||
|----------------------|------------|
|
||||
| Java | 17+ |
|
||||
| NodeJS | 18+ |
|
||||
| Spring | 6.1.14 |
|
||||
| Spring Boot | 3.2.10 |
|
||||
| Spring | 6.1.15 |
|
||||
| Spring Boot | 3.2.12 |
|
||||
| Spring Cloud | 2023.0.3 |
|
||||
| Spring Cloud Alibaba | 2023.0.1.2 |
|
||||
| Nacos Alibaba | 2.3.2 |
|
||||
@ -56,8 +56,7 @@ SpringBlade
|
||||
├── blade-service -- 业务模块
|
||||
├ ├── blade-desk -- 工作台模块
|
||||
├ ├── blade-log -- 日志模块
|
||||
├ ├── blade-system -- 系统模块
|
||||
├ └── blade-user -- 用户模块
|
||||
├ └── blade-system -- 系统模块
|
||||
├── blade-service-api -- 业务模块api封装
|
||||
├ ├── blade-desk-api -- 工作台api
|
||||
├ ├── blade-dict-api -- 字典api
|
||||
@ -82,19 +81,20 @@ SpringBlade
|
||||
|
||||
## 官方产品
|
||||
|
||||
| 简介 | 演示地址 |
|
||||
|---------------|------------------------------------------------------|
|
||||
| BladeX企业级开发平台 | [https://saber3.bladex.cn](https://saber3.bladex.cn) |
|
||||
| BladeX可视化数据大屏 | [https://data.bladex.cn](https://data.bladex.cn) |
|
||||
| BladeX物联网开发平台 | [https://iot.bladex.cn](https://iot.bladex.cn) |
|
||||
| 简介 | 演示地址 |
|
||||
|-----------------|------------------------------------------------------|
|
||||
| BladeX企业级开发平台 | [https://saber3.bladex.cn](https://saber3.bladex.cn) |
|
||||
| BladeX可视化数据大屏 | [https://data.bladex.cn](https://data.bladex.cn) |
|
||||
| BladeX物联网开发平台 | [https://iot.bladex.cn](https://iot.bladex.cn) |
|
||||
| BladeXAI大模型平台 | [https://aigc.bladex.cn/](https://aigc.bladex.cn/) |
|
||||
|
||||
## 前端项目
|
||||
|
||||
| 简介 | 地址 |
|
||||
|--------------------|----------------------------------------------------------------------------------------------------|
|
||||
| 前端框架Sword(基于React) | [https://gitee.com/smallc/Sword](https://gitee.com/smallc/Sword) |
|
||||
| 前端框架Saber(基于Vue2) | [https://gitee.com/smallc/Saber](https://gitee.com/smallc/Saber) |
|
||||
| 前端框架Saber3(基于Vue3) | [https://gitee.com/smallc/Saber3](https://gitee.com/smallc/Saber/tree/3.x/) |
|
||||
| 简介 | 地址 |
|
||||
|--------------------|------------------------------------------------------------------------------|
|
||||
| 前端框架Saber3(基于Vue3) | [https://gitee.com/smallc/Saber3](https://gitee.com/smallc/Saber) |
|
||||
| 前端框架Saber(基于Vue2) | [https://gitee.com/smallc/Saber2](https://gitee.com/smallc/Saber/tree/vue2/) |
|
||||
| 前端框架Sword(基于React) | [https://gitee.com/smallc/Sword](https://gitee.com/smallc/Sword) |
|
||||
|
||||
## 后端项目
|
||||
| 简介 | 地址 |
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "saber-admin",
|
||||
"version": "4.4.0",
|
||||
"version": "4.5.0",
|
||||
"scripts": {
|
||||
"dev": "vite --host",
|
||||
"prod": "vite --mode production",
|
||||
|
||||
@ -87,3 +87,12 @@ export const updatePassword = (oldPassword, newPassword, newPassword1) => {
|
||||
})
|
||||
}
|
||||
|
||||
export const unlock = userIds => {
|
||||
return request({
|
||||
url: '/blade-system/user/unlock',
|
||||
method: 'post',
|
||||
params: {
|
||||
userIds,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@ -135,9 +135,17 @@ export default {
|
||||
handleLogin () {
|
||||
this.$refs.loginForm.validate(valid => {
|
||||
if (valid) {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '登录中,请稍后',
|
||||
background: 'rgba(0, 0, 0, 0.7)',
|
||||
});
|
||||
this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
|
||||
loading.close();
|
||||
this.$router.push(this.tagWel);
|
||||
}).catch(() => {
|
||||
loading.close();
|
||||
this.refreshCode();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import website from '@/config/website';
|
||||
import { sm2 } from 'sm-crypto';
|
||||
import smCrypto from 'sm-crypto';
|
||||
|
||||
/**
|
||||
* sm2 加密方法
|
||||
@ -8,7 +8,7 @@ import { sm2 } from 'sm-crypto';
|
||||
*/
|
||||
export function encrypt(data) {
|
||||
try {
|
||||
return sm2.doEncrypt(data, website.auth.publicKey, 0);
|
||||
return smCrypto.sm2.doEncrypt(data, website.auth.publicKey, 0);
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
|
||||
@ -38,6 +38,14 @@
|
||||
icon="el-icon-refresh"
|
||||
@click="handleReset">密码重置
|
||||
</el-button>
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
v-if="userInfo.authority.includes('admin')"
|
||||
icon="el-icon-coordinate"
|
||||
@click="handleLock"
|
||||
>账号解封
|
||||
</el-button>
|
||||
<el-button type="success"
|
||||
plain
|
||||
v-if="userInfo.authority.includes('admin')"
|
||||
@ -105,6 +113,7 @@ import {
|
||||
update,
|
||||
add,
|
||||
grant,
|
||||
unlock,
|
||||
resetPassword
|
||||
} from "@/api/system/user";
|
||||
import { getDeptTree } from "@/api/system/dept";
|
||||
@ -532,6 +541,26 @@ export default {
|
||||
this.roleBox = true;
|
||||
});
|
||||
},
|
||||
handleLock() {
|
||||
if (this.selectionList.length === 0) {
|
||||
this.$message.warning('请选择至少一条数据');
|
||||
return;
|
||||
}
|
||||
this.$confirm('确定将选择账号解封？', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
return unlock(this.ids);
|
||||
})
|
||||
.then(() => {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '操作成功!',
|
||||
});
|
||||
});
|
||||
},
|
||||
handleImport () {
|
||||
this.excelBox = true;
|
||||
},
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<basic-container>
|
||||
<third-register></third-register>
|
||||
<p style="text-align: center;">
|
||||
<img src="https://img.shields.io/badge/Release-V4.4.0-green.svg"
|
||||
<img src="https://img.shields.io/badge/Release-V4.5.0-green.svg"
|
||||
alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/JDK-17+-green.svg"
|
||||
alt="Build Status"/>
|
||||
@ -89,7 +89,7 @@
|
||||
name="5">
|
||||
<div>1.接BladeX系列架构的定制服务</div>
|
||||
<div>2.接3个月以内工期的react、vue、springboot、springcloud、app、小程序等软件定制服务</div>
|
||||
<div>3.有意向请联系唯一指定QQ:1272154962</div>
|
||||
<div>3.有意向请联系官方商务微信：<a target="_blank" href="https://bladex.cn/#/contract">点击查看</a></div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</basic-container>
|
||||
@ -156,6 +156,21 @@
|
||||
<basic-container>
|
||||
<el-collapse v-model="logActiveNames"
|
||||
@change="handleChange">
|
||||
<el-collapse-item title="4.5.0发布 新增账号锁定与解锁功能，新增腾讯云对象存储支持"
|
||||
name="41">
|
||||
<div>1.[新增]账号锁定与解锁功能</div>
|
||||
<div>2.[新增]腾讯云对象存储支持</div>
|
||||
<div>3.[新增]blade-starter-redis 发布订阅支持延迟加载</div>
|
||||
<div>4.[新增]国密key、令牌key支持从环境变量读取与设置</div>
|
||||
<div>5.[优化]增强kv的创建功能</div>
|
||||
<div>6.[优化]脱敏工具类增加ip与mac地址类型</div>
|
||||
<div>7.[优化]oss config bean 构造，减少 bean 冲突</div>
|
||||
<div>8.[优化]BeanUtil toMap toBean 改为 jackson 工具类实现</div>
|
||||
<div>9.[优化]BladeRedis部分方法</div>
|
||||
<div>10.[优化]部分工具类方法</div>
|
||||
<div>11.[修复]调整关闭 mybatis 默认的日志，避免 NoClassDefFoundError</div>
|
||||
<div>12.[修复]github #16 JWT无法设置过长失效时间</div>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="4.4.0发布 新增黑白名单、脱敏工具、BladeRedis新版工具"
|
||||
name="40">
|
||||
<div>1.[升级]Spring 至 6.1.15</div>
|
||||
@ -661,7 +676,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
activeNames: ['1', '2', '3', '5'],
|
||||
logActiveNames: ['40']
|
||||
logActiveNames: ['41']
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user