diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d81d650..5af92e8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,10 +31,10 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+<!--
     <listener>
         <listener-class>com.casic.accessControl.cnt.MySessionListener</listener-class>
-    </listener>
+    </listener>-->
 
     <session-config>
         <session-timeout>30</session-timeout>

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d81d650..5af92e8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,10 +31,10 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+<!--
     <listener>
         <listener-class>com.casic.accessControl.cnt.MySessionListener</listener-class>
-    </listener>
+    </listener>-->
 
     <session-config>
         <session-timeout>30</session-timeout>
diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp
index 1879a54..99bcfb0 100644
--- a/src/main/webapp/common/layout/header.jsp
+++ b/src/main/webapp/common/layout/header.jsp
@@ -3,15 +3,7 @@
 <%@ page import="com.casic.accessControl.util.StringUtils" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script>
-    /*  var logout = function () {
 
-     window.location.href = '${ctx}/user/sys-log-out.do'
-
-     }
-
-     var resetPassword = function () {
-     window.location.href = '${ctx}/content/user/user-change-pwd.jsp'
-     }*/
 </script>
 
 <div class="header navbar navbar-inverse navbar-fixed-top">
@@ -46,150 +38,6 @@
 
 <ul class="nav pull-right">
 
-    <!-- BEGIN NOTIFICATION DROPDOWN -->
-
-    <!--<li class="dropdown" id="header_notification_bar">
-
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-
-            <i class="icon-warning-sign"></i>
-
-            <span class="badge">100000</span>
-
-        </a>
-
-        <ul class="dropdown-menu extended notification">
-
-            <li>
-
-                <p>新增标识:1000，总数:100000</p>
-
-            </li>
-
-            <li>
-
-                <a href="#">
-
-                    <span class="label label-success"><i class="icon-plus"></i></span>
-
-                    New user registered.
-
-                    <span class="time">Just now</span>
-
-                </a>
-
-            </li>
-
-            <li class="external">
-
-                <a href="#">See all notifications <i class="m-icon-swapright"></i></a>
-
-            </li>
-
-        </ul> -->
-
-    </li>
-
-    <!-- END NOTIFICATION DROPDOWN -->
-
-    <!-- BEGIN TODO DROPDOWN -->
-
-    <%--<li class="dropdown" id="header_task_bar">--%>
-
-        <%--<a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
-
-            <%--<i class="icon-tasks"></i>--%>
-
-            <%--&lt;%&ndash;<span class="badge">3</span>&ndash;%&gt;--%>
-
-        <%--</a>--%>
-
-        <%--<ul class="dropdown-menu extended tasks">--%>
-
-            <%--<li>--%>
-
-                <%--<p id="title_runningTasks">正在执行任务数：20条</p>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">正在执行任务占比</span>--%>
-
-								<%--<span class="percent" id="runningTasks_per">30%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success ">--%>
-
-								<%--<span style="width: 30%;" class="bar" id="runningTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">待领取任务占比：</span>--%>
-
-								<%--<span class="percent" id="unfetchingTasks_per">65%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-danger progress-striped active">--%>
-
-								<%--<span style="width: 65%;" class="bar" id="unfetchingTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">已完成任务占比</span>--%>
-
-								<%--<span class="percent" id="finishedTasks_per">98%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success">--%>
-
-								<%--<span style="width: 98%;" class="bar" id="finishedTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li class="external">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">查看所有任务 <i class="m-icon-swapright"></i></a>--%>
-
-            <%--</li>--%>
-
-        <%--</ul>--%>
-
-    <%--</li>--%>
-
-    <!-- END TODO DROPDOWN -->
-
     <!-- BEGIN USER LOGIN DROPDOWN -->
 
     <li class="dropdown user">
@@ -227,85 +75,4 @@
 </div>
 
 <!-- END TOP NAVIGATION BAR -->
-
 </div>
-<script src="${ctx}/s/media/js/jquery-1.10.1.min.js" type="text/javascript"></script>
-
-<script>
-//    $(function () {
-//
-//        //TODO LIST：访问任务统计接口
-//        var showTaskDetails = function (totalTasks, runningTasks, unfetchTasks) {
-//            var endDate;//预留接口
-//            var startDate;
-//            var undo = 0;
-//            var doing = 0;
-//            var done = 0;
-//            var total = 0;
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/task/getTaskCount.do",
-//                dataType: "json",
-//                data: {"startDate": startDate, "endDate": endDate},//startDate和endDate取本三十天内的，还未做
-//                async: false,
-//                success: function (res) {
-//                    var jData = eval(res);
-//                    if (jData.success == true) {
-//                        var dataRes = res.data;
-//                        var series = dataRes.length;
-//                        for (var i = 0; i < series; i++) {
-//                            if (dataRes[i].status == 0) {
-//                                undo = dataRes[i].statusCount;
-//                                total = total + undo;
-//                            }
-//                            if (dataRes[i].status == 1) {
-//                                doing = dataRes[i].statusCount;
-//                                total = total + doing;
-//                            }
-//                            if (dataRes[i].status == 2) {
-//                                done = dataRes[i].statusCount;
-//                                total = total + done;
-//                            }
-//
-//                        }
-//                        var doingValue = 0;
-//                        var undoValue = 0;
-//                        var doneValue = 0;
-//                        if (total != 0) {
-//                             doingValue = parseFloat(doing * 100 / total).toFixed(2);
-//                             undoValue = parseFloat(undo * 100 / total).toFixed(2);
-//                             doneValue = 100 - doingValue - undoValue;
-//                        }
-//                        $("#runningTasks_per").html(doingValue + "%");
-//                        $("#runningTasks_bar").css("width", doingValue + "%");
-//                        $("#unfetchingTasks_per").html(undoValue + "%");
-//                        $("#unfetchingTasks_bar").css("width", undoValue + "%");
-//                        $("#finishedTasks_per").html(doneValue + "%");
-//                        $("#finishedTasks_bar").css("width", doneValue + "%");
-//
-//                    }
-//                },
-//                error: function (request) {
-//
-//                    alert("获取任务状态失败");
-//
-//                }
-//            });
-//
-//
-//            $("#title_runningTasks").html("本月任务");
-//
-//
-//        };
-
-//        showTaskDetails();
-
-//        //TODO LIST：访问标识器数据接口
-//
-//        var showMarkInfo = function () {
-//
-//        };
-//
-//
-//    })
-</script>
\ No newline at end of file

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d81d650..5af92e8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,10 +31,10 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+<!--
     <listener>
         <listener-class>com.casic.accessControl.cnt.MySessionListener</listener-class>
-    </listener>
+    </listener>-->
 
     <session-config>
         <session-timeout>30</session-timeout>
diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp
index 1879a54..99bcfb0 100644
--- a/src/main/webapp/common/layout/header.jsp
+++ b/src/main/webapp/common/layout/header.jsp
@@ -3,15 +3,7 @@
 <%@ page import="com.casic.accessControl.util.StringUtils" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script>
-    /*  var logout = function () {
 
-     window.location.href = '${ctx}/user/sys-log-out.do'
-
-     }
-
-     var resetPassword = function () {
-     window.location.href = '${ctx}/content/user/user-change-pwd.jsp'
-     }*/
 </script>
 
 <div class="header navbar navbar-inverse navbar-fixed-top">
@@ -46,150 +38,6 @@
 
 <ul class="nav pull-right">
 
-    <!-- BEGIN NOTIFICATION DROPDOWN -->
-
-    <!--<li class="dropdown" id="header_notification_bar">
-
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-
-            <i class="icon-warning-sign"></i>
-
-            <span class="badge">100000</span>
-
-        </a>
-
-        <ul class="dropdown-menu extended notification">
-
-            <li>
-
-                <p>新增标识:1000，总数:100000</p>
-
-            </li>
-
-            <li>
-
-                <a href="#">
-
-                    <span class="label label-success"><i class="icon-plus"></i></span>
-
-                    New user registered.
-
-                    <span class="time">Just now</span>
-
-                </a>
-
-            </li>
-
-            <li class="external">
-
-                <a href="#">See all notifications <i class="m-icon-swapright"></i></a>
-
-            </li>
-
-        </ul> -->
-
-    </li>
-
-    <!-- END NOTIFICATION DROPDOWN -->
-
-    <!-- BEGIN TODO DROPDOWN -->
-
-    <%--<li class="dropdown" id="header_task_bar">--%>
-
-        <%--<a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
-
-            <%--<i class="icon-tasks"></i>--%>
-
-            <%--&lt;%&ndash;<span class="badge">3</span>&ndash;%&gt;--%>
-
-        <%--</a>--%>
-
-        <%--<ul class="dropdown-menu extended tasks">--%>
-
-            <%--<li>--%>
-
-                <%--<p id="title_runningTasks">正在执行任务数：20条</p>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">正在执行任务占比</span>--%>
-
-								<%--<span class="percent" id="runningTasks_per">30%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success ">--%>
-
-								<%--<span style="width: 30%;" class="bar" id="runningTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">待领取任务占比：</span>--%>
-
-								<%--<span class="percent" id="unfetchingTasks_per">65%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-danger progress-striped active">--%>
-
-								<%--<span style="width: 65%;" class="bar" id="unfetchingTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">已完成任务占比</span>--%>
-
-								<%--<span class="percent" id="finishedTasks_per">98%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success">--%>
-
-								<%--<span style="width: 98%;" class="bar" id="finishedTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li class="external">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">查看所有任务 <i class="m-icon-swapright"></i></a>--%>
-
-            <%--</li>--%>
-
-        <%--</ul>--%>
-
-    <%--</li>--%>
-
-    <!-- END TODO DROPDOWN -->
-
     <!-- BEGIN USER LOGIN DROPDOWN -->
 
     <li class="dropdown user">
@@ -227,85 +75,4 @@
 </div>
 
 <!-- END TOP NAVIGATION BAR -->
-
 </div>
-<script src="${ctx}/s/media/js/jquery-1.10.1.min.js" type="text/javascript"></script>
-
-<script>
-//    $(function () {
-//
-//        //TODO LIST：访问任务统计接口
-//        var showTaskDetails = function (totalTasks, runningTasks, unfetchTasks) {
-//            var endDate;//预留接口
-//            var startDate;
-//            var undo = 0;
-//            var doing = 0;
-//            var done = 0;
-//            var total = 0;
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/task/getTaskCount.do",
-//                dataType: "json",
-//                data: {"startDate": startDate, "endDate": endDate},//startDate和endDate取本三十天内的，还未做
-//                async: false,
-//                success: function (res) {
-//                    var jData = eval(res);
-//                    if (jData.success == true) {
-//                        var dataRes = res.data;
-//                        var series = dataRes.length;
-//                        for (var i = 0; i < series; i++) {
-//                            if (dataRes[i].status == 0) {
-//                                undo = dataRes[i].statusCount;
-//                                total = total + undo;
-//                            }
-//                            if (dataRes[i].status == 1) {
-//                                doing = dataRes[i].statusCount;
-//                                total = total + doing;
-//                            }
-//                            if (dataRes[i].status == 2) {
-//                                done = dataRes[i].statusCount;
-//                                total = total + done;
-//                            }
-//
-//                        }
-//                        var doingValue = 0;
-//                        var undoValue = 0;
-//                        var doneValue = 0;
-//                        if (total != 0) {
-//                             doingValue = parseFloat(doing * 100 / total).toFixed(2);
-//                             undoValue = parseFloat(undo * 100 / total).toFixed(2);
-//                             doneValue = 100 - doingValue - undoValue;
-//                        }
-//                        $("#runningTasks_per").html(doingValue + "%");
-//                        $("#runningTasks_bar").css("width", doingValue + "%");
-//                        $("#unfetchingTasks_per").html(undoValue + "%");
-//                        $("#unfetchingTasks_bar").css("width", undoValue + "%");
-//                        $("#finishedTasks_per").html(doneValue + "%");
-//                        $("#finishedTasks_bar").css("width", doneValue + "%");
-//
-//                    }
-//                },
-//                error: function (request) {
-//
-//                    alert("获取任务状态失败");
-//
-//                }
-//            });
-//
-//
-//            $("#title_runningTasks").html("本月任务");
-//
-//
-//        };
-
-//        showTaskDetails();
-
-//        //TODO LIST：访问标识器数据接口
-//
-//        var showMarkInfo = function () {
-//
-//        };
-//
-//
-//    })
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp
index ca1c791..3cf4b4e 100644
--- a/src/main/webapp/common/layout/menu_new.jsp
+++ b/src/main/webapp/common/layout/menu_new.jsp
@@ -32,22 +32,6 @@
 
         </li>
 
-        <%--<region:region-permission permission="层次结构管理:read" region="0">--%>
-            <%--&lt;%&ndash;<!--组织结构管理-->&ndash;%&gt;--%>
-            <%--<li class="${currentMenu == 'org' ? 'start active' : ''}">--%>
-                <%--<a href="${ctx}/content/org/org.jsp" target="_top">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">层次结构管理</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-            <%--<!--组织机构管理-->--%>
-        <%--</region:region-permission>--%>
-
        <region:region-permission permission="位置点管理:read" region="0">
             <!--权限管理-->
             <li class="${currentMenu == 'markerManagerMenu' ? 'start active' : ''}">
@@ -99,21 +83,6 @@
             </li>
         </region:region-permission>
 
-        <%--<region:region-permission permission="任务图表:read" region="0">--%>
-            <%--<!--系统服务-->--%>
-            <%--<li class="${currentMenu == 'task-charts' ? 'start active' : ''}">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">任务图表</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-        <%--</region:region-permission>--%>
     </ul>
 </div>
 

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d81d650..5af92e8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,10 +31,10 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+<!--
     <listener>
         <listener-class>com.casic.accessControl.cnt.MySessionListener</listener-class>
-    </listener>
+    </listener>-->
 
     <session-config>
         <session-timeout>30</session-timeout>
diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp
index 1879a54..99bcfb0 100644
--- a/src/main/webapp/common/layout/header.jsp
+++ b/src/main/webapp/common/layout/header.jsp
@@ -3,15 +3,7 @@
 <%@ page import="com.casic.accessControl.util.StringUtils" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script>
-    /*  var logout = function () {
 
-     window.location.href = '${ctx}/user/sys-log-out.do'
-
-     }
-
-     var resetPassword = function () {
-     window.location.href = '${ctx}/content/user/user-change-pwd.jsp'
-     }*/
 </script>
 
 <div class="header navbar navbar-inverse navbar-fixed-top">
@@ -46,150 +38,6 @@
 
 <ul class="nav pull-right">
 
-    <!-- BEGIN NOTIFICATION DROPDOWN -->
-
-    <!--<li class="dropdown" id="header_notification_bar">
-
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-
-            <i class="icon-warning-sign"></i>
-
-            <span class="badge">100000</span>
-
-        </a>
-
-        <ul class="dropdown-menu extended notification">
-
-            <li>
-
-                <p>新增标识:1000，总数:100000</p>
-
-            </li>
-
-            <li>
-
-                <a href="#">
-
-                    <span class="label label-success"><i class="icon-plus"></i></span>
-
-                    New user registered.
-
-                    <span class="time">Just now</span>
-
-                </a>
-
-            </li>
-
-            <li class="external">
-
-                <a href="#">See all notifications <i class="m-icon-swapright"></i></a>
-
-            </li>
-
-        </ul> -->
-
-    </li>
-
-    <!-- END NOTIFICATION DROPDOWN -->
-
-    <!-- BEGIN TODO DROPDOWN -->
-
-    <%--<li class="dropdown" id="header_task_bar">--%>
-
-        <%--<a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
-
-            <%--<i class="icon-tasks"></i>--%>
-
-            <%--&lt;%&ndash;<span class="badge">3</span>&ndash;%&gt;--%>
-
-        <%--</a>--%>
-
-        <%--<ul class="dropdown-menu extended tasks">--%>
-
-            <%--<li>--%>
-
-                <%--<p id="title_runningTasks">正在执行任务数：20条</p>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">正在执行任务占比</span>--%>
-
-								<%--<span class="percent" id="runningTasks_per">30%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success ">--%>
-
-								<%--<span style="width: 30%;" class="bar" id="runningTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">待领取任务占比：</span>--%>
-
-								<%--<span class="percent" id="unfetchingTasks_per">65%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-danger progress-striped active">--%>
-
-								<%--<span style="width: 65%;" class="bar" id="unfetchingTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">已完成任务占比</span>--%>
-
-								<%--<span class="percent" id="finishedTasks_per">98%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success">--%>
-
-								<%--<span style="width: 98%;" class="bar" id="finishedTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li class="external">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">查看所有任务 <i class="m-icon-swapright"></i></a>--%>
-
-            <%--</li>--%>
-
-        <%--</ul>--%>
-
-    <%--</li>--%>
-
-    <!-- END TODO DROPDOWN -->
-
     <!-- BEGIN USER LOGIN DROPDOWN -->
 
     <li class="dropdown user">
@@ -227,85 +75,4 @@
 </div>
 
 <!-- END TOP NAVIGATION BAR -->
-
 </div>
-<script src="${ctx}/s/media/js/jquery-1.10.1.min.js" type="text/javascript"></script>
-
-<script>
-//    $(function () {
-//
-//        //TODO LIST：访问任务统计接口
-//        var showTaskDetails = function (totalTasks, runningTasks, unfetchTasks) {
-//            var endDate;//预留接口
-//            var startDate;
-//            var undo = 0;
-//            var doing = 0;
-//            var done = 0;
-//            var total = 0;
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/task/getTaskCount.do",
-//                dataType: "json",
-//                data: {"startDate": startDate, "endDate": endDate},//startDate和endDate取本三十天内的，还未做
-//                async: false,
-//                success: function (res) {
-//                    var jData = eval(res);
-//                    if (jData.success == true) {
-//                        var dataRes = res.data;
-//                        var series = dataRes.length;
-//                        for (var i = 0; i < series; i++) {
-//                            if (dataRes[i].status == 0) {
-//                                undo = dataRes[i].statusCount;
-//                                total = total + undo;
-//                            }
-//                            if (dataRes[i].status == 1) {
-//                                doing = dataRes[i].statusCount;
-//                                total = total + doing;
-//                            }
-//                            if (dataRes[i].status == 2) {
-//                                done = dataRes[i].statusCount;
-//                                total = total + done;
-//                            }
-//
-//                        }
-//                        var doingValue = 0;
-//                        var undoValue = 0;
-//                        var doneValue = 0;
-//                        if (total != 0) {
-//                             doingValue = parseFloat(doing * 100 / total).toFixed(2);
-//                             undoValue = parseFloat(undo * 100 / total).toFixed(2);
-//                             doneValue = 100 - doingValue - undoValue;
-//                        }
-//                        $("#runningTasks_per").html(doingValue + "%");
-//                        $("#runningTasks_bar").css("width", doingValue + "%");
-//                        $("#unfetchingTasks_per").html(undoValue + "%");
-//                        $("#unfetchingTasks_bar").css("width", undoValue + "%");
-//                        $("#finishedTasks_per").html(doneValue + "%");
-//                        $("#finishedTasks_bar").css("width", doneValue + "%");
-//
-//                    }
-//                },
-//                error: function (request) {
-//
-//                    alert("获取任务状态失败");
-//
-//                }
-//            });
-//
-//
-//            $("#title_runningTasks").html("本月任务");
-//
-//
-//        };
-
-//        showTaskDetails();
-
-//        //TODO LIST：访问标识器数据接口
-//
-//        var showMarkInfo = function () {
-//
-//        };
-//
-//
-//    })
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp
index ca1c791..3cf4b4e 100644
--- a/src/main/webapp/common/layout/menu_new.jsp
+++ b/src/main/webapp/common/layout/menu_new.jsp
@@ -32,22 +32,6 @@
 
         </li>
 
-        <%--<region:region-permission permission="层次结构管理:read" region="0">--%>
-            <%--&lt;%&ndash;<!--组织结构管理-->&ndash;%&gt;--%>
-            <%--<li class="${currentMenu == 'org' ? 'start active' : ''}">--%>
-                <%--<a href="${ctx}/content/org/org.jsp" target="_top">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">层次结构管理</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-            <%--<!--组织机构管理-->--%>
-        <%--</region:region-permission>--%>
-
        <region:region-permission permission="位置点管理:read" region="0">
             <!--权限管理-->
             <li class="${currentMenu == 'markerManagerMenu' ? 'start active' : ''}">
@@ -99,21 +83,6 @@
             </li>
         </region:region-permission>
 
-        <%--<region:region-permission permission="任务图表:read" region="0">--%>
-            <%--<!--系统服务-->--%>
-            <%--<li class="${currentMenu == 'task-charts' ? 'start active' : ''}">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">任务图表</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-        <%--</region:region-permission>--%>
     </ul>
 </div>
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 2ee5c79..dd0e96a 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -33,7 +33,9 @@
     <!-- BEGIN PAGE LEVEL STYLES -->
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>
+<%--
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>
+--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>
     <link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css"/>
 
@@ -41,7 +43,6 @@
     <link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"/>
     <!-- END PAGE LEVEL STYLES -->
     <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>
-
     <script type="text/javascript"
             src="http://api.map.baidu.com/api?v=2.0&ak=ldIdfo22fMLn0g3bCWFnuuelk6WbFGQI"></script>
     <script type="text/javascript"
@@ -135,14 +136,15 @@
                                 </div>
 
                                 <div class="span1">
-                                    <button  id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询
-                                    </button>
+                                    <button id="searchMarker" class="btn blue" type="button">查询</button>
+<%--todo list:错误使用方法
+                                    <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
+--%>
                                 </div>
 
                             </div>
                         </div>
 
-
                     </form>
 
                 </div>
@@ -507,7 +509,10 @@
 
 <!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->
 <!-- BEGIN CORE PLUGINS -->
+<%--
 <script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>
+--%>
+<script src="${ctx}/s/jquery-easyui-1.4.3/jquery.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>
@@ -517,16 +522,17 @@
 <!-- BEGIN PAGE LEVEL SCRIPTS -->
 <script language="javascript" type="text/javascript" src="${ctx}/s/layout/jquery.layout.min.js"></script>
 <script src="${ctx}/s/media/js/jquery.form.js" type="text/javascript"></script>
+<%--
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
+--%>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
+<%--
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>
-<script type="text/javascript"
-        src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
-<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>--%>
-
 
 <!-- END PAGE LEVEL SCRIPTS -->
 <script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>
@@ -551,7 +557,6 @@
         Ems.initForm();
         Ems.initSelect();
         EmsMarkerOpt.init();
-
     })
 </script>
 

diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
deleted file mode 100644
index 47f547a..0000000
--- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.accessControl.cnt;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.HashSet;
-
-/**
- * Created by test203 on 2015/10/22.
- */
-public class MySessionListener implements HttpSessionListener {
-    public void sessionCreated(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext application = session.getServletContext();
-        HashSet sessions = (HashSet)application.getAttribute("sessions");
-        if(sessions == null){
-            sessions = new HashSet();
-            application.setAttribute("sessions",sessions);
-        }
-        sessions.add(session);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent se) {
-        HttpSession session = se.getSession();
-        ServletContext applications = session.getServletContext();
-        HashSet sessions = (HashSet)applications.getAttribute("sessions");
-        sessions.remove(session);
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 1fee6ef..f50471e 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.ws.rs.POST;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -235,6 +236,7 @@
 
     @RequestMapping("getMarkerListByCondition")
     @ResponseBody
+    @POST
     public Map<String, Object> getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) {
         Map<String, Object> map = new HashMap<String, Object>();
         User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5b882..b659f37 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 #db.default.username=scott
 #db.default.password=SZHTDB2
 db.default.driverClassName=com.mysql.jdbc.Driver
-db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8
 db.default.username=emsuser
 db.default.password=emsuser
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d81d650..5af92e8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,10 +31,10 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+<!--
     <listener>
         <listener-class>com.casic.accessControl.cnt.MySessionListener</listener-class>
-    </listener>
+    </listener>-->
 
     <session-config>
         <session-timeout>30</session-timeout>
diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp
index 1879a54..99bcfb0 100644
--- a/src/main/webapp/common/layout/header.jsp
+++ b/src/main/webapp/common/layout/header.jsp
@@ -3,15 +3,7 @@
 <%@ page import="com.casic.accessControl.util.StringUtils" %>
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script>
-    /*  var logout = function () {
 
-     window.location.href = '${ctx}/user/sys-log-out.do'
-
-     }
-
-     var resetPassword = function () {
-     window.location.href = '${ctx}/content/user/user-change-pwd.jsp'
-     }*/
 </script>
 
 <div class="header navbar navbar-inverse navbar-fixed-top">
@@ -46,150 +38,6 @@
 
 <ul class="nav pull-right">
 
-    <!-- BEGIN NOTIFICATION DROPDOWN -->
-
-    <!--<li class="dropdown" id="header_notification_bar">
-
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-
-            <i class="icon-warning-sign"></i>
-
-            <span class="badge">100000</span>
-
-        </a>
-
-        <ul class="dropdown-menu extended notification">
-
-            <li>
-
-                <p>新增标识:1000，总数:100000</p>
-
-            </li>
-
-            <li>
-
-                <a href="#">
-
-                    <span class="label label-success"><i class="icon-plus"></i></span>
-
-                    New user registered.
-
-                    <span class="time">Just now</span>
-
-                </a>
-
-            </li>
-
-            <li class="external">
-
-                <a href="#">See all notifications <i class="m-icon-swapright"></i></a>
-
-            </li>
-
-        </ul> -->
-
-    </li>
-
-    <!-- END NOTIFICATION DROPDOWN -->
-
-    <!-- BEGIN TODO DROPDOWN -->
-
-    <%--<li class="dropdown" id="header_task_bar">--%>
-
-        <%--<a href="#" class="dropdown-toggle" data-toggle="dropdown">--%>
-
-            <%--<i class="icon-tasks"></i>--%>
-
-            <%--&lt;%&ndash;<span class="badge">3</span>&ndash;%&gt;--%>
-
-        <%--</a>--%>
-
-        <%--<ul class="dropdown-menu extended tasks">--%>
-
-            <%--<li>--%>
-
-                <%--<p id="title_runningTasks">正在执行任务数：20条</p>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">正在执行任务占比</span>--%>
-
-								<%--<span class="percent" id="runningTasks_per">30%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success ">--%>
-
-								<%--<span style="width: 30%;" class="bar" id="runningTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">待领取任务占比：</span>--%>
-
-								<%--<span class="percent" id="unfetchingTasks_per">65%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-danger progress-striped active">--%>
-
-								<%--<span style="width: 65%;" class="bar" id="unfetchingTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li>--%>
-
-                <%--<a href="#">--%>
-
-								<%--<span class="task">--%>
-
-								<%--<span class="desc">已完成任务占比</span>--%>
-
-								<%--<span class="percent" id="finishedTasks_per">98%</span>--%>
-
-								<%--</span>--%>
-
-								<%--<span class="progress progress-success">--%>
-
-								<%--<span style="width: 98%;" class="bar" id="finishedTasks_bar"></span>--%>
-
-								<%--</span>--%>
-
-                <%--</a>--%>
-
-            <%--</li>--%>
-
-            <%--<li class="external">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">查看所有任务 <i class="m-icon-swapright"></i></a>--%>
-
-            <%--</li>--%>
-
-        <%--</ul>--%>
-
-    <%--</li>--%>
-
-    <!-- END TODO DROPDOWN -->
-
     <!-- BEGIN USER LOGIN DROPDOWN -->
 
     <li class="dropdown user">
@@ -227,85 +75,4 @@
 </div>
 
 <!-- END TOP NAVIGATION BAR -->
-
 </div>
-<script src="${ctx}/s/media/js/jquery-1.10.1.min.js" type="text/javascript"></script>
-
-<script>
-//    $(function () {
-//
-//        //TODO LIST：访问任务统计接口
-//        var showTaskDetails = function (totalTasks, runningTasks, unfetchTasks) {
-//            var endDate;//预留接口
-//            var startDate;
-//            var undo = 0;
-//            var doing = 0;
-//            var done = 0;
-//            var total = 0;
-//            $.ajax({
-//                type: "POST",
-//                url: $('#context').val() + "/task/getTaskCount.do",
-//                dataType: "json",
-//                data: {"startDate": startDate, "endDate": endDate},//startDate和endDate取本三十天内的，还未做
-//                async: false,
-//                success: function (res) {
-//                    var jData = eval(res);
-//                    if (jData.success == true) {
-//                        var dataRes = res.data;
-//                        var series = dataRes.length;
-//                        for (var i = 0; i < series; i++) {
-//                            if (dataRes[i].status == 0) {
-//                                undo = dataRes[i].statusCount;
-//                                total = total + undo;
-//                            }
-//                            if (dataRes[i].status == 1) {
-//                                doing = dataRes[i].statusCount;
-//                                total = total + doing;
-//                            }
-//                            if (dataRes[i].status == 2) {
-//                                done = dataRes[i].statusCount;
-//                                total = total + done;
-//                            }
-//
-//                        }
-//                        var doingValue = 0;
-//                        var undoValue = 0;
-//                        var doneValue = 0;
-//                        if (total != 0) {
-//                             doingValue = parseFloat(doing * 100 / total).toFixed(2);
-//                             undoValue = parseFloat(undo * 100 / total).toFixed(2);
-//                             doneValue = 100 - doingValue - undoValue;
-//                        }
-//                        $("#runningTasks_per").html(doingValue + "%");
-//                        $("#runningTasks_bar").css("width", doingValue + "%");
-//                        $("#unfetchingTasks_per").html(undoValue + "%");
-//                        $("#unfetchingTasks_bar").css("width", undoValue + "%");
-//                        $("#finishedTasks_per").html(doneValue + "%");
-//                        $("#finishedTasks_bar").css("width", doneValue + "%");
-//
-//                    }
-//                },
-//                error: function (request) {
-//
-//                    alert("获取任务状态失败");
-//
-//                }
-//            });
-//
-//
-//            $("#title_runningTasks").html("本月任务");
-//
-//
-//        };
-
-//        showTaskDetails();
-
-//        //TODO LIST：访问标识器数据接口
-//
-//        var showMarkInfo = function () {
-//
-//        };
-//
-//
-//    })
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp
index ca1c791..3cf4b4e 100644
--- a/src/main/webapp/common/layout/menu_new.jsp
+++ b/src/main/webapp/common/layout/menu_new.jsp
@@ -32,22 +32,6 @@
 
         </li>
 
-        <%--<region:region-permission permission="层次结构管理:read" region="0">--%>
-            <%--&lt;%&ndash;<!--组织结构管理-->&ndash;%&gt;--%>
-            <%--<li class="${currentMenu == 'org' ? 'start active' : ''}">--%>
-                <%--<a href="${ctx}/content/org/org.jsp" target="_top">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">层次结构管理</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-            <%--<!--组织机构管理-->--%>
-        <%--</region:region-permission>--%>
-
        <region:region-permission permission="位置点管理:read" region="0">
             <!--权限管理-->
             <li class="${currentMenu == 'markerManagerMenu' ? 'start active' : ''}">
@@ -99,21 +83,6 @@
             </li>
         </region:region-permission>
 
-        <%--<region:region-permission permission="任务图表:read" region="0">--%>
-            <%--<!--系统服务-->--%>
-            <%--<li class="${currentMenu == 'task-charts' ? 'start active' : ''}">--%>
-
-                <%--<a href="${ctx}/content/task/task-charts.jsp">--%>
-
-                    <%--<i class="icon-cogs"></i>--%>
-
-                    <%--<span class="title">任务图表</span>--%>
-
-                    <%--<span class="selected"></span>--%>
-
-                <%--</a>--%>
-            <%--</li>--%>
-        <%--</region:region-permission>--%>
     </ul>
 </div>
 
diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp
index 2ee5c79..dd0e96a 100644
--- a/src/main/webapp/content/ems/ems.jsp
+++ b/src/main/webapp/content/ems/ems.jsp
@@ -33,7 +33,9 @@
     <!-- BEGIN PAGE LEVEL STYLES -->
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/datepicker.css"/>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/chosen.css"/>
+<%--
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/select2_metro.css"/>
+--%>
     <link rel="stylesheet" type="text/css" href="${ctx}/s/media/css/bootstrap-fileupload.css"/>
     <link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css"/>
 
@@ -41,7 +43,6 @@
     <link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"/>
     <!-- END PAGE LEVEL STYLES -->
     <link rel="shortcut icon" href="${ctx}/s/media/image/ht.jpg"/>
-
     <script type="text/javascript"
             src="http://api.map.baidu.com/api?v=2.0&ak=ldIdfo22fMLn0g3bCWFnuuelk6WbFGQI"></script>
     <script type="text/javascript"
@@ -135,14 +136,15 @@
                                 </div>
 
                                 <div class="span1">
-                                    <button  id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询
-                                    </button>
+                                    <button id="searchMarker" class="btn blue" type="button">查询</button>
+<%--todo list:错误使用方法
+                                    <button type="submit" id="searchMarker" class="btn blue"><i class="icon-ok"></i>查询</button>
+--%>
                                 </div>
 
                             </div>
                         </div>
 
-
                     </form>
 
                 </div>
@@ -507,7 +509,10 @@
 
 <!-- BEGIN JAVASCRIPTS(Load javascripts at bottom, this will reduce page load time) -->
 <!-- BEGIN CORE PLUGINS -->
+<%--
 <script src="${ctx}/s/jquery/jquery.min.js" type="text/javascript"></script>
+--%>
+<script src="${ctx}/s/jquery-easyui-1.4.3/jquery.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-migrate-1.2.1.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/jquery-ui-1.10.1.custom.min.js" type="text/javascript"></script>
 <script src="${ctx}/s/media/js/bootstrap.min.js" type="text/javascript"></script>
@@ -517,16 +522,17 @@
 <!-- BEGIN PAGE LEVEL SCRIPTS -->
 <script language="javascript" type="text/javascript" src="${ctx}/s/layout/jquery.layout.min.js"></script>
 <script src="${ctx}/s/media/js/jquery.form.js" type="text/javascript"></script>
+<%--
 <script type="text/javascript" src="${ctx}/s/media/js/DT_bootstrap.js"></script>
+--%>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-fileupload.js"></script>
+<%--
 <script type="text/javascript" src="${ctx}/s/media/js/select2.min.js"></script>
+--%>
 <script type="text/javascript" src="${ctx}/s/media/js/chosen.jquery.min.js"></script>
 <script type="text/javascript" src="${ctx}/s/media/js/bootstrap-datepicker.js"></script>
-<script type="text/javascript"
-        src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/GeoUtils/1.2/src/GeoUtils_min.js"></script>
-<%--<script type="text/javascript" src="${ctx}/s/media/js/jquery.dataTables.js"></script>--%>
-
 
 <!-- END PAGE LEVEL SCRIPTS -->
 <script src="${ctx}/s/media/js/app.js" type="text/javascript"></script>
@@ -551,7 +557,6 @@
         Ems.initForm();
         Ems.initSelect();
         EmsMarkerOpt.init();
-
     })
 </script>
 
diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js
index 340a4ae..44fcca0 100644
--- a/src/main/webapp/s/app/ems/ems.js
+++ b/src/main/webapp/s/app/ems/ems.js
@@ -333,7 +333,6 @@
         initForm: function () {
             handleDatePickers();
             $("#selectObjectType").chosen();
-
             $("#resetEms").live("click", function (e) {
                 $("#markerObjectType").val("");
                 $("#pipeDiameter").val("");
@@ -357,7 +356,6 @@
                 $("#memo").val("");
 
             });
-
             $('#localize').click(function (e) {
                 $('#addModal').modal('hide');
                 //注册地图点击事件