third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[dev] valid appName

Browse Source
This commit is contained in:
朱八 2020-07-26 16:29:47 +08:00
parent d64a094821
commit d6abe79c17
5 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java
View File

@ -204,7 +204,7 @@ public class WorkflowInstanceManager {
node.setStatus(status.getV()); node.setStatus(status.getV());
node.setResult(result); 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())) { if (InstanceStatus.generalizedRunningStatus.contains(node.getStatus())) {

1
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java
View File

@ -41,6 +41,7 @@ public class AppInfoController {
@PostMapping("/save") @PostMapping("/save")
public ResultDTO<Void> saveAppInfo(@RequestBody ModifyAppInfoRequest req) { public ResultDTO<Void> saveAppInfo(@RequestBody ModifyAppInfoRequest req) {
req.valid();
AppInfoDO appInfoDO; AppInfoDO appInfoDO;
Long id = req.getId(); Long id = req.getId();

10
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java
View File

@ -1,6 +1,9 @@
package com.github.kfcfans.powerjob.server.web.request; 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 lombok.Data;
import org.apache.commons.lang3.StringUtils;
/** /**
* 修改应用信息请求 * 修改应用信息请求
@ -14,4 +17,11 @@ public class ModifyAppInfoRequest {
private Long id; private Long id;
private String appName; private String appName;
private String password; 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!");
}
}
} }

2
powerjob-server/src/main/resources/application.properties
View File

@ -2,6 +2,7 @@
server.port=7700 server.port=7700
spring.profiles.active=daily spring.profiles.active=daily
spring.main.banner-mode=log
spring.jpa.open-in-view=false spring.jpa.open-in-view=false
spring.data.mongodb.repositories.type=none 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.enabled=true
spring.datasource.druid.filter.stat.log-slow-sql=true spring.datasource.druid.filter.stat.log-slow-sql=true
spring.datasource.druid.filter.stat.slow-sql-millis=5000 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.enabled=true
spring.datasource.druid.stat-view-servlet.login-username=powerjob spring.datasource.druid.stat-view-servlet.login-username=powerjob
spring.datasource.druid.stat-view-servlet.login-password=powerjob spring.datasource.druid.stat-view-servlet.login-password=powerjob

9
powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java
View File

@ -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.TimerFuture;
import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test; import org.junit.Test;
import java.util.Date; import java.util.Date;
@ -82,4 +83,12 @@ public class UtilsTest {
public void testTZ() { public void testTZ() {
System.out.println(TimeZone.getDefault()); 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));
}
} }