diff --git a/src/main/java/com/ifish/config/MyWSServletContextListener.java b/src/main/java/com/ifish/config/MyWSServletContextListener.java
deleted file mode 100644
index 415e373..0000000
--- a/src/main/java/com/ifish/config/MyWSServletContextListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.ifish.config;
-
-import com.sun.xml.ws.transport.http.servlet.WSServletContextListener;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
-
-/**
- *
- * @author Administrator
- */
-public class MyWSServletContextListener implements ServletContextListener {
-
- private static WSServletContextListener wsscl = null;
-
- static {
- wsscl = new WSServletContextListener();
- }
-
- @Override
- public void contextInitialized(ServletContextEvent sce) {
- wsscl.contextInitialized(sce);
- }
-
- @Override
- public void contextDestroyed(ServletContextEvent sce) {
- wsscl.contextDestroyed(sce);
- }
-
-}
diff --git a/src/main/java/com/ifish/socket/config/MinaServerHandler.java b/src/main/java/com/ifish/socket/config/MinaServerHandler.java
index 9ea0497..ad14bfd 100644
--- a/src/main/java/com/ifish/socket/config/MinaServerHandler.java
+++ b/src/main/java/com/ifish/socket/config/MinaServerHandler.java
@@ -108,7 +108,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void messageSent(IoSession session, Object message) {
- //System.out.println("messageSent");
+ System.out.println("messageSent");
}
/**
@@ -126,7 +126,7 @@ public class MinaServerHandler extends IoHandlerAdapter {
*/
@Override
public void sessionOpened(IoSession session) throws Exception {
- //log.info("session open!!!");
+ log.info("session open!!!");
}
}
diff --git a/src/main/java/com/ifish/socket/config/ScheduleJob.java b/src/main/java/com/ifish/socket/config/ScheduleJob.java
index 9875501..4800254 100644
--- a/src/main/java/com/ifish/socket/config/ScheduleJob.java
+++ b/src/main/java/com/ifish/socket/config/ScheduleJob.java
@@ -5,10 +5,7 @@
*/
package com.ifish.socket.config;
-import com.ifish.helper.UserHelperI;
import com.ifish.socket.model.JobGroup;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import org.quartz.JobBuilder;
import org.quartz.JobDetail;
import org.quartz.JobKey;
@@ -22,7 +19,6 @@ import org.quartz.impl.StdSchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
/**
*
diff --git a/src/main/java/com/ifish/socket/webService/MyService.java b/src/main/java/com/ifish/socket/webService/MyService.java
index acf3691..e938b5e 100644
--- a/src/main/java/com/ifish/socket/webService/MyService.java
+++ b/src/main/java/com/ifish/socket/webService/MyService.java
@@ -18,8 +18,8 @@ import org.apache.mina.core.session.IoSession;
*/
@WebService
public class MyService {
-
//查询设备是否在线
+
public boolean deviceIsOnline(String macAddress) {
if (macAddress != null && macAddress.length() > 0) {
IoSession session = SomeServer.sessions_cz.get(macAddress);
@@ -51,5 +51,4 @@ public class MyService {
}
return false;
}
-
}
diff --git a/src/main/java/com/ifish/socket/webService/ServiceBean.java b/src/main/java/com/ifish/socket/webService/ServiceBean.java
index 3514ded..47601e6 100644
--- a/src/main/java/com/ifish/socket/webService/ServiceBean.java
+++ b/src/main/java/com/ifish/socket/webService/ServiceBean.java
@@ -13,16 +13,9 @@ import javax.xml.ws.Endpoint;
*/
public class ServiceBean {
+ private static boolean push = false;
+
public ServiceBean() {
-
- }
-
- public void init() {
- try {
- Endpoint.publish("http://localhost:9001/Service/webService", new MyService());
- System.out.println("MyService发布成功!");
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
+ Endpoint.publish("http://localhost:9001/Service/webService", new MyService());
}
}
diff --git a/src/main/resources/minaConfig.xml b/src/main/resources/minaConfig.xml
index 5a6f97f..a514ace 100644
--- a/src/main/resources/minaConfig.xml
+++ b/src/main/resources/minaConfig.xml
@@ -8,7 +8,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
+
@@ -61,7 +61,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..6058a36
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+ 30
+
+
+