diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java
index 5aa0dec3..50844701 100644
--- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java
+++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/config/SnailJobProperties.java
@@ -49,7 +49,7 @@ public class SnailJobProperties {
/**
* 指定客户端端口
*/
- private int port = 1789;
+ private Integer port = 1789;
/**
* 重试、调度日志远程上报滑动窗口配置
diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyChannel.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyChannel.java
index db9b2188..439a02a6 100644
--- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyChannel.java
+++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyChannel.java
@@ -1,5 +1,6 @@
package com.aizuda.snailjob.client.common.rpc.client;
+import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.client.common.cache.GroupVersionCache;
@@ -55,7 +56,7 @@ public class NettyChannel {
private static final String HOST;
static {
- PORT = Integer.parseInt(System.getProperty(SNAIL_JOB_CLIENT_PORT, String.valueOf(8080)));
+ PORT = Integer.parseInt(System.getProperty(SNAIL_JOB_CLIENT_PORT, String.valueOf(1789)));
HOST = System.getProperty(SNAIL_JOB_CLIENT_HOST, NetUtil.getLocalIpStr());
}
@@ -161,6 +162,8 @@ public class NettyChannel {
return;
}
+ Assert.notBlank(snailJobProperties.getGroup(),
+ ()-> new SnailJobRemoteException("The group is null, please check if your configuration is correct."));
request.headers()
.set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON)
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/WorkflowController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/WorkflowController.java
index 27d06ecb..403491e7 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/WorkflowController.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/WorkflowController.java
@@ -84,8 +84,9 @@ public class WorkflowController {
@LoginRequired(role = RoleEnum.USER)
public List<WorkflowResponseVO> getWorkflowNameList(
@RequestParam(value = "keywords", required = false) String keywords,
- @RequestParam(value = "workflowId", required = false) Long workflowId) {
- return workflowService.getWorkflowNameList(keywords, workflowId);
+ @RequestParam(value = "workflowId", required = false) Long workflowId,
+ @RequestParam(value = "groupName", required = false) String groupName) {
+ return workflowService.getWorkflowNameList(keywords, workflowId, groupName);
}
@PostMapping("/check-node-expression")
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/WorkflowService.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/WorkflowService.java
index 1fbc6560..e6e2b008 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/WorkflowService.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/WorkflowService.java
@@ -35,7 +35,7 @@ public interface WorkflowService {
Boolean trigger(Long id);
- List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId);
+ List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId, String groupName);
Pair<Integer, String> checkNodeExpression(DecisionConfig decisionConfig);
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
index 9703dbab..83428160 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
@@ -113,7 +113,7 @@ public class JobServiceImpl implements JobService {
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
PageDTO<Job> selectPage = jobMapper.selectPage(
- new PageDTO<>(1, 20),
+ new PageDTO<>(1, 100),
new LambdaQueryWrapper<Job>()
.select(Job::getId, Job::getJobName)
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
@@ -122,7 +122,7 @@ public class JobServiceImpl implements JobService {
.eq(Objects.nonNull(jobId), Job::getId, jobId)
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
// SQLServer 分页必须 ORDER BY
- .orderByAsc(Job::getId));
+ .orderByDesc(Job::getId));
return JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords());
}
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java
index 6db8b5cf..d0a0a071 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java
@@ -292,15 +292,16 @@ public class WorkflowServiceImpl implements WorkflowService {
}
@Override
- public List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId) {
+ public List<WorkflowResponseVO> getWorkflowNameList(String keywords, Long workflowId, String groupName) {
PageDTO<Workflow> selectPage = workflowMapper.selectPage(
- new PageDTO<>(1, 20),
+ new PageDTO<>(1, 100),
new LambdaQueryWrapper<Workflow>()
.select(Workflow::getId, Workflow::getWorkflowName)
.likeRight(StrUtil.isNotBlank(keywords), Workflow::getWorkflowName, StrUtil.trim(keywords))
.eq(Objects.nonNull(workflowId), Workflow::getId, workflowId)
+ .eq(StrUtil.isNotBlank(groupName), Workflow::getGroupName, groupName)
.eq(Workflow::getDeleted, StatusEnum.NO.getStatus())
- .orderByAsc(Workflow::getId));
+ .orderByDesc(Workflow::getId));
return WorkflowConverter.INSTANCE.convertListToWorkflowList(selectPage.getRecords());
}