调整后台管理接口地址

src/request/alova.ts

@@ -20,6 +20,8 @@ export default createAlova({
       try {
         if ( response.status >= 400 ) throw new Error(`${ response.statusText }(${ response.status })`);
 
+        if (response.headers.get('content-type') === 'text/html') return response.text();
+
         let result = await response.json();
         if (method.url.startsWith(`${location.origin}${import.meta.env.BASE_URL}database`)) result = { code: 0, data: result };
         /* 接口修正 code */
@@ -27,6 +29,8 @@ export default createAlova({
         if ( result.Data && result.data == null ) result.data = result.Data;
         if ( result.ResultInfo && result.msg == null ) result.msg = result.ResultInfo;
         if ( result.success === true || result.code === 200 ) result.code = 0;
+        /* 接口修正 data */
+        if ( result.ResultCode === 0 && result.Data == null && result.ResultInfo) result.data = result.ResultInfo;
         const { success = false, code = success ? 0 : -1, data, msg: message = '未知错误', ...props } = result;
         if ( code === 0 ) { return data; }
         else if (code === 401) {

src/request/api/manage.ts

@@ -6,7 +6,7 @@ import { fromMenusData, fromUserData, fromRoleData, fromLoggerData } from '@/req
 
 export function login(data: { account: string; password: string }) {
   return HTTP.Post<string, any>(
-    `/login`,
+    `/machine/login`,
     { username: data.account, password: data.password },
     {
       meta: { ignoreToken: true },
@@ -18,7 +18,7 @@ export function login(data: { account: string; password: string }) {
 }
 
 export function getAccountInfo(token: string) {
-  return HTTP.Get<[string, UserModel], any>(`/getInfo`, {
+  return HTTP.Get<[string, UserModel], any>(`/machine/getInfo`, {
     headers: {
       Authorization: token,
     },
@@ -29,7 +29,7 @@ export function getAccountInfo(token: string) {
 }
 
 export function getMenus() {
-  return HTTP.Get<MenuModel[], any>(`/warrantManage/getMenus`, {
+  return HTTP.Get<MenuModel[], any>(`/machine/warrantManage/getMenus`, {
     transform(data) {
       const menus = typeof data === 'string' ? JSON.parse(data) : data;
       return fromMenusData(menus)!;
@@ -40,7 +40,7 @@ export function getMenus() {
 }
 
 export function getRoles() {
-  return HTTP.Get<(RoleModel & { __raw__: any })[], any>(`/admin/right_RoleMgr/optionselect`, {
+  return HTTP.Get<(RoleModel & { __raw__: any })[], any>(`/machine/admin/right_RoleMgr/optionselect`, {
     transform(data) {
       return Array.isArray(data) ? data.map((item) => Object.assign(fromRoleData(item), { __raw__: item })) : [];
     },
@@ -51,7 +51,7 @@ export function getRoles() {
 export function listRoles(page = 1, size = 20, query = {}) {
   const params = { page, limit: size };
   return HTTP.Post<{ data: RoleModel[]; total: number }, any>(
-    `/admin/right_RoleMgr/listPain`,
+    `/machine/admin/right_RoleMgr/listPain`,
     { ...params, ...query },
     {
       params,
@@ -64,7 +64,7 @@ export function listRoles(page = 1, size = 20, query = {}) {
 }
 
 export function editRole(data: { pid?: string } & Record<string, any>) {
-  return HTTP.Post<RoleModel, any>(data.pid ? `/admin/right_RoleMgr/update` : `/admin/right_RoleMgr/Add`, data, {
+  return HTTP.Post<RoleModel, any>(data.pid ? `/machine/admin/right_RoleMgr/update` : `/machine/admin/right_RoleMgr/Add`, data, {
     transform() {
       return fromRoleData(data);
     },
@@ -74,7 +74,7 @@ export function editRole(data: { pid?: string } & Record<string, any>) {
 
 export function deleteRole(id: string) {
   return HTTP.Post(
-    `/admin/right_RoleMgr/BatchDelete`,
+    `/machine/admin/right_RoleMgr/BatchDelete`,
     {},
     {
       params: { ids: id },
@@ -86,7 +86,7 @@ export function deleteRole(id: string) {
 export function listUsers(page = 1, size = 20, query = {}) {
   const params = { page, limit: size };
   return HTTP.Post<{ data: UserModel[]; total: number }, any>(
-    `/portal/userMgr/listPain`,
+    `/machine/portal/userMgr/listPain`,
     { ...params, ...query },
     {
       params,
@@ -99,7 +99,7 @@ export function listUsers(page = 1, size = 20, query = {}) {
 
 export function editUser(data: { pid?: string } & Record<string, any>) {
   if (!data.pid) data.isFirst = 0;
-  return HTTP.Post<UserModel, any>(data.pid ? `/portal/userMgr/update` : `/portal/userMgr/Add`, data, {
+  return HTTP.Post<UserModel, any>(data.pid ? `/machine/portal/userMgr/update` : `/machine/portal/userMgr/Add`, data, {
     transform() {
       return fromUserData(data);
     },
@@ -107,17 +107,17 @@ export function editUser(data: { pid?: string } & Record<string, any>) {
 }
 
 export function deleteUser(id: string) {
-  return HTTP.Post(`/portal/userMgr/BatchDelete`, {}, { params: { ids: id } });
+  return HTTP.Post(`/machine/portal/userMgr/BatchDelete`, {}, { params: { ids: id } });
 }
 
 export function resetUserPassword(pid: string) {
-  return HTTP.Post(`/portal/userMgr/resetPassWord`, { userPid: pid });
+  return HTTP.Post(`/machine/portal/userMgr/resetPassWord`, { userPid: pid });
 }
 
 
 export function updateUserPassword(data: { password: string; again: string; pid: string | number }, token?: string) {
   return HTTP.Post(
-    `/portal/userMgr/UpdatePassWord`,
+    `/machine/portal/userMgr/UpdatePassWord`,
     {
       userPid: data.pid,
       password: data.password,
@@ -130,7 +130,7 @@ export function updateUserPassword(data: { password: string; again: string; pid:
 export function listLoggers(page = 1, size = 20, query = {}) {
   const params = { page, limit: size };
   return HTTP.Get<{ data: LoggerModel[]; total: number }, any>(
-    `/monitor/operlog/list`,
+    `/machine/monitor/operlog/list`,
     {
       params: { ...params, ...query },
       transform(data) {