|
@@ -596,7 +596,7 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
|
|
|
}
|
|
|
JSONObject json = new JSONObject();
|
|
|
String imageMd5 = imageJson.getString("md5");
|
|
|
- String imageToken = getImageToken(imageMd5, template.getAccountId(), accessToken);
|
|
|
+ String imageToken = getImageToken(imageMd5, template.getAccountId(), accessToken, imageJson.getString("url"));
|
|
|
if (Check.isNull(imageToken)) {
|
|
|
continue;
|
|
|
}
|
|
@@ -635,13 +635,13 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
|
|
|
JSONObject json = new JSONObject();
|
|
|
JSONObject imageJson = groupTemplateMapper.getImageJsonByMd5(videoMd5);
|
|
|
if (!Check.isNull(imageJson)) {
|
|
|
- String imageToken = getImageToken(imageJson.getString("md5"), template.getAccountId(), accessToken);
|
|
|
+ String imageToken = getImageToken(imageJson.getString("md5"), template.getAccountId(), accessToken, imageJson.getString("url"));
|
|
|
if (!Check.isNull(imageToken)) {
|
|
|
json.put("image_token", imageToken);
|
|
|
}
|
|
|
}
|
|
|
json.put("creative_name", template.getCreativeName() + "_" + i);
|
|
|
- json.put("photo_id",photoId);
|
|
|
+ json.put("photo_id", photoId);
|
|
|
json.put("creative_material_type", materialType);
|
|
|
json.put("action_bar_text", template.getActionBarText());
|
|
|
json.put("description", template.getDescription());
|
|
@@ -666,26 +666,21 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
|
|
|
}
|
|
|
|
|
|
|
|
|
- private String getImageToken(String md5, Long accountId, String accessToken) {
|
|
|
- JSONObject imageJson = groupTemplateMapper.getImageJsonByMd5(md5);
|
|
|
+ private String getImageToken(String md5, Long accountId, String accessToken, String url) {
|
|
|
+
|
|
|
String imageToken = null;
|
|
|
- if (!Check.isNull(imageJson)) {
|
|
|
- String signature = imageJson.getString("md5");
|
|
|
- if (!Check.isNull(signature)) {
|
|
|
- QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("account_id", accountId);
|
|
|
- queryWrapper.eq("signature", signature);
|
|
|
- queryWrapper.last("limit 1");
|
|
|
- KuaiShouImageGet imageGet = imageGetService.getOne(queryWrapper);
|
|
|
- if (!Check.isNull(imageGet)) {
|
|
|
- imageToken = imageGet.getImageToken();
|
|
|
- } else {
|
|
|
- String url = imageJson.getString("url");
|
|
|
- imageToken = uploadService.kuauiShouImageUpload(url, signature, accountId, accessToken);
|
|
|
- }
|
|
|
- }
|
|
|
+ QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("account_id", accountId);
|
|
|
+ queryWrapper.eq("signature", md5);
|
|
|
+ queryWrapper.last("limit 1");
|
|
|
+ KuaiShouImageGet imageGet = imageGetService.getOne(queryWrapper);
|
|
|
+ if (!Check.isNull(imageGet)) {
|
|
|
+ imageToken = imageGet.getImageToken();
|
|
|
+ } else {
|
|
|
+ imageToken = uploadService.kuauiShouImageUpload(url, md5, accountId, accessToken);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
return imageToken;
|
|
|
|
|
|
}
|