diff --git a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java index 3c6c992..d050322 100644 --- a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java +++ b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java @@ -20,7 +20,7 @@ public class AiVideoServiceImpl implements AiVideoService { private ServiceVideoRecordService serviceVideoRecordService; @Override - public AiPreviewResult previewVideo(AiPreviewParam aiPreviewParam) { + public AiPreviewResult previewVideo(AiPreviewParam aiPreviewParam) { return AiVideoHelper.voicePreview(aiPreviewParam); } diff --git a/suimangService/src/main/java/com/iformall/smsdk/SmSdkConstant.java b/suimangService/src/main/java/com/iformall/smsdk/SmSdkConstant.java index 9b836ef..7d6b254 100644 --- a/suimangService/src/main/java/com/iformall/smsdk/SmSdkConstant.java +++ b/suimangService/src/main/java/com/iformall/smsdk/SmSdkConstant.java @@ -14,6 +14,12 @@ public interface SmSdkConstant { String APP_KEY = "appKey"; String SIGN = "sign"; + /** + * 请求参数,必填 + */ + String TIMESTAMP = "timeStamp"; + + /** * 预览视频 */ diff --git a/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java b/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java index f5377cd..508f1b6 100644 --- a/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java +++ b/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java @@ -17,6 +17,7 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import java.util.Map; @Slf4j @Component @@ -36,10 +37,9 @@ public class SmSdkUtils { public static AiPreviewResult preview(SmPreviewVideoDTO dto) { String url = smSdkUtils.smSdkProperties.getBaseUrl() + SmSdkConstant.PREVIEW_VIDEO; -// HttpEntity httpEntity = new HttpEntity<>(dto); - log.info("(遂芒api)【预览视频】接口的请求参数:{}", JSON.toJSONString(dto)); - ResponseEntity response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, SmUtils.getHttpEntity(JSON.toJSONString(dto)), String.class); - log.info("(遂芒api)【预览视频】接口的响应数据:{}", JSON.toJSONString(response.getBody())); + log.info("(遂芒api)【预览视频】接口的请求参数:{}", JSON.toJSON(dto)); + ResponseEntity response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, SmUtils.getHttpEntity(JSON.parseObject(JSON.toJSONString(dto), Map.class)), String.class); + log.info("(遂芒api)【预览视频】接口的响应数据:{}", JSON.toJSON(response.getBody())); JSONObject resultObject = JSON.parseObject(response.getBody()); String data = resultObject.getString("data"); return StringUtils.isNotBlank(data) ? JSON.parseObject(data, AiPreviewResult.class) : new AiPreviewResult(); @@ -47,10 +47,10 @@ public class SmSdkUtils { public static AiVideoResult generateVideo(SmGenerateVideoDTO dto) { String url = smSdkUtils.smSdkProperties.getBaseUrl() + SmSdkConstant.GENERATE_VIDEO; -// HttpEntity httpEntity = new HttpEntity<>(dto); - log.info("(遂芒api)【生成视频】接口的请求参数:{}", JSON.toJSONString(dto)); - ResponseEntity response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, SmUtils.getHttpEntity(JSON.toJSONString(dto)), String.class); - log.info("(遂芒api)【生成视频】接口的响应数据:{}", JSON.toJSONString(response.getBody())); +// log.info("(遂芒api)【生成视频】接口的请求参数:{}", JSON.toJSONString(dto)); + log.info("(遂芒api)【生成视频】接口的请求参数:{}", JSON.toJSON(dto.getId())); + ResponseEntity response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, SmUtils.getHttpEntity(JSON.parseObject(JSON.toJSONString(dto), Map.class)), String.class); + log.info("(遂芒api)【生成视频】接口的响应数据:{}", JSON.toJSON(response.getBody())); JSONObject resultObject = JSON.parseObject(response.getBody()); String data = resultObject.getString("data"); return StringUtils.isNotBlank(data) ? JSON.parseObject(data, AiVideoResult.class) : new AiVideoResult(); diff --git a/suimangService/src/main/java/com/iformall/smsdk/SmUtils.java b/suimangService/src/main/java/com/iformall/smsdk/SmUtils.java index a9c2ad3..31be7e3 100644 --- a/suimangService/src/main/java/com/iformall/smsdk/SmUtils.java +++ b/suimangService/src/main/java/com/iformall/smsdk/SmUtils.java @@ -30,13 +30,14 @@ public class SmUtils { smUtils = this; } - public static HttpEntity getHttpEntity(String param) { + public static HttpEntity> getHttpEntity(Map paramMap) { + paramMap.put(SmSdkConstant.TIMESTAMP, System.currentTimeMillis()); WxThirdPartyApi apiConfig = getApiConfig(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.set(SmSdkConstant.APP_KEY, apiConfig.getAppId() + "&" + apiConfig.getAppKey()); - String sign = SignUtils.getSign(apiConfig.getSignKey(), JSON.parseObject(param, Map.class), "MD5"); + String sign = SignUtils.getSign(apiConfig.getSignKey(), paramMap, "MD5"); httpHeaders.set(SmSdkConstant.SIGN, sign); - return new HttpEntity<>(param, httpHeaders); + return new HttpEntity<>(paramMap, httpHeaders); }