gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ASW-113 新增 application MR 接口

Browse Source
This commit is contained in:
shizhendong
2024-10-28 11:01:29 +08:00
parent 890f5ccda9
commit 874c95fa9c
11 changed files with 378 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/geedge/asw/module/app/controller/GitController.java
View File

@@ -1,13 +1,17 @@
package net.geedge.asw.module.app.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.geedge.asw.common.util.ASWException;
import net.geedge.asw.common.util.R;
import net.geedge.asw.common.util.RCode;
import net.geedge.asw.common.util.T;
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
import net.geedge.asw.module.app.service.IApplicationMergeService;
import net.geedge.asw.module.app.service.IGitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -18,6 +22,9 @@ public class GitController {
@Autowired
private IGitService gitService;
@Autowired
private IApplicationMergeService applicationMergeService;
@GetMapping("/{workspaceId}/branch")
public R listBranch(@PathVariable("workspaceId") String workspaceId,
@RequestParam(value = "search", required = false) String search) {
@@ -136,4 +143,28 @@ public class GitController {
return R.ok().putData("record", record);
}
@GetMapping("/{workspaceId}/mr")
public R listMr(@PathVariable("workspaceId") String workspaceId, @RequestParam Map<String, Object> params) {
// workspaceId
params = T.MapUtil.defaultIfEmpty(params, new HashMap<>());
params.put("workspaceId", workspaceId);
Page page = applicationMergeService.queryList(params);
return R.ok(page);
}
@PostMapping("/{workspaceId}/mr")
public synchronized R newMr(@PathVariable("workspaceId") String workspaceId, @RequestBody ApplicationMergeEntity entity) {
T.VerifyUtil.is(entity).notNull()
.and(entity.getTitle()).notEmpty(RCode.PARAM_CANNOT_EMPTY)
.and(entity.getTargetBranch()).notEmpty(RCode.PARAM_CANNOT_EMPTY)
.and(entity.getTargetBranch()).notEmpty(RCode.PARAM_CANNOT_EMPTY);
// workspaceId
entity.setWorkspaceId(workspaceId);
ApplicationMergeEntity record = applicationMergeService.newMr(entity);
return R.ok().putData("record", record);
}
}

16
src/main/java/net/geedge/asw/module/app/dao/ApplicationMergeDao.java Normal file
View File

@@ -0,0 +1,16 @@
package net.geedge.asw.module.app.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface ApplicationMergeDao extends BaseMapper<ApplicationMergeEntity> {
List<ApplicationMergeEntity> queryList(Page page, Map<String, Object> params);
}

36
src/main/java/net/geedge/asw/module/app/entity/ApplicationMergeEntity.java Normal file
View File

@@ -0,0 +1,36 @@
package net.geedge.asw.module.app.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import net.geedge.asw.module.sys.entity.SysUserEntity;
@Data
@TableName(value = "application_merge", autoResultMap = true)
public class ApplicationMergeEntity {
@TableId(type = IdType.ASSIGN_UUID)
private String id;
private String sourceBranch;
private String targetBranch;
private String commitId;
private String title;
private Integer removeSourceBranch = 0;
private String description;
private String status;
private String message;
private Long createTimestamp;
private String createUserId;
private String workspaceId;
@TableField(exist = false)
private SysUserEntity createUser;
@TableField(exist = false)
private Object commit;
}

15
src/main/java/net/geedge/asw/module/app/service/IApplicationMergeService.java Normal file
View File

@@ -0,0 +1,15 @@
package net.geedge.asw.module.app.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
import java.util.Map;
public interface IApplicationMergeService extends IService<ApplicationMergeEntity> {
Page queryList(Map<String, Object> params);
ApplicationMergeEntity newMr(ApplicationMergeEntity entity);
}

4
src/main/java/net/geedge/asw/module/app/service/IGitService.java
View File

@@ -9,6 +9,8 @@ public interface IGitService {
Repository initRepository(String workspaceId);
Map<Object, Object> infoCommit(String workspaceId, String commitId);
List<Map<Object, Object>> listBranch(String workspaceId, String search);
Map<Object, Object> infoBranch(String workspaceId, String branchName);
@@ -17,6 +19,8 @@ public interface IGitService {
void deleteBranch(String workspaceId, String branchName);
String mergeBranch(String workspaceId, String sourceBranch, String targetBranch, String message) throws RuntimeException;
List<Map<Object, Object>> listApplication(String workspaceId, String branch, String q);
Map<Object, Object> infoApplication(String workspaceId, String branch, String applicationName);

97
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java Normal file
View File

@@ -0,0 +1,97 @@
package net.geedge.asw.module.app.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.log.Log;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.geedge.asw.common.config.Query;
import net.geedge.asw.common.util.T;
import net.geedge.asw.module.app.dao.ApplicationMergeDao;
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
import net.geedge.asw.module.app.service.IApplicationMergeService;
import net.geedge.asw.module.app.service.IGitService;
import net.geedge.asw.module.sys.entity.SysUserEntity;
import net.geedge.asw.module.sys.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao, ApplicationMergeEntity> implements IApplicationMergeService {
private final static Log log = Log.get();
@Autowired
private IGitService gitService;
@Autowired
private ISysUserService userService;
@Override
public Page queryList(Map<String, Object> params) {
Page page = new Query(ApplicationMergeEntity.class).getPage(params);
List<ApplicationMergeEntity> list = this.getBaseMapper().queryList(page, params);
for (ApplicationMergeEntity mergeEntity : list) {
String commitId = mergeEntity.getCommitId();
if (T.StrUtil.isNotEmpty(commitId)) {
try {
Map<Object, Object> infoCommit = gitService.infoCommit(mergeEntity.getWorkspaceId(), commitId);
mergeEntity.setCommit(infoCommit);
} catch (Exception e) {
}
}
}
page.setRecords(list);
return page;
}
@Override
public ApplicationMergeEntity newMr(ApplicationMergeEntity entity) {
String srcBranch = entity.getSourceBranch();
String tgtBranch = entity.getTargetBranch();
String message = entity.getTitle();
String workspaceId = entity.getWorkspaceId();
entity.setCreateTimestamp(System.currentTimeMillis());
entity.setCreateUserId(StpUtil.getLoginIdAsString());
// merge
try {
String commitId = gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message);
entity.setCommitId(commitId);
entity.setStatus("success");
Map<Object, Object> infoCommit = gitService.infoCommit(workspaceId, commitId);
entity.setCommit(infoCommit);
} catch (Exception e) {
log.error(e, "[newMr] [merge error] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}] [msg: {}]", workspaceId, srcBranch, tgtBranch, e.getMessage());
entity.setCommitId("");
entity.setStatus("failed");
entity.setMessage(e.getMessage());
}
// remove source branch
if (1 == entity.getRemoveSourceBranch()) {
try {
log.info("[newMr] [remove source branch] [workspaceId: {}] [branch: {}]", workspaceId, srcBranch);
gitService.deleteBranch(workspaceId, srcBranch);
} catch (Exception e) {
log.error(e, "[newMr] [remove source branch error] [workspaceId: {}] [branch: {}] [msg: {}]", workspaceId, srcBranch, e.getMessage());
}
}
// save
this.save(entity);
SysUserEntity user = userService.getById(entity.getCreateUserId());
entity.setCreateUser(user);
return entity;
}
}

92
src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
View File

@@ -12,16 +12,22 @@ import net.geedge.asw.module.sys.service.ISysUserService;
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
import net.geedge.asw.module.workspace.service.IWorkspaceService;
import org.apache.commons.io.FilenameUtils;
import org.eclipse.jgit.api.CreateBranchCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeCommand;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.PathFilter;
@@ -156,6 +162,20 @@ public class GitServiceImpl implements IGitService {
}
}
@Override
public Map<Object, Object> infoCommit(String workspaceId, String commitId) {
try (Git git = this.getGitInstance(workspaceId);
Repository repository = git.getRepository();
RevWalk revCommits = new RevWalk(repository);
) {
RevCommit commit = revCommits.parseCommit(ObjectId.fromString(commitId));
return this.buildAswCommitInfo(commit);
} catch (IOException e) {
log.error(e, "[infoCommit] [error] [workspaceId: {}] [commitId: {}]", workspaceId, commitId);
throw new RuntimeException(e);
}
}
@Override
public List<Map<Object, Object>> listBranch(String workspaceId, String search) {
List<Map<Object, Object>> resultList = T.ListUtil.list(true);
@@ -239,6 +259,78 @@ public class GitServiceImpl implements IGitService {
}
}
@Override
public String mergeBranch(String workspaceId, String srcBranch, String tgtBranch, String message) throws RuntimeException {
log.info("[mergeBranch] [begin] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}]", workspaceId, srcBranch, tgtBranch);
// prepare a new folder for the cloned repository
File localPath = T.FileUtil.file(net.geedge.asw.common.util.Constants.TEMP_PATH, T.StrUtil.uuid());
T.FileUtil.del(localPath);
T.FileUtil.mkdir(localPath);
// bare repository
File repoDir = this.getRepoDirPath(workspaceId);
// clone
try (Git git = Git.cloneRepository()
.setBare(false)
.setURI(repoDir.getAbsolutePath())
.setDirectory(localPath)
.setCredentialsProvider(null)
.call()) {
// git fetch
git.fetch().call();
// checout
git.checkout()
.setCreateBranch(true)
.setName(tgtBranch)
.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.TRACK)
.setStartPoint("origin/" + tgtBranch)
.call();
// merge
MergeResult mergeResult = git.merge()
.setCommit(true)
.setMessage(message)
.setStrategy(MergeStrategy.RECURSIVE)
.setFastForward(MergeCommand.FastForwardMode.NO_FF)
.include(git.getRepository().findRef("origin/" + srcBranch))
.call();
MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus();
if (mergeStatus.isSuccessful()) {
log.info("[mergeBranch] [merge success]");
// push
Iterable<PushResult> pushResultIterable = git.push()
.setRemote("origin")
.add(tgtBranch)
.call();
for (PushResult pushResult : pushResultIterable) {
for (RemoteRefUpdate update : pushResult.getRemoteUpdates()) {
if (update.getStatus() != RemoteRefUpdate.Status.OK && update.getStatus() != RemoteRefUpdate.Status.UP_TO_DATE) {
log.error("[mergeBranch] [push error] [remote: {}] [status: {}]", update.getRemoteName(), update.getStatus());
String errorMessage = "Push failed: " + update.getStatus();
throw new RuntimeException(errorMessage);
}
}
}
return mergeResult.getNewHead().getName();
} else {
log.error("[mergeBranch] [merge failed] [mergeStatus: {}] [conflict: {}]", mergeStatus, T.JSONUtil.toJsonStr(mergeResult.getConflicts()));
String errorMessage = String.format("Merge failed: %s, Conflicts: %s", mergeStatus, T.JSONUtil.toJsonStr(mergeResult.getConflicts()));
throw new RuntimeException(errorMessage);
}
} catch (Exception e) {
log.error(e, "[mergeBranch] [error] [workspaceId: {}]", workspaceId);
throw new RuntimeException(e.getMessage());
} finally {
T.FileUtil.del(localPath);
log.info("[mergeBranch] [finshed] [workspaceId: {}]", workspaceId);
}
}
@Override
public List<Map<Object, Object>> listApplication(String workspaceId, String branch, String q) {
List<Map<Object, Object>> resultList = T.ListUtil.list(true);

58
src/main/resources/db/mapper/app/ApplicationMergeMapper.xml Normal file
View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.geedge.asw.module.app.dao.ApplicationMergeDao">
<!-- 通用查询映射结果 -->
<resultMap id="resultMap" type="net.geedge.asw.module.app.entity.ApplicationMergeEntity">
<id column="id" property="id"/>
<result column="source_branch" property="sourceBranch"/>
<result column="target_branch" property="targetBranch"/>
<result column="commit_id" property="commitId"/>
<result column="title" property="title"/>
<result column="remove_source_branch" property="removeSourceBranch"/>
<result column="description" property="description"/>
<result column="status" property="status"/>
<result column="message" property="message"/>
<result column="create_timestamp" property="createTimestamp"/>
<result column="create_user_id" property="createUserId"/>
<result column="workspace_id" property="workspaceId"/>
<association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
</association>
</resultMap>
<select id="queryList" resultMap="resultMap">
SELECT
mr.*,
cu.id AS cu_id,
cu.name AS cu_name,
cu.user_name AS cu_user_name
FROM
application_merge mr
LEFT JOIN sys_user cu ON mr.create_user_id = cu.id
<where>
<if test="params.workspaceId != null and params.workspaceId != ''">
mr.workspace_id = #{params.workspaceId}
</if>
<if test="params.q != null and params.q != ''">
AND ( locate(#{params.q}, mr.title) OR locate(#{params.q}, mr.description) )
</if>
</where>
GROUP BY mr.id
<if test="params.orderBy == null or params.orderBy == ''">
ORDER BY mr.create_timestamp DESC
</if>
</select>
</mapper>

2
src/main/resources/db/migration/R__AZ_sys_menu.sql
View File

@@ -19,6 +19,8 @@ INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2009', 'main_branch_edit', 'buttons.edit', '2000', 'button', '', '', '', 9, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2010', 'regular_branch_edit', 'buttons.edit', '2000', 'button', '', '', '', 10, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2011', 'branch_delete', 'buttons.delete', '2000', 'button', '', '', '', 11, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2012', 'mr_view', 'buttons.view', '2000', 'button', '', '', '', 12, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2013', 'mr_add', 'buttons.add', '2000', 'button', '', '', '', 13, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('3000', 'pcaps', 'overall.pcaps', '0', 'menu', '', '/pcaps', 'asw-icon icon-Pcaps', 2, 1722478572000, 1);
INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('3001', 'pacp_view', 'buttons.view', '3000', 'button', '', '', '', 1, 1722478572000, 1);

6
src/main/resources/db/migration/R__AZ_sys_role_menu.sql
View File

@@ -22,6 +22,8 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2008');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2009');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2010');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2011');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2012');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2013');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '3000');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '3001');
@@ -82,6 +84,8 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2008');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2009');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2010');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2011');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2012');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2013');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '3000');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '3001');
@@ -135,6 +139,8 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2006');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2007');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2008');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2010');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2012');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2013');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '3000');
INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '3001');

21
src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql
View File

@@ -351,6 +351,27 @@ CREATE TABLE `application_href` (
KEY `idx_application_id` (`application_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/**
* 新增 application_merge 表
*/
DROP TABLE IF EXISTS `application_merge`;
CREATE TABLE `application_merge` (
`id` VARCHAR(64) NOT NULL COMMENT '主键',
`source_branch` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '源分支',
`target_branch` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '目标分支',
`commit_id` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '提交ID',
`title` VARCHAR(4096) NOT NULL DEFAULT '' COMMENT '标题',
`remove_source_branch` int(1) NOT NULL DEFAULT 0 COMMENT '是否删除源分支, 1：删除;0：不删除 默认：0',
`description` text NOT NULL DEFAULT '' COMMENT '描述信息',
`status` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '合并状态,可选值：success,failed',
`message` text NOT NULL DEFAULT '' COMMENT '操作信息',
`create_timestamp` BIGINT(20) NOT NULL COMMENT '创建时间戳',
`create_user_id` VARCHAR(64) NOT NULL COMMENT '创建人id',
`workspace_id` varchar(64) NOT NULL DEFAULT '' COMMENT '工作空间ID',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_workspace_id` (`workspace_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/**
* 新增 package 表
*/