From 771d1456cc802c2946a7021f6cb574371726e242 Mon Sep 17 00:00:00 2001 From: loy Date: Fri, 6 Aug 2021 16:21:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-48167=20=E4=BF=AE=E5=A4=8D=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=80=A7=E8=83=BD=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/server/LocalAnalyzerAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java index 358de5774f..2db6e6aef0 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java @@ -26,7 +26,7 @@ public class LocalAnalyzerAction extends UpdateAction { @Override public void actionPerformed(ActionEvent e) { - String path = StableUtils.pathJoin("/url", URLConstants.ANALYZE_VIEW); + String path = StableUtils.pathJoin("/nx", URLConstants.ANALYZE_VIEW); DesignUtils.visitEnvServerByParameters(path, new String[]{}, new String[]{}); } From 1a0fc19d1a054c1f4698f1d0cf9cef8bac40089a Mon Sep 17 00:00:00 2001 From: loy Date: Fri, 6 Aug 2021 16:22:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-48135=20=E4=BF=AE=E5=A4=8D=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E8=B0=83=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/nx/app/designer/transform/BatchTransformer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java b/designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java index 0f6a76f833..8dee1ca309 100644 --- a/designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java +++ b/designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java @@ -2,7 +2,6 @@ package com.fr.nx.app.designer.transform; import com.fr.design.utils.concurrent.ThreadFactoryBuilder; import com.fr.file.filetree.FileNode; -import com.fr.plugin.context.PluginContexts; import com.fr.nx.app.designer.toolbar.TransformResultInfo; import com.fr.nx.app.designer.utils.CompileTransformUtil; @@ -10,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * Created by kerry on 2019-12-10 @@ -21,7 +21,7 @@ public class BatchTransformer { private static final int MAXPOOLSIZE = 5; private static final String THREAD_NAME_TEMPLATE = "batchtransform-thread-%s"; private ExecutorService threadPoolExecutor = - PluginContexts.currentContext().newFixedThreadPool(MAXPOOLSIZE, + Executors.newFixedThreadPool(MAXPOOLSIZE, new ThreadFactoryBuilder().setNameFormat(THREAD_NAME_TEMPLATE).build()); public BatchTransformer(UpdateCallBack updateCallBack) { @@ -59,7 +59,7 @@ public class BatchTransformer { if (threadPoolExecutor != null) { threadPoolExecutor.shutdownNow(); } - threadPoolExecutor = PluginContexts.currentContext().newFixedThreadPool(MAXPOOLSIZE, + threadPoolExecutor = Executors.newFixedThreadPool(MAXPOOLSIZE, new ThreadFactoryBuilder().setNameFormat(THREAD_NAME_TEMPLATE).build()); updateCallBack.shutDown(); }