From 331aeaa2a6a3d1c608048a1e0b25c5826ac6a962 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 17 Jan 2023 15:03:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspur/edp/web/common/GspProjectUtil.java | 43 ++++++------------- .../edp/web/common/JITEngineConstants.java | 1 + .../web/common/entity/NodeJsCommandEnum.java | 40 +++++++++++++++-- .../web/common/io/NodejsFunctionUtility.java | 24 +---------- .../web/common/metadata/MetadataUtility.java | 11 ++++- .../utility/OperatingSystemUtility.java | 10 ----- .../edp/web/common/io/FileUtilityTest.java | 22 ++++++++++ .../jitengine/NpmInstallBeforeGenerate.java | 6 ++- .../CommandServiceAnalysis.java | 22 +++++----- .../CommandServiceManager.java | 13 +++--- .../FrontendProjectUtility.java | 6 +-- .../build/FrontendProjectBuild.java | 7 +-- .../SourceServicePathGenerator.java | 2 +- .../NpmCacheCleanCommandExecutor.java | 3 ++ .../metadata/utility/FileUtility.java | 24 ----------- 15 files changed, 119 insertions(+), 115 deletions(-) delete mode 100644 web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileUtility.java diff --git a/web-common/src/main/java/com/inspur/edp/web/common/GspProjectUtil.java b/web-common/src/main/java/com/inspur/edp/web/common/GspProjectUtil.java index dccb156c..74603b52 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/GspProjectUtil.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/GspProjectUtil.java @@ -4,12 +4,20 @@ import com.inspur.edp.lcm.metadata.api.entity.GspProject; import com.inspur.edp.lcm.metadata.api.service.GspProjectService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +/** + * @author guozhiqi + */ public class GspProjectUtil { + /** + * 依据工程路径获取对应的工程信息 + * + * @param projectPath + * @return + */ public static GspProject getGspProject(String projectPath) { try { GspProjectService gspProjectService = SpringBeanUtils.getBean(GspProjectService.class); - GspProject currentProject = gspProjectService.getGspProjectInfo(projectPath); - return currentProject; + return gspProjectService.getGspProjectInfo(projectPath); } catch (Exception e) { throw new RuntimeException(e.getMessage(), e); } @@ -17,36 +25,13 @@ public class GspProjectUtil { /** * 根据工程路径获取工程名称 - * @param projectPath - * @return + * + * @param projectPath 工程路径 + * @return 工程名称 */ public static String getProjectName(String projectPath) { GspProject currentProject = getGspProject(projectPath); - return (currentProject.getMetadataProjectName()).toLowerCase(); - } - - public static String getProjectPath(String projectPath) { - GspProject currentProject = getGspProject(projectPath); - - return (currentProject.getMetadataProjectName()).toLowerCase(); - } - - public static String GetProjectBizobjectID(String projectPath) { - GspProject currentProject = GspProjectUtil.getGspProject(projectPath); - if (currentProject == null) { - throw new GSPException("WEB_GetProjectBizobjectID", String.format("Error When Getting Project Bizobject ID. Current Project Path is:%1$s", projectPath)); - } - - return currentProject.getBizobjectID(); - } - - public static String GetProjectNameSpace(String projectPath) { - GspProject currentProject = GspProjectUtil.getGspProject(projectPath); - if (currentProject == null) { - throw new GSPException("WEB_GetProjectNameSpace", String.format("Error When Getting Project Namespace. Current Project Path is:%1$s", projectPath)); - } - - return currentProject.getProjectNameSpace(); + return currentProject.getMetadataProjectName().toLowerCase(); } } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/JITEngineConstants.java b/web-common/src/main/java/com/inspur/edp/web/common/JITEngineConstants.java index 92567d96..0eebb57a 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/JITEngineConstants.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/JITEngineConstants.java @@ -2,6 +2,7 @@ package com.inspur.edp.web.common; /** * JITEngine执行常量参数 + * @author guozhiqi */ public class JITEngineConstants { private JITEngineConstants() { diff --git a/web-common/src/main/java/com/inspur/edp/web/common/entity/NodeJsCommandEnum.java b/web-common/src/main/java/com/inspur/edp/web/common/entity/NodeJsCommandEnum.java index 4b412bc0..f02244dd 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/entity/NodeJsCommandEnum.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/entity/NodeJsCommandEnum.java @@ -2,21 +2,55 @@ package com.inspur.edp.web.common.entity; /** * nodejs常用命令 + * * @author guozhiqi */ public enum NodeJsCommandEnum { /** * 执行命令的node命令 */ - Node, + Node { + /** + * 获取对应的命令参数值 node + * @return + */ + @Override + public String commandName() { + return "node"; + } + }, /** * 执行npm包的npm命令 */ - Npm, + Npm { + /** + * 获取对应的命令参数值 npm + * @return + */ + @Override + public String commandName() { + return "npm"; + } + }, /** * 可以执行npm command的npx命令 */ - Npx + Npx { + /** + * 获取对应的命令参数值 npx + * @return + */ + @Override + public String commandName() { + return "npx"; + } + }; + + /** + * 获取对应的命令参数值 + * @return + */ + public abstract String commandName(); } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/io/NodejsFunctionUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/io/NodejsFunctionUtility.java index 8be8858b..e40f7efc 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/io/NodejsFunctionUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/io/NodejsFunctionUtility.java @@ -78,7 +78,7 @@ public class NodejsFunctionUtility { FileUtility.setPermission(currentNodeCommand); } else { - String nodeCommandName = getNodeJsCommandFromEnum(nodeJsCommandEnum); + String nodeCommandName =nodeJsCommandEnum.commandName(); nodeCommand = nodeCommandName; if (hasNodePackage) { nodeCommand = FileUtility.combine(nodeJsPath, nodeCommandName); @@ -90,28 +90,6 @@ public class NodejsFunctionUtility { return nodeCommand; } - /** - * 根据命令枚举获取对应的实际命令值 - * - * @param nodeJsCommandEnum - * @return - */ - private static String getNodeJsCommandFromEnum(NodeJsCommandEnum nodeJsCommandEnum) { - String result = "node"; - switch (nodeJsCommandEnum) { - case Node: - result = "node"; - break; - case Npm: - result = "npm"; - break; - case Npx: - result = "npx"; - break; - } - return result; - } - /** * 获取在server中执行jit命令的操作 * diff --git a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java index a7ec08d8..3eb2b0b7 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java @@ -100,9 +100,17 @@ public final class MetadataUtility { } - private static final MetadataUtility metadataUtilityInstance = new MetadataUtility(); + private static final Object _lock = new Object(); + private static volatile MetadataUtility metadataUtilityInstance = null; public static MetadataUtility getInstance() { + if (metadataUtilityInstance == null) { + synchronized (_lock) { + if (metadataUtilityInstance == null) { + metadataUtilityInstance = new MetadataUtility(); + } + } + } return metadataUtilityInstance; } @@ -166,7 +174,6 @@ public final class MetadataUtility { if (executeEnvironment.equals(ExecuteEnvironment.Design)) { // 设计时元数据获取 return this.getRefCommonService().getRefMetadata(new MetadataURI(metadataId), null, null); - //return this.getRefCommonService().getRefMetadata(metadataId); } else { return this.getCustomizationService().getMetadata(metadataId); } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/OperatingSystemUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/OperatingSystemUtility.java index f05adff4..b60040de 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/OperatingSystemUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/OperatingSystemUtility.java @@ -29,14 +29,4 @@ public class OperatingSystemUtility { public static boolean isWindows() { return SystemUtils.IS_OS_WINDOWS; } - - - /** - * 换行符 - * - * @return - */ - public static String lineSeperator() { - return System.getProperty("line.separator"); - } } diff --git a/web-common/src/test/java/com/inspur/edp/web/common/io/FileUtilityTest.java b/web-common/src/test/java/com/inspur/edp/web/common/io/FileUtilityTest.java index 9d00bee6..74433881 100644 --- a/web-common/src/test/java/com/inspur/edp/web/common/io/FileUtilityTest.java +++ b/web-common/src/test/java/com/inspur/edp/web/common/io/FileUtilityTest.java @@ -8,7 +8,11 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.nio.file.*; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; public class FileUtilityTest { @@ -39,6 +43,24 @@ public class FileUtilityTest { } + @Test + public void testSeparator() { + System.out.println(FileUtility.DIRECTORY_SEPARATOR_CHAR); + } + + @Test + public void testFor() { + + List sourceList = IntStream.range(1, 31).mapToObj(t -> String.valueOf(t)).collect(Collectors.toList()); + for (String item : sourceList) { + if (item.equals("5")) { + System.out.println("当前的循环值为5"); + return; + } + System.out.println("当前的循环值为" + item); + } + } + @Test public void testCombine() { } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java index c60d8260..93ff2a50 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java @@ -4,6 +4,10 @@ import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageResponse; import com.inspur.edp.web.npmpackage.core.npminstall.NpmInstallManager; +/** + * 生成前执行npm更新 + * @author guozhiqi + */ public class NpmInstallBeforeGenerate { public static void beforeCompileExecuteWithNpmInstall(ProjectCompileContext projectCompileContext, boolean isRuntime, boolean isGlobal) { beforeCompileExecuteWithNpmInstall(projectCompileContext.executeEnvironment, isRuntime, isGlobal); @@ -14,7 +18,7 @@ public class NpmInstallBeforeGenerate { if (isGlobal) { packageResponse = NpmInstallManager.npmInstallWithDefault(executeEnvironment.equals(ExecuteEnvironment.UpgradeTool), false, true); } else { - packageResponse = NpmInstallManager.npmInstallWithDefault(executeEnvironment.equals(ExecuteEnvironment.UpgradeTool), isRuntime, isGlobal); + packageResponse = NpmInstallManager.npmInstallWithDefault(executeEnvironment.equals(ExecuteEnvironment.UpgradeTool), isRuntime, false); } if (packageResponse != null && !packageResponse.isSuccess()) { diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java index e08c97d2..c6e2883d 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java @@ -21,25 +21,31 @@ import java.util.Map; * @author noah */ public class CommandServiceAnalysis { + /** + * 解析表单元数据中的命令服务 + * @param json + * @param path + * @param targetFormServiceBasePath + * @param targetStorageBasePath + * @param resolveFormMetadataItem + */ public static void resolveCommandService(FormDOM json, String path, String targetFormServiceBasePath, String targetStorageBasePath, ResolveFormMetadataItem resolveFormMetadataItem) { if (json != null && json.getModule() != null && json.getModule().getServiceRefs() != null && json.getModule().getServiceRefs().size() > 0) { - String code = json.getModule().getCode(); + String formCode = json.getModule().getCode(); - String destDirectory = FileUtility.combine(targetFormServiceBasePath, code.toLowerCase(), "services"); + String destDirectory = FileUtility.combine(targetFormServiceBasePath, formCode.toLowerCase(), "services"); String directory = destDirectory.replace("/", FileUtility.DIRECTORY_SEPARATOR_CHAR).replace("\\", FileUtility.DIRECTORY_SEPARATOR_CHAR); - HashMap serviceFileList = new HashMap<>(); + HashMap serviceFileList = new HashMap<>(16); for (HashMap o : json.getModule().getServiceRefs()) { if ("0".equals(o.get("isCommon").toString())) { - String fileName = o.get("path").toString().substring(o.get("path").toString().lastIndexOf("/") + 1); String contents = CommandServiceManager.getTypescriptFileContent(path, "", o, ExecuteEnvironment.Design, false); if (StringUtility.isNullOrEmpty(contents)) { return; } - boolean isPathExists = FileUtility.exists(destDirectory); - if (!isPathExists) { + if (!FileUtility.exists(destDirectory)) { FileUtility.createDirectory(destDirectory); } @@ -96,10 +102,6 @@ public class CommandServiceAnalysis { // 执行tsc if (isJieXiForm && !serviceFileList.isEmpty()) { - // 写入index.ts 文件 - // 暂时屏蔽打包为单一文件的形式 - // FileUtility.writeFile(directory, "index.ts", sbIndexContent.toString()); - NodeJsCommandResult tscCommandResult = NodejsFunctionUtility.getTscCommandInServer(false); // "npx"; String args = "cd " + directory + " && " + tscCommandResult.getNodeJsCommand(); diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java index dface383..00fcaa9f 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java @@ -50,11 +50,14 @@ public class CommandServiceManager { } } - /// - /// 从元数据中读取ts内容 适用于跨工程引用表单的情况 - /// - /// - /// + + /** + * 从元数据中读取ts内容 适用于跨工程引用表单的情况 + * @param cmpId + * @param executeEnvironment + * @param isUpdradeTool + * @return + */ private static String getTsSourceFromMetaData(String cmpId, String executeEnvironment, boolean isUpdradeTool) { GspMetadata gspMetadata = MetadataUtility.getInstance().getMetadataWithEnvironment(cmpId, executeEnvironment, isUpdradeTool); if (gspMetadata != null && !StringUtility.isNullOrEmpty(gspMetadata.getExtendProperty())) { diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java index a6db999c..6b2ad741 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java @@ -77,13 +77,11 @@ public class FrontendProjectUtility { public static String getProjectPathWithDevRootPath(String projectPath) { String projectPathWithDevRootPath = projectPath; - if (checkIfStartsWithDevRoot(projectPath)) { - return projectPathWithDevRootPath; - } else { + if (!checkIfStartsWithDevRoot(projectPath)) { String devRootPath = MetadataUtility.getInstance().getDevRootPath(); projectPathWithDevRootPath = java.nio.file.Paths.get(devRootPath).resolve(projectPath).toString(); - return projectPathWithDevRootPath; } + return projectPathWithDevRootPath; } private static boolean checkIfStartsWithDevRoot(String projectPath) { diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/build/FrontendProjectBuild.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/build/FrontendProjectBuild.java index ab22b415..f047122d 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/build/FrontendProjectBuild.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/build/FrontendProjectBuild.java @@ -11,6 +11,9 @@ import com.inspur.edp.web.frontendproject.NpmPackageCheckUpdate; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageResponse; import io.iec.edp.caf.commons.exception.ExceptionLevel; +/** + * @author guozhiqi + */ public class FrontendProjectBuild { public static ResultMessage buildFrontendProject(String projectPath, boolean isJieXiForm) { // 编译前操作 判定是否需要执行更新操作 @@ -24,9 +27,7 @@ public class FrontendProjectBuild { if (StringUtility.isNullOrEmpty(projectPath)) { throw new GSPException("WEB_BuildFrontendProject", "Current Project Path is Null or Empty", null, ExceptionLevel.Warning); } - - //获取webdev路径 包含根路径 - String webDevPathWithRoot = FileUtility.combine(projectPath, "src", "webdev"); + try { FrontendProjectCompiler frontendProjectCompiler = new FrontendProjectCompiler(); frontendProjectCompiler.buildFrontendProject(projectPath, isJieXiForm); diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/customservice/SourceServicePathGenerator.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/customservice/SourceServicePathGenerator.java index d05b09bc..6972340f 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/customservice/SourceServicePathGenerator.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/customservice/SourceServicePathGenerator.java @@ -22,7 +22,7 @@ public class SourceServicePathGenerator { * @return */ public static String getSourceServiceProductPath(String projectPath, TerminalType terminalType, boolean isSingleDynamicForm) { - String serviceRelativeProductPath =terminalType.getServiceRelativePath(isSingleDynamicForm); + String serviceRelativeProductPath = terminalType.getServiceRelativePath(isSingleDynamicForm); return FileUtility.combine(projectPath, serviceRelativeProductPath); } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java index 66c8b984..526f3795 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java @@ -11,6 +11,9 @@ import com.inspur.edp.web.npmpackage.api.entity.NpmInstallParameter; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageResponse; +/** + * @author guozhiqi + */ public class NpmCacheCleanCommandExecutor { /** * 命令执行 diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileUtility.java b/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileUtility.java deleted file mode 100644 index 1000cbbb..00000000 --- a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileUtility.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.inspur.edp.web.sourcecode.metadata.utility; - -import com.inspur.edp.web.sourcecode.metadata.entity.SourceCodeItemEntity; - -/** - * 文件操作 - */ -public class FileUtility { - /** - * 读取文件内容 - * - * @param sourceCodeItemEntity - * @return - */ - public static String readFileContent(SourceCodeItemEntity sourceCodeItemEntity) { - //N版逻辑如此 - if (sourceCodeItemEntity != null) { - String strRelativeEnum = sourceCodeItemEntity.getRelativePathEnum(); - String sourcePath = sourceCodeItemEntity.getSourcePath(); - - } - return ""; - } -} \ No newline at end of file -- Gitee From 11a5eb288f0f017f710d9980a70ca0faab0a9315 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 17 Jan 2023 15:35:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=82=E6=95=B0=EF=BC=8C=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=E4=B8=BA=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractFormJsonFileGenerator.java | 9 ++-- .../CommandJsonFileGenerator.java | 3 +- .../EapiJsonFileGenerator.java | 3 +- .../FormJsonFileManager.java | 3 +- .../FormRouteJsonFileGenerator.java | 5 ++- .../FrmJsonFileGenerator.java | 3 +- .../JsonFileGeneratorFactory.java | 3 +- .../ResourceJsonFileGenerator.java | 3 +- .../StateMachineJsonFileGenerator.java | 3 +- .../core/service/JitBuildServiceImp.java | 2 +- .../environment/ExecuteEnvironment.java | 45 +++++++++++++------ .../environment/ExecuteEnvironmentEnum.java | 24 ---------- .../web/common/metadata/MetadataUtility.java | 2 +- .../edp/web/jitengine/JITEngineManager.java | 11 +++-- .../jitengine/NpmInstallBeforeGenerate.java | 3 +- .../web/jitengine/ProjectCompileContext.java | 4 +- .../metadataanalysis/CommandsAnalysis.java | 6 +-- .../metadataanalysis/EapiAnalysis.java | 4 +- .../metadataanalysis/FormAnalysis.java | 9 ++-- .../StateMachineAnalysis.java | 3 +- .../metadatamanager/BaseMetaDataManager.java | 12 ++--- .../CommandServiceManager.java | 4 +- .../CommandsMetadataManager.java | 3 +- .../ComponentMetadataManager.java | 3 +- .../metadatamanager/EapiMetadataManager.java | 3 +- .../metadatamanager/FormMetadataManager.java | 4 +- .../StateMachineMetadataManager.java | 3 +- .../app/AppMetadataManager.java | 3 +- .../CommandServiceAnalysis.java | 5 ++- .../api/entity/NpmInstallParameter.java | 8 ++-- .../entity/NpmPackageCheckUpdateOptions.java | 17 +++---- .../NpmCacheCleanCommandExecutor.java | 4 +- .../npminstall/NodeModulesPathGenerator.java | 10 ++--- .../core/npminstall/NpmInstallManager.java | 10 ++--- .../NpmInstallParameterValidator.java | 6 +-- .../GlobalNpmInstallCommandExecutor.java | 4 +- .../global/NpmInstallGlobalManager.java | 4 +- .../core/npmsetting/NpmSettingConvertor.java | 4 +- .../webservice/NpmPacakgeWebServiceImpl.java | 4 +- 39 files changed, 138 insertions(+), 121 deletions(-) delete mode 100644 web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironmentEnum.java diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/AbstractFormJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/AbstractFormJsonFileGenerator.java index 7c954404..88769ee9 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/AbstractFormJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/AbstractFormJsonFileGenerator.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; /** @@ -10,10 +11,10 @@ import com.inspur.edp.web.common.io.FileUtility; */ public abstract class AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - private String executeEnvironment; + private ExecuteEnvironment executeEnvironment; private boolean isUpdradeTool=false; - protected AbstractFormJsonFileGenerator(String executeEnvironment, boolean isUpdradeTool) { + protected AbstractFormJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { this.executeEnvironment = executeEnvironment; this.isUpdradeTool=isUpdradeTool; } @@ -24,11 +25,11 @@ public abstract class AbstractFormJsonFileGenerator implements JsonFileGenerator - public String getExecuteEnvironment() { + public ExecuteEnvironment getExecuteEnvironment() { return this.executeEnvironment; } - public void setExecuteEnvironment(String value) { + public void setExecuteEnvironment(ExecuteEnvironment value) { this.executeEnvironment = value; } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/CommandJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/CommandJsonFileGenerator.java index a887eb8e..211b9fa5 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/CommandJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/CommandJsonFileGenerator.java @@ -3,6 +3,7 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.utility.StringUtility; /** @@ -13,7 +14,7 @@ import com.inspur.edp.web.common.utility.StringUtility; */ class CommandJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public CommandJsonFileGenerator(String executeEnvironment, boolean isUpdradeTool) { + public CommandJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/EapiJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/EapiJsonFileGenerator.java index d955a202..3873b25c 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/EapiJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/EapiJsonFileGenerator.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConstant; @@ -10,7 +11,7 @@ import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConsta * @date 2020/04/29 */ public class EapiJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public EapiJsonFileGenerator(String executeEnvironment,boolean isUpdradeTool) { + public EapiJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment,isUpdradeTool); } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormJsonFileManager.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormJsonFileManager.java index 50081824..948c6038 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormJsonFileManager.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormJsonFileManager.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.jitruntimebuild.api.entity.JitBuildParameter; @@ -20,7 +21,7 @@ public class FormJsonFileManager { * * @param buildParameter */ - public static void generateSpecificJsonFile(JitBuildParameter buildParameter, String executeEnvironment) { + public static void generateSpecificJsonFile(JitBuildParameter buildParameter, ExecuteEnvironment executeEnvironment) { String webDevPath = buildParameter.getBuildWebDevPath(); if (buildParameter.getBuildRefMetadataList() != null && buildParameter.getBuildRefMetadataList().size() > 0) { buildParameter.getBuildRefMetadataList().forEach(jitBuildRefMetadata -> { diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormRouteJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormRouteJsonFileGenerator.java index 4da775dd..a031f79f 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormRouteJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FormRouteJsonFileGenerator.java @@ -1,6 +1,7 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; import com.inspur.edp.web.common.JITEngineConstants; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.serialize.SerializeUtility; import com.inspur.edp.web.jitruntimebuild.api.entity.JitBuildParameter; import com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator.formroute.FormRouteEntity; @@ -18,8 +19,8 @@ import java.util.concurrent.atomic.AtomicReference; */ public class FormRouteJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public FormRouteJsonFileGenerator(String executeEnvironment,boolean isUpdradeTool) { - super(executeEnvironment,isUpdradeTool); + public FormRouteJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { + super(executeEnvironment, isUpdradeTool); } @Override diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FrmJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FrmJsonFileGenerator.java index 6eeb5ec8..e3c9eeab 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FrmJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/FrmJsonFileGenerator.java @@ -3,6 +3,7 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; import com.inspur.edp.cdp.web.component.metadata.define.WebComponentMetadata; import com.inspur.edp.i18n.resource.api.metadata.ResourceMetadata; import com.inspur.edp.lcm.metadata.api.entity.*; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.metadata.MetadataUtility; @@ -34,7 +35,7 @@ import java.util.List; */ public class FrmJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public FrmJsonFileGenerator(String executeEnvironment, boolean isUpdradeTool) { + public FrmJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/JsonFileGeneratorFactory.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/JsonFileGeneratorFactory.java index 81cc5dc0..7fccd906 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/JsonFileGeneratorFactory.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/JsonFileGeneratorFactory.java @@ -1,6 +1,7 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.jitruntimebuild.api.entity.JitMetadataTypeEnum; /** @@ -10,7 +11,7 @@ import com.inspur.edp.web.jitruntimebuild.api.entity.JitMetadataTypeEnum; * @date 2020/04/29 */ public class JsonFileGeneratorFactory { - public static JsonFileGeneratorInterface create(JitMetadataTypeEnum metadataType, String executeEnvironment,boolean isUpdradeTool) { + public static JsonFileGeneratorInterface create(JitMetadataTypeEnum metadataType, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { JsonFileGeneratorInterface jsonFileGenerator = null; switch (metadataType) { case Frm: diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/ResourceJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/ResourceJsonFileGenerator.java index ab0f1663..455e7ac0 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/ResourceJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/ResourceJsonFileGenerator.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConstant; /** @@ -10,7 +11,7 @@ import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConsta */ public class ResourceJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public ResourceJsonFileGenerator(String executeEnvironment,boolean isUpdradeTool) { + public ResourceJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment,isUpdradeTool); } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/StateMachineJsonFileGenerator.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/StateMachineJsonFileGenerator.java index f5e5f750..7eda0ede 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/StateMachineJsonFileGenerator.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/formjsonfilegenerator/StateMachineJsonFileGenerator.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitruntimebuild.core.formjsonfilegenerator; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConstant; /** @@ -10,7 +11,7 @@ import com.inspur.edp.web.jitruntimebuild.core.constant.FormJsonFileSuffixConsta */ public class StateMachineJsonFileGenerator extends AbstractFormJsonFileGenerator implements JsonFileGeneratorInterface { - public StateMachineJsonFileGenerator(String executeEnvironment,boolean isUpdradeTool) { + public StateMachineJsonFileGenerator(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment,isUpdradeTool); } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/service/JitBuildServiceImp.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/service/JitBuildServiceImp.java index f2b5f2e0..c18a5496 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/service/JitBuildServiceImp.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/service/JitBuildServiceImp.java @@ -53,7 +53,7 @@ public class JitBuildServiceImp implements JitBuildService { WebLogger.Instance.info("build parameter executed completely", CurrentClassName); } // 设定当前运行环境为runtime - String executeEnvironment = ExecuteEnvironment.Runtime; + ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Runtime; // 首先删除service文件夹 避免service文件变更导致的编译失败 String sourceServicePath = buildParameter.getBuildWebDevPath() + "/services/"; try { diff --git a/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironment.java b/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironment.java index 86dfac00..bebfcb95 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironment.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironment.java @@ -5,23 +5,42 @@ package com.inspur.edp.web.common.environment; * * @author guozhiqi */ -public class ExecuteEnvironment { - private ExecuteEnvironment() { - } +public enum ExecuteEnvironment { + Design { + @Override + public String getName() { + return "Design"; + } + }, - /** - * 设计时 - */ - public static final String Design = "Design"; + Runtime { + @Override + public String getName() { + return "Runtime"; + } + }, + UpgradeTool { + @Override + public String getName() { + return "UpgradeTool"; + } + }, None { + /** + * 未指定具体运行位置 + * @return + */ + @Override + public String getName() { + return "None"; + } + }; /** - * 运行时定制 + * 获取对应的名称描述 + * + * @return */ - public static final String Runtime = "Runtime"; + public abstract String getName(); - /** - * 元数据部署工具 - */ - public static final String UpgradeTool = "UpgradeTool"; } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironmentEnum.java b/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironmentEnum.java deleted file mode 100644 index 1cd90d32..00000000 --- a/web-common/src/main/java/com/inspur/edp/web/common/environment/ExecuteEnvironmentEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.inspur.edp.web.common.environment; - -/** - * 运行位置枚举 - * @author guozhiqi - */ -public enum ExecuteEnvironmentEnum { - /** - * 设计时 - */ - Design, - /** - * 运行时定制 - */ - Runtime, - /** - * 元数据部署工具 - */ - UpgradeTool, - /** - * 未指定具体运行位置 - */ - None -} diff --git a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java index 3eb2b0b7..983500f4 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java @@ -156,7 +156,7 @@ public final class MetadataUtility { * @param metadataId * @return */ - public GspMetadata getMetadataWithEnvironment(String metadataId, String executeEnvironment, boolean isInUpgradeTool) { + public GspMetadata getMetadataWithEnvironment(String metadataId, ExecuteEnvironment executeEnvironment, boolean isInUpgradeTool) { if (StringUtility.isNullOrEmpty(metadataId)) { return null; } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java index d53ba858..eadca4dc 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java @@ -8,7 +8,6 @@ import com.inspur.edp.web.common.constant.FrontendProjectConstant; import com.inspur.edp.web.common.entity.NodeJsCommandEnum; import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.environment.ExecuteEnvironment; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; import com.inspur.edp.web.common.environment.checker.ExecuteEnvironmentChecker; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.io.NodejsFunctionUtility; @@ -290,7 +289,7 @@ public class JITEngineManager { */ public static void ResolveFormMetadata(ResolveFormMetadataItem resolveFormMetadataItem, String baseFormPath, String projectPath, String targetStorageBasePath, String formServiceBasePath, HashMap projectCmpList, GeneratedI18nResourceList i18nResourceList, GeneratedI18nResourceList zhI18nResourceList, GeneratedI18nResourceList zhCHTI18nResourceList, - ExpressionManifest expressionManifest, String i18nResourceKeyPrefix, String executeEnvironment, boolean isUpdradeTool) { + ExpressionManifest expressionManifest, String i18nResourceKeyPrefix, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { FormAnalysis formAnalysis = new FormAnalysis(ExecuteEnvironment.Design, false); // Resolve Form @@ -335,7 +334,7 @@ public class JITEngineManager { ExpressionManifest expressionManifest, String containerId, String i18nResourceKeyPrefix, - String executeEnvironment, boolean isUpdradeTool, HashMap externalComponentItem) { + ExecuteEnvironment executeEnvironment, boolean isUpdradeTool, HashMap externalComponentItem) { String formMetadataName = resolveFormMetadataItem.getGspMetadata().getHeader().getFileName(); @@ -393,7 +392,7 @@ public class JITEngineManager { HashMap projectCmpList, String webdevpath, GeneratedI18nResourceList i18nResourceList, GeneratedI18nResourceList zhI18nResourceList, GeneratedI18nResourceList zhCHTI18nResourceList, ExpressionManifest expressionManifest, - String i18nResourceKeyPrefix, String executeEnvironment, boolean isUpdradeTool) { + String i18nResourceKeyPrefix, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { if (json != null && json.getModule() != null && json.getModule().getExternalComponents() != null && json.getModule().getExternalComponents().size() > 0) { for (HashMap item : json.getModule().getExternalComponents()) { String strI18nResourcePrefix = i18nResourceKeyPrefix; @@ -551,7 +550,7 @@ public class JITEngineManager { } - public static void buildFrontendProject(String targetProjectPath, String executeEnvironment, TerminalType terminalType) { + public static void buildFrontendProject(String targetProjectPath, ExecuteEnvironment executeEnvironment, TerminalType terminalType) { // 标识运行环境 是为运行时定制 或设计时 boolean isRuntime = executeEnvironment.equals(ExecuteEnvironment.Runtime); NpmInstallBeforeGenerate.beforeCompileExecuteWithNpmInstall(executeEnvironment, isRuntime, false); @@ -612,7 +611,7 @@ public class JITEngineManager { // 获取待执行安装的node_modules 路径 String currentWorkPath = FileUtility.getCurrentWorkPath(false); - npmInstallParameter.setExecuteEnvironment(isRuntime ? ExecuteEnvironmentEnum.Runtime : ExecuteEnvironmentEnum.Design); + npmInstallParameter.setExecuteEnvironment(isRuntime ? ExecuteEnvironment.Runtime : ExecuteEnvironment.Design); String parentNode_ModulesPath = NodeModulesPathGenerator.generatePackageJsonPath(npmInstallParameter, currentWorkPath); diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java index 93ff2a50..449dd326 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/NpmInstallBeforeGenerate.java @@ -6,6 +6,7 @@ import com.inspur.edp.web.npmpackage.core.npminstall.NpmInstallManager; /** * 生成前执行npm更新 + * * @author guozhiqi */ public class NpmInstallBeforeGenerate { @@ -13,7 +14,7 @@ public class NpmInstallBeforeGenerate { beforeCompileExecuteWithNpmInstall(projectCompileContext.executeEnvironment, isRuntime, isGlobal); } - public static void beforeCompileExecuteWithNpmInstall(String executeEnvironment, boolean isRuntime, boolean isGlobal) { + public static void beforeCompileExecuteWithNpmInstall(ExecuteEnvironment executeEnvironment, boolean isRuntime, boolean isGlobal) { NpmPackageResponse packageResponse = null; if (isGlobal) { packageResponse = NpmInstallManager.npmInstallWithDefault(executeEnvironment.equals(ExecuteEnvironment.UpgradeTool), false, true); diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/ProjectCompileContext.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/ProjectCompileContext.java index a4d7888d..35d0aa9b 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/ProjectCompileContext.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/ProjectCompileContext.java @@ -132,7 +132,7 @@ public class ProjectCompileContext { this.json = formDom; } - public String executeEnvironment = ExecuteEnvironment.Design; + public ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; /** @@ -204,7 +204,7 @@ public class ProjectCompileContext { public ProjectCompileContext(String projectName, String refNodeModulesPath, String formType, String frameworkType, String formJsonAbsolutePath, - String formPublishAbsolutePath, String eapiAbsolutePath, String serviceUnitPath, String executeEnvironment) { + String formPublishAbsolutePath, String eapiAbsolutePath, String serviceUnitPath, ExecuteEnvironment executeEnvironment) { this.projectName = projectName; this.projectRoute = projectName + JITEngineConstants.ProjectRouteFileExtension; this.nodeModulesAbsolutePath = refNodeModulesPath; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java index fc528dc1..080e4e59 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java @@ -20,17 +20,17 @@ import java.util.*; */ public class CommandsAnalysis { - private String executeEnvironment = ExecuteEnvironment.Design; + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; private boolean isUpdradeTool = false; // 是否生成command.json 文件 private boolean createCommandJsonFile = true; - public CommandsAnalysis(String executeEnvironment, boolean isUpdradeTool) { + public CommandsAnalysis(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { this.executeEnvironment = executeEnvironment; this.isUpdradeTool = isUpdradeTool; } - public CommandsAnalysis(String executeEnvironment, boolean isUpdradeTool, boolean createCommandJsonFile) { + public CommandsAnalysis(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool, boolean createCommandJsonFile) { this.executeEnvironment = executeEnvironment; this.isUpdradeTool = isUpdradeTool; this.createCommandJsonFile = createCommandJsonFile; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java index e5fcbeab..88bbf2a5 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java @@ -19,10 +19,10 @@ import java.util.List; public class EapiAnalysis { - private String executeEnvironment = ExecuteEnvironment.Design; + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; private boolean isUpdradeTool = false; - public EapiAnalysis(String executeEnvironment, boolean isUpdradeTool) { + public EapiAnalysis(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { this.executeEnvironment = executeEnvironment; this.isUpdradeTool = isUpdradeTool; } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java index bd2ad594..a5eaac89 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java @@ -16,11 +16,14 @@ import java.util.HashMap; * @author noah */ public class FormAnalysis { - // 设定执行环境 - private String executeEnvironment = ExecuteEnvironment.Design; + + /** + * 设定执行环境 + */ + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; private boolean isUpdradeTool = false; - public FormAnalysis(String executeEnvironment, boolean isUpdradeTool) { + public FormAnalysis(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { this.executeEnvironment = executeEnvironment; this.isUpdradeTool = isUpdradeTool; } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java index c3a2577b..7ddb9898 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java @@ -1,6 +1,7 @@ package com.inspur.edp.web.jitengine.metadataanalysis; import com.inspur.edp.lcm.metadata.api.IMetadataContent; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; import com.inspur.edp.web.jitengine.metadatamanager.StateMachineMetadataManager; @@ -14,7 +15,7 @@ public class StateMachineAnalysis { * 解析状态机元数据 */ public static void resolveStateMachine(FormDOM json, String metaDataFileName, String targetStoragePath, String webDevPath, - String projectPath, String executeEnvironment, + String projectPath, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { // Get StateMachine Metadata, and Save StateMachine if (json.getModule() != null && json.getModule().getStateMachines() != null && json.getModule().getStateMachines().size() > 0) { diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java index 253a429f..36ab9af7 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java @@ -20,7 +20,7 @@ public class BaseMetaDataManager { * * @param executeEnvironment */ - public BaseMetaDataManager(String executeEnvironment, boolean isUpdradeTool) { + public BaseMetaDataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { this.setExecuteEnvironment(executeEnvironment); this.isUpdradeTool = isUpdradeTool; } @@ -34,13 +34,13 @@ public class BaseMetaDataManager { } // 运行环境 运行时或设计时 - private String executeEnvironment = ExecuteEnvironment.Design; + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; - public String getExecuteEnvironment() { + public ExecuteEnvironment getExecuteEnvironment() { return this.executeEnvironment; } - public void setExecuteEnvironment(String value) { + public void setExecuteEnvironment(ExecuteEnvironment value) { this.executeEnvironment = value; } @@ -61,11 +61,11 @@ public class BaseMetaDataManager { } public String serialize(IMetadataContent obj) { - return SerializeUtility.getInstance().serialize(obj,false); + return SerializeUtility.getInstance().serialize(obj, false); } public String serialize(IMetadataContent obj, PropertyNamingStrategy namingStrategy) { - return SerializeUtility.getInstance().serialize(obj, namingStrategy,false); + return SerializeUtility.getInstance().serialize(obj, namingStrategy, false); } public void saveMetadataFile(String path, String fileName, String contents) { diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java index 00fcaa9f..21683331 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java @@ -29,7 +29,7 @@ public class CommandServiceManager { * @param serviceRef * @return */ - public static String getTypescriptFileContent(String sourcePath, String devRootPath, HashMap serviceRef, String executeEnvironment, boolean isUpdradeTool) { + public static String getTypescriptFileContent(String sourcePath, String devRootPath, HashMap serviceRef, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { try { String refCmpId = serviceRef.get("cmpId").toString(); // 仅在设计时进行文件读取 @@ -58,7 +58,7 @@ public class CommandServiceManager { * @param isUpdradeTool * @return */ - private static String getTsSourceFromMetaData(String cmpId, String executeEnvironment, boolean isUpdradeTool) { + private static String getTsSourceFromMetaData(String cmpId, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { GspMetadata gspMetadata = MetadataUtility.getInstance().getMetadataWithEnvironment(cmpId, executeEnvironment, isUpdradeTool); if (gspMetadata != null && !StringUtility.isNullOrEmpty(gspMetadata.getExtendProperty())) { CommandExtendProperty commandExtendProperty = SerializeUtility.getInstance().deserialize(gspMetadata.getExtendProperty(), CommandExtendProperty.class); diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java index 496bb031..a359f651 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java @@ -2,6 +2,7 @@ package com.inspur.edp.web.jitengine.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.command.component.metadata.WebCommandsMetadata; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; /** * 命令元数据manager @@ -9,7 +10,7 @@ import com.inspur.edp.web.command.component.metadata.WebCommandsMetadata; * @author noah */ public class CommandsMetadataManager extends BaseMetaDataManager { - public CommandsMetadataManager(String executeEnvironment, boolean isUpdradeTool) { + public CommandsMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java index 194cc92d..0e450248 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java @@ -2,6 +2,7 @@ package com.inspur.edp.web.jitengine.metadatamanager; import com.inspur.edp.cdp.web.component.metadata.define.WebComponentMetadata; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; /** * 构件元数据manager @@ -9,7 +10,7 @@ import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; * @author noah */ public class ComponentMetadataManager extends BaseMetaDataManager { - public ComponentMetadataManager(String executeEnvironment, boolean isUpdradeTool) { + public ComponentMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java index 1dbafe15..2fe66a0b 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java @@ -2,13 +2,14 @@ package com.inspur.edp.web.jitengine.metadatamanager; import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; /** * Eapi 元数据管理器 * @author noah */ public class EapiMetadataManager extends BaseMetaDataManager { - public EapiMetadataManager(String executeEnvironment,boolean isUpdradeTool) { + public EapiMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment,isUpdradeTool); } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java index 4f9f730d..9853fef5 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java @@ -2,13 +2,15 @@ package com.inspur.edp.web.jitengine.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.formmetadata.metadata.FormMetadataContent; /** * 表单元数据管理 + * @author guozhiqi */ public class FormMetadataManager extends BaseMetaDataManager { - public FormMetadataManager(String executeEnvironment, boolean isUpdradeTool) { + public FormMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java index 8bf96f2d..014a4190 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java @@ -1,9 +1,10 @@ package com.inspur.edp.web.jitengine.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; public class StateMachineMetadataManager extends BaseMetaDataManager { - public StateMachineMetadataManager(String executeEnvironment, boolean isUpdradeTool) { + public StateMachineMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java index 8167c694..64817443 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitengine.metadatamanager.app; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.jitengine.metadatamanager.BaseMetaDataManager; /** @@ -14,7 +15,7 @@ public class AppMetadataManager extends BaseMetaDataManager { * @param executeEnvironment * @param isUpdradeTool */ - public AppMetadataManager(String executeEnvironment, boolean isUpdradeTool) { + public AppMetadataManager(ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { super(executeEnvironment, isUpdradeTool); } } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java index e1c15cd7..f45f6d1a 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.jitengine.metadataparser.commandservice; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; @@ -15,7 +16,7 @@ import java.util.HashMap; */ public class CommandServiceAnalysis { public static void resolveCommandService(FormDOM json, String path, String targetStoragePath, - String webDevPath, String executeEnvironment, boolean isUpdradeTool) { + String webDevPath, ExecuteEnvironment executeEnvironment, boolean isUpdradeTool) { if (json != null && json.getModule() != null && json.getModule().getServiceRefs() != null && json.getModule().getServiceRefs().size() > 0) { @@ -24,7 +25,7 @@ public class CommandServiceAnalysis { if (serviceRefsObject.get("isCommon").toString().equals("0")) { String fileName = serviceRefsObject.get("path").toString().substring(serviceRefsObject.get("path").toString().lastIndexOf("/") + 1); - String contents = CommandServiceManager.getTypescriptFileContent(path, webDevPath, serviceRefsObject, executeEnvironment,isUpdradeTool); + String contents = CommandServiceManager.getTypescriptFileContent(path, webDevPath, serviceRefsObject, executeEnvironment, isUpdradeTool); if (StringUtility.isNullOrEmpty(contents)) { return; } diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java b/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java index 161adb3d..9707af77 100644 --- a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java +++ b/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.api.entity; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.npmpackage.api.entity.settings.NpmUpdatePolicy; @@ -71,7 +71,7 @@ public class NpmInstallParameter { * 运行位置 * 默认为设计时 */ - private ExecuteEnvironmentEnum executeEnvironment = ExecuteEnvironmentEnum.None; + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.None; private List npmInstallPackageParameterList; @@ -147,11 +147,11 @@ public class NpmInstallParameter { this.npmInstallPackageParameterList = npmInstallPackageParameterList; } - public ExecuteEnvironmentEnum getExecuteEnvironment() { + public ExecuteEnvironment getExecuteEnvironment() { return executeEnvironment; } - public void setExecuteEnvironment(ExecuteEnvironmentEnum executeEnvironment) { + public void setExecuteEnvironment(ExecuteEnvironment executeEnvironment) { this.executeEnvironment = executeEnvironment; } diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java b/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java index fe4494ff..e43aa68b 100644 --- a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java +++ b/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java @@ -1,25 +1,26 @@ package com.inspur.edp.web.npmpackage.api.entity; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; /** * npm 包checkupdate 选项 - * @author noah - * */ + * + * @author noah + */ public class NpmPackageCheckUpdateOptions { /** * 是否在升级工具中执行 */ - private boolean isUpgradeTool=false; + private boolean isUpgradeTool = false; /** * 执行环境 */ - private ExecuteEnvironmentEnum executeEnvironment=ExecuteEnvironmentEnum.Design; + private ExecuteEnvironment executeEnvironment = ExecuteEnvironment.Design; /** * 是否移动表单 */ - private boolean isMobile=false; + private boolean isMobile = false; public boolean isUpgradeTool() { return isUpgradeTool; @@ -29,11 +30,11 @@ public class NpmPackageCheckUpdateOptions { isUpgradeTool = upgradeTool; } - public ExecuteEnvironmentEnum getExecuteEnvironment() { + public ExecuteEnvironment getExecuteEnvironment() { return executeEnvironment; } - public void setExecuteEnvironment(ExecuteEnvironmentEnum executeEnvironment) { + public void setExecuteEnvironment(ExecuteEnvironment executeEnvironment) { this.executeEnvironment = executeEnvironment; } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java index 526f3795..da59608b 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java @@ -1,7 +1,7 @@ package com.inspur.edp.web.npmpackage.core.cacheclean; import com.inspur.edp.web.common.entity.NodeJsCommandEnum; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.io.NodejsFunctionUtility; import com.inspur.edp.web.common.logger.WebLogger; @@ -27,7 +27,7 @@ public class NpmCacheCleanCommandExecutor { WebLogger.Instance.info("执行离线包缓存清理", NpmCacheCleanCommandExecutor.class.getName()); - boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironmentEnum.UpgradeTool; + boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironment.UpgradeTool; String currentWorkPath = FileUtility.getCurrentWorkPath(isUpgradeTool); String npmCommandExecuteWithPath = NodejsFunctionUtility.getNodeJsCommandInServerWithOS(NodeJsCommandEnum.Npm, currentWorkPath); diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java index 3c12da26..b44b5f0d 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npminstall; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.metadata.MetadataUtility; import com.inspur.edp.web.npmpackage.api.entity.*; @@ -35,12 +35,12 @@ public class NodeModulesPathGenerator { * @return */ public static String generatePackageJsonPath(NpmInstallParameter npmInstallParameter, String currentWorkPath) { - ExecuteEnvironmentEnum executeEnvironment = npmInstallParameter.getExecuteEnvironment(); + ExecuteEnvironment executeEnvironment = npmInstallParameter.getExecuteEnvironment(); String parentNode_modulesPath = ""; // 如果是运行时定制 - if (executeEnvironment.equals(ExecuteEnvironmentEnum.Runtime)) { + if (executeEnvironment.equals(ExecuteEnvironment.Runtime)) { String relativePath = FileUtility.combine("web", "runtime", "projects"); // 移除移动单独的node_modules 文件目录 @@ -50,7 +50,7 @@ public class NodeModulesPathGenerator { } // 设计时 - if (executeEnvironment.equals(ExecuteEnvironmentEnum.Design)) { + if (executeEnvironment.equals(ExecuteEnvironment.Design)) { // 获取当前开发时工作空间绝对路径 String currentDevRootPath = MetadataUtility.getInstance().getDevRootAbsolutePath(); parentNode_modulesPath = currentDevRootPath; @@ -58,7 +58,7 @@ public class NodeModulesPathGenerator { } // 如果是部署工具 - if (executeEnvironment.equals(ExecuteEnvironmentEnum.UpgradeTool)) { + if (executeEnvironment.equals(ExecuteEnvironment.UpgradeTool)) { String relativePath = FileUtility.combine("web", "runtime", "projects"); // 移除移动独立的node_modules //relativePath = npmInstallParameter.isMobile() ? FileUtility.combine(relativePath, "mobile") : relativePath; diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java index cc51cee2..762c4700 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npminstall; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.CommonUtility; @@ -42,7 +42,7 @@ public class NpmInstallManager { return npmPackageResponse; } // 获取node_modules 要安装的路径 - boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment().equals(ExecuteEnvironmentEnum.UpgradeTool); + boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment().equals(ExecuteEnvironment.UpgradeTool); String currentWorkPath = FileUtility.getCurrentWorkPath(isUpgradeTool); // 获取待执行安装的node_modules 路径 @@ -84,9 +84,9 @@ public class NpmInstallManager { NpmInstallParameter packageParameter = NpmSettingConvertor.convertFromNpmSetting(npmSettings); // 依据参数进行默认目录的安装 if (isRuntime) { - packageParameter.setExecuteEnvironment(ExecuteEnvironmentEnum.Runtime); + packageParameter.setExecuteEnvironment(ExecuteEnvironment.Runtime); } else { - packageParameter.setExecuteEnvironment(ExecuteEnvironmentEnum.Design); + packageParameter.setExecuteEnvironment(ExecuteEnvironment.Design); } packageResponse = npmInstall(packageParameter, false); @@ -128,7 +128,7 @@ public class NpmInstallManager { } // 获取node_modules 要安装的路径 - boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironmentEnum.UpgradeTool; + boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironment.UpgradeTool; String currentWorkPath = FileUtility.getCurrentWorkPath(isUpgradeTool); // 获取待执行安装的node_modules 路径 diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java index 849d13a5..e72fbfb5 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npminstall; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.npmpackage.api.entity.NpmInstallParameter; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageResponse; @@ -20,8 +20,8 @@ class NpmInstallParameterValidator { * @return */ public static NpmPackageResponse validate(NpmInstallParameter npmInstallParameter) { - ExecuteEnvironmentEnum executeEnvironment = npmInstallParameter.getExecuteEnvironment(); - if (executeEnvironment.equals(ExecuteEnvironmentEnum.None)) { + ExecuteEnvironment executeEnvironment = npmInstallParameter.getExecuteEnvironment(); + if (executeEnvironment.equals(ExecuteEnvironment.None)) { // 表示是设计时 return NpmPackageResponse.createError("请设置npm install 运行位置参数:ExecuteEnvironment"); } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java index f6a9fa39..09cbc3ab 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java @@ -1,7 +1,7 @@ package com.inspur.edp.web.npmpackage.core.npminstall.global; import com.inspur.edp.web.common.entity.NodeJsCommandEnum; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.io.NodejsFunctionUtility; import com.inspur.edp.web.common.logger.WebLogger; @@ -31,7 +31,7 @@ public class GlobalNpmInstallCommandExecutor { // 构造install 命令参数 执行npm包安装操作 WebLogger.Instance.info("执行全局离线包安装:" + npmName + "@" + version, GlobalNpmInstallCommandExecutor.class.getName()); - boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironmentEnum.UpgradeTool; + boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment() == ExecuteEnvironment.UpgradeTool; String currentWorkPath = FileUtility.getCurrentWorkPath(isUpgradeTool); String npmCommandExecuteWithPath = NodejsFunctionUtility.getNodeJsCommandInServerWithOS(NodeJsCommandEnum.Npm, currentWorkPath); diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java index 421f48e4..1203c9a8 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npminstall.global; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.CommonUtility; @@ -66,7 +66,7 @@ public class NpmInstallGlobalManager { return NpmPackageResponse.create(); } - boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment().equals(ExecuteEnvironmentEnum.UpgradeTool); + boolean isUpgradeTool = npmInstallParameter.getExecuteEnvironment().equals(ExecuteEnvironment.UpgradeTool); String tmpPackageJsonPath = GlobalPackageJsonPathGenerator.getPackageJsonPathInTmpDir(); String serverPackageJsonPath = GlobalPackageJsonPathGenerator.generate(); // 获取package.json 文件路径 diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java index 1b2e6259..4a7969e7 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npmsetting; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.npmpackage.api.entity.NpmInstallParameter; import com.inspur.edp.web.npmpackage.api.entity.settings.NpmRepository; import com.inspur.edp.web.npmpackage.api.entity.settings.NpmSettings; @@ -32,7 +32,7 @@ public class NpmSettingConvertor { npmInstallParameter.setUserName(currentRepository.getUserName()); npmInstallParameter.setPassword(currentRepository.getPassword()); npmInstallParameter.setRegistry(currentRepository.getUrl()); - npmInstallParameter.setExecuteEnvironment(ExecuteEnvironmentEnum.Design); + npmInstallParameter.setExecuteEnvironment(ExecuteEnvironment.Design); npmInstallParameter.setUpdatePolicy(currentRepository.getUpdatePolicy()); npmInstallParameter.setUpdateAll(true); npmInstallParameter.setOfflineMode(npmSettings.isOffline()); diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPacakgeWebServiceImpl.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPacakgeWebServiceImpl.java index 11fc8777..cb3291b6 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPacakgeWebServiceImpl.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPacakgeWebServiceImpl.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.npmpackage.core.webservice; -import com.inspur.edp.web.common.environment.ExecuteEnvironmentEnum; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageCheckUpdateOptions; import com.inspur.edp.web.npmpackage.api.entity.NpmPackageResponse; import com.inspur.edp.web.npmpackage.api.entity.settings.NpmRepository; @@ -77,7 +77,7 @@ public class NpmPacakgeWebServiceImpl implements NpmPackageWebService { if (NpmUpdatePolicy.manual.equals(currentRepository.getUpdatePolicy())) { NpmPackageCheckUpdateOptions checkUpdateOptions = new NpmPackageCheckUpdateOptions(); - checkUpdateOptions.setExecuteEnvironment(ExecuteEnvironmentEnum.Design); + checkUpdateOptions.setExecuteEnvironment(ExecuteEnvironment.Design); checkUpdateOptions.setUpgradeTool(false); return NpmPackageService.checkUpdate(checkUpdateOptions); } -- Gitee From 83ea7b56dea419bd01eef93acb5426c2630030ed Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 17 Jan 2023 15:58:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/common/metadata/MetadataUtility.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java index 983500f4..ada4dbbe 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/metadata/MetadataUtility.java @@ -196,30 +196,6 @@ public final class MetadataUtility { metadataService.createMetadata(metadata.getRelativePath(), metadata); } - public GspMetadata getMetadataInDesignTime(String metadataId, String metadataRelativePath) { - // 基于id获取元数据的前置条件 - //SetMetadataContextInDesignTime(metadataRelativePath); - - return getMetadataWithEnvironment(metadataId, ExecuteEnvironment.Design, false); - } - - /** - * 获取关联的资源元数据 - * - * @param formMetadataId - * @param formMetadataPath - * @return - */ - public GspMetadata getRefResourceMetadata(String formMetadataId, String formMetadataPath) { - List resourceMetadataCollection = getRefResourceMetadataCollection(formMetadataId, formMetadataPath); - if (resourceMetadataCollection == null || resourceMetadataCollection.size() == 0) { - return null; - } - - // 一个表单元数据仅能关联一个资源元数据 - return resourceMetadataCollection.get(0); - } - private List getRefResourceMetadataCollection(String formMetadataId, String formMetadataPath) { List resourceMetadataHeaderCollection = getRefResourceMetadataHeaderCollection(formMetadataId, formMetadataPath); -- Gitee From a001ed5e6d2d5286447e64d26d124092237d84e8 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 17 Jan 2023 16:15:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=BB=A1=E8=B6=B3javadoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localserver/LocalServerPathGenerator.java | 5 +++- .../LocalServerVersionManager.java | 27 +++++++------------ .../common/converter/WebEntityConverter.java | 3 +++ .../common/serialize/SerializeUtility.java | 5 ++-- .../edp/web/common/utility/EqualsUtility.java | 9 ++++--- .../edp/web/common/utility/ListUtility.java | 7 ++--- .../edp/web/common/utility/RandomUtility.java | 1 + 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java index 6860442d..ff60fc1d 100644 --- a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java +++ b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java @@ -12,7 +12,10 @@ import com.inspur.edp.web.common.utility.StringUtility; public class LocalServerPathGenerator { private String _localServerPath; - // 是否运行在元数据部署工具 + + /** + * 是否运行在元数据部署工具 + */ private boolean isUpgradeTool = false; diff --git a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionManager.java b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionManager.java index 6d0c8d43..657a7d8c 100644 --- a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionManager.java +++ b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionManager.java @@ -36,10 +36,12 @@ import java.util.concurrent.atomic.AtomicBoolean; * @date 2020/09/25 */ public class LocalServerVersionManager { - private static volatile LocalServerVersionManager instance; + private static volatile LocalServerVersionManager _instance; private static final String CurrentClassName = LocalServerVersionManager.class.getName(); + private static final Object _lock = new Object(); + private LocalServerVersionRpcService localServerVersionRpcService; private final ScriptCacheVersionManager scriptCacheVersionManagerInstance = new ScriptCacheVersionManager(); @@ -58,25 +60,14 @@ public class LocalServerVersionManager { * @return */ public static LocalServerVersionManager getSingleInstance() { - if (instance == null) { - synchronized (LocalServerVersionManager.class) { - instance = new LocalServerVersionManager(); + if (_instance == null) { + synchronized (_lock) { + if (_instance == null) { + _instance = new LocalServerVersionManager(); + } } } - return instance; - } - - /** - * 获取工程对应的版本 - * - * @param projectName 工程名称 - * @param strProjectRelativePath 工程相对路径 - * @return - */ - public String getProjectVersion(String projectName, String strProjectRelativePath) { - // 获取当前工程对应的版本 - String strCurrentVersion = LocalServerVersionFileOperation.getSingleInstance().getVersion(projectName, strProjectRelativePath); - return strCurrentVersion; + return _instance; } /** diff --git a/web-common/src/main/java/com/inspur/edp/web/common/converter/WebEntityConverter.java b/web-common/src/main/java/com/inspur/edp/web/common/converter/WebEntityConverter.java index 9f2a9d30..643ba7fc 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/converter/WebEntityConverter.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/converter/WebEntityConverter.java @@ -1,6 +1,9 @@ package com.inspur.edp.web.common.converter; +/** + * @author guozhiqi + */ public interface WebEntityConverter { /** * 执行转换操作 diff --git a/web-common/src/main/java/com/inspur/edp/web/common/serialize/SerializeUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/serialize/SerializeUtility.java index 4219f71e..dcdb179b 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/serialize/SerializeUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/serialize/SerializeUtility.java @@ -28,10 +28,11 @@ public class SerializeUtility { * 增加volatile的作用是为了避免多线程访问时，导致变量不一致问题 */ private volatile static SerializeUtility serializeUtilityInstance = null; + private static final Object _lock = new Object(); public static SerializeUtility getInstance() { if (Objects.isNull(serializeUtilityInstance)) { - synchronized (SerializeUtility.class) { + synchronized (_lock) { if (Objects.isNull(serializeUtilityInstance)) { serializeUtilityInstance = new SerializeUtility(); } @@ -101,7 +102,7 @@ public class SerializeUtility { * @description Json序列化 */ public String serialize(Object entity) { - return serialize(entity,false); + return serialize(entity, false); } /** diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/EqualsUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/EqualsUtility.java index 35ddfeb6..d617a69b 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/EqualsUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/EqualsUtility.java @@ -1,6 +1,8 @@ package com.inspur.edp.web.common.utility; +import java.util.Objects; + /** * description: 字符串比较 * @@ -10,6 +12,8 @@ package com.inspur.edp.web.common.utility; public class EqualsUtility { private boolean isLinux = false; + private static final Object _lock = new Object(); + private EqualsUtility() { // 当前运行环境是否是linux环境 this.isLinux = OperatingSystemUtility.isLinux(); @@ -22,7 +26,7 @@ public class EqualsUtility { public static EqualsUtility getInstance() { if (instance == null) { - synchronized (EqualsUtility.class) { + synchronized (_lock) { instance = new EqualsUtility(); } } @@ -57,8 +61,7 @@ public class EqualsUtility { * @return */ public boolean equalsWithoutOS(String value1, String value2) { - // 如果是windows 那么转换成小写形式进行比较 - return value1.equals(value2); + return Objects.equals(value1, value2); } /** diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/ListUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/ListUtility.java index 3a2c7cf5..6c30bf12 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/ListUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/ListUtility.java @@ -1,9 +1,10 @@ package com.inspur.edp.web.common.utility; -import org.springframework.util.CollectionUtils; - import java.util.List; +/** + * @author guozhiqi + */ public class ListUtility { private ListUtility() { } @@ -15,7 +16,7 @@ public class ListUtility { * @return */ public static boolean isEmpty(List sourceList) { - return CollectionUtils.isEmpty(sourceList); + return sourceList == null || sourceList.size() == 0; } /** diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/RandomUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/RandomUtility.java index e82bb66c..c77ec6f7 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/RandomUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/RandomUtility.java @@ -4,6 +4,7 @@ import java.util.UUID; /** * 随机数构造器 + * @author guozhiqi */ public class RandomUtility { private RandomUtility() { -- Gitee From 701d29823ad3fdfa9409bd59689141f0fa3018df Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 17 Jan 2023 16:56:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=87=8F=E5=B0=8F=E9=94=81=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=EF=BC=8C=E5=87=8F=E5=B0=8F=E5=B9=B6=E5=8F=91=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E5=BD=B1=E5=93=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localserver/LocalServerPathGenerator.java | 3 +- .../LocalServerVersionFileContent.java | 1 - .../LocalServerVersionFileOperation.java | 14 +++-- .../LocalServerPathGeneratorTest.java | 17 ++++++ .../inspur/edp/web/common/io/FileUtility.java | 58 ++++++++----------- 5 files changed, 50 insertions(+), 43 deletions(-) create mode 100644 runtime-scriptcache/src/test/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGeneratorTest.java diff --git a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java index ff60fc1d..eb7bed1d 100644 --- a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java +++ b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGenerator.java @@ -29,7 +29,6 @@ public class LocalServerPathGenerator { * @return */ public static LocalServerPathGenerator getNewInstance(boolean isUpgradeTool) { - LocalServerPathGenerator _instance = new LocalServerPathGenerator(); _instance.isUpgradeTool = isUpgradeTool; return _instance; @@ -86,7 +85,7 @@ public class LocalServerPathGenerator { public String getLocalServerFilePathAndName() { String currentServerPath = getLocalServerPath(); String versionFileName = getLocalServerFileName(); - String localServerFilePath = FileUtility.combineOptional(currentServerPath, "web", "runtime", "web", versionFileName); + String localServerFilePath = FileUtility.combineOptional(currentServerPath, "web/runtime/web", versionFileName); localServerFilePath = FileUtility.getPlatformIndependentPath(localServerFilePath); return localServerFilePath; } diff --git a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileContent.java b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileContent.java index b7d37d73..1c9db7e4 100644 --- a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileContent.java +++ b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileContent.java @@ -36,7 +36,6 @@ public class LocalServerVersionFileContent { } public void setServerPath(String serverPath) { - this.serverPath = serverPath; } diff --git a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileOperation.java b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileOperation.java index 3d101472..e36fbee4 100644 --- a/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileOperation.java +++ b/runtime-scriptcache/src/main/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerVersionFileOperation.java @@ -22,7 +22,7 @@ class LocalServerVersionFileOperation { */ private LocalServerVersionFileOperation() { // 执行本地文件缓存初始化 - this.getLocalServerVersionList(); + this.initLocalServerVersionList(); } private final LocalServerPathGenerator localServerPathGeneratorInstance = LocalServerPathGenerator.getNewInstance(false); @@ -32,6 +32,8 @@ class LocalServerVersionFileOperation { */ private static LocalServerVersionFileContent localServerVersionContent = new LocalServerVersionFileContent(); + private static final Object _lock = new Object(); + /** * 增加volatile 避免由于指令重排而导致的获取实例不完整 * 主要针对的是多线程高并发特殊场景下 @@ -44,9 +46,11 @@ class LocalServerVersionFileOperation { * * @return */ public static LocalServerVersionFileOperation getSingleInstance() { - if (null == instance) { - synchronized (LocalServerVersionFileOperation.class) { - instance = new LocalServerVersionFileOperation(); + if (instance == null) { + synchronized (_lock) { + if (instance == null) { + instance = new LocalServerVersionFileOperation(); + } } } return instance; @@ -55,7 +59,7 @@ class LocalServerVersionFileOperation { /** * 初始化本地脚本缓存文件列表 */ - private void getLocalServerVersionList() { + private void initLocalServerVersionList() { String strLocalServerPath = localServerPathGeneratorInstance.getLocalServerPath(); String localServerVersionFilePathAndName = localServerPathGeneratorInstance.getLocalServerFilePathAndName(); diff --git a/runtime-scriptcache/src/test/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGeneratorTest.java b/runtime-scriptcache/src/test/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGeneratorTest.java new file mode 100644 index 00000000..b7b14b9a --- /dev/null +++ b/runtime-scriptcache/src/test/java/com/inspur/edp/web/jitruntimebuild/scriptcache/localserver/LocalServerPathGeneratorTest.java @@ -0,0 +1,17 @@ +package com.inspur.edp.web.jitruntimebuild.scriptcache.localserver; + +import com.inspur.edp.web.common.io.FileUtility; +import org.junit.Test; + +import java.io.File; + +import static org.junit.Assert.*; + +public class LocalServerPathGeneratorTest { + + @Test + public void getLocalServerFilePathAndName() { + String result = FileUtility.getPlatformIndependentPath(FileUtility.combineOptional("web/runtime/web", "runtime", "web")); + System.out.println(result); + } +} \ No newline at end of file diff --git a/web-common/src/main/java/com/inspur/edp/web/common/io/FileUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/io/FileUtility.java index 175f43f9..569db06a 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/io/FileUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/io/FileUtility.java @@ -24,6 +24,8 @@ public class FileUtility { */ public static final String DIRECTORY_SEPARATOR_CHAR = File.separator; + private static final Object _writeFileLock = new Object(); + private FileUtility() { } @@ -71,6 +73,7 @@ public class FileUtility { /** * 文件目录合并 * 请注意：除了path1，more中不允许出现绝对路径 + * * @param path1 * @param more * @return @@ -115,7 +118,6 @@ public class FileUtility { } - /** * Read file content as string * @@ -257,26 +259,7 @@ public class FileUtility { public static void writeFile(String path, String fileName, String contents) { String filePath = combine(path, fileName); - filePath = getPlatformIndependentPath(filePath); - // 增加写入锁 - synchronized (FileUtility.class) { - // 如果文件路径不存在 那么创建对应的文件目录 - if (!exists(path)) { - createDirectory(path); - } - File file = new File(filePath); - - if (exists(file)) { - clear(file); - } else { - createFile(file); - } - // 如果写入的内容为null 那么转换成空字符串写入 - if (StringUtility.isNullOrEmpty(contents)) { - contents = ""; - } - updateFile(filePath, contents); - } + writeFile(filePath, contents); } /** @@ -286,24 +269,28 @@ public class FileUtility { * @param contents 写入文件的内容 */ public static void writeFile(String fileNameAndPath, String contents) { + fileNameAndPath = getPlatformIndependentPath(fileNameAndPath); + // 如果文件路径不存在 那么创建对应的文件目录 File file = new File(fileNameAndPath); File fileParent = file.getParentFile(); - if (!fileParent.exists()) { - fileParent.mkdirs(); - } + synchronized (_writeFileLock) { + if (!fileParent.exists()) { + fileParent.mkdirs(); + } - if (exists(file)) { - clear(file); - } else { - createFile(file); - } - // 如果写入的内容为null 那么转换成空字符串写入 - if (StringUtility.isNullOrEmpty(contents)) { - contents = ""; + if (exists(file)) { + clear(file); + } else { + createFile(file); + } + // 如果写入的内容为null 那么转换成空字符串写入 + if (StringUtility.isNullOrEmpty(contents)) { + contents = ""; + } + updateFile(fileNameAndPath, contents); } - updateFile(fileNameAndPath, contents); } public static void reName(String source, String dest) { @@ -323,12 +310,13 @@ public class FileUtility { /** * 获取当前运行目录 + * 服务器目录 * * @return */ - public static String getCurrentWorkPath(boolean isUpdradeTool) { + public static String getCurrentWorkPath(boolean isUpgradeTool) { // 如果运行在tool中 那么运行目录需要进行调整 - if (isUpdradeTool) { + if (isUpgradeTool) { String caf_boot_home = System.getenv("CAF_BOOT_HOME"); String targetPath = null; -- Gitee