test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-30 10:58:14 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

update tip,diff sync clear old

Browse Source
This commit is contained in:
bwcx_jzy 2021-12-16 21:16:35 +08:00
parent 83d5037b49
commit 79da259acf
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/agent/src/main/java/io/jpom/controller/manage/ProjectFileControl.java
View File

@ -123,9 +123,10 @@ public class ProjectFileControl extends BaseAgentController {
//
List<DiffFileVo.DiffItem> data = diffFileVo.getData();
Assert.notEmpty(data, "没有要对比的数据");
//
// 扫描项目目录下面的所有文件
String path = projectInfoModel.allLib();
List<File> files = FileUtil.loopFiles(path);
// 将所有的文件信息组装并签名
List<JSONObject> collect = files.stream().map(file -> {
//
JSONObject item = new JSONObject();
@ -133,12 +134,13 @@ public class ProjectFileControl extends BaseAgentController {
item.put("sha1", SecureUtil.sha1(file));
return item;
}).collect(Collectors.toList());
// 得到 当前下面文件夹下面所有的文件信息 map
Map<String, String> nowMap = CollStreamUtil.toMap(collect,
jsonObject12 -> jsonObject12.getString("name"),
jsonObject1 -> jsonObject1.getString("sha1"));
//
// 将需要对应的信息转为 map
Map<String, String> tryMap = CollStreamUtil.toMap(data, DiffFileVo.DiffItem::getName, DiffFileVo.DiffItem::getSha1);
//
// 对应需要 当前项目文件夹下没有的和文件内容有变化的
List<JSONObject> canSync = tryMap.entrySet()
.stream()
.filter(stringStringEntry -> {
@ -158,7 +160,7 @@ public class ProjectFileControl extends BaseAgentController {
return item;
})
.collect(Collectors.toList());
//
// 对比项目文件夹下有对，但是需要对应对信息里面没有对。此类文件需要删除
List<JSONObject> delArray = nowMap.entrySet()
.stream()
.filter(stringStringEntry -> !tryMap.containsKey(stringStringEntry.getKey()))

14
modules/server/src/main/java/io/jpom/build/ReleaseManage.java
View File

@ -306,7 +306,7 @@ public class ReleaseManage extends BaseBuild {
* @param projectId 项目ID
* @param afterOpt 发布后的操作
*/
private void diffSyncProject(NodeModel nodeModel, String projectId, AfterOpt afterOpt) {
private void diffSyncProject(NodeModel nodeModel, String projectId, AfterOpt afterOpt, boolean clearOld) {
File resultFile = this.resultFile;
String resultFileParent = resultFile.isFile() ?
FileUtil.getAbsolutePath(resultFile.getParent()) : FileUtil.getAbsolutePath(this.resultFile);
@ -332,9 +332,13 @@ public class ReleaseManage extends BaseBuild {
JSONArray del = data.getJSONArray("del");
int delSize = CollUtil.size(del);
int diffSize = CollUtil.size(diff);
this.log(StrUtil.format("对比文件结果,产物文件 {} 个、需要上传 {} 个、需要删除 {} 个", CollUtil.size(collect), CollUtil.size(diff), delSize));
// 先删除
if (delSize > 0) {
if (clearOld) {
this.log(StrUtil.format("对比文件结果,产物文件 {} 个、需要上传 {} 个、需要删除 {} 个", CollUtil.size(collect), CollUtil.size(diff), delSize));
} else {
this.log(StrUtil.format("对比文件结果,产物文件 {} 个、需要上传 {} 个", CollUtil.size(collect), CollUtil.size(diff)));
}
// 清空发布才先执行删除
if (delSize > 0 && clearOld) {
jsonObject.put("data", del);
requestBody = NodeForward.requestBody(nodeModel, NodeUrl.MANAGE_FILE_BATCH_DELETE, this.userModel, jsonObject);
if (requestBody.getCode() != HttpStatus.HTTP_OK) {
@ -377,7 +381,7 @@ public class ReleaseManage extends BaseBuild {
Objects.requireNonNull(nodeModel, "节点不存在");
String projectId = strings[1];
if (diffSync) {
this.diffSyncProject(nodeModel, projectId, afterOpt);
this.diffSyncProject(nodeModel, projectId, afterOpt, clearOld);
return;
}
File zipFile = BuildUtil.isDirPackage(this.resultFile);

51
web-vue/src/pages/build/list-info.vue
View File

@ -116,14 +116,15 @@
<a-form-model-item label="构建命令" prop="script">
<a-input v-model="temp.script" type="textarea" :auto-size="{ minRows: 2, maxRows: 6 }" allow-clear placeholder="构建执行的命令(非阻塞命令)，如：mvn clean package、npm run build" />
</a-form-model-item>
<a-form-model-item label="产物目录" prop="resultDirFile" class="jpom-target-dir">
<a-input v-model="temp.resultDirFile" placeholder="构建产物目录,相对仓库的路径,如 java 项目的 target/xxx.jar vue 项目的 dist">
<a-tooltip slot="suffix">
<a-form-model-item prop="resultDirFile" class="jpom-target-dir">
<template slot="label">
产物目录
<a-tooltip v-show="!temp.id">
<template slot="title">
<div>可以理解为项目打包的目录。 如 Jpom 项目执行（构建命令） <b>mvn clean package</b> 构建命令，构建产物相对路径为：<b>modules/server/target/server-2.4.2-release</b></div>
<div><br /></div>
<div>
支持通配符(AntPathMatcher)
支持通配符(AntPathMatcher)【目前只使用匹配到的第一项】
<ul>
<li>? 匹配一个字符</li>
<li>* 匹配零个或多个字符</li>
@ -133,7 +134,8 @@
</template>
<a-icon type="question-circle" theme="filled" />
</a-tooltip>
</a-input>
</template>
<a-input v-model="temp.resultDirFile" placeholder="构建产物目录,相对仓库的路径,如 java 项目的 target/xxx.jar vue 项目的 dist" />
</a-form-model-item>
<a-form-model-item prop="releaseMethod">
<template slot="label">
@ -181,7 +183,21 @@
<a-input style="width: 70%" v-model="tempExtraData.releasePath" placeholder="发布目录,构建产物上传到对应目录" />
</a-input-group>
</a-form-model-item>
<a-form-model-item v-if="temp.releaseMethod === 3" label="发布命令" prop="releaseCommand">
<a-form-model-item v-if="temp.releaseMethod === 3 || temp.releaseMethod === 4" prop="releaseCommand">
<!-- sshCommand LocalCommand -->
<template slot="label">
发布命令
<a-tooltip v-show="!temp.id">
<template slot="title">
发布执行的命令(非阻塞命令),一般是启动项目命令 如：ps -aux | grep java
<ul>
<li>支持变量替换：#{BUILD_ID}、#{BUILD_NAME}、#{BUILD_RESULT_FILE}、#{BUILD_NUMBER_ID}</li>
<li>可以引用工作空间的环境变量 变量占位符 #{xxxx} xxxx 为变量名称</li>
</ul>
</template>
<a-icon type="question-circle" theme="filled" />
</a-tooltip>
</template>
<a-input
v-model="tempExtraData.releaseCommand"
allow-clear
@ -191,18 +207,7 @@
placeholder="发布执行的命令(非阻塞命令),一般是启动项目命令 如：ps -aux | grep java,支持变量替换：#{BUILD_ID}、#{BUILD_NAME}、#{BUILD_RESULT_FILE}、#{BUILD_NUMBER_ID}"
/>
</a-form-model-item>
<!-- LocalCommand -->
<a-form-model-item v-if="temp.releaseMethod === 4" label="发布命令" prop="releaseCommand">
<a-input
v-model="tempExtraData.releaseCommand"
allow-clear
:auto-size="{ minRows: 2, maxRows: 10 }"
type="textarea"
:rows="3"
placeholder="发布执行的命令(非阻塞命令),一般是启动项目命令 如：ps -aux | grep java ,支持变量替换：#{BUILD_ID}、#{BUILD_NAME}、#{BUILD_RESULT_FILE}、#{BUILD_NUMBER_ID}"
/>
</a-form-model-item>
<a-form-model-item v-if="temp.releaseMethod === 2 || temp.releaseMethod === 3" prop="clearOld">
<template slot="label">
清空发布
@ -219,7 +224,11 @@
<a-col :span="4" style="text-align: right">
<a-tooltip v-if="!temp.id">
<template slot="title">
差异发布是指对应构建产物和项目文件夹里面的文件是否存在差异,如果存在增量差异那么上传或者覆盖文件,如果是项目目录存在构建产物目录不存在对应的文件那么将删除项目目录里面的文件【差异上传前会先执行删除差异文件再执行上传差异文件】。开启差异发布清空发布将失效
差异发布是指对应构建产物和项目文件夹里面的文件是否存在差异,如果存在增量差异那么上传或者覆盖文件。
<ul>
<li>开启差异发布并且开启清空发布时将自动删除项目目录下面有的文件但是构建产物目录下面没有的文件 【清空发布差异上传前会先执行删除差异文件再执行上传差异文件】</li>
<li>开启差异发布但不开启清空发布时相当于只做增量和变动更新</li>
</ul>
</template>
<a-icon type="question-circle" theme="filled" />
</a-tooltip>
@ -278,11 +287,11 @@
import { mapGetters } from "vuex";
import CustomSelect from "@/components/customSelect";
import BuildLog from "./log";
import { getRepositoryListAll } from "../../api/repository";
import { getRepositoryListAll } from "@/api/repository";
import { clearBuid, deleteBuild, editBuild, getBranchList, getBuildList, getTriggerUrl, releaseMethodMap, releaseMethodArray, resetTrigger, startBuild, stopBuild, statusMap } from "@/api/build-info";
import { getDishPatchListAll, afterOptList } from "@/api/dispatch";
import { getProjectListAll, getNodeListAll } from "@/api/node";
import { getSshListAll } from "../../api/ssh";
import { getSshListAll } from "@/api/ssh";
import { itemGroupBy, parseTime } from "@/utils/time";
import { PAGE_DEFAULT_LIMIT, PAGE_DEFAULT_SIZW_OPTIONS, PAGE_DEFAULT_SHOW_TOTAL, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";