修改ftp服务器

沈斌

2018-04-26 f7d1181267e4643534370cf67ddd1b013599f03f

 src/main/java/com/moral/controller/ScreenController.java

@@ -262,7 +262,7 @@
    * 大屏程序在线升级配置读取

    *********************************************/

   private String fileName = "Version.xml";

   private String ip = "121.40.92.176";

   private String ip = "47.96.19.115";

   private String userName = "ftp_user";

   private String userPwd = "qwer1234";

   private int port = 21;

@@ -277,7 +277,8 @@
         ftpClient.login(userName, userPwd);

         ftpClient.changeWorkingDirectory(path);

         //ftpClient.enterRemotePassiveMode();

         ftpClient.enterLocalPassiveMode();

         //ftpClient.enterLocalPassiveMode();

         ftpClient.enterLocalActiveMode();

         InputStream ins = ftpClient.retrieveFileStream(fileName);

         BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));

         String line;

@@ -306,6 +307,12 @@
      }

      return version;

   }



   public static void main(String[] args) {

      ScreenController sc = new ScreenController();

      sc.index();

   }



   /**

    * 地图接口

    * 开始

@@ -456,7 +463,9 @@
      Map<String, Object> parameters = getParametersStartingWith(request, null);

      parameters.put("type", "month");

      String sensorKey = "list";

      if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

      if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {

         parameters.put("description", "description");

      } else {

         sensorKey = parameters.remove("sensorKey").toString();

         List<String> sensorKeys = new ArrayList<String>();

         sensorKeys.add(sensorKey);