From ca8c239e8bfcc97ce2acb7f69d65d809da9c4b2f Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Fri, 7 Mar 2025 17:15:44 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EA=B2=BD=EB=A1=9C=20=EC=9A=B4=EC=98=81=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=20=EB=A7=9E=EC=B6=B0=EC=84=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-dev.yml | 6 ++--- src/main/resources/config/application-prd.yml | 6 ++--- src/main/resources/config/application.yml | 9 ++++++- src/main/resources/logback/logback-dev.xml | 4 +-- src/main/resources/logback/logback-prd.xml | 4 +-- .../qcast/QCastApplicationTests.java | 11 -------- .../biz/commCode/CommCodeServiceTest.java | 25 ------------------- .../qcast/config/jasypt/JasyptConfigTest.java | 15 ----------- 8 files changed, 18 insertions(+), 62 deletions(-) delete mode 100644 src/test/java/com/interplug/qcast/QCastApplicationTests.java delete mode 100644 src/test/java/com/interplug/qcast/biz/commCode/CommCodeServiceTest.java delete mode 100644 src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 8dce2487..6a08c7e1 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -55,7 +55,7 @@ qsp: estimate-sync-batch-url: /api/order/qcastQuotationSave #File file: - root.path: C:\\ - ini.root.path: C:\\NewEstimate + root.path: /home/development/public/files + ini.root.path: /home/development/public/files/NewEstimate ini.base.filename: 料金シミュレーション.ini - ini.drawing.img.path: C:\\NewEstimate\Drawing \ No newline at end of file + ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing \ No newline at end of file diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index eab1c789..7a9320ef 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -55,7 +55,7 @@ qsp: estimate-sync-batch-url: /api/order/qcastQuotationSave #File file: - root.path: C:\\ - ini.root.path: \\10.31.0.21\NewEstimate + root.path: /home/production/public/files + ini.root.path: /home/production/public/files/NewEstimate ini.base.filename: 料金シミュレーション.ini - ini.drawing.img.path: \\10.31.0.21\NewEstimate\Drawing \ No newline at end of file + ini.drawing.img.path: /home/production/public/files/NewEstimate/Drawing \ No newline at end of file diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index c3a4c1a8..97f5f812 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -10,7 +10,7 @@ spring: main: allow-circular-references: true profiles: - active: local + # active: local scheduler: Y datasource: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy @@ -61,6 +61,12 @@ management: health: enabled: true +file: + root.path: /home/development/public/files + ini.root.path: /home/development/public/files/NewEstimate + ini.base.filename: 料金シミュレーション.ini + ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing + # log logging: config: classpath:logback/logback-${spring.profiles.active:local}.xml @@ -68,3 +74,4 @@ logging: springdoc: swagger-ui: operations-sorter: alpha + diff --git a/src/main/resources/logback/logback-dev.xml b/src/main/resources/logback/logback-dev.xml index 93b1ae5a..0356cb1d 100644 --- a/src/main/resources/logback/logback-dev.xml +++ b/src/main/resources/logback/logback-dev.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"> - + @@ -33,7 +33,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/logback/logback-prd.xml b/src/main/resources/logback/logback-prd.xml index e0b969ee..0356cb1d 100644 --- a/src/main/resources/logback/logback-prd.xml +++ b/src/main/resources/logback/logback-prd.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"> - + @@ -33,7 +33,7 @@ - + \ No newline at end of file diff --git a/src/test/java/com/interplug/qcast/QCastApplicationTests.java b/src/test/java/com/interplug/qcast/QCastApplicationTests.java deleted file mode 100644 index 6be73a51..00000000 --- a/src/test/java/com/interplug/qcast/QCastApplicationTests.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.interplug.qcast; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class QCastApplicationTests { - - @Test - void contextLoads() {} -} diff --git a/src/test/java/com/interplug/qcast/biz/commCode/CommCodeServiceTest.java b/src/test/java/com/interplug/qcast/biz/commCode/CommCodeServiceTest.java deleted file mode 100644 index 7760c1fd..00000000 --- a/src/test/java/com/interplug/qcast/biz/commCode/CommCodeServiceTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.interplug.qcast.biz.commCode; - -import static org.junit.jupiter.api.Assertions.*; - -import com.interplug.qcast.biz.commCode.dto.CommCodeRes; -import java.util.List; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class CommCodeServiceTest { - - @Autowired - private CommCodeService commCodeService; - - @Test - void selectQcastCommCode() { - //given - List result = commCodeService.selectQcastCommCode(); - //when - //then - assertNotNull(result); - } -} diff --git a/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java b/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java deleted file mode 100644 index f7616c4c..00000000 --- a/src/test/java/com/interplug/qcast/config/jasypt/JasyptConfigTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.interplug.qcast.config.jasypt; - -import static org.junit.jupiter.api.Assertions.*; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; - -@Slf4j -class JasyptConfigTest { - @Test - void test() { - // log.info(JasyptConfig.encrypt("qcast1234!")); - log.info(JasyptConfig.encrypt("7Sf6@BDl@PSW")); - } -}