浏览代码

1,修复1039入库播放组重复问题。
2,其他细节。

magicblack 5 年之前
父节点
当前提交
002934b95c

+ 1 - 1
application/admin/view/system/configplay.html

@@ -179,7 +179,7 @@
             $('input[name="play[second]"]').val('5');
             $('input[name="play[prestrain]"]').val('//union.maccms.com/html/prestrain.html');
             $('input[name="play[buffer]"]').val('//union.maccms.com/html/buffer.html');
-            $('input[name="play[parse]"]').val('//api.maccms.com/parse/?url=');
+            $('input[name="play[parse]"]').val('');
 
         });
 

+ 1 - 1
application/common/model/Collect.php

@@ -714,7 +714,7 @@ class Collect extends Base {
                                     $des .= '播放地址相同,跳过。';
                                 } elseif (empty($cj_play_from)) {
                                     $des .= '播放器类型为空,跳过。';
-                                } elseif (strpos(','.$info['vod_play_from'].',', ','.$cj_play_from.',') <= 0) {
+                                } elseif (strpos(','.$info['vod_play_from'].',', ','.$cj_play_from.',') !==false) {
                                     $color = 'green';
                                     $des .= '播放组(' . $cj_play_from . '),新增ok。';
                                     if(!empty($old_play_from)){

+ 1 - 1
application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS',
     'copyright' => 'MacCMS.LA',
     'url' => '//www.maccms.la/',
-    'code' => '2020.1000.1039',
+    'code' => '2020.1000.1040',
     'license' => '免费版',
 );
 ?>

文件差异内容过多而无法显示
+ 2 - 2
static/js/playerconfig.js


+ 2 - 2
static/js/playerconfig.js.bak

@@ -1,6 +1,6 @@
-var MacPlayerConfig={};
+var MacPlayerConfig={};
 //参数开始
-MacPlayerConfig={"width":"100%","height":"100%","widthmob":"100%","heightmob":"100%","widthpop":"0","heightpop":"400","second":"5","prestrain":"\/\/union.maccms.com\/html\/prestrain.html","buffer":"\/\/union.maccms.com\/html\/buffer.html","parse":"\/\/api.maccms.com\/parse\/?url=","autofull":"0","showtop":"0","showlist":"0","flag":"0","colors":"000000,F6F6F6,F6F6F6,333333,666666,FFFFF,FF0000,2c2c2c,ffffff,a3a3a3,2c2c2c,adadad,adadad,48486c,fcfcfc"};
+MacPlayerConfig={"width":"100%","height":"100%","widthmob":"100%","heightmob":"100%","widthpop":"0","heightpop":"400","second":"5","prestrain":"\/\/union.maccms.com\/html\/prestrain.html","buffer":"\/\/union.maccms.com\/html\/buffer.html","parse":"","autofull":"0","showtop":"0","showlist":"0","flag":"0","colors":"000000,F6F6F6,F6F6F6,333333,666666,FFFFF,FF0000,2c2c2c,ffffff,a3a3a3,2c2c2c,adadad,adadad,48486c,fcfcfc"};
 //参数结束
 //缓存开始
 //缓存内容

部分文件因为文件数量过多而无法显示