xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：bug

Browse Source
This commit is contained in:
nieziyan 2023-10-24 10:43:35 +08:00
parent a35c41e4e3
commit 07c7122bc0
12 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/pom.xml
View File

@ -51,6 +51,10 @@
</exclusion> </exclusion>
</exclusions>--> </exclusions>-->
</dependency> </dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-beta-gamma-analyser</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/NucliedAvgJob.java
View File

@ -43,7 +43,6 @@ public class NucliedAvgJob implements Job {
// start:生成临时Token到线程中 // start:生成临时Token到线程中
UserTokenContext.setToken(getTempToken()); UserTokenContext.setToken(getTempToken());
alarmClient = SpringContextUtils.getBean(AbnormalAlarmClient.class); alarmClient = SpringContextUtils.getBean(AbnormalAlarmClient.class);
throw new RuntimeException("test");
} }
private void destroy(){ private void destroy(){

2
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.controller; package org.jeecg.modules.system.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

2
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.controller; package org.jeecg.modules.system.controller;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;

3
jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/abnormal-alarm-error.html</file> <file>${ERROR_LOG_HOME}/abnormal-alarm-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

3
jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/auto-process-error.html</file> <file>${ERROR_LOG_HOME}/auto-process-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

1
jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->

3
jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/log-manage-error.html</file> <file>${ERROR_LOG_HOME}/log-manage-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

3
jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/spectrum-analysis-error.html</file> <file>${ERROR_LOG_HOME}/spectrum-analysis-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

3
jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/station-operation-error.html</file> <file>${ERROR_LOG_HOME}/station-operation-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

3
jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/system-cloud-error.html</file> <file>${ERROR_LOG_HOME}/system-cloud-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->

3
jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml
View File

@ -2,6 +2,7 @@
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="../logs" /> <property name="LOG_HOME" value="../logs" />
<property name="ERROR_LOG_HOME" value="../errorLogs" />
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->
@ -39,7 +40,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern> <pattern>%p%d%msg%M%F{32}%L</pattern>
</layout> </layout>
</encoder> </encoder>
<file>${LOG_HOME}/web-statistics-error.html</file> <file>${ERROR_LOG_HOME}/web-statistics-error.html</file>
</appender> </appender>
<!-- 生成 error html格式日志结束 --> <!-- 生成 error html格式日志结束 -->