diff --git a/web/thisdb/firewall.py b/web/thisdb/firewall.py index 88c7b0c39..bff32e6f2 100644 --- a/web/thisdb/firewall.py +++ b/web/thisdb/firewall.py @@ -12,10 +12,7 @@ import core.mw as mw __FIELD = 'id,port,protocol,ps,add_time,update_time' -def getFirewallList( - page:int | None = 1, - size:int | None = 10, -): +def getFirewallList(page=1,size=10): start = (int(page) - 1) * (int(size)) limit = str(start) + ',' +str(size) @@ -27,10 +24,7 @@ def getFirewallList( data['list'] = firewall_list return data -def addFirewall(port, - protocol: str | None = 'tcp', - ps: str | None = '备注' -) -> bool: +def addFirewall(port, protocol='tcp',ps='备注') -> bool: ''' 设置配置的值 :port -> str 端口 (必填) diff --git a/web/thisdb/logs.py b/web/thisdb/logs.py index d23d59719..f08b7888c 100644 --- a/web/thisdb/logs.py +++ b/web/thisdb/logs.py @@ -17,9 +17,7 @@ def clearLog(): mw.M('logs').where('id>?', (0,)).delete() return True -def addLog(type, log, - uid: int | None = 1 -) -> str: +def addLog(type, log, uid = 1) -> str: ''' 添加日志 :type -> str 类型 (必填) @@ -35,11 +33,7 @@ def addLog(type, log, mw.M('logs').insert(insert_data) return True -def getLogsList( - page:int | None = 1, - size:int | None = 10, - search: str | None = '' -): +def getLogsList(page = 1,size = 10,search = ''): sql_where = '' if search != '' : sql_where = " type like '%" + search + "%' or log like '%" + search + "%' " diff --git a/web/thisdb/option.py b/web/thisdb/option.py index b57fe1f35..35a32f5cc 100644 --- a/web/thisdb/option.py +++ b/web/thisdb/option.py @@ -12,10 +12,7 @@ import os import json import core.mw as mw -def getOption(name, - type='common', - default=None -) -> str: +def getOption(name,type='common',default=None) -> str: ''' 获取配置的值 :name -> str 名称 (必填) @@ -28,10 +25,7 @@ def getOption(name, return data -def getOptionByJson(name, - type='common', - default=None -) -> object: +def getOptionByJson(name,type='common',default=None) -> object: ''' 获取配置的值,返回对象类型 :name -> str 名称 (必填) diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py index fb2f0a3c4..4ba679e4e 100644 --- a/web/thisdb/sites.py +++ b/web/thisdb/sites.py @@ -111,12 +111,7 @@ def getSitesList( def deleteSitesById(site_id): return mw.M('sites').where("id=?", (site_id,)).delete() -def setSitesData(site_id, - edate: str | None = None, - ps: str | None = None, - path: str | None = None, - status: str | None = None, -): +def setSitesData(site_id, edate = None, ps = None, path = None,status = None): update_data = {} if edate is not None: update_data['edate'] = edate diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py index 317e5e065..bf839cca8 100644 --- a/web/thisdb/tasks.py +++ b/web/thisdb/tasks.py @@ -12,9 +12,7 @@ import core.mw as mw __FIELD = 'id,name,type,start,end,cmd,status,add_time' -def getTaskCount( - status: int | None = -1 - ) -> int: +def getTaskCount(status = -1) -> int: return mw.M('tasks').where('status=?',(1,)).count() @@ -22,12 +20,7 @@ def getTaskCount( def getTaskUnexecutedCount() -> int: return mw.M('tasks').where('status!=?',(1,)).count() -def addTaskByDownload( - name: str | None = '下载文件', - cmd: str | None = None, - type: str | None = 'download', - status: int | None = 0, -): +def addTaskByDownload(name = '下载文件',cmd = None,type = 'download',status = 0): ''' 添加后台任务 :name -> str 类型 @@ -110,19 +103,13 @@ def getTaskFirstByRun() -> None: return None return data -def getTaskRunList( - page: int | None = 1, - size: int | None = 10, -): +def getTaskRunList(page = 1,size = 10): start = (page - 1) * size limit = str(start) + ',' + str(size) task_list = mw.M('tasks').where('status!=?', (1,)).field(__FIELD).limit(limit).order('id asc').select() return task_list -def getTaskRunPage( - page: int | None = 1, - size: int | None = 10, -): +def getTaskRunPage(page = 1, size = 10): start = (page - 1) * size limit = str(start) + ',' + str(size) @@ -135,16 +122,11 @@ def getTaskRunPage( return rdata -def setTaskStatus(task_id, - status: int | None = 0 -): +def setTaskStatus(task_id,status = 0): mw.M('tasks').where('id=?',(task_id,)).update({'status':status}) return True -def setTaskData(id, - start: int | None = None, - end: int | None = None, -): +def setTaskData(id, start = None,end = None): if start is not None: mw.M('tasks').where('id=?',(id,)).update({'start':start}) if end is not None: diff --git a/web/thisdb/temp_login.py b/web/thisdb/temp_login.py index b6ac4e840..558f2526f 100644 --- a/web/thisdb/temp_login.py +++ b/web/thisdb/temp_login.py @@ -14,10 +14,7 @@ import core.mw as mw __FIELD = 'id,token,salt,state,login_time,login_addr,logout_time,expire,add_time' -def addTempLogin( - token:str | None = None, - expire:int | None = None -): +def addTempLogin(token = None,expire = None): if expire is None: start_time = int(time.time()) expire=start_time+3600 @@ -40,10 +37,7 @@ def addTempLogin( return mw.M('temp_login').insert(insert_data) -def getTempLoginPage( - page: int | None = 1, - size: int | None = 10, -): +def getTempLoginPage(page = 1,size = 10): start = (page - 1) * size limit = str(start) + ',' + str(size) tl_list = mw.M('temp_login').where('', ()).field(__FIELD).limit(limit).order('id desc').select() diff --git a/web/thisdb/user.py b/web/thisdb/user.py index ebf74532a..20fa5ff09 100644 --- a/web/thisdb/user.py +++ b/web/thisdb/user.py @@ -36,8 +36,7 @@ def initAdminUser(): return True -def getUserByName(name, -) -> None: +def getUserByName(name) -> None: ''' 获取用户信息通过用户名 ''' @@ -56,8 +55,7 @@ def getUserByName(name, row['update_time'] = data['update_time'] return row -def getUserById(id, -) -> None: +def getUserById(id) -> None: ''' 获取用户信息通过用户名 ''' @@ -95,10 +93,7 @@ def setUserPwdByName(name, password): pwd = mw.md5(password) return mw.M('users').where("name=?", (name,)).setField('password', pwd) -def setUserByRoot( - name: str | None = None, - password: str | None = None, -) -> bool: +def setUserByRoot(name = None,password = None) -> bool: ''' 设置配置的值 :name -> str 名称 (必填)