1

Author: cym1102

README.md

@@ -111,9 +111,9 @@ Path : JDK安装目录\bin
 
 ```
 Linux: mkdir /home/nginxWebUI/ 
-       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.5/nginxWebUI-4.3.5.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.6/nginxWebUI-4.3.6.jar
 
-Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.5/nginxWebUI-4.3.5.jar 到 D:/home/nginxWebUI/nginxWebUI.jar
+Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.6/nginxWebUI-4.3.6.jar 到 D:/home/nginxWebUI/nginxWebUI.jar
 ```
 
 有新版本只需要修改路径中的版本即可

README_EN.md

@@ -107,9 +107,9 @@ reboot
 
 ```
 Linux: mkdir /home/nginxWebUI/   
-       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.5/nginxWebUI-4.3.5.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.6/nginxWebUI-4.3.6.jar
 
-Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.5/nginxWebUI-4.3.5.jar into D:/home/nginxWebUI/
+Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.3.6/nginxWebUI-4.3.6.jar into D:/home/nginxWebUI/
 ```
 
 With a new version, you just need to change the version in the path

pom.xml

@@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.cym</groupId>
 	<artifactId>nginxWebUI</artifactId>
-	<version>4.3.5</version>
+	<version>4.3.6</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/cym/NginxWebUI.java

@@ -18,7 +18,6 @@
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RuntimeUtil;
-import cn.hutool.core.util.StrUtil;
 
 @EnableScheduling
 @SolonMain
@@ -27,8 +26,6 @@ public class NginxWebUI {
 
 	public static void main(String[] args) {
 		boolean findPass = false;
-		String initAdmin = null;
-		String initPass = null;
 
 		if (args != null) {
 			for (String arg : args) {
@@ -37,8 +34,6 @@ public static void main(String[] args) {
 				}
 			}
 		}
-
-	
 
 		try {
 			if (!findPass) {

src/main/java/com/cym/config/InitConfig.java

@@ -229,6 +229,7 @@ private void showLogo() throws IOException {
 
 	}
 
+	@Deprecated
 	private void transferSql() {
 		// 关闭sqlite连接
 		dataSourceEmbed.getDataSource().close();

src/main/java/com/cym/config/VersionConfig.java

@@ -23,7 +23,7 @@
 import cn.hutool.json.JSONUtil;
 
 @Component
-public class VersionConfig  {
+public class VersionConfig {
 	Logger logger = LoggerFactory.getLogger(VersionConfig.class);
 
 	public Version newVersion;
@@ -32,17 +32,15 @@ public class VersionConfig  {
 
 	@Init
 	public void afterInjection() {
-		checkVersion();
-	}
-
-	public void checkVersion(){
 		// 获取版本号
 		try {
 			currentVersion = getFromPom();
 		} catch (Exception e) {
 			logger.info(e.getMessage(), e);
 		}
+	}
 
+	public void checkVersion() {
 		// 获取服务器最新版本
 		try {
 			String json = HttpUtil.get("https://www.nginxwebui.cn/download/version.json", 1000);
@@ -54,7 +52,7 @@ public void checkVersion(){
 
 		}
 	}
-	
+
 	public String getFromPom() throws IOException, XmlPullParserException {
 
 		// 查看jar包里面pom.properties版本号

src/main/java/com/cym/controller/adminPage/LoginController.java

@@ -30,6 +30,7 @@
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -142,9 +143,6 @@ public JsonResult submitLogin(String name, String pass, String code, String auth
 		Context.current().sessionSet("admin", admin);
 		Context.current().sessionRemove("imgCode"); // 立刻销毁验证码
 
-		// 检查更新
-		versionConfig.checkVersion();
-
 		return renderSuccess(admin);
 	}
 
@@ -160,8 +158,6 @@ public JsonResult autoLogin(String autoKey) {
 			Context.current().sessionSet("admin", admin);
 			Context.current().sessionRemove("imgCode"); // 立刻销毁验证码
 
-			// 检查更新
-			versionConfig.checkVersion();
 
 			return renderSuccess(admin);
 		} else {
@@ -335,5 +331,4 @@ public JsonResult changeLang(String lang) {
 		return renderSuccess();
 	}
 
-
 }

src/main/java/com/cym/task/ScheduleTask.java

@@ -15,6 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.cym.config.HomeConfig;
+import com.cym.config.VersionConfig;
 import com.cym.controller.adminPage.CertController;
 import com.cym.controller.adminPage.ConfController;
 import com.cym.controller.adminPage.RemoteController;
@@ -73,7 +74,15 @@ public class ScheduleTask {
 	HomeConfig homeConfig;
 	@Inject
 	BLogFileTailer bLogFileTailer;
+	@Inject
+	VersionConfig versionConfig;
 
+	// 检查更新
+	@Scheduled(cron = "0 0 0 * * ?")
+	public void checkUpdate() {
+		versionConfig.checkVersion();
+	}
+		
 	// 续签证书
 	@Scheduled(cron = "0 0 0/2 * * ?")
 	public void certTasks() {

src/main/resources/WEB-INF/view/adminPage/server/index.html

@@ -80,6 +80,10 @@
 	width: 120px;
 }
 
+.middle{
+	width: 200px;
+}
+
 .long {
 	width: 300px;
 	display: inline-block;

src/main/resources/static/js/adminPage/server/index.js

@@ -618,7 +618,7 @@ function buildHtml(uuid, location, upstreamSelect) {
 				</td>
 				<td>
 					<div class="layui-inline" >
-						<input type="text" name="path" class="layui-input short" value="${location.path}">
+						<input type="text" name="path" class="layui-input middle" value="${location.path}">
 					</div>
 				</td>
 				<td>
@@ -636,7 +636,7 @@ function buildHtml(uuid, location, upstreamSelect) {
 				<td style="width: 740px;">
 					<span name="valueSpan">
 						<div class="layui-inline">
-							<input type="text"  style="width: 277px;" name="value" id="value_${uuid}" class="layui-input long" value=""  placeholder="${serverStr.example}：http://127.0.0.1:8080">
+							<input type="text"  name="value" id="value_${uuid}" class="layui-input middle" value=""  placeholder="${serverStr.example}：http://127.0.0.1:8080">
 						</div>
 					</span>