From 283c8592939f1e6460a4249b202188fab5a23294 Mon Sep 17 00:00:00 2001
From: "houcc.@qq.com" <woainiCN>
Date: Sun, 28 Nov 2021 21:15:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml            |  3 +-
 .../templates/adminPage/abort/index.html      |  4 +--
 .../templates/adminPage/admin/index.html      |  8 ++---
 .../templates/adminPage/bak/index.html        |  4 +--
 .../templates/adminPage/basic/index.html      |  4 +--
 .../templates/adminPage/cert/index.html       |  4 +--
 .../resources/templates/adminPage/common.html | 18 +++-------
 .../templates/adminPage/conf/index.html       | 12 +++----
 .../templates/adminPage/export/index.html     |  4 +--
 .../templates/adminPage/http/index.html       |  4 +--
 .../resources/templates/adminPage/index.html  |  2 +-
 .../templates/adminPage/log/index.html        |  4 +--
 .../templates/adminPage/log/tail.html         |  2 +-
 .../templates/adminPage/login/index.html      |  6 ++--
 .../resources/templates/adminPage/menu.html   | 34 +++++++++----------
 .../templates/adminPage/monitor/index.html    |  2 +-
 .../templates/adminPage/operatelog/index.html | 10 +++---
 .../templates/adminPage/password/index.html   |  4 +--
 .../templates/adminPage/remote/index.html     |  4 +--
 .../resources/templates/adminPage/script.html | 12 +++----
 .../templates/adminPage/select_mail.html      |  2 +-
 .../templates/adminPage/select_preview.html   |  2 +-
 .../templates/adminPage/select_root.html      |  2 +-
 .../templates/adminPage/select_template.html  |  2 +-
 .../templates/adminPage/server/index.html     |  4 +--
 .../templates/adminPage/stream/index.html     |  4 +--
 .../templates/adminPage/template/index.html   |  4 +--
 .../templates/adminPage/upstream/index.html   |  4 +--
 .../templates/adminPage/www/index.html        |  4 +--
 29 files changed, 83 insertions(+), 90 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 35b6ac12..1cb0fd90 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,7 @@
 server:
   port: 8080
-  servlet: 
+  servlet:
+    context-path: /admin/
     session:
       timeout: 7200 
   tomcat:
diff --git a/src/main/resources/templates/adminPage/abort/index.html b/src/main/resources/templates/adminPage/abort/index.html
index e86aa9d8..a5a22258 100644
--- a/src/main/resources/templates/adminPage/abort/index.html
+++ b/src/main/resources/templates/adminPage/abort/index.html
@@ -27,7 +27,7 @@ h3{
 				<div class="layui-form-item">
 					<h3>${aboutStr.donation}</h3>
 					<h3>
-						<img style="width: 200px;" src="${ctx}/img/weixin.png">
+						<img style="width: 200px;" src="${request.contextPath}/img/weixin.png">
 					</h3>
 					<h3>${aboutStr.author}</h3>
 					<h3>${aboutStr.email}</h3>
@@ -45,7 +45,7 @@ h3{
 
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/abort/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/abort/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/admin/index.html b/src/main/resources/templates/adminPage/admin/index.html
index 600d58f3..b524a396 100644
--- a/src/main/resources/templates/adminPage/admin/index.html
+++ b/src/main/resources/templates/adminPage/admin/index.html
@@ -26,7 +26,7 @@
 					<legend>${menuStr.admin}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/admin" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/admin" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${adminStr.add}</button>
@@ -177,7 +177,7 @@
 			<div class="layui-row">
 				<div class="layui-col-md6">
 					<div style="text-align: center;">
-						<img id="androidImg" style="width: 200px;height: 200px;" src="${ctx}/adminPage/admin/qr?url=https://www.wandoujia.com/apps/8092183">
+						<img id="androidImg" style="width: 200px;height: 200px;" src="${request.contextPath}/adminPage/admin/qr?url=https://www.wandoujia.com/apps/8092183">
 					</div>
 					<div style="text-align: center;font-size: 16px;margin-top: 10px;">
 						${adminStr.android}
@@ -185,7 +185,7 @@
 				</div>
 				<div class="layui-col-md6">
 					<div style="text-align: center;">
-						<img id="iosImg" style="width: 200px;height: 200px;" src="${ctx}/adminPage/admin/qr?url=https://apps.apple.com/cn/app/google-authenticator/id388497605">
+						<img id="iosImg" style="width: 200px;height: 200px;" src="${request.contextPath}/adminPage/admin/qr?url=https://apps.apple.com/cn/app/google-authenticator/id388497605">
 					</div>
 					<div style="text-align: center;font-size: 16px;margin-top: 10px;">
 						${adminStr.ios}
@@ -197,7 +197,7 @@
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/admin/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/admin/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/bak/index.html b/src/main/resources/templates/adminPage/bak/index.html
index 59a029e7..c18acca0 100644
--- a/src/main/resources/templates/adminPage/bak/index.html
+++ b/src/main/resources/templates/adminPage/bak/index.html
@@ -7,7 +7,7 @@
 <body>
 		<!-- 内容主体区域 -->
 		<div style="padding: 15px">
-			<form action="${ctx}/adminPage/bak" id="searchForm" method="post">
+			<form action="${request.contextPath}/adminPage/bak" id="searchForm" method="post">
 				<div class="layui-inline">
 					<button type="button" class="layui-btn layui-btn-danger" onclick="delAll()">${bakStr.clear}</button>
 				</div>
@@ -43,7 +43,7 @@
 
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_preview.html'/>
-	<script src="${ctx}/js/adminPage/bak/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/bak/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/basic/index.html b/src/main/resources/templates/adminPage/basic/index.html
index 787b18d2..92195ace 100644
--- a/src/main/resources/templates/adminPage/basic/index.html
+++ b/src/main/resources/templates/adminPage/basic/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.basic}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/basic" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/basic" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${basicStr.add}</button> 
@@ -84,7 +84,7 @@
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/basic/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/basic/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/cert/index.html b/src/main/resources/templates/adminPage/cert/index.html
index 8ea5aee4..d2b14876 100644
--- a/src/main/resources/templates/adminPage/cert/index.html
+++ b/src/main/resources/templates/adminPage/cert/index.html
@@ -30,7 +30,7 @@
 					<legend>${menuStr.cert}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/cert" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/cert" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal"
@@ -328,7 +328,7 @@
 
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/js/adminPage/cert/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/cert/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/common.html b/src/main/resources/templates/adminPage/common.html
index 9add908a..7e42ca2c 100644
--- a/src/main/resources/templates/adminPage/common.html
+++ b/src/main/resources/templates/adminPage/common.html
@@ -8,11 +8,11 @@
 <meta name="force-rendering" content="webkit" />
 <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
 
-<link rel="shortcut icon" href="${ctx}/img/favicon.ico" type="image/x-icon">
+<link rel="shortcut icon" href="${request.contextPath}/img/favicon.ico" type="image/x-icon">
 
-<link href="${ctx}/lib/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet">
-<link href="${ctx}/lib/layui/css/layui.css" rel="stylesheet" />
-<link href="${ctx}/css/adminPage/base.css" rel="stylesheet" />
+<link href="${request.contextPath}/lib/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet">
+<link href="${request.contextPath}/lib/layui/css/layui.css" rel="stylesheet" />
+<link href="${request.contextPath}/css/adminPage/base.css" rel="stylesheet" />
 
 <script>
 	//国际化
@@ -23,14 +23,6 @@
 	<#list messages as message>
 	${message.key} = "${message.value}";
 	</#list>
-	
-	// 这是用来看项目使用情况的, 不要删
-	var _hmt = _hmt || [];
-	(function() {
-		var hm = document.createElement("script");
-		hm.src = "https://hm.baidu.com/hm.js?8acef669ea66f479854ecd328d1f348f";
-		var s = document.getElementsByTagName("script")[0];
-		s.parentNode.insertBefore(hm, s);
-	})();
+
 	
 </script>
diff --git a/src/main/resources/templates/adminPage/conf/index.html b/src/main/resources/templates/adminPage/conf/index.html
index ea578ed1..2a764974 100644
--- a/src/main/resources/templates/adminPage/conf/index.html
+++ b/src/main/resources/templates/adminPage/conf/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <#include "/adminPage/common.html"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/lib/jsdifflib/diffview.css" />
+<link rel="stylesheet" type="text/css" href="${request.contextPath}/lib/jsdifflib/diffview.css" />
 <style type="text/css">
 .name {
 	padding: 10px;
@@ -185,11 +185,11 @@ input[type='radio']{
 
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/lib/auto-line-number/auto-line-number.js" type="text/javascript"></script>
-	<script src="${ctx}/lib/jsdifflib/difflib.js" type="text/javascript"></script>
-	<script src="${ctx}/lib/jsdifflib/diffview.js" type="text/javascript"></script>
-	<script src="${ctx}/lib/base64/base64.js" type="text/javascript"></script>
-	<script src="${ctx}/js/adminPage/conf/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/auto-line-number/auto-line-number.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/jsdifflib/difflib.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/jsdifflib/diffview.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/base64/base64.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/conf/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/export/index.html b/src/main/resources/templates/adminPage/export/index.html
index a906118c..a98ff91f 100644
--- a/src/main/resources/templates/adminPage/export/index.html
+++ b/src/main/resources/templates/adminPage/export/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.export}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/admin" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/admin" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" id="dataExport" class="layui-btn" onclick="dExport()">${exportStr.dExport}</button>
@@ -43,7 +43,7 @@
 
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/export/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/export/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/http/index.html b/src/main/resources/templates/adminPage/http/index.html
index 11565f6a..0e5a5c17 100644
--- a/src/main/resources/templates/adminPage/http/index.html
+++ b/src/main/resources/templates/adminPage/http/index.html
@@ -30,7 +30,7 @@ input[name='param']{
 					<legend>${menuStr.http}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/http" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/http" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${httpStr.add}</button>
@@ -229,7 +229,7 @@ input[name='param']{
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_preview.html'/>
 	<#include '/adminPage/select_template.html'/>
-	<script src="${ctx}/js/adminPage/http/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/http/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/index.html b/src/main/resources/templates/adminPage/index.html
index 1ee28b0d..b7e0d74f 100644
--- a/src/main/resources/templates/adminPage/index.html
+++ b/src/main/resources/templates/adminPage/index.html
@@ -7,7 +7,7 @@
 
 </body>
 <script type="text/javascript">
-	location.href = '/adminPage/login';
+	location.href = '${request.contextPath}/adminPage/login';
 </script>
 
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/adminPage/log/index.html b/src/main/resources/templates/adminPage/log/index.html
index 18e61b7d..4988a4b3 100644
--- a/src/main/resources/templates/adminPage/log/index.html
+++ b/src/main/resources/templates/adminPage/log/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.log}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/log" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/log" id="searchForm" method="post">
 					<div class="layui-inline">
 						<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${logStr.add}</button>
 					</div>
@@ -82,7 +82,7 @@
 	</div>
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/js/adminPage/log/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/log/index.js?v=${jsrandom}" type="text/javascript"></script>
 	
 	
 </body>
diff --git a/src/main/resources/templates/adminPage/log/tail.html b/src/main/resources/templates/adminPage/log/tail.html
index b6dcf791..ac1b7186 100644
--- a/src/main/resources/templates/adminPage/log/tail.html
+++ b/src/main/resources/templates/adminPage/log/tail.html
@@ -15,7 +15,7 @@
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/lib/base64/base64.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/base64/base64.js" type="text/javascript"></script>
 	
 	<script>
 		var run = true;
diff --git a/src/main/resources/templates/adminPage/login/index.html b/src/main/resources/templates/adminPage/login/index.html
index a89c0b44..44412c39 100644
--- a/src/main/resources/templates/adminPage/login/index.html
+++ b/src/main/resources/templates/adminPage/login/index.html
@@ -9,7 +9,7 @@
 
 </style>
 </head>
-<body style="background-image: url('${ctx}/img/background.svg'); background-size: cover;">
+<body style="background-image: url('${request.contextPath}/img/background.svg'); background-size: cover;">
 	<div style="height: 0px; width: 0px; overflow: hidden;">
 		<!-- 弹出框 -->
 		<div class="layui-form" id="windowDiv" style="padding: 15px; display: none;">
@@ -31,7 +31,7 @@
 				<div class="layui-form-item">
 					<label class="layui-form-label">${loginStr.code}</label>
 					<div class="layui-input-inline" style="width: 240px;">
-						<input type="text" name="code" id="code" class="layui-input" style="width: 100px; display: inline-block;" onkeyup="getKey()"> <img src="${ctx}/adminPage/login/getCode?t=${jsrandom}"
+						<input type="text" name="code" id="code" class="layui-input" style="width: 100px; display: inline-block;" onkeyup="getKey()"> <img src="${request.contextPath}/adminPage/login/getCode?t=${jsrandom}"
 							id="codeImg" onclick="refreshCode('codeImg')">
 					</div>
 				</div>
@@ -99,6 +99,6 @@
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/login/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/login/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/adminPage/menu.html b/src/main/resources/templates/adminPage/menu.html
index a1a7db8a..49cc1a99 100644
--- a/src/main/resources/templates/adminPage/menu.html
+++ b/src/main/resources/templates/adminPage/menu.html
@@ -10,52 +10,52 @@
 				</a>
 				<dl class="layui-nav-child">
 					<dd style="border-bottom: 1px solid #555;">
-						<a href="${ctx}/adminPage/monitor">${menuStr.monitor}</a>
+						<a href="${request.contextPath}/adminPage/monitor">${menuStr.monitor}</a>
 					</dd>
 					
 					
 					<dd>
-						<a href="${ctx}/adminPage/basic">${menuStr.basic}</a>
+						<a href="${request.contextPath}/adminPage/basic">${menuStr.basic}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/http">${menuStr.http}</a>
+						<a href="${request.contextPath}/adminPage/http">${menuStr.http}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/stream">${menuStr.stream}</a>
+						<a href="${request.contextPath}/adminPage/stream">${menuStr.stream}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/server">${menuStr.server}</a>
+						<a href="${request.contextPath}/adminPage/server">${menuStr.server}</a>
 					</dd>
 					<dd style="border-bottom: 1px solid #555;">
-						<a href="${ctx}/adminPage/upstream">${menuStr.upstream}</a>
+						<a href="${request.contextPath}/adminPage/upstream">${menuStr.upstream}</a>
 					</dd>
 					
 					
 					<dd>
-						<a href="${ctx}/adminPage/conf">${menuStr.conf}</a>
+						<a href="${request.contextPath}/adminPage/conf">${menuStr.conf}</a>
 					</dd>
 					
 					<dd>
-						<a href="${ctx}/adminPage/template">${menuStr.template}</a>
+						<a href="${request.contextPath}/adminPage/template">${menuStr.template}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/www">${menuStr.www}</a>
+						<a href="${request.contextPath}/adminPage/www">${menuStr.www}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/password">${menuStr.password}</a>
+						<a href="${request.contextPath}/adminPage/password">${menuStr.password}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/cert">${menuStr.cert}</a>
+						<a href="${request.contextPath}/adminPage/cert">${menuStr.cert}</a>
 					</dd>
 					
 					<dd>
-						<a href="${ctx}/adminPage/log">${menuStr.log}</a>
+						<a href="${request.contextPath}/adminPage/log">${menuStr.log}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/operateLog">${menuStr.operateLog}</a>
+						<a href="${request.contextPath}/adminPage/operateLog">${menuStr.operateLog}</a>
 					</dd>
 					<dd>
-						<a href="${ctx}/adminPage/export">${menuStr.export}</a>
+						<a href="${request.contextPath}/adminPage/export">${menuStr.export}</a>
 					</dd>
 					
 					
@@ -68,16 +68,16 @@
 				</a>
 				<dl class="layui-nav-child">
 					<dd>
-						<a href="${ctx}/adminPage/remote">${menuStr.remote}</a>
+						<a href="${request.contextPath}/adminPage/remote">${menuStr.remote}</a>
 					</dd>
 					<#if admin.type == 0 || showAdmin == 'true'>
 						<dd>
-							<a href="${ctx}/adminPage/admin">${menuStr.admin}</a>
+							<a href="${request.contextPath}/adminPage/admin">${menuStr.admin}</a>
 						</dd>
 					</#if>
 			
 					<dd>
-						<a href="${ctx}/adminPage/abort">${menuStr.abort}</a>
+						<a href="${request.contextPath}/adminPage/abort">${menuStr.abort}</a>
 					</dd>
 				</dl>
 			</li>
diff --git a/src/main/resources/templates/adminPage/monitor/index.html b/src/main/resources/templates/adminPage/monitor/index.html
index 234fb9c7..9d384cb1 100644
--- a/src/main/resources/templates/adminPage/monitor/index.html
+++ b/src/main/resources/templates/adminPage/monitor/index.html
@@ -140,7 +140,7 @@
 
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/js/adminPage/monitor/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/monitor/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/operatelog/index.html b/src/main/resources/templates/adminPage/operatelog/index.html
index 5c3abf68..0bec74c3 100644
--- a/src/main/resources/templates/adminPage/operatelog/index.html
+++ b/src/main/resources/templates/adminPage/operatelog/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <#include "/adminPage/common.html"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/lib/jsdifflib/diffview.css" />
+<link rel="stylesheet" type="text/css" href="${request.contextPath}/lib/jsdifflib/diffview.css" />
 <style type="text/css">
 
 table.diff {
@@ -24,7 +24,7 @@ table.diff {
 					<legend>${menuStr.operateLog}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/operateLog" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/operateLog" id="searchForm" method="post">
 
 					<input type="hidden" name="curr" value="${page.curr}">
 					<input type="hidden" name="limit" value="${page.limit}">
@@ -63,9 +63,9 @@ table.diff {
 	
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/lib/jsdifflib/difflib.js" type="text/javascript"></script>
-	<script src="${ctx}/lib/jsdifflib/diffview.js" type="text/javascript"></script>
-	<script src="${ctx}/js/adminPage/operateLog/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/jsdifflib/difflib.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/lib/jsdifflib/diffview.js" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/operateLog/index.js?v=${jsrandom}" type="text/javascript"></script>
 	
 </body>
 
diff --git a/src/main/resources/templates/adminPage/password/index.html b/src/main/resources/templates/adminPage/password/index.html
index 850ce88f..8c0f02e0 100644
--- a/src/main/resources/templates/adminPage/password/index.html
+++ b/src/main/resources/templates/adminPage/password/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.password}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/password" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/password" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${commonStr.add}</button>
@@ -94,7 +94,7 @@
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/password/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/password/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/remote/index.html b/src/main/resources/templates/adminPage/remote/index.html
index ef28d1ec..29fb8da0 100644
--- a/src/main/resources/templates/adminPage/remote/index.html
+++ b/src/main/resources/templates/adminPage/remote/index.html
@@ -24,7 +24,7 @@
 					<legend>${menuStr.remote}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/remote" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/remote" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<#if admin.type==0>
@@ -302,7 +302,7 @@
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_mail.html'/>
 	<#include '/adminPage/select_preview.html'/>
-	<script src="${ctx}/js/adminPage/remote/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/remote/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/script.html b/src/main/resources/templates/adminPage/script.html
index 1c15bcd2..80b5c8b0 100644
--- a/src/main/resources/templates/adminPage/script.html
+++ b/src/main/resources/templates/adminPage/script.html
@@ -1,14 +1,14 @@
 
-<script src="${ctx}/lib/layui/layui.js" type="text/javascript"></script>
+<script src="${request.contextPath}/lib/layui/layui.js" type="text/javascript"></script>
 
-<script src="${ctx}/js/adminPage/base.js?v=${jsrandom}" type="text/javascript"></script>
-<script src="${ctx}/lib/ztree/js/jquery.ztree.core.js" type="text/javascript"></script>
-<script src="${ctx}/lib/ztree/js/jquery.ztree.excheck.js" type="text/javascript"></script>
+<script src="${request.contextPath}/js/adminPage/base.js?v=${jsrandom}" type="text/javascript"></script>
+<script src="${request.contextPath}/lib/ztree/js/jquery.ztree.core.js" type="text/javascript"></script>
+<script src="${request.contextPath}/lib/ztree/js/jquery.ztree.excheck.js" type="text/javascript"></script>
 
-<script src="${ctx}/lib/echarts/echarts.min.js" type="text/javascript"></script>
+<script src="${request.contextPath}/lib/echarts/echarts.min.js" type="text/javascript"></script>
 <script>
 	//根路径
-	var ctx = '${ctx}/';
+	var ctx = '${request.contextPath}/';
 
 	// 翻页参数
 	var page = {
diff --git a/src/main/resources/templates/adminPage/select_mail.html b/src/main/resources/templates/adminPage/select_mail.html
index de18cb94..0381e114 100644
--- a/src/main/resources/templates/adminPage/select_mail.html
+++ b/src/main/resources/templates/adminPage/select_mail.html
@@ -1,6 +1,6 @@
 
 
-<script src="${ctx}/js/adminPage/select_mail.js?v=${jsrandom}" type="text/javascript"></script>
+<script src="${request.contextPath}/js/adminPage/select_mail.js?v=${jsrandom}" type="text/javascript"></script>
 <div style="height: 0px; width: 0px; overflow: hidden;">
 	<!-- 弹出框 -->
 	<div class="layui-form" id="mailSelectDiv" style="padding: 15px; display: none">
diff --git a/src/main/resources/templates/adminPage/select_preview.html b/src/main/resources/templates/adminPage/select_preview.html
index 74a4ac00..9bf95f8f 100644
--- a/src/main/resources/templates/adminPage/select_preview.html
+++ b/src/main/resources/templates/adminPage/select_preview.html
@@ -1,6 +1,6 @@
 
 
-<script src="${ctx}/js/adminPage/select_preview.js?v=${jsrandom}" type="text/javascript"></script>
+<script src="${request.contextPath}/js/adminPage/select_preview.js?v=${jsrandom}" type="text/javascript"></script>
 <div style="height: 0px; width: 0px; overflow: hidden;">
 	<!-- 弹出框 -->
 	<div class="layui-form" id="previewDiv" style="padding: 15px; display: none">
diff --git a/src/main/resources/templates/adminPage/select_root.html b/src/main/resources/templates/adminPage/select_root.html
index db8205b0..b902afe7 100644
--- a/src/main/resources/templates/adminPage/select_root.html
+++ b/src/main/resources/templates/adminPage/select_root.html
@@ -1,6 +1,6 @@
 
 
-<script src="${ctx}/js/adminPage/select_root.js?v=${jsrandom}" type="text/javascript"></script>
+<script src="${request.contextPath}/js/adminPage/select_root.js?v=${jsrandom}" type="text/javascript"></script>
 <div style="height: 0px; width: 0px; overflow: hidden;">
 	<!-- 弹出框 -->
 	<div class="layui-form" id="rootSelectDiv" style="padding: 15px; display: none">
diff --git a/src/main/resources/templates/adminPage/select_template.html b/src/main/resources/templates/adminPage/select_template.html
index 48466b5d..f8694a30 100644
--- a/src/main/resources/templates/adminPage/select_template.html
+++ b/src/main/resources/templates/adminPage/select_template.html
@@ -1,6 +1,6 @@
 
 
-<script src="${ctx}/js/adminPage/select_template.js?v=${jsrandom}" type="text/javascript"></script>
+<script src="${request.contextPath}/js/adminPage/select_template.js?v=${jsrandom}" type="text/javascript"></script>
 <div style="height: 0px; width: 0px; overflow: hidden;">
 	<!-- 弹出框 -->
 	<div class="layui-form" id="templateSelectDiv" style="padding: 15px; display: none">
diff --git a/src/main/resources/templates/adminPage/server/index.html b/src/main/resources/templates/adminPage/server/index.html
index 835dfd7d..a058052a 100644
--- a/src/main/resources/templates/adminPage/server/index.html
+++ b/src/main/resources/templates/adminPage/server/index.html
@@ -94,7 +94,7 @@
 					<legend>${menuStr.server}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/server" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/server" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${serverStr.add}</button>
@@ -532,7 +532,7 @@
 	<#include '/adminPage/select_root.html'/>
 	<#include '/adminPage/select_template.html'/>
 	<#include '/adminPage/select_preview.html'/>
-	<script src="${ctx}/js/adminPage/server/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/server/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/stream/index.html b/src/main/resources/templates/adminPage/stream/index.html
index 447d3d1d..2c58f517 100644
--- a/src/main/resources/templates/adminPage/stream/index.html
+++ b/src/main/resources/templates/adminPage/stream/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.stream}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/stream" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/stream" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${stream.add}</button> 
@@ -90,7 +90,7 @@
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_preview.html'/>
 	<#include '/adminPage/select_template.html'/>
-	<script src="${ctx}/js/adminPage/stream/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/stream/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/template/index.html b/src/main/resources/templates/adminPage/template/index.html
index c0e0aded..3faa9cd7 100644
--- a/src/main/resources/templates/adminPage/template/index.html
+++ b/src/main/resources/templates/adminPage/template/index.html
@@ -30,7 +30,7 @@ input[name='param']{
 					<legend>${menuStr.template}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/template" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/template" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${templateStr.add}</button>
@@ -130,7 +130,7 @@ input[name='param']{
 	</div>
 
 	<#include '/adminPage/script.html'/>
-	<script src="${ctx}/js/adminPage/template/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/template/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/upstream/index.html b/src/main/resources/templates/adminPage/upstream/index.html
index c0a0d68d..fe4cdec2 100644
--- a/src/main/resources/templates/adminPage/upstream/index.html
+++ b/src/main/resources/templates/adminPage/upstream/index.html
@@ -58,7 +58,7 @@
 					<legend>${menuStr.upstream}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/upstream" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/upstream" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${upstreamStr.add}</button>
@@ -306,7 +306,7 @@
 	<#include '/adminPage/select_mail.html'/>
 	<#include '/adminPage/select_template.html'/>
 	<#include '/adminPage/select_preview.html'/>
-	<script src="${ctx}/js/adminPage/upstream/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/upstream/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
diff --git a/src/main/resources/templates/adminPage/www/index.html b/src/main/resources/templates/adminPage/www/index.html
index 18e4647a..9a6e474f 100644
--- a/src/main/resources/templates/adminPage/www/index.html
+++ b/src/main/resources/templates/adminPage/www/index.html
@@ -17,7 +17,7 @@
 					<legend>${menuStr.www}</legend>
 				</fieldset>
 
-				<form action="${ctx}/adminPage/www" id="searchForm" method="post">
+				<form action="${request.contextPath}/adminPage/www" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal" onclick="add()">${wwwStr.add}</button>
@@ -98,7 +98,7 @@
 
 	<#include '/adminPage/script.html'/>
 	<#include '/adminPage/select_root.html'/>
-	<script src="${ctx}/js/adminPage/www/index.js?v=${jsrandom}" type="text/javascript"></script>
+	<script src="${request.contextPath}/js/adminPage/www/index.js?v=${jsrandom}" type="text/javascript"></script>
 </body>
 
 
-- 
Gitee


From 220477516777ec49cb0b9906da471327aef7baf2 Mon Sep 17 00:00:00 2001
From: liuyaowen <liuyaowen@fsfund.com>
Date: Mon, 29 Nov 2021 10:28:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/cym/NginxWebUI.java         |    5 +-
 .../adminPage/RemoteController.java           | 1105 +++++++++--------
 .../java/com/cym/service/RemoteService.java   |    4 +-
 src/main/resources/application.yml            |   18 +-
 .../static/js/adminPage/remote/index.js       |  144 +--
 5 files changed, 641 insertions(+), 635 deletions(-)

diff --git a/src/main/java/com/cym/NginxWebUI.java b/src/main/java/com/cym/NginxWebUI.java
index 8b99968a..6a5f771f 100644
--- a/src/main/java/com/cym/NginxWebUI.java
+++ b/src/main/java/com/cym/NginxWebUI.java
@@ -33,11 +33,14 @@ public class NginxWebUI {
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
-		
+
 		// 启动springboot
 		SpringApplication.run(NginxWebUI.class, args);
+
+		logger.info("启动成功");
 	}
 
+
 	public static void killSelf() {
 		RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
 		String myPid = runtimeMXBean.getName().split("@")[0];
diff --git a/src/main/java/com/cym/controller/adminPage/RemoteController.java b/src/main/java/com/cym/controller/adminPage/RemoteController.java
index c25752ed..c6d6e259 100644
--- a/src/main/java/com/cym/controller/adminPage/RemoteController.java
+++ b/src/main/java/com/cym/controller/adminPage/RemoteController.java
@@ -48,559 +48,562 @@ import cn.hutool.json.JSONUtil;
 @Controller
 @RequestMapping("/adminPage/remote")
 public class RemoteController extends BaseController {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	@Autowired
-	RemoteService remoteService;
-	@Autowired
-	SettingService settingService;
-	@Autowired
-	ConfService confService;
-	@Autowired
-	GroupService groupService;
-	@Autowired
-	ConfController confController;
-	@Autowired
-	MainController mainController;
-	@Autowired
-	NginxApiController nginxApiController;
-
-	@Value("${project.version}")
-	String projectVersion;
-	@Value("${server.port}")
-	Integer port;
-
-	@RequestMapping("version")
-	@ResponseBody
-	public Map<String, Object> version() {
-		Map<String, Object> map = new HashMap<>();
-		map.put("version", projectVersion);
-
-		if (NginxUtils.isRun()) {
-			map.put("nginx", 1);
-		} else {
-			map.put("nginx", 0);
-		}
-
-		return map;
-	}
-
-	@RequestMapping("")
-	public ModelAndView index(ModelAndView modelAndView, HttpSession httpSession) {
-
-		JsonResult<List<String>> jsonResult = nginxApiController.getNginxStartCmd();
-		modelAndView.addObject("startCmds", jsonResult.getObj());
-
-		jsonResult = nginxApiController.getNginxStopCmd();
-		modelAndView.addObject("stopCmds", jsonResult.getObj());
-
-		modelAndView.addObject("projectVersion", projectVersion);
-		modelAndView.setViewName("/adminPage/remote/index");
-
-		return modelAndView;
-	}
-
-	@RequestMapping("allTable")
-	@ResponseBody
-	public List<Remote> allTable(HttpServletRequest request) {
-		Admin admin = getAdmin(request);
-		List<Remote> remoteList = sqlHelper.findAll(Remote.class);
-
-		for (Remote remote : remoteList) {
-			remote.setStatus(0);
-			remote.setType(0);
-			if (remote.getParentId() == null) {
-				remote.setParentId("");
-			}
-
-			try {
-				String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
-				if (StrUtil.isNotEmpty(json)) {
-					Map<String, Object> map = JSONUtil.toBean(json, new TypeReference<Map<String, Object>>() {
-					}.getType(), false);
-
-					remote.setStatus(1);
-					remote.setVersion((String) map.get("version"));
-					remote.setNginx((Integer) map.get("nginx"));
-				}
-			} catch (Exception e) {
-				logger.error(e.getMessage(), e);
-			}
-
-		}
-
-		Remote remoteLocal = new Remote();
-		remoteLocal.setId("local");
-		remoteLocal.setIp("");
-		remoteLocal.setProtocol("");
-		remoteLocal.setParentId("");
-		remoteLocal.setDescr(m.get("remoteStr.local"));
-		Map<String, Object> map = version();
-		remoteLocal.setVersion((String) map.get("version"));
-		remoteLocal.setNginx((Integer) map.get("nginx"));
-		remoteLocal.setPort(port);
-		remoteLocal.setStatus(1);
-		remoteLocal.setType(0);
-		remoteLocal.setMonitor(settingService.get("monitorLocal") != null ? Integer.parseInt(settingService.get("monitorLocal")) : 0);
-		remoteLocal.setSystem(SystemTool.getSystem());
-		remoteList.add(0, remoteLocal);
-
-		List<Group> groupList = remoteService.getGroupByAdmin(admin);
-		for (Group group : groupList) {
-			Remote remoteGroup = new Remote();
-			remoteGroup.setDescr(group.getName());
-			remoteGroup.setId(group.getId());
-			remoteGroup.setParentId(checkParent(group.getParentId(), groupList));
-			remoteGroup.setType(1);
-
-			remoteGroup.setIp("");
-			remoteGroup.setProtocol("");
-			remoteGroup.setVersion("");
-			remoteGroup.setSystem("");
-
-			remoteList.add(remoteGroup);
-		}
-
-		return remoteList;
-	}
-
-	private String checkParent(String parentId, List<Group> groupList) {
-
-		if (parentId == null) {
-			return "";
-		}
-
-		for (Group group : groupList) {
-			if (group.getId().equals(parentId)) {
-				return parentId;
-			}
-		}
-
-		return "";
-	}
-
-	@RequestMapping("addGroupOver")
-	@ResponseBody
-	public JsonResult addGroupOver(Group group) {
-		if (StrUtil.isNotEmpty(group.getParentId()) && StrUtil.isNotEmpty(group.getId()) && group.getId().equals(group.getParentId())) {
-			return renderError(m.get("remoteStr.parentGroupMsg"));
-		}
-		sqlHelper.insertOrUpdate(group);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("groupDetail")
-	@ResponseBody
-	public JsonResult groupDetail(String id) {
-		return renderSuccess(sqlHelper.findById(id, Group.class));
-	}
-
-	@RequestMapping("delGroup")
-	@ResponseBody
-	public JsonResult delGroup(String id) {
-
-		groupService.delete(id);
-		return renderSuccess();
-	}
-
-	@RequestMapping("getGroupTree")
-	@ResponseBody
-	public JsonResult getGroupTree(HttpServletRequest request) {
-		Admin admin = getAdmin(request);
-
-		List<Tree> treeList = new ArrayList<>();
-		Tree tree = new Tree();
-		tree.setName(m.get("remoteStr.noGroup"));
-		tree.setValue("");
-		treeList.add(0, tree);
-
-		List<Group> groups = remoteService.getGroupByAdmin(admin);
-		fillTree(groups, treeList);
-
-		return renderSuccess(treeList);
-	}
-
-	public void fillTree(List<Group> groups, List<Tree> treeList) {
-		for (Group group : groups) {
-			if (!hasParentIn(group.getParentId(), groups)) {
-				Tree tree = new Tree();
-				tree.setName(group.getName());
-				tree.setValue(group.getId());
-
-				List<Tree> treeSubList = new ArrayList<>();
-				fillTree(groupService.getListByParent(group.getId()), treeSubList);
-				tree.setChildren(treeSubList);
-
-				treeList.add(tree);
-			}
-		}
-
-	}
-
-	private boolean hasParentIn(String parentId, List<Group> groups) {
-		for (Group group : groups) {
-			if (group.getId().equals(parentId)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@RequestMapping("getCmdRemote")
-	@ResponseBody
-	public JsonResult getCmdRemote(HttpServletRequest request) {
-		Admin admin = getAdmin(request);
-
-		List<Group> groups = remoteService.getGroupByAdmin(admin);
-		List<Remote> remotes = remoteService.getListByParent(null);
-
-		List<Tree> treeList = new ArrayList<>();
-		fillTreeRemote(groups, remotes, treeList);
-
-		Tree tree = new Tree();
-		tree.setName(m.get("remoteStr.local"));
-		tree.setValue("local");
-
-		treeList.add(0, tree);
-
-		return renderSuccess(treeList);
-	}
-
-	private void fillTreeRemote(List<Group> groups, List<Remote> remotes, List<Tree> treeList) {
-		for (Group group : groups) {
-			if (!hasParentIn(group.getParentId(), groups)) {
-				Tree tree = new Tree();
-				tree.setName(group.getName());
-				tree.setValue(group.getId());
-
-				List<Tree> treeSubList = new ArrayList<>();
-
-				fillTreeRemote(groupService.getListByParent(group.getId()), remoteService.getListByParent(group.getId()), treeSubList);
-
-				tree.setChildren(treeSubList);
-
-				treeList.add(tree);
-			}
-		}
-
-		for (Remote remote : remotes) {
-			Tree tree = new Tree();
-			tree.setName(remote.getIp() + "【" + remote.getDescr() + "】");
-			tree.setValue(remote.getId());
-
-			treeList.add(tree);
-		}
-
-	}
-
-	@RequestMapping("cmdOver")
-	@ResponseBody
-	public JsonResult cmdOver(String[] remoteId, String cmd, Integer interval, HttpServletRequest request) {
-		if (remoteId == null || remoteId.length == 0) {
-			return renderSuccess(m.get("remoteStr.noSelect"));
-		}
-
-		StringBuilder rs = new StringBuilder();
-		for (String id : remoteId) {
-			JsonResult jsonResult = null;
-			if (id.equals("local")) {
-				if (cmd.contentEquals("check")) {
-					jsonResult = confController.checkBase();
-				}
-				if (cmd.contentEquals("reload")) {
-					jsonResult = confController.reload(null, null, null);
-				}
-				if (cmd.contentEquals("replace")) {
-					jsonResult = confController.replace(confController.getReplaceJson(), request, null);
-				}
-				if (cmd.startsWith("start") || cmd.startsWith("stop")) {
-					jsonResult = confController.runCmd(cmd.replace("start ", "").replace("stop ", ""), null);
-				}
-				if (cmd.contentEquals("update")) {
-					jsonResult = renderError(m.get("remoteStr.notAllow"));
-				}
-				rs.append("<span class='blue'>" + m.get("remoteStr.local") + "> </span>");
-			} else {
-				Remote remote = sqlHelper.findById(id, Remote.class);
-				rs.append("<span class='blue'>").append(remote.getIp() + ":" + remote.getPort()).append("> </span>");
-
-				if (cmd.contentEquals("check")) {
-					cmd = "checkBase";
-				}
-
-				try {
-					String action = cmd;
-					if (cmd.startsWith("start") || cmd.startsWith("stop")) {
-						action = "runCmd";
-					}
-
-					String url = remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/conf/" + action + "?creditKey=" + remote.getCreditKey();
-
-					Map<String, Object> map = new HashMap<>();
-					if (cmd.startsWith("start") || cmd.startsWith("stop")) {
-						map.put("cmd", cmd.replace("start ", "").replace("stop ", ""));
-					}
-
-					String json = HttpUtil.post(url, map);
-					jsonResult = JSONUtil.toBean(json, JsonResult.class);
-				} catch (Exception e) {
-					logger.error(e.getMessage(), e);
-				}
-			}
-
-			if (jsonResult != null) {
-				if (jsonResult.isSuccess()) {
-					rs.append(jsonResult.getObj().toString());
-				} else {
-					rs.append(jsonResult.getMsg());
-				}
-			}
-			rs.append("<br>");
-
-			if (interval != null) {
-				try {
-					Thread.sleep(interval * 1000);
-				} catch (InterruptedException e) {
-					logger.error(e.getMessage(), e);
-				}
-			}
-		}
-
-		return renderSuccess(rs.toString());
-	}
-
-	@RequestMapping("asyc")
-	@ResponseBody
-	public JsonResult asyc(String fromId, String[] remoteId, String[] asycData, HttpServletRequest request) {
-		if (StrUtil.isEmpty(fromId) || remoteId == null || remoteId.length == 0) {
-			return renderError(m.get("remoteStr.noChoice"));
-		}
-
-		Remote remoteFrom = sqlHelper.findById(fromId, Remote.class);
-		String json;
-		if (remoteFrom == null) {
-			// 本地
-			json = getAsycPack(asycData);
-		} else {
-			// 远程
-			json = HttpUtil.get(remoteFrom.getProtocol() + "://" + remoteFrom.getIp() + ":" + remoteFrom.getPort() + "/adminPage/remote/getAsycPack?creditKey=" + remoteFrom.getCreditKey()
-				+ "&asycData=" + StrUtil.join(",", Arrays.asList(asycData))
-			, 1000);
-		}
-
-		String adminName = getAdmin(request).getName();
-
-		for (String remoteToId : remoteId) {
-			if (remoteToId.equals("local") || remoteToId.equals("本地")) {
-				setAsycPack(json, request, adminName);
-			} else {
-				Remote remoteTo = sqlHelper.findById(remoteToId, Remote.class);
-				try {
-					String version = HttpUtil.get(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/version?creditKey=" + remoteTo.getCreditKey(),
-							1000);
-					if (StrUtil.isNotEmpty(version)) {
-						// 在线
-						Map<String, Object> map = new HashMap<>();
-						map.put("json", json);
-						HttpUtil.post(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/setAsycPack?creditKey=" + remoteTo.getCreditKey()
-								+ "&adminName=" + adminName, map);
-					}
-				} catch (Exception e) {
-					logger.error(e.getMessage(), e);
-				}
-			}
-
-		}
-		return renderSuccess();
-	}
-
-	@RequestMapping("getAsycPack")
-	@ResponseBody
-	public String getAsycPack(String[] asycData) {
-		AsycPack asycPack = confService.getAsycPack(asycData);
-
-		return JSONUtil.toJsonPrettyStr(asycPack);
-	}
-
-	@RequestMapping("setAsycPack")
-	@ResponseBody
-	public JsonResult setAsycPack(String json, HttpServletRequest request, String adminName) {
-		AsycPack asycPack = JSONUtil.toBean(json, AsycPack.class);
-		if (StrUtil.isEmpty(adminName)) {
-			Admin admin = getAdmin(request);
-			adminName = admin.getName();
-		}
-		confService.setAsycPack(asycPack, adminName);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("addOver")
-	@ResponseBody
-	public JsonResult addOver(Remote remote, String code, String auth) {
-		remote.setIp(remote.getIp().trim());
-
-		if (remoteService.hasSame(remote)) {
-			return renderError(m.get("remoteStr.sameIp"));
-		}
-
-		remoteService.getCreditKey(remote, code, auth);
-
-		if (StrUtil.isNotEmpty(remote.getCreditKey())) {
-			sqlHelper.insertOrUpdate(remote);
-			return renderSuccess();
-		} else {
-			return renderError(m.get("remoteStr.noAuth"));
-		}
-
-	}
-
-	@RequestMapping("getAuth")
-	@ResponseBody
-	public JsonResult getAuth(Remote remote) {
-		try {
-			Map<String, Object> map = new HashMap<>();
-			map.put("name", remote.getName());
-			map.put("pass", remote.getPass());
-			map.put("remote", 1);
-
-			String rs = HttpUtil.post(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/login/getAuth", map, 3000);
-
-			if (StrUtil.isNotEmpty(rs)) {
-				JsonResult jsonResult = JSONUtil.toBean(rs, JsonResult.class);
-				if (jsonResult.isSuccess()) {
-					return renderSuccess(jsonResult.getObj());
-				} else {
-					return renderError(jsonResult.getMsg());
-				}
-			} else {
-				return renderError(m.get("remoteStr.noAuth"));
-			}
-		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
-			return renderError(m.get("remoteStr.noAuth"));
-		}
-	}
-
-	@RequestMapping("detail")
-	@ResponseBody
-	public JsonResult detail(String id) {
-		return renderSuccess(sqlHelper.findById(id, Remote.class));
-	}
-
-	@RequestMapping("del")
-	@ResponseBody
-	public JsonResult del(String id) {
-		sqlHelper.deleteById(id, Remote.class);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("content")
-	@ResponseBody
-	public JsonResult content(String id) {
-
-		Remote remote = sqlHelper.findById(id, Remote.class);
-
-		String rs = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/readContent?creditKey=" + remote.getCreditKey());
-
-		return renderSuccess(rs);
-	}
-
-	@RequestMapping("readContent")
-	@ResponseBody
-	public String readContent() {
-
-		String nginxPath = settingService.get("nginxPath");
-
-		if (FileUtil.exist(nginxPath)) {
-			return FileUtil.readString(nginxPath, StandardCharsets.UTF_8);
-		} else {
-			return m.get("remoteStr.noFile");
-		}
-
-	}
-
-	@RequestMapping("change")
-	@ResponseBody
-	public JsonResult change(String id, HttpSession httpSession) {
-		Remote remote = sqlHelper.findById(id, Remote.class);
-
-		if (remote == null) {
-			httpSession.setAttribute("localType", "local");
-			httpSession.removeAttribute("remote");
-		} else {
-			httpSession.setAttribute("localType", "remote");
-			httpSession.setAttribute("remote", remote);
-		}
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("nginxStatus")
-	@ResponseBody
-	public JsonResult nginxStatus(HttpSession httpSession) {
-		Map<String, String> map = new HashMap<>();
-		map.put("mail", settingService.get("mail"));
-
-		String nginxMonitor = settingService.get("nginxMonitor");
-		map.put("nginxMonitor", nginxMonitor != null ? nginxMonitor : "false");
-
-		return renderSuccess(map);
-	}
-
-	@RequestMapping("nginxOver")
-	@ResponseBody
-	public JsonResult nginxOver(String mail, String nginxMonitor) {
-		settingService.set("mail", mail);
-		settingService.set("nginxMonitor", nginxMonitor);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("setMonitor")
-	@ResponseBody
-	public JsonResult setMonitor(String id, Integer monitor) {
-		if (!"local".equals(id)) {
-			Remote remote = new Remote();
-			remote.setId(id);
-			remote.setMonitor(monitor);
-			sqlHelper.updateById(remote);
-		} else {
-			settingService.set("monitorLocal", monitor.toString());
-		}
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("/src")
-	public void src(HttpServletRequest httpServletRequest, HttpServletResponse response, String url) throws Exception {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    RemoteService remoteService;
+    @Autowired
+    SettingService settingService;
+    @Autowired
+    ConfService confService;
+    @Autowired
+    GroupService groupService;
+    @Autowired
+    ConfController confController;
+    @Autowired
+    MainController mainController;
+    @Autowired
+    NginxApiController nginxApiController;
+
+    @Value("${project.version}")
+    String projectVersion;
+    @Value("${server.port}")
+    Integer port;
+
+    @Value("${server.servlet.context-path}")
+    String contextPath;
+
+    @RequestMapping("version")
+    @ResponseBody
+    public Map<String, Object> version() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("version", projectVersion);
+
+        if (NginxUtils.isRun()) {
+            map.put("nginx", 1);
+        } else {
+            map.put("nginx", 0);
+        }
+
+        return map;
+    }
+
+    @RequestMapping("")
+    public ModelAndView index(ModelAndView modelAndView, HttpSession httpSession) {
+
+        JsonResult<List<String>> jsonResult = nginxApiController.getNginxStartCmd();
+        modelAndView.addObject("startCmds", jsonResult.getObj());
+
+        jsonResult = nginxApiController.getNginxStopCmd();
+        modelAndView.addObject("stopCmds", jsonResult.getObj());
+
+        modelAndView.addObject("projectVersion", projectVersion);
+        modelAndView.setViewName("/adminPage/remote/index");
+
+        return modelAndView;
+    }
+
+    @RequestMapping("allTable")
+    @ResponseBody
+    public List<Remote> allTable(HttpServletRequest request) {
+        Admin admin = getAdmin(request);
+        List<Remote> remoteList = sqlHelper.findAll(Remote.class);
+
+        for (Remote remote : remoteList) {
+            remote.setStatus(0);
+            remote.setType(0);
+            if (remote.getParentId() == null) {
+                remote.setParentId("");
+            }
+
+            try {
+                String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
+                if (StrUtil.isNotEmpty(json)) {
+                    Map<String, Object> map = JSONUtil.toBean(json, new TypeReference<Map<String, Object>>() {
+                    }.getType(), false);
+
+                    remote.setStatus(1);
+                    remote.setVersion((String) map.get("version"));
+                    remote.setNginx((Integer) map.get("nginx"));
+                }
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+            }
+
+        }
+
+        Remote remoteLocal = new Remote();
+        remoteLocal.setId("local");
+        remoteLocal.setIp("");
+        remoteLocal.setProtocol("");
+        remoteLocal.setParentId("");
+        remoteLocal.setDescr(m.get("remoteStr.local"));
+        Map<String, Object> map = version();
+        remoteLocal.setVersion((String) map.get("version"));
+        remoteLocal.setNginx((Integer) map.get("nginx"));
+        remoteLocal.setPort(port);
+        remoteLocal.setStatus(1);
+        remoteLocal.setType(0);
+        remoteLocal.setMonitor(settingService.get("monitorLocal") != null ? Integer.parseInt(settingService.get("monitorLocal")) : 0);
+        remoteLocal.setSystem(SystemTool.getSystem());
+        remoteList.add(0, remoteLocal);
+
+        List<Group> groupList = remoteService.getGroupByAdmin(admin);
+        for (Group group : groupList) {
+            Remote remoteGroup = new Remote();
+            remoteGroup.setDescr(group.getName());
+            remoteGroup.setId(group.getId());
+            remoteGroup.setParentId(checkParent(group.getParentId(), groupList));
+            remoteGroup.setType(1);
+
+            remoteGroup.setIp("");
+            remoteGroup.setProtocol("");
+            remoteGroup.setVersion("");
+            remoteGroup.setSystem("");
+
+            remoteList.add(remoteGroup);
+        }
+
+        return remoteList;
+    }
+
+    private String checkParent(String parentId, List<Group> groupList) {
+
+        if (parentId == null) {
+            return "";
+        }
+
+        for (Group group : groupList) {
+            if (group.getId().equals(parentId)) {
+                return parentId;
+            }
+        }
+
+        return "";
+    }
+
+    @RequestMapping("addGroupOver")
+    @ResponseBody
+    public JsonResult addGroupOver(Group group) {
+        if (StrUtil.isNotEmpty(group.getParentId()) && StrUtil.isNotEmpty(group.getId()) && group.getId().equals(group.getParentId())) {
+            return renderError(m.get("remoteStr.parentGroupMsg"));
+        }
+        sqlHelper.insertOrUpdate(group);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("groupDetail")
+    @ResponseBody
+    public JsonResult groupDetail(String id) {
+        return renderSuccess(sqlHelper.findById(id, Group.class));
+    }
+
+    @RequestMapping("delGroup")
+    @ResponseBody
+    public JsonResult delGroup(String id) {
+
+        groupService.delete(id);
+        return renderSuccess();
+    }
+
+    @RequestMapping("getGroupTree")
+    @ResponseBody
+    public JsonResult getGroupTree(HttpServletRequest request) {
+        Admin admin = getAdmin(request);
+
+        List<Tree> treeList = new ArrayList<>();
+        Tree tree = new Tree();
+        tree.setName(m.get("remoteStr.noGroup"));
+        tree.setValue("");
+        treeList.add(0, tree);
+
+        List<Group> groups = remoteService.getGroupByAdmin(admin);
+        fillTree(groups, treeList);
+
+        return renderSuccess(treeList);
+    }
+
+    public void fillTree(List<Group> groups, List<Tree> treeList) {
+        for (Group group : groups) {
+            if (!hasParentIn(group.getParentId(), groups)) {
+                Tree tree = new Tree();
+                tree.setName(group.getName());
+                tree.setValue(group.getId());
+
+                List<Tree> treeSubList = new ArrayList<>();
+                fillTree(groupService.getListByParent(group.getId()), treeSubList);
+                tree.setChildren(treeSubList);
+
+                treeList.add(tree);
+            }
+        }
+
+    }
+
+    private boolean hasParentIn(String parentId, List<Group> groups) {
+        for (Group group : groups) {
+            if (group.getId().equals(parentId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @RequestMapping("getCmdRemote")
+    @ResponseBody
+    public JsonResult getCmdRemote(HttpServletRequest request) {
+        Admin admin = getAdmin(request);
+
+        List<Group> groups = remoteService.getGroupByAdmin(admin);
+        List<Remote> remotes = remoteService.getListByParent(null);
+
+        List<Tree> treeList = new ArrayList<>();
+        fillTreeRemote(groups, remotes, treeList);
+
+        Tree tree = new Tree();
+        tree.setName(m.get("remoteStr.local"));
+        tree.setValue("local");
+
+        treeList.add(0, tree);
+
+        return renderSuccess(treeList);
+    }
+
+    private void fillTreeRemote(List<Group> groups, List<Remote> remotes, List<Tree> treeList) {
+        for (Group group : groups) {
+            if (!hasParentIn(group.getParentId(), groups)) {
+                Tree tree = new Tree();
+                tree.setName(group.getName());
+                tree.setValue(group.getId());
+
+                List<Tree> treeSubList = new ArrayList<>();
+
+                fillTreeRemote(groupService.getListByParent(group.getId()), remoteService.getListByParent(group.getId()), treeSubList);
+
+                tree.setChildren(treeSubList);
+
+                treeList.add(tree);
+            }
+        }
+
+        for (Remote remote : remotes) {
+            Tree tree = new Tree();
+            tree.setName(remote.getIp() + "【" + remote.getDescr() + "】");
+            tree.setValue(remote.getId());
+
+            treeList.add(tree);
+        }
+
+    }
+
+    @RequestMapping("cmdOver")
+    @ResponseBody
+    public JsonResult cmdOver(String[] remoteId, String cmd, Integer interval, HttpServletRequest request) {
+        if (remoteId == null || remoteId.length == 0) {
+            return renderSuccess(m.get("remoteStr.noSelect"));
+        }
+
+        StringBuilder rs = new StringBuilder();
+        for (String id : remoteId) {
+            JsonResult jsonResult = null;
+            if (id.equals("local")) {
+                if (cmd.contentEquals("check")) {
+                    jsonResult = confController.checkBase();
+                }
+                if (cmd.contentEquals("reload")) {
+                    jsonResult = confController.reload(null, null, null);
+                }
+                if (cmd.contentEquals("replace")) {
+                    jsonResult = confController.replace(confController.getReplaceJson(), request, null);
+                }
+                if (cmd.startsWith("start") || cmd.startsWith("stop")) {
+                    jsonResult = confController.runCmd(cmd.replace("start ", "").replace("stop ", ""), null);
+                }
+                if (cmd.contentEquals("update")) {
+                    jsonResult = renderError(m.get("remoteStr.notAllow"));
+                }
+                rs.append("<span class='blue'>" + m.get("remoteStr.local") + "> </span>");
+            } else {
+                Remote remote = sqlHelper.findById(id, Remote.class);
+                rs.append("<span class='blue'>").append(remote.getIp() + ":" + remote.getPort()).append("> </span>");
+
+                if (cmd.contentEquals("check")) {
+                    cmd = "checkBase";
+                }
+
+                try {
+                    String action = cmd;
+                    if (cmd.startsWith("start") || cmd.startsWith("stop")) {
+                        action = "runCmd";
+                    }
+
+                    String url = remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/conf/" + action + "?creditKey=" + remote.getCreditKey();
+
+                    Map<String, Object> map = new HashMap<>();
+                    if (cmd.startsWith("start") || cmd.startsWith("stop")) {
+                        map.put("cmd", cmd.replace("start ", "").replace("stop ", ""));
+                    }
+
+                    String json = HttpUtil.post(url, map);
+                    jsonResult = JSONUtil.toBean(json, JsonResult.class);
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+
+            if (jsonResult != null) {
+                if (jsonResult.isSuccess()) {
+                    rs.append(jsonResult.getObj().toString());
+                } else {
+                    rs.append(jsonResult.getMsg());
+                }
+            }
+            rs.append("<br>");
+
+            if (interval != null) {
+                try {
+                    Thread.sleep(interval * 1000);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+        }
+
+        return renderSuccess(rs.toString());
+    }
+
+    @RequestMapping("asyc")
+    @ResponseBody
+    public JsonResult asyc(String fromId, String[] remoteId, String[] asycData, HttpServletRequest request) {
+        if (StrUtil.isEmpty(fromId) || remoteId == null || remoteId.length == 0) {
+            return renderError(m.get("remoteStr.noChoice"));
+        }
+
+        Remote remoteFrom = sqlHelper.findById(fromId, Remote.class);
+        String json;
+        if (remoteFrom == null) {
+            // 本地
+            json = getAsycPack(asycData);
+        } else {
+            // 远程
+            json = HttpUtil.get(remoteFrom.getProtocol() + "://" + remoteFrom.getIp() + ":" + remoteFrom.getPort() + "/adminPage/remote/getAsycPack?creditKey=" + remoteFrom.getCreditKey()
+                            + "&asycData=" + StrUtil.join(",", Arrays.asList(asycData))
+                    , 1000);
+        }
+
+        String adminName = getAdmin(request).getName();
+
+        for (String remoteToId : remoteId) {
+            if (remoteToId.equals("local") || remoteToId.equals("本地")) {
+                setAsycPack(json, request, adminName);
+            } else {
+                Remote remoteTo = sqlHelper.findById(remoteToId, Remote.class);
+                try {
+                    String version = HttpUtil.get(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/version?creditKey=" + remoteTo.getCreditKey(),
+                            1000);
+                    if (StrUtil.isNotEmpty(version)) {
+                        // 在线
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("json", json);
+                        HttpUtil.post(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/setAsycPack?creditKey=" + remoteTo.getCreditKey()
+                                + "&adminName=" + adminName, map);
+                    }
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+
+        }
+        return renderSuccess();
+    }
+
+    @RequestMapping("getAsycPack")
+    @ResponseBody
+    public String getAsycPack(String[] asycData) {
+        AsycPack asycPack = confService.getAsycPack(asycData);
+
+        return JSONUtil.toJsonPrettyStr(asycPack);
+    }
+
+    @RequestMapping("setAsycPack")
+    @ResponseBody
+    public JsonResult setAsycPack(String json, HttpServletRequest request, String adminName) {
+        AsycPack asycPack = JSONUtil.toBean(json, AsycPack.class);
+        if (StrUtil.isEmpty(adminName)) {
+            Admin admin = getAdmin(request);
+            adminName = admin.getName();
+        }
+        confService.setAsycPack(asycPack, adminName);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("addOver")
+    @ResponseBody
+    public JsonResult addOver(Remote remote, String code, String auth) {
+        remote.setIp(remote.getIp().trim());
+
+        if (remoteService.hasSame(remote)) {
+            return renderError(m.get("remoteStr.sameIp"));
+        }
+
+        remoteService.getCreditKey(remote, code, auth,contextPath);
+
+        if (StrUtil.isNotEmpty(remote.getCreditKey())) {
+            sqlHelper.insertOrUpdate(remote);
+            return renderSuccess();
+        } else {
+            return renderError(m.get("remoteStr.noAuth"));
+        }
+
+    }
+
+    @RequestMapping("getAuth")
+    @ResponseBody
+    public JsonResult getAuth(Remote remote) {
+        try {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", remote.getName());
+            map.put("pass", remote.getPass());
+            map.put("remote", 1);
+
+            String rs = HttpUtil.post(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath + "/adminPage/login/getAuth", map, 3000);
+
+            if (StrUtil.isNotEmpty(rs)) {
+                JsonResult jsonResult = JSONUtil.toBean(rs, JsonResult.class);
+                if (jsonResult.isSuccess()) {
+                    return renderSuccess(jsonResult.getObj());
+                } else {
+                    return renderError(jsonResult.getMsg());
+                }
+            } else {
+                return renderError(m.get("remoteStr.noAuth"));
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            return renderError(m.get("remoteStr.noAuth"));
+        }
+    }
+
+    @RequestMapping("detail")
+    @ResponseBody
+    public JsonResult detail(String id) {
+        return renderSuccess(sqlHelper.findById(id, Remote.class));
+    }
+
+    @RequestMapping("del")
+    @ResponseBody
+    public JsonResult del(String id) {
+        sqlHelper.deleteById(id, Remote.class);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("content")
+    @ResponseBody
+    public JsonResult content(String id) {
+
+        Remote remote = sqlHelper.findById(id, Remote.class);
+
+        String rs = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/readContent?creditKey=" + remote.getCreditKey());
+
+        return renderSuccess(rs);
+    }
+
+    @RequestMapping("readContent")
+    @ResponseBody
+    public String readContent() {
+
+        String nginxPath = settingService.get("nginxPath");
+
+        if (FileUtil.exist(nginxPath)) {
+            return FileUtil.readString(nginxPath, StandardCharsets.UTF_8);
+        } else {
+            return m.get("remoteStr.noFile");
+        }
+
+    }
+
+    @RequestMapping("change")
+    @ResponseBody
+    public JsonResult change(String id, HttpSession httpSession) {
+        Remote remote = sqlHelper.findById(id, Remote.class);
+
+        if (remote == null) {
+            httpSession.setAttribute("localType", "local");
+            httpSession.removeAttribute("remote");
+        } else {
+            httpSession.setAttribute("localType", "remote");
+            httpSession.setAttribute("remote", remote);
+        }
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("nginxStatus")
+    @ResponseBody
+    public JsonResult nginxStatus(HttpSession httpSession) {
+        Map<String, String> map = new HashMap<>();
+        map.put("mail", settingService.get("mail"));
+
+        String nginxMonitor = settingService.get("nginxMonitor");
+        map.put("nginxMonitor", nginxMonitor != null ? nginxMonitor : "false");
+
+        return renderSuccess(map);
+    }
+
+    @RequestMapping("nginxOver")
+    @ResponseBody
+    public JsonResult nginxOver(String mail, String nginxMonitor) {
+        settingService.set("mail", mail);
+        settingService.set("nginxMonitor", nginxMonitor);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("setMonitor")
+    @ResponseBody
+    public JsonResult setMonitor(String id, Integer monitor) {
+        if (!"local".equals(id)) {
+            Remote remote = new Remote();
+            remote.setId(id);
+            remote.setMonitor(monitor);
+            sqlHelper.updateById(remote);
+        } else {
+            settingService.set("monitorLocal", monitor.toString());
+        }
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("/src")
+    public void src(HttpServletRequest httpServletRequest, HttpServletResponse response, String url) throws Exception {
 
 //		response.addHeader("Content-Type", "image/jpeg");
 //		response.setHeader("content-disposition", "attachment;filename=code.jpg"); // 设置文件名
 
-		byte[] buffer = new byte[1024];
-		URL downUrl = new URL(url);
-		BufferedInputStream bis = null;
-		try {
-			bis = new BufferedInputStream(downUrl.openConnection().getInputStream());
-			OutputStream os = response.getOutputStream();
-			int i = bis.read(buffer);
-			while (i != -1) {
-				os.write(buffer, 0, i);
-				i = bis.read(buffer);
-			}
-		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
-		} finally {
-			if (bis != null) {
-				try {
-					bis.close();
-				} catch (IOException e) {
-					logger.error(e.getMessage(), e);
-				}
-			}
-		}
-
-	}
+        byte[] buffer = new byte[1024];
+        URL downUrl = new URL(url);
+        BufferedInputStream bis = null;
+        try {
+            bis = new BufferedInputStream(downUrl.openConnection().getInputStream());
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        } finally {
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+        }
+
+    }
 }
diff --git a/src/main/java/com/cym/service/RemoteService.java b/src/main/java/com/cym/service/RemoteService.java
index ff3eaa0e..58f866a2 100644
--- a/src/main/java/com/cym/service/RemoteService.java
+++ b/src/main/java/com/cym/service/RemoteService.java
@@ -29,7 +29,7 @@ public class RemoteService {
 	@Autowired
 	AdminService adminService;
 
-	public void getCreditKey(Remote remote, String code, String auth) {
+	public void getCreditKey(Remote remote, String code, String auth,String contextPath) {
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 
 		paramMap.put("name", remote.getName());
@@ -38,7 +38,7 @@ public class RemoteService {
 		paramMap.put("auth", auth);
 		try {
 			String rs = HttpUtil.post(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort()
-					+ "/adminPage/login/getCredit", paramMap, 2000);
+					+ contextPath+"/adminPage/login/getCredit", paramMap, 2000);
 
 			if (StrUtil.isNotEmpty(rs)) {
 				JSONObject jsonObject = new JSONObject(rs);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1cb0fd90..6223265a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 server:
   port: 8080
   servlet:
-    context-path: /admin/
+    context-path: /nadmin/
     session:
-      timeout: 7200 
+      timeout: 7200
   tomcat:
     # 默认是200
     threads:
@@ -18,8 +18,8 @@ spring:
   jackson:
     default-property-inclusion: NON_NULL
   jmx:
-    enabled: true 
-  database: 
+    enabled: true
+  database:
     type: sqlite
     package: com.cym.model
     print: false
@@ -27,15 +27,15 @@ spring:
 
 project:
   version: v@project.version@
-  home: /home/nginxWebUI/
-  
-logging: 
+  home: D:\source\_Git\nginxWebUI
+
+logging:
   file:
     name: ${project.home}log/nginxWebUI.log
     max-size: 1024MB
-  level: 
+  level:
     root: info
 
 knife4j:
   enable: true
-  production: true # 生产环境屏蔽
\ No newline at end of file
+  production: true # 生产环境屏蔽
diff --git a/src/main/resources/static/js/adminPage/remote/index.js b/src/main/resources/static/js/adminPage/remote/index.js
index dcc16ff6..c1109ff1 100644
--- a/src/main/resources/static/js/adminPage/remote/index.js
+++ b/src/main/resources/static/js/adminPage/remote/index.js
@@ -164,7 +164,7 @@ $(function(){
 			}
 		});
 	})
-	
+
 	form.on('switch(monitor)', function(data){
 		  $.ajax({
 				type : 'POST',
@@ -175,7 +175,7 @@ $(function(){
 				},
 				dataType : 'json',
 				success : function(data) {
-				
+
 					if (data.success) {
 						//location.reload();
 					} else {
@@ -186,16 +186,16 @@ $(function(){
 					layer.alert(commonStr.errorInfo);
 				}
 		});
-	});   
-	
+	});
+
 	form.on('select(cmd)', function(data){
 		if(data.value=='reload'){
 			$("#intervalDiv").show();
 		}else{
 			$("#intervalDiv").hide();
 		}
-	});   
-	
+	});
+
 	layer.load();
 	layui.config({
 		base: ctx + 'lib/layui/exts/treeTable/'
@@ -241,7 +241,7 @@ $(function(){
 							},{
 								key: 'system',
 								title : remoteStr.system
-							},{	
+							},{
 								title : 'nginx',
 								template : function(remote) {
 									if(remote.nginx == 2){
@@ -253,10 +253,10 @@ $(function(){
 									if(remote.nginx == 0){
 										return `<span class="red">${remoteStr.stopped}</span>`
 									}
-									
+
 									return "";
 								}
-							},{	
+							},{
 								title : commonStr.status,
 								template : function(remote) {
 									if(remote.status == 1){
@@ -265,10 +265,10 @@ $(function(){
 									if(remote.status == 0){
 										return `<span class="red">${remoteStr.offline}</span>`
 									}
-									
+
 									return "";
 								}
-							},{	
+							},{
 								title : remoteStr.mailNotice,
 								template : function(remote) {
 									if(remote.type == 0){
@@ -281,20 +281,20 @@ $(function(){
 								title :commonStr.operation,
 								template : function(remote) {
 									var html = "";
-									
+
 									if(remote.type == 0){
 										// 服务器(同版本的才能切换)
 										//console.log( remote.version + " : "  + $("#projectVersion").val());
 										if(remote.status == 1 && remote.version == $("#projectVersion").val()){
 											html += `<button class="layui-btn layui-btn-sm layui-btn-normal" onclick="change('${remote.id}')">${remoteStr.changeTo}</button>`;
 										}
-										
+
 										if(remote.id != 'local'){
 											// 本地
 											if(remote.status == 1){
 												html += `<button class="layui-btn layui-btn-sm" onclick="content('${remote.id}')">${remoteStr.see} conf</button>`;
 											}
-											
+
 											html += `
 												<button class="layui-btn layui-btn-sm" onclick="edit('${remote.id}')">${commonStr.edit}</button>
 												<button class="layui-btn layui-btn-danger layui-btn-sm" onclick="del('${remote.id}')">${commonStr.del}</button>
@@ -305,7 +305,7 @@ $(function(){
 												html += `<button class="layui-btn layui-btn-sm" onclick="contentLocal()">${remoteStr.see} conf</button>`;
 											}
 										}
-										
+
 									} else {
 										// 分组
 										html += `
@@ -323,16 +323,16 @@ $(function(){
 
 
 function add() {
-	$("#id").val(""); 
-	$("#ip").val(""); 
-	$("#port").val(""); 
-	$("#descr").val(""); 
-	$("#protocol").val("http"); 
-	$("#name").val(""); 
-	$("#pass").val(""); 
+	$("#id").val("");
+	$("#ip").val("");
+	$("#port").val("");
+	$("#descr").val("");
+	$("#protocol").val("http");
+	$("#name").val("");
+	$("#pass").val("");
 	$("#monitor option:first").prop("checked", true);
 	parentId.setValue([""]);
-	
+
 	showWindow(remoteStr.add);
 }
 
@@ -352,7 +352,7 @@ function contentLocal(){
 		url : ctx + '/adminPage/remote/readContent',
 		success : function(data) {
 			if (data) {
-				
+
 				$("#preview").val(data);
 				layer.open({
 					type: 1,
@@ -360,8 +360,8 @@ function contentLocal(){
 					area: ['800px', '600px'], // 宽高
 					content: $('#previewDiv')
 				});
-				
-				
+
+
 			}else{
 				layer.msg(data.msg);
 			}
@@ -382,7 +382,7 @@ function content(id) {
 		},
 		success : function(data) {
 			if (data.success) {
-				
+
 				$("#preview").val(data.obj);
 				layer.open({
 					type: 1,
@@ -401,8 +401,8 @@ function content(id) {
 }
 
 function edit(id) {
-	$("#id").val(id); 
-	
+	$("#id").val(id);
+
 	$.ajax({
 		type : 'GET',
 		url : ctx + '/adminPage/remote/detail',
@@ -413,16 +413,16 @@ function edit(id) {
 		success : function(data) {
 			if (data.success) {
 				var remote = data.obj;
-				$("#id").val(remote.id); 
-				$("#pass").val(remote.pass); 
+				$("#id").val(remote.id);
+				$("#pass").val(remote.pass);
 				$("#name").val(remote.name);
-				$("#ip").val(remote.ip); 
-				$("#port").val(remote.port); 
-				$("#protocol").val(remote.protocol); 
-				$("#descr").val(remote.descr); 
-				$("#monitor").val(remote.monitor); 
+				$("#ip").val(remote.ip);
+				$("#port").val(remote.port);
+				$("#protocol").val(remote.protocol);
+				$("#descr").val(remote.descr);
+				$("#monitor").val(remote.monitor);
 				parentId.setValue([remote.parentId]);
-				
+
 				form.render();
 				showWindow(remoteStr.edit);
 			}else{
@@ -484,7 +484,7 @@ function change(id){
 }
 
 function asycSelect(){
-	
+
 	layer.open({
 		type : 1,
 		title : remoteStr.asycSelect,
@@ -495,7 +495,7 @@ function asycSelect(){
 
 
 function asycOver(){
-	
+
 	$(".asycData")
 	var asycData = [];
 	$(".asycData").each(function() {
@@ -507,8 +507,8 @@ function asycOver(){
 		layer.msg(remoteStr.noData);
 		return;
 	}
-	
-	
+
+
     load = layer.load();
 	$.ajax({
 		type : 'POST',
@@ -536,16 +536,16 @@ function cmdGroup(){
 		type : 'POST',
 		url : ctx + '/adminPage/remote/getCmdRemote',
 		data : {
-		
+
 		},
 		dataType : 'json',
 		success : function(data) {
 			layer.closeAll();
 			if (data.success) {
-				
+
 				// 渲染多选
 				remoteCmdId = xmSelect.render({
-				    el: '#remoteCmdSelectId', 
+				    el: '#remoteCmdSelectId',
 				    name : 'remoteId',
 				    // 显示为text模式
 				    model: { label: { type: 'text' } },
@@ -565,9 +565,9 @@ function cmdGroup(){
 				    },
 				    data: data.obj
 				})
-				
+
 				form.render();
-				
+
 				layer.open({
 					type : 1,
 					title : remoteStr.cmdOver,
@@ -583,7 +583,7 @@ function cmdGroup(){
 			layer.alert(commonStr.errorInfo);
 		}
 	});
-	
+
 }
 
 
@@ -593,8 +593,8 @@ function cmdOver(){
 		layer.msg(remoteStr.noSelect);
 		return;
 	}
-	
-	
+
+
 	layer.load();
 	$.ajax({
 		type : 'POST',
@@ -605,7 +605,7 @@ function cmdOver(){
 			layer.closeAll();
 			if (data.success) {
 				layer.open({
-					  type: 0, 
+					  type: 0,
 					  area : [ '810px', '400px' ],
 					  content: data.obj
 				});
@@ -625,20 +625,20 @@ function addGroup(){
 	$("#groupId").val("");
 	$("#groupName").val("");
 	groupParentId.setValue([""]);
-	
+
 	layer.open({
 		type : 1,
 		title :remoteStr.addGroup,
 		area : [ '400px', '450px' ], // 宽高
 		content : $('#groupDiv')
 	});
-	
+
 }
 
 
 function editGroup(id) {
-	$("#groupId").val(id); 
-	
+	$("#groupId").val(id);
+
 	$.ajax({
 		type : 'GET',
 		url : ctx + '/adminPage/remote/groupDetail',
@@ -649,7 +649,7 @@ function editGroup(id) {
 		success : function(data) {
 			if (data.success) {
 				var group = data.obj;
-				$("#groupId").val(group.id); 
+				$("#groupId").val(group.id);
 				$("#groupName").val(group.name);
 				groupParentId.setValue([group.parentId]);
 				layer.open({
@@ -658,7 +658,7 @@ function editGroup(id) {
 					area : [ '400px', '500px' ], // 宽高
 					content : $('#groupDiv')
 				});
-				
+
 				form.render();
 			}else{
 				layer.msg(data.msg);
@@ -714,12 +714,12 @@ function delGroup(id){
 			}
 		});
 	}
-	
+
 }
 
 
 function nginxMonitor(){
-	
+
 	$.ajax({
 		type : 'POST',
 		url : ctx + '/adminPage/remote/nginxStatus',
@@ -728,7 +728,7 @@ function nginxMonitor(){
 			if (data.success) {
 				$("#mail").val(data.obj.mail);
 				$("#nginxMonitor").val(data.obj.nginxMonitor);
-				
+
 				form.render();
 				layer.open({
 					type : 1,
@@ -748,11 +748,11 @@ function nginxMonitor(){
 }
 
 function nginxOver(){
-		if ($("#mail").val().indexOf("@") == -1) {                    
-			layer.alert(remoteStr.emailTips);               
-			return;                
+		if ($("#mail").val().indexOf("@") == -1) {
+			layer.alert(remoteStr.emailTips);
+			return;
 		}
-		
+
 		$.ajax({
 		type : 'POST',
 		url : ctx + '/adminPage/remote/nginxOver',
@@ -780,11 +780,11 @@ function nginxOver(){
 var loadIndex;
 function testMail(){
 	if(confirm(remoteStr.testSend)){
-		if ($("#mail").val().indexOf("@") == -1) {                    
-			layer.alert(remoteStr.emailTips);               
-			return;                
+		if ($("#mail").val().indexOf("@") == -1) {
+			layer.alert(remoteStr.emailTips);
+			return;
 		}
-		
+
 		loadIndex = layer.load();
 		$.ajax({
 			type: 'POST',
@@ -832,7 +832,7 @@ function addOver() {
 					$("#authCode").hide();
 					$("#imgCode").show();
 				}
-				
+
 				refreshCode();
 				codeIndex = layer.open({
 					type : 1,
@@ -849,7 +849,7 @@ function addOver() {
 			layer.alert(commonStr.errorInfo);
 		}
 	});
-	
+
 }
 
 function addOverSubmit(){
@@ -877,7 +877,7 @@ function addOverSubmit(){
 }
 
 function refreshCode(){
-	var src = encodeURIComponent($("#protocol").val() + "://" + $("#ip").val() + ":" + $("#port").val() + "/adminPage/login/getRemoteCode?t=" + guid());
-	
+	var src = encodeURIComponent($("#protocol").val() + "://" + $("#ip").val() + ":" + $("#port").val() + ctx +"/adminPage/login/getRemoteCode?t=" + guid());
+
 	$("#codeImg").attr("src", ctx + "/adminPage/remote/src?url=" + src)
-}
\ No newline at end of file
+}
-- 
Gitee


From 59ed1e4ffde54fe9dbe968c6838e0e585797c3c6 Mon Sep 17 00:00:00 2001
From: liuyaowen <liuyaowen@fsfund.com>
Date: Mon, 29 Nov 2021 10:32:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cym/config/ScheduleTask.java     |   7 +-
 .../controller/adminPage/MainController.java  |  12 +-
 .../adminPage/RemoteController.java           |  12 +-
 .../adminPage/UpstreamController.java         | 377 +++++++++---------
 4 files changed, 203 insertions(+), 205 deletions(-)

diff --git a/src/main/java/com/cym/config/ScheduleTask.java b/src/main/java/com/cym/config/ScheduleTask.java
index 0ca1bbbf..ca80451c 100644
--- a/src/main/java/com/cym/config/ScheduleTask.java
+++ b/src/main/java/com/cym/config/ScheduleTask.java
@@ -76,6 +76,9 @@ public class ScheduleTask {
 	@Autowired
 	MessageUtils m;
 
+	@Value("${server.servlet.context-path}")
+	String contextPath;
+
 	// 续签证书
 	@Scheduled(cron = "0 0 2 * * ?")
 	public void certTasks() {
@@ -189,7 +192,7 @@ public class ScheduleTask {
 			List<Remote> remoteList = remoteService.getMonitorRemoteList();
 			for (Remote remote : remoteList) {
 				try {
-					String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
+					String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath+"/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
 					Map<String, Object> map = JSONUtil.toBean(json, new TypeReference<Map<String, Object>>() {
 					}.getType(), false);
 
@@ -263,4 +266,4 @@ public class ScheduleTask {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/cym/controller/adminPage/MainController.java b/src/main/java/com/cym/controller/adminPage/MainController.java
index 1ccca853..c26fba0c 100644
--- a/src/main/java/com/cym/controller/adminPage/MainController.java
+++ b/src/main/java/com/cym/controller/adminPage/MainController.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +39,9 @@ public class MainController extends BaseController {
 	@Autowired
 	SettingService settingService;
 
+	@Value("${server.servlet.context-path}")
+	String contextPath;
+
 	private static final Logger LOG = LoggerFactory.getLogger(MainController.class);
 
 	@RequestMapping("")
@@ -64,7 +68,7 @@ public class MainController extends BaseController {
 				HashMap<String, Object> paramMap = new HashMap<>();
 				paramMap.put("file", dest);
 
-				String rs = HttpUtil.post(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/upload", paramMap);
+				String rs = HttpUtil.post(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath+"/upload", paramMap);
 				JsonResult jsonResult = JSONUtil.toBean(rs, JsonResult.class);
 				FileUtil.del(dest);
 				return jsonResult;
@@ -93,8 +97,8 @@ public class MainController extends BaseController {
 		updateUtils.run(path);
 		return renderSuccess();
 	}
-	
-	
+
+
 	@ResponseBody
 	@RequestMapping("/adminPage/main/changeLang")
 	public JsonResult changeLang() {
@@ -107,4 +111,4 @@ public class MainController extends BaseController {
 		return renderSuccess();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/cym/controller/adminPage/RemoteController.java b/src/main/java/com/cym/controller/adminPage/RemoteController.java
index c6d6e259..bdf04da6 100644
--- a/src/main/java/com/cym/controller/adminPage/RemoteController.java
+++ b/src/main/java/com/cym/controller/adminPage/RemoteController.java
@@ -116,7 +116,7 @@ public class RemoteController extends BaseController {
             }
 
             try {
-                String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
+                String json = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath+"/adminPage/remote/version?creditKey=" + remote.getCreditKey(), 1000);
                 if (StrUtil.isNotEmpty(json)) {
                     Map<String, Object> map = JSONUtil.toBean(json, new TypeReference<Map<String, Object>>() {
                     }.getType(), false);
@@ -337,7 +337,7 @@ public class RemoteController extends BaseController {
                         action = "runCmd";
                     }
 
-                    String url = remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/conf/" + action + "?creditKey=" + remote.getCreditKey();
+                    String url = remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath+"/adminPage/conf/" + action + "?creditKey=" + remote.getCreditKey();
 
                     Map<String, Object> map = new HashMap<>();
                     if (cmd.startsWith("start") || cmd.startsWith("stop")) {
@@ -386,7 +386,7 @@ public class RemoteController extends BaseController {
             json = getAsycPack(asycData);
         } else {
             // 远程
-            json = HttpUtil.get(remoteFrom.getProtocol() + "://" + remoteFrom.getIp() + ":" + remoteFrom.getPort() + "/adminPage/remote/getAsycPack?creditKey=" + remoteFrom.getCreditKey()
+            json = HttpUtil.get(remoteFrom.getProtocol() + "://" + remoteFrom.getIp() + ":" + remoteFrom.getPort() + contextPath+"/adminPage/remote/getAsycPack?creditKey=" + remoteFrom.getCreditKey()
                             + "&asycData=" + StrUtil.join(",", Arrays.asList(asycData))
                     , 1000);
         }
@@ -399,13 +399,13 @@ public class RemoteController extends BaseController {
             } else {
                 Remote remoteTo = sqlHelper.findById(remoteToId, Remote.class);
                 try {
-                    String version = HttpUtil.get(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/version?creditKey=" + remoteTo.getCreditKey(),
+                    String version = HttpUtil.get(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + contextPath+"/adminPage/remote/version?creditKey=" + remoteTo.getCreditKey(),
                             1000);
                     if (StrUtil.isNotEmpty(version)) {
                         // 在线
                         Map<String, Object> map = new HashMap<>();
                         map.put("json", json);
-                        HttpUtil.post(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + "/adminPage/remote/setAsycPack?creditKey=" + remoteTo.getCreditKey()
+                        HttpUtil.post(remoteTo.getProtocol() + "://" + remoteTo.getIp() + ":" + remoteTo.getPort() + contextPath+"/adminPage/remote/setAsycPack?creditKey=" + remoteTo.getCreditKey()
                                 + "&adminName=" + adminName, map);
                     }
                 } catch (Exception e) {
@@ -505,7 +505,7 @@ public class RemoteController extends BaseController {
 
         Remote remote = sqlHelper.findById(id, Remote.class);
 
-        String rs = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + "/adminPage/remote/readContent?creditKey=" + remote.getCreditKey());
+        String rs = HttpUtil.get(remote.getProtocol() + "://" + remote.getIp() + ":" + remote.getPort() + contextPath+"/adminPage/remote/readContent?creditKey=" + remote.getCreditKey());
 
         return renderSuccess(rs);
     }
diff --git a/src/main/java/com/cym/controller/adminPage/UpstreamController.java b/src/main/java/com/cym/controller/adminPage/UpstreamController.java
index a81237e5..ce3837c5 100644
--- a/src/main/java/com/cym/controller/adminPage/UpstreamController.java
+++ b/src/main/java/com/cym/controller/adminPage/UpstreamController.java
@@ -1,22 +1,9 @@
 package com.cym.controller.adminPage;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
+import cn.craccd.sqlHelper.bean.Page;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.cym.ext.UpstreamExt;
-import com.cym.model.Remote;
-import com.cym.model.Server;
 import com.cym.model.Upstream;
 import com.cym.model.UpstreamServer;
 import com.cym.service.ParamService;
@@ -25,187 +12,191 @@ import com.cym.service.UpstreamService;
 import com.cym.utils.BaseController;
 import com.cym.utils.JsonResult;
 import com.cym.utils.SnowFlakeUtils;
-import com.cym.utils.TelnetUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
-import cn.craccd.sqlHelper.bean.Page;
-import cn.hutool.core.lang.TypeReference;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
+import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/adminPage/upstream")
 public class UpstreamController extends BaseController {
-	@Autowired
-	UpstreamService upstreamService;
-	@Autowired
-	ParamService paramService;
-	@Autowired
-	SettingService settingService;
-
-	@RequestMapping("")
-	public ModelAndView index(HttpSession httpSession, ModelAndView modelAndView, Page page, String keywords) {
-
-		page = upstreamService.search(page, keywords);
-
-		List<UpstreamExt> list = new ArrayList<UpstreamExt>();
-		for (Upstream upstream :(List<Upstream>)  page.getRecords()) {
-			UpstreamExt upstreamExt = new UpstreamExt();
-			upstreamExt.setUpstream(upstream);
-
-			List<String> str = new ArrayList<String>();
-			List<UpstreamServer> servers = upstreamService.getUpstreamServers(upstream.getId());
-			for (UpstreamServer upstreamServer : servers) {
-				str.add(buildStr(upstreamServer, upstream.getProxyType()));
-			}
-
-			upstreamExt.setServerStr(StrUtil.join("", str));
-			list.add(upstreamExt);
-		}
-		page.setRecords(list);
-
-		modelAndView.addObject("page", page);
-		modelAndView.addObject("keywords", keywords);
-		
-		modelAndView.addObject("upstreamMonitor", settingService.get("upstreamMonitor"));
-		modelAndView.setViewName("/adminPage/upstream/index");
-		return modelAndView;
-	}
-
-	public String buildStr(UpstreamServer upstreamServer, Integer proxyType) {
-		String status = m.get("upstreamStr.noStatus");
-		if (!"none".equals(upstreamServer.getStatus())) {
-			status = upstreamServer.getStatus();
-		}
-
-		String monitorStatus = "";
-
-		String upstreamMonitor = settingService.get("upstreamMonitor");
-		if ("true".equals(upstreamMonitor)) {
-			monitorStatus += "<td class='short50'>";
-			if (upstreamServer.getMonitorStatus() == -1) {
-				monitorStatus += "<span class='gray'>" + m.get("upstreamStr.gray") + "</span>";
-			} else if (upstreamServer.getMonitorStatus() == 1) {
-				monitorStatus += "<span class='green'>" + m.get("upstreamStr.green") + "</span>";
-			} else {
-				monitorStatus += "<span class='red'>" + m.get("upstreamStr.red") + "</span>";
-			}
-			monitorStatus += "</td>";
-		}
-
-		if (upstreamServer.getServer().contains(":")) {
-			upstreamServer.setServer("[" + upstreamServer.getServer() + "]");
-		}
-
-		String html = "<tr><td class='short100'>" + upstreamServer.getServer() + ":" + upstreamServer.getPort() + "</td><td>";
-				
-		if(upstreamServer.getWeight()!=null) {
-			html += "weight=" + upstreamServer.getWeight() + " ";
-		}
-		if(upstreamServer.getFailTimeout()!=null) {
-			html += "fail_timeout=" + upstreamServer.getFailTimeout() + "s ";
-		}
-		if(upstreamServer.getMaxFails()!=null) {
-			html += "max_fails=" + upstreamServer.getMaxFails() + " ";
-		}
-		if(upstreamServer.getMaxConns()!=null) {
-			html += "max_conns=" + upstreamServer.getMaxConns() + " ";
-		}
-		html+=  "</td><td class='short50'>" + status + "</td>" + monitorStatus + "</tr>";
-		return html;
-	}
-
-	@RequestMapping("addOver")
-	@ResponseBody
-	public JsonResult addOver(String upstreamJson, String upstreamParamJson, String upstreamServerJson) {
-		Upstream upstream = JSONUtil.toBean(upstreamJson, Upstream.class);
-		List<UpstreamServer> upstreamServers = JSONUtil.toList(JSONUtil.parseArray(upstreamServerJson), UpstreamServer.class);
-
-
-		if (StrUtil.isEmpty(upstream.getId())) {
-			upstream.setSeq( SnowFlakeUtils.getId());
-		}
-		
-		if (StrUtil.isEmpty(upstream.getId())) {
-			Long count = upstreamService.getCountByName(upstream.getName());
-			if (count > 0) {
-				return renderError(m.get("upstreamStr.sameName"));
-			}
-		} else {
-			Long count = upstreamService.getCountByNameWithOutId(upstream.getName(), upstream.getId());
-			if (count > 0) {
-				return renderError(m.get("upstreamStr.sameName"));
-			}
-		}
-
-		upstreamService.addOver(upstream, upstreamServers, upstreamParamJson);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("detail")
-	@ResponseBody
-	public JsonResult detail(String id) {
-
-		UpstreamExt upstreamExt = new UpstreamExt();
-		upstreamExt.setUpstream(sqlHelper.findById(id, Upstream.class));
-		upstreamExt.setUpstreamServerList(upstreamService.getUpstreamServers(id));
-
-		upstreamExt.setParamJson(paramService.getJsonByTypeId(upstreamExt.getUpstream().getId(), "upstream"));
-
-		return renderSuccess(upstreamExt);
-	}
-
-	@RequestMapping("del")
-	@ResponseBody
-	public JsonResult del(String id) {
-
-		upstreamService.del(id);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("setMonitor")
-	@ResponseBody
-	public JsonResult setMonitor(String id, Integer monitor) {
-		Upstream upstream = new Upstream();
-		upstream.setId(id);
-		upstream.setMonitor(monitor);
-		sqlHelper.updateById(upstream);
-
-		return renderSuccess();
-	}
-
-	@RequestMapping("upstreamStatus")
-	@ResponseBody
-	public JsonResult upstreamStatus(HttpSession httpSession) {
-		Map<String, String> map = new HashMap<>();
-		map.put("mail", settingService.get("mail"));
-
-		String upstreamMonitor = settingService.get("upstreamMonitor");
-		map.put("upstreamMonitor", upstreamMonitor != null ? upstreamMonitor : "false");
-
-		return renderSuccess(map);
-	}
-
-	@RequestMapping("upstreamOver")
-	@ResponseBody
-	public JsonResult upstreamOver(String mail, String upstreamMonitor) {
-		settingService.set("mail", mail);
-		settingService.set("upstreamMonitor", upstreamMonitor);
-
-		if (upstreamMonitor.equals("true")) {
-			upstreamService.resetMonitorStatus();
-		}
-
-		return renderSuccess();
-	}
-	
-	@RequestMapping("setOrder")
-	@ResponseBody
-	public JsonResult setOrder(String id, Integer count) {
-		upstreamService.setSeq(id, count);
-		return renderSuccess();
-	}
+    @Autowired
+    UpstreamService upstreamService;
+    @Autowired
+    ParamService paramService;
+    @Autowired
+    SettingService settingService;
+
+    @RequestMapping("")
+    public ModelAndView index(HttpSession httpSession, ModelAndView modelAndView, Page page, String keywords) {
+
+        page = upstreamService.search(page, keywords);
+
+        List<UpstreamExt> list = new ArrayList<UpstreamExt>();
+        for (Upstream upstream : (List<Upstream>) page.getRecords()) {
+            UpstreamExt upstreamExt = new UpstreamExt();
+            upstreamExt.setUpstream(upstream);
+
+            List<String> str = new ArrayList<String>();
+            List<UpstreamServer> servers = upstreamService.getUpstreamServers(upstream.getId());
+            for (UpstreamServer upstreamServer : servers) {
+                str.add(buildStr(upstreamServer, upstream.getProxyType()));
+            }
+
+            upstreamExt.setServerStr(StrUtil.join("", str));
+            list.add(upstreamExt);
+        }
+        page.setRecords(list);
+
+        modelAndView.addObject("page", page);
+        modelAndView.addObject("keywords", keywords);
+
+        modelAndView.addObject("upstreamMonitor", settingService.get("upstreamMonitor"));
+        modelAndView.setViewName("/adminPage/upstream/index");
+        return modelAndView;
+    }
+
+    public String buildStr(UpstreamServer upstreamServer, Integer proxyType) {
+        String status = m.get("upstreamStr.noStatus");
+        if (!"none".equals(upstreamServer.getStatus())) {
+            status = upstreamServer.getStatus();
+        }
+
+        String monitorStatus = "";
+
+        String upstreamMonitor = settingService.get("upstreamMonitor");
+        if ("true".equals(upstreamMonitor)) {
+            monitorStatus += "<td class='short50'>";
+            if (upstreamServer.getMonitorStatus() == -1) {
+                monitorStatus += "<span class='gray'>" + m.get("upstreamStr.gray") + "</span>";
+            } else if (upstreamServer.getMonitorStatus() == 1) {
+                monitorStatus += "<span class='green'>" + m.get("upstreamStr.green") + "</span>";
+            } else {
+                monitorStatus += "<span class='red'>" + m.get("upstreamStr.red") + "</span>";
+            }
+            monitorStatus += "</td>";
+        }
+
+        if (upstreamServer.getServer().contains(":")) {
+            upstreamServer.setServer("[" + upstreamServer.getServer() + "]");
+        }
+
+        String html = "<tr><td class='short100'>" + upstreamServer.getServer() + ":" + upstreamServer.getPort() + "</td><td>";
+
+        if (upstreamServer.getWeight() != null) {
+            html += "weight=" + upstreamServer.getWeight() + " ";
+        }
+        if (upstreamServer.getFailTimeout() != null) {
+            html += "fail_timeout=" + upstreamServer.getFailTimeout() + "s ";
+        }
+        if (upstreamServer.getMaxFails() != null) {
+            html += "max_fails=" + upstreamServer.getMaxFails() + " ";
+        }
+        if (upstreamServer.getMaxConns() != null) {
+            html += "max_conns=" + upstreamServer.getMaxConns() + " ";
+        }
+        html += "</td><td class='short50'>" + status + "</td>" + monitorStatus + "</tr>";
+        return html;
+    }
+
+    @RequestMapping("addOver")
+    @ResponseBody
+    public JsonResult addOver(String upstreamJson, String upstreamParamJson, String upstreamServerJson) {
+        Upstream upstream = JSONUtil.toBean(upstreamJson, Upstream.class);
+        List<UpstreamServer> upstreamServers = JSONUtil.toList(JSONUtil.parseArray(upstreamServerJson), UpstreamServer.class);
+
+
+        if (StrUtil.isEmpty(upstream.getId())) {
+            upstream.setSeq(SnowFlakeUtils.getId());
+        }
+
+        if (StrUtil.isEmpty(upstream.getId())) {
+            Long count = upstreamService.getCountByName(upstream.getName());
+            if (count > 0) {
+                return renderError(m.get("upstreamStr.sameName"));
+            }
+        } else {
+            Long count = upstreamService.getCountByNameWithOutId(upstream.getName(), upstream.getId());
+            if (count > 0) {
+                return renderError(m.get("upstreamStr.sameName"));
+            }
+        }
+
+        upstreamService.addOver(upstream, upstreamServers, upstreamParamJson);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("detail")
+    @ResponseBody
+    public JsonResult detail(String id) {
+
+        UpstreamExt upstreamExt = new UpstreamExt();
+        upstreamExt.setUpstream(sqlHelper.findById(id, Upstream.class));
+        upstreamExt.setUpstreamServerList(upstreamService.getUpstreamServers(id));
+
+        upstreamExt.setParamJson(paramService.getJsonByTypeId(upstreamExt.getUpstream().getId(), "upstream"));
+
+        return renderSuccess(upstreamExt);
+    }
+
+    @RequestMapping("del")
+    @ResponseBody
+    public JsonResult del(String id) {
+
+        upstreamService.del(id);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("setMonitor")
+    @ResponseBody
+    public JsonResult setMonitor(String id, Integer monitor) {
+        Upstream upstream = new Upstream();
+        upstream.setId(id);
+        upstream.setMonitor(monitor);
+        sqlHelper.updateById(upstream);
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("upstreamStatus")
+    @ResponseBody
+    public JsonResult upstreamStatus(HttpSession httpSession) {
+        Map<String, String> map = new HashMap<>();
+        map.put("mail", settingService.get("mail"));
+
+        String upstreamMonitor = settingService.get("upstreamMonitor");
+        map.put("upstreamMonitor", upstreamMonitor != null ? upstreamMonitor : "false");
+
+        return renderSuccess(map);
+    }
+
+    @RequestMapping("upstreamOver")
+    @ResponseBody
+    public JsonResult upstreamOver(String mail, String upstreamMonitor) {
+        settingService.set("mail", mail);
+        settingService.set("upstreamMonitor", upstreamMonitor);
+
+        if (upstreamMonitor.equals("true")) {
+            upstreamService.resetMonitorStatus();
+        }
+
+        return renderSuccess();
+    }
+
+    @RequestMapping("setOrder")
+    @ResponseBody
+    public JsonResult setOrder(String id, Integer count) {
+        upstreamService.setSeq(id, count);
+        return renderSuccess();
+    }
 
 }
-- 
Gitee