获取文本内容bug修改

DAPlatform/views/uploadDownload.py

@@ -191,9 +191,17 @@ def getFileContent():
 
     url = result.get('textUrl')
     try:
-        fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r', encoding='UTF-8').read()
+        fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r', encoding='utf-8').read()
     except Exception as e:
-        fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r', encoding='cp936').read()
+        try:
+            fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r', encoding='utf-16').read()
+        except Exception as e:
+            try:
+                fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r').read()
+            except Exception as e:
+                return_dict['return_code'] = '203'
+                return_dict['return_info'] = '该编码的文本文法打开'
+                return json.dumps(return_dict, ensure_ascii=False)
 
     # 后端传给前端 return_dict = {'return_code': '200', 'return_info': '处理成功', 'result': fileStr}
     return_dict['result'] = fileStr