aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge

Browse Source
This commit is contained in:
litianxiang
2025-10-16 11:52:20 +08:00
parent a76b9ba365 8c3e1fdda5
commit d426fb34a2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -410,7 +410,7 @@
<dependency> <dependency>
<groupId>com.google.auth</groupId> <groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId> <artifactId>google-auth-library-oauth2-http</artifactId>
<version>LATEST</version> <version>1.38.0</version>
</dependency> </dependency>

12
src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
View File

@@ -21,6 +21,8 @@ import com.ai.da.model.enums.Sex;
import com.ai.da.model.vo.*; import com.ai.da.model.vo.*;
import com.ai.da.service.*; import com.ai.da.service.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -267,7 +269,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
} }
projectSnapshot.setUserLikeList(list); projectSnapshot.setUserLikeList(list);
} }
String snapshotJson = JSONObject.toJSONString(projectSnapshot); String snapshotJson = JSONObject.toJSONString(projectSnapshot, SerializerFeature.DisableCircularReferenceDetect);
portfolio.setSnapshot(snapshotJson); portfolio.setSnapshot(snapshotJson);
} else { } else {
@@ -543,7 +545,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class); PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
if (vo.getOpenSource() == 1) { if (vo.getOpenSource() == 1) {
if (!StringUtils.isEmpty(portfolio.getSnapshot())) { if (!StringUtils.isEmpty(portfolio.getSnapshot())) {
ProjectSnapshot projectSnapshot = JSONObject.parseObject(portfolio.getSnapshot(), ProjectSnapshot.class); ProjectSnapshot projectSnapshot = JSONObject.parseObject(portfolio.getSnapshot(), ProjectSnapshot.class, Feature.DisableCircularReferenceDetect);
List<CollectionElement> collectionElementList = projectSnapshot.getCollectionElementList(); List<CollectionElement> collectionElementList = projectSnapshot.getCollectionElementList();
for (CollectionElement element : collectionElementList) { for (CollectionElement element : collectionElementList) {
if (StringUtils.isEmpty(element.getUrl())) { if (StringUtils.isEmpty(element.getUrl())) {
@@ -557,8 +559,10 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
List<TDesignPythonOutfit> list = new ArrayList<>(); List<TDesignPythonOutfit> list = new ArrayList<>();
for (UserLikeSnapshot userLikeSnapshot : userLikeList) { for (UserLikeSnapshot userLikeSnapshot : userLikeList) {
TDesignPythonOutfit designPythonOutfit = userLikeSnapshot.getDesignPythonOutfit(); TDesignPythonOutfit designPythonOutfit = userLikeSnapshot.getDesignPythonOutfit();
designPythonOutfit.setDesignUrl(minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60)); if (designPythonOutfit != null && !StringUtils.isEmpty(designPythonOutfit.getDesignUrl())) {
list.add(designPythonOutfit); designPythonOutfit.setDesignUrl(minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60));
list.add(designPythonOutfit);
}
} }
vo.setDesignPythonOutfitList(list); vo.setDesignPythonOutfitList(list);
} }