'commit'

ETL/Mars/Config/Config.py

@@ -2,7 +2,7 @@
 city = '湘潭市'
 
 # 数据库配置
-dbname = 'eduData_temp'
+dbname = 'eduData_xt'
 user = 'postgres'
 password = 'dsideal'
 host = '10.10.14.231'

ETL/Mars/Doc/安装文档.md

@@ -60,11 +60,11 @@ python3 Start.py
 
 ## 四、测试
 ```shell
-http://10.10.14.214:8888/exportDoc?year=2020
-http://10.10.14.214:8888/exportPpt?year=2020
+http://192.168.100.100:8888/Mars/exportDoc?year=2020
+http://192.168.100.100:8888/Mars/exportPpt?year=2020
 
-http://10.10.14.214:8888/exportDoc?year=2019
-http://10.10.14.214:8888/exportPpt?year=2019
+http://12:8888/Mars/exportDoc?year=2019
+http://192.168.100.100:8888/Mars/exportPpt?year=2019
 ```
 
 ## 五、异常处理

ETL/Mars/Start.py

@@ -39,7 +39,7 @@ def exportPpt():
     path = basepath + '/Out/' + str(year) + '.pptx'
     # 如果存在，直接返回
     if os.path.exists(path):
-        return send_file(path, as_attachment=True, download_name="Word版本" + str(year) + "年年报.docx")
+        return send_file(path, as_attachment=True, download_name="PPT版本" + str(year) + "年年报.pptx")
 
     from_to = str(year) + "-" + str(year + 1)  # 开始终止年份
     # 修改Ppt