From 3f7deefd53ef6d8f91b11bae05ea665edcc1d530 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 14 Mar 2025 10:28:08 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=204.5.0.RELEASE=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=94=81=E5=AE=9A=E4=B8=8E=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E5=AF=B9=E8=B1=A1=E5=AD=98=E5=82=A8=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 30 +++++++++++++++--------------- package.json | 2 +- src/api/system/user.js | 9 +++++++++ src/page/login/userlogin.vue | 8 ++++++++ src/utils/sm2.js | 4 ++-- src/views/system/user.vue | 29 +++++++++++++++++++++++++++++ src/views/wel/index.vue | 21 ++++++++++++++++++--- 7 files changed, 82 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index cd48ad6..a453037 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status 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) | ## 后端项目 | 简介 | 地址 | diff --git a/package.json b/package.json index 24c0a76..c8444c2 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "saber-admin", - "version": "4.4.0", + "version": "4.5.0", "scripts": { "dev": "vite --host", "prod": "vite --mode production", diff --git a/src/api/system/user.js b/src/api/system/user.js index 9283519..8491fc5 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -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, + }, + }); +}; diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 3044a93..4b8a34c 100755 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -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(); }); } }); diff --git a/src/utils/sm2.js b/src/utils/sm2.js index 1b2d182..16cd9c8 100644 --- a/src/utils/sm2.js +++ b/src/utils/sm2.js @@ -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 ''; } diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 1f11eff..a013280 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -38,6 +38,14 @@ icon="el-icon-refresh" @click="handleReset">密码重置 + 账号解封 + { + return unlock(this.ids); + }) + .then(() => { + this.$message({ + type: 'success', + message: '操作成功!', + }); + }); + }, handleImport () { this.excelBox = true; }, diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index aec0db6..1acb9db 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -2,7 +2,7 @@

- Downloads Build Status @@ -89,7 +89,7 @@ name="5">

1.接BladeX系列架构的定制服务
2.接3个月以内工期的react、vue、springboot、springcloud、app、小程序等软件定制服务
-
3.有意向请联系唯一指定QQ:1272154962
+
3.有意向请联系官方商务微信：点击查看
@@ -156,6 +156,21 @@ + +
1.[新增]账号锁定与解锁功能
+
2.[新增]腾讯云对象存储支持
+
3.[新增]blade-starter-redis 发布订阅支持延迟加载
+
4.[新增]国密key、令牌key支持从环境变量读取与设置
+
5.[优化]增强kv的创建功能
+
6.[优化]脱敏工具类增加ip与mac地址类型
+
7.[优化]oss config bean 构造，减少 bean 冲突
+
8.[优化]BeanUtil toMap toBean 改为 jackson 工具类实现
+
9.[优化]BladeRedis部分方法
+
10.[优化]部分工具类方法
+
11.[修复]调整关闭 mybatis 默认的日志，避免 NoClassDefFoundError
+
12.[修复]github #16 JWT无法设置过长失效时间
+
1.[升级]Spring 至 6.1.15
@@ -661,7 +676,7 @@ export default { data() { return { activeNames: ['1', '2', '3', '5'], - logActiveNames: ['40'] + logActiveNames: ['41'] }; }, computed: {