edit

app/collection/database/content.php

@@ -295,7 +295,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'one',
-            'order' => array('reorder' => 'desc', 'cdate' => 'desc'),
+            'order' => array('page_id' => 'desc','reorder' => 'desc', 'cdate' => 'desc'),
             'col' => '*',
         ),
     )

app/collection/lib/Create.php

@@ -8,8 +8,9 @@ use Dever\Support\Img as Handle;
 class Create
 {
     # 自动创建
-    public function up($info_id, $source_id, $name, $desc, $year, $type = 11, $data, $cover = '')
+    public function up_commit($info_id, $source_id, $name, $desc, $year, $type = 11, $data, $cover = '')
     {
+        Dever::config('base')->hook = true;
         $where['info_id'] = $info_id;
 
         $info = Dever::db('collection/content')->getNew($where);
@@ -18,51 +19,49 @@ class Create
         	$data = explode(',', $data);
         	if (!$cover) {
         		$cover = $data[0];
-	            $cover = Dever::load('upload/view')->get($cover, 't', 1);
-	            $cover = Dever::load('upload/view')->get($cover, 'c', 1);
+	            //$cover = Dever::load('upload/view')->get($cover, 't', 1);
+	            //$cover = Dever::load('upload/view')->get($cover, 'c', 1);
         	}
         }
 
         $max = 15;
         $result = array();
-
-        print_r($info);die;
         if ($info) {
+            $result['page_id'] = $info['page_id'];
+            $page = Dever::db('collection/page')->find($info['page_id']);
+            if (!$page) {
+                return false;
+            }
+            $result['parent_times_id'] = $page['times_id_parent'];
+            $result['times_id'] = $page['times_id'];
+            $result['parent_page_id'] = $page['page_id'];
             if ($info['reorder'] >= $max) {
-            	$max = 12;
                 $result['reorder'] = $info['reorder'] = 1;
-                $result['page_id'] = $info['page_id'];
-                $page = Dever::db('collection/page')->find($info['page_id']);
-                if ($page) {
-                    $result['parent_times_id'] = $page['times_id_parent'];
-                    $result['times_id'] = $page['times_id'];
-                    $result['parent_page_id'] = $page['page_id'];
-
-                	if ($page['reorder'] >= $max) {
-                        $parent_page = Dever::db('collection/page')->find($result['parent_page_id']);
-                		
-                        if ($parent_page['reorder'] >= $max) {
-                            $result['parent_page_reorder'] = 1;
-
-                            $times = Dever::db('collection/times')->find($page['times_id']);
-
-                            $result['times_reorder'] = $times['reorder'] + 1;
-                            $result['times_id'] = $this->createTimes($info_id, $source_id, $result['times_reorder'], '', $year, $result['parent_times_id']);
-
-                        } else {
-                            $result['parent_page_reorder'] = $parent_page['reorder'] + 1;
-                        }
+                $max = 4;
+                if ($page['reorder'] >= $max) {
+                    $parent_page = Dever::db('collection/page')->find($result['parent_page_id']);
+                    
+                    if ($parent_page['reorder'] >= $max) {
+                        $result['parent_page_reorder'] = 1;
+
+                        $times = Dever::db('collection/times')->find($page['times_id']);
+
+                        $result['times_reorder'] = $times['reorder'] + 1;
+                        $result['times_id'] = $this->createTimes($info_id, $source_id, $result['times_reorder'], '', $year, $result['parent_times_id']);
 
-                        $result['parent_page_id'] = $this->createPage($info_id, $source_id, $result['parent_times_id'], $result['times_id'], $result['parent_page_reorder']);
+                    } else {
+                        $result['parent_page_reorder'] = $parent_page['reorder'] + 1;
+                    }
 
-                        $result['page_reorder'] = 1;
-                	} else {
-                		# 直接创建子章节
-                		$result['page_reorder'] = $page['reorder'] + 1;
-                	}
+                    $result['parent_page_id'] = $this->createPage($info_id, $source_id, $result['parent_times_id'], $result['times_id'], $result['parent_page_reorder']);
 
-                    $result['page_id'] = $this->createPage($info_id, $source_id, $result['parent_times_id'], $result['times_id'], $result['page_reorder'], $result['parent_page_id'], $desc, $cover);
+                    $result['page_reorder'] = 1;
+                } else {
+                    # 直接创建子章节
+                    $result['page_reorder'] = $page['reorder'] + 1;
                 }
+
+                $result['page_id'] = $this->createPage($info_id, $source_id, $result['parent_times_id'], $result['times_id'], $result['page_reorder'], $result['parent_page_id'], $desc, $cover);
             } else {
                 $result['reorder'] = $info['reorder'] + 1;
             }
@@ -94,8 +93,6 @@ class Create
         	}
         }
 
-        print_r($result);die;
-
         return $result;
     }
 
@@ -177,12 +174,18 @@ class Create
         foreach ($pic as $k => $v) {
             $where['pic_key'] = md5($v);
             $param['pic'] = $v;
+
+            Dever::upinto($table, $where, $param);
+            Dever::load('collection/lib/content')->updateTypeId($id, '', $where);
+
+            /*
             $v = Dever::curl($v . '?imageInfo');
             $v = Dever::json_decode($v);
             if (isset($v['width']) && $v['width'] > 0) {
                 Dever::upinto($table, $where, $param);
                 Dever::load('collection/lib/content')->updateTypeId($id, '', $where);
             }
+            */
         }
     }
 }

app/collection/lib/Spider.php

@@ -37,17 +37,18 @@ class Spider
 
         # 导入到唯美中
         # 每年12期，
-        $info_id = Dever::input('info_id', 5);
+        $info_id = Dever::input('info_id', 3);
         $source_id = $where['pid'] = Dever::input('pid', 14);
 
         $name = '测试';
         $desc = '测试测试';
-        $year = '';
+        $year = '2022';
 
-        $data = 'https://img.lianzhixiu.com/uploads/allimg/202003/9999/43eefe151d.jpg,https://img.lianzhixiu.com/uploads/allimg/202003/9999/31020deb3d.jpg',
+        $data = 'https://img.lianzhixiu.com/uploads/allimg/202003/9999/43eefe151d.jpg,https://img.lianzhixiu.com/uploads/allimg/202003/9999/31020deb3d.jpg';
 
-        Dever::load('collection/lib/create')->up($info_id, $source_id, $name, $desc, $year, $type = 11, $data, $cover = '');
+        $result = Dever::load('collection/lib/create.up_commit', $info_id, $source_id, $name, $desc, $year, $type = 11, $data, $cover = '');
 
+        print_r($result);die;
         echo 1;die;
 
         $where['use'] = 1;