From d6abe79c17b1edb8c42d6b46bd5ec9ad70ef0ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=85=AB?= Date: Sun, 26 Jul 2020 16:29:47 +0800 Subject: [PATCH] [dev] valid appName --- .../service/workflow/WorkflowInstanceManager.java | 2 +- .../server/web/controller/AppInfoController.java | 1 + .../server/web/request/ModifyAppInfoRequest.java | 10 ++++++++++ .../src/main/resources/application.properties | 2 ++ .../github/kfcfans/powerjob/server/test/UtilsTest.java | 9 +++++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java index b5cfbd56..955c831b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java @@ -204,7 +204,7 @@ public class WorkflowInstanceManager { node.setStatus(status.getV()); node.setResult(result); - log.debug("[Workflow-{}|{}] node(jobId={},instanceId={}) finished in workflowInstance, status={},result={}", wfId, wfInstanceId, node.getJobId(), instanceId, status.name(), result); + log.info("[Workflow-{}|{}] node(jobId={},instanceId={}) finished in workflowInstance, status={},result={}", wfId, wfInstanceId, node.getJobId(), instanceId, status.name(), result); } if (InstanceStatus.generalizedRunningStatus.contains(node.getStatus())) { diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java index eb3f463d..5123c123 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java @@ -41,6 +41,7 @@ public class AppInfoController { @PostMapping("/save") public ResultDTO saveAppInfo(@RequestBody ModifyAppInfoRequest req) { + req.valid(); AppInfoDO appInfoDO; Long id = req.getId(); diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java index aeacc5db..77ea5da3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java @@ -1,6 +1,9 @@ package com.github.kfcfans.powerjob.server.web.request; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; import lombok.Data; +import org.apache.commons.lang3.StringUtils; /** * 修改应用信息请求 @@ -14,4 +17,11 @@ public class ModifyAppInfoRequest { private Long id; private String appName; private String password; + + public void valid() { + CommonUtils.requireNonNull(appName, "appName can't be empty"); + if (StringUtils.containsWhitespace(appName)) { + throw new OmsException("appName can't contains white space!"); + } + } } diff --git a/powerjob-server/src/main/resources/application.properties b/powerjob-server/src/main/resources/application.properties index a9383fbe..781cd407 100644 --- a/powerjob-server/src/main/resources/application.properties +++ b/powerjob-server/src/main/resources/application.properties @@ -2,6 +2,7 @@ server.port=7700 spring.profiles.active=daily +spring.main.banner-mode=log spring.jpa.open-in-view=false spring.data.mongodb.repositories.type=none @@ -17,6 +18,7 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* spring.datasource.druid.filter.stat.enabled=true spring.datasource.druid.filter.stat.log-slow-sql=true spring.datasource.druid.filter.stat.slow-sql-millis=5000 +spring.datasource.druid.stat-view-servlet.allow=* spring.datasource.druid.stat-view-servlet.enabled=true spring.datasource.druid.stat-view-servlet.login-username=powerjob spring.datasource.druid.stat-view-servlet.login-password=powerjob diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java index 0703432f..8350e6e5 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java @@ -5,6 +5,7 @@ import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTime import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; import com.google.common.collect.Lists; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import java.util.Date; @@ -82,4 +83,12 @@ public class UtilsTest { public void testTZ() { System.out.println(TimeZone.getDefault()); } + + @Test + public void testStringUtils() { + String goodAppName = "powerjob-server"; + String appName = "powerjob-server "; + System.out.println(StringUtils.containsWhitespace(goodAppName)); + System.out.println(StringUtils.containsWhitespace(appName)); + } }