diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 54b29d6a..c69977e4 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -64,7 +64,7 @@ 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 + ini.drawing.img.path: https://files.hanasys.jp/Drawing front: url: http://1.248.227.176:3000 diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index c61817bb..4523dc5c 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -43,7 +43,7 @@ spring: #QSP qsp: - url: http://localhost:8120 + url: http://1.248.227.176:8120 master-store-batch-url: /api/master/storeAdditionalInfo master-material-batch-url: /api/master/materialList master-bom-batch-url: /api/master/bomList diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index 872ce2db..4c806760 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -60,7 +60,7 @@ file: root.path: /home/production/public/files ini.root.path: /home/production/public/files/NewEstimate ini.base.filename: 料金シミュレーション.ini - ini.drawing.img.path: /home/production/public/files/NewEstimate/Drawing + ini.drawing.img.path: https://files.hanasys.jp/Drawing front: url: https://hanasys.jp diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 38548a80..aa010a73 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -72,7 +72,7 @@ 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 + ini.drawing.img.path: https://files.hanasys.jp/Drawing # log logging: diff --git a/src/main/resources/logback/logback-dev-interplug.xml b/src/main/resources/logback/logback-dev-interplug.xml new file mode 100644 index 00000000..9219eb3d --- /dev/null +++ b/src/main/resources/logback/logback-dev-interplug.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + ${CONSOLE_LOG_CHARSET} + + + + + ${LOG_FILE}${LOG_FILE_EXT} + + ${FILE_LOG_PATTERN} + ${FILE_LOG_CHARSET} + + + ${LOG_FILE}.%d{yyyy-MM-dd}${LOG_FILE_EXT} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 915915c3..1ac641cb 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -362,7 +362,12 @@