From a0f341dd710e0cefd9050fee203d33b80fe7733d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Tue, 16 May 2023 22:15:02 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EB=93=B1=EB=A1=9D/?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../httpmockserver/server/dto/ServerDTO.java | 16 +++- .../httpmockserver/server/entity/Server.java | 17 +++- .../server/mapper/ServerMapper.java | 2 + .../server/service/ServerMgmtService.java | 1 + .../templates/page/servers/serverEdit.html | 94 +++++++++++++++++++ 5 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/templates/page/servers/serverEdit.html diff --git a/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java b/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java index 7c7ce2b..56da69e 100644 --- a/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java +++ b/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java @@ -18,7 +18,9 @@ public class ServerDTO { @NotEmpty private String basePath = "/"; - private int port = 80; + private Integer port = 80; + + private boolean enabled = true; public Long getId() { return id; @@ -60,11 +62,19 @@ public class ServerDTO { this.basePath = basePath; } - public int getPort() { + public Integer getPort() { return port; } - public void setPort(int port) { + public void setPort(Integer port) { this.port = port; } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } } diff --git a/src/main/java/com/eactive/httpmockserver/server/entity/Server.java b/src/main/java/com/eactive/httpmockserver/server/entity/Server.java index 1a1a7d0..f3e3783 100644 --- a/src/main/java/com/eactive/httpmockserver/server/entity/Server.java +++ b/src/main/java/com/eactive/httpmockserver/server/entity/Server.java @@ -18,7 +18,10 @@ public class Server { private String basePath; - private int port; + private Integer port; + + @Column(name = "IS_ENABLED", columnDefinition = "boolean default true") + private boolean enabled; public Long getId() { return id; @@ -69,7 +72,15 @@ public class Server { } @Transient - public String getHostAddress() { - return scheme + "://" + hostname; + public String getFullHostAddress() { + return scheme + "://" + hostname + (port == null ? "" : ":" + port) + basePath; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; } } diff --git a/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java b/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java index f53a6f6..c52abf7 100644 --- a/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java +++ b/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java @@ -38,6 +38,7 @@ public class ServerMapper { dto.setPort(server.getPort()); dto.setScheme(server.getScheme()); dto.setBasePath(server.getBasePath()); + dto.setEnabled(server.isEnabled()); return dto; } @@ -54,6 +55,7 @@ public class ServerMapper { server.setPort(dto.getPort()); server.setScheme(dto.getScheme()); server.setBasePath(dto.getBasePath()); + server.setEnabled(dto.isEnabled()); return server; } diff --git a/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java b/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java index d512331..eaf4b95 100644 --- a/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java +++ b/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java @@ -38,6 +38,7 @@ public class ServerMgmtService { server.setHostname(updated.getHostname()); server.setBasePath(updated.getBasePath()); server.setPort(updated.getPort()); + server.setEnabled(updated.isEnabled()); serverRepository.save(server); diff --git a/src/main/resources/templates/page/servers/serverEdit.html b/src/main/resources/templates/page/servers/serverEdit.html new file mode 100644 index 0000000..2a68920 --- /dev/null +++ b/src/main/resources/templates/page/servers/serverEdit.html @@ -0,0 +1,94 @@ + + + +
+
+
+
+

서버 등록

+

서버 수정

+
+
+
+ + +
+ + + +
+
+
+
+
+ + +
+ :// +
+ + + +
+
+
+ : +
+ + + +
+
+
+
+ + + +
+
+
+
+
+ + +
+
+
+ +
+
+
+ + + + + \ No newline at end of file