From 371303a5e98a660cf4fd112d45263e2c65dc6dc4 Mon Sep 17 00:00:00 2001
From: nancylizi <li.zi30@zte.com.cn>
Date: Mon, 19 Sep 2016 15:28:25 +0800
Subject: [PATCH] Remove Chinese charactor

Change-Id: I7457b30f67498c6dccf30350e667e6288c21b8a3
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
---
 .../java/org/openo/commontosca/catalog/common/ZipCompressor.java    | 6 +++---
 .../org/openo/commontosca/catalog/filemanage/http/ToolUtil.java     | 4 ++--
 .../src/main/java/org/openo/commontosca/catalog/ftp/FtpUtil.java    | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ZipCompressor.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ZipCompressor.java
index e378c36c..ab556277 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ZipCompressor.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/common/ZipCompressor.java
@@ -67,7 +67,7 @@ public class ZipCompressor {
   public void compress(String srcPathName) {
     File file = new File(srcPathName);
     if (!file.exists()) {
-      throw new RuntimeException(srcPathName + "not exist！");
+      throw new RuntimeException(srcPathName + "not exist!");
     }
     try {
       FileOutputStream fileOutputStream = new FileOutputStream(zipFile);
@@ -83,10 +83,10 @@ public class ZipCompressor {
 
   private void compress(File file, ZipOutputStream out, String basedir) {
     if (file.isDirectory()) {
-      System.out.println("compress：" + basedir + file.getName());
+      System.out.println("compress: " + basedir + file.getName());
       this.compressDirectory(file, out, basedir);
     } else {
-      System.out.println("compress：" + basedir + file.getName());
+      System.out.println("compress: " + basedir + file.getName());
       this.compressFile(file, out, basedir);
     }
   }
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/ToolUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/ToolUtil.java
index 97abd3ae..931c5f33 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/ToolUtil.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/filemanage/http/ToolUtil.java
@@ -80,7 +80,7 @@ public class ToolUtil {
       }
     }
     if (!flag) {
-      String message = "Copy catagory " + srcDirName + " to " + destDirName + " failed！";
+      String message = "Copy catagory " + srcDirName + " to " + destDirName + " failed!";
       LOGGER.error(message);
       return false;
     } else {
@@ -99,7 +99,7 @@ public class ToolUtil {
     File srcFile = new File(srcFileName);
 
     if (!srcFile.exists()) {
-      String message = "Source file ：" + srcFileName + " not exist !";
+      String message = "Source file : " + srcFileName + " not exist !";
       LOGGER.error(message);
       return false;
     } else if (!srcFile.isFile()) {
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/ftp/FtpUtil.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/ftp/FtpUtil.java
index 01ab5a24..84d65416 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/ftp/FtpUtil.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/ftp/FtpUtil.java
@@ -157,7 +157,6 @@ public class FtpUtil {
         OutputStream outputStream = null;
         try {
           File locaFile = new File(relativeLocalPath + ftpFile.getName());
-          // 判断文件是否存在，存在则返回
           if (locaFile.exists()) {
             return;
           } else {
@@ -174,7 +173,7 @@ public class FtpUtil {
               outputStream.close();
             }
           } catch (IOException e1) {
-            logger.error("输出文件流异常");
+            logger.error("OutputStream error !");
           }
         }
       }
-- 
2.16.6