diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index 043facdb..7d176710 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -51,6 +51,10 @@ --> + + org.jeecgframework.boot + jeecg-module-beta-gamma-analyser + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/NucliedAvgJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/NucliedAvgJob.java index 2e8742d9..138f9acb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/NucliedAvgJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/NucliedAvgJob.java @@ -43,7 +43,6 @@ public class NucliedAvgJob implements Job { // start:生成临时Token到线程中 UserTokenContext.setToken(getTempToken()); alarmClient = SpringContextUtils.getBean(AbnormalAlarmClient.class); - throw new RuntimeException("test"); } private void destroy(){ diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java similarity index 95% rename from jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java index 5f323bf5..a9444267 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.controller; +package org.jeecg.modules.system.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java similarity index 98% rename from jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java index 7f65492b..47dbdb9e 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml index 82198bd8..80ab3294 100644 --- a/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/abnormal-alarm-error.html + ${ERROR_LOG_HOME}/abnormal-alarm-error.html diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml index 79dcfb72..d408a171 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/auto-process-error.html + ${ERROR_LOG_HOME}/auto-process-error.html diff --git a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml index 50e7c335..bda10130 100644 --- a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + diff --git a/jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml index 092efa9d..fa8e1dd2 100644 --- a/jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/log-manage-error.html + ${ERROR_LOG_HOME}/log-manage-error.html diff --git a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml index c6e9bb49..b9f1b57e 100644 --- a/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/spectrum-analysis-error.html + ${ERROR_LOG_HOME}/spectrum-analysis-error.html diff --git a/jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml index e6cd4af6..dfb5675e 100644 --- a/jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/station-operation-error.html + ${ERROR_LOG_HOME}/station-operation-error.html diff --git a/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml index e2964448..0d7a9f36 100644 --- a/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/system-cloud-error.html + ${ERROR_LOG_HOME}/system-cloud-error.html diff --git a/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml index 89527ce4..403d8892 100644 --- a/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml @@ -2,6 +2,7 @@ + @@ -39,7 +40,7 @@ %p%d%msg%M%F{32}%L - ${LOG_HOME}/web-statistics-error.html + ${ERROR_LOG_HOME}/web-statistics-error.html