mirror of
https://github.com/chillzhuang/Sword
synced 2024-11-11 04:59:20 +08:00
🎉 4.2.0.RELEASE 重构包名,分类core模块与starter模块
This commit is contained in:
parent
d928cfceeb
commit
53e050f87d
@ -1,5 +1,5 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="https://img.shields.io/badge/Release-V4.1.0-green.svg" alt="Downloads">
|
<img src="https://img.shields.io/badge/Release-V4.2.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/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/license-Apache%202-blue.svg" alt="Build Status">
|
||||||
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
|
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
|
||||||
@ -33,9 +33,9 @@
|
|||||||
|----------------------|------------|
|
|----------------------|------------|
|
||||||
| Java | 17+ |
|
| Java | 17+ |
|
||||||
| NodeJS | 18+ |
|
| NodeJS | 18+ |
|
||||||
| Spring | 6.1.10 |
|
| Spring | 6.1.12 |
|
||||||
| Spring Boot | 3.2.7 |
|
| Spring Boot | 3.2.9 |
|
||||||
| Spring Cloud | 2023.0.2 |
|
| Spring Cloud | 2023.0.3 |
|
||||||
| Spring Cloud Alibaba | 2023.0.1.0 |
|
| Spring Cloud Alibaba | 2023.0.1.0 |
|
||||||
| Nacos Alibaba | 2.3.2 |
|
| Nacos Alibaba | 2.3.2 |
|
||||||
| Mybatis Plus | 3.5.7 |
|
| Mybatis Plus | 3.5.7 |
|
||||||
|
14
mock/user.js
14
mock/user.js
@ -71,13 +71,13 @@ function fakeSuccess(req, res) {
|
|||||||
|
|
||||||
// 代码中会兼容本地 service mock 以及部署站点的静态数据
|
// 代码中会兼容本地 service mock 以及部署站点的静态数据
|
||||||
const proxy = {
|
const proxy = {
|
||||||
'GET /api/blade-user/list': getFakeList,
|
'GET /api/blade-system/user/list': getFakeList,
|
||||||
'GET /api/blade-user/detail': getFakeDetail,
|
'GET /api/blade-system/user/detail': getFakeDetail,
|
||||||
'POST /api/blade-user/grant': fakeSuccess,
|
'POST /api/blade-system/user/grant': fakeSuccess,
|
||||||
'POST /api/blade-user/reset-password': fakeSuccess,
|
'POST /api/blade-system/user/reset-password': fakeSuccess,
|
||||||
'POST /api/blade-user/submit': fakeSuccess,
|
'POST /api/blade-system/user/submit': fakeSuccess,
|
||||||
'POST /api/blade-user/update': fakeSuccess,
|
'POST /api/blade-system/user/update': fakeSuccess,
|
||||||
'POST /api/blade-user/remove': fakeSuccess,
|
'POST /api/blade-system/user/remove': fakeSuccess,
|
||||||
|
|
||||||
// 支持值为 Object 和 Array
|
// 支持值为 Object 和 Array
|
||||||
'GET /api/currentUser': {
|
'GET /api/currentUser': {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sword-admin",
|
"name": "sword-admin",
|
||||||
"version": "4.1.0",
|
"version": "4.2.0",
|
||||||
"description": "An out-of-box UI solution for enterprise applications",
|
"description": "An out-of-box UI solution for enterprise applications",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@ -18,7 +18,7 @@ module.exports = {
|
|||||||
pwa: true,
|
pwa: true,
|
||||||
auth: {
|
auth: {
|
||||||
// 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
|
// 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
|
||||||
publicKey: '04e6862d0819ec55e9d7d8bb961ccc8c2b7d86b6845ac333d1d9ab8af6a892cebb3d30f952da4111971908eb02829459170bdd338e7a27fa57d6300dc290d052b5',
|
publicKey: '请配置国密sm2公钥',
|
||||||
},
|
},
|
||||||
// 第三方登陆授权地址
|
// 第三方登陆授权地址
|
||||||
authUrl: 'http://localhost/blade-auth/oauth/render',
|
authUrl: 'http://localhost/blade-auth/oauth/render',
|
||||||
|
@ -20,7 +20,7 @@ class Workplace extends PureComponent {
|
|||||||
<Row gutter={24}>
|
<Row gutter={24}>
|
||||||
<Col span={24}>
|
<Col span={24}>
|
||||||
<div style={{ textAlign: 'center' }}>
|
<div style={{ textAlign: 'center' }}>
|
||||||
<img src="https://img.shields.io/badge/Release-V4.1.0-green.svg" alt="Downloads" />
|
<img src="https://img.shields.io/badge/Release-V4.2.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/JDK-17+-green.svg" alt="Build Status" />
|
||||||
<img
|
<img
|
||||||
src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg"
|
src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg"
|
||||||
@ -212,7 +212,17 @@ class Workplace extends PureComponent {
|
|||||||
</Row>
|
</Row>
|
||||||
<Row gutter={24}>
|
<Row gutter={24}>
|
||||||
<Card className={styles.card} bordered={false}>
|
<Card className={styles.card} bordered={false}>
|
||||||
<Collapse bordered={false} defaultActiveKey={['37']}>
|
<Collapse bordered={false} defaultActiveKey={['38']}>
|
||||||
|
<Panel header="4.2.0发布 底层架构升级,分类core模块与starter模块" key="38">
|
||||||
|
<div>1.[升级]SpringBoot 至 3.2.9</div>
|
||||||
|
<div>2.[升级]SpringCloud 至 2023.0.3</div>
|
||||||
|
<div>3.[升级]底层架构升级,分类core模块与starter模块</div>
|
||||||
|
<div>4.[新增]Geo坐标工具</div>
|
||||||
|
<div>5.[新增]JsonUtil新增readListMap方法</div>
|
||||||
|
<div>6.[优化]将user模块合并至system模块,统一api入口</div>
|
||||||
|
<div>7.[修复]vue3版本报表列表跳转路径出错的问题</div>
|
||||||
|
<div>8.[修复]excel导出工具类版本冲突的问题</div>
|
||||||
|
</Panel>
|
||||||
<Panel header="4.1.0发布 登录认证升级国密算法,数据库password字段无需变动" key="37">
|
<Panel header="4.1.0发布 登录认证升级国密算法,数据库password字段无需变动" key="37">
|
||||||
<div>1.[升级]SpringBoot 至 3.2.7</div>
|
<div>1.[升级]SpringBoot 至 3.2.7</div>
|
||||||
<div>2.[升级]SpringCloud 至 2023.0.2</div>
|
<div>2.[升级]SpringCloud 至 2023.0.2</div>
|
||||||
|
@ -202,7 +202,7 @@ class User extends PureComponent {
|
|||||||
const account = params.account || '';
|
const account = params.account || '';
|
||||||
const realName = params.realName || '';
|
const realName = params.realName || '';
|
||||||
window.open(
|
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() {},
|
onCancel() {},
|
||||||
@ -210,7 +210,7 @@ class User extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleTemplate = () => {
|
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 => {
|
onUpload = info => {
|
||||||
@ -257,7 +257,7 @@ class User extends PureComponent {
|
|||||||
headers: {
|
headers: {
|
||||||
'Blade-Auth': getToken(),
|
'Blade-Auth': getToken(),
|
||||||
},
|
},
|
||||||
action: '/api/blade-user/import-user',
|
action: '/api/blade-system/user/import-user',
|
||||||
};
|
};
|
||||||
|
|
||||||
const formItemLayout = {
|
const formItemLayout = {
|
||||||
|
@ -35,7 +35,7 @@ export async function socialLogin(params) {
|
|||||||
export async function registerGuest(form, oauthId) {
|
export async function registerGuest(form, oauthId) {
|
||||||
const values = form;
|
const values = form;
|
||||||
values.oauthId = oauthId;
|
values.oauthId = oauthId;
|
||||||
return request('/api/blade-user/register-guest', {
|
return request('/api/blade-system/user/register-guest', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: func.toFormData(values),
|
body: func.toFormData(values),
|
||||||
});
|
});
|
||||||
@ -50,54 +50,54 @@ export async function queryCurrent() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function list(params) {
|
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) {
|
export async function grant(params) {
|
||||||
return request('/api/blade-user/grant', {
|
return request('/api/blade-system/user/grant', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: func.toFormData(params),
|
body: func.toFormData(params),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function resetPassword(params) {
|
export async function resetPassword(params) {
|
||||||
return request('/api/blade-user/reset-password', {
|
return request('/api/blade-system/user/reset-password', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: func.toFormData(params),
|
body: func.toFormData(params),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function remove(params) {
|
export async function remove(params) {
|
||||||
return request('/api/blade-user/remove', {
|
return request('/api/blade-system/user/remove', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: func.toFormData(params),
|
body: func.toFormData(params),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function submit(params) {
|
export async function submit(params) {
|
||||||
return request('/api/blade-user/submit', {
|
return request('/api/blade-system/user/submit', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: params,
|
body: params,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function update(params) {
|
export async function update(params) {
|
||||||
return request('/api/blade-user/update', {
|
return request('/api/blade-system/user/update', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: params,
|
body: params,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function detail(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() {
|
export async function getUserInfo() {
|
||||||
return request('/api/blade-user/info');
|
return request('/api/blade-system/user/info');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function updatePassword(params) {
|
export async function updatePassword(params) {
|
||||||
return request('/api/blade-user/update-password', {
|
return request('/api/blade-system/user/update-password', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: func.toFormData(params),
|
body: func.toFormData(params),
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user