From 7508921a0d39bb7998b7b5e99528b4d1c117bb01 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Mon, 26 May 2025 15:47:42 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EA=B3=84=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # src/main/resources/config/application-dev.yml --- src/main/resources/config/application-dev.yml | 2 +- src/main/resources/config/application-local.yml | 9 ++++++--- src/main/resources/config/application-prd.yml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 9daffe47..54b29d6a 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -6,13 +6,13 @@ server: spring: datasource: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - username: pvDBuser #내부 개발계 DB 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://192.168.200.220:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false #password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) + username: pvDBuser maximum-pool-size: 4 pool-name: Master-HikariPool # datasource: diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index ac6b7226..c61817bb 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -6,10 +6,13 @@ server: 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 - jdbc-url: jdbc:log4jdbc:sqlserver://192.168.200.220:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false + #내부 개발계 DB + 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://192.168.200.220:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false + #password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) username: pvDBuser - password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) maximum-pool-size: 4 pool-name: Master-HikariPool # datasource: diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index 6e60e23f..872ce2db 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -41,7 +41,7 @@ spring: #QSP url 하나시스개발 #https://121.168.9.37:8080 #QSP url interplug dev #http://1.248.227.176:8120 qsp: - url: http://1.248.227.176:8120 + 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