Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

feat(Wiki历史版本):历史版本列表用户名显示昵称

This commit is contained in:
wanjia 2025-05-26 15:43:55 +08:00
parent 0b69e3bafa
commit e48ce7f4b0
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/controller/wiki/WikiController.java
View File

@ -162,7 +162,7 @@ public class WikiController {
@ApiParam(value = "name of the repo", required = true) @RequestParam(defaultValue = "") String repo, @ApiParam(value = "name of the repo", required = true) @RequestParam(defaultValue = "") String repo,
@ApiParam(value = "name of the wikipage", required = true) @RequestParam(defaultValue = "") String pageName, @ApiParam(value = "name of the wikipage", required = true) @RequestParam(defaultValue = "") String pageName,
@ApiParam(value = "id of the project", required = true) @RequestParam(defaultValue = "") Integer projectId, @ApiParam(value = "id of the project", required = true) @RequestParam(defaultValue = "") Integer projectId,
@ApiParam(value = "id of the project", required = true) @RequestParam(defaultValue = "") String sha) throws Exception { @ApiParam(value = "sha of the project", required = true) @RequestParam(defaultValue = "") String sha) throws Exception {
String giteaToken = wikiService.getGiteaToken(request, projectId); String giteaToken = wikiService.getGiteaToken(request, projectId);
//未获取有效giteaToken时，赋值内置giteaToken //未获取有效giteaToken时，赋值内置giteaToken
giteaToken = giteaToken == null ? token : giteaToken; giteaToken = giteaToken == null ? token : giteaToken;

10
microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/wiki/WikiService.java
View File

@ -9,6 +9,7 @@ import com.github.jhonnymertz.wkhtmltopdf.wrapper.params.Param;
import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.web.domain.AjaxResult; import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.wiki.domain.projects.Projects; import com.microservices.wiki.domain.projects.Projects;
import com.microservices.wiki.domain.sys.User;
import com.microservices.wiki.domain.sys.UserVo; import com.microservices.wiki.domain.sys.UserVo;
import com.microservices.wiki.domain.wiki.Wiki; import com.microservices.wiki.domain.wiki.Wiki;
import com.microservices.wiki.domain.wiki.WikiContentSimple; import com.microservices.wiki.domain.wiki.WikiContentSimple;
@ -23,6 +24,7 @@ import com.microservices.wiki.mapper.team_projects.TeamProjectsMapper;
import com.microservices.wiki.refactoring.response.HttpClientResult; import com.microservices.wiki.refactoring.response.HttpClientResult;
import com.microservices.wiki.refactoring.utils.*; import com.microservices.wiki.refactoring.utils.*;
import com.microservices.wiki.service.sys.UserService; import com.microservices.wiki.service.sys.UserService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -163,7 +165,15 @@ public class WikiService {
} }
WikiRevisionsVo wikiRevisionsVo = JSON.parseObject(httpClientResult.getContent(), WikiRevisionsVo.class); WikiRevisionsVo wikiRevisionsVo = JSON.parseObject(httpClientResult.getContent(), WikiRevisionsVo.class);
wikiRevisionsVo.getCommits().forEach(commit -> { wikiRevisionsVo.getCommits().forEach(commit -> {
User commitUser = userService.getUserByLogin(commit.getCommiter().getName());
if(commitUser != null){
commit.getCommiter().setName(StringUtils.isEmpty(commitUser.getNickname()) ? commitUser.getLogin() : commitUser.getNickname());
}
commit.getCommiter().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getCommiter().getName())); commit.getCommiter().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getCommiter().getName()));
User authorUser = userService.getUserByLogin(commit.getAuthor().getName());
if(authorUser != null){
commit.getAuthor().setName(StringUtils.isEmpty(authorUser.getNickname()) ? authorUser.getLogin() : authorUser.getNickname());
}
commit.getAuthor().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getAuthor().getName())); commit.getAuthor().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getAuthor().getName()));
}); });