src/main/java/com/interplug/qcast/batch/JobLauncherController.java

@@ -57,29 +57,29 @@ public class JobLauncherController {
       resultMap.put("message", "Job" + jobName + " not found");
       return resultMap;
     }
-//    String[] arryJob = {
-//            "storeAdditionalJob"
-//            ,"BOMJob"
-//            ,"materialJob"
-//            ,"businessChargerJob"
-//            ,"adminUserJob"
-//            ,"priceJob"
-////            ,"commonCodeJob"
-//            ,"specialNoteDispItemAdditionalJob"
-//            ,"planConfirmJob"
-//            ,"estimateSyncJob"
-//    };
-//
-//
-//    if(!batchJobEnabled ){
-//      for(String jobName2 :arryJob){
-//        if(jobName2.equals(jobName)){
-//          resultMap.put("code", "FAILED");
-//          resultMap.put("message", "application.yml :: batch.job.enabled true");
-//          return resultMap;
-//        }
-//      }
-//    }
+    String[] arryJob = {
+            "storeAdditionalJob"
+            ,"BOMJob"
+            ,"materialJob"
+            ,"businessChargerJob"
+            ,"adminUserJob"
+            ,"priceJob"
+//            ,"commonCodeJob"
+            ,"specialNoteDispItemAdditionalJob"
+            ,"planConfirmJob"
+            ,"estimateSyncJob"
+    };
+
+
+    if(!batchJobEnabled ){
+      for(String jobName2 :arryJob){
+        if(jobName2.equals(jobName)){
+          resultMap.put("code", "FAILED");
+          resultMap.put("message", "application.yml :: batch.job.enabled true");
+          return resultMap;
+        }
+      }
+    }
 
     JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName)
         .addDate("time", new Date()).toJobParameters();
@@ -121,9 +121,8 @@ public class JobLauncherController {
     if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-      if (batchJobEnabled) {
-         jobLauncher.run(job, jobParameters);
-      }
+
+      jobLauncher.run(job, jobParameters);
     }
     return "OK";
   }
@@ -151,9 +150,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
     return "OK";
   }
@@ -181,9 +178,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -212,9 +207,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -243,9 +236,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -274,9 +265,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -332,9 +321,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -363,9 +350,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";
@@ -394,9 +379,7 @@ public class JobLauncherController {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
-        jobLauncher.run(job, jobParameters);
-      }
+      jobLauncher.run(job, jobParameters);
     }
 
     return "OK";

src/main/resources/config/application-dev.yml

@@ -7,11 +7,11 @@ spring:
   datasource:
     driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     #내부 개발계 DB
-#    jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
-#    password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
+    jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
+    password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
     #한화 개발계 DB
-    jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
-    password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
+    #jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
+    #password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
     username: pvDBuser
     maximum-pool-size: 4
     pool-name: Master-HikariPool

src/main/resources/config/application-prd.yml

@@ -4,28 +4,28 @@ server:
 
 #spring
 spring:
-  #  datasource:
-  #    driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-  #    jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
-  #    username: pvDBuser
-  #    password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
-  #    maximum-pool-size: 4
-  #    pool-name: Master-HikariPool
   datasource:
-    master:
-      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
-      username: pvDBuser
-      password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
-      maximum-pool-size: 4
-      pool-name: Master-HikariPool
-    read:
-      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
-      username: pvDBuser
-      password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
-      maximum-pool-size: 4
-      pool-name: Read-HikariPool
+    driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+    jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
+    username: pvDBuser
+    password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
+    maximum-pool-size: 4
+    pool-name: Master-HikariPool
+  #    datasource:
+  #      master:
+  #        driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+  #        jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
+  #        username: pvDBuser
+  #        password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
+  #        maximum-pool-size: 4
+  #        pool-name: Master-HikariPool
+  #    read:
+  #      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+  #      jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
+  #      username: pvDBuser
+  #      password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
+  #      maximum-pool-size: 4
+  #      pool-name: Read-HikariPool
   jackson:
     time-zone: Asia/Seoul
   batch:
@@ -43,7 +43,7 @@ batch:
 #QSP url 하나시스개발 #https://121.168.9.37:8080
 #QSP url interplug dev #http://1.248.227.176:8120
 qsp:
-  url: https://jp.qsalesplatform.com
+  url: http://121.168.9.37:8080
   master-store-batch-url: /api/master/storeAdditionalInfo
   master-material-batch-url: /api/master/materialList
   master-bom-batch-url: /api/master/bomList