From c0017343e95e0807871a6f28f69209e7c3b64742 Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Tue, 15 Oct 2019 00:23:13 +0800
Subject: [PATCH] aaaa
---
.../com/example/action/AjaxController.java | 2 +-
.../admin/req/MappingUpdateRequest.java | 27 +++++++++++++----
.../main/resources/templates/nginx.conf.ftl | 11 +++----
.../resources/templates/screen/mapping.ftl | 30 ++++++++++++++-----
4 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/admin/src/main/java/com/example/action/AjaxController.java b/admin/src/main/java/com/example/action/AjaxController.java
index 3b808c7..6daa4aa 100644
--- a/admin/src/main/java/com/example/action/AjaxController.java
+++ b/admin/src/main/java/com/example/action/AjaxController.java
@@ -220,7 +220,7 @@ public class AjaxController {
PortLoadResponse portLoadResponse = (PortLoadResponse) loadPort("", LocalData.getSysToken());
context.put("services",portLoadResponse.getResult());
- Template template = freeMarkerConfigurer.getConfiguration().getTemplate("nginx.conf");
+ Template template = freeMarkerConfigurer.getConfiguration().getTemplate("nginx.conf.ftl");
wr = new OutputStreamWriter(new FileOutputStream(config), "UTF-8");
//写入
template.process(context, wr);
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 9ba5ee1..a1c0c77 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
@@ -1,8 +1,12 @@
package com.example.module.admin.req;
import com.example.frame.base.BaseUpdateRequest;
+
import javax.validation.constraints.NotNull;
+
import org.hibernate.validator.constraints.Length;
+import xyz.wbsite.wsqlite.anonation.TableField;
+
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
@@ -13,7 +17,7 @@ import javax.validation.constraints.Pattern;
* @version 0.0.1
* @since 2019-09-28
*/
-public class MappingUpdateRequest extends BaseUpdateRequest {
+public class MappingUpdateRequest extends BaseUpdateRequest {
/**
* 主键
@@ -36,7 +40,10 @@ public class MappingUpdateRequest extends BaseUpdateRequest {
@NotNull(message = "映射值不能为空")
@Pattern(regexp = "[^/]*", message = "映射值不能存在/")
@Pattern(regexp = "\\w*", message = "映射值需为英文")
- private String value;
+ private String context;
+
+ @TableField
+ private String location;
/**
* BZ - 备注
@@ -51,12 +58,20 @@ public class MappingUpdateRequest extends BaseUpdateRequest {
this.name = name;
}
- public String getValue() {
- return value;
+ public String getContext() {
+ return context;
+ }
+
+ public void setContext(String context) {
+ this.context = context;
+ }
+
+ public String getLocation() {
+ return location;
}
- public void setValue(String value) {
- this.value = value;
+ public void setLocation(String location) {
+ this.location = location;
}
public String getBz() {
diff --git a/admin/src/main/resources/templates/nginx.conf.ftl b/admin/src/main/resources/templates/nginx.conf.ftl
index 9e2b4e6..5cbbb6d 100644
--- a/admin/src/main/resources/templates/nginx.conf.ftl
+++ b/admin/src/main/resources/templates/nginx.conf.ftl
@@ -19,7 +19,6 @@ http {
default_type application/octet-stream;
sendfile on;
keepalive_timeout 65;
-
<#list services as item>
server {
@@ -30,13 +29,15 @@ http {
#access_log logs/host.access.log main;
-<#list services.mappingList as mapping>
- location /#{mapping.context} {
- proxy_pass http://#{location};
+<#list item.mappingList as mapping>
+ location /${mapping.context} {
+ proxy_pass ${mapping.location};
proxy_redirect off;
- proxy_set_header Host $host;
+ proxy_set_header Host $remote_addr:$server_port;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header request_uri $scheme://$remote_addr:$server_port$request_uri;
+ proxy_set_header proxy_context /${mapping.context};
client_max_body_size 50m;
client_body_buffer_size 128k;
proxy_connect_timeout 300;
diff --git a/admin/src/main/resources/templates/screen/mapping.ftl b/admin/src/main/resources/templates/screen/mapping.ftl
index 085644c..3afd5b9 100644
--- a/admin/src/main/resources/templates/screen/mapping.ftl
+++ b/admin/src/main/resources/templates/screen/mapping.ftl
@@ -69,14 +69,12 @@
-
+
:{{form.port}}/
-
- http://
-
+
+
+ {{ scope.row.name }}
+
+
+
+
0) {
nav.e(response.errors[0].message);
} else {
- nav.s("删除成功")
+ nav.s("删除成功");
this.onFind();
+ this.nginxReload();
}
}.bind(this))
}.bind(this)).catch(function (action) {