文本编码

DAPlatform/views/uploadDownload.py

@@ -197,11 +197,14 @@ def getFileContent():
             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()
+                fileStr = open(os.path.join(basedir, UPLOAD_FOLDER, url), 'r', encoding='936').read()
             except Exception as e:
-                return_dict['return_code'] = '203'
-                return_dict['return_info'] = '该编码的文本文法打开'
-                return json.dumps(return_dict, ensure_ascii=False)
+                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