diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 6db74aed..c8afb5c3 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -316,7 +316,7 @@ public class GenerateServiceImpl extends ServiceImpl i } ToProductImageResult toProductImageResult = toProductImageResults.get(0); toProductImageResult.setUrl(url); - toProductImageResult.setResultType("ToProductImage"); +// toProductImageResult.setResultType("ToProductImage"); toProductImageResultMapper.updateById(toProductImageResult); String key = toProductImageResultKey + ":" + taskId; @@ -829,7 +829,7 @@ public class GenerateServiceImpl extends ServiceImpl i pythonService.bright(url, toProductImageResult.getBrightenValue()); } toProductImageResult.setUrl(url); - toProductImageResult.setResultType("Relight"); +// toProductImageResult.setResultType("Relight"); toProductImageResultMapper.updateById(toProductImageResult); String key = relightResultKey + ":" + taskId; diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 9f92680b..59cbbe44 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -485,6 +485,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl toProductImageResults = toProductImageResultMapper.selectList(qw); for (ToProductImageResult toProductImageResult : toProductImageResults) { - toProductImageResult.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), 24 * 60)); + toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl())); } List toProductImageResultVOS = CopyUtil.copyList(toProductImageResults, ToProductImageResultVO.class); for (ToProductImageResultVO toProductImageResultVO : toProductImageResultVOS) { if (toProductImageResultVO.getElementType().equals("ProductElement")) { ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl())); }else if ((toProductImageResultVO.getElementType().equals("DesignOutfit"))) { TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(tDesignPythonOutfit.getDesignUrl())); }else { ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(toProductImageResult1.getUrl())); } } moduleChooseVO.setToProduct(toProductImageResultVOS); @@ -1910,19 +1914,19 @@ public class UserLikeGroupServiceImpl extends ServiceImpl toProductImageResults = toProductImageResultMapper.selectList(qw); for (ToProductImageResult toProductImageResult : toProductImageResults) { - toProductImageResult.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), 24 * 60)); + toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl())); } List toProductImageResultVOS = CopyUtil.copyList(toProductImageResults, ToProductImageResultVO.class); for (ToProductImageResultVO toProductImageResultVO : toProductImageResultVOS) { if (toProductImageResultVO.getElementType().equals("ProductElement")) { ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl())); }else if ((toProductImageResultVO.getElementType().equals("DesignOutfit"))) { TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(tDesignPythonOutfit.getDesignUrl())); }else { ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResultVO.getElementId()); - toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60)); + toProductImageResultVO.setSourceUrl(getMinioUrl(toProductImageResult1.getUrl())); } } moduleChooseVO.setRelight(toProductImageResultVOS); @@ -1987,6 +1991,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.lambda().eq(CollectionElementRelModel::getCollectionElementId, id);