mirror of
https://gitee.com/dromara/Jpom.git
synced 2024-11-30 10:58:14 +08:00
fix
This commit is contained in:
parent
e916c5d6de
commit
f3c8053fed
@ -13,8 +13,7 @@
|
||||
7. 【server】服务端脚本模版新增跨工作空间同步功能
|
||||
8. 【server】构建新增事件脚本属性,在构建环节可以执行指定脚本来实现部分功能(感谢[@沈世举](https://gitee.com/shen-shiju) [Gitee issues I5FKFM](https://gitee.com/dromara/Jpom/issues/I5FKFM) )
|
||||
9. 【server】优化构建任务独立线程池,并且新增配置属性 `build.poolSize`、`build.poolWaitQueue` (感谢@小翼哥)
|
||||
10. 【server】修复 windows 执行脚本出现异常(感谢[@all-around-badass](https://gitee.com/all-around-badass) [Gitee issues I5FK0K](https://gitee.com/dromara/Jpom/issues/I5FK0K) )
|
||||
11. 【agent】配置项目是否备份控制台日志属性独立:`log.autoBackToFile` (感谢@Vergil。)
|
||||
10. 【agent】配置项目是否备份控制台日志属性独立:`log.autoBackToFile` (感谢@Vergil。)
|
||||
|
||||
### 🐞 解决BUG、优化功能
|
||||
|
||||
@ -22,6 +21,7 @@
|
||||
2. 【server】docker 加入集群无法正常使用问题
|
||||
3. 【server】项目文件备份列表不能取消弹窗(点击关闭依然执行)问题(感谢@ʟᴊx💎💎)
|
||||
4. 【server】修复编辑构建仓库切换事件重复问题 (感谢[@五六](https://gitee.com/tutu-father) [Gitee issues I5F35E](https://gitee.com/dromara/Jpom/issues/I5F35E) )
|
||||
5. 【server】修复 windows 执行脚本出现异常(感谢[@all-around-badass](https://gitee.com/all-around-badass) [Gitee issues I5FK0K](https://gitee.com/dromara/Jpom/issues/I5FK0K) )
|
||||
|
||||
------
|
||||
|
||||
|
@ -23,10 +23,16 @@
|
||||
package cn;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.date.DateField;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.cron.pattern.CronPatternUtil;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@ -37,7 +43,12 @@ public class TestT {
|
||||
|
||||
@Test
|
||||
public void tset() {
|
||||
|
||||
List<Date> dates = CronPatternUtil
|
||||
.matchedDates("0 0 0 1/3 * ?", DateTime.now(),
|
||||
DateUtil.offset(DateTime.now(), DateField.YEAR, 1), 10, true);
|
||||
for (Date date : dates) {
|
||||
System.out.println(DateUtil.format(date, DatePattern.NORM_DATETIME_MS_PATTERN));
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
@ -1,3 +1,25 @@
|
||||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2019 Code Technology Studio
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
package io.jpom.system.extconf;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -20,7 +20,6 @@
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import cn.hutool.core.lang.PatternPool;
|
||||
import cn.hutool.core.util.CharsetUtil;
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
|
@ -20,7 +20,6 @@
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import cn.hutool.core.thread.ExecutorBuilder;
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
Loading…
Reference in New Issue
Block a user