Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

ryland 2 лет назад
Родитель
Сommit
5690ceedb8
3 измененных файлов с 12 добавлено и 2 удалено
  1. 2 2
      module/config/config_model.py
  2. 4 0
      module/server/config_manager.py
  3. 6 0
      module/server/script_router.py

+ 2 - 2
module/config/config_model.py

@@ -365,8 +365,8 @@ class ConfigModel(ConfigBase):
         task_object = getattr(self, task, None)
         group_object = getattr(task_object, group, None)
         argument_object = getattr(group_object, argument, None)
-        print(group_object)
-        print(argument_object)
+        # print(group_object)
+        # print(argument_object)
 
         if argument_object is None:
             logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')

+ 4 - 0
module/server/config_manager.py

@@ -22,6 +22,10 @@ class ConfigManager:
             if json.stem == 'template':
                 continue
             result.append(json.stem)
+        if len(result) == 0:
+            # 如果没有脚本文件 则创建一个
+            ConfigManager.copy(file='oas1', template='template')
+            result.append('oas1')
         return result
 
     @staticmethod

+ 6 - 0
module/server/script_router.py

@@ -79,6 +79,12 @@ async def script_task(script_name: str, task: str, group: str, argument: str, ty
             case 'number':
                 value = float(value)
             case 'boolean':
+                if isinstance(value, str):
+                    logger.warning(f'[{script_name}] script argument {argument} value is string, try to convert to bool')
+                    if value.lower() in ['true', '1']:
+                        value = True
+                    elif value.lower() in ['false', '0']:
+                        value = False
                 value = bool(value)
             case 'string':
                 pass