Browse Source

update configuration

shjung 3 days ago
parent
commit
440c98f2e5

+ 8 - 8
src/main/java/com/tsi/app/server/controller/TscSsipApiController.java

@@ -33,8 +33,8 @@ public class TscSsipApiController {
     @GetMapping(value = {SSIP_API_NODE_INFO}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> getNodeInfo(@PathVariable("apiToken") String apiToken, HttpServletRequest request) {
 
-        String apiId = SSIP_API_NODE_INFO;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = SSIP_API_NODE_INFO;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, apiToken);
 
         ApiInvokeVo apiInvokeVo = ApiInvokeVo.builder()
@@ -73,8 +73,8 @@ public class TscSsipApiController {
     @GetMapping(value = {SSIP_API_BROKER_INFO}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> getBrokerInfo(@PathVariable("apiToken") String apiToken, HttpServletRequest request) {
 
-        String apiId = SSIP_API_BROKER_INFO;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = SSIP_API_BROKER_INFO;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, apiToken);
 
         ApiInvokeVo apiInvokeVo = ApiInvokeVo.builder()
@@ -140,8 +140,8 @@ public class TscSsipApiController {
     @PostMapping(value = {SSIP_API_SYSTEM_STATUS}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> registerSystemStatus(@RequestBody SystemStatus status, HttpServletRequest request){
 
-        String apiId = SSIP_API_SYSTEM_STATUS;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = SSIP_API_SYSTEM_STATUS;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.debug("{}, {}, {}", apiId, remoteIP, status.toString());
 
         //명목메모리 사용률 = used / total = ( total - free ) / total
@@ -157,7 +157,7 @@ public class TscSsipApiController {
         //실질 여유 메모리 = 683728 ( = 83400 + 63516 + 536812 )
         try {
             // disk
-            log.debug("{}, {}", status.getTotalDisk(), status.getUsedDisk());
+//            log.debug("{}, {}", status.getTotalDisk(), status.getUsedDisk());
             if (status.getTotalDisk() > 0) {
                 double dblTotal = status.getTotalDisk();
                 double dblUsed = status.getUsedDisk();
@@ -166,7 +166,7 @@ public class TscSsipApiController {
                     status.setUseDiskRate(100);
                 }
                 status.setTotalDisk(status.getTotalDisk()/1024);    // KB => MB
-                log.debug("{}, {}", status.toString());
+//                log.debug("{}", status);
             }
             // swap
             float total;

+ 12 - 10
src/main/java/com/tsi/app/server/controller/TscSsipAppController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -65,8 +66,8 @@ public class TscSsipAppController {
     @GetMapping(value = {NAVI_NODE_STATUS}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> getNodeStatus(@PathVariable("deviceId") String deviceId, HttpServletRequest request) {
 
-        String apiId = NAVI_NODE_STATUS;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = NAVI_NODE_STATUS;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, deviceId);
 
         ApiInvokeVo apiInvokeVo = ApiInvokeVo.builder()
@@ -108,8 +109,8 @@ public class TscSsipAppController {
     @GetMapping(value = {NAVI_DEVICE_AUTH}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> getDeviceAuthInfo(@PathVariable("deviceId") String deviceId, HttpServletRequest request) {
 
-        String apiId = NAVI_DEVICE_AUTH;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = NAVI_DEVICE_AUTH;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, deviceId);
 
         ApiInvokeVo apiInvokeVo = ApiInvokeVo.builder()
@@ -148,14 +149,14 @@ public class TscSsipAppController {
 
         // 이력저장
         this.tscNaviApiService.insertInvokeHs(apiInvokeVo);
-        log.info("Auth: {}, {}", deviceId, result.toString());
+        log.info("Auth: {}, {}", deviceId, result);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
     @PostMapping(value = {NAVI_DEVICE_REGISTER}, produces = {"application/json; charset=utf8"})
     public ResponseEntity<AbstractTscSsipApiResult> registerDevice(@RequestBody DeviceInfo deviceInfo,  HttpServletRequest request){
-        String apiId = NAVI_DEVICE_REGISTER;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = NAVI_DEVICE_REGISTER;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, deviceInfo.toString());
 
         try {
@@ -173,12 +174,13 @@ public class TscSsipAppController {
 
     @GetMapping(value = {NAVI_DOWNLOADS})
     public ResponseEntity<Resource> download(@PathVariable("fileName") String fileName, HttpServletRequest request) {
-        String apiId = NAVI_DOWNLOADS;
-        String remoteIP = ApiUtils.getRemoteIP(request);
+        final String apiId = NAVI_DOWNLOADS;
+        final String remoteIP = ApiUtils.getRemoteIP(request);
         log.info("{}, {}, {}", apiId, remoteIP, fileName);
 
         try {
-            String separator = System.getProperty("file.separator");
+//            String separator = System.getProperty("file.separator");
+            String separator = FileSystems.getDefault().getSeparator();
             String fileFullName = System.getProperty("user.dir")+separator+"download"+separator+fileName;
             Path path = Paths.get(fileFullName);
             File file2Upload = path.toFile();