⚡ user服务合并至system服务

src/api/system/user.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params, deptId) => {
   return request({
-    url: '/api/blade-user/page',
+    url: '/api/blade-system/user/page',
     method: 'get',
     params: {
       ...params,
@@ -15,7 +15,7 @@ export const getList = (current, size, params, deptId) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/blade-user/remove',
+    url: '/api/blade-system/user/remove',
     method: 'post',
     params: {
       ids,
@@ -25,7 +25,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
   })
@@ -33,7 +33,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
   })
@@ -41,7 +41,7 @@ export const update = (row) => {
 
 export const updatePlatform = (userId, userType, userExt) => {
   return request({
-    url: '/api/blade-user/update-platform',
+    url: '/api/blade-system/user/update-platform',
     method: 'post',
     params: {
       userId,
@@ -53,7 +53,7 @@ export const updatePlatform = (userId, userType, userExt) => {
 
 export const getUser = (id) => {
   return request({
-    url: '/api/blade-user/detail',
+    url: '/api/blade-system/user/detail',
     method: 'get',
     params: {
       id,
@@ -63,7 +63,7 @@ export const getUser = (id) => {
 
 export const getUserPlatform = (id) => {
   return request({
-    url: '/api/blade-user/platform-detail',
+    url: '/api/blade-system/user/platform-detail',
     method: 'get',
     params: {
       id,
@@ -73,14 +73,14 @@ export const getUserPlatform = (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,
@@ -90,7 +90,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,
@@ -102,7 +102,7 @@ export const updatePassword = (oldPassword, newPassword, newPassword1) => {
 
 export const updateInfo = (row) => {
   return request({
-    url: '/api/blade-user/update-info',
+    url: '/api/blade-system/user/update-info',
     method: 'post',
     data: row
   })
@@ -110,7 +110,7 @@ export const updateInfo = (row) => {
 
 export const grant = (userIds, roleIds) => {
   return request({
-    url: '/api/blade-user/grant',
+    url: '/api/blade-system/user/grant',
     method: 'post',
     params: {
       userIds,
@@ -121,7 +121,7 @@ export const grant = (userIds, roleIds) => {
 
 export const unlock = (userIds) => {
   return request({
-    url: '/api/blade-user/unlock',
+    url: '/api/blade-system/user/unlock',
     method: 'post',
     params: {
       userIds,

src/api/user.js

@@ -69,7 +69,7 @@ export const refreshToken = (refresh_token, tenantId, deptId, roleId) => 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,

src/views/system/user.vue

@@ -630,7 +630,7 @@
                 res: 'data'
               },
               tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-user/import-user"
+              action: "/api/blade-system/user/import-user"
             },
             {
               label: "数据覆盖",
@@ -677,7 +677,7 @@
       'excelForm.isCovered'() {
         if (this.excelForm.isCovered !== '') {
           const column = this.findObject(this.excelOption.column, "excelFile");
-          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+          column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`;
         }
       }
     },
@@ -911,14 +911,14 @@
           type: "warning"
         }).then(() => {
           NProgress.start();
-          exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
+          exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
             downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
             NProgress.done();
           })
         });
       },
       handleTemplate() {
-        exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
           downloadXls(res.data, "用户数据模板.xlsx");
         })
       },

src/views/work/process/leave/form.vue

@@ -28,7 +28,7 @@
                   label: '审批人员',
                   prop: 'taskUser',
                   type: 'select',
-                  dicUrl: `/api/blade-user/user-list`,
+                  dicUrl: `/api/blade-system/user/user-list`,
                   props: {
                     label: "account",
                     value: "id"