Merge branch 'test6.9.3' of http://git.yoho.cn/platform/platform-cms into test6.9.3

@@ -43,7 +43,7 @@ public class CMSHtmlController {
         try{
             //取context下的html文件转成文件流
             String filePath = request.getServletContext().getRealPath(url);
-            logger.info("getContentHtml: filePath is {}", filePath);
+            logger.info("getContentHtml: filePath is {},realPath is {}", filePath, request.getServletContext().getRealPath("/"));
             File f = new File(filePath);
             logger.info("getContentHtml: file is {}, file path is {}", f, f.getPath());
             fis = new FileInputStream(filePath);