feat入库重复规移除名称必选和新增豆瓣id

application/admin/view/system/configcollect.html

@@ -139,13 +139,14 @@
                     <label class="layui-form-label">
                         {:lang('admin/system/configcollect/inrule')}：</label>
                     <div class="layui-input-block">
-                        <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="a" title="{:lang('name')}" checked disabled>
+                        <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="a" title="{:lang('name')}" {if condition="strpos($config['collect']['vod']['inrule'],'a') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="b" title="{:lang('type')}" {if condition="strpos($config['collect']['vod']['inrule'],'b') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="c" title="{:lang('years')}" {if condition="strpos($config['collect']['vod']['inrule'],'c') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="d" title="{:lang('area')}" {if condition="strpos($config['collect']['vod']['inrule'],'d') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="e" title="{:lang('lang')}" {if condition="strpos($config['collect']['vod']['inrule'],'e') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="f" title="{:lang('actor')}" {if condition="strpos($config['collect']['vod']['inrule'],'f') !==false"}checked {/if}>
                         <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="g" title="{:lang('director')}" {if condition="strpos($config['collect']['vod']['inrule'],'g') !==false"}checked {/if}>
+                        <input type="checkbox" lay-skin="primary" name="collect[vod][inrule][]" value="h" title="{:lang('douban_id')}" {if condition="strpos($config['collect']['vod']['inrule'],'h') !==false"}checked {/if}>
                     </div>
                 </div>
 

application/common/model/Collect.php

@@ -569,7 +569,10 @@ class Collect extends Base {
                 }
 
                 $where = [];
-                $where['vod_name'] = mac_filter_xss($v['vod_name']);
+
+                if (strpos($config['inrule'], 'a')!==false) {
+                    $where['vod_name'] = mac_filter_xss($v['vod_name']);
+                }
                 $blend=false;
                 if (strpos($config['inrule'], 'b')!==false) {
                     $where['type_id'] = $v['type_id'];
@@ -594,6 +597,9 @@ class Collect extends Base {
                 if (strpos($config['inrule'], 'g')!==false) {
                     $where['vod_director'] = mac_filter_xss($v['vod_director']);
                 }
+                if (strpos($config['inrule'], 'h')!==false) {
+                    $where['vod_douban_id'] = intval($v['vod_douban_id']);
+                }
                 if ($config['tag'] == 1) {
                     $v['vod_tag'] = mac_filter_xss(mac_get_tag($v['vod_name'], $v['vod_content']));
                 }

application/data/update/database.php

@@ -97,3 +97,18 @@ if(empty($col_list[$pre.'collect']['collect_filter_year'])){
     $sql .= "ALTER TABLE `mac_collect` ADD `collect_filter_year` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '采集时，过滤年份' AFTER `collect_filter_from`;";
     $sql .="\r";
 }
+// 入库重复规则设置名称
+if (version_compare(config('version.code'), '2024.1000.4043', '>=')) {
+    $file = APP_PATH . 'extra/maccms.php';
+    $backupFile = APP_PATH . 'extra/maccms_backup_' . date('Ymd_His') . '.php';
+
+    copy($file, $backupFile);
+
+    @chmod($file, 0777);
+    $config = config('maccms');
+    if (strpos($config['collect']['vod']['inrule'], 'a') === false  && !isset($config['collect']['vod']['inrule_first_change'])) {
+        $config['collect']['vod']['inrule'] = ',a' . $config['collect']['vod']['inrule'];
+        $config['collect']['vod']['inrule_first_change']= true;
+        $res = mac_arr2file($file, $config);
+    }
+}