Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/split_text.py
#	core/api_get_article.py
#	core/api_get_article2.py
#	core/api_get_article3.py
#	core/api_get_audio.py
#	core/api_get_spoken_language.py
#	core/api_get_word.py
#	core/api_routes_jwt.py
#	data/get_frequency_script.py
#	deepseek/get_article3.py
#	gpt/chatgpt.py
#	gpt/get_article.py
#	gpt/get_article2.py
#	gpt/gpt.py
#	gpt/gpt_check.py
#	main.py
#	main_9000.py
#	make_docx_demo/check_test_table/aaaaaaaaaa.py
#	make_docx_demo/check_test_table/image_preprocess.py
#	make_docx_demo/check_test_table/image_preprocess2.py
#	make_docx_demo/data.py
#	make_docx_demo/docx_other_func.py
#	make_docx_demo/get_standard_data.py
#	mock/mock_request.py
#	spoken_language/soeexample.py
#	tools/audio.py
#	tools/sql_format.py
#	tools/thread_pool_manager.py
xie 3 týždňov pred
rodič
commit
10def223d1
2 zmenil súbory, kde vykonal 2 pridanie a 0 odobranie
  1. 1 0
      gpt/query_oss_file.py
  2. 1 0
      tools/loglog.py

+ 1 - 0
gpt/query_oss_file.py

@@ -12,6 +12,7 @@ from oss2.credentials import EnvironmentVariableCredentialsProvider
 from tools.loglog import logger
 
 
+
 def query_file_content(key):
     """
     :param key: OSS的键;key = 'study/article/14138566'

+ 1 - 0
tools/loglog.py

@@ -75,6 +75,7 @@ simple_logger = SimpleLogger()
 temp_logger = SimpleLogger(base_file_name="temp_log")
 
 
+
 def exception_handler(func):
     def wrapper(*args, **kwargs):
         try: