中心服务用到的文件缓存改为存储到附件

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java

@@ -12,14 +12,14 @@ import com.x.base.core.project.annotation.ModuleType;
 		"com.x.program.center.core.entity.Structure", "com.x.program.center.core.entity.WarnLog",
 		"com.x.program.center.core.entity.validation.Meta", "com.x.program.center.core.entity.InstallLog",
 		"com.x.program.center.core.entity.Application", "com.x.program.center.core.entity.Attachment",
-		"com.x.portal.core.entity.Page",
+		"com.x.portal.core.entity.Page", "com.x.general.core.entity.GeneralFile",
 		"com.x.portal.core.entity.Portal", "com.x.organization.core.entity.Group",
 		"com.x.organization.core.entity.Custom", "com.x.organization.core.entity.Role",
 		"com.x.organization.core.entity.Person", "com.x.organization.core.entity.Identity",
 		"com.x.organization.core.entity.PersonAttribute", "com.x.organization.core.entity.Unit",
 		"com.x.organization.core.entity.UnitAttribute", "com.x.organization.core.entity.UnitDuty",
 		"com.x.general.core.entity.area.District", "com.x.program.center.core.entity.ScheduleLog" },
-		storageTypes = { StorageType.structure }, storeJars = {
+		storageTypes = { StorageType.structure, StorageType.general}, storeJars = {
 		"x_organization_core_express", "x_program_center_core_entity", "x_attendance_core_entity",
 		"x_cms_core_entity", "x_message_core_entity", "x_component_core_entity", "x_file_core_entity",
 		"x_meeting_core_entity", "x_okr_core_entity", "x_organization_core_entity",

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionCompareUpload.java

@@ -3,10 +3,16 @@ package com.x.program.center.jaxrs.module;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.config.Config;
+import com.x.base.core.project.config.StorageMapping;
 import com.x.base.core.project.connection.CipherConnectionAction;
+import com.x.general.core.entity.GeneralFile;
 import com.x.program.center.core.entity.wrap.WrapServiceModule;
+import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 
 import com.google.gson.JsonElement;
@@ -38,20 +44,29 @@ class ActionCompareUpload extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCompareUpload.class);
 
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, byte[] bytes, FormDataContentDisposition disposition)
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, byte[] bytes, String fileName, FormDataContentDisposition disposition)
 			throws Exception {
 		logger.debug(effectivePerson, "name: {}.", disposition.getName());
 		ActionResult<Wo> result = new ActionResult<>();
 		Wo wo = new Wo();
 		String json = new String(bytes, DefaultCharset.charset);
 		WrapModule module = XGsonBuilder.instance().fromJson(json, WrapModule.class);
-		CacheObject cacheObject = new CacheObject();
-		cacheObject.setModule(module);
-		String flag = StringTools.uniqueToken();
-		CacheCategory cacheCategory = new CacheCategory(CacheObject.class);
-		CacheKey cacheKey = new CacheKey(flag);
-		CacheManager.put(cacheCategory, cacheKey, cacheObject);
-		wo.setFlag(flag);
+
+		if (StringUtils.isEmpty(fileName)) {
+			fileName = this.fileName(disposition);
+		}
+		if(fileName.indexOf(".")==-1){
+			fileName = fileName + ".xapp";
+		}
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			StorageMapping gfMapping = ThisApplication.context().storageMappings().random(GeneralFile.class);
+			GeneralFile generalFile = new GeneralFile(gfMapping.getName(), fileName, effectivePerson.getDistinguishedName());
+			generalFile.saveContent(gfMapping, bytes, fileName);
+			emc.beginTransaction(GeneralFile.class);
+			emc.persist(generalFile, CheckPersistType.all);
+			emc.commit();
+			wo.setFlag(generalFile.getId());
+		}
 		for (WrapProcessPlatform o : module.getProcessPlatformList()) {
 			ActionResponse r = ThisApplication.context().applications().putQuery(effectivePerson.getDebugger(),
 					x_processplatform_assemble_designer.class, Applications.joinQueryUri("input", "compare"), o);

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/module/ActionWrite.java

@@ -5,7 +5,11 @@ import java.util.List;
 import java.util.Optional;
 
 import com.x.base.core.project.config.Config;
+import com.x.base.core.project.config.StorageMapping;
 import com.x.base.core.project.connection.CipherConnectionAction;
+import com.x.base.core.project.gson.XGsonBuilder;
+import com.x.base.core.project.tools.DefaultCharset;
+import com.x.general.core.entity.GeneralFile;
 import com.x.program.center.core.entity.wrap.WrapServiceModule;
 import org.apache.commons.lang3.StringUtils;
 
@@ -40,263 +44,286 @@ public class ActionWrite extends BaseAction {
 	private static Logger logger = LoggerFactory.getLogger(ActionWrite.class);
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String flag, JsonElement jsonElement) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-			Wo wo = new Wo();
-			ActionResult<Wo> result = new ActionResult<>();
-			CacheCategory cacheCategory = new CacheCategory(CacheObject.class);
-			CacheKey cacheKey = new CacheKey(flag);
-			Optional<?> optional = CacheManager.get(cacheCategory, cacheKey);
-			if (!optional.isPresent()) {
-				throw new ExceptionFlagNotExist(flag);
-			}
+		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
+		Wo wo = new Wo();
+		ActionResult<Wo> result = new ActionResult<>();
+		CacheCategory cacheCategory = new CacheCategory(CacheObject.class);
+		CacheKey cacheKey = new CacheKey(flag);
+		Optional<?> optional = CacheManager.get(cacheCategory, cacheKey);
+		WrapModule module;
+		String name = "";
+		if (optional.isPresent()) {
 			CacheObject cacheObject = (CacheObject) optional.get();
-			WrapModule module = cacheObject.getModule();
-			List<WrapPair> replaces = new ArrayList<>();
-			for (WiCommand cmd : wi.getProcessPlatformList()) {
-				WrapProcessPlatform o = module.getProcessPlatform(cmd.getId());
-				if (null != o) {
-					switch (cmd.getMethod()) {
-					case "create":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_processplatform_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "create"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					case "cover":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_processplatform_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "cover"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					default:
-						break;
-					}
+			module = cacheObject.getModule();
+		}else{
+			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+				GeneralFile generalFile = emc.find(flag, GeneralFile.class);
+				if(generalFile!=null){
+					StorageMapping gfMapping = ThisApplication.context().storageMappings().get(GeneralFile.class,
+							generalFile.getStorage());
+					String json = new String(generalFile.readContent(gfMapping), DefaultCharset.charset);
+					module = XGsonBuilder.instance().fromJson(json, WrapModule.class);
+					name = generalFile.getName();
+					generalFile.deleteContent(gfMapping);
+					emc.beginTransaction(GeneralFile.class);
+					emc.delete(GeneralFile.class, generalFile.getId());
+					emc.commit();
+				}else{
+					throw new ExceptionFlagNotExist(flag);
 				}
 			}
-			for (WiCommand cmd : wi.getCmsList()) {
-				WrapCms o = module.getCms(cmd.getId());
-				if (null != o) {
-					switch (cmd.getMethod()) {
-					case "create":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_cms_assemble_control.class,
-										Applications.joinQueryUri("input", "prepare", "create"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					case "cover":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_cms_assemble_control.class,
-										Applications.joinQueryUri("input", "prepare", "cover"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					default:
-						break;
-					}
+		}
+		if(StringUtils.isNotBlank(name)) {
+			logger.print("开始安装模块：{}", name);
+		}
+		List<WrapPair> replaces = new ArrayList<>();
+		for (WiCommand cmd : wi.getProcessPlatformList()) {
+			WrapProcessPlatform o = module.getProcessPlatform(cmd.getId());
+			if (null != o) {
+				switch (cmd.getMethod()) {
+				case "create":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_processplatform_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "create"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				case "cover":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_processplatform_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "cover"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getPortalList()) {
-				WrapPortal o = module.getPortal(cmd.getId());
-				if (null != o) {
-					switch (cmd.getMethod()) {
-					case "create":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_portal_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "create"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					case "cover":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_portal_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "cover"), o)
-								.getDataAsList(WrapPair.class));
-						break;
-					default:
-						break;
-					}
+		}
+		for (WiCommand cmd : wi.getCmsList()) {
+			WrapCms o = module.getCms(cmd.getId());
+			if (null != o) {
+				switch (cmd.getMethod()) {
+				case "create":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_cms_assemble_control.class,
+									Applications.joinQueryUri("input", "prepare", "create"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				case "cover":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_cms_assemble_control.class,
+									Applications.joinQueryUri("input", "prepare", "cover"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getQueryList()) {
-				WrapQuery o = module.getQuery(cmd.getId());
-				if (null != o) {
-					switch (cmd.getMethod()) {
+		}
+		for (WiCommand cmd : wi.getPortalList()) {
+			WrapPortal o = module.getPortal(cmd.getId());
+			if (null != o) {
+				switch (cmd.getMethod()) {
+				case "create":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_portal_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "create"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				case "cover":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_portal_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "cover"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		for (WiCommand cmd : wi.getQueryList()) {
+			WrapQuery o = module.getQuery(cmd.getId());
+			if (null != o) {
+				switch (cmd.getMethod()) {
+				case "create":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_query_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "create"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				case "cover":
+					replaces.addAll(ThisApplication.context().applications()
+							.putQuery(x_query_assemble_designer.class,
+									Applications.joinQueryUri("input", "prepare", "cover"), o)
+							.getDataAsList(WrapPair.class));
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		for (WiCommand cmd : wi.getServiceModuleList()) {
+			WrapServiceModule o = module.getServiceModule(cmd.getId());
+			if (null != o) {
+				switch (cmd.getMethod()) {
 					case "create":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_query_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "create"), o)
+						replaces.addAll(CipherConnectionAction.put(false,
+								Config.url_x_program_center_jaxrs("input", "prepare", "create"), o)
 								.getDataAsList(WrapPair.class));
 						break;
 					case "cover":
-						replaces.addAll(ThisApplication.context().applications()
-								.putQuery(x_query_assemble_designer.class,
-										Applications.joinQueryUri("input", "prepare", "cover"), o)
+						replaces.addAll(CipherConnectionAction.put(false,
+								Config.url_x_program_center_jaxrs("input", "prepare", "cover"), o)
 								.getDataAsList(WrapPair.class));
 						break;
 					default:
 						break;
-					}
 				}
 			}
-			for (WiCommand cmd : wi.getServiceModuleList()) {
-				WrapServiceModule o = module.getServiceModule(cmd.getId());
-				if (null != o) {
-					switch (cmd.getMethod()) {
-						case "create":
-							replaces.addAll(CipherConnectionAction.put(false,
-									Config.url_x_program_center_jaxrs("input", "prepare", "create"), o)
-									.getDataAsList(WrapPair.class));
-							break;
-						case "cover":
-							replaces.addAll(CipherConnectionAction.put(false,
-									Config.url_x_program_center_jaxrs("input", "prepare", "cover"), o)
-									.getDataAsList(WrapPair.class));
-							break;
-						default:
-							break;
-					}
+		}
+		for (WiCommand cmd : wi.getProcessPlatformList()) {
+			WrapProcessPlatform o = module.getProcessPlatform(cmd.getId());
+			if (null != o) {
+				String json = gson.toJson(o);
+				for (WrapPair re : replaces) {
+					json = StringUtils.replace(json, re.getFirst(), re.getSecond());
+				}
+				WrapProcessPlatform obj = gson.fromJson(json, WrapProcessPlatform.class);
+				switch (cmd.getMethod()) {
+				case "create":
+					wo.getProcessPlatformList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_processplatform_assemble_designer.class,
+											Applications.joinQueryUri("input", "create"), obj)
+									.getData(WoId.class).getId());
+					break;
+				case "cover":
+					wo.getProcessPlatformList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_processplatform_assemble_designer.class,
+											Applications.joinQueryUri("input", "cover"), obj)
+									.getData(WoId.class).getId());
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getProcessPlatformList()) {
-				WrapProcessPlatform o = module.getProcessPlatform(cmd.getId());
-				if (null != o) {
-					String json = gson.toJson(o);
-					for (WrapPair re : replaces) {
-						json = StringUtils.replace(json, re.getFirst(), re.getSecond());
-					}
-					WrapProcessPlatform obj = gson.fromJson(json, WrapProcessPlatform.class);
-					switch (cmd.getMethod()) {
-					case "create":
-						wo.getProcessPlatformList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_processplatform_assemble_designer.class,
-												Applications.joinQueryUri("input", "create"), obj)
-										.getData(WoId.class).getId());
-						break;
-					case "cover":
-						wo.getProcessPlatformList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_processplatform_assemble_designer.class,
-												Applications.joinQueryUri("input", "cover"), obj)
-										.getData(WoId.class).getId());
-						break;
-					default:
-						break;
-					}
+		}
+		for (WiCommand cmd : wi.getCmsList()) {
+			WrapCms o = module.getCms(cmd.getId());
+			if (null != o) {
+				String json = gson.toJson(o);
+				for (WrapPair re : replaces) {
+					json = StringUtils.replace(json, re.getFirst(), re.getSecond());
+				}
+				WrapCms obj = gson.fromJson(json, WrapCms.class);
+				switch (cmd.getMethod()) {
+				case "create":
+					wo.getCmsList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_cms_assemble_control.class,
+											Applications.joinQueryUri("input", "create"), obj)
+									.getData(WoId.class).getId());
+					break;
+				case "cover":
+					wo.getCmsList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_cms_assemble_control.class,
+											Applications.joinQueryUri("input", "cover"), obj)
+									.getData(WoId.class).getId());
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getCmsList()) {
-				WrapCms o = module.getCms(cmd.getId());
-				if (null != o) {
-					String json = gson.toJson(o);
-					for (WrapPair re : replaces) {
-						json = StringUtils.replace(json, re.getFirst(), re.getSecond());
-					}
-					WrapCms obj = gson.fromJson(json, WrapCms.class);
-					switch (cmd.getMethod()) {
-					case "create":
-						wo.getCmsList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_cms_assemble_control.class,
-												Applications.joinQueryUri("input", "create"), obj)
-										.getData(WoId.class).getId());
-						break;
-					case "cover":
-						wo.getCmsList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_cms_assemble_control.class,
-												Applications.joinQueryUri("input", "cover"), obj)
-										.getData(WoId.class).getId());
-						break;
-					default:
-						break;
-					}
+		}
+		for (WiCommand cmd : wi.getPortalList()) {
+			WrapPortal o = module.getPortal(cmd.getId());
+			if (null != o) {
+				String json = gson.toJson(o);
+				for (WrapPair re : replaces) {
+					json = StringUtils.replace(json, re.getFirst(), re.getSecond());
+				}
+				WrapPortal obj = gson.fromJson(json, WrapPortal.class);
+				switch (cmd.getMethod()) {
+				case "create":
+					wo.getPortalList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_portal_assemble_designer.class,
+											Applications.joinQueryUri("input", "create"), obj)
+									.getData(WoId.class).getId());
+					break;
+				case "cover":
+					wo.getPortalList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_portal_assemble_designer.class,
+											Applications.joinQueryUri("input", "cover"), obj)
+									.getData(WoId.class).getId());
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getPortalList()) {
-				WrapPortal o = module.getPortal(cmd.getId());
-				if (null != o) {
-					String json = gson.toJson(o);
-					for (WrapPair re : replaces) {
-						json = StringUtils.replace(json, re.getFirst(), re.getSecond());
-					}
-					WrapPortal obj = gson.fromJson(json, WrapPortal.class);
-					switch (cmd.getMethod()) {
-					case "create":
-						wo.getPortalList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_portal_assemble_designer.class,
-												Applications.joinQueryUri("input", "create"), obj)
-										.getData(WoId.class).getId());
-						break;
-					case "cover":
-						wo.getPortalList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_portal_assemble_designer.class,
-												Applications.joinQueryUri("input", "cover"), obj)
-										.getData(WoId.class).getId());
-						break;
-					default:
-						break;
-					}
+		}
+		for (WiCommand cmd : wi.getQueryList()) {
+			WrapQuery o = module.getQuery(cmd.getId());
+			if (null != o) {
+				String json = gson.toJson(o);
+				for (WrapPair re : replaces) {
+					json = StringUtils.replace(json, re.getFirst(), re.getSecond());
+				}
+				WrapQuery obj = gson.fromJson(json, WrapQuery.class);
+				switch (cmd.getMethod()) {
+				case "create":
+					wo.getQueryList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_query_assemble_designer.class,
+											Applications.joinQueryUri("input", "create"), obj)
+									.getData(WoId.class).getId());
+					break;
+				case "cover":
+					wo.getQueryList()
+							.add(ThisApplication.context().applications()
+									.putQuery(x_query_assemble_designer.class,
+											Applications.joinQueryUri("input", "cover"), obj)
+									.getData(WoId.class).getId());
+					break;
+				default:
+					break;
 				}
 			}
-			for (WiCommand cmd : wi.getQueryList()) {
-				WrapQuery o = module.getQuery(cmd.getId());
-				if (null != o) {
-					String json = gson.toJson(o);
-					for (WrapPair re : replaces) {
-						json = StringUtils.replace(json, re.getFirst(), re.getSecond());
-					}
-					WrapQuery obj = gson.fromJson(json, WrapQuery.class);
-					switch (cmd.getMethod()) {
+		}
+		for (WiCommand cmd : wi.getServiceModuleList()) {
+			WrapServiceModule o = module.getServiceModule(cmd.getId());
+			if (null != o) {
+				String json = gson.toJson(o);
+				for (WrapPair re : replaces) {
+					json = StringUtils.replace(json, re.getFirst(), re.getSecond());
+				}
+				WrapServiceModule obj = gson.fromJson(json, WrapServiceModule.class);
+				switch (cmd.getMethod()) {
 					case "create":
-						wo.getQueryList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_query_assemble_designer.class,
-												Applications.joinQueryUri("input", "create"), obj)
+						wo.getServiceModuleList()
+								.add(CipherConnectionAction.put(false,
+										Config.url_x_program_center_jaxrs("input", "create"), obj)
 										.getData(WoId.class).getId());
 						break;
 					case "cover":
-						wo.getQueryList()
-								.add(ThisApplication.context().applications()
-										.putQuery(x_query_assemble_designer.class,
-												Applications.joinQueryUri("input", "cover"), obj)
+						wo.getServiceModuleList()
+								.add(CipherConnectionAction.put(false,
+										Config.url_x_program_center_jaxrs("input", "cover"), obj)
 										.getData(WoId.class).getId());
 						break;
 					default:
 						break;
-					}
 				}
 			}
-			for (WiCommand cmd : wi.getServiceModuleList()) {
-				WrapServiceModule o = module.getServiceModule(cmd.getId());
-				if (null != o) {
-					String json = gson.toJson(o);
-					for (WrapPair re : replaces) {
-						json = StringUtils.replace(json, re.getFirst(), re.getSecond());
-					}
-					WrapServiceModule obj = gson.fromJson(json, WrapServiceModule.class);
-					switch (cmd.getMethod()) {
-						case "create":
-							wo.getServiceModuleList()
-									.add(CipherConnectionAction.put(false,
-											Config.url_x_program_center_jaxrs("input", "create"), obj)
-											.getData(WoId.class).getId());
-							break;
-						case "cover":
-							wo.getServiceModuleList()
-									.add(CipherConnectionAction.put(false,
-											Config.url_x_program_center_jaxrs("input", "cover"), obj)
-											.getData(WoId.class).getId());
-							break;
-						default:
-							break;
-					}
-				}
-			}
-			result.setData(wo);
-			return result;
 		}
+		if(StringUtils.isNotBlank(name)) {
+			logger.print("完成安装模块：{}", name);
+		}
+		result.setData(wo);
+		return result;
+
 	}
 
 	public static class Wi extends GsonPropertyObject {