update

web/thisdb/firewall.py

@@ -12,10 +12,7 @@ import core.mw as mw
 
 __FIELD = 'id,port,protocol,ps,add_time,update_time'
 
-def getFirewallList(
+def getFirewallList(page=1,size=10):
-    page:int | None = 1,
-    size:int | None = 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,
+def addFirewall(port, protocol='tcp',ps='备注') -> bool:
-    protocol: str | None = 'tcp',
-    ps: str | None = '备注'
-) -> bool:
     '''
     设置配置的值
     :port -> str 端口 (必填)

web/thisdb/logs.py

@@ -17,9 +17,7 @@ def clearLog():
     mw.M('logs').where('id>?', (0,)).delete()
     return True
 
-def addLog(type, log,
+def addLog(type, log, uid = 1) -> str:
-    uid: int | None = 1
-) -> str:
     '''
     添加日志
     :type -> str 类型 (必填)
@@ -35,11 +33,7 @@ def addLog(type, log,
     mw.M('logs').insert(insert_data)
     return True
 
-def getLogsList(
+def getLogsList(page = 1,size = 10,search = ''):
-    page:int | None = 1,
-    size:int | None = 10,
-    search: str | None = ''
-):
     sql_where = ''
     if search != '' :
         sql_where = " type like '%" + search + "%' or log like '%" + search + "%' "

web/thisdb/option.py

@@ -12,10 +12,7 @@ import os
 import json
 import core.mw as mw
 
-def getOption(name,
+def getOption(name,type='common',default=None) -> str:
-    type='common',
-    default=None
-) -> str:
     '''
     获取配置的值
     :name -> str 名称 (必填)
@@ -28,10 +25,7 @@ def getOption(name,
     return data
 
 
-def getOptionByJson(name,
+def getOptionByJson(name,type='common',default=None) -> object:
-    type='common',
-    default=None
-) -> object:
     '''
     获取配置的值,返回对象类型
     :name -> str 名称 (必填)

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,
+def setSitesData(site_id, edate = None, ps = None, path = None,status = None):
-    edate: str | None = None,
-    ps: str | None = None,
-    path: str | None = None,
-    status: str | None = None,
-):
     update_data = {}
     if edate is not None:
         update_data['edate'] = edate

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(
+def getTaskCount(status = -1) -> int:
-        status: int | None = -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(
+def addTaskByDownload(name = '下载文件',cmd = None,type = 'download',status = 0):
-    name: str | None = '下载文件',
-    cmd: str | None = None,
-    type: str | None = 'download',
-    status: int | None = 0,
-):
     '''
     添加后台任务
     :name -> str 类型
@@ -110,19 +103,13 @@ def getTaskFirstByRun() -> None:
         return None
     return data
 
-def getTaskRunList(
+def getTaskRunList(page = 1,size = 10):
-    page: int | None = 1,
-    size: int | None = 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(
+def getTaskRunPage(page = 1, size = 10):
-    page: int | None = 1,
-    size: int | None = 10,
-):
     start = (page - 1) * size
     limit = str(start) + ',' + str(size)
 
@@ -135,16 +122,11 @@ def getTaskRunPage(
     return rdata
 
 
-def setTaskStatus(task_id,
+def setTaskStatus(task_id,status = 0):
-    status: int | None = 0
-):
     mw.M('tasks').where('id=?',(task_id,)).update({'status':status})
     return True
 
-def setTaskData(id,
+def setTaskData(id, start = None,end = None):
-    start: int | None = None,
-    end: int | None = None,
-):
     if start is not None:
         mw.M('tasks').where('id=?',(id,)).update({'start':start})
     if end is not None:

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(
+def addTempLogin(token = None,expire = None):
-    token:str | None = None,
-    expire:int | None = 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(
+def getTempLoginPage(page = 1,size = 10):
-    page: int | None = 1,
-    size: int | None = 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()

web/thisdb/user.py

@@ -36,8 +36,7 @@ def initAdminUser():
     return True
 
 
-def getUserByName(name,
+def getUserByName(name) -> None:
-) -> None:
     '''
     获取用户信息通过用户名
     '''
@@ -56,8 +55,7 @@ def getUserByName(name,
     row['update_time'] = data['update_time']
     return row
 
-def getUserById(id,
+def getUserById(id) -> None:
-) -> 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(
+def setUserByRoot(name = None,password = None) -> bool:
-    name: str | None = None,
-    password: str | None = None,
-) -> bool:
     '''
     设置配置的值
     :name -> str 名称 (必填)