From 6b2454b182e756700fc898b423bce6460c3e157b Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Fri, 26 Nov 2021 16:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=BB=BA=E8=A1=A8=E5=88=86=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=BC=96=E8=AF=912?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../console/server/JettySeverTools.java       | 11 +++---
 .../jaxrs/table/ActionBuildTable.java         |  1 +
 .../jaxrs/table/ActionBuildTableDispatch.java | 36 +++++++++----------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
index a1cb9ef78e..64d12ff528 100644
--- a/o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
+++ b/o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
@@ -9,6 +9,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
+import com.x.base.core.entity.dynamic.DynamicBaseEntity;
+import com.x.base.core.entity.dynamic.DynamicEntity;
+import com.x.base.core.project.tools.ListTools;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
@@ -90,10 +93,10 @@ public abstract class JettySeverTools {
 				jars.add(file.getAbsolutePath());
 			}
 		}
-		for (String str : module.dynamicJars()) {
-			File file = new File(Config.dir_dynamic_jars(), str + ".jar");
-			if (file.exists()) {
-				jars.add(file.getAbsolutePath());
+		if (module.dynamicJars()!=null && module.dynamicJars().length > 0) {
+			IOFileFilter filter = new WildcardFileFilter(DynamicEntity.JAR_PREFIX + "*.jar");
+			for (File o : FileUtils.listFiles(Config.dir_dynamic_jars(), filter, null)) {
+				jars.add(o.getAbsolutePath());
 			}
 		}
 		for (Path path : paths) {
diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java
index d130b02f0f..957bb19eac 100644
--- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java
+++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTable.java
@@ -40,6 +40,7 @@ class ActionBuildTable extends BaseAction {
 				for(Query query : queryList){
 					business.buildAllTable(query.getId());
 				}
+				jar.delete();
 				wo.setValue(true);
 			}else {
 				wo.setValue(business.buildAllTable(queryId));
diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java
index 54cc8ade65..51ef27ecc2 100644
--- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java
+++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildTableDispatch.java
@@ -25,9 +25,9 @@ class ActionBuildTableDispatch extends BaseAction {
 	private static Logger logger = LoggerFactory.getLogger(ActionBuildTableDispatch.class);
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String queryId) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<Wo> result = new ActionResult<>();
-			Wo wo = new Wo();
 			Business business = new Business(emc);
 			if (!business.controllable(effectivePerson)) {
 				throw new ExceptionAccessDenied(effectivePerson);
@@ -36,24 +36,24 @@ class ActionBuildTableDispatch extends BaseAction {
 			if (null == query) {
 				throw new ExceptionEntityNotExist(queryId, Query.class);
 			}
-			List<Application> apps = ThisApplication.context().applications().get(x_query_assemble_designer.class);
-			if (ListTools.isNotEmpty(apps)) {
-				apps.stream().forEach(o -> {
-					String url = o.getUrlJaxrsRoot() + "table/"+ queryId +"/build?tt="+System.currentTimeMillis();
-					logger.info("{} do dispatch build query {} table request to : {}", effectivePerson.getDistinguishedName(), queryId, url);
-					try {
-						CipherConnectionAction.get(effectivePerson.getDebugger(), url);
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				});
-			}
-			wo.setValue(true);
+		}
+		List<Application> apps = ThisApplication.context().applications().get(x_query_assemble_designer.class);
+		if (ListTools.isNotEmpty(apps)) {
+			apps.stream().forEach(o -> {
+				String url = o.getUrlJaxrsRoot() + "table/"+ queryId +"/build?tt="+System.currentTimeMillis();
+				logger.info("{} do dispatch build query {} table request to : {}", effectivePerson.getDistinguishedName(), queryId, url);
+				try {
+					CipherConnectionAction.get(effectivePerson.getDebugger(), url);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			});
+		}
+		wo.setValue(true);
 
-			result.setData(wo);
+		result.setData(wo);
 
-			return result;
-		}
+		return result;
 	}
 
 	public static class Wo extends WrapBoolean {
-- 
GitLab