qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#228) from dev into prd-deploy

Browse Source 
Reviewed-on: #228
This commit is contained in:
ysCha 2025-09-01 16:19:35 +09:00
commit 860e309b8e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/interplug/qcast/batch/JobLauncherController.java
View File

@ -218,7 +218,9 @@ public class JobLauncherController {
return "Job " + jobName + " not found"; return "Job " + jobName + " not found";
} }
if (!"Y".equals(scheduler) && !"storeAdditionalJob".equals(jobName)) { if (!"Y".equals(scheduler)
&& !"materialJob".equals(jobName)
&& !"commonCodeJob".equals(jobName)) {
log.info("Scheduler disabled, skipping job {}", jobName); log.info("Scheduler disabled, skipping job {}", jobName);
return "Scheduler disabled"; return "Scheduler disabled";
} }

4
src/main/resources/config/application-dev.yml
View File

@ -24,12 +24,12 @@ spring:
names: ${job.name:NONE} names: ${job.name:NONE}
enabled: false enabled: false
profiles: profiles:
scheduler: Y scheduler: N
#QSP url 하나시스운영 #https://jp.qsalesplatform.com #QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #https://121.168.9.37:8080 #QSP url 하나시스개발 #https://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120 #QSP url interplug dev #http://1.248.227.176:8120
qsp: qsp:
url: http://121.168.9.37:8080F url: http://121.168.9.37:8080
master-store-batch-url: /api/master/storeAdditionalInfo master-store-batch-url: /api/master/storeAdditionalInfo
master-material-batch-url: /api/master/materialList master-material-batch-url: /api/master/materialList
master-bom-batch-url: /api/master/bomList master-bom-batch-url: /api/master/bomList