Merge branch 'master' of https://github.com/star7th/showdoc

star7th · Apr 12, 2017 · ab0f897 · ab0f897
2 parents a967e86 + 7abd6dc
commit ab0f897
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Application/Home/Model/UserTokenModel.class.php b/Application/Home/Model/UserTokenModel.class.php
@@ -9,7 +9,7 @@ class UserTokenModel extends BaseModel {
 
 	public function createToken($uid,$token_expire = 0 ){
 		$token_expire = $token_expire > 0  ? (time() + $token_expire ) : (time() + 60*60*24*90 );
-		$token = md5(md5($uid.$token_expire.time().rand()."showdoc")."rdgtrd12367hghf54t");
+		$token = md5(md5($uid.$token_expire.time().rand()."showdoc")."rdgsvgsrgr67hghf54t").md5($uid.$token_expire.time().rand()."showdoc");
 		$data['uid'] = $uid ;
 		$data['token'] = $token ;
 		$data['token_expire'] = $token_expire ;

diff --git a/Application/Home/View/Item/show_single_page.html b/Application/Home/View/Item/show_single_page.html
@@ -24,11 +24,8 @@ <h3 id="doc-title">{$page.page_title}</h3>
             <ul class="dropdown-menu">
             <!-- dropdown menu links -->
                <li><a href="{:U('Home/Item/word',array('item_id'=>$item['item_id']))}">{$Think.Lang.export}</a></li>
-               <if condition="$ItemCreator">
-                <li><a href="{:U('Home/Item/add',array('item_id'=>$item['item_id']))}">{$Think.Lang.update_info}</a></li>          
-                <li><a href="{:U('Home/Member/edit',array('item_id'=>$item['item_id']))}">{$Think.Lang.manage_members}</a></li>
-                <li><a href="{:U('Home/Attorn/index',array('item_id'=>$item['item_id']))}">{$Think.Lang.attorn}</a></li>
-                <li><a href="{:U('Home/Item/delete',array('item_id'=>$item['item_id']))}">{$Think.Lang.delete}</a></li>
+             <if condition="$ItemCreator">
+                <li><a href="{:U('Home/Item/setting',array('item_id'=>$item['item_id']))}">项目设置</a></li>          
               </if>
               <li><a href="{:U('Home/Item/index')}" >{$Think.Lang.goback}</a></li>
             </ul>

diff --git a/server/Application/Api/Model/UserTokenModel.class.php b/server/Application/Api/Model/UserTokenModel.class.php
@@ -9,7 +9,7 @@ class UserTokenModel extends BaseModel {
 
 	public function createToken($uid,$token_expire = 0 ){
 		$token_expire = $token_expire > 0  ? (time() + $token_expire ) : (time() + 60*60*24*90 );
-		$token = md5(md5($uid.$token_expire.time().rand()."showdoc")."thyjhhyhhvxdtr6kiykyn");
+		$token = md5(md5($uid.$token_expire.time().rand()."showdoc")."rdgsvgsrgr67hghf54t").md5($uid.$token_expire.time().rand()."showdoc");
 		$data['uid'] = $uid ;
 		$data['token'] = $token ;
 		$data['token_expire'] = $token_expire ;