From 609852532ab9685a8110e9906c76a65c8b6a9161 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Thu, 7 Sep 2023 20:09:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ derby.log | 13 ------------- .../org/jeecg/common/constant/SymbolConstant.java | 2 ++ .../service/impl/SpectrumAnalysisServiceImpl.java | 3 ++- 4 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 derby.log diff --git a/.gitignore b/.gitignore index 1977fdcf..9c9e33a5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ rebel.xml ## json /json/ + +## log +derby.log \ No newline at end of file diff --git a/derby.log b/derby.log deleted file mode 100644 index debbe824..00000000 --- a/derby.log +++ /dev/null @@ -1,13 +0,0 @@ ----------------------------------------------------------------- -Thu Sep 07 18:35:29 CST 2023: -Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-018a-6f36-0bb6-000026acaf78 -on database directory memory:E:\Code\RadionuclideAnalysis\AnalysisSystemForRadionuclide\dd4468e9-cdd6-4c7a-91ec-3c8744a24ea3 with class loader sun.misc.Launcher$AppClassLoader@18b4aac2 -Loaded from file:/E:/maven/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar -java.vendor=Oracle Corporation -java.runtime.version=1.8.0_351-b10 -user.dir=E:\Code\RadionuclideAnalysis\AnalysisSystemForRadionuclide -os.name=Windows 10 -os.arch=amd64 -os.version=10.0 -derby.system.home=null -Database Class Loader started - derby.database.classpath='' diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java index 1470c6ec..fed196aa 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java @@ -123,4 +123,6 @@ public class SymbolConstant { public static final String SPACE = " "; + public static final String LINE = "\n"; + } \ No newline at end of file diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index 51b36462..9b474f44 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -1100,7 +1100,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { String sampleInfo = buffer.toString(); String colon = SymbolConstant.COLON; String space = SymbolConstant.SPACE; - List sampleInfos = ListUtil.toList(sampleInfo.split("\n")).stream() + String line = SymbolConstant.LINE; + List sampleInfos = ListUtil.toList(sampleInfo.split(line)).stream() .filter(StrUtil::isNotBlank) .filter(item -> StrUtil.contains(item,colon)) .collect(Collectors.toList());