Merge remote-tracking branch 'origin/dev/dev' into prod/release_1.0
This commit is contained in:
@@ -55,7 +55,8 @@ public class VisitRecordServiceImpl extends ServiceImpl<VisitRecordMapper, Visit
|
||||
throw BusinessException.parameterRequired("Customer ID");
|
||||
}
|
||||
LambdaQueryWrapper<VisitRecord> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(VisitRecord::getCustomerId, customerId);
|
||||
queryWrapper.eq(VisitRecord::getCustomerId, customerId).orderByDesc(VisitRecord::getCreatedTime);
|
||||
|
||||
List<VisitRecord> visitRecords = this.list(queryWrapper);
|
||||
|
||||
List<LibraryVo> libraryVos = new ArrayList<>();
|
||||
@@ -75,7 +76,7 @@ public class VisitRecordServiceImpl extends ServiceImpl<VisitRecordMapper, Visit
|
||||
// 如果有收藏的试穿效果,设置其图片URL为默认图片
|
||||
if (favoriteEffect != null && favoriteEffect.getResultImageUrl() != null) {
|
||||
libraryVo.setDefaultImageUrl(minioUtil.convertToPresignedUrl(
|
||||
favoriteEffect.getResultImageUrl(),
|
||||
favoriteEffect.getResultImageUrl(),
|
||||
CommonConstant.MINIO_IMAGE_EXPIRE_TIME
|
||||
));
|
||||
} else {
|
||||
|
||||
@@ -353,7 +353,7 @@ public class MinioUtil {
|
||||
.method(Method.GET)
|
||||
.bucket(bucketName)
|
||||
.object(objectName)
|
||||
.expiry(expires, TimeUnit.SECONDS)
|
||||
.expiry(expires, TimeUnit.MINUTES)
|
||||
.build()
|
||||
);
|
||||
} catch (Exception e) {
|
||||
|
||||
Reference in New Issue
Block a user