From c7d8646c5ebd4b8e59aada06cc0fad03f939f1ac Mon Sep 17 00:00:00 2001
From: zyx0814 <zyx0814@163.com>
Date: Tue, 6 Feb 2024 13:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/setting/interface.php                        |  4 +++-
 core/class/table/table_pichome_resources.php       | 12 ++++++++++--
 dzz/banner/template/components/index/operation.htm |  6 +++---
 dzz/textviewer/index.php                           |  6 +++++-
 dzz/xgplayer/index.php                             |  9 +++++++--
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/admin/setting/interface.php b/admin/setting/interface.php
index a2b2203..ef3e021 100644
--- a/admin/setting/interface.php
+++ b/admin/setting/interface.php
@@ -392,7 +392,9 @@ elseif($operation == 'mailcheck'){//邮件检测
        
         exit(json_encode(array('path'=>$_G['setting']['attachurl'] .$waterpath)));
     }
-        exit(json_encode(array('error'=>'upload error')));
+        exit(json_encode(array('path'=>$waterfilepath.'?'.VERHASH)));
+    }else{
+        exit(json_encode(array('error'=>'upload failer')));
     }
 }elseif($operation == 'watermark'){//水印设置
     if(!submitcheck('settingsubmit')) {
diff --git a/core/class/table/table_pichome_resources.php b/core/class/table/table_pichome_resources.php
index cd514a6..dc4c4af 100644
--- a/core/class/table/table_pichome_resources.php
+++ b/core/class/table/table_pichome_resources.php
@@ -248,6 +248,7 @@ class table_pichome_resources extends dzz_table
         if ($downshare[$resourcesdata['appid']]['isdelete']) return array();
         $attrdata = C::t('pichome_resources_attr')->fetch($rid);
         $resourcesdata = array_merge($resourcesdata, $attrdata);
+        $resourcesdata['remoteid'] = 0;
         if (is_numeric($resourcesdata['path'])) {
             $attachment = C::t('attachment')->fetch(intval($resourcesdata['path']));
             $bz = io_remote::getBzByRemoteid($attachment['remote']);
@@ -260,12 +261,19 @@ class table_pichome_resources extends dzz_table
                 $resourcesdata['bz'] = 'dzz::';
             } else {
                 $patharr = explode(':', $downshare[$resourcesdata['appid']]['path']);
-                $resourcesdata['bz'] = ($patharr[1]) ? $patharr[0] . ':' . $patharr[1] . ':' : 'dzz::';
-                $resourcesdata['remoteid'] = $patharr[1];
+                if(is_numeric($patharr[1])){
+                    $resourcesdata['bz'] = ($patharr[1]) ? $patharr[0] . ':' . $patharr[1] . ':' : 'dzz::';
+                    $resourcesdata['remoteid'] = $patharr[1];
+                }else{
+                    $resourcesdata['bz'] = 'dzz::';
+                }
+
             }
             $resourcesdata['path'] = $downshare[$resourcesdata['appid']]['path'] . BS . $resourcesdata['path'];
         }
         $resourcesdata['vapptype'] = $downshare[$resourcesdata['appid']]['type'];
+        if($resourcesdata['vapptype'] == 3)  $resourcesdata['iswebsitefile'] = 1;
+        else  $resourcesdata['iswebsitefile'] =0;
         return $resourcesdata;
     }
 
diff --git a/dzz/banner/template/components/index/operation.htm b/dzz/banner/template/components/index/operation.htm
index 3ae7e8b..9aec542 100644
--- a/dzz/banner/template/components/index/operation.htm
+++ b/dzz/banner/template/components/index/operation.htm
@@ -96,7 +96,7 @@
                 <!-- <el-radio :label="1" size="large">智能数据</el-radio> -->
                 <el-radio :label="2" size="large">单页</el-radio>
                 <el-radio :label="3" size="large">链接</el-radio>
-                <el-radio :label="4" size="large">专辑</el-radio>
+                <!--<el-radio :label="4" size="large">专辑</el-radio>-->
             </el-radio-group>
         </el-form-item>
         <el-form-item label="数据来源" prop="value" v-if="DialogData.type != 5">
@@ -126,13 +126,13 @@
                                 :label="item.name"
                                 :value="item.id"></el-option>
                         </template>
-                        <template v-else-if="DialogData.type == 4">
+                        <!--<template v-else-if="DialogData.type == 4">
                             <el-option
                                 v-for="item in DialogData.dataList.tab"
                                 :key="item.gid"
                                 :label="item.name"
                                 :value="item.gid"></el-option>
-                        </template>
+                        </template>-->
                   </el-select>
             </template>
             
diff --git a/dzz/textviewer/index.php b/dzz/textviewer/index.php
index 31491b7..53c46a6 100644
--- a/dzz/textviewer/index.php
+++ b/dzz/textviewer/index.php
@@ -23,7 +23,11 @@ if($_GET['src']){
     }else{
         $resourcesdata = C::t('pichome_resources')->fetch_data_by_rid($rid);
     }
-    $fileurl = IO::getFileUri($resourcesdata['path']);
+    if(!$resourcesdata['iswebsitefile'] && $resourcesdata['bz'] == 'dzz::'){
+        $fileurl  = getglobal('siteurl') . 'index.php?mod=io&op=getStream&path=' . dzzencode($rid.'_3', '', 14400, 0);
+    }else{
+        $fileurl=IO::getFileuri($resourcesdata['path']);
+    }
     $str = file_get_contents($fileurl);
 }
 
diff --git a/dzz/xgplayer/index.php b/dzz/xgplayer/index.php
index 4d4a0ea..143b630 100644
--- a/dzz/xgplayer/index.php
+++ b/dzz/xgplayer/index.php
@@ -22,7 +22,7 @@ if($_GET['operation']=='progress'){
     //$rid = dzzdecode($_GET['path'],'',0);
     if(strpos($rid, 'attach::') === 0){
         $resourcesdata = C::t('attachment')->fetch(intval(str_replace('attach::', '', $path)));
-
+        $resourcesdata['iswebsitefile'] = 1;
     }else{
         $resourcesdata = C::t('pichome_resources')->fetch_data_by_rid($rid);
     }
@@ -119,7 +119,12 @@ if($_GET['operation']=='progress'){
         }
 
     }else{
-        $src=IO::getFileuri($resourcesdata['path']);
+        if(!$resourcesdata['iswebsitefile'] && $resourcesdata['bz'] == 'dzz::'){
+            $src  = getglobal('siteurl') . 'index.php?mod=io&op=getStream&path=' . dzzencode($rid.'_3', '', 14400, 0);
+        }else{
+            $src=IO::getFileuri($resourcesdata['path']);
+        }
+
     }