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
+  @Autowired Messages message;
-  Messages message;
+
+  @Value("${front.url}")
+  private String frontUrl;
 
   @GetMapping
-  public String Main() {
+  public MainTestResponse Main() {
-    return message.getMessage("example.msg.001");
+    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;
+    }
   }
 }

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:

src/main/resources/config/application-prd.yml

@@ -6,26 +6,11 @@ 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
     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 +28,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

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

src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml

@@ -7,9 +7,13 @@
   <select id="getCanvasStatusNewObjectNo" parameterType="string"
     resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
     /* sqlid : com.interplug.qcast.canvasStatus.getCanvasStatusNewObjectNo */
-    SELECT #{userId} + FORMAT(GETDATE(), 'yyMMdd') + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR (3)), 3) AS objectNo
+    SELECT #{userId} + RIGHT('0' + CAST(YEAR(GETDATE()) % 100 AS VARCHAR), 2) +
+      RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) +
+      RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2) + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR (3)), 3) AS objectNo
     FROM TB_CANVAS_STATUS
-    WHERE object_no LIKE #{userId} + FORMAT(GETDATE(), 'yyMMdd') + '%'
+    WHERE object_no LIKE #{userId} + RIGHT('0' + CAST(YEAR(GETDATE()) % 100 AS VARCHAR), 2) +
+      RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) +
+      RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2) + '%'
   </select>
 
   <select id="getCanvasStatusImageAdd" parameterType="string"