diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailLogManager.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailLogManager.java index f947be89..de0596ef 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailLogManager.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailLogManager.java @@ -308,7 +308,7 @@ public class EmailLogManager { LocalDateTime now = LocalDateTime.now(); StringBuilder logFilePath = new StringBuilder(); logFilePath.append(spectrumPathProperties.getRootPath()); - logFilePath.append(File.separator); +// logFilePath.append(File.separator); logFilePath.append(spectrumPathProperties.getLogPath()); logFilePath.append(File.separator); logFilePath.append(FIXED_FILE_NAME); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java index d701893e..fe112ee7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java @@ -544,7 +544,7 @@ public class EmailServiceManager { fileName.append(SAVE_EML_SUFFIX); final String rootPath = spectrumPathProperties.getRootPath(); final String emlPath = spectrumPathProperties.getEmlPath(); - emlFile = new File(rootPath+File.separator+emlPath+File.separator+fileName); + emlFile = new File(rootPath+emlPath+File.separator+fileName); message.writeTo(new FileOutputStream(emlFile)); } catch (MessagingException | IOException e) { //下载邮件失败 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index 286f8737..8b8e9c4c 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; @Component -@FeignClient("jeecg-system") +@FeignClient("armd-system") public interface SystemClient { /* 系统用户相关 */ @RequestMapping("/sys/user/findUserMap") diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ErrorLogManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ErrorLogManager.java index 5e830a23..0c795180 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ErrorLogManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/ErrorLogManager.java @@ -72,7 +72,7 @@ public class ErrorLogManager { StringBuilder logFilePath = new StringBuilder(); logFilePath.append(spectrumPathProperties.getRootPath()); - logFilePath.append(File.separator); +// logFilePath.append(File.separator); logFilePath.append(spectrumPathProperties.getLogPath()); logFilePath.append(File.separator); logFilePath.append("error"); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java index 0eccdbc1..173d9fe0 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java @@ -68,7 +68,7 @@ public class FileSourceHandleManager{ //手动放置能谱文件获取路径 final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath(); final String filePath = spectrumServiceQuotes.getSpectrumPathProperties().getFilesourcePath(); - List spectrumFiles = FileOperation.getFiles(rootPath+ File.separator+filePath,taskProperties.getFilesourceDirReceiveNum()); + List spectrumFiles = FileOperation.getFiles(rootPath+ filePath,taskProperties.getFilesourceDirReceiveNum()); if(!CollectionUtils.isEmpty(spectrumFiles)){ CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size()); for(File spectrumFile : spectrumFiles){ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/StatReportManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/StatReportManager.java index dcc9d69b..daa88554 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/StatReportManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/StatReportManager.java @@ -263,7 +263,7 @@ public class StatReportManager implements ApplicationListener{ final String statisticsPath = spectrumPathProperties.getStatisticsPath(); StringBuilder finalPath = new StringBuilder(); finalPath.append(spectrumPathProperties.getRootPath()); - finalPath.append(File.separator); +// finalPath.append(File.separator); finalPath.append(spectrumPathProperties.getSaveFilePath()); finalPath.append(File.separator); finalPath.append(spectrumPathProperties.getStatisticsPath()); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java index 12d16596..9d61875f 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java @@ -69,7 +69,7 @@ public class UndealHandleManager{ //ftp解析失败文件存储路径 final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath(); final String filePath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath(); - List spectrumFiles = FileOperation.getFiles(rootPath+ File.separator+filePath,taskProperties.getUndealDirReceiveNum()); + List spectrumFiles = FileOperation.getFiles(rootPath+ filePath,taskProperties.getUndealDirReceiveNum()); if(!CollectionUtils.isEmpty(spectrumFiles)){ CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size()); for(File spectrumFile : spectrumFiles){ diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java index 88a0e361..009d7f09 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java @@ -157,7 +157,7 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { final SpectrumPathProperties properties = this.spectrumServiceQuotes.getSpectrumPathProperties(); StringBuilder finalPath = new StringBuilder(); finalPath.append(properties.getRootPath()); - finalPath.append(File.separator); +// finalPath.append(File.separator); finalPath.append(properties.getSaveFilePath()); finalPath.append(File.separator); finalPath.append(fileSavePath); @@ -266,13 +266,13 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { //解析失败会把文件移动到errorfile目录 final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath(); final String errorFilePath = spectrumServiceQuotes.getSpectrumPathProperties().getErrorFilePath(); - final String finalPath = rootPath+File.separator+errorFilePath; + final String finalPath = rootPath+errorFilePath; FileOperation.moveFile(spectrumFile,finalPath,true); } else { //解析失败会把文件移动到undeal目录 final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath(); final String undealPath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath(); - final String finalPath = rootPath+File.separator+undealPath; + final String finalPath = rootPath+undealPath; //判断文件是否在savefile下已经保存过 final String savefileName = spectrumServiceQuotes.getSpectrumPathProperties().getSaveFilePath().substring(1); //若文件已经在savefile了进行复制 @@ -318,7 +318,7 @@ public abstract class AbstractSpectrumHandler extends AbstractChain { if(SpectrumSource.FORM_FILE_UNDEL.getSourceType().equals(spectrumSource)){ StringBuilder undealFilePath = new StringBuilder(); undealFilePath.append(spectrumServiceQuotes.getSpectrumPathProperties().getRootPath()); - undealFilePath.append(File.separator); +// undealFilePath.append(File.separator); undealFilePath.append(spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath()); undealFilePath.append(File.separator); undealFilePath.append(this.spectrumFile.getName()); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java index 5a052851..73f32595 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java @@ -804,7 +804,7 @@ public class Sample_B_Analysis implements BlockConstant { private void saveReportToSavefileArr() throws IOException { StringBuilder finalReportPath = new StringBuilder(); finalReportPath.append(spectrumServiceQuotes.getSpectrumPathProperties().getRootPath()); - finalReportPath.append(File.separator); +// finalReportPath.append(File.separator); finalReportPath.append(spectrumServiceQuotes.getSpectrumPathProperties().getSaveFilePath()); finalReportPath.append(File.separator); finalReportPath.append(arrFilePath); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index bd548e41..6baf4151 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -186,8 +186,7 @@ public class Sample_G_Analysis { String reportContent = gammaFileUtil.GetReportContent(middleData); String reportPath = StringUtils.substringBeforeLast(middleData.getAnalyses_ReportPath(), StringPool.SLASH); String reportName = StringUtils.substringAfterLast(middleData.getAnalyses_ReportPath(), StringPool.SLASH) + ".txt"; - String savePath = spectrumPathProperties.getRootPath() + File.separator + - spectrumPathProperties.getSaveFilePath() + File.separator + reportPath + + String savePath = spectrumPathProperties.getRootPath() + spectrumPathProperties.getSaveFilePath() + File.separator + reportPath + File.separator + reportName; // 保存文件 FileOperation.saveOrAppendFile(savePath, reportContent, false); @@ -356,8 +355,7 @@ public class Sample_G_Analysis { * @param middleData */ private void writeLog(String logFilePath, GStoreMiddleProcessData middleData) { - logFilePath = spectrumPathProperties.getRootPath() + File.separator + - spectrumPathProperties.getLogPath() + File.separator + logFilePath; + logFilePath = spectrumPathProperties.getRootPath() + spectrumPathProperties.getLogPath() + File.separator + logFilePath; String sampleId = middleData.getSample_id(); MyLogFormatUtil myLogFormatUtil = new MyLogFormatUtil(); List writes = new LinkedList<>(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 999628f0..943ef4b9 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -7,7 +7,6 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.bizVo.GammaRLR; import org.jeecg.modules.entity.GardsSampleDataSpectrum; import org.jeecg.modules.entity.vo.*; -import org.jeecg.modules.feignclient.SystemClient; import org.jeecg.modules.service.IGammaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/feignclient/SystemClient.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index a59ce816..c2099c19 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/feignclient/SystemClient.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; @Component -@FeignClient("jeecg-spectrum") +@FeignClient("armd-system") public interface SystemClient { /* 获取当前用户信息 */ diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IUserTaskService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IUserTaskService.java index 9e1f5330..7321ef8c 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IUserTaskService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IUserTaskService.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @Component -@FeignClient("jeecg-system") +@FeignClient("armd-system") public interface IUserTaskService { @RequestMapping("/sys/user/findUserByName") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index c95bdf81..7e874087 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -1062,7 +1062,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("The comparison file path does not exist"); return result; } - compareFilePath = StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + compareFilePath; + compareFilePath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + compareFilePath; File compareFile = ftpUtil.downloadFile(compareFilePath, "betaGamma"); if (Objects.isNull(compareFile)) { result.error500("The comparison file path does not exist"); @@ -1146,7 +1146,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("The comparison file path does not exist"); return result; } - stripFilePath = StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + stripFilePath; + stripFilePath = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + stripFilePath; File stripFile = ftpUtil.downloadFile(stripFilePath, "betaGamma"); if (Objects.isNull(stripFile)) { result.error500("The comparison file path does not exist"); 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 4e26a312..9f82fada 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 @@ -518,7 +518,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } //判断det信息是否存在 if (Objects.nonNull(detBg)) { - betaDataFile.setDetFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getDetBgFilePath()); + betaDataFile.setDetFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getDetBgFilePath()); betaDataFile.setDetFileName(detFileName); detTmp = ftpUtil.downloadFile(betaDataFile.getDetFilePathName(), "betaGamma"); if (Objects.nonNull(detTmp)) { @@ -532,7 +532,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } //判断qc信息是否存在 if (Objects.nonNull(qc)) { - betaDataFile.setQcFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbQcFilePath); + betaDataFile.setQcFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbQcFilePath); betaDataFile.setQcFileName(qcFileName); qcTmp = ftpUtil.downloadFile(betaDataFile.getQcFilePathName(), "betaGamma"); if (Objects.nonNull(qcTmp)) { @@ -612,7 +612,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements //获取用户名 String userName = JwtUtil.getUserNameByToken(request); //上传文件路径 - String path = StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName; + String path = ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName; Map resultMap = new HashMap<>(); Map sampleMap = new HashMap<>(); Map gasBgMap = new HashMap<>(); @@ -892,7 +892,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements InputStream inputStream = null; ServletOutputStream outputStream = null; try { - inputStream = ftpUtil.downloadFileStream(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath + ".txt"); + inputStream = ftpUtil.downloadFileStream(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath + ".txt"); if (Objects.nonNull(inputStream)){ outputStream = response.getOutputStream(); byte[] buffer = new byte[1024]; @@ -3736,7 +3736,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements InputStream inputStream = null; ServletOutputStream outputStream = null; try { - inputStream = ftpUtil.downloadFileStream(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getLogPath() + StringPool.SLASH + logPath); + inputStream = ftpUtil.downloadFileStream(ftpUtil.getFtpRootPath() + spectrumPathProperties.getLogPath() + StringPool.SLASH + logPath); if (Objects.nonNull(inputStream)){ outputStream = response.getOutputStream(); byte[] buffer = new byte[1024]; @@ -4042,19 +4042,19 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements try { if (StringUtils.isNotBlank(betaDataFile.getSampleTmpPath())) { File sampleTmp = new File(betaDataFile.getSampleTmpPath()); - ftpUtil.saveFile(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + sampleFilePathName.substring(0, sampleFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getSampleFileName(), new FileInputStream(sampleTmp)); + ftpUtil.saveFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + sampleFilePathName.substring(0, sampleFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getSampleFileName(), new FileInputStream(sampleTmp)); } if (StringUtils.isNotBlank(betaDataFile.getGasTmpPath())) { File gasTmp = new File(betaDataFile.getGasTmpPath()); - ftpUtil.saveFile(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + gasFilePathName.substring(0, gasFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getGasFileName(), new FileInputStream(gasTmp)); + ftpUtil.saveFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + gasFilePathName.substring(0, gasFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getGasFileName(), new FileInputStream(gasTmp)); } if (StringUtils.isNotBlank(betaDataFile.getDetTmpPath())) { File detTmp = new File(betaDataFile.getDetTmpPath()); - ftpUtil.saveFile(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + detFilePathName.substring(0, detFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getDetFileName(), new FileInputStream(detTmp)); + ftpUtil.saveFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + detFilePathName.substring(0, detFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getDetFileName(), new FileInputStream(detTmp)); } if (StringUtils.isNotBlank(betaDataFile.getQcTmpPath())) { File qcTmp = new File(betaDataFile.getQcTmpPath()); - ftpUtil.saveFile(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + qcFilePathName.substring(0, qcFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getQcFileName(), new FileInputStream(qcTmp)); + ftpUtil.saveFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + qcFilePathName.substring(0, qcFilePathName.lastIndexOf(StringPool.SLASH)), anlyseResultIn.getQcFileName(), new FileInputStream(qcTmp)); } //分析成功后存储日志文件和报告文件 { diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java index ee98e075..e116fe73 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; @Component -@FeignClient(value = "jeecg-system") +@FeignClient("armd-system") public interface ICacheTimeService { @RequestMapping("/sys/dictItem/findCacheTime") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java index bac9b1b7..7ca3c5d2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/AbnormalAlarmClient.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @Component -@FeignClient("jeecg-abnormal-alarm") +@FeignClient("armd-abnormal-alarm") public interface AbnormalAlarmClient { /* SysEmailController下相关接口 */ diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java index 9c02d771..bf72544c 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @Component -@FeignClient("jeecg-system") +@FeignClient("armd-system") public interface IMenuNameService { @RequestMapping("/sys/dict/findStationListByMenuName") diff --git a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml index 2b72a783..869bb3b9 100644 --- a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-abnormal-alarm + name: armd-abnormal-alarm cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml index b77b9afe..c72677ef 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-auto-process + name: armd-auto-process cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml index ffc1c3a8..316cb2e9 100644 --- a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml @@ -15,11 +15,11 @@ db: password: '0': ${MYSQL-PWD:123456} url: - '0': jdbc:postgresql://${MYSQL-HOST:182.92.183.230}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java + '0': jdbc:postgresql://${MYSQL-HOST:127.0.0.1}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java #'0': jdbc:postgresql://${MYSQL-HOST:172.21.50.118}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java user: - '0': ${MYSQL-USER:temp} - #'0': ${MYSQL-USER:postgres} + #'0': ${MYSQL-USER:temp} + '0': ${MYSQL-USER:postgres} pool: config: driver-class-name: org.postgresql.Driver diff --git a/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml index cdf9afda..a6d71a86 100644 --- a/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-log-manage + name: armd-log-manage cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml index c5ee5723..a03168d8 100644 --- a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-spectrum-analysis + name: armd-spectrum-analysis cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml index 945ae7dc..426ce987 100644 --- a/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-station-operation + name: armd-station-operation cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml index 2bd4c646..9308d8e6 100644 --- a/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-system + name: armd-system cloud: nacos: config: diff --git a/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml index 9c30abc9..81be334e 100644 --- a/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-web-statistics + name: armd-web-statistics cloud: nacos: config: