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

Reviewed-on: #62
This commit is contained in:
ysCha 2025-06-04 11:02:33 +09:00
commit de41ca8db3

View File

@ -6,9 +6,12 @@ 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://10.31.0.21: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)
jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
username: pvDBuser
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool pool-name: Master-HikariPool
jackson: jackson:
@ -28,7 +31,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: https://jp.qsalesplatform.com url: https://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