修复linux下运行错误
This commit is contained in:
@ -6,7 +6,7 @@ const herader = {
|
||||
const db=require("../comman/db")
|
||||
const mywebsocket=require("./tstws")
|
||||
exports.getfrpserver=getfrpserver
|
||||
|
||||
const moment = require('moment');
|
||||
|
||||
function createdfrpdb( )
|
||||
{
|
||||
@ -55,7 +55,9 @@ async function insertfrpinfo(data)
|
||||
sql="INSERT INTO `frpinfo` SET ?"
|
||||
if(insertdata.remote_port==0)
|
||||
{
|
||||
insertdata.last_online=new Date("2000-01-01").toLocaleString()
|
||||
|
||||
|
||||
insertdata.last_online=moment().format('YYYY-MM-DD HH:mm:ss')
|
||||
}
|
||||
|
||||
await db.queryacy(sql,insertdata)
|
||||
@ -113,14 +115,15 @@ async function getfrpserver()
|
||||
|
||||
|
||||
var aaa=await frpserveraxios.get('http://106.75.72.40:7500/api/proxy/tcp',{headers:herader})
|
||||
nowtime=new Date()
|
||||
nowtime=nowtime.toLocaleString()
|
||||
|
||||
nowtime=moment().format('YYYY-MM-DD HH:mm:ss')
|
||||
aaa=aaa.data.proxies;
|
||||
for (var i=0;i<aaa.length;i++)
|
||||
{
|
||||
|
||||
if(aaa[i].name.endsWith('_data'))
|
||||
{
|
||||
console.log(aaa[i])
|
||||
var data=aaa[i]
|
||||
//console.log(aaa[i].name)
|
||||
//去除后缀
|
||||
@ -249,7 +252,7 @@ async function panduanshebei(data)
|
||||
name:data.nameup,
|
||||
lasttime:frpret.lasttimedata,
|
||||
sppercent:frpret.space.percent,
|
||||
sptotal:frpret.space.total/1024/1024+"GB",
|
||||
sptotal:frpret.space.total/1024/1024,
|
||||
remote_port:"http://106.75.72.40:"+data.conf.remote_port,
|
||||
mountedon:frpret.space.mountedon
|
||||
|
||||
@ -351,7 +354,7 @@ try {
|
||||
let nowtime=now.getTime()
|
||||
|
||||
let filetime=new Date(filemodtime)
|
||||
ret.lasttimedata=filetime.toLocaleString();
|
||||
ret.lasttimedata=moment(filetime).format('YYYY-MM-DD HH:mm:ss');
|
||||
let filetime1=filetime.getTime()
|
||||
|
||||
diff=nowtime-filetime1
|
||||
@ -426,8 +429,8 @@ try {
|
||||
}
|
||||
|
||||
|
||||
ret.space.percent=space[4]
|
||||
ret.space.total=space[1]
|
||||
ret.space.percent=space[4].replace(/\D/g, '');
|
||||
ret.space.total=space[1].replace(/\D/g, '');
|
||||
if(ret.space.mountedon!="No SD card")
|
||||
ret.space.mountedon=space[5]
|
||||
|
||||
|
Reference in New Issue
Block a user