合并代码完成

没有想到，一晚上搞定。OK,完美。后续测试

data/tpl/nginx.conf

@@ -8,6 +8,10 @@ server
     #SSL-START
     #error_page 404/404.html;
     #SSL-END
+
+    #301-START
+    
+    #PROXY-START
     
     #ERROR-PAGE-START
     error_page 404 /404.html;
@@ -21,14 +25,7 @@ server
     #REWRITE-START
     include {$OR_REWRITE}/{$SERVER_NAME}.conf;
     #REWRITE-END
-
-    #301-START
-    include {$OR_REDIRECT}/{$SERVER_NAME}/*.conf;
-    #301-END
-
-    #PROXY-START
-    include {$OR_PROXY}/{$SERVER_NAME}/*.conf;
-    #PROXY-END
+    
     
     #禁止访问的文件或目录
     location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)