Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/se...

霍东伟

2019-06-27 8a4cd2babff6f08c8eea127211f9d4a755e1dd88

Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw

 sensor/WebRoot/WEB-INF/web.xml

@@ -81,7 +81,7 @@
    <listener-class>com.fgkj.Listeners.Sessionlister</listener-class>

  </listener>

  <welcome-file-list>

    <welcome-file>CheckClient.jsp</welcome-file>

    <welcome-file>index.html</welcome-file>

  </welcome-file-list>

  <servlet>

    <servlet-name>Faces Servlet</servlet-name>


 sensor/src/com/fgkj/actions/Sensor_mapinfoAction.java

@@ -13,7 +13,7 @@
    public String searchAll() {

        ServiceModel model= service.searchAll();

        result=tojson(model);

        System.out.println(result);

        //System.out.println(result);

        return SUCCESS;

    }