소스 검색

更改URL为兼容模式。即时不使用apache或者nginx的重定向也能正常访问

star7th 9 년 전
부모
커밋
3c00c2f82b

+ 1 - 0
Application/Common/Conf/config.php

@@ -11,6 +11,7 @@ return array(
 	'DB_CHARSET'=> 'utf8', // 字符集
 	'DB_DEBUG'  =>  TRUE, // 数据库调试模式 开启后可以记录SQL日志
 	"URL_HTML_SUFFIX" => '',//url伪静态后缀
+	"URL_MODEL" => 3 ,//URL兼容模式
 	'URL_ROUTER_ON'   => true, 
 	'URL_ROUTE_RULES'=>array(
 	    ':id\d'               => 'Home/Item/Show?item_id=:1',

+ 1 - 1
Application/Home/Controller/BaseController.class.php

@@ -99,7 +99,7 @@ class BaseController extends Controller {
 		$item = D("Item")->where("item_id = '%d' ",array($item_id))->find();
 		if ($item['password']) {
 			//跳转到输入访问密码框
-			header("location:".U("Home/item/pwd").'?item_id='.$item_id);
+			header("location:".U("Home/item/pwd",array("item_id"=>$item_id)));
 		}else{
 			session("visit_item_".$item_id , 1 );
 			return true;

+ 1 - 1
Application/Home/Controller/ItemController.class.php

@@ -173,7 +173,7 @@ class ItemController extends BaseController {
             $item = D("Item")->where("item_id = '$item_id' ")->find();
             if ($item['password'] == $password) {
                 session("visit_item_".$item_id , 1 );
-                header("location:".U("Home/Item/show").'?item_id='.$item_id);
+                header("location:".U("Home/Item/show").'&item_id='.$item_id);
             }else{
                 
                 $this->message("访问密码不正确");

+ 2 - 2
Application/Home/Controller/PageController.class.php

@@ -160,9 +160,9 @@ class PageController extends BaseController {
 
         }
         if ($ret) {
-           $this->message("删除成功!",U("Home/item/show").'?item_id='.$page['item_id']);
+           $this->message("删除成功!",U("Home/item/show?item_id={$page['item_id']}"));
         }else{
-           $this->message("删除失败!",U("Home/item/show").'?item_id='.$page['item_id']);
+           $this->message("删除失败!",U("Home/item/show?item_id={$page['item_id']}"));
         }
     }
 

+ 2 - 2
Application/Home/View/Index/index.html

@@ -48,8 +48,8 @@
 			</small>
 		</p> -->
 		<p class="text-center">
-			<a class="btn btn-primary  btn-large" href="{:U('Home/item/show').'?item_id=2'}" target="_blank">Demo</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<a class="btn  btn-large" href="{:U('Home/item/show').'?item_id=3'}" target="_blank" >帮助教程&nbsp;<i class="icon-circle-arrow-right"></i></a>
+			<a class="btn btn-primary  btn-large" href="{:U('Home/item/show?item_id=2')}" target="_blank">Demo</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<a class="btn  btn-large" href="{:U('Home/item/show?item_id=3')}" target="_blank" >帮助教程&nbsp;<i class="icon-circle-arrow-right"></i></a>
 		</p>
 
       <hr>

+ 2 - 2
Application/Home/View/Item/index.html

@@ -29,7 +29,7 @@
         <!-- dropdown menu links -->
           <li><a href="{:U('Home/User/setting')}">个人设置</a></li>
           <li><a href="#share-home-modal"  data-toggle="modal">分享主页</a></li>
-          <li><a href="../">网站首页</a></li>
+          <li><a href="{:U('Home/index/index')}">网站首页</a></li>
           <li><a href="{:U('Home/User/exist')}">退出登录</a></li>
 
         </ul>
@@ -46,7 +46,7 @@
 
         <foreach name="items" item="item">
           <li class="span3 text-center">
-            <a class="thumbnail" href="{:U('Home/Item/Show')}?item_id={$item.item_id}" title="{$item.item_description}">
+            <a class="thumbnail" href="{:U('Home/Item/Show')}&item_id={$item.item_id}" title="{$item.item_description}">
               <p class="my-item">{$item.item_name}</p>
             </a>
           </li>     

+ 10 - 10
Application/Home/View/Item/show.html

@@ -17,13 +17,13 @@
           <ul class="dropdown-menu">
           <!-- dropdown menu links -->
             <li><a href="#" id="share">分享</a></li>
-             <li><a href="{:U('Home/Item/word')}?item_id={$item.item_id}">导出</a></li>
+             <li><a href="{:U('Home/Item/word')}&item_id={$item.item_id}">导出</a></li>
 
              <if condition="$ItemCreator">
-              <li><a href="{:U('Home/Item/add')}?item_id={$item.item_id}">修改信息</a></li>          
-              <li><a href="{:U('Home/Member/edit')}?item_id={$item.item_id}">成员管理</a></li>
-              <li><a href="{:U('Home/Attorn/index')}?item_id={$item.item_id}">转让</a></li>
-              <li><a href="{:U('Home/Item/delete')}?item_id={$item.item_id}">删除</a></li>
+              <li><a href="{:U('Home/Item/add')}&item_id={$item.item_id}">修改信息</a></li>          
+              <li><a href="{:U('Home/Member/edit')}&item_id={$item.item_id}">成员管理</a></li>
+              <li><a href="{:U('Home/Attorn/index')}&item_id={$item.item_id}">转让</a></li>
+              <li><a href="{:U('Home/Item/delete')}&item_id={$item.item_id}">删除</a></li>
             </if>
 
             <li><a href="{:U('Home/Item/index')}">更多项目</a></li>
@@ -33,7 +33,7 @@
 
       <if condition="! $login_user">
         <li ><a href="{:U('Home/User/login')}">登录/注册</a></li>
-        <li ><a href="http://doc.star7th.com/3" target="_blank">关于ShowDoc</a></li>
+        <li ><a href="http://doc.star7th.com/?s=/3" target="_blank">关于ShowDoc</a></li>
         <else />
         <li><a href="{:U('Home/Item/index')}">我的项目</a></li>
       </if>
@@ -61,7 +61,7 @@
       <ul class="nav nav-list bs-docs-sidenav">
 
         <foreach name="pages" item="page">
-          <li ><a href="{:U('Home/Page/index')}?page_id={$page.page_id}" data-page-id="{$page.page_id}" ><i class="icon-blank"></i>{$page.page_title}</a></li>
+          <li ><a href="{:U('Home/Page/index')}&page_id={$page.page_id}" data-page-id="{$page.page_id}" ><i class="icon-blank"></i>{$page.page_title}</a></li>
         </foreach>
 
         <foreach name="catalogs" item="catalog">
@@ -69,7 +69,7 @@
           <li><a href="#"><i class="icon-chevron-right"></i>{$catalog.cat_name}</a>
             <ul class="child-ul nav-list hide">
               <foreach name="catalog.pages" item="catalog_page">
-                <li><a href="{:U('Home/Page/index')}?page_id={$catalog_page.page_id}" data-page-id="{$catalog_page.page_id}" >{$catalog_page.page_title}</a></li>
+                <li><a href="{:U('Home/Page/index')}&page_id={$catalog_page.page_id}" data-page-id="{$catalog_page.page_id}" >{$catalog_page.page_title}</a></li>
               </foreach>
             </ul>
           </li>
@@ -81,8 +81,8 @@
       <div class="doc-left-newbar">
 
         <if condition="$ItemPermn">
-          <div><a href="{:U('Home/Page/edit')}?item_id={$item.item_id}&type=new" id="new-like"><i class="icon-plus"></i>&nbsp;新建页面</a></div>
-          <div><a href="{:U('Home/Catalog/edit')}?item_id={$item.item_id}" id="dir-like" ><i class="icon-folder-open"></i>新建目录</a></div>
+          <div><a href="{:U('Home/Page/edit')}&item_id={$item.item_id}&type=new" id="new-like"><i class="icon-plus"></i>&nbsp;新建页面</a></div>
+          <div><a href="{:U('Home/Catalog/edit')}&item_id={$item.item_id}" id="dir-like" ><i class="icon-folder-open"></i>新建目录</a></div>
 
         </if>
 

+ 1 - 1
Application/Home/View/Item/showbyuid.html

@@ -50,7 +50,7 @@
 
         <foreach name="items" item="item">
           <li class="span3 text-center">
-            <a class="thumbnail" href="{:U('Home/Item/Show')}?item_id={$item.item_id}" target="_blank" title="{$item.item_description}">
+            <a class="thumbnail" href="{:U('Home/Item/Show')}&item_id={$item.item_id}" target="_blank" title="{$item.item_description}">
               <p class="my-item">{$item.item_name}</p>
             </a>
           </li>     

+ 2 - 2
Application/Home/View/Page/edit.html

@@ -22,7 +22,7 @@
                 <li>
                     <!-- 首次添加没有历史版本,不显示 -->
                     <if condition="$page.page_id gt 0">
-                        <a href="history?page_id={$page.page_id}">历史版本</a>
+                        <a href="?s=home/page/history&page_id={$page.page_id}">历史版本</a>
                         <else />
                     </if>
                 </li>
@@ -30,7 +30,7 @@
         </div>
         <div class="head-right pull-right">
             <a href="#" class="btn btn-primary " id="save">保存</a>
-            <a href="../Item/show?item_id={$item_id}&page_id={$page.page_id}" class="btn cancel">取消</a>
+            <a href="?s=home/item/show&item_id={$item_id}&page_id={$page.page_id}" class="btn cancel">取消</a>
         </div>
     </header>
     <br>

+ 3 - 3
Application/Home/View/Page/history.html

@@ -20,7 +20,7 @@
       <TR>
         <td>{$value.addtime}</td>
         <td>{$value.author_username}</td>
-        <td><a href="edit?page_id={$page_id}&page_history_id={$value.page_history_id}">恢复到此版本</a></td>
+        <td><a href="?s=home/page/edit&page_id={$page_id}&page_history_id={$value.page_history_id}">恢复到此版本</a></td>
       </TR>
 
       </foreach>
@@ -28,8 +28,8 @@
   </table>
 
     <div class="modal-footer">
-      <a href="edit?page_id={$page_id}" class="btn exist-cat">关闭</a>
-      <a href="edit?page_id={$page_id}" class="btn btn-primary exist-cat">完成</a>
+      <a href="?s=home/page/edit&page_id={$page_id}" class="btn exist-cat">关闭</a>
+      <a href="?s=home/page/edit&page_id={$page_id}" class="btn btn-primary exist-cat">完成</a>
     </div>
  </div>
 <input type="hidden" id="page_id" value="{$page_id}">

+ 1 - 1
Application/Home/View/User/login.html

@@ -14,7 +14,7 @@
           </div>
         </div>
         <button class="btn btn-large btn-primary" type="submit">登录</button>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="register">没有账号?马上去注册→</a>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="?s=/home/user/register">没有账号?马上去注册→</a>
       </form>
 
     </div> <!-- /container -->

+ 1 - 1
Application/Home/View/User/register.html

@@ -15,7 +15,7 @@
           </div>
         </div>
         <button class="btn btn-large btn-primary" type="submit">注册</button>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="login">已有账号?马上去登录→</a>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="?s=/home/user/login">已有账号?马上去登录→</a>
       </form>
 
     </div> <!-- /container -->

+ 3 - 3
Public/js/attorn/index.js

@@ -10,12 +10,12 @@ $(function(){
       var username = $("#username").val();
       var password = $("#password").val();
       $.post(
-        "save",
+        "?s=/home/attorn/save",
         {"username": username ,"item_id": item_id , "password": password  },
         function(data){
           if (data.error_code == 0) {
             alert("转让成功!");
-            window.location.href="../item/index";
+            window.location.href="?s=/home/item/index";
           }else{
             alert(data.error_message);
 
@@ -28,7 +28,7 @@ $(function(){
   }); 
   
   $(".exist-cat").click(function(){
-    window.location.href="../item/show?item_id="+item_id;
+    window.location.href="?s=/home/item/show&item_id="+item_id;
   });
 
 });

+ 6 - 6
Public/js/catalog/edit.js

@@ -10,7 +10,7 @@ $(function(){
 
   function getCatList(){
       $.get(
-        "catList",
+        "?s=home/catalog/catList",
         { "item_id": item_id },
         function(data){
           $("#show-cat").html('');
@@ -18,7 +18,7 @@ $(function(){
             json = data.data;
             console.log(json);
             for (var i = 0; i < json.length; i++) {
-                cat_html ='<a class="badge badge-info single-cat " href="edit?cat_id='+json[i].cat_id+'&item_id='+json[i].item_id+'">'+json[i].cat_name+'&nbsp;<i class="icon-edit"></i></a>';
+                cat_html ='<a class="badge badge-info single-cat " href="?s=home/catalog/edit&cat_id='+json[i].cat_id+'&item_id='+json[i].item_id+'">'+json[i].cat_name+'&nbsp;<i class="icon-edit"></i></a>';
                 $("#show-cat").append(cat_html);
             };
 
@@ -37,7 +37,7 @@ $(function(){
       var order = $("#order").val();
       var cat_id = $("#cat_id").val();
       $.post(
-        "save",
+        "?s=home/catalog/save",
         {"cat_name": cat_name , "order": order , "item_id": item_id , "cat_id": cat_id  },
         function(data){
           if (data.error_code == 0) {
@@ -63,12 +63,12 @@ $(function(){
         var cat_id = $("#cat_id").val();
         if (cat_id > 0 ) {
             $.post(
-                "delete",
+                "?s=home/catalog/delete",
                 { "cat_id": cat_id  },
                 function(data){
                   if (data.error_code == 0) {
                     alert("删除成功!");
-                    window.location.href="edit?item_id="+item_id;
+                    window.location.href="?s=home/catalog/edit&item_id="+item_id;
                   }else{
                     if (data.error_message) {
                       alert(data.error_message);
@@ -87,7 +87,7 @@ $(function(){
   })
 
   $(".exist-cat").click(function(){
-    window.location.href="../item/show?item_id="+item_id;
+    window.location.href="?s=home/item/show&item_id="+item_id;
   });
 
 

+ 3 - 3
Public/js/item/delete.js

@@ -12,12 +12,12 @@ $(function(){
   $("#save-cat").click(function(){
       var password = $("#password").val();
       $.post(
-        "ajaxDelete",
+        "?s=/home/item/ajaxDelete",
         {"item_id": item_id , "password": password  },
         function(data){
           if (data.error_code == 0) {
             alert("删除成功!");
-            window.location.href="../item/index";
+            window.location.href="?s=/home/item/index";
           }else{
             alert(data.error_message);
 
@@ -30,7 +30,7 @@ $(function(){
   });
 
   $(".exist-cat").click(function(){
-    window.location.href="../item/show?item_id="+item_id;
+    window.location.href="?s=/home/item/show&item_id="+item_id;
   });
 
 });

+ 6 - 6
Public/js/item/show.js

@@ -120,12 +120,12 @@ $(function(){
       var item_id = $("#item_id").val();
       var base_url = $("#base_url").val();
       $(".page-edit-link").show();
-      $("#page-content").attr("src" , base_url+"/Home/page/index?page_id="+page_id);
-      $("#edit-link").attr("href" , base_url+"/Home/page/edit?page_id="+page_id);
-      $("#copy-link").attr("href" , base_url+"/Home/page/edit?item_id="+item_id+"&copy_page_id="+page_id);
-      $("#share-page-link").html("http://"+window.location.host+base_url+"/"+item_id+"?page_id="+page_id);
-      $("#delete-link").attr("href" , base_url+"/Home/page/delete?page_id="+page_id);
-      history.replaceState(null, null, "http://"+window.location.host+base_url+"/"+item_id+"?page_id="+page_id);
+      $("#page-content").attr("src" , base_url+"/home/page/index/page_id/"+page_id);
+      $("#edit-link").attr("href" , base_url+"/home/page/edit/page_id/"+page_id);
+      $("#copy-link").attr("href" , base_url+"/home/page/edit/item_id/"+item_id+"/copy_page_id/"+page_id);
+      $("#share-page-link").html("http://"+window.location.host+base_url+"/"+item_id+"&page_id="+page_id);
+      $("#delete-link").attr("href" , base_url+"/home/page/delete/page_id/"+page_id);
+      history.replaceState(null, null, "http://"+window.location.host+base_url+"/"+item_id+"&page_id="+page_id);
   }
 
   //分享项目

+ 4 - 4
Public/js/member/edit.js

@@ -10,7 +10,7 @@ $(function(){
 
   function getList(){
       $.get(
-        "getList",
+        "?s=/home/member/getList",
         { "item_id": item_id },
         function(data){
           $("#show-cat").html('');
@@ -35,7 +35,7 @@ $(function(){
   $("#save-cat").click(function(){
       var username = $("#username").val();
       $.post(
-        "save",
+        "?s=/home/member/save",
         {"username": username ,"item_id": item_id  },
         function(data){
           if (data.error_code == 0) {
@@ -59,7 +59,7 @@ $(function(){
 
       if (username) {
           $.post(
-              "delete",
+              "?s=/home/member/delete",
               { "username": username, "item_id" :item_id },
               function(data){
                 if (data.error_code == 0) {
@@ -79,7 +79,7 @@ $(function(){
 
   $(".exist-cat").click(function(){
     
-    window.location.href="../item/show?item_id="+item_id;
+    window.location.href="?s=/home/item/show&item_id="+item_id;
   });
 
 });

+ 6 - 5
Public/js/page/edit.js

@@ -11,8 +11,9 @@ $(function() {
     var default_cat_id = $("#default_cat_id").val();
     var item_id = $("#item_id").val();
     $.get(
-      "../catalog/catList", {
-        "item_id": item_id
+      "./", {
+        "item_id": item_id,
+        "s": "home/catalog/catList",
       },
       function(data) {
         $("#cat_id").html('<OPTION value="0">无</OPTION>');
@@ -70,7 +71,7 @@ $(function() {
     placeholder: "本编辑器支持Markdown编辑,左边编写,右边预览",
     imageUpload: true,
     imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-    imageUploadURL: "uploadImg",
+    imageUploadURL: "?s=home/page/uploadImg",
     onload: function() {
       this.addKeyMap(keyMap);
     }
@@ -148,7 +149,7 @@ $(function() {
     var order = $("#order").val();
     saving = true;
     $.post(
-      "save", {
+      "?s=home/page/save", {
         "page_id": page_id,
         "cat_id": cat_id,
         "order": order,
@@ -159,7 +160,7 @@ $(function() {
       function(data) {
         if (data.error_code == 0) {
           $.bootstrapGrowl("保存成功!");
-          window.location.href = "../item/show?page_id=" + data.data.page_id + "&item_id=" + item_id;
+          window.location.href = "?s=home/item/show&page_id=" + data.data.page_id + "&item_id=" + item_id;
         } else {
           $.bootstrapGrowl("保存失败!");