From 9a01ae9f61ad230c29baeb45683dfead4e296daa Mon Sep 17 00:00:00 2001 From: yjnoh Date: Wed, 4 Jun 2025 10:16:19 +0900 Subject: [PATCH 1/4] =?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 fc21756767239c3a87b07a30fde732b1f9ecc0f4 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Wed, 4 Jun 2025 10:19:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?profile=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=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 821ad1a8c76002eb17b425ec7eef662e2068dbd0 Mon Sep 17 00:00:00 2001 From: cha Date: Wed, 4 Jun 2025 10:30:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?format=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mappers/canvasStatus/canvasStatusMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml index 78539bc9..5ea76411 100644 --- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml +++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml @@ -7,9 +7,13 @@