dever 4 лет назад
Родитель
Сommit
fc31c996cb
2 измененных файлов с 5 добавлено и 4 удалено
  1. 1 0
      assets/layadmin/html/inc/script.html
  2. 4 4
      src/Lib/Input.php

+ 1 - 0
assets/layadmin/html/inc/script.html

@@ -38,6 +38,7 @@
 <script type="text/javascript" src="../script/lib/qiniu/upload/plupload.full.min.js"></script>
 
 <script type="text/javascript" src="../script/lib/qiniu/qiniu.upload.js"></script>
+<script type="text/javascript" src="../script/lib/oss/aliyun-oss-sdk-6.11.2.min.js"></script>
 <script type="text/javascript" src="../script/lib/tool/md5.js"></script>
 
 <script type="text/javascript" src="../script/lib/layui/upload.js?v11"></script>

+ 4 - 4
src/Lib/Input.php

@@ -195,12 +195,12 @@ class Input
         $html = $style = '';
         $div = array('', '');
         $type = 'button';
-        if (isset($param['upload']) && $param['upload'] == 'qiniu') {
+        if (isset($param['upload']) && ($param['upload'] == 'yun' || $param['upload'] == 'qiniu')) {
             $upload = Dever::project('upload');
             if ($upload && !strstr($upload['path'], 'http')) {
-                $upload = Dever::load('upload/qiniu.token?result=1&key=' . $param['key']);
+                $upload = Dever::load('upload/yun.token?return=1&key=' . $param['key']);
             } else {
-                $upload = Dever::load('upload/qiniu.token?key=' . $param['key']);
+                $upload = Dever::load('upload/yun.token?key=' . $param['key']);
             }
             
             if (isset($upload['domain'])) {
@@ -214,7 +214,7 @@ class Input
 
                 $date = explode('-', date("Y-m-d"));
                 $path = $param['key'] . '/' . $date[0] . '/' . $date[1] . '/' . $date[2] . '/';
-                $html = ' m="qiniu" cover="'.$cover.'" domain="'.$domain.'" path="'.$path.'" host="'.$host.'" token="'.$token.'" ';
+                $html = ' m="'.$upload['type'].'" cover="'.$cover.'" domain="'.$domain.'" path="'.$path.'" host="'.$host.'" token="'.$token.'" ';
             }
         }