From 296141b7b403d582d16b12f71c47057a785407cc Mon Sep 17 00:00:00 2001 From: afan <185085781@qq.com> Date: Thu, 29 Feb 2024 08:48:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=8A=A5=E9=94=99=E6=97=A0?= =?UTF-8?q?=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/tenfell/webos/common/util/ProjectUtil.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/api/src/main/java/cn/tenfell/webos/common/util/ProjectUtil.java b/api/src/main/java/cn/tenfell/webos/common/util/ProjectUtil.java index edf6b59..9c329ac 100644 --- a/api/src/main/java/cn/tenfell/webos/common/util/ProjectUtil.java +++ b/api/src/main/java/cn/tenfell/webos/common/util/ProjectUtil.java @@ -2,7 +2,6 @@ package cn.tenfell.webos.common.util; import java.io.File; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; @@ -47,7 +46,6 @@ import cn.tenfell.webos.common.webdav.WebdavUtil; public class ProjectUtil { private static Log log = LogFactory.get(); - public static String jmPublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyCKDubntmD36NAS0EqUY6re+GVCVZr2y/poNdC0AG9sTYURtt6qmfF2SBgJydceyYKV8AZ7zV3QKpa2ieqmTBLRsB4JIEQovzcQyNVWY90XPd10LG6f9WshWdCArwBp2VchKhL86fm5pypvqtIih+kFGfOoocQ+NAafOwVrD3JwIDAQAB"; public static JSONObject softVersion; private static final ThreadLocal currentContext = new ThreadLocal<>(); // 配置文件路径 @@ -96,7 +94,7 @@ public class ProjectUtil { } public static void authRestart(Throwable e) { - if(e != null){ + if (e != null) { e = ExceptionUtil.getRootCause(e); if (!"InaccessibleObjectException".equals(e.getClass().getSimpleName())) { return; @@ -195,9 +193,6 @@ public class ProjectUtil { startConfig.set("projectName", "webos" + IdUtil.getSnowflakeNextId()); needSave = true; } - if (needSave) { - FileUtil.writeUtf8String(startConfig.toString(), startConfigPath); - } noErrorMethod(ProjectUtil::settingKaijiAction); noErrorMethod(FrameStartUtil::pringInfo); log.info("webos started in jdk:{}", System.getProperty("java.version")); @@ -218,9 +213,8 @@ public class ProjectUtil { } } } - if (StrUtil.isNotBlank(webRootPath.get())) { - FileUtil.writeBytes(FrameStartUtil.logo, webRootPath.get() + "/imgs/logo.png"); - FileUtil.writeBytes(FrameStartUtil.logo, webRootPath.get() + "/common/smart-ui/expand/logo_32.png"); + if (needSave) { + FileUtil.writeUtf8String(startConfig.toString(), startConfigPath); } int port = startConfig.getInt("port"); Solon.start(ProjectUtil.class, ArrayUtil.append(new String[0], "--server.port=" + port), app -> {