update

class/core/site_api.py

@@ -100,6 +100,13 @@ class site_api:
         rewrite = self.getRewriteConf(siteName)
         return public.getJson({'rewrite': rewrite})
 
+    def getRewriteTplApi(self):
+        tplname = request.form.get('tplname', '').encode('utf-8')
+        file = public.getRunDir() + '/rewrite/nginx/' + tplname + '.conf'
+        if not os.path.exists(file):
+            return public.returnJson(False, '模版不存在!')
+        return public.returnJson(True, 'OK', file)
+
     def getRewriteListApi(self):
         rlist = self.getRewriteList()
         return public.getJson(rlist)

rewrite/nginx/EmpireCMS.conf

@@ -1,3 +1,4 @@
+location / {
 	rewrite ^([^\.]*)/listinfo-(.+?)-(.+?)\.html$ $1/e/action/ListInfo/index.php?classid=$2&page=$3 last;
 	rewrite ^([^\.]*)/showinfo-(.+?)-(.+?)-(.+?)\.html$ $1/e/action/ShowInfo.php?classid=$2&id=$3&page=$4 last;
 	rewrite ^([^\.]*)/infotype-(.+?)-(.+?)\.html$ $1/e/action/InfoType/index.php?ttid=$2&page=$3 last;
@@ -6,3 +7,4 @@ rewrite ^([^\.]*)/comment-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)\.html$  $1/e/pl/in
 	if (!-e $request_filename) {
 		return 404;
 	}
+}

rewrite/nginx/dedecms.conf

@@ -1,3 +1,4 @@
+location / {
 	rewrite "^/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last;
 	rewrite "^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
 	rewrite "^/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last;
@@ -8,3 +9,4 @@ rewrite "^/plus/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last;
 	rewrite "^/plus/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
 	rewrite "^/tags.html$" /tags.php last;
 	rewrite "^/tag-([0-9]+)-([0-9]+)\.html$" /tags.php?/$1/$2/ last;
+}

rewrite/nginx/default.conf

@@ -1 +0,0 @@
- 

rewrite/nginx/discuzx.conf

@@ -1,3 +1,4 @@
+location / {
 	rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last;
 	rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last;
 	rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last;
@@ -10,3 +11,4 @@ rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$
 	if (!-e $request_filename) {
 		return 404;
 	}
+}

rewrite/nginx/drupal.conf

@@ -1,3 +1,5 @@
+location / {
 	if (!-e $request_filename) {
 	 	rewrite ^/(.*)$ /index.php?q=$1 last;
 	}
+}

rewrite/nginx/ecshop.conf

@@ -1,3 +1,4 @@
+location / {
 	if (!-e $request_filename)
 	{
 	rewrite "^/index\.html" /index.php last;
@@ -30,3 +31,4 @@ rewrite ^/exchange-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?
 	rewrite "^/exchange-([0-9]+)-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2 last;
 	rewrite "^/exchange-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1 last;
 	}
+}

rewrite/nginx/maccms.conf

@@ -1,5 +0,0 @@
-rewrite ^/vod-(.*)$ /index.php?m=vod-$1 break;
-rewrite ^/art-(.*)$ /index.php?m=art-$1 break;
-rewrite ^/gbook-(.*)$ /index.php?m=gbook-$1 break;
-rewrite ^/label-(.*)$ /index.php?m=label-$1 break;
-rewrite ^/map-(.*)$ /index.php?m=map-$1 break;

rewrite/nginx/typecho.conf

@@ -1,3 +1,5 @@
+location / {
     if (!-e $request_filename) {
         rewrite ^(.*)$ /index.php$1 last;
     }
+}

rewrite/nginx/wp2.conf

@@ -1,6 +1,9 @@
+
+location / {
 	rewrite ^.*/files/(.*)$ /wp-includes/ms-files.php?file=$1 last;
 	if (!-e $request_filename){
 		rewrite ^.+?(/wp-.*) $1 last;
 		rewrite ^.+?(/.*\.php)$ $1 last;
 		rewrite ^ /index.php last;
 	}
+}

rewrite/nginx/zblog.conf

@@ -1,3 +1,4 @@
+location / {
 	if (-f $request_filename/index.html){
 		rewrite (.*) $1/index.html break;
 	}
@@ -7,3 +8,4 @@ if (-f $request_filename/index.php){
 	if (!-f $request_filename){
 		rewrite (.*) /index.php;
 	}
+}

route/static/app/site.js

@@ -2115,20 +2115,24 @@ function rewrite(siteName){
 		var info = syncPost('/site/get_rewrite_conf', {siteName:siteName});
 		var filename = info['rewrite'];
 		$.post('/files/get_body','path='+filename,function(fileBody){
+			var centent = fileBody['data']['data'];
 			var rList = ''; 
 			for(var i=0;i<rdata.rewrite.length;i++){
+				if (i==0){
+					rList += "<option value='0'>"+rdata.rewrite[i]+"</option>";	
+				} else {
 					rList += "<option value='"+rdata.rewrite[i]+"'>"+rdata.rewrite[i]+"</option>";		
 				}
+			}
 			var webBakHtml = "<div class='bt-form'>\
 						<div class='line'>\
 						<select id='myRewrite' class='bt-input-text mr20' name='rewrite' style='width:30%;'>"+rList+"</select>\
-						<span>"+lan.site.rule_cov_tool+"：<a href='https://www.bt.cn/Tools' target='_blank' style='color:#20a53a'>"+lan.site.a_c_n+"</a>\</span></div><div class='line'>\
+						<textarea class='bt-input-text' style='height: 260px; width: 480px; line-height:18px;margin-top:10px;padding:5px;' id='rewriteBody'>"+centent+"</textarea></div>\
-						<textarea class='bt-input-text' style='height: 260px; width: 480px; line-height:18px;margin-top:10px;padding:5px;' id='rewriteBody'>"+fileBody.data+"</textarea></div>\
+						<button id='SetRewriteBtn' class='btn btn-success btn-sm'>保存</button>\
-						<button id='SetRewriteBtn' class='btn btn-success btn-sm'>"+lan.public.save+"</button>\
+						<button id='SetRewriteBtnTel' class='btn btn-success btn-sm'>另存为模板</button>\
-						<button id='SetRewriteBtnTel' class='btn btn-success btn-sm'>"+lan.site.save_as_template+"</button>\
 						<ul class='help-info-text c7 ptb15'>\
-							<li>"+lan.site.url_rw_help_1+"</li>\
+							<li>请选择您的应用，若设置伪静态后，网站无法正常访问，请尝试设置回default</li>\
-							<li>"+lan.site.url_rw_help_2+"</li>\
+							<li>您可以对伪静态规则进行修改，修改完后保存即可。</li>\
 						</ul>\
 						</div>";
 			$("#webedit-con").html(webBakHtml);
@@ -2143,35 +2147,39 @@ function rewrite(siteName){
 			$("#SetRewriteBtn").click(function(){
 				$("#rewriteBody").empty();
 				$("#rewriteBody").text(editor.getValue());
-				SetRewrite(filename);
+				setRewrite(filename);
 			});
 			$("#SetRewriteBtnTel").click(function(){
 				$("#rewriteBody").empty();
 				$("#rewriteBody").text(editor.getValue());
-				SetRewriteTel();
+				setRewriteTel();
 			});
 			
 			$("#myRewrite").change(function(){
 				var rewriteName = $(this).val();
-				// var info = syncPost('/site/get_rewrite_conf', {siteName:siteName});
+				if(rewriteName == '0'){
-				if(rewriteName == lan.site.rewritename){
 					rpath = filename;
 				}else{
-					rpath = '/www/server/panel/rewrite/' + getCookie('serverType')+'/' + rewriteName + '.conf';
+					var info = syncPost('/site/get_rewrite_tpl', {tplname:rewriteName});
+					if (!info['status']){
+						layer.msg(info['msg']);
+						return;
+					}
+					rpath = info['data'];
 				}
-				rpath = '/www/server/panel/vhost/rewrite/'+siteName+'.conf';
+				
 				$.post('/files/get_body','path='+rpath,function(fileBody){
-					 $("#rewriteBody").val(fileBody.data);
+					$("#rewriteBody").val(fileBody['data']['data']);
-					 editor.setValue(fileBody.data);
+					editor.setValue(fileBody['data']['data']);
-				});
+				},'json');
-			});
 			});
 		},'json');
+	},'json');
 }
 
 
 //设置伪静态
-function SetRewrite(filename){
+function setRewrite(filename){
 	var data = 'data='+encodeURIComponent($("#rewriteBody").val())+'&path='+filename+'&encoding=utf-8';
 	var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/files/save_body',data,function(rdata){
@@ -2185,7 +2193,7 @@ function SetRewrite(filename){
 }
 var aindex = null;
 //保存为模板
-function SetRewriteTel(act){
+function setRewriteTel(act){
 	if(act != undefined){
 		name = $("#rewriteName").val();
 		if(name == ''){