|
@@ -198,8 +198,6 @@ class CosService |
|
@@ -198,8 +198,6 @@ class CosService |
|
198
|
];
|
198
|
];
|
|
199
|
$url = $url.'?watermark/1/'.implode('/',$param);
|
199
|
$url = $url.'?watermark/1/'.implode('/',$param);
|
|
200
|
}else{
|
200
|
}else{
|
|
201
|
-// $data['dx'] = $data['dx'] ?? 10;
|
|
|
|
202
|
-// return $data;
|
|
|
|
203
|
$param = [
|
201
|
$param = [
|
|
204
|
'text/'.$this->urlSafeBase64Encode($data['text'] ?? ''),//文字水印名称
|
202
|
'text/'.$this->urlSafeBase64Encode($data['text'] ?? ''),//文字水印名称
|
|
205
|
'gravity/'.$this->urlSafeBase64Encode($data['gravity'] ?? 'SouthEast'),
|
203
|
'gravity/'.$this->urlSafeBase64Encode($data['gravity'] ?? 'SouthEast'),
|
|
@@ -232,7 +230,7 @@ class CosService |
|
@@ -232,7 +230,7 @@ class CosService |
|
232
|
'Key' => $cdnUrl, // 去掉域名部分,得到存储桶内的路径
|
230
|
'Key' => $cdnUrl, // 去掉域名部分,得到存储桶内的路径
|
|
233
|
'Body' => $imageContent,
|
231
|
'Body' => $imageContent,
|
|
234
|
]);
|
232
|
]);
|
|
235
|
- return $url;
|
233
|
+ return $cos['cdn'].$cdnUrl;
|
|
236
|
}
|
234
|
}
|
|
237
|
|
235
|
|
|
238
|
/**
|
236
|
/**
|