diff --git a/jitengine-web-core/pom.xml b/jitengine-web-core/pom.xml
index 799f694e2e51574f5e1c815899d90c8027fc44b2..5f5f9bca86b33faa22f2c04c3ff80f1d08c5be01 100644
--- a/jitengine-web-core/pom.xml
+++ b/jitengine-web-core/pom.xml
@@ -36,6 +36,10 @@
com.inspur.edp
web-jitengine-runtimebuild-core
+
+ com.inspur.edp
+ web-jitengine-runtimebuild-scriptcache-api
+
io.iec.edp
caf-boot-starter-rest-client
diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/config/JitEngineWebConfiguration.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/config/JitEngineWebConfiguration.java
index d8c411bd7483994e9fcd0b583a8c6940ed33aa17..afc9121ee9b85a5024e611f72eed1b241e88804b 100644
--- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/config/JitEngineWebConfiguration.java
+++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/config/JitEngineWebConfiguration.java
@@ -16,29 +16,37 @@
package com.inspur.edp.web.jitengine.web.core.config;
+import com.inspur.edp.web.jitengine.web.core.service.MobileApproveDocker;
import io.iec.edp.caf.rest.RESTEndpoint;
import com.inspur.edp.web.jitengine.web.api.service.JitEngineService;
import com.inspur.edp.web.jitengine.web.api.webservice.JitEngineWebService;
import com.inspur.edp.web.jitengine.web.core.service.JitEngineServiceImpl;
-import com.inspur.edp.web.jitengine.web.core.webservice.JitEngineWebSericeImpl;
+import com.inspur.edp.web.jitengine.web.core.webservice.JitEngineWebServiceImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
@Configuration
public class JitEngineWebConfiguration {
@Bean
- public JitEngineService jitEngineService(){
+ public JitEngineService jitEngineService() {
return new JitEngineServiceImpl();
}
@Bean
- public JitEngineWebService jitEngineWebService(JitEngineService jitEngineService){
- return new JitEngineWebSericeImpl();
+ public JitEngineWebService jitEngineWebService(JitEngineService jitEngineService) {
+ return new JitEngineWebServiceImpl();
}
@Bean
- public RESTEndpoint JitEngineWebServiceEndpoint(JitEngineWebService jitEngineWebService){
+ @Scope(value = "prototype")
+ public MobileApproveDocker mobileApproveDocker() {
+ return new MobileApproveDocker();
+ }
+
+ @Bean
+ public RESTEndpoint JitEngineWebServiceEndpoint(JitEngineWebService jitEngineWebService) {
return new RESTEndpoint("/runtime/bcc/v1.0", jitEngineWebService);
}
}
diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java
index 1e94fe8d905a3419bc6e491ab453dec0710b1377..6764879304f85eab596d4f5f2779e32cd396965f 100644
--- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java
+++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java
@@ -30,9 +30,9 @@ public class JitEngineServiceImpl implements JitEngineService {
throw new Exception("delete mobileapprove dev source failed,the formId is null");
}
- GspMetadata gspMetadata = MobilEApprovePreviewImpl.getGspMetadataWithFormId(formId);
+ GspMetadata gspMetadata = MobileApprovePreviewImpl.getGspMetadataWithFormId(formId);
String formCode = gspMetadata.getHeader().getCode();
- String mobileApproveAppPath = MobilEApprovePreviewImpl.generateMobileApproveDevBasePath(formCode, false);
+ String mobileApproveAppPath = MobileApprovePreviewImpl.generateMobileApproveDevBasePath(formCode, false);
try {
FileUtility.deleteFolder(mobileApproveAppPath);
} catch (Exception ex) {
diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java
index 4f6e393eb7bfdcdc37c813d8a0fca4a5c0fcbf4a..d29b3a4b042eba80c4e9adca43e2a67b9b553856 100644
--- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java
+++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java
@@ -19,17 +19,27 @@ package com.inspur.edp.web.jitengine.web.core.service;
import com.inspur.edp.web.common.io.FileUtility;
import com.inspur.edp.web.common.logger.WebLogger;
import com.inspur.edp.web.jitruntimebuild.scriptcache.api.entity.PublishScriptRequest;
+import com.inspur.edp.web.jitruntimebuild.scriptcache.api.service.ScriptCacheService;
import com.inspur.edp.web.jitruntimebuild.scriptcache.localserver.LocalServerPathGenerator;
import com.inspur.edp.web.jitruntimebuild.scriptcache.service.ScriptCacheServiceImpl;
+import org.springframework.context.annotation.Bean;
+import javax.annotation.Resource;
+/**
+ * 移动审批
+ * 将移动审批脚本保存至对应的数据库表，作为负载均衡使用
+ * @author noah
+ */
public class MobileApproveDocker {
+ @Resource
+ private ScriptCacheService scriptCacheService;
+
public void afterPreview(String formCode, String publishPath, String metadataId) {
// 去部署路径取js内容，存入数据库
// projectName="mobileapproval"
try {
- ScriptCacheServiceImpl scriptCacheServiceImpl = new ScriptCacheServiceImpl();
PublishScriptRequest request = new PublishScriptRequest();
request.setFormCode(formCode);
request.setProjectName("bo-mobileapprovalpresetproject");
@@ -43,7 +53,7 @@ public class MobileApproveDocker {
request.setScriptName(formCode + ".js");
- scriptCacheServiceImpl.publishScriptWithDirectory(request);
+ this.scriptCacheService.publishScriptWithDirectory(request);
WebLogger.Instance.info("execute mobile approval script cache completely!!!", this.getClass().getName());
} catch (Exception e) {
WebLogger.Instance.error(e);
diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobilEApprovePreviewImpl.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApprovePreviewImpl.java
similarity index 75%
rename from jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobilEApprovePreviewImpl.java
rename to jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApprovePreviewImpl.java
index f95f302c43753aafb21c77c7c58c74e295a32308..7426ee7522d05a849fa5dd1ae7537ca89caa5a43 100644
--- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobilEApprovePreviewImpl.java
+++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApprovePreviewImpl.java
@@ -17,8 +17,9 @@
package com.inspur.edp.web.jitengine.web.core.service;
import com.inspur.edp.lcm.metadata.api.entity.GspMetadata;
-import com.inspur.edp.metadata.rtcustomization.api.CustomizationService;
+import com.inspur.edp.web.common.customexception.WebCustomException;
import com.inspur.edp.web.common.io.FileUtility;
+import com.inspur.edp.web.common.metadata.MetadataUtility;
import com.inspur.edp.web.jitengine.web.api.service.MobileApproveReviewParameter;
import io.iec.edp.caf.businessobject.api.entity.DevBasicBoInfo;
import io.iec.edp.caf.businessobject.api.service.DevBasicInfoService;
@@ -30,8 +31,7 @@ import io.iec.edp.caf.commons.utils.SpringBeanUtils;
* @author Noah Guo
* @date 2020/05/17
*/
-public class MobilEApprovePreviewImpl {
- private static final CustomizationService customizationService = SpringBeanUtils.getBean(CustomizationService.class);
+public class MobileApprovePreviewImpl {
private static final DevBasicInfoService devBasicInfoService = SpringBeanUtils.getBean(DevBasicInfoService.class);
/**
@@ -52,10 +52,11 @@ public class MobilEApprovePreviewImpl {
* @throws Exception
*/
- public static GspMetadata getGspMetadataWithFormId(String formId) throws Exception {
- GspMetadata gspMetadata = customizationService.getMetadata(formId);
+ public static GspMetadata getGspMetadataWithFormId(String formId) {
+ GspMetadata gspMetadata = MetadataUtility.getInstance().getMetadataInRuntime(formId);
+
if (gspMetadata == null) {
- throw new Exception("根据formId 获取元数据为空");
+ throw new WebCustomException("根据formId 获取元数据为空");
}
return gspMetadata;
}
@@ -72,8 +73,8 @@ public class MobilEApprovePreviewImpl {
FileUtility.writeFile(basePath, fileName, content);
}
- public static String generateWebDevPath(String formCode,boolean isUpdradeTool) {
- String projectRuntimeAppBasePath = generateMobileApproveDevBasePath(formCode,isUpdradeTool);
+ public static String generateWebDevPath(String formCode, boolean isUpgradeTool) {
+ String projectRuntimeAppBasePath = generateMobileApproveDevBasePath(formCode, isUpgradeTool);
String projectRuntimeAppWebdevPath = projectRuntimeAppBasePath + FileUtility.DIRECTORY_SEPARATOR_CHAR + "webdev";
return projectRuntimeAppWebdevPath;
}
@@ -84,21 +85,15 @@ public class MobilEApprovePreviewImpl {
* @param formCode
* @return
*/
- public static String generateMobileApproveDevBasePath(String formCode,boolean isUpdradeTool) {
- String currentWorkSpace = FileUtility.getCurrentWorkPath(isUpdradeTool);
- String projectRuntimeAppPath = currentWorkSpace + FileUtility.DIRECTORY_SEPARATOR_CHAR +
- "web" + FileUtility.DIRECTORY_SEPARATOR_CHAR +
- "runtime" + FileUtility.DIRECTORY_SEPARATOR_CHAR +
- "projects" + FileUtility.DIRECTORY_SEPARATOR_CHAR +
- "mobileapproval" + FileUtility.DIRECTORY_SEPARATOR_CHAR +
- formCode;
- return projectRuntimeAppPath;
+ public static String generateMobileApproveDevBasePath(String formCode, boolean isUpgradeTool) {
+ String currentWorkSpace = FileUtility.getCurrentWorkPath(isUpgradeTool);
+ return FileUtility.combine(currentWorkSpace, "web/runtime/projects/mobileapproval", formCode);
}
- public static String generatePublishPath(String formCode, GspMetadata gspMetadata,boolean isUpdradeTool) {
+ public static String generatePublishPath(String formCode, GspMetadata gspMetadata, boolean isUpgradeTool) {
String serviceUnitPath = getServiceUnit(gspMetadata);
- String currentWorkSpace = FileUtility.getCurrentWorkPath(isUpdradeTool);
+ String currentWorkSpace = FileUtility.getCurrentWorkPath(isUpgradeTool);
String projectRuntimeAppPath = currentWorkSpace + FileUtility.DIRECTORY_SEPARATOR_CHAR +
("web" + FileUtility.DIRECTORY_SEPARATOR_CHAR +
@@ -124,7 +119,6 @@ public class MobilEApprovePreviewImpl {
*/
public static String getServiceUnit(GspMetadata gspMetadata) {
DevBasicBoInfo devBasicBoInfo = devBasicInfoService.getDevBasicBoInfo(gspMetadata.getHeader().getBizobjectID());
- String serviceUnitPath = devBasicBoInfo.getAppCode().toLowerCase() + "/" + devBasicBoInfo.getSuCode().toLowerCase();
- return serviceUnitPath;
+ return (devBasicBoInfo.getAppCode() + "/" + devBasicBoInfo.getSuCode()).toLowerCase();
}
}
diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebSericeImpl.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebServiceImpl.java
similarity index 80%
rename from jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebSericeImpl.java
rename to jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebServiceImpl.java
index 6aad378d421b199c08e5bbcc61cc4acc628004c5..aec6427d9b15478a13a15ce3ad5363c0661f176b 100644
--- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebSericeImpl.java
+++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/webservice/JitEngineWebServiceImpl.java
@@ -25,15 +25,19 @@ import com.inspur.edp.web.jitengine.ProjectCompileContext;
import com.inspur.edp.web.jitengine.web.api.service.MobileApproveReviewParameter;
import com.inspur.edp.web.jitengine.web.api.service.MobileApproveReviewResponse;
import com.inspur.edp.web.jitengine.web.api.webservice.JitEngineWebService;
-import com.inspur.edp.web.jitengine.web.core.service.MobilEApprovePreviewImpl;
+import com.inspur.edp.web.jitengine.web.core.service.MobileApprovePreviewImpl;
import com.inspur.edp.web.jitengine.web.core.service.MobileApproveDocker;
+import javax.annotation.Resource;
import java.io.IOException;
-public class JitEngineWebSericeImpl implements JitEngineWebService {
+public class JitEngineWebServiceImpl implements JitEngineWebService {
+
+ @Resource
+ private MobileApproveDocker mobileApproveDocker;
@Override
- public Object createNewTemplate(Object data) throws IOException {
+ public Object createNewTemplate(Object data) {
return null;
}
@@ -42,6 +46,13 @@ public class JitEngineWebSericeImpl implements JitEngineWebService {
return null;
}
+ /**
+ * 移动审批预览
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
@Override
public Object preview(MobileApproveReviewParameter data) throws Exception {
// 将参数转换成预览实体类型
@@ -50,7 +61,7 @@ public class JitEngineWebSericeImpl implements JitEngineWebService {
}
// 根据维度信息读取表单元数据信息
- GspMetadata gspMetadata = MobilEApprovePreviewImpl.getGspMetaDataWithPreviewParameter(data);
+ GspMetadata gspMetadata = MobileApprovePreviewImpl.getGspMetaDataWithPreviewParameter(data);
//FormMetaDataContent
String serializedMetaDataContent = SerializeUtility.getInstance().serialize(gspMetadata.getContent());
FormMetadataContent formMetadataContent = SerializeUtility.getInstance().deserialize(serializedMetaDataContent, FormMetadataContent.class);
@@ -60,15 +71,13 @@ public class JitEngineWebSericeImpl implements JitEngineWebService {
//根据id读取对应的表单json文件
// 获取su的路径参数
String formCode = gspMetadata.getHeader().getCode();
- String webDevPath = MobilEApprovePreviewImpl.generateWebDevPath(formCode, false);
+ String webDevPath = MobileApprovePreviewImpl.generateWebDevPath(formCode, false);
// 全部转换成小写
- String publishPath = MobilEApprovePreviewImpl.generatePublishPath(formCode, gspMetadata, false);
+ String publishPath = MobileApprovePreviewImpl.generatePublishPath(formCode, gspMetadata, false);
// 保存表单元数据至json文件
- MobilEApprovePreviewImpl.saveMetaDataContent(webDevPath, formCode + ".frm.json", metaDataContent);
-
+ MobileApprovePreviewImpl.saveMetaDataContent(webDevPath, formCode + ".frm.json", metaDataContent);
- String mobileApproveFormCode = formCode;
- String serviceUnitPath = MobilEApprovePreviewImpl.getServiceUnit(gspMetadata);
+ String serviceUnitPath = MobileApprovePreviewImpl.getServiceUnit(gspMetadata);
// 构造webdev文件路径
// 设置为移动审批
@@ -89,12 +98,11 @@ public class JitEngineWebSericeImpl implements JitEngineWebService {
// 调用jit进行脚本文件生成
// js存入数据库
- MobileApproveDocker mobileApproveDocker = new MobileApproveDocker();
- mobileApproveDocker.afterPreview(formCode, publishPath, data.getFormId());
+ this.mobileApproveDocker.afterPreview(formCode, publishPath, data.getFormId());
// 返回文件路径
- String publishFormUrl = MobilEApprovePreviewImpl.generatePublishFormPathUrl(formCode, gspMetadata);
+ String publishFormUrl = MobileApprovePreviewImpl.generatePublishFormPathUrl(formCode, gspMetadata);
MobileApproveReviewResponse reviewResponse = new MobileApproveReviewResponse();
// 返回路径转换成小写
String reviewPath = publishFormUrl + "/" + (formCode + ".js").toLowerCase();
diff --git a/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java b/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
index 8e711324d33b3bf70a3ac6b04c0a315d15b3dcea..2cd3d4a27b3f90c9b34d22dd8495bda422b2aabc 100644
--- a/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
+++ b/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
@@ -59,21 +59,24 @@ public class CopyJarFile {
Map moduleMap = this.getModulePath();
pomModel.getModules().forEach(moduleItem -> {
- String moduleId = moduleMap.get(moduleItem).moduleId;
- if (StringUtility.isNullOrEmpty(moduleId)) {
- WebLogger.Instance.error("无法找到对应的moduleId" + moduleItem);
- } else {
- String modulePath = FileUtility.combine(projectPath, moduleItem);
- String moduleJarFilePath = FileUtility.combine(modulePath, "target", moduleId + "-" + version + ".jar");
- if (!new File(moduleJarFilePath).exists()) {
- WebLogger.Instance.error("目标文件不存在，" + moduleJarFilePath);
+ if (moduleMap.containsKey(moduleItem)) {
+ String moduleId = moduleMap.get(moduleItem).moduleId;
+ if (StringUtility.isNullOrEmpty(moduleId)) {
+ WebLogger.Instance.error("无法找到对应的moduleId" + moduleItem);
} else {
- String targetJarPath = FileUtility.combine(baseTargetJarPath, moduleMap.get(moduleItem).getRelativePath());
- String targetJarFilePath = FileUtility.combine(targetJarPath, moduleId + ".jar");
- FileUtility.copyFile(moduleJarFilePath, targetJarFilePath, true);
+ String modulePath = FileUtility.combine(projectPath, StringUtility.convertNullToEmptyString(moduleMap.get(moduleItem).moduleIdPath), moduleItem);
+ String moduleJarFilePath = FileUtility.combine(modulePath, "target", moduleId + "-" + version + ".jar");
+ if (!new File(moduleJarFilePath).exists()) {
+ WebLogger.Instance.error("目标文件不存在，" + moduleJarFilePath);
+ } else {
+ String targetJarPath = FileUtility.combine(baseTargetJarPath, moduleMap.get(moduleItem).getRelativePath());
+ String targetJarFilePath = FileUtility.combine(targetJarPath, moduleId + ".jar");
+ FileUtility.copyFile(moduleJarFilePath, targetJarFilePath, true);
+ }
}
}
+
});
@@ -86,27 +89,27 @@ public class CopyJarFile {
moduleMap.put("web-form-metadata", ModulePath.init("web-jitengine-formmetadata"));
moduleMap.put("web-sourcecode-metadata", ModulePath.init("web-sourcecode-metadata"));
moduleMap.put("web-pageflow-metadata", ModulePath.init("web-pageflow-metadata"));
- moduleMap.put("web-appconfig-api", ModulePath.init("web-appconfig-api"));
- moduleMap.put("web-appconfig-core", ModulePath.init("web-appconfig-core"));
+ moduleMap.put("web-appconfig-api", ModulePath.init("web-appconfig-api", "", "appconfig"));
+ moduleMap.put("web-appconfig-core", ModulePath.init("web-appconfig-core", "", "appconfig"));
moduleMap.put("web-frontendproject", ModulePath.init("web-jitengine-frontendproject"));
moduleMap.put("web-frontendproject-api", ModulePath.init("web-jitengine-frontendproject-api"));
moduleMap.put("web-form-jitengine", ModulePath.init("web-jitengine"));
moduleMap.put("web-designschema", ModulePath.init("web-designschema"));
moduleMap.put("web-designschema-api", ModulePath.init("web-designschema-api"));
- moduleMap.put("web-statemachine", ModulePath.init("web-statemachine-metadata"));
- moduleMap.put("web-tsfile-api", ModulePath.init("web-tsfile-api"));
- moduleMap.put("web-tsfile-core", ModulePath.init("web-tsfile-core"));
+ moduleMap.put("web-statemachine", ModulePath.init("web-statemachine-metadata", "", "metadata"));
+ moduleMap.put("web-tsfile-api", ModulePath.init("web-tsfile-api", "", "tsfile"));
+ moduleMap.put("web-tsfile-core", ModulePath.init("web-tsfile-core", "", "tsfile"));
moduleMap.put("web-ide-api", ModulePath.init("web-ide-api"));
- moduleMap.put("web-ide-webapi", ModulePath.init("ide-config-webapi","server/platform/dev/main/libs"));
- moduleMap.put("runtime-api", ModulePath.init("web-jitengine-runtimebuild-api"));
- moduleMap.put("runtime-core", ModulePath.init("web-jitengine-runtimebuild-core"));
- moduleMap.put("runtime-scriptcache", ModulePath.init("web-jitengine-runtimebuild-scriptcache"));
- moduleMap.put("runtime-scriptcache-api", ModulePath.init("web-jitengine-runtimebuild-scriptcache-api"));
+ moduleMap.put("web-ide-webapi", ModulePath.init("ide-config-webapi", "server/platform/dev/main/libs", ""));
+ moduleMap.put("runtime-api", ModulePath.init("web-jitengine-runtimebuild-api", "", "runtime"));
+ moduleMap.put("runtime-core", ModulePath.init("web-jitengine-runtimebuild-core", "", "runtime"));
+ moduleMap.put("runtime-scriptcache", ModulePath.init("web-jitengine-runtimebuild-scriptcache", "", "scriptcache"));
+ moduleMap.put("runtime-scriptcache-api", ModulePath.init("web-jitengine-runtimebuild-scriptcache-api", "", "scriptcache"));
moduleMap.put("jitengine-web-api", ModulePath.init("web-jitengine-web-api"));
moduleMap.put("jitengine-web-core", ModulePath.init("web-jitengine-web-core"));
- moduleMap.put("web-npmpackage-core", ModulePath.init("web-npmpackage-core"));
- moduleMap.put("web-npmpackage-api", ModulePath.init("web-npmpackage-api"));
- moduleMap.put("web-npmpackage-patch", ModulePath.init("web-npmpackage-patch"));
+ moduleMap.put("web-npmpackage-core", ModulePath.init("web-npmpackage-core", "", "npmpackage"));
+ moduleMap.put("web-npmpackage-api", ModulePath.init("web-npmpackage-api", "", "npmpackage"));
+ moduleMap.put("web-npmpackage-patch", ModulePath.init("web-npmpackage-patch", "", "npmpackage"));
moduleMap.put("web-dynamic-form-api", ModulePath.init("web-dynamicform-api"));
moduleMap.put("web-dynamic-form-core", ModulePath.init("web-dynamicform-core"));
moduleMap.put("web-formconfig-api", ModulePath.init("web-formconfig-api"));
@@ -118,6 +121,7 @@ public class CopyJarFile {
private static class ModulePath {
private String moduleId;
private String relativePath = "server/platform/common/libs";
+ private String moduleIdPath;
public static ModulePath init(String moduleId) {
ModulePath modulePath = new ModulePath();
@@ -125,10 +129,11 @@ public class CopyJarFile {
return modulePath;
}
- public static ModulePath init(String moduleId, String relativePath) {
+ public static ModulePath init(String moduleId, String relativePath, String moduleIdPath) {
ModulePath modulePath = new ModulePath();
modulePath.moduleId = moduleId;
modulePath.relativePath = relativePath;
+ modulePath.moduleIdPath = moduleIdPath;
return modulePath;
}
}
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/AbstractComponentIdStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/AbstractComponentIdStrategy.java
index 165cc7deec26c7ccc4350083603e782e45f0e2a3..3cc50d18e9cffe710abb5a0ae72634946a91d0f9 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/AbstractComponentIdStrategy.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/AbstractComponentIdStrategy.java
@@ -20,6 +20,7 @@ import com.inspur.edp.web.formmetadata.i18n.component.ComponentUtility;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
/**
* 组件ID策略抽象类
@@ -32,7 +33,7 @@ public abstract class AbstractComponentIdStrategy implements IComponentIdStrateg
}
@Override()
- public ArrayList getComponentIdCollection(HashMap component) {
+ public List getComponentIdCollection(HashMap component) {
ArrayList idList = new ArrayList<>();
String defaultId = ComponentUtility.getInstance().getId(component);
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/HtmlTemplateIdStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/HtmlTemplateIdStrategy.java
index 44d6b01c896dfb68698766929707e07e31c2c3d6..2390096324af59415476bff2d85e41f9bae20c79 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/HtmlTemplateIdStrategy.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/HtmlTemplateIdStrategy.java
@@ -20,19 +20,18 @@ import com.inspur.edp.web.formmetadata.i18n.component.ComponentUtility;
import java.util.*;
-/**
- 默认组件Id策略
-*/
-public class HtmlTemplateIdStrategy extends AbstractComponentIdStrategy
-{
- @Override
- public ArrayList getComponentIdCollection(HashMap component) {
- // TODO: 从string中提取id集合
- ArrayList idList = new ArrayList<>();
+/**
+ * 默认组件Id策略
+ */
+public class HtmlTemplateIdStrategy extends AbstractComponentIdStrategy {
+ @Override
+ public List getComponentIdCollection(HashMap component) {
+ // TODO: 从string中提取id集合
+ ArrayList idList = new ArrayList<>();
- String defaultId = ComponentUtility.getInstance().getId(component);
- idList.add(defaultId);
+ String defaultId = ComponentUtility.getInstance().getId(component);
+ idList.add(defaultId);
- return idList;
- }
+ return idList;
+ }
}
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/IComponentIdStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/IComponentIdStrategy.java
index cd254142e01e8fde1cb59cefa64be213c4afb25f..012aeb6e7b6d2dbcf0b915e91d689be96800e3a7 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/IComponentIdStrategy.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/idstrategy/IComponentIdStrategy.java
@@ -18,6 +18,7 @@ package com.inspur.edp.web.formmetadata.i18n.component.strategy.idstrategy;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
/**
* 组件ID策略接口
@@ -31,5 +32,5 @@ public interface IComponentIdStrategy {
/**
* 获取组件Id集合
*/
- ArrayList getComponentIdCollection(HashMap component);
+ List getComponentIdCollection(HashMap component);
}
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/namestrategy/AbstractComponentNameStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/namestrategy/AbstractComponentNameStrategy.java
index a81abe05871897aa6ec82743e658e76516b5b49b..0ccb5b9f9e1b254489b6f59a39b0ff9b118834c1 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/namestrategy/AbstractComponentNameStrategy.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/namestrategy/AbstractComponentNameStrategy.java
@@ -28,8 +28,6 @@ public abstract class AbstractComponentNameStrategy implements IComponentNameStr
/**
* 从Name属性获取组件名称
*
- * @param component 参数
- * @return
*/
@Override()
public String getComponentName(HashMap component) {
diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/step/AbstractChangeDetectStepExecuteService.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/step/AbstractChangeDetectStepExecuteService.java
index 0c3ecb19af880fe2f129fc92f164155dfb088fd8..f2aa5e60bd775d63c5a2e08e3bd944b5b7a39828 100644
--- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/step/AbstractChangeDetectStepExecuteService.java
+++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/step/AbstractChangeDetectStepExecuteService.java
@@ -22,11 +22,8 @@ import com.inspur.edp.web.frontendproject.changedetect.context.ChangeDetectConte
import io.iec.edp.caf.commons.utils.SpringBeanUtils;
/**
- * @Title: AbstractChangeDetectStepExecuteService
- * @Description: com.inspur.edp.web.frontendproject.changedetect
- * @Author: Noah
- * @Version: V1.0
- * @Create: 2022/6/21 19:08
+ * 表单变更检测
+ * @author noah
*/
public abstract class AbstractChangeDetectStepExecuteService implements ChangeDetectStepExecuteService {