diff --git a/platform-code/src/microhost/models/system.ts b/platform-code/src/microhost/models/system.ts index 5eff007..cab4b5e 100644 --- a/platform-code/src/microhost/models/system.ts +++ b/platform-code/src/microhost/models/system.ts @@ -3,9 +3,9 @@ import WebApi from '@/config/Api'; import lodash, { isArray, isObject } from 'lodash'; import { defaultSetting as conf } from '@/config/default'; import { localStorageUtil } from '@/microhost/util'; -import CryptoJs, { MD5, SHA256} from 'crypto-js'; +import CryptoJs, { MD5, SHA256 } from 'crypto-js'; import request from 'umi-request' -import {defaultSetting as cfg} from "@/config/default" +import { defaultSetting as cfg } from "@/config/default" export class SystemData extends RemoteRequest { protected request = new RemoteRequest(); @@ -36,31 +36,34 @@ export class SystemData extends RemoteRequest { } }) } + public setlog = async (obj: any) => { + return request.post('/Personnel/Personnelapi/LogRecording', obj) + } public logout = async () => { - await this.request.delete(WebApi.logout, true).then(() => {}); + await this.request.delete(WebApi.logout, true).then(() => { }); localStorageUtil.remove(cfg.userInfo); }; public init = async () => { let systemData: any = {}; await this.request.get(WebApi.systemData, true, true).then((res: any) => { - if (isArray(res)) { - systemData = {}; - - res.forEach((item: any) => { - switch (item.Key.toLowerCase()) { - case 'clientname': - systemData.clientName = item.Value; - break; - case 'logo': - systemData.logo = item.Value; - break; + if (isArray(res)) { + systemData = {}; + + res.forEach((item: any) => { + switch (item.Key.toLowerCase()) { + case 'clientname': + systemData.clientName = item.Value; + break; + case 'logo': + systemData.logo = item.Value; + break; + } + }); + } else if (isObject(res) && res.success === false) { + location.href = '/login'; } - }); - } else if (isObject(res) && res.success === false) { - location.href = '/login'; - } }); return systemData; @@ -86,7 +89,7 @@ export class SystemData extends RemoteRequest { let result: any[] = [] await this.request.get(WebApi.navigroups, true).then((res: any) => { - result = res + result = res }) return result @@ -97,10 +100,10 @@ export class SystemData extends RemoteRequest { let menus: any[] = []; await this.request - .get(WebApi.userMenu + '/' + loginId, true) - .then((res: any) => { - menus = lodash.isArray(res) ? res : menus; - }); + .get(WebApi.userMenu + '/' + loginId, true) + .then((res: any) => { + menus = lodash.isArray(res) ? res : menus; + }); // if (!lodash.isArray(menus)) { // if (!menus || menus.success == false) { @@ -164,7 +167,7 @@ export class SystemData extends RemoteRequest { if (pid != data.parentId) continue; - data.rooter = parent.rooter ? {...parent.rooter} : { + data.rooter = parent.rooter ? { ...parent.rooter } : { attributes: parent.attributes, } data.purl = parent.url; @@ -210,10 +213,10 @@ export class SystemData extends RemoteRequest { let result: any = null; await this.request - .get(`${WebApi.user.info}/${loginId}`, true) - .then((response: any) => { - result = response; - }); + .get(`${WebApi.user.info}/${loginId}`, true) + .then((response: any) => { + result = response; + }); return result; }; @@ -222,10 +225,10 @@ export class SystemData extends RemoteRequest { if (!data) return false; let ret = false; await request - .put(WebApi.user.info, { data: data }) - .then((response: any) => { - ret = response == 1; - }); + .put(WebApi.user.info, { data: data }) + .then((response: any) => { + ret = response == 1; + }); return ret; }; diff --git a/platform-code/src/microhost/system/runtimes/user.ts b/platform-code/src/microhost/system/runtimes/user.ts index dfab575..c4643b5 100644 --- a/platform-code/src/microhost/system/runtimes/user.ts +++ b/platform-code/src/microhost/system/runtimes/user.ts @@ -6,7 +6,8 @@ import { SystemData } from "@/microhost/models/system" import MicroApps from "../apps" import { Log } from "./logger" import { history } from "umi" -import requestaxios from 'axios'; +import request from 'umi-request' + /** * 运行时用户 @@ -163,7 +164,7 @@ export default class RuntimeUser { OperateUser: loginId || "未登录", Operate: `${loginId}登陆了工艺数据管理子系统` } - await requestaxios.post('/Personnel/Personnelapi/LogRecording', obj) + await this.model.setlog(obj) return true } }