Merge branch 'master' of https://gitea.f2b211.com/jsasg/orico-official-website

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
             ];
+            $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']);
         }
     }

app/index/view/mobile/public/footer.html

@@ -64,7 +64,7 @@
         <div class="copy-text">
             {$basic_config.website_powerby.value}
             {notempty name="$basic_config.website_icp"}
-            <a href="https://beian.miit.gov.cn/" style="color:white;">（{$basic_config.website_icp.value}）</a>
+            <a href="https://beian.miit.gov.cn/" style="color:white;">{$basic_config.website_icp.value|raw}</a>
             {/notempty}
         </div>
         {/notempty}

app/index/view/pc/public/nas_footer.html

@@ -63,7 +63,7 @@
                 <div class="ftcopyright">
                     <span>{$basic_config.website_powerby.value}</span>
                     {if condition="!empty($basic_config.website_icp)"}
-                    <a href="https://beian.miit.gov.cn/">（{$basic_config.website_icp.value}）</a>
+                    <a href="https://beian.miit.gov.cn/">{$basic_config.website_icp.value|raw}</a>
                     {/if}
                 </div>
                 {/if}