diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index 66cd9905e75be27bd5d95f744776264c95eb7d83..ac182ab588768a98b7fe1d321bb7a02ba6204446 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -93,7 +93,6 @@ public class MavenWrapperDownloader { System.exit(0); } catch (Throwable e) { System.out.println("- Error downloading"); - e.printStackTrace(); System.exit(1); } } diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java index 75dd8dd8ed18ef2caf0960c71c3ea6366cf94aad..4342d445f12d3262510444c5417bcff7511297e2 100644 --- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java +++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/JitEngineServiceImpl.java @@ -2,6 +2,7 @@ package com.inspur.edp.web.jitengine.web.core.service; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.common.io.FileUtility; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.jitengine.web.api.service.JitEngineService; @@ -15,11 +16,11 @@ public class JitEngineServiceImpl implements JitEngineService { GspMetadata gspMetadata = MobilEApprovePreviewImpl.getGspMetadataWithFormId(formId); String formCode = gspMetadata.getHeader().getCode(); - String mobileApproveAppPath = MobilEApprovePreviewImpl.generateMobileApproveDevBasePath(formCode,false); + String mobileApproveAppPath = MobilEApprovePreviewImpl.generateMobileApproveDevBasePath(formCode, false); try { FileUtility.deleteFolder(mobileApproveAppPath); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception ex) { + WebLogger.Instance.error(ex); } } } diff --git a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java index f1dedc7da9ee52f52f78f521eb49698b823be624..2c23ba85978ae5d2306d2eee6cd495e7c606daff 100644 --- a/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java +++ b/jitengine-web-core/src/main/java/com/inspur/edp/web/jitengine/web/core/service/MobileApproveDocker.java @@ -30,7 +30,7 @@ public class MobileApproveDocker { scriptCacheServiceImpl.publishScriptWithDirectory(request); WebLogger.Instance.info("execute mobile approval script cache completely!!!", this.getClass().getName()); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } diff --git a/pom.xml b/pom.xml index d99653187c96415358350640cdf6b8e704116f27..19683ee22d1c9589047edfed59148cdee7ceaeeb 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,11 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/builddeploy/BuildDeployManager.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/builddeploy/BuildDeployManager.java index 8b11510786de5b3523a855bf864102c9d326b027..a68fbbc1695789750fb01644ca03c088cd63d397 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/builddeploy/BuildDeployManager.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/builddeploy/BuildDeployManager.java @@ -118,7 +118,7 @@ public class BuildDeployManager { scriptCacheServiceImpl.publishScriptWithDirectory(request); WebLogger.Instance.info("execute form script cache completely!!!", CurrentClassName); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } 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 211b9fa563541cdd1ccacb58bf0a06b654f60458..e9f68ac8aa41520af0e15443f0c606fa39b1bbe1 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 @@ -4,6 +4,7 @@ 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.logger.WebLogger; import com.inspur.edp.web.common.utility.StringUtility; /** @@ -46,13 +47,13 @@ class CommandJsonFileGenerator extends AbstractFormJsonFileGenerator implements this.writeFile(basePath, tsFileCode.toLowerCase(), tsFileContent); } } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } }); } } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } } 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 e3c9eeabdcd3c85dd9e34fc9a7f7fc3a45683981..1eac227eb27eb73d0757a1d11ed63a6786af7dfd 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 @@ -97,7 +97,7 @@ public class FrmJsonFileGenerator extends AbstractFormJsonFileGenerator implemen fileName = fileName + ".frm"; commandsAnalysis.resolveCommand(json, fileName, basePath, projectCmpList, null, fileName); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -203,7 +203,7 @@ public class FrmJsonFileGenerator extends AbstractFormJsonFileGenerator implemen try { externalVisualDom = formAnalysis.analysisExternalComponent(targetStorageBasePath, json.getModule().getCode().toLowerCase(), item, webdevpath); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); return; } @@ -235,7 +235,7 @@ public class FrmJsonFileGenerator extends AbstractFormJsonFileGenerator implemen externalFormBasePath, externalVisualDom.getRelativePath(), externalFormServicePath, projectPath, projectCmpList, webdevpath, expressionManifest); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } } diff --git a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/sourcecodemetadata/SourceCodeMetadataManager.java b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/sourcecodemetadata/SourceCodeMetadataManager.java index b20b2aa988fd3925b6c823360e641799cb353cb3..5d21e60cbb75afb938a55dae85e2f5512179006f 100644 --- a/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/sourcecodemetadata/SourceCodeMetadataManager.java +++ b/runtime-core/src/main/java/com/inspur/edp/web/jitruntimebuild/core/sourcecodemetadata/SourceCodeMetadataManager.java @@ -1,6 +1,7 @@ package com.inspur.edp.web.jitruntimebuild.core.sourcecodemetadata; import com.inspur.edp.web.common.io.FileUtility; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.Base64Utility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.jitengine.sourcecode.SourceCodeInFormManager; @@ -63,7 +64,7 @@ public class SourceCodeMetadataManager { System.out.println("待写入的目标文件路径为" + strWriteFilePath); FileUtility.writeFile(strWriteFilePath, strFileContent); } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } }); diff --git a/web-approval-format-core/src/main/java/com/inspur/edp/web/approvalformat/core/service/ApprovalFormatServiceImpl.java b/web-approval-format-core/src/main/java/com/inspur/edp/web/approvalformat/core/service/ApprovalFormatServiceImpl.java index d51b32e88d07d46b4f13003b2ee9e26a5f7cf4cb..d005d5be928d8734b70eba70204c578338f53bd2 100644 --- a/web-approval-format-core/src/main/java/com/inspur/edp/web/approvalformat/core/service/ApprovalFormatServiceImpl.java +++ b/web-approval-format-core/src/main/java/com/inspur/edp/web/approvalformat/core/service/ApprovalFormatServiceImpl.java @@ -30,6 +30,7 @@ import com.inspur.edp.web.approvalformat.core.domain.entity.ApprovalFormatDO; import com.inspur.edp.web.approvalformat.core.domain.manager.ApprovalFormatManager; import com.inspur.edp.web.approvalformat.core.util.*; import com.inspur.edp.web.common.io.FileUtility; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.help.api.LookupDataService; import com.inspur.edp.web.help.api.LookupQueryParam; @@ -619,7 +620,7 @@ public class ApprovalFormatServiceImpl implements ApprovalFormatService { try { FileUtility.deleteFolder(mobileApproveAppPath); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -778,7 +779,7 @@ public class ApprovalFormatServiceImpl implements ApprovalFormatService { return mapper.readTree(itemCollectionObjectStr); } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); throw new RuntimeException(e); } } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/encrypt/EncryptUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/encrypt/EncryptUtility.java index 6da357668539e63f7c87b199c0f1ded160a9c02a..80e4bb1b1a124d87394a94a12a3c2ec6a21c336c 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/encrypt/EncryptUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/encrypt/EncryptUtility.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.common.encrypt; +import com.inspur.edp.web.common.logger.WebLogger; import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import javax.crypto.Cipher; @@ -68,8 +69,8 @@ public class EncryptUtility { MessageDigest md = MessageDigest.getInstance(algorithm); byte[] resBytes = charset == null ? res.getBytes() : res.getBytes(charset); return base64(md.digest(resBytes)); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception ex) { + WebLogger.Instance.error(ex); } return null; } @@ -97,7 +98,7 @@ public class EncryptUtility { byte[] result = mac.doFinal(res.getBytes()); return base64(result); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } return null; } @@ -136,7 +137,7 @@ public class EncryptUtility { return new String(cipher.doFinal(parseHexStr2Byte(res))); } } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } return null; } 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 569db06a4ea79e1f47acfcf8d4e75e54b5c29569..c176557f3a76f18546f6152ead142db050bfa1cf 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 @@ -1,5 +1,6 @@ package com.inspur.edp.web.common.io; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.OperatingSystemUtility; import com.inspur.edp.web.common.utility.StringUtility; import io.iec.edp.caf.common.environment.EnvironmentUtil; @@ -134,7 +135,7 @@ public class FileUtility { in.read(fileContent); in.close(); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); throw new RuntimeException("readAsString failed", e); } @@ -147,7 +148,7 @@ public class FileUtility { return fileContents; } catch (UnsupportedEncodingException e) { System.err.println("The OS does not support " + ENCODING); - e.printStackTrace(); + WebLogger.Instance.errorWithCustomMessage(e, "The OS does not support " + ENCODING); return null; } } @@ -385,7 +386,7 @@ public class FileUtility { fileWriter.flush(); fileWriter.close(); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -402,7 +403,7 @@ public class FileUtility { fos.write(buffer); fos.close(); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -419,7 +420,7 @@ public class FileUtility { file.createNewFile(); } } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -433,7 +434,7 @@ public class FileUtility { file.createNewFile(); return true; } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); return false; } } @@ -450,7 +451,7 @@ public class FileUtility { file.mkdirs(); } } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -607,7 +608,7 @@ public class FileUtility { FileUtils.copyFile(file1, file2); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -654,14 +655,14 @@ public class FileUtility { return false; } } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } finally {//关闭文件流，防止内存泄漏 if (fis1 != null) { try { fis1.close(); } catch (IOException e) { //忽略 - e.printStackTrace(); + WebLogger.Instance.error(e); } } if (fis2 != null) { @@ -669,7 +670,7 @@ public class FileUtility { fis2.close(); } catch (IOException e) { //忽略 - e.printStackTrace(); + WebLogger.Instance.error(e); } } } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java b/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java index 444c38b11c129d8e242217ba54683749bff0ccec..1a56a09c033b3923dbdc2ef2bb844ede5bdc7fb1 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java @@ -157,6 +157,31 @@ public enum WebLogger { this.write(message, WebLoggerLevel.Error, loggerName); } + /** + * 输出异常信息 + * + * @param ex + * @param loggerName + */ + public void error(Exception ex, String... loggerName) { + this.error(ex.getMessage() + ex.getStackTrace(), loggerName); + } + + /** + * 异常信息日志记录 + * + * @param ex + * @param customErrorMessage + * @param loggerName + */ + public void errorWithCustomMessage(Exception ex, String customErrorMessage, String... loggerName) { + if (StringUtility.isNullOrEmpty(customErrorMessage)) { + this.error(ex, loggerName); + } else { + this.error(customErrorMessage + ex.getMessage() + ex.getStackTrace(), loggerName); + } + } + public void warn(String message, String... loggerName) { this.write(message, WebLoggerLevel.Warn, loggerName); } 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 ada4dbbe729017b83189e84480d9a52e943796f9..fd14eebdb37f30486019c8bc2cf9871e389ee471 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 @@ -18,6 +18,7 @@ import com.inspur.edp.web.command.component.metadata.*; import com.inspur.edp.web.common.GSPException; 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.StringUtility; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -278,7 +279,7 @@ public final class MetadataUtility { try { return this.getGspProjectService().getGspProjectInfo(projectPath); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); return null; } } 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 dcdb179bbb574763e94e627b737d93d3343ae8ba..ff616e18dd1737fd4c918e7e999ab2f3cfdc4021 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 @@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.*; +import com.inspur.edp.web.common.logger.WebLogger; import java.io.IOException; import java.util.Objects; @@ -198,7 +199,7 @@ public class SerializeUtility { try { return (T) (objectMapper.readValue(contentString, valueType)); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); return null; } } @@ -227,7 +228,7 @@ public class SerializeUtility { return serializeStr; } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); return null; } } @@ -249,7 +250,7 @@ public class SerializeUtility { objectJsonNode = objectMapper.readTree(objectContent); return objectJsonNode; } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); throw new RuntimeException(e); } } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandExecuteInterceptor.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandExecuteInterceptor.java index e3c478d923b2732130364e1b2c7b2c6a8dc7df95..028c4ca874f0b13f1befdaf18268cc7c5e8cafc7 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandExecuteInterceptor.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandExecuteInterceptor.java @@ -131,13 +131,13 @@ public class CommandExecuteInterceptor extends Thread { } } } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } finally { try { this.inputStream.close(); br.close(); } catch (IOException ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandLineUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandLineUtility.java index 9016e50a2053566d75672781607c63861ffd6ebc..2e607faaace7441bbf646ec138a12944557786d0 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandLineUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/CommandLineUtility.java @@ -107,7 +107,7 @@ public class CommandLineUtility { } //process.destroy(); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); errorMessage = e.getMessage() + Arrays.toString(e.getStackTrace()); } return errorMessage; diff --git a/web-designschema/src/main/java/com/inspur/edp/web/designschema/udtextensiondef/FormUdtExtensionDeserializer.java b/web-designschema/src/main/java/com/inspur/edp/web/designschema/udtextensiondef/FormUdtExtensionDeserializer.java index 0083a0828da158e38e3a1dbab89f71af68e8f0cb..e8b1daaed7f32da9f303e56a7857d227c4c15f23 100644 --- a/web-designschema/src/main/java/com/inspur/edp/web/designschema/udtextensiondef/FormUdtExtensionDeserializer.java +++ b/web-designschema/src/main/java/com/inspur/edp/web/designschema/udtextensiondef/FormUdtExtensionDeserializer.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.inspur.edp.cef.designtime.api.json.SerializerUtils; import com.inspur.edp.udt.designtime.api.extension.BaseUdtExtensionDeserializer; +import com.inspur.edp.web.common.logger.WebLogger; import java.io.IOException; import java.util.HashMap; @@ -78,7 +79,7 @@ public class FormUdtExtensionDeserializer extends BaseUdtExtensionDeserializer webCmpAndTsDeleteList = webCommandMetadataDelete.generateWebCmpAndTsDeleteList(formDOM, projInfo); relativeMetadataDeleteList.addAll(new ArrayList<>(webCmpAndTsDeleteList)); } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -107,9 +107,9 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { deleteRelateFormSourceCode(projectPath, projInfo.getName(), metaDataCode); // 更新页面流元数据 } catch (RuntimeException ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -166,7 +166,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { } }); } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -175,7 +175,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { try { deleteRelateHelpMetadata(metadataEventArgs); } catch (Exception ex) { - WebLogger.Instance.error(ex.getMessage() + ex.getStackTrace()); + WebLogger.Instance.error(ex); } } } diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/WebCommandMetadataDelete.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/WebCommandMetadataDelete.java index 6fe7edcde6e4cad453bcd1cb7c5923c95083a996..b5659e240a29ff22e84d0b89f4baf9daecb6b555 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/WebCommandMetadataDelete.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/WebCommandMetadataDelete.java @@ -6,6 +6,7 @@ import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; import com.inspur.edp.web.command.component.metadata.*; import com.inspur.edp.web.common.environment.ExecuteEnvironment; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.metadata.MetadataUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; @@ -33,7 +34,7 @@ class WebCommandMetadataDelete { deleteList.add(webCmdFileName); } } catch (Exception ex) { - ex.printStackTrace(); + WebLogger.Instance.error(ex); } } @@ -132,7 +133,7 @@ class WebCommandMetadataDelete { try { analysisComponentCommandItemList(webCommandItem.getItems(), cmpList, projectCmpList); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } } @@ -141,7 +142,7 @@ class WebCommandMetadataDelete { try { analysisComponentCommandItemList(branchCommandItem.getItems(), cmpList, projectCmpList); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } } diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadata/FormMetadataContent.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadata/FormMetadataContent.java index 2545be1642dbf870a9e39b7086e463b48367fd1f..48cae46a59552370c83984c14d63a21a0c95093a 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadata/FormMetadataContent.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadata/FormMetadataContent.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.TextNode; import com.inspur.edp.lcm.metadata.api.AbstractMetadataContent; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.serialize.SerializeUtility; import java.util.Date; @@ -67,7 +68,7 @@ public class FormMetadataContent extends AbstractMetadataContent { JsonNode newContent = mapper.treeToValue(mapper.valueToTree(this.getContents()), JsonNode.class); formMetaDataContent.setContents(newContent); } catch (JsonProcessingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); throw new RuntimeException("Form Content克隆失败, id=" + this.getId() + ", code=" + this.getCode() + ", name=" + this.getName()); } formMetaDataContent.setName(this.getName()); diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetataService.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetataService.java index 3368c17348e9e47b1e81cfeec502cd8e80fac644..a70daf5a70de53d07bdbd7a07bb4e4cf6b48ad8a 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetataService.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetataService.java @@ -85,7 +85,7 @@ public class FormMetataService { if (ex.getMessage() != null && ex.getMessage().contains(fileNotFoundException)) { WebLogger.Instance.warn(ex.getMessage()); } else { - ex.printStackTrace(); + WebLogger.Instance.error(ex); throw ex; } } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/compile/stepexecute/FileChangeStepExecuteImpl.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/compile/stepexecute/FileChangeStepExecuteImpl.java index bac27a05e134a348baacc4f024aca4464d0acf29..1a6e816e7fa6730a31ea0628f31dfc86e8abe355 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/compile/stepexecute/FileChangeStepExecuteImpl.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/changedetect/compile/stepexecute/FileChangeStepExecuteImpl.java @@ -4,6 +4,7 @@ import com.inspur.edp.lcm.metadata.api.entity.OperationEnum; import com.inspur.edp.lcm.metadata.api.service.MetadataProjectService; import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.io.FileUtility; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.Base64Utility; import com.inspur.edp.web.frontendproject.changedetect.ChangeDetectExecuteType; import com.inspur.edp.web.frontendproject.changedetect.ExcludePathEntity; @@ -90,7 +91,7 @@ public class FileChangeStepExecuteImpl extends AbstractCompileChangeDetectStepEx executeResult.setUnPassReason("node_modules发生变更"); } } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } @@ -128,7 +129,7 @@ public class FileChangeStepExecuteImpl extends AbstractCompileChangeDetectStepEx String base64EncodeValue = Base64Utility.encode(FileUtility.readAsString(serverPackageJsonPath)).substring(0, 32); projectService.updateFileChanges(context.getProjectPath(), serverPackageJsonPath, base64EncodeValue, OperationEnum.WEB_GENERATE); } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/webservice/ZeroCodeWebServiceImpl.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/webservice/ZeroCodeWebServiceImpl.java index 8c74efeca1e55b56ac3fe77ca92684befada0925..2868860ce17fb124f8788ecf4320038b3285d781 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/webservice/ZeroCodeWebServiceImpl.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/webservice/ZeroCodeWebServiceImpl.java @@ -3,6 +3,7 @@ package com.inspur.edp.web.frontendproject.webservice; import com.inspur.edp.web.common.entity.ResultCode; import com.inspur.edp.web.common.entity.ResultMessage; import com.inspur.edp.web.common.io.FileUtility; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.jitruntimebuild.scriptcache.api.entity.ScriptCacheResponse; import com.inspur.edp.web.jitruntimebuild.scriptcache.localserver.LocalServerVersionManager; @@ -65,7 +66,7 @@ public class ZeroCodeWebServiceImpl implements ZeroCodeWebService { assert response != null; response.sendRedirect(redirectUrl); } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } // 进行页面跳转 diff --git a/web-ide-webapi/src/main/java/com/inspur/edp/ide/config/webapi/common/FileUtil.java b/web-ide-webapi/src/main/java/com/inspur/edp/ide/config/webapi/common/FileUtil.java index 529c1de54863430db280ed240815517307622662..0fdafd2efe34e4b3c5b10ed637172b556c9e2e8c 100644 --- a/web-ide-webapi/src/main/java/com/inspur/edp/ide/config/webapi/common/FileUtil.java +++ b/web-ide-webapi/src/main/java/com/inspur/edp/ide/config/webapi/common/FileUtil.java @@ -1,33 +1,40 @@ package com.inspur.edp.ide.config.webapi.common; +import com.inspur.edp.web.common.logger.WebLogger; import lombok.extern.slf4j.Slf4j; import java.io.File; import java.io.FileInputStream; +import java.io.UnsupportedEncodingException; -@Slf4j -public class FileUtil -{ - public static String readFile(String path) { - String encoding = "UTF-8"; - File file = new File(path); - long length = file.length(); - String fileContents = null; - try { - byte[] bytes = new byte[(int) length]; - FileInputStream in = new FileInputStream(file); - in.read(bytes); - in.close(); +/** + * @author guozhiqi + */ +public class FileUtil { + public static String readFile(String path) { + String encoding = "UTF-8"; + File file = new File(path); + long length = file.length(); + String fileContents = null; - fileContents = new String(bytes, encoding); - // 处理utf-8 bom头 - if (fileContents.startsWith("\ufeff")) { - fileContents = fileContents.substring(1); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - e.printStackTrace(); - } - return fileContents; - } + byte[] bytes = new byte[(int) length]; + try (FileInputStream in = new FileInputStream(file);) { + in.read(bytes); + } catch (Exception e) { + WebLogger.Instance.error(e.getMessage() + e.getStackTrace(), FileUtil.class.getName()); + } + + try { + fileContents = new String(bytes, encoding); + // 处理utf-8 bom头 + if (fileContents.startsWith("\ufeff")) { + fileContents = fileContents.substring(1); + } + } catch (UnsupportedEncodingException e) { + WebLogger.Instance.error(e.getMessage() + e.getStackTrace(), FileUtil.class.getName()); + } + + + return fileContents; + } } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java index 2968e280294ab24f026a00e4c43520eaebbbb1cb..66a5ea351dd6c928fa11ea46e4ea9aa903877143 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java @@ -1,5 +1,6 @@ package com.inspur.edp.web.npmpackage.core.npminstall.global; +import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.OperatingSystemUtility; import java.io.BufferedReader; @@ -35,7 +36,7 @@ public class GlobalNpmDeployPathGenerator { resultstr = line; } } catch (IOException e) { - e.printStackTrace(); + WebLogger.Instance.error(e); } return resultstr; } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java index 7a86eb42449b86003100ff1f004dd54c88b7e2e7..99715561578c7842988ef137029b5fce107a4808 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java @@ -147,7 +147,7 @@ public class NpmLoginCommandExecutor { //process.destroy(); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); WebLogger.Instance.info(Arrays.toString(e.getStackTrace()), NpmLoginCommandExecutor.class.getName()); errorMessage = e.getMessage() + Arrays.toString(e.getStackTrace()); } finally { @@ -155,7 +155,7 @@ public class NpmLoginCommandExecutor { try { bufferedReader.close(); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); errorMessage = e.getMessage() + Arrays.toString(e.getStackTrace()); } } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java index 24a7226d7c65a123897d02b138c21250f54490b4..b0d371d544dab580a9907351b21aac06d47cd975 100644 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java +++ b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java @@ -106,14 +106,14 @@ public class NpmLogoutCommandExecutor { } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); errorMessage = e.getMessage() + Arrays.toString(e.getStackTrace()); } finally { if (bufferedReader != null) { try { bufferedReader.close(); } catch (Exception e) { - e.printStackTrace(); + WebLogger.Instance.error(e); errorMessage = e.getMessage() + Arrays.toString(e.getStackTrace()); } } diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java b/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java index 87f7a64355b839bdd770ff1bfea55f0023f33a80..9dc8fbe14e31bb03fbe31996514b15c57b917543 100644 --- a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java +++ b/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java @@ -20,10 +20,8 @@ public class FileOperation { File file = new File(path); long fileLength = file.length(); byte[] fileContent = new byte[(int) fileLength]; - try { - FileInputStream in = new FileInputStream(file); + try (FileInputStream in = new FileInputStream(file);) { in.read(fileContent); - in.close(); } catch (IOException e) { e.printStackTrace(); throw new RuntimeException("readAsString failed", e); @@ -110,16 +108,15 @@ public class FileOperation { * @param file 待清空文件句柄 */ private static void clear(File file) { - try { - if (file.exists()) { - file.setWritable(true); - file.setReadable(true); - file.setExecutable(true); - } - FileWriter fileWriter = new FileWriter(file); + if (file.exists()) { + file.setWritable(true); + file.setReadable(true); + file.setExecutable(true); + } + + try (FileWriter fileWriter = new FileWriter(file)) { fileWriter.write(""); fileWriter.flush(); - fileWriter.close(); } catch (IOException e) { e.printStackTrace(); } @@ -163,11 +160,9 @@ public class FileOperation { * @param content */ public static void updateFile(String fullPath, String content) { - try { - byte[] buffer = content.getBytes(StandardCharsets.UTF_8); - FileOutputStream fos = new FileOutputStream(fullPath, true); + byte[] buffer = content.getBytes(StandardCharsets.UTF_8); + try (FileOutputStream fos = new FileOutputStream(fullPath, true);) { fos.write(buffer); - fos.close(); } catch (IOException e) { e.printStackTrace(); }