dever 6 yıl önce
ebeveyn
işleme
fb78ac383c

+ 7 - 3
act/lib/Num.php

@@ -83,20 +83,24 @@ class Num
     # 订阅数计数器
     public function setCounter($id, $num = 0)
     {
-        $key = 'journal_buy_num2_' . $id;
+        $key = 'journal_buy_num3_' . $id;
+        /*
         $callback = function() use($id) {
             $journal = Dever::db('journal/info')->one($id);
             return $journal['num_ding'];
         };
         Dever::counter($key, $num, $callback);
+        */
+        Dever::cache($key, $num);
         return true;
     }
 
     # 订阅数计数器
     public function getCounter($id)
     {
-        $key = 'journal_buy_num2_' . $id;
-        return Dever::counter($key);
+        $key = 'journal_buy_num3_' . $id;
+        //return Dever::counter($key);
+        return Dever::cache($key);
     }
 
     /**

+ 1 - 1
act/lib/Pay.php

@@ -186,7 +186,7 @@ class Pay
                     }
 
                     # 增加订阅数
-                    Dever::load('act/lib/num')->setCounter($order['product_id'], $buy['num']);
+                    //Dever::load('act/lib/num')->setCounter($order['product_id'], $buy['num']);
                 }
             }
             # 积分

+ 11 - 3
journal/database/info.php

@@ -542,11 +542,19 @@ $config = array
 
 	'top' => Dever::config('base')->top,
 
-	# 增加这个,为了给当前的list增加一个option
+	# 增加这个,为了给当前的list增加一个option $admin = Dever::load('manage/auth.info');
 	'top_option' => array
 	(
-		'value' => $auth,
-		'col' => 'cate_id',
+		array
+		(
+			'value' => $auth,
+			'col' => 'cate_id',
+		),
+		array
+		(
+			'value' => Dever::load('manage/auth.authData'),
+			'col' => 'id',
+		),
 	),
 	
 	# 管理功能

+ 14 - 0
journal/lib/Manage.php

@@ -6,6 +6,20 @@ use Dever;
 
 class Manage
 {
+    public function getManageData()
+    {
+        $data = array();
+
+        $data = Dever::db('journal/cate')->state();
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $data[$k]['child'] = Dever::db('journal/info')->state(array('cate_id' => $v['id']));
+            }
+        }
+        return $data;
+    }
+
     public function showOrderUser($id)
     {
         $info = Dever::db('journal/order')->one($id);

+ 6 - 1
main/src/Content.php

@@ -7,6 +7,11 @@ use Main\Lib\Core;
 
 class Content extends Core
 {
+    public function test_combine()
+    {
+        return Dever::load('passport/lib/base')->combine(4, '321313');
+    }
+
     public function test_redis()
     {
         # 测试缓存
@@ -63,7 +68,7 @@ class Content extends Core
     public function home()
     {
         //MWY2M2MtZThRSG1iR2NHTjV6SjlHUDZvSHNlVURQVkRiT1dtREQxVVA4SThSOEc5bFhnUW43UExo
-        //echo Dever::login(12);die;
+        //echo Dever::login(96046);die;
         //1 NDY3MmVlOGVsdUxxa2pzNHczckR2TEl1NGFmVmVTd2ItWWhDcDB1T04wdXBDaUpDMl9rRmU4VHM=
         //2 ZTdjNjBHUTY4QUpoZk16QVlZRlg0d3locDFRcll5a3FQcWhFdEo1M1QzaFhmNGhrUlAyTTdGVWc= 
         //9 ZTBiZWN5dW9ublpnSzR2dmlXUUc5MWJJQWk5d3pFQmx0TEp6a0VJVkU4NG5HVTYtcjhFNTdfdnc=

+ 3 - 3
main/src/Journal_v1.php

@@ -64,7 +64,7 @@ class Journal_v1 extends Core
             $this->data['journal'] = array();
         }
 
-        //$this->data['end']['call'] = 'main/journal_v1.getList_noCache';
+        $this->data['end']['call'] = 'main/journal_v1.getList_noCache';
 
         $this->data['code'] = 1;
         if (checkVersion()->journal_buy == 2) {
@@ -78,7 +78,7 @@ class Journal_v1 extends Core
     {
         if ($data['push'] && $data['push']['hot'] == 1) {
             $num_ding = Dever::load('act/lib/num')->getCounter($data['push']['id']);
-            if ($num_ding) {
+            if ($num_ding && $num_ding >= $data['push']['num_ding']) {
                 $data['push']['num_ding'] = $num_ding;
                 $data['push'] = $this->ding($data['push']);
             }
@@ -88,7 +88,7 @@ class Journal_v1 extends Core
             foreach ($data['journal'] as $k => $v) {
                 if ($v['hot'] == 1) {
                     $num_ding = Dever::load('act/lib/num')->getCounter($v['id']);
-                    if ($num_ding) {
+                    if ($num_ding && $num_ding >= $v['num_ding']) {
                         $data['journal'][$k]['num_ding'] = $num_ding;
                         $data['journal'][$k] = $this->ding($data['journal'][$k]);
                     }

+ 3 - 0
manage/config/base.php

@@ -24,6 +24,9 @@ $config['base'] = array
 	(
 		'url' => 'https://webapi.amap.com/maps?v=1.4.8&key=b51a0d5f8f977726eeaa070a30bcf3cd',
 	),
+
+	# 后台管理的数据执行权限的设置
+	'manageAuthData' => 'journal/lib/manage.getManageData',
 );
 
 # 模板配置

+ 14 - 1
stat/database/journal.php

@@ -249,7 +249,20 @@ return array
         ),
     ),
 
-    //'top' => Dever::config('base')->top,
+    'top' => Dever::config('base')->top,
+    'top_option' => array
+    (
+        array
+        (
+            'value' => $auth,
+            'col' => 'cate_id',
+        ),
+        array
+        (
+            'value' => Dever::load('manage/auth.authData'),
+            'col' => 'id',
+        ),
+    ),
 
     'manage' => array
     (

+ 3 - 0
stat/lib/Journal.php

@@ -155,9 +155,12 @@ class Journal
 
         $stat = Dever::db('stat/journal')->getNumByJournal(array('journal_id' => $where['journal_id']));
         if ($stat && $stat['buy_num']) {
+            Dever::config('base')->after = 1;
             $set['num_ding'] = $stat['buy_num'];
             $set['where_id'] = $where['journal_id'];
             Dever::db('journal/info')->update($set);
+
+            Dever::load('act/lib/num')->setCounter($set['where_id'], $set['num_ding']);
         }
     }
 }