feat: implement dynamic log directory resolution for portable and standard modes

Author: lakernote

easy-postman-app/src/main/java/com/laker/postman/logging/LogHomePropertyDefiner.java

@@ -0,0 +1,24 @@
+package com.laker.postman.logging;
+
+import ch.qos.logback.core.PropertyDefinerBase;
+import com.laker.postman.util.AppRuntimeLayout;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * 根据运行形态解析日志目录，确保便携版日志写入程序所在目录下的 logs。
+ */
+public class LogHomePropertyDefiner extends PropertyDefinerBase {
+
+    @Override
+    public String getPropertyValue() {
+        Path logDir = AppRuntimeLayout.logRootDirectory(LogHomePropertyDefiner.class);
+        try {
+            Files.createDirectories(logDir);
+        } catch (Exception ignored) {
+            // 目录创建失败时交由 logback 在后续初始化阶段报告具体错误。
+        }
+        return logDir.toString();
+    }
+}

easy-postman-app/src/main/resources/logback.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 定义日志文件存储路径变量，使用用户主目录下的 EasyPostman/logs 文件夹 -->
-    <!-- 应用程序标识和环境配置 -->
-    <property name="APP_NAME" value="EasyPostman"/>
-    <property name="LOG_HOME" value="${user.home}/${APP_NAME}/logs"/>
+    <!-- 便携版写入应用根目录/logs，安装版写入用户主目录/EasyPostman/logs -->
+    <define name="LOG_HOME" class="com.laker.postman.logging.LogHomePropertyDefiner"/>
     <!-- 支持通过系统属性覆盖日志级别，默认为 INFO -->
     <property name="LOG_LEVEL" value="${LOG_LEVEL:-INFO}"/>
 

easy-postman-app/src/test/java/com/laker/postman/service/js/PostmanBuiltinLibrariesTest.java

@@ -72,6 +72,7 @@ public void restoreSettings() {
     @BeforeMethod
     public void setUp() {
         log.info("初始化 JavaScript 执行环境...");
+        resetScriptSettingsToDefaults();
         context = Context.newBuilder("js")
                 .allowHostAccess(HostAccess.ALL)
                 .allowHostClassLookup(className -> false)
@@ -653,6 +654,15 @@ private void restoreScriptSettings() {
         SettingManager.setRemoteJsRequireMaxBytes(originalRemoteMaxBytes);
     }
 
+    private void resetScriptSettingsToDefaults() {
+        SettingManager.setRemoteJsRequireEnabled(false);
+        SettingManager.setInsecureRemoteJsRequireEnabled(false);
+        SettingManager.setRemoteJsRequireAllowedHosts("");
+        SettingManager.setRemoteJsRequireConnectTimeoutMs(3000);
+        SettingManager.setRemoteJsRequireReadTimeoutMs(5000);
+        SettingManager.setRemoteJsRequireMaxBytes(512 * 1024);
+    }
+
     private String toJsString(String raw) {
         return raw.replace("\\", "\\\\").replace("'", "\\'");
     }

easy-postman-app/src/test/java/com/laker/postman/service/update/asset/RuntimeModeConsistencyTest.java

@@ -1,6 +1,7 @@
 package com.laker.postman.service.update.asset;
 
 import com.laker.postman.plugin.runtime.PluginRuntime;
+import com.laker.postman.util.AppRuntimeLayout;
 import com.laker.postman.util.SystemUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -43,6 +44,7 @@ public void shouldResolvePortableModeConsistentlyAcrossModules() throws Exceptio
 
         assertTrue(WindowsVersionDetector.isPortableVersion());
         assertEquals(Paths.get(SystemUtil.getEasyPostmanPath()).normalize(), appDir.resolve("data"));
+        assertEquals(AppRuntimeLayout.logRootDirectory(RuntimeModeConsistencyTest.class), appDir.resolve("logs"));
         assertEquals(PluginRuntime.getManagedPluginDir(), appDir.resolve("plugins"));
         assertEquals(PluginRuntime.getPluginPackageDir(), appDir.resolve("plugins").resolve("packages"));
     }
@@ -52,9 +54,11 @@ public void shouldTreatJarStyleLaunchAsInstalledModeByDefault() {
         System.setProperty("easyPostman.app.dir", appDir.toString());
 
         Path expectedDataRoot = Paths.get(System.getProperty("user.home"), "EasyPostman").toAbsolutePath().normalize();
+        Path expectedLogRoot = expectedDataRoot.resolve("logs");
 
         assertFalse(WindowsVersionDetector.isPortableVersion());
         assertEquals(Paths.get(SystemUtil.getEasyPostmanPath()).normalize(), expectedDataRoot);
+        assertEquals(AppRuntimeLayout.logRootDirectory(RuntimeModeConsistencyTest.class), expectedLogRoot);
         assertEquals(PluginRuntime.getManagedPluginDir(), expectedDataRoot.resolve("plugins").resolve("installed"));
         assertEquals(PluginRuntime.getPluginPackageDir(), expectedDataRoot.resolve("plugins").resolve("packages"));
     }

easy-postman-plugin-bridge/src/main/java/com/laker/postman/common/constants/ConfigPathConstants.java

@@ -1,6 +1,7 @@
 package com.laker.postman.common.constants;
 
 import com.laker.postman.model.Workspace;
+import com.laker.postman.util.AppRuntimeLayout;
 import com.laker.postman.util.SystemUtil;
 import lombok.experimental.UtilityClass;
 
@@ -96,10 +97,11 @@ private static String getDataRootPath() {
 
     /**
      * 日志目录
-     * 使用用户主目录，与 logback.xml 配置保持一致
+     * Portable 模式：程序所在目录/logs/
+     * 普通模式：用户主目录/EasyPostman/logs/
      */
-    public static final String LOG_DIR = System.getProperty("user.home") + File.separator +
-            AppConstants.APP_NAME + File.separator + "logs" + File.separator;
+    public static final String LOG_DIR = AppRuntimeLayout.logRootDirectory(ConfigPathConstants.class).toString()
+            + File.separator;
 
     // ==================== 工作区相关路径方法 ====================
 

easy-postman-plugin-bridge/src/main/java/com/laker/postman/util/AppRuntimeLayout.java

@@ -75,6 +75,13 @@ public static Path dataRootDirectory(Class<?> anchorClass) {
         return Paths.get(System.getProperty("user.home"), "EasyPostman").toAbsolutePath().normalize();
     }
 
+    public static Path logRootDirectory(Class<?> anchorClass) {
+        if (isPortableMode(anchorClass)) {
+            return applicationRootDirectory(anchorClass).resolve("logs").toAbsolutePath().normalize();
+        }
+        return Paths.get(System.getProperty("user.home"), "EasyPostman", "logs").toAbsolutePath().normalize();
+    }
+
     private static boolean hasPortableMarker(Path directory) {
         if (directory == null) {
             return false;