-
-
\ No newline at end of file
+
diff --git a/app/common/model.py b/app/common/model.py
index 12897f1e00f1c62001a12ef9f6c71b6c534e5f75..7c60028f43c889376ec2e8e25647bcdb79235b1b 100644
--- a/app/common/model.py
+++ b/app/common/model.py
@@ -61,19 +61,22 @@ class model_intapp_menu(modelsqliteintapp):
"url":model.dbtype.varchar(LEN=32,DEFAULT=''), #菜单地址
"types":model.dbtype.varchar(LEN=11,DEFAULT=''), # left,header
}
- def add(title,icon,url,types='left',pid=0,admin_id=0):
+ def add(title,icon,url,types='left',pid=0,admin_id=0,sort=2000):
"添加菜单"
- sqlite('menu',model_app_path).insert({'title':title,'icon':icon,'url':url,"types":types,"pid":pid,"admin_id":admin_id,"sort":0})
- def delete(id='',title='',types="left",pid=0,admin_id=0):
+ sqlite('menu',model_app_path).insert({'title':title,'icon':icon,'url':url,"types":types,"pid":pid,"admin_id":admin_id,"sort":sort})
+ def delete(id='',title='',types="left",pid=0,admin_id=0,sort=2000):
"删除菜单"
if id:
sqlite('menu',model_app_path).where("id="+str(id)+"").delete()
elif title and pid:
sqlite('menu',model_app_path).where("title='"+title+"' and pid="+str(pid)).delete()
+ elif title and sort:
+ sqlite('menu',model_app_path).where("title='"+title+"' and sort='"+str(sort)+"'").delete()
elif title and types:
sqlite('menu',model_app_path).where("title='"+title+"' and types='"+types+"'").delete()
elif title and admin_id:
sqlite('menu',model_app_path).where("title='"+title+"' and admin_id='"+str(admin_id)+"'").delete()
+
try:
sqlite('menu',model_app_path).find()
@@ -123,4 +126,23 @@ except:
"icon":'',
"role":json_encode(role),
"addtime":times()
- })
\ No newline at end of file
+ })
+
+class model_app_start(modelsqliteintapp):
+ "启动项"
+ table="start"
+ fields={
+ "id":model.dbtype.int(LEN=11,PRI=True,A_L=True), #设置id为自增主键
+ "name":model.dbtype.varchar(LEN=128,DEFAULT=''), #名字
+ "icon":model.dbtype.varchar(LEN=128,DEFAULT=''),
+ "types":model.dbtype.varchar(LEN=128,DEFAULT='shell'), #类型
+ "value":model.dbtype.varchar(LEN=512,DEFAULT=''),
+ "admin_id":model.dbtype.int(LEN=11),
+ "updtime":model.dbtype.int(LEN=11,DEFAULT=0), #添加时间
+ "addtime":model.dbtype.int(LEN=11,DEFAULT=0), #添加时间
+ }
+try:
+ sqlite('start',model_app_path).find()
+except:
+ model_app_start=model_app_start()
+ model_app_start.create_table()
\ No newline at end of file
diff --git a/app/intapp/controller/__init__.py b/app/intapp/controller/__init__.py
index f4dbb41806865dbf404d8e22172a59b9a51cb25a..6a0389200c3dbfe0c77443814666268ed08060c3 100644
--- a/app/intapp/controller/__init__.py
+++ b/app/intapp/controller/__init__.py
@@ -1,3 +1,2 @@
-from . import index
-from . import soft
\ No newline at end of file
+from . import index
\ No newline at end of file
diff --git a/app/intapp/controller/index/common/plantask.py b/app/intapp/controller/index/common/plantask.py
index 017ed102283759bb7ffa0642497ddf05266e1fd9..65abec8df951af844231ac4b187204ec846d59f5 100644
--- a/app/intapp/controller/index/common/plantask.py
+++ b/app/intapp/controller/index/common/plantask.py
@@ -146,16 +146,18 @@ class PLANTASK():
try:
if not PLANTASK.BlockingSchedulers:
PLANTASK.BlockingSchedulers = BlockingScheduler()
- #进程可能影响cli运行
- multiprocessing.Process(target=PLANTASK.plantaskdsfsdfsafdsafsd,args=(PLANTASK.BlockingSchedulers,func,targger,args,year,month,week,day_of_week,day,hour,minute,second,iden)).start()
- # t=threading.Thread(target=PLANTASK.plantaskdsfsdfsafdsafsd,args=(PLANTASK.BlockingSchedulers,func,targger,args,year,month,week,day_of_week,day,hour,minute,second,iden))
- # t.daemon=True
- # t.start()
- # print("添加",data)
-
+ if 'Linux' in get_sysinfo()['platform']:
+ mu=multiprocessing.Process(target=PLANTASK.plantaskdsfsdfsafdsafsd,args=(PLANTASK.BlockingSchedulers,func,targger,args,year,month,week,day_of_week,day,hour,minute,second,iden))
+ mu.daemon=True
+ mu.start()
+ elif 'Windows' in get_sysinfo()['platform']:
+ t=threading.Thread(target=PLANTASK.plantaskdsfsdfsafdsafsd,args=(PLANTASK.BlockingSchedulers,func,targger,args,year,month,week,day_of_week,day,hour,minute,second,iden))
+ t.daemon=True
+ t.start()
except:
return False
- return True
+ else:
+ return True
#这里是初始化计划任务
if not config.app['cli']: #判断运行方式
try:
@@ -165,5 +167,4 @@ if not config.app['cli']: #判断运行方式
serverserverinterval['updtime']=times()
sqlite("interval",model_intapp_index_path).where("id",serverserverinterval['id']).update(serverserverinterval)
PLANTASK.plantask(serverserverinterval) #添加计划任务
- # print(serverserverinterval)
except:pass
\ No newline at end of file
diff --git a/app/intapp/controller/index/plug.py b/app/intapp/controller/index/plug.py
index b7e201331355f12995acb51fca562e5e626d6c75..eb3fd7133ee72b1678460aa369bf5146dc9f24a6 100644
--- a/app/intapp/controller/index/plug.py
+++ b/app/intapp/controller/index/plug.py
@@ -130,8 +130,8 @@ def uninstallplug():
dirname="app/"+arr['modular']+"/controller/"+arr['name']+"/common/file"
if not os.path.exists("backup/"+dirname):
os.makedirs("backup/"+dirname)
- zip.packzip(dirname,"backup/"+dirname+"/backup.zip")
- file_set_content("backup/"+dirname+"/time",str(times()))
+ zip.packzip(dirname,"backup/"+dirname+"/backup.zip")
+ file_set_content("backup/"+dirname+"/time",str(times()))
sqlite("menu",model_app_path).where("url='/"+arr['modular']+'/'+arr['name']+"'").delete()
sqlite('plug',model_app_path).where("name='"+arr['name']+"' and modular='"+arr['modular']+"'").delete()
diff --git a/app/intapp/controller/index/setup.py b/app/intapp/controller/index/setup.py
index 9294b0a7964e0c6d7e3953a485215bb7b42fbffa..261071256a92687821cad5d9255b30160953a511 100644
--- a/app/intapp/controller/index/setup.py
+++ b/app/intapp/controller/index/setup.py
@@ -1,7 +1,38 @@
from .common import *
def index():
return response.tpl()
-
+def addstart():
+ "添加启动项"
+ data=request.get_json()
+ if sqlite("start").connect(model_app_path).where("value",data['value']).count():
+ return errorjson(msg="禁止重复添加")
+ if system_start.insert_Boot_up(cmd=data['value'],name=data['name'],types=data['types'],admin_id=G.userinfo['id']):
+ return successjson()
+ else:
+ return errorjson(msg="添加失败，该系统支不支持")
+def delstart():
+ data=request.get_json()
+ if system_start.del_Boot_up(cmd=data['value'],id=data['id']):
+ return successjson()
+ else:
+ return errorjson()
+def startlist():
+ "启动项列表"
+ pagenow=request.args.get('pagenow')
+ pagesize=request.args.get('pagesize')
+ if not pagenow:
+ pagenow=1
+ else:
+ pagenow=int(pagenow)
+ if not pagesize:
+ pagesize=10
+ else:
+ pagesize=int(pagesize)
+ yz=system_start.lists(pagenow,pagesize)
+ lists=yz[0]
+ count=yz[1]
+ data=return_list(lists,count,pagenow,pagesize)
+ return successjson(data)
def backup():
"备份"
dirname=request.args.get("dirname")
@@ -56,7 +87,7 @@ def recovery():
return successjson()
else:
return errorjson(msg="备份文件不存在")
- else:
+ elif os.path.exists("backup"):
filelist=get_file("backup")
for k in filelist:
if k['type']=='file' and 'backup.zip' in k['path']:
@@ -64,6 +95,8 @@ def recovery():
dirname=re.sub("/backup.zip","",dirname)
zip.unzip_file("backup/"+dirname+"/backup.zip",dirname)
return successjson("恢复所有")
+ else:
+ return errorjson(msg="备份目录不存在")
def download(name=""):
"下载备份文件"
if os.path.exists("backup"):
diff --git a/app/intapp/controller/index/tpl/index/index.html b/app/intapp/controller/index/tpl/index/index.html
index 01010bd526429b57559a4799fd857f170b846da0..ee605a0afe13619a40ddf8bd978592ff67cf7b31 100644
--- a/app/intapp/controller/index/tpl/index/index.html
+++ b/app/intapp/controller/index/tpl/index/index.html
@@ -36,7 +36,7 @@
-
+
- 您可以使用以下命令生成ssh密钥
-
+
+ -
+
-
+
-
+
+
+
+
+ +
kcweb
+
+
+
+
+
+ 登录
+
+
+
+
+ 添加启动项
+
+
+
-
恢复所有备份
@@ -53,6 +80,23 @@
+
+
+
+
+
+
+
+
+
恭喜您！网站创建成功
') - f.close() - f=open(data['path']+"/index.php",'w',encoding="utf-8") - f.write("") - f.close() - try: - data['servers']=paths+filenames - except:pass - del data['ssl'] - del data['key'] - del data['pem'] - del data['rewrite'] - data['balancing'] =json_encode(data['balancing']) - data['proxy_set_header'] =json_encode(data['proxy_set_header']) - if data['id']: - data['updtime']=addtime - data['status']=1 - sqlite('web',model_intapp_soft_path).where("id",data['id']).update(data) - pi=subprocess.Popen('nginx -s reload',shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) - ars=pi.stdout.read().decode() - ars=ars.split("\n") - strs=ars[len(ars)-2] - if len(strs) > 1: - return errorjson(msg=strs) - else: - del data['id'] - data['addtime']=addtime - data['updtime']=addtime - sqlite('web',model_intapp_soft_path).insert(data) - except: - print(traceback.format_exc()) - return errorjson(msg="失败,检查参数是否有误") - else: - return successjson() -def del_web(id=0,path=0): - #path=1 表示删除网站目录 ,linux和windows已完成 - "删除网站" - title=request.args.get("title") - if not id and title: - where="title = '"+title+"'" - else: - where="id='"+str(id)+"'" - nginx=sqlite('web',model_intapp_soft_path).where(where).find() - if not nginx: - return successjson(msg="不存在") - print(nginx) - filenames=nginx['servers'] - if get_sysinfo()['uname'][0]=='Linux': - if os.path.isfile(filenames+"/conf/vhost/"+nginx['only']+'.conf'): - os.remove(filenames+"/conf/vhost/"+nginx['only']+'.conf') - if os.path.isfile(filenames+"/conf/vhost/rewrite/"+nginx['only']): - os.remove(filenames+"/conf/vhost/rewrite/"+nginx['only']) - if os.path.isfile(filenames+"/logs/"+nginx['only']+".access.log"): - os.remove(filenames+"/logs/"+nginx['only']+".access.log") - if os.path.isfile(filenames+'/conf/vhost/rewrite/'+nginx['only']+".key"): - os.remove(filenames+'/conf/vhost/rewrite/'+nginx['only']+".key") - if os.path.isfile(filenames+'/conf/vhost/rewrite/'+nginx['only']+".pem"): - os.remove(filenames+'/conf/vhost/rewrite/'+nginx['only']+".pem") - pi=subprocess.Popen('nginx -s reload',shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) - ars=pi.stdout.read().decode() - ars=ars.split("\n") - strs=ars[len(ars)-2] - elif get_sysinfo()['uname'][0]=='Windows': - if os.path.isfile(filenames+"/conf/vhost/"+nginx['only']+'.conf'): - os.remove(filenames+"/conf/vhost/"+nginx['only']+'.conf') - if os.path.isfile(filenames+"/conf/vhost/rewrite/"+nginx['only']): - os.remove(filenames+"/conf/vhost/rewrite/"+nginx['only']) - if os.path.isfile(filenames+"/logs/"+nginx['only']+".access.log"): - os.remove(filenames+"/logs/"+nginx['only']+".access.log") - os.system("cd "+filenames+" & stop.bat") - time.sleep(3) - os.system("cd "+filenames+" & start.bat") - else: - return errorjson(msg="无法匹配系统") - if path=='1' and os.path.exists(nginx['path']): - shutil.rmtree(nginx['path']) - sqlite('web',model_intapp_soft_path).where(where).delete() - pi=subprocess.Popen('nginx -s reload',shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) - ars=pi.stdout.read().decode() - ars=ars.split("\n") - strs=ars[len(ars)-2] - if len(strs) > 1: - return errorjson(msg=strs) - return successjson() - -def getssl(id): - ar=sqlite('web',model_intapp_soft_path).where('id',id).find() - key=ar['servers']+'/conf/vhost/rewrite/'+ar['only']+".key" - pem=ar['servers']+'/conf/vhost/rewrite/'+ar['only']+".pem" - data={ - "key":file_get_content(key), - "pem":file_get_content(pem) - } - return successjson(data) -def getrewr(id): - "获取伪静态" - ar=sqlite('web',model_intapp_soft_path).where('id',id).find() - return successjson(file_get_content(ar['servers']+'/conf/vhost/rewrite/'+ar['only'])) -def getconfig(id,types='get'): - "获取配置文件" - ar=sqlite('web',model_intapp_soft_path).where('id',id).find() - if types=='get': - return successjson(file_get_content(ar['servers']+'/conf/vhost/'+ar['only']+".conf")) - elif types=='set': - data=request.get_json() - file_set_content(ar['servers']+'/conf/vhost/'+ar['only']+".conf",data['text']) - pi=subprocess.Popen('nginx -s reload',shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) - ars=pi.stdout.read().decode() - ars=ars.split("\n") - strs=ars[len(ars)-2] - if len(strs) > 1: - return errorjson(msg=strs) - return successjson() - - -def sslfolde(): - "Let's Encrypt证书夹" - paths="/etc/letsencrypt/live/" - if not os.path.exists(paths): - return errorjson(code=1,msg="Let's Encrypt证书夹不存在，在插件市场安装LetsEncrypt插件创建证书后再使用该功能") - try: - lis=os.listdir(paths) - except: - return errorjson(code=1,msg="无法打开"+str(paths)) - lists=[] - for files in lis: - types="folder" - config={} - if os.path.isfile(paths+"/"+files): - types="file" - else: - config=file_get_content(paths+"/"+files+"/config.conf") - if config: - config=json_decode(config) - zd={"name":files,"types":types,"config":config} - lists.append(zd) - data=return_list(lists,count=len(lis),pagenow=1,pagesize=len(lis)) - data['paths']=paths - "文件列表" - return successjson(data) -def ssltpl(): - "Let's Encrypt证书内容" - name=request.args.get("name") - paths="/etc/letsencrypt/live/"+name - chain=file_get_content(paths+"/chain.pem") - fullchain=file_get_content(paths+"/fullchain.pem") - privkey=file_get_content(paths+"/privkey.pem") - cert=file_get_content(paths+"/cert.pem") - data={ - "chain":chain, - "fullchain":fullchain, - "privkey":privkey, - "cert":cert - } - return successjson(data) - \ No newline at end of file diff --git a/app/intapp/controller/soft/page.py b/app/intapp/controller/soft/page.py deleted file mode 100644 index 0dc48f6ff671c72661636725695ece962d3059b8..0000000000000000000000000000000000000000 --- a/app/intapp/controller/soft/page.py +++ /dev/null @@ -1,13 +0,0 @@ -from .common import * -def home(): - return response.tpl("index/home") -def pub(html): - return response.tpl("page/%s" % html) -def s(fun,html): - id=request.args.get("id") - return response.tpl("%s/%s" % (fun,html),id=id) -def soft(html): - id=request.args.get("id") - types=request.args.get("types") - data=sqlite("soft",model_intapp_soft_path).where("id",id).find() - return response.tpl("soft/%s" % html,id=id,data=data,types=types) \ No newline at end of file diff --git a/app/intapp/controller/soft/php.py b/app/intapp/controller/soft/php.py deleted file mode 100644 index 5c1e94b10e673f8109b7ebc04f00787d2db08b9f..0000000000000000000000000000000000000000 --- a/app/intapp/controller/soft/php.py +++ /dev/null @@ -1,266 +0,0 @@ -from .common import * -def ini(id,is_upd=0): - "php.ini配置文件" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - filepath=paths+filenames+"/bin/php.ini" - elif ar['platform']=='Windows': - filepath=paths+filenames+"/php.ini" - else: - return errorjson(code=1,msg="不支持此时平台") - if is_upd: #修改配置 - data=request.get_json() - file_set_content(filepath,data['text']) - return successjson() - else: - data={ - 'ini':file_get_content(filepath), - 'php':ar - } - return successjson(data) -def www_conf(id,is_upd=0): - "www.conf配置文件" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - filepath=paths+filenames+"/etc/php-fpm.d/www.conf" - if 'php5.6' in filenames: - filepath=paths+filenames+"/etc/php-fpm.conf" - elif ar['platform']=='Windows': - filepath='' - else: - return errorjson(code=1,msg="不支持此时平台") - if is_upd: #修改配置 - data=request.get_json() - file_set_content(filepath,data['text']) - return successjson() - else: - data={ - 'www_conf':file_get_content(filepath), - 'php':ar - } - return successjson(data) -def phpfpm(id,is_upd=0): - "phpfpm配置信息" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - if not os.path.exists(paths+filenames+"/bin/conf"): - os.makedirs(paths+filenames+"/bin/conf") - filepath=paths+filenames+"/bin/conf/phpfpm.conf" - phpfpmpath=paths+filenames+"/etc/php-fpm.d/www.conf" - if 'php5.6' in filenames: - phpfpmpath=paths+filenames+"/etc/php-fpm.conf" - else: - filepath='' - phpfpmpath='' - if is_upd: #修改php-fpm配置信息 - data=request.get_json() - f = open(phpfpmpath) - con='' - while True: - line = f.readline() - if not line: - break - elif 'pm = ' in line and '=' in line: #运行描述 - line="pm = "+data['text']['pm']+"\n" - elif 'pm.max_children' in line and '=' in line:# 允许创建的最大子进程数 - line="pm.max_children = "+data['text']['max_children']+"\n" - elif 'pm.start_servers' in line and '=' in line:# 起始进程数（服务启动后初始进程数量） - line="pm.start_servers = "+data['text']['start_servers']+"\n" - elif 'pm.min_spare_servers' in line and '=' in line:# 起始进程数（服务启动后初始进程数量） - line="pm.min_spare_servers = "+data['text']['min_spare_servers']+"\n" - elif 'pm.max_spare_servers' in line and '=' in line:# 最大空闲进程数（当空闲进程达到此值时清理） - line="pm.max_spare_servers = "+data['text']['max_spare_servers']+"\n" - con=con+line - f.close() - f= open(phpfpmpath, "w") - f.write(con) - f.close() - file_set_content(filepath,json_encode(data['text'])) - return successjson() - else: - phpfpm=json_decode(file_get_content(filepath)) - if not phpfpm: - phpfpm='' - data={ - 'phpfpm':phpfpm, - 'php':ar - } - return successjson(data) -def base(id,is_upd=0): - "基本配置信息" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - if not os.path.exists(paths+filenames+"/bin/conf"): - os.makedirs(paths+filenames+"/bin/conf") - filepath=paths+filenames+"/bin/conf/base.ini" - phpinipath=paths+filenames+"/bin/php.ini" - elif ar['platform']=='Windows': - if not os.path.exists(paths+filenames+"/conf"): - os.makedirs(paths+filenames+"/conf") - filepath=paths+filenames+"/conf/base.ini" - phpinipath=paths+filenames+"/php.ini" - if is_upd: #修改基本配置信息 - #修改php.ini配置 - data=request.get_json() - f = open(phpinipath) - con='' - while True: - line = f.readline() - if not line: - break - elif 'max_execution_time' in line and '=' in line:#最大执行时间 - line="max_execution_time = "+data['text']['max_execution_time']+"\n" - elif 'max_input_time' in line and '=' in line:#最大输入时间 - line="max_input_time = "+data['text']['max_input_time']+"\n" - elif 'memory_limit' in line and '=' in line:#内存限制 - line="memory_limit = "+data['text']['memory_limit']+"M\n" - elif 'file_uploads' == line[0:12] and '=' in line:#是否允许文件上传 - line="file_uploads = "+data['text']['file_uploads']+"\n" - elif 'upload_max_filesize' in line and '=' in line:#上传大小限制 - line="upload_max_filesize = "+data['text']['upload_max_filesize']+"M\n" - elif 'max_file_uploads' in line and '=' in line:#上传数量限制 - line="max_file_uploads = "+data['text']['max_file_uploads']+"\n" - elif 'post_max_size' in line and '=' in line:#上传数量限制 - line="post_max_size = "+data['text']['post_max_size']+"M\n" - elif 'allow_url_fopen' in line and '=' in line: - line="allow_url_fopen = "+data['text']['allow_url_fopen']+"\n" - elif 'allow_url_include' in line and '=' in line: - line="allow_url_include = "+data['text']['allow_url_include']+"\n" - elif 'default_socket_timeout' in line and '=' in line: - line="default_socket_timeout = "+data['text']['default_socket_timeout']+"\n" - con=con+line - f.close() - f= open(phpinipath, "w") - f.write(con) - f.close() - file_set_content(filepath,json_encode(data['text'])) - # print(data['text']) - return successjson() - else: - base=json_decode(file_get_content(filepath)) - if not base: - base='' - data={ - 'base':base, - 'php':ar - } - return successjson(data) -def extenlist(id,is_upd=0): - "php扩展信息列表" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - lists=sqlite('php_exten',model_intapp_soft_php_exten_path).where('pid',id).select() - data={ - 'extenlist':lists, - 'php':ar - } - return successjson(data) -def log(id): - "待完善" - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - filename=ar['filename'] - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - filepath=paths+filenames+"" - elif ar['platform']=='Windows': - filepath=paths+filenames+"" - data={ - 'log':file_get_content(filepath), - 'php':ar - } - return successjson(data) - -def add_php_exten(): - "增加php扩展" - data=request.get_json() - data['addtime']=times() - data['updtime']=times() - sqlite('php_exten',model_intapp_soft_php_exten_path).insert(data) - return successjson() -def del_php_exten(id): - "删除php扩展" - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',id).delete() - return successjson() - -def installext(id): - is_del=False #是否删除成功 - "安装php扩展和下载扩展" - ar=sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',id).find() - if ar['status']==0: - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':1,'msg':''}) - Queues.insert(target=__installextqu,args=(ar,),title="安装php-"+ar['title']+"扩展") - elif ar['status']==4: - "卸载扩展" - paths=request.get_json()['paths'] - if get_sysinfo()['uname'][0]=='Linux': - if os.path.exists(paths): - - confile=paths+"bin/php.ini" - f= open(confile, "r") - con='' - while True: - line = f.readline() - if not line: - break - elif str(ar['title']) in line: - line="" - is_del=True - con=con+line - f.close() - f= open(confile, "w") - f.write(con) - f.close() - - # confile=paths+"bin/php.ini" - # f= open(confile, "r") - # con=f.read() - # f.close() - # con=con.replace("extension="+str(ar['title'])+".so\n","") - # f= open(confile, "w") - # f.write(con) - # f.close() - if is_del: - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':0,'msg':''}) - if 'php7.0' in paths: - os.system("pkill php70-fpm && php70-fpm -c "+paths+"php7.0/etc/php.ini") - elif 'php7.1' in paths: - os.system("pkill php71-fpm && php71-fpm -c "+paths+"php7.1/etc/php.ini") - elif 'php7.2' in paths: - os.system("pkill php72-fpm && php72-fpm -c "+paths+"php7.2/etc/php.ini") - elif 'php7.3' in paths: - os.system("pkill php73-fpm && php73-fpm -c "+paths+"php7.3/etc/php.ini") - elif 'php7.4' in paths: - os.system("pkill php74-fpm && php74-fpm -c "+paths+"php7.4/etc/php.ini") - else: - return errorjson(code=1,msg='卸载失败') - else: - return errorjson(code=1,msg='php文件夹错误') - return successjson() -def get_exten(id): - return successjson(sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',id).find()) -def __installextqu(ar): - "安装php扩展" - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':3,'msg':''}) - try: - cmd="wget "+config.domain['kcwebfile']+"/"+ar['filename'] - # os.system(cmd) - print(cmd) - pi=subprocess.Popen(cmd,shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT) - ars=pi.stdout.read().decode() - ars=ars.split("\n") - strs=ars[len(ars)-2] - if 'success' in strs: - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':4,'msg':''}) - else: - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':0,'msg':'安装失败'}) - # sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':4,'msg':''}) - except Exception as e: - sqlite('php_exten',model_intapp_soft_php_exten_path).where('id',ar['id']).update({'status':0,'msg':'安装失败'+str(e)}) \ No newline at end of file diff --git a/app/intapp/controller/soft/redis.py b/app/intapp/controller/soft/redis.py deleted file mode 100644 index df44a4d3f7660ab7bfbb16db9a29adb8e3ebc258..0000000000000000000000000000000000000000 --- a/app/intapp/controller/soft/redis.py +++ /dev/null @@ -1,69 +0,0 @@ -from .common import * -def conf(id,is_upd=0): - "redis配置文件信息" - is_upd=int(is_upd) - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - if ar['platform']=='Linux': - filepath=paths+filenames+"/redis.conf" - else: - return errorjson(code=1,msg="不支持此时平台") - if is_upd: #修改配置 - data=request.get_json() - if not data['text']: - return errorjson(code=1,msg='不允许清空配置文件') - file_set_content(filepath,data['text']) - return successjson() - else: - data=file_get_content(filepath) - # print(filepath) - return successjson(data) -def base(id,is_upd=0): - "redis配置文件信息" - is_upd=int(is_upd) - ar=sqlite('soft',model_intapp_soft_path).where('id',id).find() - paths=ar['paths'] - filenames=ar['title']+ar['edition'] - - if ar['platform']=='Linux': - filepath=paths+filenames+"/redis.conf" - jsonpath=paths+filenames+"/redis.json" - else: - return errorjson(code=1,msg="不支持此时平台") - if is_upd: #修改配置 - data=request.get_json() - f = open(filepath) - con='' - while True: - line = f.readline() - if not line: - break - elif 'bind ' in line and '\n' in line and '#' not in line: - line="bind "+data['bind']+"\n" - elif 'port ' in line and '\n' in line and '#' not in line: - line="port "+data['port']+"\n" - elif 'timeout ' in line and '\n' in line and '#' not in line: - line="timeout "+data['timeout']+"\n" - elif 'maxclients ' in line and '\n' in line: - line="maxclients "+data['maxclients']+"\n" - elif 'databases ' in line and '\n' in line and '#' not in line: - line="databases "+data['databases']+"\n" - elif 'requirepass ' in line and '\n' in line: - if data['requirepass']: - line="requirepass "+data['requirepass']+"\n" - else: - line="# requirepass "+data['requirepass']+"\n" - elif 'maxmemory ' in line and '\n' in line and len(line)<20: - line="maxmemory "+data['maxmemory']+"\n" - con=con+line - f.close() - f= open(filepath, "w") - f.write(con) - f.close() - file_set_content(jsonpath,json_encode(data)) - return successjson() - else: - v=file_get_content(jsonpath) - data=json_decode(v) - return successjson(data) \ No newline at end of file diff --git a/app/intapp/controller/soft/tpl/index/home.html b/app/intapp/controller/soft/tpl/index/home.html deleted file mode 100644 index 3e542d22f9669aab08578aec44fc2aba407e04d6..0000000000000000000000000000000000000000 --- a/app/intapp/controller/soft/tpl/index/home.html +++ /dev/null @@ -1,420 +0,0 @@ - - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Linux
- Windows
-
-
-
-
-
-
-
-
-
-
diff --git a/app/intapp/controller/soft/tpl/index/web.html b/app/intapp/controller/soft/tpl/index/web.html
deleted file mode 100644
index 53d06a962960a465a2b0828fa273a605ea81aa32..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/index/web.html
+++ /dev/null
@@ -1,479 +0,0 @@
-
-
-
-
-
-
-
- 搜索
-
- 备份、网站 、软件列表、php扩展
- 恢复
- 更新软件列表
-
-
-
-
- % if config.app['appmode']=='develop':
-
-
- ![]()
-
-
-
-
-
-
-
- 
-
-
-
-
- 安装
- 等待中...
- 下载中...
- 安装中...
- 卸载中...
- 正在启动...
- 正在停止服务
-
-
-
-
-
- 启动
- 设置
- 卸载
-
-
-
-
- 客户端
- 客户端
- 服务端
- 服务端
-
-
- 设置
- 卸载
-
-
-
-
- ssh密钥
- 初始化
-
- 分布式部署
- 独立部署
-
- 卸载
-
-
-
-
-
-
-
-
- 停止
- 重启
- 设置
-
-
-
- % if config.app['appmode']=='develop':
- 编辑
- % endif
-
-
-
-
-
-
-
-
-
- {{scope.row.title}}{{scope.row.edition}}
- {{scope.row.msg}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 修改添加
-
-
-
-
-
-
-
- 保存
- 选择伪静态模板就可以了，修改了记得要保存哦！重启nginx生效 -
-
-
-
-
-
-
-
-
diff --git a/app/intapp/controller/soft/tpl/soft/frp.html b/app/intapp/controller/soft/tpl/soft/frp.html
deleted file mode 100644
index c137b73fa594dc8e2d6120875746dc88d0e181b3..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/frp.html
+++ /dev/null
@@ -1,250 +0,0 @@
-
-
-
-
-
-
-
-
- 搜索
- 添加网站
-
-
-
-
-
-
-
-
-
- 运行在负载均衡代理转发器中
- 点击打开：{{scope.row.describes}}
- {{scope.row.describes}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 创建于
-
-
-
-
- 更新
-
-
-
-
-
-
-
-
-
- SSL配置
- 设置
-
- php伪静态配置
- 删除
-
-
-
-
-
-
- {{item}}
-
-
-
-
-
-
-
-
-
- | 域名 | |||||||||
| 端口 | -|||||||||
| 网站名 | -|||||||||
| 配置文件模板 | -|||||||||
| 备注 | -|||||||||
| 网站目录 | -|||||||||
|
-
-
-
-
|
- |||||||||
-
-
-
- 您已配置Let's证书
- ssl_certificate ：{{admin.ssl_certificate}}
- ssl_certificate_key ：{{admin.ssl_certificate_key}}
-使用自有证书
-
- - ssl_certificate ：{{admin.ssl_certificate}}
- ssl_certificate_key ：{{admin.ssl_certificate_key}}
-
- 确定
-
-
- 密钥(KEY)
-
-
- 证书(PEM格式)
-
-
-
-
-
-
-
- - 选择伪静态模板就可以了，修改了记得要保存哦！重启nginx生效 -
- 确定
-
-
-
-
-
- | 支持域名 | 有效期 | |
| - - {{item1.domain}} - - | -- - {{time_date(item.config.createtime+7776000,true)}} - - | -
-
- |
-
-
-
-
-
- 重启
- 停止
- 保存
-
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/kodexplorer.html b/app/intapp/controller/soft/tpl/soft/kodexplorer.html
deleted file mode 100644
index 6fb3f59b95946d8504b9f3fe4bf5c9a78b85169b..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/kodexplorer.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
- 重启
- 停止
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/mongodb.html b/app/intapp/controller/soft/tpl/soft/mongodb.html
deleted file mode 100644
index 417da13b4af6bd477526929f68caee0f9ac9015b..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/mongodb.html
+++ /dev/null
@@ -1,436 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/mysql.html b/app/intapp/controller/soft/tpl/soft/mysql.html
deleted file mode 100644
index ebeb98f3f6c12135106c911353e835173f336cc6..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/mysql.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
- 保存
-
- 可以在终端中执行以下命令创建可以 -
- WORK_DIR=/data/mongodb
- mkdir -p $WORK_DIR/key/
- cd $WORK_DIR/key/
- openssl rand -base64 756 > mongo.key
- chmod 600 mongo.key
-
-
- - mkdir -p $WORK_DIR/key/
- cd $WORK_DIR/key/
- openssl rand -base64 756 > mongo.key
- chmod 600 mongo.key
-
- config服务 (注：这是一个config服务)
-
-
- 通常生产环境每台机器应该只有一个，您可以在其他机器上开启config服务后手动添加到副本集中
-
-
- | - |
-
- 运行中
- 停止服务
- 重启服务
-
-
- 已停止
- 启动服务
-
-
- 待初始化
- 初始化
-
- -
- 副本集初始化（如果需要,生产环境应该是内网ip而不是127.0.0.1）
-
-
- -
-
-增加副本集示例
-
-mongo --port {{data.configs.server[0]['port']}}
-use admin
-rs.add({_id:1,host:'{{data.get_local_ip}}:27002',priority:2})#增加主机 priority:优先级
-
-删除副本集示例
-
-mongo --port {{data.configs.server[0]['port']}}
-use admin
-rs.remove('{{data.get_local_ip}}:27002')
-
-
- configdb:
- 路由服务 (注：这是一个路由服务) -
-
-
-
-
- 示例：configdb = configs/192.168.1.101:27001,192.168.1.102:27001,192.168.1.103:27001,则无法扩展外部服务器
- 上述ip和端口是已经启动的配置服务，可以是其他机器上的mongodb配置服务
- - 路由服务 (注：这是一个路由服务) -
| - |
-
- 运行中
- 停止服务
- 重启服务
-
-
- 已停止
- 启动服务
-
-
- 待初始化
- 初始化
-
- -
- 初始化用户
-
-
- -
-
- 在路由中添加分片，如下示例-
-mongo --port {{data.mongos.server[0]['port']}}
-use admin
-db.auth('admin','admin')
-sh.addShard("shard1/192.168.1.101:29001,192.168.1.102:29001") #shard1是分片集群id
-sh.status()
-
-
-
-
- 分片服务名{{indexs+1}}：
-
- 通常生产环境每台机器应该只有一个，您可以在其他机器上开启分片服务后手动添加到副本集中
-
-
- | - |
-
- 运行中
- 停止服务
- 重启服务
-
-
- 已停止
- 启动服务
-
-
- 待初始化
- 初始化
-
- -
- 副本集初始化（生产环境应该是内网ip而不是127.0.0.1）
-
- -
-
-
-
- | 绑定ip | -端口 | -服务目录 | -- |
|
-
- 运行中
- |
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/nginx.html b/app/intapp/controller/soft/tpl/soft/nginx.html
deleted file mode 100644
index 8956ac72e8acef1bcbb5de4b3fef3b1d27bdc2fd..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/nginx.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
- 保存
- 该配置文件只对该网站有效，修改后重启nginx生效
-
-
-
-
-
--
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 该配置文件只对{{data.php.title}}有效，修改后重启{{data.php.title}}生效
-
-
-
- 保存
- 该配置文件只对{{data.php.title}}有效，修改后重启{{data.php.title}}生效
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/phpmyadmin.html b/app/intapp/controller/soft/tpl/soft/phpmyadmin.html
deleted file mode 100644
index 5dd49d6bdafd1c4864f98aaf6c71eb967fc0fcb8..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/phpmyadmin.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是否允许将url（如http://或 ftp://）作为文件处理。
-
-
-
- 是否允许include/require以文件形式打开url（如http://或 ftp://）。
-
-
-
-
- 保存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
-
- % if config.app['appmode']=='develop':
-
-
-
- | 名称 | 说明 | 状态 | 操作 |
| {{item.title}} | -{{item.describes}} - % if config.app['appmode']=='develop': - {{item.filename}} - % endif - | -- - - | -
-
- |
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/intapp/controller/soft/tpl/soft/redis.html b/app/intapp/controller/soft/tpl/soft/redis.html
deleted file mode 100644
index 64eac893a14c59ec96efcf712ab918ef24a21f09..0000000000000000000000000000000000000000
--- a/app/intapp/controller/soft/tpl/soft/redis.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 修改后重启redis生效
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/static/js/function.js b/app/static/js/function.js
index 5e7615e53fec6b440c63746b16d200e3cc2edbb5..d1d3c2c26fea23e80b60dbc9ddddb70980874cd8 100644
--- a/app/static/js/function.js
+++ b/app/static/js/function.js
@@ -41,6 +41,11 @@ axios_instance.interceptors.request.use(function(axiosconfig){
axios_instance.interceptors.response.use(function(res){
return res;
},function(error){
+ if(error.response.data){
+ if(error.response.data.code==-1||error.response.data.code==5){
+ window.location.href="/intapp"
+ }
+ }
return Promise.reject(error);
})
//get请求
diff --git a/kcweb/common/autoload.py b/kcweb/common/autoload.py
index 48fc6357b2004fa3e7f5ef5fd27bec975174980d..cb0bebede2097d44333ab323e021e18db2408fd7 100644
--- a/kcweb/common/autoload.py
+++ b/kcweb/common/autoload.py
@@ -493,7 +493,6 @@ class create:
if os.path.isfile(self.appname+"/"+self.modular+"/controller/"+plug+".zip"):#安装打包好的插件
zip.unzip_file(self.appname+"/"+self.modular+"/controller/"+plug+".zip",self.appname+"/"+self.modular+"/controller/"+plug+"/")
os.remove(self.appname+"/"+self.modular+"/controller/"+plug+".zip")
-
if os.path.isfile(self.appname+"/"+self.modular+"/controller/"+plug+"/install.txt"): #安装依赖包
install_requires=[]
try:
@@ -512,14 +511,13 @@ class create:
try:
install_requires.insert(0,"install")
if 0 != pip.main(install_requires):
- shutil.rmtree(self.appname+"."+self.modular+"/controller/"+plug)
+ shutil.rmtree(self.appname+"/"+self.modular+"/controller/"+plug)
return False,"error"
except AttributeError as e:
- shutil.rmtree(self.appname+"."+self.modular+"/controller/"+plug)
+ shutil.rmtree(self.appname+"/"+self.modular+"/controller/"+plug)
if config.app['app_debug']:
print("建议更新您的pip版本。参考命令：Python -m pip install --user --upgrade pip -i https://mirrors.aliyun.com/pypi/simple/")
return False,str(e)
-
# try:
# m=importlib.import_module(self.appname+"."+self.modular+"/controller/"+plug+".install")
# except:
diff --git a/kcweb/config/__init__.py b/kcweb/config/__init__.py
index 8c813499bd97507bb36c972478cbd2841dc94886..eef962f4cd8919031d5e35082486b967bdcdd1eb 100644
--- a/kcweb/config/__init__.py
+++ b/kcweb/config/__init__.py
@@ -98,7 +98,7 @@ email['recNick']='' #默认收件人昵称
kcweb={}
kcweb['name']='kcweb' #项目的名称
-kcweb['version']='4.11.7' #项目版本
+kcweb['version']='4.11.8' #项目版本
kcweb['description']='' #项目的简单描述
kcweb['long_description']='' #项目详细描述
kcweb['license']='MIT' #开源协议 mit开源
diff --git a/kcweb/setup.py b/kcweb/setup.py
index 8f2c47e27ca5618e7bbe39e2f2e07c8be68be41d..328b102071b3c9ef56e88ebfb831747042a870c8 100644
--- a/kcweb/setup.py
+++ b/kcweb/setup.py
@@ -16,7 +16,7 @@ def file_get_content(k):
return con
confkcw={}
confkcw['name']='kcweb' #项目的名称
-confkcw['version']='4.11.7' #项目版本
+confkcw['version']='4.11.8' #项目版本
confkcw['description']='' #项目的简单描述
confkcw['long_description']="" #项目详细描述
confkcw['license']='MIT License' #开源协议 mit开源
diff --git a/server.sh b/server.sh
index 852d2915ae74c900c816e594899fe5d929933db1..0ca827b33eb97955922cbe628ea8dabbb8f79bdf 100644
--- a/server.sh
+++ b/server.sh
@@ -1,6 +1,6 @@
chmod -R 777 /kcwebplus
./server stop
-nohup ./server --h 0.0.0.0 --p 39001 start > log 2>&1 &
+nohup ./server --h 0.0.0.0 --p 39001 --w 1 start > log 2>&1 &
sleep 2
-nohup ./server --h 0.0.0.0 --p 39002 --w 1 start > log 2>&1 &
-nohup ./server --h 0.0.0.0 --p 39003 --w 1 start > log 2>&1 &
\ No newline at end of file
+nohup ./server --h 0.0.0.0 --p 39002 --w 2 start > log 2>&1 &
+nohup ./server --h 0.0.0.0 --p 39003 --w 2 start > log 2>&1 &
\ No newline at end of file
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
-
- -