diff --git a/app/Http/Controllers/CronController.php b/app/Http/Controllers/CronController.php
index f85d0509..39f19b44 100755
--- a/app/Http/Controllers/CronController.php
+++ b/app/Http/Controllers/CronController.php
@@ -41,7 +41,7 @@ class CronController
             $s = $v;
         }
         
-        $h = "00";
+//        $h = "00";
         //// test end
         
         if ($h == "00") {
diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index e5bdbac9..306e1b40 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -318,6 +318,7 @@ class SakaiController
         $s = "/cron#test";
         $s = "/book#main";
         $s = "/book#up__3";
+        $s = "/book#main";
 //        $s = "war 8";
 //        $s = "no 9";
 //        $s = "detail__all 1";
diff --git a/app/Models/Book.php b/app/Models/Book.php
index 35598099..98577d6a 100755
--- a/app/Models/Book.php
+++ b/app/Models/Book.php
@@ -126,18 +126,36 @@ class Book extends Model
         // order
         if ($oParentRag->order == "rank_todo") {
             
-            $sTodoOrder = BookOption::_hit("order_rank_todo");
-            $aTodoOrder = explode(",", $sTodoOrder);
-            $sTodoOrder = implode(",", array_reverse($aTodoOrder));
+            $sOrderRank = BookOption::_hit("order_rank_todo");
+//            $aTodoOrder = explode(",", $sTodoOrder);
+//            $sTodoOrder = implode(",", array_reverse($aTodoOrder));
+//            
+//            $oSelf = $oSelf->orderByRaw("FIELD(rank, " . $sTodoOrder . ") DESC, (rank IS NULL) ASC");
+//            $oSelf = $oSelf->orderByRaw("fire DESC, (fire IS NULL) ASC");
+//            
+//            $sOrder = "no";
+//            $sOrderType = "asc";
             
-            $oSelf = $oSelf->orderByRaw("FIELD(rank, " . $sTodoOrder . ") DESC, (rank IS NULL) ASC");
-            $oSelf = $oSelf->orderByRaw("fire DESC, (fire IS NULL) ASC");
+        // 默认也rank排序
+        } else {
             
-            $sOrder = "no";
-            $sOrderType = "asc";
+            $sOrderRank = BookOption::_hit("order_rank");
             
+//            tomd($sOrderRank, 1);
         }
         
+        
+//        $sOrderRank = BookOption::_hit("order_rank_todo");
+        $aOrderRank = explode(",", $sOrderRank);
+        $sOrderRank = implode(",", array_reverse($aOrderRank));
+        
+        $oSelf = $oSelf->orderByRaw("FIELD(rank, " . $sOrderRank . ") DESC, (rank IS NULL) ASC");
+        $oSelf = $oSelf->orderByRaw("fire DESC, (fire IS NULL) ASC");
+        
+        $sOrder = "no";
+        $sOrderType = "asc";
+        
+        
         $oSelf = $oSelf->orderBy($sOrder, $sOrderType);
         
         $oSelf = $oSelf->orderBy("updated_at", "desc");
diff --git a/app/Services/TG/Hook/Mod/Book.php b/app/Services/TG/Hook/Mod/Book.php
index 92822684..5f3ce65c 100644
--- a/app/Services/TG/Hook/Mod/Book.php
+++ b/app/Services/TG/Hook/Mod/Book.php
@@ -1848,17 +1848,21 @@ class Book extends Base {
         $aMap = [
             "war"   => "🔴",
             "red"   => "🔴",
+            "tip"   => "🟣",
             "gem"   => "🟣",
-            "glod"  => "🟡",
-            "iron"  => "🟤",
             "action"   => "🟢",
             "wait"  => "⚪️",
-//            "block"  => "⚫️",
             "keep"  => "🟡",
-            "tip"   => "🟣",
+            "glod"  => "🟡",
             "track" => "🟤",
+            "iron"  => "🟤",
+            "block"  => "⚫️",
         ];
         
+//        'war','red','tip','gem','action','wait','keep','glod','track','iron','block',
+        
+//        'war','red','action','tip','keep','track','wait','none'
+        
         if (!empty($aMap[$sRank])) {
             $sRst = $aMap[$sRank];
         } else {