Skip to content

Commit

Permalink
注释签名优化
Browse files Browse the repository at this point in the history
  • Loading branch information
qmdx committed Jun 6, 2024
1 parent 0559add commit c3612bc
Show file tree
Hide file tree
Showing 69 changed files with 280 additions and 213 deletions.
4 changes: 0 additions & 4 deletions .gitee/ISSUE_TEMPLATE.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
### 该问题是怎么引起的?



### 重现步骤



### 报错信息


Expand Down
2 changes: 0 additions & 2 deletions .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
### 内容说明(相关的Issue)



### 变更内容


5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<img src="https://foruda.gitee.com/images/1693470775312764207/27440c57_12260.png" alt="flowlong" width="100px" height="113px">

# 项目介绍

FlowLong🐉飞龙工作流

- 项目说明 `flowlong` 中文名 `飞龙` 在天美好愿景!
Expand All @@ -10,7 +10,7 @@ FlowLong🐉飞龙工作流
> 使用必须遵守国家法律法规,⛔不允许非法项目使用,后果自负❗
[使用源码登记入口](https://gitee.com/aizuda/flowlong/issues/I7XGP5)
[使用源码登记入口](https://gitee.com/aizuda/flowlong/issues/I7XGP5)

[打开官方开发文档](https://doc.flowlong.com)

Expand Down Expand Up @@ -61,7 +61,6 @@ FlowLong🐉飞龙工作流
| 超时审批 | 根据设置的超时审批时间,超时后自动审批【自动通过或拒绝】 || ||
| 自动提醒 | 根据设置的提醒时间,提醒审批人审批【可设定提醒次数】实现接口任意方式提醒【短信,邮件,微信,钉钉等】 ||


# 贡献力量

- [运行单元测试](https://gitee.com/aizuda/flowlong/wikis/%E8%BF%90%E8%A1%8C%E5%8D%95%E5%85%83%E6%B5%8B%E8%AF%95)
Expand Down
37 changes: 13 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ allprojects {
}



// 子模块配置
subprojects {
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: 'signing'
apply plugin: "io.spring.dependency-management"

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:-serial"
options.encoding = 'UTF-8'
options.warnings = false
}
Expand Down Expand Up @@ -100,18 +100,19 @@ subprojects {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
options.warnings = false
options.deprecation = true
options.compilerArgs += ["-parameters"]
}

tasks.withType(GenerateModuleMetadata) {
tasks.withType(GenerateModuleMetadata).configureEach {
enabled = false
}

task sourcesJar(type: Jar, dependsOn: classes) {
tasks.register('sourcesJar', Jar) {
dependsOn classes
archiveClassifier = 'sources'
from sourceSets.main.allSource
}
Expand All @@ -123,22 +124,22 @@ subprojects {
author true
version true
failOnError false
links "http://docs.oracle.com/javase/8/docs/api"
links "https://docs.oracle.com/javase/8/docs/api"
}
}

tasks.withType(MavenPublication) {
tasks.withType(MavenPublication).configureEach {
doFirst {
options.skipCertificateChecks = true
}
}

task javadocJar(type: Jar) {
tasks.register('javadocJar', Jar) {
archiveClassifier = 'javadoc'
from javadoc
}

tasks.whenTaskAdded { task ->
tasks.configureEach { task ->
if (task.name.contains('signMavenJavaPublication')) {
task.enabled = new File(project.property('signing.secretKeyRingFile') as String).isFile()
}
Expand All @@ -153,8 +154,8 @@ subprojects {
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl

credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
username = "andto"
password = "243194995"
}
}
}
Expand Down Expand Up @@ -191,22 +192,10 @@ subprojects {
email = '[email protected]'
}
}

withXml {
def root = asNode()
root.dependencies.'*'.findAll {
def d = it
d.scope.text() == 'runtime' && project.configurations.findByName("implementation").allDependencies.find { dep ->
dep.name == it.artifactId.text()
}.each() {
d.scope*.value = 'compile'
d.appendNode('optional', true)
}
}
}
}
}
}
}

signing {
useInMemoryPgpKeys(System.getenv('GPG_SECRET'), System.getenv('GPG_PASSWORD'))
Expand Down
8 changes: 2 additions & 6 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# 更新日志

## [v0.0.7] 2024.06.05
Expand All @@ -10,16 +9,17 @@
- 不捕获可能存在得业务异常
- 其它优化完善


## [v0.0.6] 2024.05.20

- 支持并行分支执行节点
- 新增唯一节点 nodeKey 允许节点名称重复
- 调整任务实例表结构优化

```
1,模型新增 nodeKey 替代 nodeName 唯一条件,任务 displayName 修改为 taskKey
2,流程实例 currentNode 分为 currentNodeName currentNodeKey
```

- 增加枚举参与者类型
- 优化换成允许过期时间设置
- 优化任务节点审批人列表
Expand All @@ -35,7 +35,6 @@
- 新增模型自定义外置表单扩展
- 优化自动审批通过或拒绝


## [v0.0.4] 2024.05.08

- 节点跳转任务支持添加参数
Expand All @@ -49,7 +48,6 @@
- 新增动态构建执行新任务(不体现在流程图中)
- 优化完善定时自动审批超时等处理逻辑


## [v0.0.3] 2024.04.21

- 执行节点调整父任务节点记录携带优化
Expand All @@ -59,7 +57,6 @@
- 修复会签节点驳回 Bug
- 其它代码优化


## [v0.0.2] 2024.04.18

- 新增节点条件参数处理器
Expand All @@ -74,7 +71,6 @@
- 增加 重新部署流程 的测试用例
- 优化初始赋值


## [v0.0.1] 2024.04.01

- 发布创始版
4 changes: 0 additions & 4 deletions flowlong-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<description>flowlong core</description>
<packaging>jar</packaging>

<properties>
<!-- <spring-boot.version>2.7.0</spring-boot.version>-->
</properties>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ public static void dynamicAssignee(Map<String, Object> dataMap) {
/**
* 获取传递参数
*
* @param param 传递参数
* @param 传递参数
* @return 传递参数 MAP 对象
*/
@SuppressWarnings({"all"})
public static <T> T get(String param) {
Map<String, Object> dataMap = getAll();
if (null != dataMap && !dataMap.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ default boolean executeJumpTask(Long taskId, String nodeKey, FlowCreator flowCre
* @param performType 参与类型
* @param flowCreator 任务创建者
* @param args 任务参数
* @return List<Task> 创建任务集合
* @return 创建任务集合
*/
List<FlwTask> createNewTask(Long taskId, TaskType taskType, PerformType performType, List<FlwTaskActor> taskActors,
FlowCreator flowCreator, Map<String, Object> args);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright 2023-2025 Licensed under the AGPL License
*/
package com.aizuda.bpm.engine;
Expand All @@ -23,6 +23,7 @@ public interface ModelInstance {
*
* @param flowLongContext 流程引擎上下文
* @param execution 执行对象
* @return 执行结果 true 成功 false 失败
*/
boolean execute(FlowLongContext flowLongContext, Execution execution);
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,22 @@ public interface ProcessModelCache {

/**
* 流程模型缓存KEY
*
* @return 缓存 KEY
*/
String modelCacheKey();

/**
* 流程模型内容
*
* @return 缓存内容
*/
String getModelContent();

/**
* JSON BPM 模型
*
* @return JSON BPM 模型
*/
default ProcessModel model() {
String modelContent = this.getModelContent();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public interface ProcessModelParser {

/**
* 流程缓存实现类
*
* @return 流程缓存
*/
FlowCache getFlowCache();
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ default FlwTask complete(Long taskId, FlowCreator flowCreator) {
* @param taskId 任务ID
* @param flowCreator 任务创建者
* @param args 任务参数
* @param nodeKey 跳转至目标节点key
* @param nodeKey 跳转至目标节点key
* @param executionFunction 执行函数
* @return 当前 flowCreator 所在的任务
*/
Expand All @@ -81,7 +81,8 @@ default boolean executeJumpTask(Long taskId, String nodeKey, FlowCreator flowCre
/**
* 完成指定实例ID活动任务
*
* @param instanceId 实例ID
* @param instanceId 实例ID
* @param flowCreator 处理人员
* @return true 成功 false 失败
*/
boolean completeActiveTasksByInstanceId(Long instanceId, FlowCreator flowCreator);
Expand Down Expand Up @@ -226,7 +227,7 @@ default Optional<FlwTask> rejectTask(FlwTask currentFlwTask, FlowCreator flowCre
*
* @param taskModel 任务模型
* @param execution 执行对象
* @return List<Task> 创建任务集合
* @return 创建任务集合
*/
List<FlwTask> createTask(NodeModel taskModel, Execution execution);

Expand All @@ -242,15 +243,15 @@ default Optional<FlwTask> rejectTask(FlwTask currentFlwTask, FlowCreator flowCre
* @param performType 参与类型
* @param flowCreator 任务创建者
* @param executionFunction 执行函数
* @return List<Task> 创建任务集合
* @return 创建任务集合
*/
List<FlwTask> createNewTask(Long taskId, TaskType taskType, PerformType performType, List<FlwTaskActor> taskActors,
FlowCreator flowCreator, Function<FlwTask, Execution> executionFunction);

/**
* 获取超时或者提醒的任务
*
* @return List<Task> 任务列表
* @return 任务列表
*/
List<FlwTask> getTimeoutOrRemindTasks();

Expand All @@ -269,6 +270,7 @@ List<FlwTask> createNewTask(Long taskId, TaskType taskType, PerformType performT
* @param performType 参与类型 {@link PerformType}
* @param flwTaskActors 参与者列表
* @param flowCreator 执行操作人员
* @return true 成功 false 失败
*/
boolean addTaskActor(Long taskId, PerformType performType, List<FlwTaskActor> flwTaskActors, FlowCreator flowCreator);

Expand All @@ -282,6 +284,7 @@ default boolean addTaskActor(Long taskId, PerformType performType, FlwTaskActor
* @param taskId 任务ID
* @param actorIds 参与者ID列表
* @param flowCreator 执行操作人员
* @return true 成功 false 失败
*/
boolean removeTaskActor(Long taskId, List<String> actorIds, FlowCreator flowCreator);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public interface TaskTrigger {
*
* @param nodeModel 节点模型
* @param execution 执行对象
* @return 执行结果 true 成功 false 失败
*/
boolean execute(NodeModel nodeModel, Execution execution);
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static void notNull(Object object) {
/**
* 断言给定的object对象为空
*
* @param object 待检测对象
* @param object 待检测对象
*/
public static void isEmpty(Object object) {
isEmpty(object, "[Assertion failed] - this argument must not be null or empty");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public static LocalDateTime now() {

/**
* 日期判断
*
* @param arg0 开始时间
* @param arg1 结束时间
* @return true 开始时间大于结束时间 false 开始时间小于结束时间
*/
public static boolean after(Date arg0, Date arg1) {
return null != arg0 && null != arg1 && arg0.after(arg1);
Expand All @@ -48,6 +52,7 @@ public static boolean after(Date arg0, Date arg1) {
* 日期 LocalDateTime 转为 Date
*
* @param localDateTime {@link LocalDateTime}
* @return {@link Date}
*/
public static Date toDate(LocalDateTime localDateTime) {
if (null == localDateTime) {
Expand Down
Loading

0 comments on commit c3612bc

Please sign in to comment.