ZhangYuanSheng1217 · EverettSy · Sep 22, 2024
diff --git a/build.gradle b/build.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,58 @@
+plugins {
+    id("java")
+    id("org.jetbrains.kotlin.jvm") version "2.0.20"
+    id("org.jetbrains.intellij") version "1.17.4"
+}
+
+dependencies {
+    implementation("cn.hutool:hutool-all:5.8.18")
+    implementation("org.dom4j:dom4j:2.1.4")
+}
+
+group = "cn.cloud.auto.restful.tool"
+version = "1.5.2"
+
+repositories {
+    mavenLocal()
+    maven("https://maven.aliyun.com/nexus/content/repositories/central/")
+    mavenCentral()
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+intellij {
+    updateSinceUntilBuild.set(true)
+    version.set("2023.3.7")
+    type.set("IC") // Target IDE Platform
+    pluginName.set("RestfulTool")
+    plugins.set(listOf("java","properties","yaml","Kotlin"))
+
+}
+
+
+tasks {
+    // Set the JVM compatibility versions
+    withType<JavaCompile> {
+        sourceCompatibility = "17"
+        targetCompatibility = "17"
+    }
+
+    patchPluginXml {
+        // 最低版本
+        sinceBuild.set("233")
+        // 最高版本
+        untilBuild.set("242.*")
+    }
+
+    signPlugin {
+        certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
+        privateKey.set(System.getenv("PRIVATE_KEY"))
+        password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
+    }
+
+    publishPlugin {
+        token.set(System.getenv("PUBLISH_TOKEN"))
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "RestfulTool"
+
diff --git a/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java b/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java
@@ -15,6 +15,7 @@
 import com.github.restful.tool.view.window.WindowFactory;
 import com.github.restful.tool.view.window.frame.Window;
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.ToggleAction;
@@ -38,6 +39,10 @@ public WithLibraryAction() {
 
     @Override
     public boolean isSelected(@NotNull AnActionEvent e) {
+        Project data = e.getData(CommonDataKeys.PROJECT);
+        if (null == data) {
+            return false;
+        }
         return Storage.scanServiceWithLibrary(e.getRequiredData(CommonDataKeys.PROJECT));
     }
 
@@ -59,4 +64,10 @@ private Window getToolWindow(@Nullable Project project) {
         }
         return (toolWindow = WindowFactory.getToolWindow(project));
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
 }
diff --git a/src/main/java/com/github/restful/tool/service/ToolWindowService.java b/src/main/java/com/github/restful/tool/service/ToolWindowService.java
@@ -37,7 +37,7 @@ static ToolWindowService getInstance(@NotNull Project project) {
      * @param toolWindow toolWindow
      */
     default void init(@NotNull ToolWindow toolWindow) {
-        ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
+        ContentFactory contentFactory = ContentFactory.getInstance();
         Content content = contentFactory.createContent(getContent(), "", false);
 
         toolWindow.getContentManager().addContent(content);

diff --git a/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java b/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java
@@ -1,57 +1,58 @@
-/*
-  Copyright (C), 2018-2020, ZhangYuanSheng
-  FileName: FileAppender
-  Author:   ZhangYuanSheng
-  Date:     2020/7/17 17:05
-  Description: 
-  History:
-  <author>          <time>          <version>          <desc>
-  作者姓名            修改时间           版本号              描述
- */
-package com.github.restful.tool.utils.diagnostic;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author ZhangYuanSheng
- * @version 1.0
- */
-public class FileAppender extends org.apache.log4j.FileAppender {
-
-    public static final String DEFAULT_PATTERN = "[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n";
-
-    public FileAppender(@NotNull String logFile) {
-        this(logFile, DEFAULT_PATTERN);
-    }
-
-    public FileAppender(@NotNull String logFile, @NotNull String pattern) {
-        setFile(logFile);
-        setEncoding("utf-8");
-        setLayout(new PatternLayout(pattern));
-        activateOptions();
-    }
-
-    public void applyDebug(@NotNull Logger logger) {
-        apply(logger, Level.DEBUG);
-    }
-
-    public void applyInfo(@NotNull Logger logger) {
-        apply(logger, Level.INFO);
-    }
-
-    public void applyWarn(@NotNull Logger logger) {
-        apply(logger, Level.WARN);
-    }
-
-    public void applyError(@NotNull Logger logger) {
-        apply(logger, Level.ERROR);
-    }
-
-    public void apply(@NotNull Logger logger, @NotNull Level level) {
-        logger.setLevel(level);
-        logger.addAppender(this);
-    }
-}
+///*
+//  Copyright (C), 2018-2020, ZhangYuanSheng
+//  FileName: FileAppender
+//  Author:   ZhangYuanSheng
+//  Date:     2020/7/17 17:05
+//  Description:
+//  History:
+//  <author>          <time>          <version>          <desc>
+//  作者姓名            修改时间           版本号              描述
+// */
+//package com.github.restful.tool.utils.diagnostic;
+//
+//import org.apache.log4j.Level;
+//import org.apache.log4j.Logger;
+//import org.apache.log4j.PatternLayout;
+//import org.jetbrains.annotations.NotNull;
+//
+///**
+// * @author ZhangYuanSheng
+// * @version 1.0
+// */
+//public class FileAppender extends org.apache.log4j.FileAppender {
+//
+//    public static final String DEFAULT_PATTERN = "[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n";
+//
+//    public FileAppender(@NotNull String logFile) {
+//        this(logFile, DEFAULT_PATTERN);
+//    }
+//
+//    public FileAppender(@NotNull String logFile, @NotNull String pattern) {
+//        //setFile(logFile);
+//        //setEncoding("utf-8");
+//
+//        setLayout(new PatternLayout(pattern));
+//        activateOptions();
+//    }
+//
+//    public void applyDebug(@NotNull Logger logger) {
+//        apply(logger, Level.DEBUG);
+//    }
+//
+//    public void applyInfo(@NotNull Logger logger) {
+//        apply(logger, Level.INFO);
+//    }
+//
+//    public void applyWarn(@NotNull Logger logger) {
+//        apply(logger, Level.WARN);
+//    }
+//
+//    public void applyError(@NotNull Logger logger) {
+//        apply(logger, Level.ERROR);
+//    }
+//
+//    public void apply(@NotNull Logger logger, @NotNull Level level) {
+//        logger.setLevel(level);
+//        logger.addAppender(this);
+//    }
+//}
diff --git a/src/main/java/com/github/restful/tool/utils/diagnostic/LoggerManager.java b/src/main/java/com/github/restful/tool/utils/diagnostic/LoggerManager.java
@@ -1,48 +1,48 @@
-/*
-  Copyright (C), 2018-2020, ZhangYuanSheng
-  FileName: LoggerManager
-  Author:   ZhangYuanSheng
-  Date:     2020/7/17 16:54
-  Description: 
-  History:
-  <author>          <time>          <version>          <desc>
-  作者姓名            修改时间           版本号              描述
- */
-package com.github.restful.tool.utils.diagnostic;
-
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author ZhangYuanSheng
- * @version 1.0
- */
-public class LoggerManager {
-
-    /**
-     * 日志文件存储位置
-     */
-    public static final String LOG_FILE = "E://logs/RestfulTool.log";
-
-    private static FileAppender FILE_APPENDER;
-
-    @NotNull
-    private static FileAppender getAppender() {
-        if (FILE_APPENDER == null) {
-            FILE_APPENDER = new FileAppender(LOG_FILE);
-        }
-        return FILE_APPENDER;
-    }
-
-    @NotNull
-    public static Logger getLogger(@NotNull String className) {
-        Logger logger = Logger.getLogger(className);
-        getAppender().applyDebug(logger);
-        return logger;
-    }
-
-    @NotNull
-    public static org.apache.log4j.Logger getLogger(@NotNull Class<?> clazz) {
-        return getLogger(clazz.getName());
-    }
-}
+///*
+//  Copyright (C), 2018-2020, ZhangYuanSheng
+//  FileName: LoggerManager
+//  Author:   ZhangYuanSheng
+//  Date:     2020/7/17 16:54
+//  Description:
+//  History:
+//  <author>          <time>          <version>          <desc>
+//  作者姓名            修改时间           版本号              描述
+// */
+//package com.github.restful.tool.utils.diagnostic;
+//
+//import org.apache.log4j.Logger;
+//import org.jetbrains.annotations.NotNull;
+//
+///**
+// * @author ZhangYuanSheng
+// * @version 1.0
+// */
+//public class LoggerManager {
+//
+//    /**
+//     * 日志文件存储位置
+//     */
+//    public static final String LOG_FILE = "E://logs/RestfulTool.log";
+//
+//    private static FileAppender FILE_APPENDER;
+//
+//    @NotNull
+//    private static FileAppender getAppender() {
+//        if (FILE_APPENDER == null) {
+//            FILE_APPENDER = new FileAppender(LOG_FILE);
+//        }
+//        return FILE_APPENDER;
+//    }
+//
+//    @NotNull
+//    public static Logger getLogger(@NotNull String className) {
+//        Logger logger = Logger.getLogger(className);
+//        getAppender().applyDebug(logger);
+//        return logger;
+//    }
+//
+//    @NotNull
+//    public static org.apache.log4j.Logger getLogger(@NotNull Class<?> clazz) {
+//        return getLogger(clazz.getName());
+//    }
+//}