Merge branch 'hotfix/修复TXT和HTML文件在线打开乱码问题' into 'develop'

hotfix/修复TXT和HTML文件在线打开乱码问题  同时合并到master

See merge request o2oa/o2oa!681

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java

@@ -775,6 +775,9 @@ public class Config {
 			MimeTypes mimeTypes = new MimeTypes();
 			/* 添加o2自定义格式 */
 			mimeTypes.addMimeMapping("wcss", "application/json");
+			/* TXT和HTML文件以utf-8输出，解决在线打开乱码问题 */
+			mimeTypes.addMimeMapping("txt", "text/plain; charset=UTF-8");
+			mimeTypes.addMimeMapping("html", "text/html; charset=UTF-8");
 			/* 添加默认格式 */
 			mimeTypes.addMimeMapping("", "application/octet-stream");
 			/* 添加新版office格式 */
@@ -1006,7 +1009,7 @@ public class Config {
 //		}
 //		return instance().messageTable;
 //	}
-//	
+//
 //	private MessageHadoop messageHadoop;
 //
 //	public static synchronized MessageHadoop messageHadoop() throws Exception {