diff --git a/rewrite/nginx/EmpireCMS.conf b/rewrites/nginx/EmpireCMS.conf similarity index 100% rename from rewrite/nginx/EmpireCMS.conf rename to rewrites/nginx/EmpireCMS.conf diff --git a/rewrite/nginx/cloudfare_real_ip.conf b/rewrites/nginx/cloudfare_real_ip.conf similarity index 100% rename from rewrite/nginx/cloudfare_real_ip.conf rename to rewrites/nginx/cloudfare_real_ip.conf diff --git a/rewrite/nginx/dedecms.conf b/rewrites/nginx/dedecms.conf similarity index 100% rename from rewrite/nginx/dedecms.conf rename to rewrites/nginx/dedecms.conf diff --git a/rewrite/nginx/discuzx.conf b/rewrites/nginx/discuzx.conf similarity index 100% rename from rewrite/nginx/discuzx.conf rename to rewrites/nginx/discuzx.conf diff --git a/rewrite/nginx/discuzx2.conf b/rewrites/nginx/discuzx2.conf similarity index 100% rename from rewrite/nginx/discuzx2.conf rename to rewrites/nginx/discuzx2.conf diff --git a/rewrite/nginx/discuzx3.conf b/rewrites/nginx/discuzx3.conf similarity index 100% rename from rewrite/nginx/discuzx3.conf rename to rewrites/nginx/discuzx3.conf diff --git a/rewrite/nginx/drupal.conf b/rewrites/nginx/drupal.conf similarity index 100% rename from rewrite/nginx/drupal.conf rename to rewrites/nginx/drupal.conf diff --git a/rewrite/nginx/ecshop.conf b/rewrites/nginx/ecshop.conf similarity index 100% rename from rewrite/nginx/ecshop.conf rename to rewrites/nginx/ecshop.conf diff --git a/rewrite/nginx/emlog.conf b/rewrites/nginx/emlog.conf similarity index 100% rename from rewrite/nginx/emlog.conf rename to rewrites/nginx/emlog.conf diff --git a/rewrite/nginx/fastdfs.conf b/rewrites/nginx/fastdfs.conf similarity index 100% rename from rewrite/nginx/fastdfs.conf rename to rewrites/nginx/fastdfs.conf diff --git a/rewrite/nginx/gunicorn.conf b/rewrites/nginx/gunicorn.conf similarity index 100% rename from rewrite/nginx/gunicorn.conf rename to rewrites/nginx/gunicorn.conf diff --git a/rewrite/nginx/header_cors.conf b/rewrites/nginx/header_cors.conf similarity index 100% rename from rewrite/nginx/header_cors.conf rename to rewrites/nginx/header_cors.conf diff --git a/rewrite/nginx/laravel5.conf b/rewrites/nginx/laravel5.conf similarity index 100% rename from rewrite/nginx/laravel5.conf rename to rewrites/nginx/laravel5.conf diff --git a/rewrite/nginx/mvc.conf b/rewrites/nginx/mvc.conf similarity index 100% rename from rewrite/nginx/mvc.conf rename to rewrites/nginx/mvc.conf diff --git a/rewrite/nginx/nezha.conf b/rewrites/nginx/nezha.conf similarity index 100% rename from rewrite/nginx/nezha.conf rename to rewrites/nginx/nezha.conf diff --git a/rewrite/nginx/phpcms.conf b/rewrites/nginx/phpcms.conf similarity index 100% rename from rewrite/nginx/phpcms.conf rename to rewrites/nginx/phpcms.conf diff --git a/rewrite/nginx/phpwind.conf b/rewrites/nginx/phpwind.conf similarity index 100% rename from rewrite/nginx/phpwind.conf rename to rewrites/nginx/phpwind.conf diff --git a/rewrite/nginx/proxy.conf b/rewrites/nginx/proxy.conf similarity index 100% rename from rewrite/nginx/proxy.conf rename to rewrites/nginx/proxy.conf diff --git a/rewrite/nginx/proxydg.conf b/rewrites/nginx/proxydg.conf similarity index 100% rename from rewrite/nginx/proxydg.conf rename to rewrites/nginx/proxydg.conf diff --git a/rewrite/nginx/sablog.conf b/rewrites/nginx/sablog.conf similarity index 100% rename from rewrite/nginx/sablog.conf rename to rewrites/nginx/sablog.conf diff --git a/rewrite/nginx/seacms.conf b/rewrites/nginx/seacms.conf similarity index 100% rename from rewrite/nginx/seacms.conf rename to rewrites/nginx/seacms.conf diff --git a/rewrite/nginx/shopex.conf b/rewrites/nginx/shopex.conf similarity index 100% rename from rewrite/nginx/shopex.conf rename to rewrites/nginx/shopex.conf diff --git a/rewrite/nginx/sub.conf.tpl b/rewrites/nginx/sub.conf.tpl similarity index 100% rename from rewrite/nginx/sub.conf.tpl rename to rewrites/nginx/sub.conf.tpl diff --git a/rewrite/nginx/thinkphp.conf b/rewrites/nginx/thinkphp.conf similarity index 100% rename from rewrite/nginx/thinkphp.conf rename to rewrites/nginx/thinkphp.conf diff --git a/rewrite/nginx/typecho.conf b/rewrites/nginx/typecho.conf similarity index 100% rename from rewrite/nginx/typecho.conf rename to rewrites/nginx/typecho.conf diff --git a/rewrite/nginx/v2ray.conf b/rewrites/nginx/v2ray.conf similarity index 100% rename from rewrite/nginx/v2ray.conf rename to rewrites/nginx/v2ray.conf diff --git a/rewrite/nginx/walle.conf b/rewrites/nginx/walle.conf similarity index 100% rename from rewrite/nginx/walle.conf rename to rewrites/nginx/walle.conf diff --git a/rewrite/nginx/whmcs.conf b/rewrites/nginx/whmcs.conf similarity index 100% rename from rewrite/nginx/whmcs.conf rename to rewrites/nginx/whmcs.conf diff --git a/rewrite/nginx/wmcms.conf b/rewrites/nginx/wmcms.conf similarity index 100% rename from rewrite/nginx/wmcms.conf rename to rewrites/nginx/wmcms.conf diff --git a/rewrite/nginx/wordpress.conf b/rewrites/nginx/wordpress.conf similarity index 100% rename from rewrite/nginx/wordpress.conf rename to rewrites/nginx/wordpress.conf diff --git a/rewrite/nginx/zblog.conf b/rewrites/nginx/zblog.conf similarity index 100% rename from rewrite/nginx/zblog.conf rename to rewrites/nginx/zblog.conf diff --git a/web/admin/site/site.py b/web/admin/site/site.py index 26ffbd81b..b8e1a1bcc 100644 --- a/web/admin/site/site.py +++ b/web/admin/site/site.py @@ -248,10 +248,18 @@ def get_rewrite_conf(): # 获取Rewrite模版名 @blueprint.route('/get_rewrite_tpl', endpoint='get_rewrite_tpl',methods=['POST']) @panel_login_required -def get_php_version(): +def get_rewrite_tpl(): tplname = request.form.get('tplname', '') return MwSites.instance().getRewriteTpl(tplname) +# 设置Rewrite模版名 +@blueprint.route('/set_rewrite_tpl', endpoint='set_rewrite_tpl',methods=['POST']) +@panel_login_required +def set_rewrite_tpl(): + name = request.form.get('name', '') + data = request.form.get('data', '') + return MwSites.instance().setRewriteTpl(name,data) + # 网站日志开关 @blueprint.route('/logs_open', endpoint='logs_open',methods=['POST']) @panel_login_required diff --git a/web/utils/site.py b/web/utils/site.py index 5d8a460dd..e9c9a3329 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -606,16 +606,29 @@ class sites(object): # 获取模版名内容 def getRewriteTpl(self, tplname): - file = mw.getPanelDir() + '/rewrite/nginx/' + tplname + '.conf' + file = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + tplname + '.conf' if not os.path.exists(file): return mw.returnData(False, '模版不存在!') return mw.returnData(True, 'OK', file) + def setRewriteTpl(self,name,data): + path = mw.getPanelDir() + '/web/misc/nginx/rewrite/' + name + ".conf" + if os.path.exists(path): + return mw.returnData(False, '模版已经存在!') + + if data == "": + return mw.returnData(False, '模版内容不能为空!') + ok = mw.writeFile(path, data) + if not ok: + return mw.returnData(False, '模版保持失败!') + + return mw.returnData(True, '设置模板成功!') + def getRewriteList(self): rewriteList = {} rewriteList['rewrite'] = [] rewriteList['rewrite'].append('0.当前') - rewrite_nginx_dir = mw.getPanelDir() + '/rewrite/nginx' + rewrite_nginx_dir = mw.getPanelDir() + '/web/misc/nginx/rewrite' for ds in os.listdir(rewrite_nginx_dir): rewriteList['rewrite'].append(ds[0:len(ds) - 5]) rewriteList['rewrite'] = sorted(rewriteList['rewrite'])