From 995c67b6039c9940cf24c9459cfd7465421c8ae4 Mon Sep 17 00:00:00 2001 From: panbaolin <13071138970@163.com> Date: Sun, 27 Apr 2025 14:02:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E7=B1=BB?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=202.=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86=E8=80=81?= =?UTF-8?q?=E6=97=A7=E9=82=AE=E7=AE=B1=E5=8D=8F=E8=AE=AEjar=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot-base-core/pom.xml | 7 ------- jeecg-module-auto-process/pom.xml | 15 +++++++++++++++ .../org/jeecg/JeecgAbnormalAlarmApplication.java | 2 +- .../main/java/org/jeecg/JeecgAppProcessStart.java | 2 +- .../org/jeecg/JeecgAutoProcessApplication.java | 2 +- .../src/main/resources/application.yml | 2 +- .../java/org/jeecg/JeecgLogManageApplication.java | 2 +- .../jeecg/JeecgSpectrumAnalysisApplication.java | 4 ++-- .../jeecg/JeecgStationOperationApplication.java | 2 +- .../org/jeecg/JeecgSystemCloudApplication.java | 2 +- .../org/jeecg/JeecgWebStatisticsApplication.java | 2 +- pom.xml | 4 ++-- 12 files changed, 27 insertions(+), 19 deletions(-) diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index 1e5181eb..81364887 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -124,13 +124,6 @@ ${mysql-connector-java.version} runtime - - - com.microsoft.sqlserver - sqljdbc4 - ${sqljdbc4.version} - runtime - com.oracle diff --git a/jeecg-module-auto-process/pom.xml b/jeecg-module-auto-process/pom.xml index 6724d41d..b9a7622c 100644 --- a/jeecg-module-auto-process/pom.xml +++ b/jeecg-module-auto-process/pom.xml @@ -30,5 +30,20 @@ spring-boot-configuration-processor true + + org.apache.james + apache-mime4j-core + 0.8.10 + + + org.apache.james + apache-mime4j-dom + 0.8.10 + + + commons-io + commons-io + 2.11.0 + \ No newline at end of file diff --git a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java index b692a493..ee22ffd9 100644 --- a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java +++ b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java @@ -37,7 +37,7 @@ public class JeecgAbnormalAlarmApplication extends SpringBootServletInitializer String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application AbnormalAlarm is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-app-start/src/main/java/org/jeecg/JeecgAppProcessStart.java b/jeecg-server-cloud/armd-app-start/src/main/java/org/jeecg/JeecgAppProcessStart.java index ec5cac4e..e796751a 100644 --- a/jeecg-server-cloud/armd-app-start/src/main/java/org/jeecg/JeecgAppProcessStart.java +++ b/jeecg-server-cloud/armd-app-start/src/main/java/org/jeecg/JeecgAppProcessStart.java @@ -35,7 +35,7 @@ public class JeecgAppProcessStart extends SpringBootServletInitializer implement String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application AppProcess is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java index 853ac505..360a78b4 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java @@ -59,7 +59,7 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application AutoProcess is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml index d2dc6114..fe31b3c0 100644 --- a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml @@ -32,7 +32,7 @@ spring: #Sentinel配置 sentinel: transport: - dashboard: jeecg-boot-sentinel:9000 + dashboard: armd-sentinel:9000 # 支持链路限流 web-context-unify: false filter: diff --git a/jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java b/jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java index a4a117ed..30a907ae 100644 --- a/jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java +++ b/jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java @@ -33,7 +33,7 @@ public class JeecgLogManageApplication extends SpringBootServletInitializer impl String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application LogManage is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java index 3a5017b3..07f37eb0 100644 --- a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java @@ -53,7 +53,7 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application SpectrumAnalysis is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + @@ -78,6 +78,6 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ gammaService.readMDCParameter(); nuclLibService.getNuclideMap(); nuclCoincidenceSumSpectrumService.getNuclCoincidenceMap(); - dataService.viewStations(); +// dataService.viewStations(); } } \ No newline at end of file diff --git a/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java b/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java index 8c3db501..bc33e33a 100644 --- a/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java +++ b/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java @@ -41,7 +41,7 @@ public class JeecgStationOperationApplication extends SpringBootServletInitializ String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application StationOperation is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java index ea5070ee..c23f78ab 100644 --- a/jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java +++ b/jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java @@ -58,7 +58,7 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application SystemCloud is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java index 2c0c4f34..e1dc2c76 100644 --- a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java @@ -32,7 +32,7 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application WebStatistics is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/pom.xml b/pom.xml index 1e8a9549..5e7bba0c 100644 --- a/pom.xml +++ b/pom.xml @@ -476,7 +476,7 @@ dev - jeecg-boot-nacos:8848 + armd-nacos:8848 @@ -490,7 +490,7 @@ test - jeecg-boot-nacos:8848 + armd-nacos:8848