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

Update exception throw logic

pull/389/head
johnniang 2019-11-17 21:07:49 +08:00
parent ccdb705e7e
commit 95b3e944f0
1 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
View File

@ -335,7 +335,10 @@ public class AdminServiceImpl implements AdminService {
Object assetsObject = responseEntity.getBody().get("assets"); Object assetsObject = responseEntity.getBody().get("assets");
if (assetsObject instanceof List) { if (!(assetsObject instanceof List)) {
throw new ServiceException("Github API 返回内容有误").setErrorData(assetsObject);
}
try { try {
List assets = (List) assetsObject; List assets = (List) assetsObject;
Map assetMap = (Map) assets.stream() Map assetMap = (Map) assets.stream()
@ -370,11 +373,7 @@ public class AdminServiceImpl implements AdminService {
// Copy it to template/admin folder // Copy it to template/admin folder
FileUtils.copyFolder(FileUtils.tryToSkipZipParentFolder(assetTempPath), adminPath); FileUtils.copyFolder(FileUtils.tryToSkipZipParentFolder(assetTempPath), adminPath);
} catch (Throwable t) { } catch (Throwable t) {
log.error("Failed to update halo admin", t); throw new ServiceException("更新 Halo admin 失败", t);
throw new ServiceException("更新 Halo admin 失败");
}
} else {
throw new ServiceException("Github API 返回内容有误").setErrorData(assetsObject);
} }
} }