|
@@ -239,10 +239,11 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
|
continue;
|
|
|
}
|
|
|
CtopOauthToken oauthToken = tokenService.getTokenByAccountId(accountId);
|
|
|
- String imageToken = getImageToken(appPackage.getImageMd5(), accountId, oauthToken);
|
|
|
- if (Check.isNull(imageToken) && (appPackage.getPlatform() == 1 || appPackage.getPlatform() == 3)) {
|
|
|
+ JSONObject dataJson = getImageToken(appPackage.getImageMd5(), accountId, oauthToken);
|
|
|
+ String imageToken = dataJson.getString("image_token");
|
|
|
+ if (Check.isNull(imageToken)) {
|
|
|
+ rel.setMessage(dataJson.getString("message"));
|
|
|
rel.setDataStatus(0);
|
|
|
- rel.setMessage("获取图片文件失败");
|
|
|
list.add(rel);
|
|
|
continue;
|
|
|
}
|
|
@@ -295,8 +296,8 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
|
/**
|
|
|
* 获取图片token
|
|
|
*/
|
|
|
- private String getImageToken(String md5, Long accountId, CtopOauthToken oauthToken) {
|
|
|
- String imageToken = null;
|
|
|
+ private JSONObject getImageToken(String md5, Long accountId, CtopOauthToken oauthToken) {
|
|
|
+ JSONObject request = new JSONObject();
|
|
|
if (!Check.isNull(md5)) {
|
|
|
QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("account_id", accountId);
|
|
@@ -304,13 +305,18 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
|
queryWrapper.last("limit 1");
|
|
|
KuaiShouImageGet imageGet = imageGetService.getOne(queryWrapper);
|
|
|
if (!Check.isNull(imageGet)) {
|
|
|
- imageToken = imageGet.getImageToken();
|
|
|
+ request.put("image_token", imageGet.getImageToken());
|
|
|
+ return request;
|
|
|
} else {
|
|
|
- String url = imageGetService.getUrlByCode(md5);
|
|
|
- imageToken = uploadService.kuauiShouImageUpload(url, md5, accountId, oauthToken.getAccessToken());
|
|
|
+ String url = appPackageMapper.getUrlByMd5(md5);
|
|
|
+ JSONObject resultJson = uploadService.kuauiShouImageUploadOnly(url, md5, accountId, oauthToken.getAccessToken());
|
|
|
+ if (resultJson.getInteger("code") == 0) {
|
|
|
+ return resultJson.getJSONObject("data");
|
|
|
+ }
|
|
|
+ return resultJson;
|
|
|
}
|
|
|
}
|
|
|
- return imageToken;
|
|
|
+ return request;
|
|
|
}
|
|
|
|
|
|
@Override
|