diff --git a/app/utils/sendDeviceInfor.ts b/app/utils/sendDeviceInfor.ts index 2d04911..3b33a16 100644 --- a/app/utils/sendDeviceInfor.ts +++ b/app/utils/sendDeviceInfor.ts @@ -19,6 +19,8 @@ export const sendDeviceInfora = async () => { const memDefault = allKeyValue .filter((i) => i.$attributes.key === "MEMORY_DEFAULT") .map((obj) => obj.$attributes.value); + + console.log(memDefault) let listInformation = []; let dataFile = await LogDetectFile.all(); @@ -178,7 +180,7 @@ export const sendDeviceInfora = async () => { } } else { if (PID !== "" && SN !== "") { - const memDefaultForPID = + let memDefaultForPID = memDefault.filter((i) => PID.includes(i.split(":")[0]) )[0] !== undefined @@ -198,6 +200,14 @@ export const sendDeviceInfora = async () => { if(mathches && stringMem[0]?.includes("CHASSIS")){ console.log(mathches) + memDefaultForPID = + memDefault.filter((i) => + mathches[0].trim().includes(i.split(":")[0]) + )[0] !== undefined + ? memDefault.filter((i) => + mathches[0].trim().includes(i.split(":")[0]) + )[0] + : mathches[0].trim() + ":N/A:N/A"; PID = mathches[0].trim(); SN = showInventoryContent.filter((i)=>i.includes(mathches[0].trim()))[0]?.split("SN:")[1]?.replace(/,/g, "").trim(); VID = showInventoryContent.filter((i)=>i.includes(mathches[0].trim()))[0]?.split("VID:")[1] diff --git a/manage-view/src/App.js b/manage-view/src/App.js index 8aa3945..87a40a1 100644 --- a/manage-view/src/App.js +++ b/manage-view/src/App.js @@ -6,6 +6,7 @@ import { Routes, Route, Switch, useParams } from "react-router-dom"; import ShowLog from "./components/ShowLog/ShowLog"; import ListLog from "./components/ListLog/ListLog"; import ScreenShot from "./components/ScreenShot/ScreenShot"; +import PrivateLog from "./pages/PrivateLog"; function App() { return (
@@ -17,6 +18,7 @@ function App() { }> }> }> + }>
); diff --git a/manage-view/src/api/apiLog.js b/manage-view/src/api/apiLog.js index da1346d..9d12284 100644 --- a/manage-view/src/api/apiLog.js +++ b/manage-view/src/api/apiLog.js @@ -5,4 +5,6 @@ export const deleteValue = API + "/deleteValue"; export const addKeyValue = API + "/addValue"; export const editValue = API + "/editValue"; export const getLog = API + "/log/showLog"; -export const getListLog = API + "/getAllLogDetect"; \ No newline at end of file +export const getListLog = API + "/getAllLogDetect"; +export const listOnFolder = API + "/private-log/getFileOnFolder"; +export const getContentFile = API + "/private-log/readFile"; \ No newline at end of file diff --git a/manage-view/src/pages/PrivateLog.jsx b/manage-view/src/pages/PrivateLog.jsx new file mode 100644 index 0000000..ce96571 --- /dev/null +++ b/manage-view/src/pages/PrivateLog.jsx @@ -0,0 +1,258 @@ +import axios from "axios"; +import React, { useEffect, useState } from "react"; +import { getContentFile, listOnFolder } from "../api/apiLog"; + +const PrivateLog = () => { + const [listInFolderPM2, setListInFolderPM2] = useState([]); + const [listInFolderLogs, setListInFolderLogs] = useState([]); + const [listInFolderAPI, setListInFolderAPI] = useState([]); + const [pathBeforePM2, setPathBeforePM2] = useState("/home/pm2_backup"); + const [pathBeforeLogs, setPathBeforeLogs] = useState("/home/logs"); + const [pathBeforeAPI, setPathBeforeAPI] = useState( + "/home/Log_service/app/store/logsAPI" + ); + const [searchPM2, setSearchPM2] = useState(""); + const [searchLogs, setSearchLogs] = useState(""); + const [searchAPI, setSearchAPI] = useState(""); + const [content, setContent] = useState(""); + const [choose, setChoose] = useState(1); + const [fileChoose, setFileChoose] = useState(""); + + const getAllInFolder = async (path, save) => { + try { + const res = await axios.post(listOnFolder, { folerPath: path }); + save(res.data); + } catch (error) { + console.log(error); + } + }; + + const getContent = async (pathFile) => { + try { + const res = await axios.post(getContentFile, { filePath: pathFile }); + setContent(res.data); + } catch (error) { + console.log(error); + } + }; + + useEffect(() => { + getAllInFolder(pathBeforePM2, setListInFolderPM2); + getAllInFolder(pathBeforeLogs, setListInFolderLogs); + getAllInFolder(pathBeforeAPI, setListInFolderAPI); + }, []); + + return ( +
+ + + +
+ +
+
{ + getAllInFolder(pathBeforePM2, setListInFolderPM2); + }} + > + . .PM2{" "} +
+ {listInFolderPM2.map((u) => ( +
+
{ + if (u.type === "directory") { + setPathBeforePM2( + u.name + ?.split("/") + ?.slice(0, u.name.split("/").length - 1) + .join("/") + ); + getAllInFolder(u.name, setListInFolderPM2); + } else { + getContent(u.name); + setFileChoose(u.name) + console.log(u); + } + }} + > + {u.type==="file"?"f - ": "d - "}{u.name?.split("/")[u.name.split("/").length - 1]} +
+
+ ))} +
+ + +
+
{ + getAllInFolder(pathBeforeAPI, setPathBeforeAPI); + }} + > + . .API{" "} +
+ {listInFolderAPI.map((u) => ( +
+
{ + if (u.type === "directory") { + setPathBeforeAPI( + u.name + ?.split("/") + ?.slice(0, u.name.split("/").length - 1) + .join("/") + ); + getAllInFolder(u.name, setPathBeforeAPI); + } else { + getContent(u.name); + setFileChoose(u.name) + console.log(u); + } + }} + > + {u.type==="file"?"f - ": "d - "}{u.name?.split("/")[u.name.split("/").length - 1]} +
+
+ ))} +
+ +
+
{ + getAllInFolder(pathBeforeLogs, setListInFolderLogs); + }} + > +
. .Logs
+
+ { + console.log(e.target.value); + setSearchLogs(e.target.value); + }} + /> +
+
+
+ {listInFolderLogs + .filter((i) => i.name.includes(searchLogs)) + .map((u) => ( +
{ + if (u.type === "directory") { + setPathBeforeLogs( + u.name + ?.split("/") + ?.slice(0, u.name.split("/").length - 1) + .join("/") + ); + getAllInFolder(u.name, setListInFolderLogs); + } else { + getContent(u.name); + setFileChoose(u.name) + console.log(u); + } + }} + > + {u.type==="file"?"f - ": "d - "}{u.name?.split("/")[u.name.split("/").length - 1]} +
+ ))} +
+
+ + +
+
+ ); +}; + +export default PrivateLog; diff --git a/start/routes.ts b/start/routes.ts index 7b7522d..08ce2ed 100644 --- a/start/routes.ts +++ b/start/routes.ts @@ -33,176 +33,6 @@ import Cache from "@ioc:Kaperskyguru/Adonis-Cache"; runtimeCheckLogs(Env.get("FOLDER_LOGS")); -// setTimeout(async() => { -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// LogDetectFile.all() -// console.log("first") -// }, 2000); - -//ERP get index serial number Route.post("/api/getIndexSerialNumber", "ErpsController.getIndexSerialNumber") .middleware("checkToken").middleware(