Merge remote-tracking branch 'origin/dev/dev' into dev/dev
This commit is contained in:
@@ -105,8 +105,8 @@ public class GenerateController {
|
|||||||
|
|
||||||
@ApiOperation(value = "获取姿势变换生成结果")
|
@ApiOperation(value = "获取姿势变换生成结果")
|
||||||
@PostMapping("/poseTransformResult")
|
@PostMapping("/poseTransformResult")
|
||||||
public Response<PoseTransformationVO> getPoseTransformationResults(@RequestParam String taskId) {
|
public Response<PoseTransformationVO> getPoseTransformationResults(@Valid @RequestBody Map<String,String> taskId) {
|
||||||
PoseTransformationVO generateResult = generateService.getPoseTransformationResult(taskId);
|
PoseTransformationVO generateResult = generateService.getPoseTransformationResult(taskId.get("taskId"));
|
||||||
return Response.success(generateResult);
|
return Response.success(generateResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1401,7 +1401,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
|
|||||||
ImageSynthesisResult result = null;
|
ImageSynthesisResult result = null;
|
||||||
try {
|
try {
|
||||||
//如果已经在环境变量中设置了 DASHSCOPE_API_KEY,wait()方法可将apiKey设置为null
|
//如果已经在环境变量中设置了 DASHSCOPE_API_KEY,wait()方法可将apiKey设置为null
|
||||||
result = imageSynthesis.fetch(taskId, null);
|
result = imageSynthesis.fetch(taskId, ALIYUN_API_KEY);
|
||||||
log.info(JsonUtils.toJson(result));
|
log.info(JsonUtils.toJson(result));
|
||||||
//PENDING:任务排队中; RUNNING:任务处理中; SUCCEEDED:任务执行成功; FAILED:任务执行失败; CANCELED:任务取消成功; UNKNOWN:任务不存在或状态未知
|
//PENDING:任务排队中; RUNNING:任务处理中; SUCCEEDED:任务执行成功; FAILED:任务执行失败; CANCELED:任务取消成功; UNKNOWN:任务不存在或状态未知
|
||||||
String taskStatus = result.getOutput().getTaskStatus();
|
String taskStatus = result.getOutput().getTaskStatus();
|
||||||
|
|||||||
Reference in New Issue
Block a user