工具包修改

base/BaseCore.py

@@ -614,7 +614,7 @@ class BaseCore:
     # 上传至文件服务器,并解析pdf的内容和页数
     def upLoadToServe(self, pdf_url, type_id, social_code):
         headers = {}
-        retData = {'state': False, 'type_id': type_id, 'item_id': social_code, 'group_name': 'group1', 'path': '',
+        retData = {'state': False, 'type_id': type_id, 'item_id': social_code, 'group_name': '', 'path': '',
                    'full_path': '',
                    'category': 'pdf', 'file_size': '', 'status': 1, 'create_by': 'XueLingKun',
                    'create_time': '', 'page_size': '', 'content': ''}
@@ -681,12 +681,12 @@ class BaseCore:
             id = ''
             return id
         else:
-            Upsql = '''insert into clb_sys_attachment(year,name,type_id,item_id,group_name,path,full_path,category,file_size,order_by,status,create_by,create_time,page_size,object_key,publish_time,bucket_name) values(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,'zzsn')'''
+            Upsql = '''insert into clb_sys_attachment(year,name,type_id,item_id,group_name,path,full_path,category,file_size,order_by,status,create_by,create_time,page_size) values(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)'''
 
             values = (
                 year, pdf_name, type_id, item_id, group_name, path, full_path, category, file_size, order_by,
                 status, create_by,
-                create_time, page_size, path, pub_time)
+                pub_time, page_size)
 
             self.cursor_.execute(Upsql, values)  # 插入
             self.cnx_.commit()  # 提交
@@ -750,7 +750,7 @@ class BaseCore:
                 time.sleep(3)
                 continue
         page_size = 0
-        name = name_pdf + '.pdf'
+        name = name_pdf
         now_time = time.strftime("%Y-%m")
         try:
             result = self.getOBSres(pathType, now_time, name, response)