Passed
Push — master ( 4428d0...671bc7 )
by xiaohui
02:35
created
src/WantuFileServiceProvider.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 
11 11
 class WantuFileServiceProvider extends ServiceProvider
12 12
 {
13
-    public function boot()
14
-    {
15
-        app('filesystem')->extend('wantu', function ($app, $config) {
16
-            $adapter = new WantuFileAdapter(
17
-                $config['access_key'],
18
-                $config['secret_key'],
19
-                $config['namespace'],
20
-                $config['domain']
21
-            );
22
-            $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
23
-            // $flysystem->addPlugin(new FetchFile());
24
-            $flysystem->addPlugin(new UploadToken());
25
-            $flysystem->addPlugin(new GetUrl());
26
-            // $flysystem->addPlugin(new PrivateDownloadUrl());
27
-            // $flysystem->addPlugin(new RefreshFile());
28
-            return $flysystem;
29
-        });
30
-    }
13
+	public function boot()
14
+	{
15
+		app('filesystem')->extend('wantu', function ($app, $config) {
16
+			$adapter = new WantuFileAdapter(
17
+				$config['access_key'],
18
+				$config['secret_key'],
19
+				$config['namespace'],
20
+				$config['domain']
21
+			);
22
+			$flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
23
+			// $flysystem->addPlugin(new FetchFile());
24
+			$flysystem->addPlugin(new UploadToken());
25
+			$flysystem->addPlugin(new GetUrl());
26
+			// $flysystem->addPlugin(new PrivateDownloadUrl());
27
+			// $flysystem->addPlugin(new RefreshFile());
28
+			return $flysystem;
29
+		});
30
+	}
31 31
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function boot()
14 14
     {
15
-        app('filesystem')->extend('wantu', function ($app, $config) {
15
+        app('filesystem')->extend('wantu', function($app, $config) {
16 16
             $adapter = new WantuFileAdapter(
17 17
                 $config['access_key'],
18 18
                 $config['secret_key'],
Please login to merge, or discard this patch.
src/Plugins/UploadToken.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 
6 6
 class UploadToken extends AbstractPlugin
7 7
 {
8
-    public function getMethod()
9
-    {
10
-        return 'getUploadToken';
11
-    }
8
+	public function getMethod()
9
+	{
10
+		return 'getUploadToken';
11
+	}
12 12
 
13
-    public function handle($option = null)
14
-    {
15
-        return $this->filesystem->getAdapter()->getUploadToken($option);
16
-    }
13
+	public function handle($option = null)
14
+	{
15
+		return $this->filesystem->getAdapter()->getUploadToken($option);
16
+	}
17 17
 }
Please login to merge, or discard this patch.
src/Plugins/GetUrl.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@
 block discarded – undo
5 5
 
6 6
 class GetUrl extends AbstractPlugin
7 7
 {
8
-    public function getMethod()
9
-    {
10
-        return 'getUrl';
11
-    }
12
-    public function handle($path)
13
-    {
14
-        return $this->filesystem->getAdapter()->getUrl($path);
15
-    }
8
+	public function getMethod()
9
+	{
10
+		return 'getUrl';
11
+	}
12
+	public function handle($path)
13
+	{
14
+		return $this->filesystem->getAdapter()->getUrl($path);
15
+	}
16 16
 }
Please login to merge, or discard this patch.
src/WantuFileAdapter.php 2 patches
Indentation   +385 added lines, -385 removed lines patch added patch discarded remove patch
@@ -12,389 +12,389 @@
 block discarded – undo
12 12
 
13 13
 class WantuFileAdapter extends AbstractAdapter
14 14
 {
15
-    use NotSupportingVisibilityTrait;
16
-
17
-    /**
18
-     * @var Client|null
19
-     */
20
-    private $client = null;
21
-
22
-    /**
23
-     * @var string
24
-     */
25
-    private $namespace = null;
26
-
27
-    /**
28
-     * @var string
29
-     */
30
-    private $domain = null;
31
-
32
-    /**
33
-     * @param string $accessKey
34
-     * @param string $secretKey
35
-     * @param string $namespace
36
-     */
37
-    public function __construct($accessKey, $secretKey, $namespace, $origin)
38
-    {
39
-        $client = new Client($accessKey, $secretKey, $namespace);
40
-        $this->setClient($client, $namespace, $origin);
41
-    }
42
-
43
-    public function setClient(Client $client, $namespace, $origin)
44
-    {
45
-        $this->client = $client;
46
-        $this->namespace = $namespace;
47
-        $this->domain = $origin;
48
-    }
49
-
50
-    /**
51
-     * Write a new file.
52
-     *
53
-     * @param string $path
54
-     * @param string $contents
55
-     * @param Config $config   Config object
56
-     *
57
-     * @return array|false false on failure file meta data on success
58
-     */
59
-    public function write($path, $contents, Config $config)
60
-    {
61
-        $uploadPolicy = new UploadPolicy([
62
-            'namespace' => $this->namespace,
63
-            'dir' => preg_replace('/^\./', '', dirname($path)),
64
-            'name' => last(explode("/", $path)),
65
-        ]);
66
-
67
-        return $this->client->uploadData($contents, $uploadPolicy);
68
-    }
69
-
70
-    /**
71
-     * Write a new file using a stream.
72
-     *
73
-     * @param string   $path
74
-     * @param resource $resource
75
-     * @param Config   $config   Config object
76
-     *
77
-     * @return array|false false on failure file meta data on success
78
-     */
79
-    public function writeStream($path, $resource, Config $config)
80
-    {
81
-        $contents = '';
82
-
83
-        while (!feof($resource)) {
84
-            $contents .= fread($resource, 1024);
85
-        }
86
-
87
-        $response = $this->write($path, $contents, $config);
88
-
89
-        if (false === $response) {
90
-            return $response;
91
-        }
92
-
93
-        return compact('path');
94
-    }
95
-
96
-    /**
97
-     * Update a file.
98
-     *
99
-     * @param string $path
100
-     * @param string $contents
101
-     * @param Config $config   Config object
102
-     *
103
-     * @return array|false false on failure file meta data on success
104
-     */
105
-    public function update($path, $contents, Config $config)
106
-    {
107
-        $this->delete($path);
108
-
109
-        return $this->write($path, $contents, $config);
110
-    }
111
-
112
-    /**
113
-     * Update a file using a stream.
114
-     *
115
-     * @param string   $path
116
-     * @param resource $resource
117
-     * @param Config   $config   Config object
118
-     *
119
-     * @return array|false false on failure file meta data on success
120
-     */
121
-    public function updateStream($path, $resource, Config $config)
122
-    {
123
-        $this->delete($path);
124
-
125
-        return $this->writeStream($path, $resource, $config);
126
-    }
127
-
128
-    public function put($path, $contents, Config $config)
129
-    {
130
-        return $this->write($path, $contents, $config);
131
-    }
132
-
133
-    public function putStream($path, $resource, Config $config)
134
-    {
135
-        return $this->write($path, $resource, $config);
136
-    }
137
-
138
-    /**
139
-     * Rename a file.
140
-     *
141
-     * @param string $path
142
-     * @param string $newpath
143
-     *
144
-     * @return bool
145
-     */
146
-    public function rename($path, $newpath)
147
-    {
148
-        return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
149
-    }
150
-
151
-    /**
152
-     * Copy a file.
153
-     *
154
-     * @param string $path
155
-     * @param string $newpath
156
-     *
157
-     * @return bool
158
-     */
159
-    public function copy($path, $newpath)
160
-    {
161
-    }
162
-
163
-    /**
164
-     * Delete a file.
165
-     *
166
-     * @param string $path
167
-     *
168
-     * @return bool
169
-     */
170
-    public function delete($path)
171
-    {
172
-        return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
173
-    }
174
-
175
-    /**
176
-     * Delete a directory.
177
-     *
178
-     * @param string $dirname
179
-     *
180
-     * @return bool
181
-     */
182
-    public function deleteDir($dirname)
183
-    {
184
-        return $this->client->deleteDir($this->namespace, $dirname);
185
-    }
186
-
187
-    /**
188
-     * Create a directory.
189
-     *
190
-     * @param string $dirname directory name
191
-     * @param Config $config
192
-     *
193
-     * @return array|false
194
-     */
195
-    public function createDir($dirname, Config $config)
196
-    {
197
-        return $this->client->createDir($this->namespace, $dirname);
198
-    }
199
-
200
-    /**
201
-     * Check whether a file exists.
202
-     *
203
-     * @param string $path
204
-     *
205
-     * @return array|bool|null
206
-     */
207
-    public function has($path)
208
-    {
209
-        if (Str::endsWith($path, "/")) {
210
-            return $this->client->existsFolder($this->namespace, preg_replace('/^\./', '', dirname($path)));
211
-        } else {
212
-            return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
213
-        }
214
-    }
215
-
216
-
217
-    /**
218
-     * Read a file.
219
-     *
220
-     * @param string $path
221
-     *
222
-     * @return array|false
223
-     */
224
-    public function read($path)
225
-    {
226
-        $contents = file_get_contents($this->getUrl($path));
227
-        return compact('contents', 'path');
228
-    }
229
-
230
-    /**
231
-     * Read a file as a stream.
232
-     *
233
-     * @param string $path
234
-     *
235
-     * @return array|false
236
-     */
237
-    public function readStream($path)
238
-    {
239
-    }
240
-
241
-    /**
242
-     * List contents of a directory.
243
-     *
244
-     * @param string $directory
245
-     * @param bool   $recursive
246
-     *
247
-     * @return array
248
-     */
249
-    public function listContents($directory = '', $recursive = false)
250
-    {
251
-        return $this->client->listFiles($this->namespace, $directory, 1, 1000);
252
-    }
253
-
254
-    /**
255
-     * Get all the meta data of a file or directory.
256
-     *
257
-     * @param string $path
258
-     *
259
-     * @return array|false
260
-     */
261
-    public function getMetadata($path)
262
-    {
263
-        return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
264
-    }
265
-
266
-    /**
267
-     * Get the size of a file.
268
-     *
269
-     * @param string $path
270
-     *
271
-     * @return array|false
272
-     */
273
-    public function getSize($path)
274
-    {
275
-    }
276
-
277
-
278
-    /**
279
-     * Fetch url to bucket.
280
-     *
281
-     * @param string $path
282
-     * @param string $url
283
-     *
284
-     * @return array|false
285
-     */
286
-    public function fetch($path, $url)
287
-    {
288
-    }
289
-
290
-    /**
291
-     * Get private file download url.
292
-     *
293
-     * @param string $path
294
-     * @param int    $expires
295
-     *
296
-     * @return string
297
-     */
298
-    public function privateDownloadUrl($path, $expires = 3600)
299
-    {
300
-    }
301
-
302
-    /**
303
-     * Refresh file cache.
304
-     *
305
-     * @param string|array $path
306
-     *
307
-     * @return array
308
-     */
309
-    public function refresh($path)
310
-    {
311
-    }
312
-
313
-
314
-    /**
315
-     * Get the mime-type of a file.
316
-     *
317
-     * @param string $path
318
-     *
319
-     * @return array|false
320
-     */
321
-    public function getMimeType($path)
322
-    {
323
-    }
324
-
325
-
326
-    /**
327
-     * Get the timestamp of a file.
328
-     *
329
-     * @param string $path
330
-     *
331
-     * @return array|false
332
-     */
333
-    public function getTimestamp($path)
334
-    {
335
-    }
336
-
337
-    /**
338
-     * Get the upload token.
339
-     *
340
-     * @param string|null $key
341
-     * @param int         $ttl
342
-     * @param string|null $policy
343
-     * @param string|null $strictPolice
344
-     *
345
-     * @return string
346
-     */
347
-    public function getUploadToken($option = null)
348
-    {
349
-        if ($option === null) {
350
-            $option = ['name' => null, 'ttl' => 3600, ];
351
-        } elseif (!isset($option['ttl']) || !$option['ttl']) {
352
-            $option['ttl'] = 3600;
353
-        }
354
-
355
-        return $this->client->getUploadToken(collect([
356
-            'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
357
-            'insertOnly' => Conf::INSERT_ONLY_TRUE
358
-        ])->merge(collect($option)->except(['ttl',])));
359
-    }
360
-
361
-    /**
362
-     * @param array $stats
363
-     *
364
-     * @return array
365
-     */
366
-    protected function normalizeFileInfo(array $stats)
367
-    {
368
-        return [
369
-            'type' => 'file',
370
-            'path' => $stats['key'],
371
-            'timestamp' => floor($stats['putTime'] / 10000000),
372
-            'size' => $stats['fsize'],
373
-        ];
374
-    }
375
-
376
-    /**
377
-     * Get resource url.
378
-     *
379
-     * @param string $path
380
-     *
381
-     * @return string
382
-     */
383
-    public function getUrl($path)
384
-    {
385
-        return $this->normalizeHost($this->domain) . ltrim($path, '/');
386
-    }
387
-
388
-    /**
389
-     * @param string $domain
390
-     *
391
-     * @return string
392
-     */
393
-    protected function normalizeHost($domain)
394
-    {
395
-        if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
396
-            $domain = "http://{$domain}";
397
-        }
398
-        return rtrim($domain, '/') . '/';
399
-    }
15
+	use NotSupportingVisibilityTrait;
16
+
17
+	/**
18
+	 * @var Client|null
19
+	 */
20
+	private $client = null;
21
+
22
+	/**
23
+	 * @var string
24
+	 */
25
+	private $namespace = null;
26
+
27
+	/**
28
+	 * @var string
29
+	 */
30
+	private $domain = null;
31
+
32
+	/**
33
+	 * @param string $accessKey
34
+	 * @param string $secretKey
35
+	 * @param string $namespace
36
+	 */
37
+	public function __construct($accessKey, $secretKey, $namespace, $origin)
38
+	{
39
+		$client = new Client($accessKey, $secretKey, $namespace);
40
+		$this->setClient($client, $namespace, $origin);
41
+	}
42
+
43
+	public function setClient(Client $client, $namespace, $origin)
44
+	{
45
+		$this->client = $client;
46
+		$this->namespace = $namespace;
47
+		$this->domain = $origin;
48
+	}
49
+
50
+	/**
51
+	 * Write a new file.
52
+	 *
53
+	 * @param string $path
54
+	 * @param string $contents
55
+	 * @param Config $config   Config object
56
+	 *
57
+	 * @return array|false false on failure file meta data on success
58
+	 */
59
+	public function write($path, $contents, Config $config)
60
+	{
61
+		$uploadPolicy = new UploadPolicy([
62
+			'namespace' => $this->namespace,
63
+			'dir' => preg_replace('/^\./', '', dirname($path)),
64
+			'name' => last(explode("/", $path)),
65
+		]);
66
+
67
+		return $this->client->uploadData($contents, $uploadPolicy);
68
+	}
69
+
70
+	/**
71
+	 * Write a new file using a stream.
72
+	 *
73
+	 * @param string   $path
74
+	 * @param resource $resource
75
+	 * @param Config   $config   Config object
76
+	 *
77
+	 * @return array|false false on failure file meta data on success
78
+	 */
79
+	public function writeStream($path, $resource, Config $config)
80
+	{
81
+		$contents = '';
82
+
83
+		while (!feof($resource)) {
84
+			$contents .= fread($resource, 1024);
85
+		}
86
+
87
+		$response = $this->write($path, $contents, $config);
88
+
89
+		if (false === $response) {
90
+			return $response;
91
+		}
92
+
93
+		return compact('path');
94
+	}
95
+
96
+	/**
97
+	 * Update a file.
98
+	 *
99
+	 * @param string $path
100
+	 * @param string $contents
101
+	 * @param Config $config   Config object
102
+	 *
103
+	 * @return array|false false on failure file meta data on success
104
+	 */
105
+	public function update($path, $contents, Config $config)
106
+	{
107
+		$this->delete($path);
108
+
109
+		return $this->write($path, $contents, $config);
110
+	}
111
+
112
+	/**
113
+	 * Update a file using a stream.
114
+	 *
115
+	 * @param string   $path
116
+	 * @param resource $resource
117
+	 * @param Config   $config   Config object
118
+	 *
119
+	 * @return array|false false on failure file meta data on success
120
+	 */
121
+	public function updateStream($path, $resource, Config $config)
122
+	{
123
+		$this->delete($path);
124
+
125
+		return $this->writeStream($path, $resource, $config);
126
+	}
127
+
128
+	public function put($path, $contents, Config $config)
129
+	{
130
+		return $this->write($path, $contents, $config);
131
+	}
132
+
133
+	public function putStream($path, $resource, Config $config)
134
+	{
135
+		return $this->write($path, $resource, $config);
136
+	}
137
+
138
+	/**
139
+	 * Rename a file.
140
+	 *
141
+	 * @param string $path
142
+	 * @param string $newpath
143
+	 *
144
+	 * @return bool
145
+	 */
146
+	public function rename($path, $newpath)
147
+	{
148
+		return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
149
+	}
150
+
151
+	/**
152
+	 * Copy a file.
153
+	 *
154
+	 * @param string $path
155
+	 * @param string $newpath
156
+	 *
157
+	 * @return bool
158
+	 */
159
+	public function copy($path, $newpath)
160
+	{
161
+	}
162
+
163
+	/**
164
+	 * Delete a file.
165
+	 *
166
+	 * @param string $path
167
+	 *
168
+	 * @return bool
169
+	 */
170
+	public function delete($path)
171
+	{
172
+		return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
173
+	}
174
+
175
+	/**
176
+	 * Delete a directory.
177
+	 *
178
+	 * @param string $dirname
179
+	 *
180
+	 * @return bool
181
+	 */
182
+	public function deleteDir($dirname)
183
+	{
184
+		return $this->client->deleteDir($this->namespace, $dirname);
185
+	}
186
+
187
+	/**
188
+	 * Create a directory.
189
+	 *
190
+	 * @param string $dirname directory name
191
+	 * @param Config $config
192
+	 *
193
+	 * @return array|false
194
+	 */
195
+	public function createDir($dirname, Config $config)
196
+	{
197
+		return $this->client->createDir($this->namespace, $dirname);
198
+	}
199
+
200
+	/**
201
+	 * Check whether a file exists.
202
+	 *
203
+	 * @param string $path
204
+	 *
205
+	 * @return array|bool|null
206
+	 */
207
+	public function has($path)
208
+	{
209
+		if (Str::endsWith($path, "/")) {
210
+			return $this->client->existsFolder($this->namespace, preg_replace('/^\./', '', dirname($path)));
211
+		} else {
212
+			return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
213
+		}
214
+	}
215
+
216
+
217
+	/**
218
+	 * Read a file.
219
+	 *
220
+	 * @param string $path
221
+	 *
222
+	 * @return array|false
223
+	 */
224
+	public function read($path)
225
+	{
226
+		$contents = file_get_contents($this->getUrl($path));
227
+		return compact('contents', 'path');
228
+	}
229
+
230
+	/**
231
+	 * Read a file as a stream.
232
+	 *
233
+	 * @param string $path
234
+	 *
235
+	 * @return array|false
236
+	 */
237
+	public function readStream($path)
238
+	{
239
+	}
240
+
241
+	/**
242
+	 * List contents of a directory.
243
+	 *
244
+	 * @param string $directory
245
+	 * @param bool   $recursive
246
+	 *
247
+	 * @return array
248
+	 */
249
+	public function listContents($directory = '', $recursive = false)
250
+	{
251
+		return $this->client->listFiles($this->namespace, $directory, 1, 1000);
252
+	}
253
+
254
+	/**
255
+	 * Get all the meta data of a file or directory.
256
+	 *
257
+	 * @param string $path
258
+	 *
259
+	 * @return array|false
260
+	 */
261
+	public function getMetadata($path)
262
+	{
263
+		return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
264
+	}
265
+
266
+	/**
267
+	 * Get the size of a file.
268
+	 *
269
+	 * @param string $path
270
+	 *
271
+	 * @return array|false
272
+	 */
273
+	public function getSize($path)
274
+	{
275
+	}
276
+
277
+
278
+	/**
279
+	 * Fetch url to bucket.
280
+	 *
281
+	 * @param string $path
282
+	 * @param string $url
283
+	 *
284
+	 * @return array|false
285
+	 */
286
+	public function fetch($path, $url)
287
+	{
288
+	}
289
+
290
+	/**
291
+	 * Get private file download url.
292
+	 *
293
+	 * @param string $path
294
+	 * @param int    $expires
295
+	 *
296
+	 * @return string
297
+	 */
298
+	public function privateDownloadUrl($path, $expires = 3600)
299
+	{
300
+	}
301
+
302
+	/**
303
+	 * Refresh file cache.
304
+	 *
305
+	 * @param string|array $path
306
+	 *
307
+	 * @return array
308
+	 */
309
+	public function refresh($path)
310
+	{
311
+	}
312
+
313
+
314
+	/**
315
+	 * Get the mime-type of a file.
316
+	 *
317
+	 * @param string $path
318
+	 *
319
+	 * @return array|false
320
+	 */
321
+	public function getMimeType($path)
322
+	{
323
+	}
324
+
325
+
326
+	/**
327
+	 * Get the timestamp of a file.
328
+	 *
329
+	 * @param string $path
330
+	 *
331
+	 * @return array|false
332
+	 */
333
+	public function getTimestamp($path)
334
+	{
335
+	}
336
+
337
+	/**
338
+	 * Get the upload token.
339
+	 *
340
+	 * @param string|null $key
341
+	 * @param int         $ttl
342
+	 * @param string|null $policy
343
+	 * @param string|null $strictPolice
344
+	 *
345
+	 * @return string
346
+	 */
347
+	public function getUploadToken($option = null)
348
+	{
349
+		if ($option === null) {
350
+			$option = ['name' => null, 'ttl' => 3600, ];
351
+		} elseif (!isset($option['ttl']) || !$option['ttl']) {
352
+			$option['ttl'] = 3600;
353
+		}
354
+
355
+		return $this->client->getUploadToken(collect([
356
+			'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
357
+			'insertOnly' => Conf::INSERT_ONLY_TRUE
358
+		])->merge(collect($option)->except(['ttl',])));
359
+	}
360
+
361
+	/**
362
+	 * @param array $stats
363
+	 *
364
+	 * @return array
365
+	 */
366
+	protected function normalizeFileInfo(array $stats)
367
+	{
368
+		return [
369
+			'type' => 'file',
370
+			'path' => $stats['key'],
371
+			'timestamp' => floor($stats['putTime'] / 10000000),
372
+			'size' => $stats['fsize'],
373
+		];
374
+	}
375
+
376
+	/**
377
+	 * Get resource url.
378
+	 *
379
+	 * @param string $path
380
+	 *
381
+	 * @return string
382
+	 */
383
+	public function getUrl($path)
384
+	{
385
+		return $this->normalizeHost($this->domain) . ltrim($path, '/');
386
+	}
387
+
388
+	/**
389
+	 * @param string $domain
390
+	 *
391
+	 * @return string
392
+	 */
393
+	protected function normalizeHost($domain)
394
+	{
395
+		if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
396
+			$domain = "http://{$domain}";
397
+		}
398
+		return rtrim($domain, '/') . '/';
399
+	}
400 400
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -355,7 +355,7 @@
 block discarded – undo
355 355
         return $this->client->getUploadToken(collect([
356 356
             'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
357 357
             'insertOnly' => Conf::INSERT_ONLY_TRUE
358
-        ])->merge(collect($option)->except(['ttl',])));
358
+        ])->merge(collect($option)->except(['ttl', ])));
359 359
     }
360 360
 
361 361
     /**
Please login to merge, or discard this patch.
sdk/Utils/UploadPolicy.php 2 patches
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -5,47 +5,47 @@
 block discarded – undo
5 5
 
6 6
 class UploadPolicy
7 7
 {
8
-    /*如下属性是必须的[The following attributes are required]*/
9
-    public $namespace;                              // 多媒体服务的空间名[media namespace name]
10
-    public $bucket;                                 // OSS的空间名[media bucket name]
11
-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
12
-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
8
+	/*如下属性是必须的[The following attributes are required]*/
9
+	public $namespace;                              // 多媒体服务的空间名[media namespace name]
10
+	public $bucket;                                 // OSS的空间名[media bucket name]
11
+	public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
12
+	public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
13 13
 
14
-    /*如下属性是可选的[The following attributes are optional]*/
15
-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
16
-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
17
-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
18
-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
19
-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]
20
-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
21
-    public $callbackHost;                           // 回调时Host [callback host]
22
-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
23
-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
24
-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
25
-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
26
-    public $mediaEncode;                            // 上传音视频时,可以指定转码策略[media encode policy after upload task has been completed. it's json string]
14
+	/*如下属性是可选的[The following attributes are optional]*/
15
+	public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
16
+	public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
17
+	public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
18
+	public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
19
+	public $mimeLimit;                              // 文件类型限制[upload mime type limited]
20
+	public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
21
+	public $callbackHost;                           // 回调时Host [callback host]
22
+	public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
23
+	public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
24
+	public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
25
+	public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
26
+	public $mediaEncode;                            // 上传音视频时,可以指定转码策略[media encode policy after upload task has been completed. it's json string]
27 27
 
28
-    public function __construct($option)
29
-    {
30
-        if (!isset($option['expiration']) || !$option['expiration']) {
31
-            $option['expiration'] = -1;
32
-        }
28
+	public function __construct($option)
29
+	{
30
+		if (!isset($option['expiration']) || !$option['expiration']) {
31
+			$option['expiration'] = -1;
32
+		}
33 33
 
34
-        foreach ($option as $attribute => $value) {
35
-            $this->{$attribute} = $value;
36
-        }
37
-    }
34
+		foreach ($option as $attribute => $value) {
35
+			$this->{$attribute} = $value;
36
+		}
37
+	}
38 38
 
39
-    public function toArray()
40
-    {
41
-        return (array) $this;
42
-        $array = [];
43
-        foreach ($this as $attribute => $value) {
44
-            if ($value !== null) {
45
-                $array[$attribute] = $value;
46
-            }
47
-        }
39
+	public function toArray()
40
+	{
41
+		return (array) $this;
42
+		$array = [];
43
+		foreach ($this as $attribute => $value) {
44
+			if ($value !== null) {
45
+				$array[$attribute] = $value;
46
+			}
47
+		}
48 48
 
49
-        return $array;
50
-    }
49
+		return $array;
50
+	}
51 51
 }
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -6,24 +6,24 @@
 block discarded – undo
6 6
 class UploadPolicy
7 7
 {
8 8
     /*如下属性是必须的[The following attributes are required]*/
9
-    public $namespace;                              // 多媒体服务的空间名[media namespace name]
10
-    public $bucket;                                 // OSS的空间名[media bucket name]
11
-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
12
-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
9
+    public $namespace; // 多媒体服务的空间名[media namespace name]
10
+    public $bucket; // OSS的空间名[media bucket name]
11
+    public $insertOnly; // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
12
+    public $expiration; // 过期时间[expiration time, unix time, in milliseconds]
13 13
 
14 14
     /*如下属性是可选的[The following attributes are optional]*/
15
-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
16
-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
17
-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
18
-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
19
-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]
20
-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
21
-    public $callbackHost;                           // 回调时Host [callback host]
22
-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
23
-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
24
-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
25
-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
26
-    public $mediaEncode;                            // 上传音视频时,可以指定转码策略[media encode policy after upload task has been completed. it's json string]
15
+    public $detectMime = Conf::DETECT_MIME_TRUE; // 是否进行类型检测[is auto detecte media file mime type, default is true]
16
+    public $dir; // 路径[media file dir, magic vars and custom vars are supported]
17
+    public $name; // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
18
+    public $sizeLimit; // 文件大小限制[upload size limited, in bytes]
19
+    public $mimeLimit; // 文件类型限制[upload mime type limited]
20
+    public $callbackUrl; // 回调URL [callback urls, ip address is recommended]
21
+    public $callbackHost; // 回调时Host [callback host]
22
+    public $callbackBody; // 回调时Body [callback body, magic vars and custom vars are supported]
23
+    public $callbackBodyType; // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
24
+    public $returnUrl; // 上传完成之后,303跳转的Url [return url, when return code is 303]
25
+    public $returnBody; // 上传完成返回体 [return body, magic vars and custom vars are supported]
26
+    public $mediaEncode; // 上传音视频时,可以指定转码策略[media encode policy after upload task has been completed. it's json string]
27 27
 
28 28
     public function __construct($option)
29 29
     {
Please login to merge, or discard this patch.
sdk/Utils/ManageOption.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 final class ManageOption extends ResourceInfo
6 6
 {
7 7
     /*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
8
-    private $currentPage;                            //当前页号
9
-    private $pageSize;                               //每页的大小
8
+    private $currentPage; //当前页号
9
+    private $pageSize; //每页的大小
10 10
     /* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
11 11
     private $filesArray;
12 12
     private $urlsArray;
Please login to merge, or discard this patch.
Indentation   +179 added lines, -179 removed lines patch added patch discarded remove patch
@@ -4,192 +4,192 @@
 block discarded – undo
4 4
 /**管理时的选项*/
5 5
 final class ManageOption extends ResourceInfo
6 6
 {
7
-    /*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
8
-    private $currentPage;                            //当前页号
9
-    private $pageSize;                               //每页的大小
10
-    /* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
11
-    private $filesArray;
12
-    private $urlsArray;
13
-    /* 以下属性是"鉴黄反馈"方法所需的属性。即pornFeedback()方法中的参数 */
14
-    private $pornFbArray;
15
-    /**
16
-     * UploadPolicy的构造函数
17
-     */
18
-    public function __construct($namespace = null)
19
-    {
20
-        $this->namespace = $namespace;
21
-        $this->currentPage = 1;
22
-        $this->pageSize = 10;
23
-    }
7
+	/*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
8
+	private $currentPage;                            //当前页号
9
+	private $pageSize;                               //每页的大小
10
+	/* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
11
+	private $filesArray;
12
+	private $urlsArray;
13
+	/* 以下属性是"鉴黄反馈"方法所需的属性。即pornFeedback()方法中的参数 */
14
+	private $pornFbArray;
15
+	/**
16
+	 * UploadPolicy的构造函数
17
+	 */
18
+	public function __construct($namespace = null)
19
+	{
20
+		$this->namespace = $namespace;
21
+		$this->currentPage = 1;
22
+		$this->pageSize = 10;
23
+	}
24 24
 
25
-    /**
26
-     * 生成文件列表listFiles()方法所需的参数
27
-     */
28
-    public function buildListFilesParas()
29
-    {
30
-        return "namespace=" . $this->namespace . "&dir=" . urlencode($this->dir) .
31
-            "&currentPage=" . $this->currentPage . "&pageSize=" . $this->pageSize;
32
-    }
25
+	/**
26
+	 * 生成文件列表listFiles()方法所需的参数
27
+	 */
28
+	public function buildListFilesParas()
29
+	{
30
+		return "namespace=" . $this->namespace . "&dir=" . urlencode($this->dir) .
31
+			"&currentPage=" . $this->currentPage . "&pageSize=" . $this->pageSize;
32
+	}
33 33
 
34
-    /**
35
-     * 校验待检测资源信息是否合法。如果合法,则返回http请求体<p> 返回格式{$isValid, $message, $bodyArray}
36
-     */
37
-    public function checkFilesAndUrls()
38
-    {
39
-        if (empty($this->filesArray) && empty($this->urlsArray)) {
40
-            return array(false, "resource's info is empty"); //待检测资源不能均为空,反馈错误
41
-        } elseif (!empty($this->filesArray) && !empty($this->urlsArray)) {
42
-            return array(false, "resource and url could not exist all at once"); //均存在时,反馈错误
43
-        }
44
-        $bodyArray = array();
45
-        $resourceStr = '';
46
-        if (!empty($this->filesArray)) {
47
-            //检测文件是否合法。若合法则返回http请求体所需参数
48
-            foreach ($this->filesArray as $resourceInfo) {
49
-                list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测文件信息是否合法
50
-                if (!$valid) {
51
-                    return array($valid, $msg);
52
-                }
53
-                $resourceStr .= (empty($resourceStr) ? null : ';');
54
-                $resourceStr .= $resourceInfo->buildResourceId();
55
-            }
56
-            $bodyArray['resourceId'] = $resourceStr;
57
-        } elseif (!empty($this->urlsArray)) {
58
-            //检测URL是否合法。若合法则返回http请求体所需参数
59
-            foreach ($this->urlsArray as $url) {
60
-                if (empty($url)) {
61
-                    return array(false, "url's info is invalid");
62
-                }
63
-                $resourceStr .= (empty($resourceStr) ? null : ';');
64
-                $resourceStr .= $this->urlencodeCh($url);
65
-            }
66
-            $bodyArray['url'] = $resourceStr;
67
-        }
68
-        return array(true, 'valid', $bodyArray);
69
-    }
34
+	/**
35
+	 * 校验待检测资源信息是否合法。如果合法,则返回http请求体<p> 返回格式{$isValid, $message, $bodyArray}
36
+	 */
37
+	public function checkFilesAndUrls()
38
+	{
39
+		if (empty($this->filesArray) && empty($this->urlsArray)) {
40
+			return array(false, "resource's info is empty"); //待检测资源不能均为空,反馈错误
41
+		} elseif (!empty($this->filesArray) && !empty($this->urlsArray)) {
42
+			return array(false, "resource and url could not exist all at once"); //均存在时,反馈错误
43
+		}
44
+		$bodyArray = array();
45
+		$resourceStr = '';
46
+		if (!empty($this->filesArray)) {
47
+			//检测文件是否合法。若合法则返回http请求体所需参数
48
+			foreach ($this->filesArray as $resourceInfo) {
49
+				list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测文件信息是否合法
50
+				if (!$valid) {
51
+					return array($valid, $msg);
52
+				}
53
+				$resourceStr .= (empty($resourceStr) ? null : ';');
54
+				$resourceStr .= $resourceInfo->buildResourceId();
55
+			}
56
+			$bodyArray['resourceId'] = $resourceStr;
57
+		} elseif (!empty($this->urlsArray)) {
58
+			//检测URL是否合法。若合法则返回http请求体所需参数
59
+			foreach ($this->urlsArray as $url) {
60
+				if (empty($url)) {
61
+					return array(false, "url's info is invalid");
62
+				}
63
+				$resourceStr .= (empty($resourceStr) ? null : ';');
64
+				$resourceStr .= $this->urlencodeCh($url);
65
+			}
66
+			$bodyArray['url'] = $resourceStr;
67
+		}
68
+		return array(true, 'valid', $bodyArray);
69
+	}
70 70
 
71
-    /**
72
-     * 生成扫描黄图scanPorn()方法所需的参数
73
-     */
74
-    public function buildScanPornParas()
75
-    {
76
-        $bodyArray = array();
77
-        if (!empty($this->filesArray)) {
78
-            $resourceStr = '';
79
-            foreach ($this->filesArray as $resourceInfo) {
80
-                $resourceStr .= (empty($resourceStr) ? null : ';');
81
-                $resourceStr .= $resourceInfo->buildResourceId();
82
-            }
83
-            $bodyArray['resourceId'] = $resourceStr;
84
-        } elseif (!empty($this->urlsArray)) {
85
-            $urlStr = '';
86
-            foreach ($this->urlsArray as $url) {
87
-                $urlStr .= (empty($urlStr) ? null : ';');
88
-                $urlStr .= urlencode($url);
89
-            }
90
-            $bodyArray['url'] = $urlStr;
91
-        }
92
-        return $bodyArray;
93
-    }
71
+	/**
72
+	 * 生成扫描黄图scanPorn()方法所需的参数
73
+	 */
74
+	public function buildScanPornParas()
75
+	{
76
+		$bodyArray = array();
77
+		if (!empty($this->filesArray)) {
78
+			$resourceStr = '';
79
+			foreach ($this->filesArray as $resourceInfo) {
80
+				$resourceStr .= (empty($resourceStr) ? null : ';');
81
+				$resourceStr .= $resourceInfo->buildResourceId();
82
+			}
83
+			$bodyArray['resourceId'] = $resourceStr;
84
+		} elseif (!empty($this->urlsArray)) {
85
+			$urlStr = '';
86
+			foreach ($this->urlsArray as $url) {
87
+				$urlStr .= (empty($urlStr) ? null : ';');
88
+				$urlStr .= urlencode($url);
89
+			}
90
+			$bodyArray['url'] = $urlStr;
91
+		}
92
+		return $bodyArray;
93
+	}
94 94
 
95
-    /**
96
-     * 生成扫描广告图scanAdvertising()方法所需的参数
97
-     */
98
-    public function buildScanAdvertisingParas()
99
-    {
100
-        return $this->buildScanPornParas();
101
-    }
95
+	/**
96
+	 * 生成扫描广告图scanAdvertising()方法所需的参数
97
+	 */
98
+	public function buildScanAdvertisingParas()
99
+	{
100
+		return $this->buildScanPornParas();
101
+	}
102 102
 
103
-    /**
104
-     * 校验鉴黄反馈信息是否合法。如果合法,则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}
105
-     */
106
-    public function checkPornFeedbackInfos()
107
-    {
108
-        $httpBody = '';
109
-        if (empty($this->pornFbArray)) {
110
-            return array(false, "porn feedback info is empty", null); //鉴黄反馈信息为空,反馈错误
111
-        }
112
-        foreach ($this->pornFbArray as $pornFbInfo) {
113
-            $resourceInfo = $pornFbInfo['file']; //图片信息
114
-            list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测图片信息是否合法
115
-            if (!$valid) {
116
-                return array($valid, $msg, null);
117
-            }
118
-            $type = $pornFbInfo['type'];
119
-            $wrong = $pornFbInfo['wrong'];
120
-            if (!isset($type) || ($type != 0 && $type != 1) || !is_bool($wrong)) {
121
-                return array(false, "parameters 'type' or 'wrong' is invalid", null); //参数type取值0、1, wrong是bool类型
122
-            }
123
-            $score = $pornFbInfo['score'];
124
-            if ($wrong && (!isset($score) || $score < 0 || $score > 1)) {
125
-                return array(false, "parameters 'score' is invalid", null); //当"wrong"=true时,参数score必须有,且取值范围为[0,1]
126
-            }
127
-            $pornFbInfo['file'] = $resourceInfo->toArray(); //将图片信息对象,转换为数组,并保存
128
-            $httpBody .= (empty($httpBody) ? null : '&'); //添加分隔符
129
-            $httpBody .= "feedback=" . urlencode(json_encode($pornFbInfo, true)); //urlencode编码
130
-        }
131
-        return array(true, "valid", $httpBody); //鉴黄反馈信息合法,并返回http请求体
132
-    }
133
-    /*###################下面是属性的get和set方法###############*/
134
-    /**设置当前页号*/
135
-    public function setCurrentPage($currentPage)
136
-    {
137
-        $this->currentPage = $currentPage;
138
-        return $this;
139
-    }
103
+	/**
104
+	 * 校验鉴黄反馈信息是否合法。如果合法,则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}
105
+	 */
106
+	public function checkPornFeedbackInfos()
107
+	{
108
+		$httpBody = '';
109
+		if (empty($this->pornFbArray)) {
110
+			return array(false, "porn feedback info is empty", null); //鉴黄反馈信息为空,反馈错误
111
+		}
112
+		foreach ($this->pornFbArray as $pornFbInfo) {
113
+			$resourceInfo = $pornFbInfo['file']; //图片信息
114
+			list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测图片信息是否合法
115
+			if (!$valid) {
116
+				return array($valid, $msg, null);
117
+			}
118
+			$type = $pornFbInfo['type'];
119
+			$wrong = $pornFbInfo['wrong'];
120
+			if (!isset($type) || ($type != 0 && $type != 1) || !is_bool($wrong)) {
121
+				return array(false, "parameters 'type' or 'wrong' is invalid", null); //参数type取值0、1, wrong是bool类型
122
+			}
123
+			$score = $pornFbInfo['score'];
124
+			if ($wrong && (!isset($score) || $score < 0 || $score > 1)) {
125
+				return array(false, "parameters 'score' is invalid", null); //当"wrong"=true时,参数score必须有,且取值范围为[0,1]
126
+			}
127
+			$pornFbInfo['file'] = $resourceInfo->toArray(); //将图片信息对象,转换为数组,并保存
128
+			$httpBody .= (empty($httpBody) ? null : '&'); //添加分隔符
129
+			$httpBody .= "feedback=" . urlencode(json_encode($pornFbInfo, true)); //urlencode编码
130
+		}
131
+		return array(true, "valid", $httpBody); //鉴黄反馈信息合法,并返回http请求体
132
+	}
133
+	/*###################下面是属性的get和set方法###############*/
134
+	/**设置当前页号*/
135
+	public function setCurrentPage($currentPage)
136
+	{
137
+		$this->currentPage = $currentPage;
138
+		return $this;
139
+	}
140 140
 
141
-    /**
142
-     * 设置每页的大小
143
-     */
144
-    public function setPageSize($pageSize)
145
-    {
146
-        $this->pageSize = $pageSize;
147
-        return $this;
148
-    }
141
+	/**
142
+	 * 设置每页的大小
143
+	 */
144
+	public function setPageSize($pageSize)
145
+	{
146
+		$this->pageSize = $pageSize;
147
+		return $this;
148
+	}
149 149
 
150
-    /**
151
-     * 添加待扫描文件信息。
152
-     */
153
-    public function addResource($namespace = null, $dir = null, $name = null)
154
-    {
155
-        if (!isset($this->filesArray)) {
156
-            $this->filesArray = array();
157
-        }
158
-        array_push($this->filesArray, new ResourceInfo($namespace, $dir, $name));
159
-    }
150
+	/**
151
+	 * 添加待扫描文件信息。
152
+	 */
153
+	public function addResource($namespace = null, $dir = null, $name = null)
154
+	{
155
+		if (!isset($this->filesArray)) {
156
+			$this->filesArray = array();
157
+		}
158
+		array_push($this->filesArray, new ResourceInfo($namespace, $dir, $name));
159
+	}
160 160
 
161
-    /**
162
-     * 添加待扫描URL信息。
163
-     */
164
-    public function addUrl($url)
165
-    {
166
-        if (!isset($this->urlsArray)) {
167
-            $this->urlsArray = array();
168
-        }
169
-        array_push($this->urlsArray, $url);
170
-    }
161
+	/**
162
+	 * 添加待扫描URL信息。
163
+	 */
164
+	public function addUrl($url)
165
+	{
166
+		if (!isset($this->urlsArray)) {
167
+			$this->urlsArray = array();
168
+		}
169
+		array_push($this->urlsArray, $url);
170
+	}
171 171
 
172
-    /**
173
-     * 添加鉴黄反馈信息。
174
-     * @param string $namespace 空间名[必须]。
175
-     * @param string $dir 路径。为空则默认根目录
176
-     * @param string $name 文件名。不能为空
177
-     * @param bool $type 黄图类型[必须]。0或者1,0是非黄图,1是黄图
178
-     * @param bool $wrong 鉴黄判断[必须]。true代表用户认为多媒体鉴黄服务的结果有问题。当为true的时候必须传score
179
-     * @param float $score 黄图分值。[可选]取值范围[0-1],值越高则是黄图可能性越高
180
-     */
181
-    public function addPornFbInfo($namespace = null, $dir = null, $name = null, $type = null, $wrong = null, $score = null)
182
-    {
183
-        if (!isset($this->pornFbArray)) {
184
-            $this->pornFbArray = array();
185
-        }
186
-        $pornFbInfo = array(
187
-            "file" => new ResourceInfo($namespace, $dir, $name),
188
-            "type" => $type, "wrong" => $wrong
189
-        );
190
-        if ($wrong) {
191
-            $pornFbInfo['score'] = $score; //当$wrong为true的时候必须传score
192
-        }
193
-        array_push($this->pornFbArray, $pornFbInfo);
194
-    }
172
+	/**
173
+	 * 添加鉴黄反馈信息。
174
+	 * @param string $namespace 空间名[必须]。
175
+	 * @param string $dir 路径。为空则默认根目录
176
+	 * @param string $name 文件名。不能为空
177
+	 * @param bool $type 黄图类型[必须]。0或者1,0是非黄图,1是黄图
178
+	 * @param bool $wrong 鉴黄判断[必须]。true代表用户认为多媒体鉴黄服务的结果有问题。当为true的时候必须传score
179
+	 * @param float $score 黄图分值。[可选]取值范围[0-1],值越高则是黄图可能性越高
180
+	 */
181
+	public function addPornFbInfo($namespace = null, $dir = null, $name = null, $type = null, $wrong = null, $score = null)
182
+	{
183
+		if (!isset($this->pornFbArray)) {
184
+			$this->pornFbArray = array();
185
+		}
186
+		$pornFbInfo = array(
187
+			"file" => new ResourceInfo($namespace, $dir, $name),
188
+			"type" => $type, "wrong" => $wrong
189
+		);
190
+		if ($wrong) {
191
+			$pornFbInfo['score'] = $score; //当$wrong为true的时候必须传score
192
+		}
193
+		array_push($this->pornFbArray, $pornFbInfo);
194
+	}
195 195
 }
Please login to merge, or discard this patch.
sdk/Conf/Conf.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -3,39 +3,39 @@
 block discarded – undo
3 3
 
4 4
 class Conf
5 5
 {
6
-    const CHARSET = "UTF-8";
7
-    const SDK_VERSION = '2.0.3';
6
+	const CHARSET = "UTF-8";
7
+	const SDK_VERSION = '2.0.3';
8 8
 
9
-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
10
-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
11
-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
12
-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
13
-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
9
+	const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
10
+	const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
11
+	const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
12
+	const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
13
+	const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
14 14
 
15
-    const UPLOAD_API_UPLOAD = "/api/proxy/upload";
16
-    const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
17
-    const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
18
-    const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
19
-    const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
15
+	const UPLOAD_API_UPLOAD = "/api/proxy/upload";
16
+	const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
17
+	const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
18
+	const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
19
+	const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
20 20
 
21
-    const TYPE_TOP = "TOP";
22
-    const TYPE_CLOUD = "CLOUD";
21
+	const TYPE_TOP = "TOP";
22
+	const TYPE_CLOUD = "CLOUD";
23 23
 
24
-    const DETECT_MIME_TRUE = 1;            //检测MimeType
25
-    const DETECT_MIME_NONE = 0;            //不检测MimeType
26
-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
27
-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
24
+	const DETECT_MIME_TRUE = 1;            //检测MimeType
25
+	const DETECT_MIME_NONE = 0;            //不检测MimeType
26
+	const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
27
+	const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
28 28
 
29
-    const MIN_OBJ_SIZE = 1;        //1024*100;
30
-    const HTTP_TIMEOUT = 30;            //http的超时时间:30s
31
-    const HTTP_RETRY = 1;                //http失败后重试:1
29
+	const MIN_OBJ_SIZE = 1;        //1024*100;
30
+	const HTTP_TIMEOUT = 30;            //http的超时时间:30s
31
+	const HTTP_RETRY = 1;                //http失败后重试:1
32 32
 
33
-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值:1024*100; 100K
34
-    const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值:1024*1024*2; 2M
35
-    const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值:1024*1024*10; 10M
33
+	const BLOCK_MIN_SIZE = 102400;        //文件分片最小值:1024*100; 100K
34
+	const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值:1024*1024*2; 2M
35
+	const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值:1024*1024*10; 10M
36 36
 
37
-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
37
+	const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
38 38
 
39
-    const RUN_LEVEL_RELEASE = 1;        //release级别
40
-    const RUN_LEVEL_DEBUG = 2;            //debug级别
39
+	const RUN_LEVEL_RELEASE = 1;        //release级别
40
+	const RUN_LEVEL_DEBUG = 2;            //debug级别
41 41
 }
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@  discard block
 block discarded – undo
6 6
     const CHARSET = "UTF-8";
7 7
     const SDK_VERSION = '2.0.3';
8 8
 
9
-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
10
-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
11
-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
12
-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
13
-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
9
+    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com"; //文件上传的地址
10
+    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com"; //服务管理的地址
11
+    const MANAGE_API_VERSION = "3.0"; //资源管理接口版本
12
+    const SCAN_PORN_VERSION = "3.1"; //黄图扫描接口版本
13
+    const MEDIA_ENCODE_VERSION = "3.0"; //媒体转码接口版本
14 14
 
15 15
     const UPLOAD_API_UPLOAD = "/api/proxy/upload";
16 16
     const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
@@ -21,21 +21,21 @@  discard block
 block discarded – undo
21 21
     const TYPE_TOP = "TOP";
22 22
     const TYPE_CLOUD = "CLOUD";
23 23
 
24
-    const DETECT_MIME_TRUE = 1;            //检测MimeType
25
-    const DETECT_MIME_NONE = 0;            //不检测MimeType
26
-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
27
-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
24
+    const DETECT_MIME_TRUE = 1; //检测MimeType
25
+    const DETECT_MIME_NONE = 0; //不检测MimeType
26
+    const INSERT_ONLY_TRUE = 1; //文件上传不可覆盖
27
+    const INSERT_ONLY_NONE = 0; //文件上传可覆盖
28 28
 
29
-    const MIN_OBJ_SIZE = 1;        //1024*100;
30
-    const HTTP_TIMEOUT = 30;            //http的超时时间:30s
31
-    const HTTP_RETRY = 1;                //http失败后重试:1
29
+    const MIN_OBJ_SIZE = 1; //1024*100;
30
+    const HTTP_TIMEOUT = 30; //http的超时时间:30s
31
+    const HTTP_RETRY = 1; //http失败后重试:1
32 32
 
33
-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值:1024*100; 100K
34
-    const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值:1024*1024*2; 2M
35
-    const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值:1024*1024*10; 10M
33
+    const BLOCK_MIN_SIZE = 102400; //文件分片最小值:1024*100; 100K
34
+    const BLOCK_DEFF_SIZE = 209715200; //文件分片默认值:1024*1024*2; 2M
35
+    const BLOCK_MAX_SIZE = 104857600; //文件分片最大值:1024*1024*10; 10M
36 36
 
37
-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
37
+    const CURL_ERR_LOG = "curl_error.log"; //curl请求时的错误日志信息
38 38
 
39
-    const RUN_LEVEL_RELEASE = 1;        //release级别
40
-    const RUN_LEVEL_DEBUG = 2;            //debug级别
39
+    const RUN_LEVEL_RELEASE = 1; //release级别
40
+    const RUN_LEVEL_DEBUG = 2; //debug级别
41 41
 }
Please login to merge, or discard this patch.
sdk/AlibabaImage.php 2 patches
Indentation   +234 added lines, -234 removed lines patch added patch discarded remove patch
@@ -12,238 +12,238 @@
 block discarded – undo
12 12
 
13 13
 class AlibabaImage
14 14
 {
15
-    private $upload_client;
16
-    private $manage_client;
17
-    private $ak;
18
-    private $sk;
19
-    private $namespace;
20
-    private $type; // "TOP"和"CLOUD"两种模式
21
-
22
-    public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
23
-
24
-    /**
25
-     * 构造函数
26
-     *
27
-     * @param string $ak 云存储公钥
28
-     * @param string $sk 云存储私钥
29
-     * @param string $type 可选,兼容TOP与tea云的 ak/sk
30
-     * @throws \Exception
31
-     */
32
-    public function __construct($ak, $sk, $namespace, $type = Conf::TYPE_TOP)
33
-    {
34
-        $this->ak = $ak;
35
-        $this->sk = $sk;
36
-        $this->namespace = $namespace;
37
-        $this->type = $type;
38
-        $this->upload_client = new UploadClient($ak, $sk, $type);
39
-        $this->manage_client = new ManageClient($ak, $sk, $type);
40
-    }
41
-
42
-    public function getUploadToken($option)
43
-    {
44
-        if (!isset($option['name']) || !$option['name']) {
45
-            $option['name'] = '${uuid}.${ext}';
46
-        }
47
-        if ($option['name']) {
48
-            $option['dir'] = preg_replace('/^\./', '', dirname($option['name']));
49
-            $option['name'] = last(explode("/", $option['name']));
50
-        }
51
-        $option['namespace'] = $this->namespace;
52
-
53
-        $policy = new UploadPolicy($option);
54
-
55
-        return $this->upload_client->getUploadToken($policy);
56
-    }
57
-
58
-    /**
59
-     * 直接上传文件,适合文件比较小的情况
60
-     */
61
-    public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
62
-    {
63
-        return $this->upload_client->upload($filePath, $uploadPolicy, $uploadOption);
64
-    }
65
-
66
-    /**
67
-     * 直接上传文件数据,适合数据量比较小的情况
68
-     */
69
-    public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
70
-    {
71
-        return $this->upload_client->uploadData($data, $uploadPolicy, $uploadOption);
72
-    }
73
-
74
-    /**
75
-     * 创建分片上传任务,指定待上传的文件。即初始化分片上传
76
-     */
77
-    public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
78
-    {
79
-        return $this->upload_client->multipartInit($filePath, $uploadPolicy, $uploadOption);
80
-    }
81
-
82
-    /**
83
-     * 创建分片上传任务,指定初始化分片任务的数据,即第一块数据
84
-     */
85
-    public function multipartInitByData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
86
-    {
87
-        return $this->upload_client->multipartInitByData($data, $uploadPolicy, $uploadOption);
88
-    }
89
-
90
-    /**
91
-     * 分片上传,指定待上传的文件。需要指定UploadOption中文件块编号
92
-     */
93
-    public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
94
-    {
95
-        return $this->upload_client->multipartUpload($filePath, $uploadPolicy, $uploadOption);
96
-    }
97
-
98
-    /**
99
-     * 分片上传,指定待上传的数据。需要指定UploadOption中文件块编号
100
-     */
101
-    public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
102
-    {
103
-        return $this->upload_client->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
104
-    }
105
-
106
-    /**
107
-     * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
108
-     */
109
-    public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
110
-    {
111
-        return $this->upload_client->multipartComplete($uploadPolicy, $uploadOption);
112
-    }
113
-
114
-    /**
115
-     * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
116
-     */
117
-    public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
118
-    {
119
-        return $this->upload_client->multipartCancel($uploadPolicy, $uploadOption);
120
-    }
121
-
122
-    /**
123
-     * 查看文件是否存在
124
-     */
125
-    public function existsFile($namespace, $dir, $filename)
126
-    {
127
-        return $this->manage_client->existsFile($namespace, $dir, $filename);
128
-    }
129
-
130
-    /**
131
-     * 获取文件的元信息(meta信息)
132
-     */
133
-    public function getFileInfo($namespace, $dir, $filename)
134
-    {
135
-        return $this->manage_client->getFileInfo($namespace, $dir, $filename);
136
-    }
137
-
138
-    /**
139
-     * 重命名文件
140
-     */
141
-    public function renameFile($namespace, $dir, $filename, $newDir, $newName)
142
-    {
143
-        return $this->manage_client->renameFile($namespace, $dir, $filename, $newDir, $newName);
144
-    }
145
-
146
-    /**
147
-     * 获取指定目录下的文件列表。dir为空,表示根目录。page指定页数,pageSize指定每页显示数量
148
-     */
149
-    public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
150
-    {
151
-        return $this->manage_client->listFiles($namespace, $dir, $page, $pageSize);
152
-    }
153
-
154
-    /**
155
-     * 删除文件
156
-     */
157
-    public function deleteFile($namespace, $dir, $filename)
158
-    {
159
-        return $this->manage_client->deleteFile($namespace, $dir, $filename);
160
-    }
161
-
162
-    /**
163
-     * 查看文件夹是否存在
164
-     */
165
-    public function existsFolder($namespace, $dir)
166
-    {
167
-        return $this->manage_client->existsFolder($namespace, $dir);
168
-    }
169
-
170
-    /**
171
-     * 创建文件夹
172
-     */
173
-    public function createDir($namespace, $dir)
174
-    {
175
-        return $this->manage_client->createDir($namespace, $dir);
176
-    }
177
-
178
-    /**
179
-     * 获取子文件夹列表。dir为空,表示根目录。page指定页数,pageSize指定每页显示数量
180
-     */
181
-    public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
182
-    {
183
-        return $this->manage_client->listDirs($namespace, $dir, $page, $pageSize);
184
-    }
185
-
186
-    /**
187
-     * 删除文件夹
188
-     */
189
-    public function deleteDir($namespace, $dir)
190
-    {
191
-        return $this->manage_client->deleteDir($namespace, $dir);
192
-    }
193
-
194
-    /**
195
-     * 黄图扫描接口
196
-     */
197
-    public function scanPorn(ManageOption $resInfos)
198
-    {
199
-        return $this->manage_client->scanPorn($resInfos);
200
-    }
201
-
202
-    /**
203
-     * 鉴黄反馈feedback接口
204
-     */
205
-    public function pornFeedback(ManageOption $pornFbInfos)
206
-    {
207
-        return $this->manage_client->pornFeedback($pornFbInfos);
208
-    }
209
-
210
-    /**
211
-     * 多媒体转码接口
212
-     */
213
-    public function mediaEncode(MediaEncodeOption $encodeOption)
214
-    {
215
-        return $this->manage_client->mediaEncode($encodeOption);
216
-    }
217
-
218
-    /**
219
-     * 多媒体转码任务查询接口
220
-     */
221
-    public function mediaEncodeQuery($taskId)
222
-    {
223
-        return $this->manage_client->mediaEncodeQuery($taskId);
224
-    }
225
-
226
-    /**
227
-     * 视频截图接口
228
-     */
229
-    public function videoSnapshot(SnapShotOption $snapshotOption)
230
-    {
231
-        return $this->manage_client->videoSnapshot($snapshotOption);
232
-    }
233
-
234
-    /**
235
-     * 视频截图结果查询接口
236
-     */
237
-    public function vSnapshotQuery($taskId)
238
-    {
239
-        return $this->manage_client->vSnapshotQuery($taskId);
240
-    }
241
-
242
-    /**
243
-     * 广告图扫描接口(beta)
244
-     */
245
-    public function scanAdvertising(ManageOption $resInfos)
246
-    {
247
-        return $this->manage_client->scanAdvertising($resInfos);
248
-    }
15
+	private $upload_client;
16
+	private $manage_client;
17
+	private $ak;
18
+	private $sk;
19
+	private $namespace;
20
+	private $type; // "TOP"和"CLOUD"两种模式
21
+
22
+	public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
23
+
24
+	/**
25
+	 * 构造函数
26
+	 *
27
+	 * @param string $ak 云存储公钥
28
+	 * @param string $sk 云存储私钥
29
+	 * @param string $type 可选,兼容TOP与tea云的 ak/sk
30
+	 * @throws \Exception
31
+	 */
32
+	public function __construct($ak, $sk, $namespace, $type = Conf::TYPE_TOP)
33
+	{
34
+		$this->ak = $ak;
35
+		$this->sk = $sk;
36
+		$this->namespace = $namespace;
37
+		$this->type = $type;
38
+		$this->upload_client = new UploadClient($ak, $sk, $type);
39
+		$this->manage_client = new ManageClient($ak, $sk, $type);
40
+	}
41
+
42
+	public function getUploadToken($option)
43
+	{
44
+		if (!isset($option['name']) || !$option['name']) {
45
+			$option['name'] = '${uuid}.${ext}';
46
+		}
47
+		if ($option['name']) {
48
+			$option['dir'] = preg_replace('/^\./', '', dirname($option['name']));
49
+			$option['name'] = last(explode("/", $option['name']));
50
+		}
51
+		$option['namespace'] = $this->namespace;
52
+
53
+		$policy = new UploadPolicy($option);
54
+
55
+		return $this->upload_client->getUploadToken($policy);
56
+	}
57
+
58
+	/**
59
+	 * 直接上传文件,适合文件比较小的情况
60
+	 */
61
+	public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
62
+	{
63
+		return $this->upload_client->upload($filePath, $uploadPolicy, $uploadOption);
64
+	}
65
+
66
+	/**
67
+	 * 直接上传文件数据,适合数据量比较小的情况
68
+	 */
69
+	public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
70
+	{
71
+		return $this->upload_client->uploadData($data, $uploadPolicy, $uploadOption);
72
+	}
73
+
74
+	/**
75
+	 * 创建分片上传任务,指定待上传的文件。即初始化分片上传
76
+	 */
77
+	public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
78
+	{
79
+		return $this->upload_client->multipartInit($filePath, $uploadPolicy, $uploadOption);
80
+	}
81
+
82
+	/**
83
+	 * 创建分片上传任务,指定初始化分片任务的数据,即第一块数据
84
+	 */
85
+	public function multipartInitByData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
86
+	{
87
+		return $this->upload_client->multipartInitByData($data, $uploadPolicy, $uploadOption);
88
+	}
89
+
90
+	/**
91
+	 * 分片上传,指定待上传的文件。需要指定UploadOption中文件块编号
92
+	 */
93
+	public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
94
+	{
95
+		return $this->upload_client->multipartUpload($filePath, $uploadPolicy, $uploadOption);
96
+	}
97
+
98
+	/**
99
+	 * 分片上传,指定待上传的数据。需要指定UploadOption中文件块编号
100
+	 */
101
+	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
102
+	{
103
+		return $this->upload_client->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
104
+	}
105
+
106
+	/**
107
+	 * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
108
+	 */
109
+	public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
110
+	{
111
+		return $this->upload_client->multipartComplete($uploadPolicy, $uploadOption);
112
+	}
113
+
114
+	/**
115
+	 * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
116
+	 */
117
+	public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
118
+	{
119
+		return $this->upload_client->multipartCancel($uploadPolicy, $uploadOption);
120
+	}
121
+
122
+	/**
123
+	 * 查看文件是否存在
124
+	 */
125
+	public function existsFile($namespace, $dir, $filename)
126
+	{
127
+		return $this->manage_client->existsFile($namespace, $dir, $filename);
128
+	}
129
+
130
+	/**
131
+	 * 获取文件的元信息(meta信息)
132
+	 */
133
+	public function getFileInfo($namespace, $dir, $filename)
134
+	{
135
+		return $this->manage_client->getFileInfo($namespace, $dir, $filename);
136
+	}
137
+
138
+	/**
139
+	 * 重命名文件
140
+	 */
141
+	public function renameFile($namespace, $dir, $filename, $newDir, $newName)
142
+	{
143
+		return $this->manage_client->renameFile($namespace, $dir, $filename, $newDir, $newName);
144
+	}
145
+
146
+	/**
147
+	 * 获取指定目录下的文件列表。dir为空,表示根目录。page指定页数,pageSize指定每页显示数量
148
+	 */
149
+	public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
150
+	{
151
+		return $this->manage_client->listFiles($namespace, $dir, $page, $pageSize);
152
+	}
153
+
154
+	/**
155
+	 * 删除文件
156
+	 */
157
+	public function deleteFile($namespace, $dir, $filename)
158
+	{
159
+		return $this->manage_client->deleteFile($namespace, $dir, $filename);
160
+	}
161
+
162
+	/**
163
+	 * 查看文件夹是否存在
164
+	 */
165
+	public function existsFolder($namespace, $dir)
166
+	{
167
+		return $this->manage_client->existsFolder($namespace, $dir);
168
+	}
169
+
170
+	/**
171
+	 * 创建文件夹
172
+	 */
173
+	public function createDir($namespace, $dir)
174
+	{
175
+		return $this->manage_client->createDir($namespace, $dir);
176
+	}
177
+
178
+	/**
179
+	 * 获取子文件夹列表。dir为空,表示根目录。page指定页数,pageSize指定每页显示数量
180
+	 */
181
+	public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
182
+	{
183
+		return $this->manage_client->listDirs($namespace, $dir, $page, $pageSize);
184
+	}
185
+
186
+	/**
187
+	 * 删除文件夹
188
+	 */
189
+	public function deleteDir($namespace, $dir)
190
+	{
191
+		return $this->manage_client->deleteDir($namespace, $dir);
192
+	}
193
+
194
+	/**
195
+	 * 黄图扫描接口
196
+	 */
197
+	public function scanPorn(ManageOption $resInfos)
198
+	{
199
+		return $this->manage_client->scanPorn($resInfos);
200
+	}
201
+
202
+	/**
203
+	 * 鉴黄反馈feedback接口
204
+	 */
205
+	public function pornFeedback(ManageOption $pornFbInfos)
206
+	{
207
+		return $this->manage_client->pornFeedback($pornFbInfos);
208
+	}
209
+
210
+	/**
211
+	 * 多媒体转码接口
212
+	 */
213
+	public function mediaEncode(MediaEncodeOption $encodeOption)
214
+	{
215
+		return $this->manage_client->mediaEncode($encodeOption);
216
+	}
217
+
218
+	/**
219
+	 * 多媒体转码任务查询接口
220
+	 */
221
+	public function mediaEncodeQuery($taskId)
222
+	{
223
+		return $this->manage_client->mediaEncodeQuery($taskId);
224
+	}
225
+
226
+	/**
227
+	 * 视频截图接口
228
+	 */
229
+	public function videoSnapshot(SnapShotOption $snapshotOption)
230
+	{
231
+		return $this->manage_client->videoSnapshot($snapshotOption);
232
+	}
233
+
234
+	/**
235
+	 * 视频截图结果查询接口
236
+	 */
237
+	public function vSnapshotQuery($taskId)
238
+	{
239
+		return $this->manage_client->vSnapshotQuery($taskId);
240
+	}
241
+
242
+	/**
243
+	 * 广告图扫描接口(beta)
244
+	 */
245
+	public function scanAdvertising(ManageOption $resInfos)
246
+	{
247
+		return $this->manage_client->scanAdvertising($resInfos);
248
+	}
249 249
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     private $namespace;
20 20
     private $type; // "TOP"和"CLOUD"两种模式
21 21
 
22
-    public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
22
+    public static $run_level = Conf::RUN_LEVEL_RELEASE; //设置SDK运行级别
23 23
 
24 24
     /**
25 25
      * 构造函数
Please login to merge, or discard this patch.
sdk/Core/UploadClient.php 2 patches
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
             return $this->errorResponse("FileNotExist", "file not exist");
39 39
         }
40 40
         if (empty($uploadOption)) {
41
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
41
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption,则生成一个默认的
42 42
         }
43 43
         if (empty($uploadOption->name)) {
44
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
44
+            $uploadOption->name = basename($filePath); //如果用户没有设置name属性,则使用上传时的文件名
45 45
         }
46 46
         // UploadPolicy 和 UploadOption检查
47 47
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     {
69 69
         $data = file_get_contents($filePath);
70 70
         $uploadOption->setContent($data);
71
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
71
+        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD; //普通上传的API
72 72
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
73 73
     }
74 74
 
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
      */
82 82
     protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
83 83
     {
84
-        $fileSize = filesize($filePath);        // 文件大小
85
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
84
+        $fileSize = filesize($filePath); // 文件大小
85
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
86 86
         $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
87 87
         for ($i = 0; $i < $blockNum; $i++) {
88 88
             $currentSize = $blockSize; // 当前文件块的大小
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
             $httpRes = null;
96 96
             if (0 == $i) {
97 97
                 // 分片初始化阶段
98
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
99
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
98
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
99
+                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
100 100
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
101 101
                 $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
102 102
                 $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
@@ -104,16 +104,16 @@  discard block
 block discarded – undo
104 104
                 $uploadOption->setUniqueIdId($id);
105 105
             } else {
106 106
                 // 分片上传过程中
107
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
108
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
109
-                $uploadOption->setPartNumber($i + 1);                           //
107
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
108
+                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
109
+                $uploadOption->setPartNumber($i + 1); //
110 110
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
111 111
             }
112 112
             // 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
113 113
             if (!$httpRes['isSuccess']) {
114 114
                 if ($uploadOption->checkMutipartParas()) {
115
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
116
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
115
+                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
116
+                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
117 117
                     $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
118 118
                 }
119 119
                 return $httpRes;
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
127 127
         }
128 128
         // 分片上传完成
129
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
130
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
131
-        $uploadOption->setMd5(md5_file($filePath));                         //文件Md5
129
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
130
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
131
+        $uploadOption->setMd5(md5_file($filePath)); //文件Md5
132 132
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
133 133
     }
134 134
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
145 145
     {
146 146
         if (empty($uploadOption)) {
147
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
147
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption,则生成一个默认的
148 148
         }
149 149
         // UploadPolicy 和 UploadOption检查
150 150
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         }
159 159
         // 文件不大于设定的分片大小(默认2M),则直接上传uploadMiniFile()
160 160
         $uploadOption->setContent($data);
161
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
161
+        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD; //普通上传的API
162 162
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
163 163
     }
164 164
 
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
171 171
      */
172 172
     protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
173 173
     {
174
-        $dataSize = strlen($data);          // 文件大小
175
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
174
+        $dataSize = strlen($data); // 文件大小
175
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
176 176
         $blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
177 177
         for ($i = 0; $i < $blockNum; $i++) {
178 178
             $currentSize = $blockSize; // 当前文件块的大小
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
             $httpRes = null;
186 186
             if (0 == $i) {
187 187
                 // 分片初始化阶段
188
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
189
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
188
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
189
+                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
190 190
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
191 191
                 $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
192 192
                 $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
@@ -194,16 +194,16 @@  discard block
 block discarded – undo
194 194
                 $uploadOption->setUniqueIdId($id);
195 195
             } else {
196 196
                 // 分片上传过程中
197
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
198
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
199
-                $uploadOption->setPartNumber($i + 1);                           //
197
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
198
+                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
199
+                $uploadOption->setPartNumber($i + 1); //
200 200
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
201 201
             }
202 202
             // 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
203 203
             if (!$httpRes['isSuccess']) {
204 204
                 if ($uploadOption->checkMutipartParas()) {
205
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
206
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
205
+                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
206
+                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
207 207
                     $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
208 208
                 }
209 209
                 return $httpRes;
@@ -212,9 +212,9 @@  discard block
 block discarded – undo
212 212
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
213 213
         }
214 214
         // 分片上传完成
215
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
216
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
217
-        $uploadOption->setMd5(md5($data));                          //文件Md5
215
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
216
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
217
+        $uploadOption->setMd5(md5($data)); //文件Md5
218 218
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
219 219
     }
220 220
 
@@ -232,10 +232,10 @@  discard block
 block discarded – undo
232 232
             return $this->errorResponse("FileNotExist", "file not exist");
233 233
         }
234 234
         if (empty($uploadOption)) {
235
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
235
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption,则生成一个默认的
236 236
         }
237 237
         if (empty($uploadOption->name)) {
238
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
238
+            $uploadOption->name = basename($filePath); //如果用户没有设置name属性,则使用上传时的文件名
239 239
         }
240 240
         $blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
241 241
         return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
     public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
252 252
     {
253 253
         if (empty($uploadOption)) {
254
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
254
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption,则生成一个默认的
255 255
         }
256 256
         // UploadPolicy 和 UploadOption检查
257 257
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
             return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
260 260
         }
261 261
         // 数据大小不等于设定的分片大小(默认2M),则无法完成初始化
262
-        $dataSize = strlen($blockData);         // 数据文件大小
262
+        $dataSize = strlen($blockData); // 数据文件大小
263 263
         if ($dataSize != ($uploadOption->blockSize)) {
264 264
             return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
265 265
         }
266 266
         $uploadOption->setContent($blockData); // 设置待上传的文件块
267
-        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
268
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
267
+        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
268
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
269 269
         $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
270 270
         //若成功返回,则保存初始化成功的uploadId、id 以及 partNumber、eTag
271 271
         $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
290 290
         if (!file_exists($encodePath)) {
291 291
             return $this->errorResponse("FileNotExist", "file not exist");
292 292
         }
293
-        $fileSize = filesize($encodePath);      // 文件大小
294
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
293
+        $fileSize = filesize($encodePath); // 文件大小
294
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
295 295
         $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
296 296
         $currentSize = $blockSize; // 当前文件块的大小
297 297
         if ($uploadOption->getPartNumber() == $blockNum) {
@@ -317,8 +317,8 @@  discard block
 block discarded – undo
317 317
             return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
318 318
         }
319 319
         $uploadOption->setContent($blockData); // 设置待上传的文件块
320
-        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
321
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
320
+        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
321
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
322 322
         $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
323 323
         if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
324 324
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
         if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
340 340
             return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
341 341
         }
342
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
343
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
342
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
343
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
344 344
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
345 345
     }
346 346
 
@@ -355,8 +355,8 @@  discard block
 block discarded – undo
355 355
         if (!$uploadOption->checkMutipartParas()) {
356 356
             return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
357 357
         }
358
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
359
-        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
358
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
359
+        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
360 360
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
361 361
     }
362 362
 
@@ -388,17 +388,17 @@  discard block
 block discarded – undo
388 388
                 list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
389 389
                 $length = @strlen($httpBody);
390 390
                 array_push($_headers, "Content-Type: {$contentType}");
391
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
391
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody); //请求体
392 392
             }
393 393
             array_push($_headers, "Content-Length: {$length}");
394
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
395
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
396
-            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
397
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
394
+            curl_setopt($ch, CURLOPT_HEADER, 1); //设置头部
395
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers); //请求头
396
+            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout); //持续时长
397
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); //连接超时时长
398 398
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功,只返回结果,不自动输出任何内容。如果失败返回FALSE
399 399
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
400 400
             curl_setopt($ch, CURLOPT_URL, $url);
401
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
401
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method); //自定义请求
402 402
             //设置请求方式(GET或POST等)
403 403
             if ($method == 'PUT' || $method == 'POST') {
404 404
                 curl_setopt($ch, CURLOPT_POST, 1);
@@ -419,10 +419,10 @@  discard block
 block discarded – undo
419 419
             } else {
420 420
                 //解析返回结果,并判断是否上传成功
421 421
                 $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
422
-                $success = ($http_code == 200) ? true : false;                  //判断是否上传成功
422
+                $success = ($http_code == 200) ? true : false; //判断是否上传成功
423 423
                 $resStr = explode("\r\n\r\n", $response, 2);
424 424
                 $resBody = isset($resStr[1]) ? $resStr[1] : '';
425
-                $resArray = json_decode($resBody, true);                        //解析得到结果
425
+                $resArray = json_decode($resBody, true); //解析得到结果
426 426
                 $result = (empty($resArray) ? $result : $resArray);
427 427
             }
428 428
         } catch (Exception $e) {
Please login to merge, or discard this patch.
Indentation   +538 added lines, -538 removed lines patch added patch discarded remove patch
@@ -11,128 +11,128 @@  discard block
 block discarded – undo
11 11
 
12 12
 class UploadClient
13 13
 {
14
-    private $upload_host;
15
-    private $ak;
16
-    private $sk;
17
-    private $type; // "CLOUD" or "TOP";
14
+	private $upload_host;
15
+	private $ak;
16
+	private $sk;
17
+	private $type; // "CLOUD" or "TOP";
18 18
 
19
-    public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
20
-    {
21
-        $this->ak = $ak;
22
-        $this->sk = $sk;
23
-        $this->type = $type;
24
-        $this->upload_host = Conf::UPLOAD_HOST_MEDIA;
25
-    }
19
+	public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
20
+	{
21
+		$this->ak = $ak;
22
+		$this->sk = $sk;
23
+		$this->type = $type;
24
+		$this->upload_host = Conf::UPLOAD_HOST_MEDIA;
25
+	}
26 26
 
27
-    /**
28
-     * 上传文件。根据文件大小判断是否进行分片
29
-     * @param string $filePath  文件路径
30
-     * @param UploadPolicy $uploadPolicy    上传策略
31
-     * @param UploadOption $uploadOption    上传选项
32
-     * @return array
33
-     */
34
-    public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
35
-    {
36
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
37
-        if (!file_exists($encodePath)) {
38
-            return $this->errorResponse("FileNotExist", "file not exist");
39
-        }
40
-        if (empty($uploadOption)) {
41
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
42
-        }
43
-        if (empty($uploadOption->name)) {
44
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
45
-        }
46
-        // UploadPolicy 和 UploadOption检查
47
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
48
-        if (!$isValid) {
49
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
50
-        }
51
-        $fileSize = filesize($encodePath);
52
-        // 文件大于设定的分片大小(默认2M),则进行分片上传uploadSuperfile()
53
-        if ($fileSize > ($uploadOption->blockSize)) {
54
-            return $this->uploadSuperFile($encodePath, $uploadPolicy, $uploadOption);
55
-        }
56
-        // 文件不大于设定的分片大小(默认2M),则直接上传uploadMiniFile()
57
-        return $this->uploadMiniFile($encodePath, $uploadPolicy, $uploadOption);
58
-    }
27
+	/**
28
+	 * 上传文件。根据文件大小判断是否进行分片
29
+	 * @param string $filePath  文件路径
30
+	 * @param UploadPolicy $uploadPolicy    上传策略
31
+	 * @param UploadOption $uploadOption    上传选项
32
+	 * @return array
33
+	 */
34
+	public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
35
+	{
36
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
37
+		if (!file_exists($encodePath)) {
38
+			return $this->errorResponse("FileNotExist", "file not exist");
39
+		}
40
+		if (empty($uploadOption)) {
41
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
42
+		}
43
+		if (empty($uploadOption->name)) {
44
+			$uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
45
+		}
46
+		// UploadPolicy 和 UploadOption检查
47
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
48
+		if (!$isValid) {
49
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
50
+		}
51
+		$fileSize = filesize($encodePath);
52
+		// 文件大于设定的分片大小(默认2M),则进行分片上传uploadSuperfile()
53
+		if ($fileSize > ($uploadOption->blockSize)) {
54
+			return $this->uploadSuperFile($encodePath, $uploadPolicy, $uploadOption);
55
+		}
56
+		// 文件不大于设定的分片大小(默认2M),则直接上传uploadMiniFile()
57
+		return $this->uploadMiniFile($encodePath, $uploadPolicy, $uploadOption);
58
+	}
59 59
 
60
-    /**
61
-     * 上传小文件
62
-     * @param string $filePath 文件路径
63
-     * @param UploadPolicy $uploadPolicy 上传策略
64
-     * @param UploadOption $uploadOption 上传选项
65
-     * @return array
66
-     */
67
-    protected function uploadMiniFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
68
-    {
69
-        $data = file_get_contents($filePath);
70
-        $uploadOption->setContent($data);
71
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
72
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
73
-    }
60
+	/**
61
+	 * 上传小文件
62
+	 * @param string $filePath 文件路径
63
+	 * @param UploadPolicy $uploadPolicy 上传策略
64
+	 * @param UploadOption $uploadOption 上传选项
65
+	 * @return array
66
+	 */
67
+	protected function uploadMiniFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
68
+	{
69
+		$data = file_get_contents($filePath);
70
+		$uploadOption->setContent($data);
71
+		$url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
72
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
73
+	}
74 74
 
75
-    /**
76
-     * 分片上传大文件
77
-     * @param string $filePath 文件路径
78
-     * @param UploadPolicy $uploadPolicy 上传策略
79
-     * @param UploadOption $uploadOption 上传选项
80
-     * @return array
81
-     */
82
-    protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
83
-    {
84
-        $fileSize = filesize($filePath);        // 文件大小
85
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
86
-        $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
87
-        for ($i = 0; $i < $blockNum; $i++) {
88
-            $currentSize = $blockSize; // 当前文件块的大小
89
-            if (($i + 1) === $blockNum) {
90
-                $currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
91
-            }
92
-            $offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
93
-            $blockData = file_get_contents($filePath, 0, null, $offset, $currentSize); //当前文件块的数据
94
-            $uploadOption->setContent($blockData); // 设置待上传的文件块
95
-            $httpRes = null;
96
-            if (0 == $i) {
97
-                // 分片初始化阶段
98
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
99
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
100
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
101
-                $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
102
-                $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
103
-                $uploadOption->setUploadId($uploadId);
104
-                $uploadOption->setUniqueIdId($id);
105
-            } else {
106
-                // 分片上传过程中
107
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
108
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
109
-                $uploadOption->setPartNumber($i + 1);                           //
110
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
111
-            }
112
-            // 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
113
-            if (!$httpRes['isSuccess']) {
114
-                if ($uploadOption->checkMutipartParas()) {
115
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
116
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
117
-                    $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
118
-                }
119
-                return $httpRes;
120
-                //              $message = isset( $httpRes ['message'] ) ? $httpRes ['message'] : null;
121
-                //              $code = isset( $httpRes ['code'] ) ? $httpRes ['code'] : null;
122
-                //              $requestId = isset( $httpRes ['requestId'] ) ? $httpRes ['requestId'] : null;
123
-                //              return $this->errorResponse ( $code, "fail upload block file:" . $message, $requestId );
124
-            }
125
-            // 保存 块编号partNumber 和 标记ETag,用于分片完成时的参数设置
126
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
127
-        }
128
-        // 分片上传完成
129
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
130
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
131
-        $uploadOption->setMd5(md5_file($filePath));                         //文件Md5
132
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
133
-    }
75
+	/**
76
+	 * 分片上传大文件
77
+	 * @param string $filePath 文件路径
78
+	 * @param UploadPolicy $uploadPolicy 上传策略
79
+	 * @param UploadOption $uploadOption 上传选项
80
+	 * @return array
81
+	 */
82
+	protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
83
+	{
84
+		$fileSize = filesize($filePath);        // 文件大小
85
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
86
+		$blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
87
+		for ($i = 0; $i < $blockNum; $i++) {
88
+			$currentSize = $blockSize; // 当前文件块的大小
89
+			if (($i + 1) === $blockNum) {
90
+				$currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
91
+			}
92
+			$offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
93
+			$blockData = file_get_contents($filePath, 0, null, $offset, $currentSize); //当前文件块的数据
94
+			$uploadOption->setContent($blockData); // 设置待上传的文件块
95
+			$httpRes = null;
96
+			if (0 == $i) {
97
+				// 分片初始化阶段
98
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
99
+				$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
100
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
101
+				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
102
+				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
103
+				$uploadOption->setUploadId($uploadId);
104
+				$uploadOption->setUniqueIdId($id);
105
+			} else {
106
+				// 分片上传过程中
107
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
108
+				$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
109
+				$uploadOption->setPartNumber($i + 1);                           //
110
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
111
+			}
112
+			// 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
113
+			if (!$httpRes['isSuccess']) {
114
+				if ($uploadOption->checkMutipartParas()) {
115
+					$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
116
+					$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
117
+					$this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
118
+				}
119
+				return $httpRes;
120
+				//              $message = isset( $httpRes ['message'] ) ? $httpRes ['message'] : null;
121
+				//              $code = isset( $httpRes ['code'] ) ? $httpRes ['code'] : null;
122
+				//              $requestId = isset( $httpRes ['requestId'] ) ? $httpRes ['requestId'] : null;
123
+				//              return $this->errorResponse ( $code, "fail upload block file:" . $message, $requestId );
124
+			}
125
+			// 保存 块编号partNumber 和 标记ETag,用于分片完成时的参数设置
126
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
127
+		}
128
+		// 分片上传完成
129
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
130
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
131
+		$uploadOption->setMd5(md5_file($filePath));                         //文件Md5
132
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
133
+	}
134 134
 
135
-    /**上传字符串/二进制数据
135
+	/**上传字符串/二进制数据
136 136
      * @param string $data
137 137
      *          文件数据
138 138
      * @param UploadPolicy $uploadPolicy
@@ -141,450 +141,450 @@  discard block
 block discarded – undo
141 141
      *          上传选项
142 142
      * @return array
143 143
      */
144
-    public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
145
-    {
146
-        if (empty($uploadOption)) {
147
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
148
-        }
149
-        // UploadPolicy 和 UploadOption检查
150
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
151
-        if (!$isValid) {
152
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
153
-        }
154
-        $dataSize = strlen($data);
155
-        // 文件大于设定的分片大小(默认2M),则进行分片上传uploadSuperfile()
156
-        if ($dataSize > ($uploadOption->blockSize)) {
157
-            return $this->uploadSuperData($data, $uploadPolicy, $uploadOption);
158
-        }
159
-        // 文件不大于设定的分片大小(默认2M),则直接上传uploadMiniFile()
160
-        $uploadOption->setContent($data);
161
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
162
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
163
-    }
144
+	public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
145
+	{
146
+		if (empty($uploadOption)) {
147
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
148
+		}
149
+		// UploadPolicy 和 UploadOption检查
150
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
151
+		if (!$isValid) {
152
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
153
+		}
154
+		$dataSize = strlen($data);
155
+		// 文件大于设定的分片大小(默认2M),则进行分片上传uploadSuperfile()
156
+		if ($dataSize > ($uploadOption->blockSize)) {
157
+			return $this->uploadSuperData($data, $uploadPolicy, $uploadOption);
158
+		}
159
+		// 文件不大于设定的分片大小(默认2M),则直接上传uploadMiniFile()
160
+		$uploadOption->setContent($data);
161
+		$url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
162
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
163
+	}
164 164
 
165
-    /**
166
-     * 分片上传大文件数据
167
-     * @param string $data 文件数据
168
-     * @param UploadPolicy $uploadPolicy 上传策略
169
-     * @param UploadOption $uploadOption 上传选项
170
-     * @return array
171
-     */
172
-    protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
173
-    {
174
-        $dataSize = strlen($data);          // 文件大小
175
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
176
-        $blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
177
-        for ($i = 0; $i < $blockNum; $i++) {
178
-            $currentSize = $blockSize; // 当前文件块的大小
179
-            if (($i + 1) === $blockNum) {
180
-                $currentSize = ($dataSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
181
-            }
182
-            $offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
183
-            $blockData = substr($data, $offset, $currentSize); //当前文件块的数据
184
-            $uploadOption->setContent($blockData); // 设置待上传的文件块
185
-            $httpRes = null;
186
-            if (0 == $i) {
187
-                // 分片初始化阶段
188
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
189
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
190
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
191
-                $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
192
-                $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
193
-                $uploadOption->setUploadId($uploadId);
194
-                $uploadOption->setUniqueIdId($id);
195
-            } else {
196
-                // 分片上传过程中
197
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
198
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
199
-                $uploadOption->setPartNumber($i + 1);                           //
200
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
201
-            }
202
-            // 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
203
-            if (!$httpRes['isSuccess']) {
204
-                if ($uploadOption->checkMutipartParas()) {
205
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
206
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
207
-                    $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
208
-                }
209
-                return $httpRes;
210
-            }
211
-            // 保存 块编号partNumber 和 标记ETag,用于分片完成时的参数设置
212
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
213
-        }
214
-        // 分片上传完成
215
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
216
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
217
-        $uploadOption->setMd5(md5($data));                          //文件Md5
218
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
219
-    }
165
+	/**
166
+	 * 分片上传大文件数据
167
+	 * @param string $data 文件数据
168
+	 * @param UploadPolicy $uploadPolicy 上传策略
169
+	 * @param UploadOption $uploadOption 上传选项
170
+	 * @return array
171
+	 */
172
+	protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
173
+	{
174
+		$dataSize = strlen($data);          // 文件大小
175
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
176
+		$blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
177
+		for ($i = 0; $i < $blockNum; $i++) {
178
+			$currentSize = $blockSize; // 当前文件块的大小
179
+			if (($i + 1) === $blockNum) {
180
+				$currentSize = ($dataSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
181
+			}
182
+			$offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
183
+			$blockData = substr($data, $offset, $currentSize); //当前文件块的数据
184
+			$uploadOption->setContent($blockData); // 设置待上传的文件块
185
+			$httpRes = null;
186
+			if (0 == $i) {
187
+				// 分片初始化阶段
188
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
189
+				$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
190
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
191
+				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
192
+				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
193
+				$uploadOption->setUploadId($uploadId);
194
+				$uploadOption->setUniqueIdId($id);
195
+			} else {
196
+				// 分片上传过程中
197
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
198
+				$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
199
+				$uploadOption->setPartNumber($i + 1);                           //
200
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
201
+			}
202
+			// 如果分片上传失败,则取消cancel分片上传任务,然后返回错误信息
203
+			if (!$httpRes['isSuccess']) {
204
+				if ($uploadOption->checkMutipartParas()) {
205
+					$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
206
+					$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
207
+					$this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
208
+				}
209
+				return $httpRes;
210
+			}
211
+			// 保存 块编号partNumber 和 标记ETag,用于分片完成时的参数设置
212
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
213
+		}
214
+		// 分片上传完成
215
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
216
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
217
+		$uploadOption->setMd5(md5($data));                          //文件Md5
218
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
219
+	}
220 220
 
221
-    /**
222
-     * 创建分片上传任务,指定待上传的文件。即初始化分片上传
223
-     * @param string $filePath 文件路径
224
-     * @param UploadPolicy $uploadPolicy 上传策略
225
-     * @param UploadOption $uploadOption 上传选项
226
-     * @return array 初始化分片上传的结果
227
-     */
228
-    public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
229
-    {
230
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
231
-        if (!file_exists($encodePath)) {
232
-            return $this->errorResponse("FileNotExist", "file not exist");
233
-        }
234
-        if (empty($uploadOption)) {
235
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
236
-        }
237
-        if (empty($uploadOption->name)) {
238
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
239
-        }
240
-        $blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
241
-        return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
242
-    }
221
+	/**
222
+	 * 创建分片上传任务,指定待上传的文件。即初始化分片上传
223
+	 * @param string $filePath 文件路径
224
+	 * @param UploadPolicy $uploadPolicy 上传策略
225
+	 * @param UploadOption $uploadOption 上传选项
226
+	 * @return array 初始化分片上传的结果
227
+	 */
228
+	public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
229
+	{
230
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
231
+		if (!file_exists($encodePath)) {
232
+			return $this->errorResponse("FileNotExist", "file not exist");
233
+		}
234
+		if (empty($uploadOption)) {
235
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
236
+		}
237
+		if (empty($uploadOption->name)) {
238
+			$uploadOption->name = basename($filePath);        //如果用户没有设置name属性,则使用上传时的文件名
239
+		}
240
+		$blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
241
+		return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
242
+	}
243 243
 
244
-    /**
245
-     * 创建分片上传任务,指定初始化分片任务的数据,即第一块数据
246
-     * @param string $blockData 文件数据
247
-     * @param UploadPolicy $uploadPolicy 上传策略
248
-     * @param UploadOption $uploadOption 上传选项
249
-     * @return array 初始化分片上传的结果
250
-     */
251
-    public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
252
-    {
253
-        if (empty($uploadOption)) {
254
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
255
-        }
256
-        // UploadPolicy 和 UploadOption检查
257
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
258
-        if (!$isValid) {
259
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
260
-        }
261
-        // 数据大小不等于设定的分片大小(默认2M),则无法完成初始化
262
-        $dataSize = strlen($blockData);         // 数据文件大小
263
-        if ($dataSize != ($uploadOption->blockSize)) {
264
-            return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
265
-        }
266
-        $uploadOption->setContent($blockData); // 设置待上传的文件块
267
-        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
268
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
269
-        $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
270
-        //若成功返回,则保存初始化成功的uploadId、id 以及 partNumber、eTag
271
-        $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
272
-        $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
273
-        $uploadOption->setUploadId($uploadId);
274
-        $uploadOption->setUniqueIdId($id);
275
-        if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
276
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
277
-        }
278
-        return $httpRes;
279
-    }
244
+	/**
245
+	 * 创建分片上传任务,指定初始化分片任务的数据,即第一块数据
246
+	 * @param string $blockData 文件数据
247
+	 * @param UploadPolicy $uploadPolicy 上传策略
248
+	 * @param UploadOption $uploadOption 上传选项
249
+	 * @return array 初始化分片上传的结果
250
+	 */
251
+	public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
252
+	{
253
+		if (empty($uploadOption)) {
254
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption,则生成一个默认的
255
+		}
256
+		// UploadPolicy 和 UploadOption检查
257
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
258
+		if (!$isValid) {
259
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
260
+		}
261
+		// 数据大小不等于设定的分片大小(默认2M),则无法完成初始化
262
+		$dataSize = strlen($blockData);         // 数据文件大小
263
+		if ($dataSize != ($uploadOption->blockSize)) {
264
+			return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
265
+		}
266
+		$uploadOption->setContent($blockData); // 设置待上传的文件块
267
+		$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
268
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
269
+		$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
270
+		//若成功返回,则保存初始化成功的uploadId、id 以及 partNumber、eTag
271
+		$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID(OSS用于区分上传的id)
272
+		$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID(多媒体服务用于区分上传的id)
273
+		$uploadOption->setUploadId($uploadId);
274
+		$uploadOption->setUniqueIdId($id);
275
+		if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
276
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
277
+		}
278
+		return $httpRes;
279
+	}
280 280
 
281
-    /**分片上传,指定待上传的文件。需要指定UploadOption中文件块编号
281
+	/**分片上传,指定待上传的文件。需要指定UploadOption中文件块编号
282 282
      * @param string $filePath 文件路径
283 283
      * @param UploadPolicy $uploadPolicy 上传策略
284 284
      * @param UploadOption $uploadOption 上传选项
285 285
      * @return array 初始化分片上传的结果
286 286
      */
287
-    public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
288
-    {
289
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
290
-        if (!file_exists($encodePath)) {
291
-            return $this->errorResponse("FileNotExist", "file not exist");
292
-        }
293
-        $fileSize = filesize($encodePath);      // 文件大小
294
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
295
-        $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
296
-        $currentSize = $blockSize; // 当前文件块的大小
297
-        if ($uploadOption->getPartNumber() == $blockNum) {
298
-            $currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
299
-        }
300
-        $offset = ($uploadOption->getPartNumber() - 1) * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
301
-        $blockData = file_get_contents($encodePath, 0, null, $offset, $currentSize);
302
-        return $this->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
303
-    }
287
+	public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
288
+	{
289
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312,file_exist等函数才能识别
290
+		if (!file_exists($encodePath)) {
291
+			return $this->errorResponse("FileNotExist", "file not exist");
292
+		}
293
+		$fileSize = filesize($encodePath);      // 文件大小
294
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
295
+		$blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
296
+		$currentSize = $blockSize; // 当前文件块的大小
297
+		if ($uploadOption->getPartNumber() == $blockNum) {
298
+			$currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
299
+		}
300
+		$offset = ($uploadOption->getPartNumber() - 1) * $blockSize; // 当前文件块相对于文件开头的偏移量(块的起始位置)
301
+		$blockData = file_get_contents($encodePath, 0, null, $offset, $currentSize);
302
+		return $this->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
303
+	}
304 304
 
305
-    /**
306
-     * 分片上传,指定待上传的数据。需要指定UploadOption中文件块编号
307
-     * @param string $filePath 文件路径
308
-     * @param UploadPolicy $uploadPolicy 上传策略
309
-     * @param UploadOption $uploadOption 上传选项
310
-     * @return array 分片上传的结果
311
-     */
312
-    public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
313
-    {
314
-        $partNumber = $uploadOption->getPartNumber(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容,增加临时变量
315
-        // 检查分片上传所需的参数是否设置正确
316
-        if (!$uploadOption->checkMutipartParas() || empty($partNumber)) {
317
-            return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
318
-        }
319
-        $uploadOption->setContent($blockData); // 设置待上传的文件块
320
-        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
321
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
322
-        $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
323
-        if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
324
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
325
-        }
326
-        return $httpRes;
327
-    }
305
+	/**
306
+	 * 分片上传,指定待上传的数据。需要指定UploadOption中文件块编号
307
+	 * @param string $filePath 文件路径
308
+	 * @param UploadPolicy $uploadPolicy 上传策略
309
+	 * @param UploadOption $uploadOption 上传选项
310
+	 * @return array 分片上传的结果
311
+	 */
312
+	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
313
+	{
314
+		$partNumber = $uploadOption->getPartNumber(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容,增加临时变量
315
+		// 检查分片上传所需的参数是否设置正确
316
+		if (!$uploadOption->checkMutipartParas() || empty($partNumber)) {
317
+			return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
318
+		}
319
+		$uploadOption->setContent($blockData); // 设置待上传的文件块
320
+		$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
321
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
322
+		$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
323
+		if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
324
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
325
+		}
326
+		return $httpRes;
327
+	}
328 328
 
329
-    /**
330
-     * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
331
-     * @param UploadPolicy $uploadPolicy 上传策略
332
-     * @param UploadOption $uploadOption 上传选项
333
-     * @return array 分片上传完成的结果
334
-     */
335
-    public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
336
-    {
329
+	/**
330
+	 * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
331
+	 * @param UploadPolicy $uploadPolicy 上传策略
332
+	 * @param UploadOption $uploadOption 上传选项
333
+	 * @return array 分片上传完成的结果
334
+	 */
335
+	public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
336
+	{
337 337
  // 检查分片上传所需的参数是否设置正确
338
-        $fileMd5 = $uploadOption->getMd5(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容,增加临时变量
339
-        if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
340
-            return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
341
-        }
342
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
343
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
344
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
345
-    }
338
+		$fileMd5 = $uploadOption->getMd5(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容,增加临时变量
339
+		if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
340
+			return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
341
+		}
342
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
343
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
344
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
345
+	}
346 346
 
347
-    /**
348
-     * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
349
-     * @param UploadPolicy $uploadPolicy 上传策略
350
-     * @param UploadOption $uploadOption 上传选项
351
-     * @return array 分片上传完成的结果
352
-     */
353
-    public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
354
-    {
355
-        if (!$uploadOption->checkMutipartParas()) {
356
-            return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
357
-        }
358
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
359
-        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
360
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
361
-    }
347
+	/**
348
+	 * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
349
+	 * @param UploadPolicy $uploadPolicy 上传策略
350
+	 * @param UploadOption $uploadOption 上传选项
351
+	 * @return array 分片上传完成的结果
352
+	 */
353
+	public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
354
+	{
355
+		if (!$uploadOption->checkMutipartParas()) {
356
+			return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
357
+		}
358
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
359
+		$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
360
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
361
+	}
362 362
 
363
-    /**
364
-     * 调用curl利用http上传数据
365
-     * @param string $method
366
-     * @param string $url
367
-     * @param UploadPolicy $uploadPolicy
368
-     * @param UploadOption $uploadOption
369
-     * @return array (isSuccess, ...)
370
-     */
371
-    protected function sendRequest($method, $url, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
372
-    {
373
-        $success = false;
374
-        $http_code = 0;
375
-        $result = array();
376
-        /**
377
-         * @var resource $ch
378
-         */
379
-        $ch = curl_init();
380
-        try {
381
-            //构建Http请求头和请求体
382
-            $_headers = array('Expect:');
383
-            $token = $this->getUploadToken($uploadPolicy);
384
-            array_push($_headers, "Authorization: {$token}");
385
-            array_push($_headers, "User-Agent: {$this->getUserAgent()}");
386
-            $length = 0;
387
-            if (!empty($uploadOption)) {
388
-                list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
389
-                $length = @strlen($httpBody);
390
-                array_push($_headers, "Content-Type: {$contentType}");
391
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
392
-            }
393
-            array_push($_headers, "Content-Length: {$length}");
394
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
395
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
396
-            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
397
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
398
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功,只返回结果,不自动输出任何内容。如果失败返回FALSE
399
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
400
-            curl_setopt($ch, CURLOPT_URL, $url);
401
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
402
-            //设置请求方式(GET或POST等)
403
-            if ($method == 'PUT' || $method == 'POST') {
404
-                curl_setopt($ch, CURLOPT_POST, 1);
405
-            } else {
406
-                curl_setopt($ch, CURLOPT_POST, 0);
407
-            }
408
-            //执行上传,然后获取服务端返回,决定是否重试
409
-            $response = curl_exec($ch);
410
-            if ($response === false && $uploadOption->httpReTry != 0) {
411
-                //如果执行curl失败,且需要重试,则进行重试
412
-                $this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
413
-                $response = curl_exec($ch);
414
-            }
415
-            if ($response === false) {
416
-                $this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
417
-                $result = $this->errorResponse("curl error", "curl request failed");
418
-                $result['errno'] = curl_errno($ch); //错误码
419
-            } else {
420
-                //解析返回结果,并判断是否上传成功
421
-                $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
422
-                $success = ($http_code == 200) ? true : false;                  //判断是否上传成功
423
-                $resStr = explode("\r\n\r\n", $response, 2);
424
-                $resBody = isset($resStr[1]) ? $resStr[1] : '';
425
-                $resArray = json_decode($resBody, true);                        //解析得到结果
426
-                $result = (empty($resArray) ? $result : $resArray);
427
-            }
428
-        } catch (Exception $e) {
429
-            $result = $this->errorResponse("HTTPRequestException#" . $e->getLine(), $e->getMessage());
430
-        }
363
+	/**
364
+	 * 调用curl利用http上传数据
365
+	 * @param string $method
366
+	 * @param string $url
367
+	 * @param UploadPolicy $uploadPolicy
368
+	 * @param UploadOption $uploadOption
369
+	 * @return array (isSuccess, ...)
370
+	 */
371
+	protected function sendRequest($method, $url, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
372
+	{
373
+		$success = false;
374
+		$http_code = 0;
375
+		$result = array();
376
+		/**
377
+		 * @var resource $ch
378
+		 */
379
+		$ch = curl_init();
380
+		try {
381
+			//构建Http请求头和请求体
382
+			$_headers = array('Expect:');
383
+			$token = $this->getUploadToken($uploadPolicy);
384
+			array_push($_headers, "Authorization: {$token}");
385
+			array_push($_headers, "User-Agent: {$this->getUserAgent()}");
386
+			$length = 0;
387
+			if (!empty($uploadOption)) {
388
+				list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
389
+				$length = @strlen($httpBody);
390
+				array_push($_headers, "Content-Type: {$contentType}");
391
+				curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
392
+			}
393
+			array_push($_headers, "Content-Length: {$length}");
394
+			curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
395
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
396
+			curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
397
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
398
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功,只返回结果,不自动输出任何内容。如果失败返回FALSE
399
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
400
+			curl_setopt($ch, CURLOPT_URL, $url);
401
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
402
+			//设置请求方式(GET或POST等)
403
+			if ($method == 'PUT' || $method == 'POST') {
404
+				curl_setopt($ch, CURLOPT_POST, 1);
405
+			} else {
406
+				curl_setopt($ch, CURLOPT_POST, 0);
407
+			}
408
+			//执行上传,然后获取服务端返回,决定是否重试
409
+			$response = curl_exec($ch);
410
+			if ($response === false && $uploadOption->httpReTry != 0) {
411
+				//如果执行curl失败,且需要重试,则进行重试
412
+				$this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
413
+				$response = curl_exec($ch);
414
+			}
415
+			if ($response === false) {
416
+				$this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
417
+				$result = $this->errorResponse("curl error", "curl request failed");
418
+				$result['errno'] = curl_errno($ch); //错误码
419
+			} else {
420
+				//解析返回结果,并判断是否上传成功
421
+				$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
422
+				$success = ($http_code == 200) ? true : false;                  //判断是否上传成功
423
+				$resStr = explode("\r\n\r\n", $response, 2);
424
+				$resBody = isset($resStr[1]) ? $resStr[1] : '';
425
+				$resArray = json_decode($resBody, true);                        //解析得到结果
426
+				$result = (empty($resArray) ? $result : $resArray);
427
+			}
428
+		} catch (Exception $e) {
429
+			$result = $this->errorResponse("HTTPRequestException#" . $e->getLine(), $e->getMessage());
430
+		}
431 431
 
432
-        curl_close($ch); //PHP5.3中不支持finally关键字。因此,为了兼容,这里取消finally
433
-        if (!$success) {
434
-            throw new UploadException($result['message'], $http_code);
435
-        }
436
-        $result['isSuccess'] = $success;
437
-        return $result;
438
-    }
432
+		curl_close($ch); //PHP5.3中不支持finally关键字。因此,为了兼容,这里取消finally
433
+		if (!$success) {
434
+			throw new UploadException($result['message'], $http_code);
435
+		}
436
+		$result['isSuccess'] = $success;
437
+		return $result;
438
+	}
439 439
 
440
-    /**
441
-     * uploadPolicy和uploadOption 合法性检查
442
-     * @param UploadPolicy $uploadPolicy 上传策略
443
-     * @param UploadOption $uploadOption 上传选项
444
-     * @return array($isValid, $message)
445
-     */
446
-    protected function checkUploadInfo(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
447
-    {
448
-        $isValid = true;
449
-        $message = null;
450
-        // 1:判断是否设置空间名
451
-        if (empty($uploadPolicy->bucket) && empty($uploadPolicy->namespace)) {
452
-            $isValid = false;
453
-            $message = 'namespace or bucket is empty';
454
-        } elseif (empty($uploadPolicy->name)) {
455
-            // 2:优先使用uploadPolicy中的name,如果为空,则使用uploadOption中的name
456
-            if (empty($uploadOption->name)) {
457
-                $isValid = false;
458
-                $message = "file's name is empty"; // 如果uploadPolicy和uploadOption中的文件名name都为空,则返回错误信息
459
-            }
460
-        }
461
-        if (true === $isValid) {
462
-            // 3:优先使用uploadPolicy中的dir
463
-            if (!empty($uploadPolicy->dir)) {
464
-                if (strpos($uploadPolicy->dir, '/') !== 0) {
465
-                    $uploadPolicy->dir = '/' . $uploadPolicy->dir; //如果dir不为空,且其前面没有以"/"开头,则为其添加
466
-                }
467
-            }
468
-            // 4:如果uploadPolicy中的dir为空,则使用uploadOption中的dir
469
-            if (!empty($uploadOption->dir)) {
470
-                if (strpos($uploadOption->dir, '/') !== 0) {
471
-                    $uploadOption->dir = '/' . $uploadOption->dir; //如果dir不为空,且其前面没有以"/"开头,则为其添加
472
-                }
473
-            }
474
-            // 5:判断用户设置的文件分块大小,是否在指定的范围内。如果不在,则设置为默认Conf::BLOCK_DEFF_SIZE = 2M
475
-            if (($uploadOption->blockSize > Conf::BLOCK_MAX_SIZE) || ($uploadOption->blockSize < Conf::BLOCK_MIN_SIZE)) {
476
-                $uploadOption->blockSize = Conf::BLOCK_DEFF_SIZE;
477
-            }
478
-        }
479
-        return array($isValid, $message);
480
-    }
440
+	/**
441
+	 * uploadPolicy和uploadOption 合法性检查
442
+	 * @param UploadPolicy $uploadPolicy 上传策略
443
+	 * @param UploadOption $uploadOption 上传选项
444
+	 * @return array($isValid, $message)
445
+	 */
446
+	protected function checkUploadInfo(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
447
+	{
448
+		$isValid = true;
449
+		$message = null;
450
+		// 1:判断是否设置空间名
451
+		if (empty($uploadPolicy->bucket) && empty($uploadPolicy->namespace)) {
452
+			$isValid = false;
453
+			$message = 'namespace or bucket is empty';
454
+		} elseif (empty($uploadPolicy->name)) {
455
+			// 2:优先使用uploadPolicy中的name,如果为空,则使用uploadOption中的name
456
+			if (empty($uploadOption->name)) {
457
+				$isValid = false;
458
+				$message = "file's name is empty"; // 如果uploadPolicy和uploadOption中的文件名name都为空,则返回错误信息
459
+			}
460
+		}
461
+		if (true === $isValid) {
462
+			// 3:优先使用uploadPolicy中的dir
463
+			if (!empty($uploadPolicy->dir)) {
464
+				if (strpos($uploadPolicy->dir, '/') !== 0) {
465
+					$uploadPolicy->dir = '/' . $uploadPolicy->dir; //如果dir不为空,且其前面没有以"/"开头,则为其添加
466
+				}
467
+			}
468
+			// 4:如果uploadPolicy中的dir为空,则使用uploadOption中的dir
469
+			if (!empty($uploadOption->dir)) {
470
+				if (strpos($uploadOption->dir, '/') !== 0) {
471
+					$uploadOption->dir = '/' . $uploadOption->dir; //如果dir不为空,且其前面没有以"/"开头,则为其添加
472
+				}
473
+			}
474
+			// 5:判断用户设置的文件分块大小,是否在指定的范围内。如果不在,则设置为默认Conf::BLOCK_DEFF_SIZE = 2M
475
+			if (($uploadOption->blockSize > Conf::BLOCK_MAX_SIZE) || ($uploadOption->blockSize < Conf::BLOCK_MIN_SIZE)) {
476
+				$uploadOption->blockSize = Conf::BLOCK_DEFF_SIZE;
477
+			}
478
+		}
479
+		return array($isValid, $message);
480
+	}
481 481
 
482
-    /**
483
-     * 构建Http请求的Body
484
-     * @param UploadOption $uploadOption
485
-     * @return array (contentType,httpBody)
486
-     */
487
-    protected function buildMultipartForm(UploadOption $uploadOption)
488
-    {
489
-        $bodyArray = array();
490
-        $mimeBoundary = md5(microtime());
491
-        $paraArray = $uploadOption->getParaArray();
492
-        foreach ($paraArray as $name => $val) {
493
-            if ($name != 'content') {
494
-                array_push($bodyArray, '--' . $mimeBoundary);
495
-                array_push($bodyArray, "Content-Disposition: form-data; name=\"$name\"");
496
-                array_push($bodyArray, 'Content-Type: text/plain; charset=UTF-8');
497
-                array_push($bodyArray, '');
498
-                array_push($bodyArray, $val);
499
-            }
500
-        }
501
-        if (isset($paraArray['content'])) {
502
-            array_push($bodyArray, '--' . $mimeBoundary);
503
-            $fileName = empty($uploadOption->name) ? "temp" : $uploadOption->name;
504
-            array_push($bodyArray, "Content-Disposition: form-data; name=\"content\"; filename=\"{$fileName}\"");
505
-            array_push($bodyArray, "Content-Type: application/octet-stream");
506
-            array_push($bodyArray, '');
507
-            array_push($bodyArray, $paraArray['content']);
508
-        }
482
+	/**
483
+	 * 构建Http请求的Body
484
+	 * @param UploadOption $uploadOption
485
+	 * @return array (contentType,httpBody)
486
+	 */
487
+	protected function buildMultipartForm(UploadOption $uploadOption)
488
+	{
489
+		$bodyArray = array();
490
+		$mimeBoundary = md5(microtime());
491
+		$paraArray = $uploadOption->getParaArray();
492
+		foreach ($paraArray as $name => $val) {
493
+			if ($name != 'content') {
494
+				array_push($bodyArray, '--' . $mimeBoundary);
495
+				array_push($bodyArray, "Content-Disposition: form-data; name=\"$name\"");
496
+				array_push($bodyArray, 'Content-Type: text/plain; charset=UTF-8');
497
+				array_push($bodyArray, '');
498
+				array_push($bodyArray, $val);
499
+			}
500
+		}
501
+		if (isset($paraArray['content'])) {
502
+			array_push($bodyArray, '--' . $mimeBoundary);
503
+			$fileName = empty($uploadOption->name) ? "temp" : $uploadOption->name;
504
+			array_push($bodyArray, "Content-Disposition: form-data; name=\"content\"; filename=\"{$fileName}\"");
505
+			array_push($bodyArray, "Content-Type: application/octet-stream");
506
+			array_push($bodyArray, '');
507
+			array_push($bodyArray, $paraArray['content']);
508
+		}
509 509
 
510
-        array_push($bodyArray, '--' . $mimeBoundary . '--');
511
-        array_push($bodyArray, '');
510
+		array_push($bodyArray, '--' . $mimeBoundary . '--');
511
+		array_push($bodyArray, '');
512 512
 
513
-        $httpBody = implode("\r\n", $bodyArray);
514
-        $contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
515
-        return array(
516
-            $contentType,
517
-            $httpBody
518
-        );
519
-    }
513
+		$httpBody = implode("\r\n", $bodyArray);
514
+		$contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
515
+		return array(
516
+			$contentType,
517
+			$httpBody
518
+		);
519
+	}
520 520
 
521
-    /**
522
-     * UserAgent用户代理
523
-     */
524
-    protected function getUserAgent()
525
-    {
526
-        if ($this->type == "TOP") {
527
-            return "ALIMEDIASDK_PHP_TAE/" . Conf::SDK_VERSION;
528
-        } else {
529
-            return "ALIMEDIASDK_PHP_CLOUD/" . Conf::SDK_VERSION;
530
-        }
531
-    }
521
+	/**
522
+	 * UserAgent用户代理
523
+	 */
524
+	protected function getUserAgent()
525
+	{
526
+		if ($this->type == "TOP") {
527
+			return "ALIMEDIASDK_PHP_TAE/" . Conf::SDK_VERSION;
528
+		} else {
529
+			return "ALIMEDIASDK_PHP_CLOUD/" . Conf::SDK_VERSION;
530
+		}
531
+	}
532 532
 
533
-    /**
534
-     * 生成上传凭证
535
-     * @param UploadPolicy $uploadPolicy
536
-     * @return string 上传时的凭证token
537
-     */
538
-    public function getUploadToken(UploadPolicy $uploadPolicy)
539
-    {
540
-        $encodedPolicy = EncodeUtils::encodeWithURLSafeBase64(json_encode($uploadPolicy->toArray()));
541
-        $signed = hash_hmac('sha1', $encodedPolicy, $this->sk);
542
-        $tempStr = $this->ak . ":" . $encodedPolicy . ":" . $signed;
543
-        $token = "UPLOAD_AK_" . $this->type . " " . EncodeUtils::encodeWithURLSafeBase64($tempStr);
533
+	/**
534
+	 * 生成上传凭证
535
+	 * @param UploadPolicy $uploadPolicy
536
+	 * @return string 上传时的凭证token
537
+	 */
538
+	public function getUploadToken(UploadPolicy $uploadPolicy)
539
+	{
540
+		$encodedPolicy = EncodeUtils::encodeWithURLSafeBase64(json_encode($uploadPolicy->toArray()));
541
+		$signed = hash_hmac('sha1', $encodedPolicy, $this->sk);
542
+		$tempStr = $this->ak . ":" . $encodedPolicy . ":" . $signed;
543
+		$token = "UPLOAD_AK_" . $this->type . " " . EncodeUtils::encodeWithURLSafeBase64($tempStr);
544 544
 
545
-        return $token;
546
-    }
545
+		return $token;
546
+	}
547 547
 
548
-    /**
549
-     * 反馈错误信息
550
-     */
551
-    protected function errorResponse($code = "UnknownError", $message = "unkonown error", $requestId = null)
552
-    {
553
-        return array(
554
-            "isSuccess" => false,
555
-            "code" => $code,
556
-            "message" => $message,
557
-            "requestId" => $requestId
558
-        );
559
-    }
548
+	/**
549
+	 * 反馈错误信息
550
+	 */
551
+	protected function errorResponse($code = "UnknownError", $message = "unkonown error", $requestId = null)
552
+	{
553
+		return array(
554
+			"isSuccess" => false,
555
+			"code" => $code,
556
+			"message" => $message,
557
+			"requestId" => $requestId
558
+		);
559
+	}
560 560
 
561
-    /**
562
-     * 记录curl错误日志
563
-     * @param curl-handle $ch curl句柄
564
-     */
565
-    protected function recordCurlErrorLog($ch)
566
-    {
567
-        if (AlibabaImage::$run_level == Conf::RUN_LEVEL_DEBUG) {
568
-            $errno = curl_errno($ch); //错误码
569
-            $info  = curl_getinfo($ch); //curl连接资源句柄的信息
570
-            $info['errno'] = $errno; //添加到连接句柄信息中
571
-            $content = date("Y-m-d H:i:s") . json_encode($info) . "\n";
572
-            $logPath = dirname(__FILE__) . "/" . Conf::CURL_ERR_LOG;
573
-            $this->putContentToFile($content, $logPath);
574
-        }
575
-    }
561
+	/**
562
+	 * 记录curl错误日志
563
+	 * @param curl-handle $ch curl句柄
564
+	 */
565
+	protected function recordCurlErrorLog($ch)
566
+	{
567
+		if (AlibabaImage::$run_level == Conf::RUN_LEVEL_DEBUG) {
568
+			$errno = curl_errno($ch); //错误码
569
+			$info  = curl_getinfo($ch); //curl连接资源句柄的信息
570
+			$info['errno'] = $errno; //添加到连接句柄信息中
571
+			$content = date("Y-m-d H:i:s") . json_encode($info) . "\n";
572
+			$logPath = dirname(__FILE__) . "/" . Conf::CURL_ERR_LOG;
573
+			$this->putContentToFile($content, $logPath);
574
+		}
575
+	}
576 576
 
577
-    /**
578
-     * 将信息追加写到文件
579
-     * @param string $message 日志内容。
580
-     * @return void
581
-     */
582
-    protected function putContentToFile($content, $filepath)
583
-    {
584
-        if (!file_exists($filepath)) {
585
-            $handle = fopen($filepath, 'w');
586
-            fclose($handle);
587
-        }
588
-        file_put_contents($filepath, $content, FILE_APPEND);
589
-    }
577
+	/**
578
+	 * 将信息追加写到文件
579
+	 * @param string $message 日志内容。
580
+	 * @return void
581
+	 */
582
+	protected function putContentToFile($content, $filepath)
583
+	{
584
+		if (!file_exists($filepath)) {
585
+			$handle = fopen($filepath, 'w');
586
+			fclose($handle);
587
+		}
588
+		file_put_contents($filepath, $content, FILE_APPEND);
589
+	}
590 590
 }
Please login to merge, or discard this patch.