1

Author: cym1102

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.21
+FROM alpine:3.22
 ENV LANG=zh_CN.UTF-8 \
     TZ=Asia/Shanghai \
     PS1="\u@\h:\w \$ "

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

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

@@ -290,8 +290,8 @@ private String getKey(String rs) {
 	private String getPem(String rs) {
 		String[] lines = rs.split("\n");
 		for (String line : lines) {
-			if (line.contains("And the full chain certs is there:")) {
-				return line.split("And the full chain certs is there:")[1].trim().replace("\\", "/").replace("//", "/");
+			if (line.contains("And the full-chain cert is in:")) {
+				return line.split("And the full-chain cert is in:")[1].trim().replace("\\", "/").replace("//", "/");
 			}
 		}
 
@@ -328,8 +328,12 @@ private String[] getEnv(Cert cert) {
 			}
 			if (cert.getDnsType().equals("cfToken")) {
 				list.add("CF_Token=" + cert.getCfToken());
-				list.add("CF_Account_ID=" + cert.getCfAccountId());
-				list.add("CF_Zone_ID=" + cert.getCfZoneId());
+				if (StrUtil.isNotEmpty(cert.getCfAccountId())) {
+					list.add("CF_Account_ID=" + cert.getCfAccountId());
+				}
+				if (StrUtil.isNotEmpty(cert.getCfZoneId())) {
+					list.add("CF_Zone_ID=" + cert.getCfZoneId());
+				}
 			}
 			if (cert.getDnsType().equals("gd")) {
 				list.add("GD_Key=" + cert.getGdKey());

src/main/java/com/cym/utils/TimeExeUtils.java

@@ -38,7 +38,11 @@ public String execCMD(String cmd, String[] envs, long timeout) {
 			ProcessBuilder processBuilder = new ProcessBuilder("/bin/sh", "-c", cmd);
 			Map<String, String> environmentMap = processBuilder.environment();
 			for (String env : envs) {
-				environmentMap.put(env.split("=")[0], env.split("=")[1]);
+				String[] arrays = env.split("=");
+				String key = arrays.length > 0 ? arrays[0] : "";
+				String value = arrays.length > 1 ? arrays[1] : "";
+				
+				environmentMap.put(key, value);
 			}
 			processBuilder.redirectErrorStream(true);// 将错误流中的数据合并到输入流
 			process = processBuilder.start();
@@ -60,7 +64,7 @@ public String execCMD(String cmd, String[] envs, long timeout) {
 						process.exitValue();
 						break;
 					} catch (IllegalThreadStateException e) {
-						//System.err.println(e.getMessage());
+						// System.err.println(e.getMessage());
 					}
 				}