diff --git a/server/apps/information/views.py b/server/apps/information/views.py index de7640a..e0d2538 100644 --- a/server/apps/information/views.py +++ b/server/apps/information/views.py @@ -368,21 +368,18 @@ class ParsePdfViewSet(RbacFilterSet, CreateUpdateCustomMixin, ModelViewSet): """ 解析pdf到excel """ - try: - pdf_file = request.data['pdf_file'] - annual = request.data['annual'] - # 读数据路径copy 在media 下新建excel,解析完成后存入数据库。 - media_excel = os.path.join(os.path.dirname(EXCEL_PATH),"media_excel") - if not os.path.exists(media_excel): - os.makedirs(media_excel) - shutil.copy(EXCEL_PATH, media_excel) - save_path = os.path.join(media_excel, os.path.basename(EXCEL_PATH)) - server_pdf_path = settings.BASE_DIR + pdf_file - download_excel_path = save_path.split("server")[-1] - run(server_pdf_path, save_path) - except Exception: - traceback.print_exc() - return Response({"message":"解析失败"}, status = status.HTTP_400_BAD_REQUEST) + + pdf_file = request.data['pdf_file'] + annual = request.data['annual'] + # 读数据路径copy 在media 下新建excel,解析完成后存入数据库。 + media_excel = os.path.join(os.path.dirname(EXCEL_PATH),"media_excel") + if not os.path.exists(media_excel): + os.makedirs(media_excel) + shutil.copy(EXCEL_PATH, media_excel) + save_path = os.path.join(media_excel, os.path.basename(EXCEL_PATH)) + server_pdf_path = settings.BASE_DIR + pdf_file + download_excel_path = save_path.split("server")[-1] + run(server_pdf_path, save_path) Parsepdf.objects.create( pdf_path=pdf_file, excel_path= EXCEL_PATH, diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index 2de3278..f06bcfd 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -18,13 +18,24 @@ DATABASES = { # # 'HOST': '1.203.161.102', # 'PORT': '5432', # } - 'default': { + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'cma', + # 'USER': 'postgres', + # 'PASSWORD': 'zcDsj2021', + # 'HOST': '49.232.14.174', + # # 'HOST': '1.203.161.102', + # 'PORT': '5432', + # }, + 'default': { 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'cma', - 'USER': 'postgres', - 'PASSWORD': 'zcDsj2021', - 'HOST': '49.232.14.174', - # 'HOST': '1.203.161.102', + 'USER': 'cma', + 'PASSWORD': 'cma123', + # 'HOST': '127.0.0.1', + 'HOST': '1.203.161.102', 'PORT': '5432', } + + }