From a965a5ae6ba82e1efeb01194c9f9244a6f11ede9 Mon Sep 17 00:00:00 2001
From: smallchill
Date: Thu, 3 Jul 2025 23:34:21 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=204.6.0.RELEASE=20=E5=8D=87=E7=BA=A7?=
=?UTF-8?q?=E9=80=82=E9=85=8D=20SpringCloud2025=20SpringBoot3.5=EF=BC=8CUr?=
=?UTF-8?q?eport=E5=A2=9E=E5=8A=A0token=E9=89=B4=E6=9D=83=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 48 +++++++++++++++++++-------------
package.json | 2 +-
src/pages/Dashboard/Workplace.js | 20 ++++++++++---
src/pages/System/User/User.js | 2 +-
4 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index a453037..75d3f34 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,20 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
## SpringBlade微服务开发平台
* 采用前后端分离的模式,前端开源两个框架:[Sword](https://gitee.com/smallc/Sword) (基于 React、Ant Design)、[Saber](https://gitee.com/smallc/Saber) (基于 Vue、Element-UI)
@@ -33,12 +37,12 @@
|----------------------|------------|
| Java | 17+ |
| NodeJS | 18+ |
-| 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 |
-| Mybatis Plus | 3.5.8 |
+| Spring | 6.2.8 |
+| Spring Boot | 3.5.3 |
+| Spring Cloud | 2025.0.0 |
+| Spring Cloud Alibaba | 2023.0.3.3 |
+| Nacos Alibaba | 3.0.2 |
+| Mybatis Plus | 3.5.12 |
## 工程结构
@@ -50,16 +54,20 @@ SpringBlade
├── blade-ops -- 运维中心
├ ├── blade-admin -- spring-cloud后台管理
├ ├── blade-develop -- 代码生成
-├ ├── blade-resource -- 资源管理
+├ ├── blade-report -- 报表模块
+├ ├── blade-resource -- 资源模块
├ ├── blade-seata-order -- seata分布式事务demo
├ ├── blade-seata-storage -- seata分布式事务demo
├── blade-service -- 业务模块
+├ ├── blade-demo -- 示例模块
├ ├── blade-desk -- 工作台模块
├ ├── blade-log -- 日志模块
├ └── blade-system -- 系统模块
├── blade-service-api -- 业务模块api封装
+├ ├── blade-demo-api -- 示例api
├ ├── blade-desk-api -- 工作台api
├ ├── blade-dict-api -- 字典api
+├ ├── blade-scope-api -- 权限api
├ ├── blade-system-api -- 系统api
└── └── blade-user-api -- 用户api
```
@@ -86,7 +94,7 @@ 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) |
-| BladeXAI大模型平台 | [https://aigc.bladex.cn/](https://aigc.bladex.cn/) |
+| BladeXAI大模型平台 | [https://ai.bladex.cn/](https://ai.bladex.cn/) |
## 前端项目
diff --git a/package.json b/package.json
index 62cd4ce..cf0e1c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sword-admin",
- "version": "4.5.0",
+ "version": "4.6.0",
"description": "An out-of-box UI solution for enterprise applications",
"private": true,
"scripts": {
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index 7e59f23..ab1e952 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -20,14 +20,14 @@ class Workplace extends PureComponent {
-

+
@@ -212,7 +212,19 @@ class Workplace extends PureComponent {
-
+
+
+ 1.[升级]Spring 至 6.2.8
+ 2.[升级]SpringBoot 至 3.5.3
+ 3.[升级]SpringCloud 至 2025.0.0
+ 4.[升级]SpringCloud Alibaba 至 2023.0.3.3
+ 5.[升级]Nacos 至 3.0.2
+ 6.[升级]MybatisPlus 至 3.5.12
+ 7.[新增]Ureport报表Token鉴权逻辑
+ 8.[新增]登录认证IP锁定逻辑
+ 9.[新增]excel封装,将easyexcel切换为fastexcel
+ 10.[优化]适配优化knife4j与springboot3.5版本的兼容性
+
1.[新增]账号锁定与解锁功能
2.[新增]腾讯云对象存储支持
diff --git a/src/pages/System/User/User.js b/src/pages/System/User/User.js
index abf6c7b..7a374c1 100644
--- a/src/pages/System/User/User.js
+++ b/src/pages/System/User/User.js
@@ -69,7 +69,7 @@ class User extends PureComponent {
}
Modal.confirm({
title: '重置密码确认',
- content: '确定将选择账号密码重置为123456?',
+ content: '确定将选择账号密码重置为初始密码?',
okText: '确定',
okType: 'danger',
cancelText: '取消',