diff --git a/src/main/java/com/ifish/entity/hbm/DeviceOffline.hbm.xml b/src/main/java/com/ifish/entity/hbm/DeviceOffline.hbm.xml
index b8d00b5..711b44e 100644
--- a/src/main/java/com/ifish/entity/hbm/DeviceOffline.hbm.xml
+++ b/src/main/java/com/ifish/entity/hbm/DeviceOffline.hbm.xml
@@ -9,7 +9,7 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/quartz/ExecuteJob.java b/src/main/java/com/ifish/quartz/ExecuteJob.java
index 767a2eb..7c8a12a 100644
--- a/src/main/java/com/ifish/quartz/ExecuteJob.java
+++ b/src/main/java/com/ifish/quartz/ExecuteJob.java
@@ -1,21 +1,6 @@
package com.ifish.quartz;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import com.ifish.entity.*;
-import com.ifish.util.IfishUtil;
-import org.apache.mina.core.session.IoSession;
-import org.quartz.Job;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
import com.ifish.enums.BooleanEnum;
import com.ifish.enums.NeteaseEnum;
import com.ifish.enums.PushTypeEnum;
@@ -23,10 +8,23 @@ import com.ifish.netease.NeteaseIM;
import com.ifish.service.DeviceService;
import com.ifish.service.UserService;
import com.ifish.socketNew.SomeServer;
+import com.ifish.util.IfishUtil;
+import org.apache.log4j.Logger;
+import org.apache.mina.core.session.IoSession;
+import org.quartz.Job;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class ExecuteJob implements Job {
- private static Logger log = LoggerFactory.getLogger(ExecuteJob.class);
+ private static Logger log = Logger.getLogger(ExecuteJob.class);
@Autowired
private NeteaseIM neteaseIM;
@Autowired
@@ -56,7 +54,7 @@ public class ExecuteJob implements Job {
deviceOffline.setOfflineSdkVersion(String.valueOf(device.getSdkVersion()));
deviceOffline.setOfflineTime(IfishUtil.StrToDate1(timestamp));
deviceService.saveDeviceOffline(deviceOffline);
-
+ log.info("离线设备信息保存++++++++++++++++++++++++++++++++++++++++++");
//记录次数
Integer number1 = device.getNumber1();
Integer number2 = device.getNumber2();
@@ -113,8 +111,7 @@ public class ExecuteJob implements Job {
}
}
} catch (Exception e) {
- e.printStackTrace();
- log.error("error msg:{}",e.toString());
+ log.error(e.getMessage(),e);
}
}
}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/socketNew/MinaServerHandler.java b/src/main/java/com/ifish/socketNew/MinaServerHandler.java
index 295d944..d3e9cc7 100644
--- a/src/main/java/com/ifish/socketNew/MinaServerHandler.java
+++ b/src/main/java/com/ifish/socketNew/MinaServerHandler.java
@@ -1,18 +1,16 @@
package com.ifish.socketNew;
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
import com.ifish.quartz.JobGroup;
import com.ifish.quartz.ScheduleJob;
import com.ifish.util.IfishUtil;
+import org.apache.log4j.Logger;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* mina服务器端事件处理
@@ -23,7 +21,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
private final AtomicInteger atomicInt = new AtomicInteger();
- private static Logger log = LoggerFactory.getLogger(MinaServerHandler.class);
+ private static Logger log = Logger.getLogger(MinaServerHandler.class);
@Autowired
private SomeServer someServer;
@@ -33,7 +31,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
@Override
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
cause.printStackTrace();
- log.error("{}服务器-客户端session异常:{}", session.getRemoteAddress(), cause.toString());
+ log.error(String.format("{%s}服务器-客户端session异常:", session.getRemoteAddress()), cause);
}
/**
@@ -49,7 +47,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void sessionCreated(IoSession session) throws Exception {
- log.info("{}:会话创建,在线数:{}", session.getRemoteAddress(), atomicInt.incrementAndGet());
+ log.info(String.format("{%s}:会话创建,在线数:{%s}", session.getRemoteAddress(), atomicInt.incrementAndGet()));
}
/**
@@ -57,7 +55,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void sessionClosed(IoSession session) throws Exception {
- log.info("{}:会话关闭,连接数:{}", session.getRemoteAddress(), atomicInt.decrementAndGet());
+ log.info(String.format("{%s}:会话关闭在线数:{%s}", session.getRemoteAddress(), atomicInt.incrementAndGet()));
//旧连接关闭,获取设备mac地址
String oldConnect = session.getRemoteAddress().toString();
String macAddress = SomeServer.remoteAddress.get(oldConnect);
@@ -93,6 +91,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
jobGroup.setTimestamp(IfishUtil.format(new Date()));
//10分钟后推送 update 30分钟
jobGroup.setStartTime(new Date(System.currentTimeMillis() + 600000L * 3));
+// jobGroup.setStartTime(new Date(System.currentTimeMillis() + 6000));
scheduleJob.addJob(jobGroup);
}
@@ -110,7 +109,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
@Override
public void sessionIdle(IoSession session, IdleStatus status)
throws Exception {
- log.info("空闲超时，服务器主动关闭连接{}", session.getRemoteAddress());
+ log.info(String.format("空闲超时，服务器主动关闭连接{%s}", session.getRemoteAddress()));
session.close(true);
}
diff --git a/src/main/resources/log4j.properties_bak b/src/main/resources/log4j.properties
similarity index 92%
rename from src/main/resources/log4j.properties_bak
rename to src/main/resources/log4j.properties
index 493e7e4..b6cd287 100644
--- a/src/main/resources/log4j.properties_bak
+++ b/src/main/resources/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=INFO,CONSOLE,FILE,ROLLING_FILE
# Console Appender
###################
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.Threshold=INFO
+log4j.appender.Threshold=DEBUG
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=[ifish7Socket][%-5p]%d - (%F:%L) - %m%n
@@ -11,7 +11,7 @@ log4j.appender.CONSOLE.layout.ConversionPattern=[ifish7Socket][%-5p]%d - (%F:%L)
# [INFO]Daily Rolling File
########################
log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FILE.Threshold=INFO
+log4j.appender.FILE.Threshold=DEBUG
log4j.appender.FILE.File=/logs/ifishSocket/ifish7Socket_ALL.log
log4j.appender.FILE.Append=true
log4j.appender.FILE.ImmediateFlush = true
@@ -31,7 +31,8 @@ log4j.appender.ROLLING_FILE.DatePattern='.'yyyy-MM-dd
log4j.appender.ROLLING_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.ROLLING_FILE.layout.ConversionPattern=[Ifish7][%-5p]%d - %c.%t(%F:%L) - %m%n
+log4j.logger.com.ifish=DEBUG
log4j.logger.org.springframework=INFO
log4j.logger.com.hibernate=INFO
-log4j.logger.java.sql=INFO
+log4j.logger.java.sql=DEBUG
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml_bak
similarity index 87%
rename from src/main/resources/logback.xml
rename to src/main/resources/logback.xml_bak
index a3d95ff..fd552df 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml_bak
@@ -46,18 +46,21 @@
WARN
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties
index 336e3d6..a4c9158 100644
--- a/src/main/resources/property.properties
+++ b/src/main/resources/property.properties
@@ -1,5 +1,5 @@
#\u672c\u5730
-#ifish.ip=192.168.1.13
+#ifish.ip=192.168.1.7
#\u6d4b\u8bd5\u4e91
#ifish.ip=139.196.24.156
#\u6b63\u5f0f\u4e91
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 7bd141f..3feccb8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
index.jsp
-
+
contextConfigLocation