github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Complete QnYun deletion handler

pull/137/head
johnniang 2019-03-27 19:44:20 +08:00
parent c37b6dd4f8
commit 51f71c0255
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cc/ryanc/halo/filehandler/FileHandler.java
View File

@ -36,6 +36,7 @@ public interface FileHandler {
* Deletes file. * Deletes file.
* *
* @param key file key must not be null * @param key file key must not be null
* @throws FileOperationException throws when fail to delete the file
*/ */
void delete(@NonNull String key); void delete(@NonNull String key);

22
src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java
View File

@ -11,6 +11,7 @@ import cc.ryanc.halo.utils.JsonUtils;
import com.qiniu.common.QiniuException; import com.qiniu.common.QiniuException;
import com.qiniu.common.Zone; import com.qiniu.common.Zone;
import com.qiniu.http.Response; import com.qiniu.http.Response;
import com.qiniu.storage.BucketManager;
import com.qiniu.storage.Configuration; import com.qiniu.storage.Configuration;
import com.qiniu.storage.UploadManager; import com.qiniu.storage.UploadManager;
import com.qiniu.storage.persistent.FileRecorder; import com.qiniu.storage.persistent.FileRecorder;
@ -56,6 +57,7 @@ public class QnYunFileHandler implements FileHandler {
String domain = optionService.getByPropertyOfNonNull(QnYunProperties.DOMAIN); String domain = optionService.getByPropertyOfNonNull(QnYunProperties.DOMAIN);
String smallUrl = optionService.getByPropertyOfNullable(QnYunProperties.SMALL_URL); String smallUrl = optionService.getByPropertyOfNullable(QnYunProperties.SMALL_URL);
// TODO Consider to cache the configuration
// Create configuration // Create configuration
Configuration configuration = new Configuration(zone); Configuration configuration = new Configuration(zone);
@ -125,9 +127,27 @@ public class QnYunFileHandler implements FileHandler {
@Override @Override
public void delete(String key) { public void delete(String key) {
Assert.notNull(key, "File key must not be blank"); Assert.notNull(key, "File key must not be blank");
// Get all config
Zone zone = optionService.getQnYunZone();
String accessKey = optionService.getByPropertyOfNonNull(QnYunProperties.ACCESS_KEY);
String secretKey = optionService.getByPropertyOfNonNull(QnYunProperties.SECRET_KEY);
String bucket = optionService.getByPropertyOfNonNull(QnYunProperties.BUCKET);
// TODO Consider to cache the configuration
// Create configuration
Configuration configuration = new Configuration(zone);
// TODO Handle file deletion // Create auth
Auth auth = Auth.create(accessKey, secretKey);
BucketManager bucketManager = new BucketManager(auth, configuration);
try {
bucketManager.delete(bucket, key);
} catch (QiniuException e) {
log.error("QnYun error response: [{}]", e.response);
throw new FileOperationException("Failed to delete file with " + key + " key", e);
}
} }
@Override @Override