增加影集logo

application/api/controller/Eyemargin.php

@@ -137,6 +137,7 @@ class Eyemargin extends Common
 
         $time = time() - 30*86400;
         $common_where = [];
+        $common_where['u.avatar'] = ['like', 'https%'];
         $common_where['a.is_main'] = 1;
         $common_where['a.status'] = 1;
         $common_where['u.city'] = $this->auth->city;
@@ -434,6 +435,9 @@ class Eyemargin extends Common
                 $eyemargin->where(['id' => $v['id'], 'encode_status' => 0])->setField($_data);
             }
         }
+
+        echo 'wan bi';
+        die;
     }
 
     /**

application/common/model/Eyemargin.php

@@ -30,6 +30,13 @@ class Eyemargin extends Model
             $results[$k]['right_info'] = self::getIsView($v['user_id'],$user_id);
             $v['cover'] || $results[$k]['cover'] = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].'/assets/img/video_cover.jpeg';
             $results[$k]['file_name'] = $v['eye_type'] == 1 ? self::getFileUniq($v['video']) : "";
+            if ($v['eye_type'] == 2) {
+                $album = explode(',', $v['album']);
+                foreach ($album as &$vv) {
+                    $vv = $vv . config('oss.img_watermark');
+                }
+                $results[$k]['album'] = join(',', $album);
+            }
         }
         $distance = array_column($results,'distance');
         array_multisort($distance,SORT_ASC,$results);

application/config.php

@@ -326,6 +326,8 @@ return [
         'pipeline_id'    => '0c4f9b648be54da09e29d8819f60a0df', //管道id
         'watermark_template_id'    => '0c09ed4ef64e424b89a3449bcc0de522', //水印模板id
         'template_id'    => '4c43c0ff9436425dbb6eaf2ce74e0ff0', //转码模板id
+        // 图片水印参数
+        'img_watermark'  => '?x-oss-process=image/watermark,image_bG9nby5wbmc_eC1vc3MtcHJvY2Vzcz1pbWFnZS9yZXNpemUsUF8zMA,t_90,g_se,x_18,y_18'
     ],
     'imgurl' => ["image","cover","avatar","album","old_avatar","music"],
     'onLogin' => [