maven 配置调整

zgdkik · Apr 28, 2019 · ad3149c · ad3149c
1 parent 76aab80
commit ad3149c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git a/main/pom.xml b/main/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.pdown.gui</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>proxyee-down</artifactId>
     <version>3.0</version>
   </parent>
 

diff --git a/main/src/main/java/org/pdown/gui/http/controller/NativeController.java b/main/src/main/java/org/pdown/gui/http/controller/NativeController.java
@@ -4,31 +4,9 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.netty.channel.Channel;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpVersion;
-import java.awt.Desktop;
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
-import java.awt.datatransfer.Transferable;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.Function;
+import io.netty.handler.codec.http.*;
 import javafx.application.Platform;
-import javax.script.Invocable;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.SimpleScriptContext;
+import jdk.nashorn.internal.runtime.Undefined;
 import org.pdown.core.boot.HttpDownBootstrap;
 import org.pdown.core.dispatch.HttpDownCallback;
 import org.pdown.core.util.OsUtil;
@@ -57,6 +35,19 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @RequestMapping("native")
 public class NativeController {
 
@@ -447,7 +438,7 @@ public FullHttpResponse onResolve(Channel channel, FullHttpRequest request) thro
             try {
               //执行resolve方法
               Object result = ExtensionUtil.invoke(extensionInfo, event, taskRequest, false);
-              if (result != null) {
+              if (result != null && !(result instanceof Undefined)) {
                 ObjectMapper objectMapper = new ObjectMapper();
                 String temp = objectMapper.writeValueAsString(result);
                 TaskForm taskForm = objectMapper.readValue(temp, TaskForm.class);

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.pdown.gui</groupId>
-  <artifactId>parent</artifactId>
+  <artifactId>proxyee-down</artifactId>
   <version>3.0</version>
   <packaging>pom</packaging>
 

diff --git a/runner/pom.xml b/runner/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.pdown.gui</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>proxyee-down</artifactId>
     <version>3.0</version>
   </parent>