diff --git a/app/command/DataMigration.php b/app/command/DataMigration.php index e506ef9a..06e237f0 100644 --- a/app/command/DataMigration.php +++ b/app/command/DataMigration.php @@ -930,7 +930,8 @@ class DataMigration extends Command { $videos = Db::connect('old') ->name('video') - ->where('id', '>', 844) + // ->where('id', '>', 844) + ->where('cid', 'in', array_keys($category_map)) ->where('country_code', 'in', ['ZH', 'US']) ->order(['id' => 'asc']) ->cursor(); @@ -970,7 +971,16 @@ class DataMigration extends Command 'seo_desc' => $val['seo_description'], 'deleted_at' => $val['stat'] == -1 ? date('Y-m-d H:i:s') : null ]; - Db::name('video')->insert($item); + $ret = Db::name('video') + ->where('language_id', '=', $item['language_id']) + ->where('name', '=', $item['name']) + ->find(); + if (empty($ret)) { + Db::name('video')->insert($item); + } else { + Db::name('video')->where('id', '=', $ret['id'])->update($item); + } + $this->println('迁移视频ID:' . $val['id']); } } diff --git a/app/index/view/mobile/public/footer.html b/app/index/view/mobile/public/footer.html index 0d54de8d..1374d1ac 100644 --- a/app/index/view/mobile/public/footer.html +++ b/app/index/view/mobile/public/footer.html @@ -64,7 +64,7 @@
{$basic_config.website_powerby.value} {notempty name="$basic_config.website_icp"} - ({$basic_config.website_icp.value}) + {$basic_config.website_icp.value|raw} {/notempty}
{/notempty} diff --git a/app/index/view/pc/public/nas_footer.html b/app/index/view/pc/public/nas_footer.html index 7b9f8581..d007da18 100644 --- a/app/index/view/pc/public/nas_footer.html +++ b/app/index/view/pc/public/nas_footer.html @@ -63,7 +63,7 @@
{$basic_config.website_powerby.value} {if condition="!empty($basic_config.website_icp)"} - ({$basic_config.website_icp.value}) + {$basic_config.website_icp.value|raw} {/if}
{/if}