Compare commits

..

No commits in common. "4675dd4a56d31b3753dd41ca65378b68163f7563" and "8e2f98ff07b441f5754d989a772700ed77478b64" have entirely different histories.

5 changed files with 47 additions and 25 deletions

View File

@ -32,8 +32,8 @@ public class JobLauncherController {
@Value("${qsp.master-admin-user-batch-url}")
private String qspInterfaceUrl;
@Value("${spring.profiles.scheduler}")
private String scheduler;
@Value("${batch.job.enabled}")
private boolean batchJobEnabled;
/**
* 특정 Job을 매핑으로 실행하는 메소드
*
@ -118,12 +118,12 @@ public class JobLauncherController {
if (job == null) {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
}
@ -147,12 +147,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
}
@ -176,12 +177,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -206,11 +208,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters);
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -235,11 +239,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters);
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -264,11 +270,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters);
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -293,7 +301,7 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
@ -320,11 +328,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters);
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -349,13 +359,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";
@ -380,12 +390,13 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if ("Y".equals(scheduler)) {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
}
return "OK";

View File

@ -25,6 +25,9 @@ spring:
enabled: false
profiles:
scheduler: Y
batch:
job:
enabled: true
#QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #https://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120

View File

@ -25,6 +25,9 @@ spring:
enabled: false
profiles:
scheduler: Y
batch:
job:
enabled: true
#QSP
qsp:
url: http://1.248.227.176:8120

View File

@ -23,8 +23,10 @@ spring:
names: ${job.name:NONE}
enabled: false
profiles:
scheduler: N
scheduler: Y
batch:
job:
enabled: false
#QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #http://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120

View File

@ -52,6 +52,9 @@ management:
health:
enabled: true
batch:
job:
enabled: true
file:
root.path: /home/development/public/files