Jelajahi Sumber

Merge branch 'feature/java11' into 'develop'

fix

See merge request o2oa/o2oa!1520
o2null 5 tahun lalu
induk
melakukan
e9d78a2940

+ 2 - 2
o2server/x_console/src/main/java/com/x/server/console/Main.java

@@ -82,7 +82,7 @@ public class Main {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-	});
+	}, "swapCommandThread");
 
 	private static final Thread consoleCommandThread = new Thread(() -> {
 		// 将屏幕命令输出到解析器
@@ -100,7 +100,7 @@ public class Main {
 		} catch (Exception e) {
 			System.out.println("console input closed!");
 		}
-	});
+	}, "consoleCommandThread");
 
 	private static void init() throws Exception {
 		String base = getBasePath();

+ 3 - 0
o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java

@@ -323,6 +323,9 @@ public class ApplicationServerTools extends JettySeverTools {
 				PathUtils.cleanDirectory(dir);
 			}
 			JarTools.unjar(war, "", dir, true);
+			if (!Files.exists(lastModified)) {
+				Files.createFile(Files.createDirectories(lastModified));
+			}
 			FileUtils.writeStringToFile(lastModified.toFile(), Files.getLastModifiedTime(lastModified).toMillis() + "",
 					DefaultCharset.charset_utf_8, false);
 		}