From e610bd542afd3f8767c11c1ec556e1f7e2702d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EC=9B=90?= Date: Mon, 13 Jan 2020 19:59:47 +0900 Subject: [PATCH] update port 12345 update port 12345 --- .../system_monitor/Controller/MobileController.java | 4 ++-- .../system_monitor/Controller/PcController.java | 1 - .../com/hours22/system_monitor/DemoApplication.java | 13 ------------- .../src/main/resources/application.properties | 3 ++- 4 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 dev/Server/src/main/java/com/hours22/system_monitor/DemoApplication.java diff --git a/dev/Server/src/main/java/com/hours22/system_monitor/Controller/MobileController.java b/dev/Server/src/main/java/com/hours22/system_monitor/Controller/MobileController.java index fc70fc6..161e653 100644 --- a/dev/Server/src/main/java/com/hours22/system_monitor/Controller/MobileController.java +++ b/dev/Server/src/main/java/com/hours22/system_monitor/Controller/MobileController.java @@ -15,9 +15,9 @@ public class MobileController { @Autowired DataService dss; - @RequestMapping(value = "/", method = RequestMethod.GET) + @RequestMapping(value = "/phone", method = RequestMethod.GET) public void GetTotalPcData(HttpServletResponse response) throws IOException { - // 모든 PC의 JSON 데이터 GET + System.out.println("Input : <- Total GET method "); } } \ No newline at end of file diff --git a/dev/Server/src/main/java/com/hours22/system_monitor/Controller/PcController.java b/dev/Server/src/main/java/com/hours22/system_monitor/Controller/PcController.java index 6b81681..dd0f6c8 100644 --- a/dev/Server/src/main/java/com/hours22/system_monitor/Controller/PcController.java +++ b/dev/Server/src/main/java/com/hours22/system_monitor/Controller/PcController.java @@ -17,7 +17,6 @@ public class PcController { @RequestMapping(value = "/pc", method = RequestMethod.GET) public void GetPcData(HttpServletResponse response) throws IOException { - // PC의 JSON 데이터 GET // RedisLoad_JsonToObj(); // HttpResponse_ObjToJson(); System.out.println("Input : /pc <- GET method "); diff --git a/dev/Server/src/main/java/com/hours22/system_monitor/DemoApplication.java b/dev/Server/src/main/java/com/hours22/system_monitor/DemoApplication.java deleted file mode 100644 index db28fa1..0000000 --- a/dev/Server/src/main/java/com/hours22/system_monitor/DemoApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hours22.system_monitor; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - -} diff --git a/dev/Server/src/main/resources/application.properties b/dev/Server/src/main/resources/application.properties index 3ac687f..2932022 100644 --- a/dev/Server/src/main/resources/application.properties +++ b/dev/Server/src/main/resources/application.properties @@ -2,4 +2,5 @@ spring.redis.lettuce.pool.max-active=10 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.min-idle=2 spring.redis.port=6379 -spring.redis.host=127.0.0.1 \ No newline at end of file +spring.redis.host=127.0.0.1 +server.port = 12345 \ No newline at end of file