diff --git a/README.md b/README.md
index d50da84..6bcce5b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
@@ -33,9 +33,9 @@
|----------------------|------------|
| Java | 17+ |
| NodeJS | 18+ |
-| Spring | 6.1.10 |
-| Spring Boot | 3.2.7 |
-| Spring Cloud | 2023.0.2 |
+| Spring | 6.1.12 |
+| Spring Boot | 3.2.9 |
+| Spring Cloud | 2023.0.3 |
| Spring Cloud Alibaba | 2023.0.1.0 |
| Nacos Alibaba | 2.3.2 |
| Mybatis Plus | 3.5.7 |
diff --git a/mock/user.js b/mock/user.js
index f56baa2..36c9463 100644
--- a/mock/user.js
+++ b/mock/user.js
@@ -71,13 +71,13 @@ function fakeSuccess(req, res) {
// 代码中会兼容本地 service mock 以及部署站点的静态数据
const proxy = {
- 'GET /api/blade-user/list': getFakeList,
- 'GET /api/blade-user/detail': getFakeDetail,
- 'POST /api/blade-user/grant': fakeSuccess,
- 'POST /api/blade-user/reset-password': fakeSuccess,
- 'POST /api/blade-user/submit': fakeSuccess,
- 'POST /api/blade-user/update': fakeSuccess,
- 'POST /api/blade-user/remove': fakeSuccess,
+ 'GET /api/blade-system/user/list': getFakeList,
+ 'GET /api/blade-system/user/detail': getFakeDetail,
+ 'POST /api/blade-system/user/grant': fakeSuccess,
+ 'POST /api/blade-system/user/reset-password': fakeSuccess,
+ 'POST /api/blade-system/user/submit': fakeSuccess,
+ 'POST /api/blade-system/user/update': fakeSuccess,
+ 'POST /api/blade-system/user/remove': fakeSuccess,
// 支持值为 Object 和 Array
'GET /api/currentUser': {
diff --git a/package.json b/package.json
index b474310..262066c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sword-admin",
- "version": "4.1.0",
+ "version": "4.2.0",
"description": "An out-of-box UI solution for enterprise applications",
"private": true,
"scripts": {
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index da382e6..476fbdf 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -18,7 +18,7 @@ module.exports = {
pwa: true,
auth: {
// 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
- publicKey: '04e6862d0819ec55e9d7d8bb961ccc8c2b7d86b6845ac333d1d9ab8af6a892cebb3d30f952da4111971908eb02829459170bdd338e7a27fa57d6300dc290d052b5',
+ publicKey: '请配置国密sm2公钥',
},
// 第三方登陆授权地址
authUrl: 'http://localhost/blade-auth/oauth/render',
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index 505a4f7..7e08b3f 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -20,7 +20,7 @@ class Workplace extends PureComponent {
-
+
-
+
+
+ 1.[升级]SpringBoot 至 3.2.9
+ 2.[升级]SpringCloud 至 2023.0.3
+ 3.[升级]底层架构升级,分类core模块与starter模块
+ 4.[新增]Geo坐标工具
+ 5.[新增]JsonUtil新增readListMap方法
+ 6.[优化]将user模块合并至system模块,统一api入口
+ 7.[修复]vue3版本报表列表跳转路径出错的问题
+ 8.[修复]excel导出工具类版本冲突的问题
+
1.[升级]SpringBoot 至 3.2.7
2.[升级]SpringCloud 至 2023.0.2
diff --git a/src/pages/System/User/User.js b/src/pages/System/User/User.js
index 8b0e34a..abf6c7b 100644
--- a/src/pages/System/User/User.js
+++ b/src/pages/System/User/User.js
@@ -202,7 +202,7 @@ class User extends PureComponent {
const account = params.account || '';
const realName = params.realName || '';
window.open(
- `/api/blade-user/export-user?blade-auth=${getAccessToken()}&account=${account}&realName=${realName}`
+ `/api/blade-system/user/export-user?blade-auth=bearer ${getAccessToken()}&account=${account}&realName=${realName}`
);
},
onCancel() {},
@@ -210,7 +210,7 @@ class User extends PureComponent {
};
handleTemplate = () => {
- window.open(`/api/blade-user/export-template?blade-auth=${getAccessToken()}`);
+ window.open(`/api/blade-system/user/export-template?blade-auth=bearer ${getAccessToken()}`);
};
onUpload = info => {
@@ -257,7 +257,7 @@ class User extends PureComponent {
headers: {
'Blade-Auth': getToken(),
},
- action: '/api/blade-user/import-user',
+ action: '/api/blade-system/user/import-user',
};
const formItemLayout = {
diff --git a/src/services/user.js b/src/services/user.js
index eae9499..f0bfd1e 100644
--- a/src/services/user.js
+++ b/src/services/user.js
@@ -35,7 +35,7 @@ export async function socialLogin(params) {
export async function registerGuest(form, oauthId) {
const values = form;
values.oauthId = oauthId;
- return request('/api/blade-user/register-guest', {
+ return request('/api/blade-system/user/register-guest', {
method: 'POST',
body: func.toFormData(values),
});
@@ -50,54 +50,54 @@ export async function queryCurrent() {
}
export async function list(params) {
- return request(`/api/blade-user/list?${stringify(params)}`);
+ return request(`/api/blade-system/user/list?${stringify(params)}`);
}
export async function grant(params) {
- return request('/api/blade-user/grant', {
+ return request('/api/blade-system/user/grant', {
method: 'POST',
body: func.toFormData(params),
});
}
export async function resetPassword(params) {
- return request('/api/blade-user/reset-password', {
+ return request('/api/blade-system/user/reset-password', {
method: 'POST',
body: func.toFormData(params),
});
}
export async function remove(params) {
- return request('/api/blade-user/remove', {
+ return request('/api/blade-system/user/remove', {
method: 'POST',
body: func.toFormData(params),
});
}
export async function submit(params) {
- return request('/api/blade-user/submit', {
+ return request('/api/blade-system/user/submit', {
method: 'POST',
body: params,
});
}
export async function update(params) {
- return request('/api/blade-user/update', {
+ return request('/api/blade-system/user/update', {
method: 'POST',
body: params,
});
}
export async function detail(params) {
- return request(`/api/blade-user/detail?${stringify(params)}`);
+ return request(`/api/blade-system/user/detail?${stringify(params)}`);
}
export async function getUserInfo() {
- return request('/api/blade-user/info');
+ return request('/api/blade-system/user/info');
}
export async function updatePassword(params) {
- return request('/api/blade-user/update-password', {
+ return request('/api/blade-system/user/update-password', {
method: 'POST',
body: func.toFormData(params),
});