From 0eaf8d3ec8afdd4627b0c897f35bb9bfcbbc3602 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 10:03:11 +0900 Subject: [PATCH 1/7] =?UTF-8?q?db=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-prd.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index f5c6888d..3a804700 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -4,24 +4,24 @@ 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: + # 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 + 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=true;trustServerCertificate=true + 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 @@ -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: http://121.168.9.37:8080 + url: https://jp.qsalesplatform.com master-store-batch-url: /api/master/storeAdditionalInfo master-material-batch-url: /api/master/materialList master-bom-batch-url: /api/master/bomList From e3b9b491fe9bb7a632c4658eb8287a5a53d4537f Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 10:12:12 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=9A=B4=EC=98=81=20DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-prd.yml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index 3a804700..4fb2ab2b 100644 --- a/src/main/resources/config/application-prd.yml +++ b/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://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true + username: pvDBuser + password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) + 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 From d662de9658a3865040ce4397b78e268a51170297 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 10:16:19 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=9A=B4=EC=98=81DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-prd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index 4fb2ab2b..1c3cd624 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -6,7 +6,7 @@ server: spring: datasource: 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 password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) maximum-pool-size: 4 @@ -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: http://121.168.9.37:8080 + url: https://jp.qsalesplatform.com master-store-batch-url: /api/master/storeAdditionalInfo master-material-batch-url: /api/master/materialList master-bom-batch-url: /api/master/bomList From 0b70838aa547e0ce6d1e3f00778c52e5cb434e06 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Wed, 4 Jun 2025 10:17:28 +0900 Subject: [PATCH 4/7] =?UTF-8?q?profile=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/MainController.java | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/MainController.java b/src/main/java/com/interplug/qcast/biz/MainController.java index 70bdec4b..377214fe 100644 --- a/src/main/java/com/interplug/qcast/biz/MainController.java +++ b/src/main/java/com/interplug/qcast/biz/MainController.java @@ -3,6 +3,7 @@ package com.interplug.qcast.biz; import com.interplug.qcast.config.message.Messages; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,11 +13,33 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/main") public class MainController { - @Autowired - Messages message; + @Autowired Messages message; + + @Value("${front.url}") + private String frontUrl; @GetMapping - public String Main() { - return message.getMessage("example.msg.001"); + public MainTestResponse Main() { + MainTestResponse response = + new MainTestResponse(message.getMessage("example.msg.001"), frontUrl); + return response; + } + + class MainTestResponse { + private String message; + private String frontUrl; + + public MainTestResponse(String message, String frontUrl) { + this.message = message; + this.frontUrl = frontUrl; + } + + public String getMessage() { + return message; + } + + public String getFrontUrl() { + return frontUrl; + } } } From d6cc4c81eac5ab474402b4ef001796dddd890306 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 15:40:34 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=9A=B4=EC=98=81=EA=B3=84=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=ED=8F=AC=ED=8A=B8=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback/logback-prd.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/logback/logback-prd.xml b/src/main/resources/logback/logback-prd.xml index 0356cb1d..25ff23f8 100644 --- a/src/main/resources/logback/logback-prd.xml +++ b/src/main/resources/logback/logback-prd.xml @@ -3,7 +3,8 @@ xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"> - + + From e9ca24c304b250f396d49d946a192340ed1c531d Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 15:58:08 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EC=9A=B4=EC=98=81=EA=B3=84=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=ED=8F=AC=ED=8A=B8=EB=B3=84=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback/logback-prd.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/logback/logback-prd.xml b/src/main/resources/logback/logback-prd.xml index 25ff23f8..f28431c4 100644 --- a/src/main/resources/logback/logback-prd.xml +++ b/src/main/resources/logback/logback-prd.xml @@ -3,8 +3,8 @@ xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"> - - + + From dc9652449080ea9e9f225b7cbe5ba00060dbe0fe Mon Sep 17 00:00:00 2001 From: cha Date: Tue, 10 Jun 2025 14:44:03 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[1090]=20=EB=B0=9C=EC=A0=84=EC=8B=9C?= =?UTF-8?q?=EB=AE=AC=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml index bdad080d..41c79768 100644 --- a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml +++ b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml @@ -15,7 +15,7 @@ , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_ID/* 풍속조건명 */ , B.PREF_ID /* 도도부현 */ , (SELECT PREF_NAME FROM M_PREFECTURE WHERE PREF_ID = B.PREF_ID ) AS PREF_NAME - , B1.AREA_ID /* 일사량 관측지점 */ + , (SELECT SIMULATION_NO FROM T_SIMULATION_AREA AS S WHERE S.AREA_ID = B1.AREA_ID) AS AREA_ID/* 일사량 관측지점 */ , (SELECT AREA_NAME FROM M_PREFECTURE_AREA WHERE AREA_ID = B1.AREA_ID ) AS AREA_NAME FROM T_PLAN A WITH (NOLOCK) INNER JOIN T_PLAN_INFO A1 WITH (NOLOCK)