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/package.json b/package.json
index 516900b..4e913cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "4.1.0",
+ "version": "4.2.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 28d2afd..d939ebf 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -2,7 +2,7 @@ import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
- url: '/api/blade-user/list',
+ url: '/api/blade-system/user/list',
method: 'get',
params: {
...params,
@@ -13,7 +13,7 @@ export const getList = (current, size, params) => {
}
export const remove = (ids) => {
return request({
- url: '/api/blade-user/remove',
+ url: '/api/blade-system/user/remove',
method: 'post',
params: {
ids,
@@ -23,7 +23,7 @@ export const remove = (ids) => {
export const add = (row) => {
return request({
- url: '/api/blade-user/submit',
+ url: '/api/blade-system/user/submit',
method: 'post',
data: row
})
@@ -31,7 +31,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
- url: '/api/blade-user/update',
+ url: '/api/blade-system/user/update',
method: 'post',
data: row
})
@@ -39,7 +39,7 @@ export const update = (row) => {
export const grant = (userIds, roleIds) => {
return request({
- url: '/api/blade-user/grant',
+ url: '/api/blade-system/user/grant',
method: 'post',
params: {
userIds,
@@ -50,7 +50,7 @@ export const grant = (userIds, roleIds) => {
export const getUser = (id) => {
return request({
- url: '/api/blade-user/detail',
+ url: '/api/blade-system/user/detail',
method: 'get',
params: {
id,
@@ -60,14 +60,14 @@ export const getUser = (id) => {
export const getUserInfo = () => {
return request({
- url: '/api/blade-user/info',
+ url: '/api/blade-system/user/info',
method: 'get',
})
}
export const resetPassword = (userIds) => {
return request({
- url: '/api/blade-user/reset-password',
+ url: '/api/blade-system/user/reset-password',
method: 'post',
params: {
userIds,
@@ -77,7 +77,7 @@ export const resetPassword = (userIds) => {
export const updatePassword = (oldPassword, newPassword, newPassword1) => {
return request({
- url: '/api/blade-user/update-password',
+ url: '/api/blade-system/user/update-password',
method: 'post',
params: {
oldPassword,
diff --git a/src/api/user.js b/src/api/user.js
index 5761fac..5673179 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -54,7 +54,7 @@ export const refreshToken = (refreshToken) => request({
})
export const registerGuest = (form, oauthId) => request({
- url: '/api/blade-user/register-guest',
+ url: '/api/blade-system/user/register-guest',
method: 'post',
params: {
tenantId: form.tenantId,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 06c6e1e..514125e 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -356,7 +356,7 @@
res: 'data'
},
tip: '请上传 .xls,.xlsx 标准格式文件',
- action: "/api/blade-user/import-user"
+ action: "/api/blade-system/user/import-user"
},
{
label: '模板下载',
@@ -550,11 +550,11 @@
cancelButtonText: "取消",
type: "warning"
}).then(() => {
- window.open(`/api/blade-user/export-user?blade-auth=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
+ window.open(`/api/blade-system/user/export-user?blade-auth=bearer ${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
});
},
handleTemplate() {
- window.open(`/api/blade-user/export-template?blade-auth=${getToken()}`);
+ window.open(`/api/blade-system/user/export-template?blade-auth=bearer ${getToken()}`);
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 78248cd..a299906 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -125,6 +125,16 @@