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.2.7/nginxWebUI-4.2.7.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.8/nginxWebUI-4.2.8.jar
 
-Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.7/nginxWebUI-4.2.7.jar 到 D:/home/nginxWebUI/nginxWebUI.jar
+Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.8/nginxWebUI-4.2.8.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.2.7/nginxWebUI-4.2.7.jar
+       wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.8/nginxWebUI-4.2.8.jar
 
-Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.7/nginxWebUI-4.2.7.jar into D:/home/nginxWebUI/
+Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.2.8/nginxWebUI-4.2.8.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.2.7</version>
+	<version>4.2.8</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -38,6 +38,7 @@
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -88,7 +89,7 @@ public void start() throws Throwable {
 			List<Admin> admins = sqlHelper.findAll(Admin.class);
 			for (Admin admin : admins) {
 				String randomPass = RandomUtil.randomString(8);
-				
+
 				System.out.println(m.get("adminStr.name") + ":" + admin.getName() + " " + m.get("adminStr.pass") + ":" + randomPass);
 				admin.setAuth(false); // 关闭二次验证
 				admin.setPass(EncodePassUtils.encode(randomPass));
@@ -163,24 +164,37 @@ public void start() throws Throwable {
 				settingService.set("nginxExe", "nginx");
 			}
 
-			// 重启nginx, 拿到pid
-			String nginxExe = settingService.get("nginxExe");
-			String nginxDir = settingService.get("nginxDir");
-			if (StrUtil.isNotEmpty(nginxExe) && StrUtil.isNotEmpty(nginxPath)) {
-				RuntimeUtil.exec("/bin/sh", "-c", "pkill -9 nginx");
-				
-				String cmd = nginxExe + " -c " + nginxPath;
-				if (StrUtil.isNotEmpty(nginxDir)) {
-					cmd += " -p " + nginxDir;
+			// 异步重启nginx, 拿到pid
+			ThreadUtil.execute(new Runnable() {
+
+				@Override
+				public void run() {
+
+					String nginxExe = settingService.get("nginxExe");
+					String nginxDir = settingService.get("nginxDir");
+					String nginxPath = settingService.get("nginxPath");
+					if (StrUtil.isNotEmpty(nginxExe) && StrUtil.isNotEmpty(nginxPath)) {
+						runCmd("pkill -9 nginx");
+						String cmd = nginxExe + " -c " + nginxPath;
+						if (StrUtil.isNotEmpty(nginxDir)) {
+							cmd += " -p " + nginxDir;
+						}
+						runCmd(cmd);
+					}
 				}
-				RuntimeUtil.exec("/bin/sh", "-c", cmd);
-			}
+
+			});
 		}
 
 		// 展示logo
 		showLogo();
 	}
 
+	private void runCmd(String cmd) {
+		logger.info("run: " + cmd);
+		RuntimeUtil.execForStr("/bin/sh", "-c", cmd);
+	}
+
 	private boolean hasNginx() {
 		String rs = RuntimeUtil.execForStr("which nginx");
 		if (StrUtil.isNotEmpty(rs)) {