diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 0e57adbb..605caeef 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -15,21 +15,6 @@ spring: username: pvDBuser maximum-pool-size: 4 pool-name: Master-HikariPool - # datasource: - # master: - # 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 - # read: - # 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: Read-HikariPool jackson: time-zone: Asia/Seoul batch: diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index 1c3cd624..0f426c46 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -11,21 +11,6 @@ spring: 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: diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index aa010a73..078eabf1 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -19,22 +19,6 @@ spring: password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) maximum-pool-size: 4 pool-name: Master-HikariPool - # master: - # 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 - # # connection-test-query: SELECT 1 - # read: - # 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: Read-HikariPool - # connection-test-query: SELECT 2 jackson: time-zone: Asia/Seoul batch: @@ -68,6 +52,10 @@ management: health: enabled: true +batch: + job: + enabled: true + file: root.path: /home/development/public/files ini.root.path: /home/development/public/files/NewEstimate 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 @@