Merge branch 'feature/CHINARPA-4731' into feature/uat-tmp

@@ -162,7 +162,7 @@ class Command(BaseCommand, LoggerMixin):
 
 
     @staticmethod
     @staticmethod
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
-        time_stamp = datetime.now().strftime('%Y-%m-%d_%H:%M:%S')
+        time_stamp = datetime.now().strftime('%Y-%m-%d_%H_%M_%S')
         new_name = '{0}_{1}'.format(time_stamp, name)
         new_name = '{0}_{1}'.format(time_stamp, name)
         img_save_path = os.path.join(img_output_dir, new_name)
         img_save_path = os.path.join(img_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)

@@ -320,7 +320,7 @@ class Command(BaseCommand, LoggerMixin):
                 true_file_set.add(os_error_filename_set.pop())
                 true_file_set.add(os_error_filename_set.pop())
             for name in true_file_set:
             for name in true_file_set:
                 time.sleep(10)
                 time.sleep(10)
-                unique_folder_name = '{0}_{1}'.format(datetime.now().strftime('%Y-%m-%d_%H:%M:%S'), name)
+                unique_folder_name = '{0}_{1}'.format(datetime.now().strftime('%Y-%m-%d_%H_%M_%S'), name)
                 path = os.path.join(input_dir, name)
                 path = os.path.join(input_dir, name)
 
 
                 try:
                 try:

@@ -272,7 +272,7 @@ class Command(BaseCommand, LoggerMixin):
 
 
     @staticmethod
     @staticmethod
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir, seperate_dir_map):
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir, seperate_dir_map):
-        time_stamp = datetime.now().strftime('%Y-%m-%d_%H:%M:%S')
+        time_stamp = datetime.now().strftime('%Y-%m-%d_%H_%M_%S')
         new_name = '{0}_{1}'.format(time_stamp, name)
         new_name = '{0}_{1}'.format(time_stamp, name)
         img_save_path = os.path.join(img_output_dir, new_name)
         img_save_path = os.path.join(img_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)

@@ -186,7 +186,7 @@ class Command(BaseCommand, LoggerMixin):
 
 
     @staticmethod
     @staticmethod
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
-        time_stamp = datetime.now().strftime('%Y-%m-%d_%H:%M:%S')
+        time_stamp = datetime.now().strftime('%Y-%m-%d_%H_%M_%S')
         new_name = '{0}_{1}'.format(time_stamp, name)
         new_name = '{0}_{1}'.format(time_stamp, name)
         img_save_path = os.path.join(img_output_dir, new_name)
         img_save_path = os.path.join(img_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)

@@ -409,7 +409,7 @@ class Command(BaseCommand, LoggerMixin):
 
 
     @staticmethod
     @staticmethod
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
     def get_path(name, img_output_dir, wb_output_dir, pdf_output_dir):
-        time_stamp = datetime.now().strftime('%Y-%m-%d_%H:%M:%S')
+        time_stamp = datetime.now().strftime('%Y-%m-%d_%H_%M_%S')
         new_name = '{0}_{1}'.format(time_stamp, name)
         new_name = '{0}_{1}'.format(time_stamp, name)
         img_save_path = os.path.join(img_output_dir, new_name)
         img_save_path = os.path.join(img_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)
         pdf_save_path = os.path.join(pdf_output_dir, new_name)