test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 11:58:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
bwcx_jzy 2023-03-29 15:08:07 +08:00
parent 97a6081cf1
commit 0f317de6a1
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/server/src/main/java/io/jpom/func/openapi/controller/BuildTriggerApiController.java
View File

@ -433,7 +433,7 @@ public class BuildTriggerApiController extends BaseJpomController implements Ini
}
}
int size = waitQueue.size();
log.debug("需要处理的构建数：{}", size);
log.debug("需要处理构建微队列数：{}", size);
// 遍历队列中的数据
waitQueue.forEach((buildId, buildCaches) -> {
synchronized (buildId.intern()) {

6
web-vue/src/pages/build/details.vue
View File

@ -24,7 +24,7 @@
本地构建
</template>
</a-descriptions-item>
<a-descriptions-item label="产物"> {{ data.resultDirFile }} </a-descriptions-item>
<a-descriptions-item label="最新构建ID">
<span v-if="data.buildId <= 0"></span>
<a-tag v-else color="#108ee9">#{{ data.buildId }}</a-tag>
@ -37,9 +37,13 @@
<a-descriptions-item label="发布方式">{{ releaseMethodMap[data.releaseMethod] }} </a-descriptions-item>
<a-descriptions-item label="定时构建"> {{ data.autoBuildCron }} </a-descriptions-item>
<a-descriptions-item label="别名码"> {{ data.aliasCode }} </a-descriptions-item>
<a-descriptions-item label="构建目录">
<a-tag>{{ data.sourceDirExist ? "存在" : "不存在" }}</a-tag>
</a-descriptions-item>
<a-descriptions-item label="创建时间"> {{ parseTime(data.createTimeMillis) }} </a-descriptions-item>
<a-descriptions-item label="最后修改时间"> {{ parseTime(data.modifyTimeMillis) }}</a-descriptions-item>
<a-descriptions-item label="最后修改人">{{ data.modifyUser }}</a-descriptions-item>
<a-descriptions-item label="产物" :span="3"> {{ data.resultDirFile }} </a-descriptions-item>
<a-descriptions-item label="源仓库" :span="3" v-if="tempRepository">{{ `${tempRepository ? tempRepository.name + "[" + tempRepository.gitUrl + "]" : ""}` }}</a-descriptions-item>
<a-descriptions-item label="仓库lastcommit" :span="3">{{ data.repositoryLastCommitId }}</a-descriptions-item>
</a-descriptions>

2
web-vue/src/pages/build/trigger.vue
View File

@ -21,7 +21,7 @@
批量构建全部参数举例 BODY json： [ { "id":"1", "token":"a", "delay":"0","branchName":"test","branchTagName":"1.*","script":"mvn clean
package","resultDirFile":"/target/","webhook":"http://test.com/webhook" } ]
</li>
<li>参数如果传入 useQueue=true 将使用微队列来排队构建，避免几乎同时触发构建被中断构建（一般用户仓库合并代码会触发多次请求）</li>
<li>参数如果传入 useQueue=true 将使用微队列来排队构建，避免几乎同时触发构建被中断构建（一般用户仓库合并代码会触发多次请求）,队列保存在内存中,重启将丢失</li>
<li>批量构建传入其他参数将同步执行修改</li>
</ul>
</template>