diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ba9e825..69fbc74 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/admin/src/main/java/com/example/action/screen/Mapping.java b/admin/src/main/java/com/example/action/screen/Mapping.java
index 6761881..cf63946 100644
--- a/admin/src/main/java/com/example/action/screen/Mapping.java
+++ b/admin/src/main/java/com/example/action/screen/Mapping.java
@@ -1,21 +1,23 @@
package com.example.action.screen;
import com.example.frame.base.Screen;
-import com.example.frame.utils.ProcessUtil;
import com.example.module.admin.ent.NginxCtrl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
public class Mapping extends Screen {
@Autowired
private NginxCtrl nginxCtrl;
+ @Value("${mapping.default.port}")
+ private String serverPort;
@Override
public void exec(Model model, HttpServletRequest request, HttpServletResponse response) {
model.addAttribute("run", nginxCtrl.isRunning() ? "true" : "false");
+ model.addAttribute("serverPort", serverPort);
}
}
diff --git a/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java b/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java
index 6043828..0444836 100644
--- a/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java
+++ b/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java
@@ -22,8 +22,8 @@ public class MappingUpdateRequest extends BaseUpdateRequest {
@NotNull(message = "主键不能为NULL")
private Long id;
- @NotNull(message = "服务Id不能为空")
- private Long serviceId;
+ @NotNull(message = "服务端口不能为空")
+ private String servicePort;
@NotNull(message = "映射名称不能为空")
private String name;
@@ -88,11 +88,11 @@ public class MappingUpdateRequest extends BaseUpdateRequest {
this.id = id;
}
- public Long getServiceId() {
- return serviceId;
+ public String getServicePort() {
+ return servicePort;
}
- public void setServiceId(Long serviceId) {
- this.serviceId = serviceId;
+ public void setServicePort(String servicePort) {
+ this.servicePort = servicePort;
}
}
diff --git a/admin/src/main/resources/application-prod.properties b/admin/src/main/resources/application-prod.properties
deleted file mode 100644
index 0a5e2d2..0000000
--- a/admin/src/main/resources/application-prod.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-# 生产环境
-server.service=80
-server.servlet.context-path=/
-spring.mvc.static-path-pattern=/static/**
-spring.resources.static-locations=classpath:static/
-spring.application.name=EXAMPLE-WEB
-spring.main.banner-mode=off
-spring.devtools.restart.enabled=false
-# 编码配置
-spring.http.encoding.force=true
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-server.tomcat.uri-encoding=UTF-8
-# 根路径、欢迎页
-web.welcome.page=/mapping.htm
-# 不需要验证授权, 或该请求有自己的验证机制
-web.url.auth.excluded=/favicon.ico,/static/**,/api,/login.htm
-# 日志配置
-logging.path=/root/
-logging.levels=INFO
-logging.config=classpath:logback-config.xml
-# jackson 相关配置
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-spring.jackson.default-property-inclusion=use_defaults
-spring.jackson.mapper.sort-properties-alphabetically=true
-spring.jackson.deserialization.fail-on-unknown-properties=false
-# freemarker
-spring.freemarker.enabled=true
-spring.freemarker.allow-request-override=false
-spring.freemarker.cache=true
-spring.freemarker.check-template-location=true
-spring.freemarker.charset=UTF-8
-spring.freemarker.content-type=text/html
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=false
-spring.freemarker.settings.template_update_delay=1
-spring.freemarker.settings.locale=zh_CN
-spring.freemarker.settings.datetime_format=yyyy-MM-dd HH:mm:ss
-spring.freemarker.settings.date_format=yyyy-MM-dd
-spring.freemarker.settings.number_format=#.##
-spring.freemarker.settings.classic_compatible=true
-spring.freemarker.settings.whitespace_stripping=true
-spring.freemarker.settings.url_escaping_charset=utf-8
-# 文件上传配置
-spring.servlet.multipart.resolveLazily=false
-spring.servlet.multipart.max-file-size=100MB
-spring.servlet.multipart.max-request-size=100MB
-dbpath=
-nginx-path=
\ No newline at end of file
diff --git a/admin/src/main/resources/application-dev.properties b/admin/src/main/resources/application.properties
similarity index 93%
rename from admin/src/main/resources/application-dev.properties
rename to admin/src/main/resources/application.properties
index 6e8516e..beb5296 100644
--- a/admin/src/main/resources/application-dev.properties
+++ b/admin/src/main/resources/application.properties
@@ -1,10 +1,10 @@
# 开发环境
-server.service=8080
+server.port=8888
server.servlet.context-path=/
spring.mvc.static-path-pattern=/static/**
spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
-spring.application.name=EXAMPLE-WEB
-spring.main.banner-mode=CONSOLE
+spring.application.name=nginx-admin
+spring.main.banner-mode=OFF
spring.devtools.restart.enabled=true
# 编码配置
spring.http.encoding.force=true
@@ -50,4 +50,5 @@ spring.servlet.multipart.max-request-size=100MB
dbpath=
nginx-path=
admin.username=admin
-admin.password=admin
\ No newline at end of file
+admin.password=admin
+mapping.default.port=8080
\ No newline at end of file
diff --git a/admin/src/main/resources/templates/nginx.conf.ftl b/admin/src/main/resources/templates/nginx.conf.ftl
index 5e3c8e1..6f874a7 100644
--- a/admin/src/main/resources/templates/nginx.conf.ftl
+++ b/admin/src/main/resources/templates/nginx.conf.ftl
@@ -31,7 +31,7 @@ http {
keepalive_timeout 65;
#gzip on;
-<#list services.keySet() as key>
+<#list services?keys as key>
server {
listen ${key};
diff --git a/admin/src/main/resources/templates/screen/mapping.ftl b/admin/src/main/resources/templates/screen/mapping.ftl
index 82954b9..2a3ccb0 100644
--- a/admin/src/main/resources/templates/screen/mapping.ftl
+++ b/admin/src/main/resources/templates/screen/mapping.ftl
@@ -35,7 +35,7 @@
-
+
新增
@@ -44,7 +44,11 @@
编辑
+ @click="onAction(['edit',scope.row])">编辑
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+ :
+
+
- http://host:{{form.servicePort}}
-
+
HTTP
FILE
-
+
+ 取 消
+ 保存
+