Merge remote-tracking branch 'origin/dev-deploy' into dev-deploy

This commit is contained in:
yoosangwook 2025-06-04 10:17:47 +09:00
commit 839165caf5

View File

@ -6,7 +6,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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 jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
username: pvDBuser username: pvDBuser
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
maximum-pool-size: 4 maximum-pool-size: 4
@ -43,7 +43,7 @@ batch:
#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:8080 url: https://jp.qsalesplatform.com
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