forked from Gitlink/microservices
Merge pull request '置顶项目信息新增url字段' (#1174) from amypeng/microservices:master into master
This commit is contained in:
commit
fc9e511aa0
|
|
@ -37,4 +37,7 @@ public class ZonePointsTopProjectVo {
|
|||
@ApiModelProperty("置顶过期时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date expiryTime;
|
||||
|
||||
@ApiModelProperty("项目访问URL")
|
||||
private String projectURL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import com.microservices.common.core.utils.DateUtils;
|
|||
import com.microservices.common.core.utils.StringUtils;
|
||||
import com.microservices.common.core.utils.uuid.IdUtils;
|
||||
import com.microservices.common.datascope.annotation.DataScope;
|
||||
import com.microservices.common.core.utils.html.EscapeUtil;
|
||||
import com.microservices.common.httpClient.util.GitLinkRequestHelper;
|
||||
import com.microservices.common.redis.service.RedisService;
|
||||
import com.microservices.common.security.utils.SecurityUtils;
|
||||
import com.microservices.system.api.RemoteCmsService;
|
||||
|
|
@ -115,6 +117,9 @@ public class ZonePointsAccountServiceImpl implements IZonePointsAccountService {
|
|||
@Autowired
|
||||
private IZonePointsApplyService zonePointsApplyService;
|
||||
|
||||
@Autowired
|
||||
private GitLinkRequestHelper gitLinkRequestHelper;
|
||||
|
||||
/** 策略模式:所有积分任务处理器,Spring 自动注入 */
|
||||
@Autowired
|
||||
private List<IPointsTaskHandler> pointsTaskHandlers;
|
||||
|
|
@ -392,6 +397,8 @@ public class ZonePointsAccountServiceImpl implements IZonePointsAccountService {
|
|||
vo.setGitlinkProjectId(project.getGitlinkProjectId());
|
||||
vo.setIsPointsTop(project.getIsPointsTop());
|
||||
vo.setExpiryTime(project.getExpiryTime());
|
||||
vo.setProjectURL(EscapeUtil.removeExtraSlashOfUrl(
|
||||
String.format("%s/%s", gitLinkRequestHelper.gitLinkUrl, project.getFullName())));
|
||||
return vo;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue