ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -31,7 +31,7 @@ * @date 2023-05-30 */ @Service @Slf4j(topic = "PatrolInspectionTask") @Slf4j(topic = "patrolInspectionTask") public class ArdVideoInspectTaskServiceImpl implements IArdVideoInspectTaskService { @Resource private ArdVideoInspectTaskMapper ardVideoInspectTaskMapper; ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java
@@ -12,7 +12,7 @@ * @Date: 2023年06月01日8:57 * @Version: 1.0 **/ @Slf4j(topic = "PatrolInspectionTask") @Slf4j(topic = "patrolInspectionTask") class InspectionTask implements Runnable { private String taskId; ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -22,7 +22,7 @@ **/ @Component @Slf4j(topic = "PatrolInspectionTask") @Slf4j(topic = "patrolInspectionTask") public class InspectionTaskManager { @Resource ard-work/src/main/resources/mapper/minio/StorageMinioEventMapper.xml
@@ -28,6 +28,7 @@ <if test="eventType != null and eventType != ''"> and event_type = #{eventType}</if> <if test="host != null and host != ''"> and host = #{host}</if> </where> order by create_time desc </select> <select id="selectStorageMinioEventById" parameterType="String" resultMap="StorageMinioEventResult"> ruoyi-admin/src/main/resources/banner.txt
@@ -1,13 +1,3 @@ Application Version: ${ard.version} Spring Boot Version: ${spring-boot.version} ___ ___ ___ /\ \ /\ \ /\ \ /::\ \ /::\ \ /::\ \ /:/\:\ \ /:/\:\ \ /:/\:\ \ /::\~\:\ \ /::\~\:\ \ /:/ \:\__\ /:/\:\ \:\__/:/\:\ \:\__/:/__/ \:|__| \/__\:\/:/ \/_|::\/:/ \:\ \ /:/ / \::/ / |:|::/ / \:\ /:/ / /:/ / |:|\/__/ \:\/:/ / /:/ / |:| | \::/__/ \/__/ \|__| ~~ 安瑞达4.0平台开始启动 ruoyi-admin/src/main/resources/logback.xml
@@ -69,11 +69,11 @@ </encoder> </appender> <!-- Authorize日志输出 --> <appender name="Authorize" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}/Authorize.log</file> <appender name="authorize" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}/authorize.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- 按天回滚 daily --> <fileNamePattern>${log.path}/Authorize.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/authorize.%d{yyyy-MM-dd}.log</fileNamePattern> <!-- 日志最大的历史 60天 --> <maxHistory>60</maxHistory> </rollingPolicy> @@ -160,11 +160,11 @@ </encoder> </appender> <!--PatrolInspectionTask日志输出--> <appender name="PatrolInspectionTask" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}/PatrolInspectionTask.log</file> <appender name="patrolInspectionTask" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}/patrolInspectionTask.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!--按天回滚daily--> <fileNamePattern>${log.path}/PatrolInspectionTask.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/patrolInspectionTask.%d{yyyy-MM-dd}.log</fileNamePattern> <!--日志最大的历史60天--> <maxHistory>60</maxHistory> </rollingPolicy> @@ -241,53 +241,5 @@ <!--系统用户操作日志--> <logger name="sys-user" level="INFO"> <appender-ref ref="sys-user"/> </logger> <!--Authorize日志--> <logger name="Authorize" level="INFO"> <appender-ref ref="Authorize"/> </logger> <!--minio日志打印等级--> <logger name="minio" level="INFO"> <appender-ref ref="minio"/> </logger> <!--hiksdk日志打印等级--> <logger name="hikSdk" level="debug"> <appender-ref ref="hikSdk"/> </logger> <!--盗电报警日志打印等级--> <logger name="stealAlarm" level="INFO"> <appender-ref ref="stealAlarm"/> </logger> <!--websocket日志打印等级--> <logger name="websocket" level="INFO"> <appender-ref ref="websocket"/> </logger> <!--光电巡检日志打印等级--> <logger name="PatrolInspectionTask" level="INFO"> <appender-ref ref="PatrolInspectionTask"/> </logger> <!--mqtt日志打印等级--> <logger name="mqtt" level="debug"> <appender-ref ref="mqtt"/> </logger> <!--guideQueue日志打印等级--> <logger name="guideQueue" level="INFO"> <appender-ref ref="guideQueue"/> </logger> <!--rongCloud日志打印等级--> <logger name="rongCloud" level="INFO"> <appender-ref ref="rongCloud"/> </logger> <!--cmd日志打印等级--> <logger name="cmd" level="INFO"> <appender-ref ref="cmd"/> </logger> <!--无人机日志打印等级--> <logger name="uav" level="INFO"> <appender-ref ref="uav"/> </logger> <!--三一车辆日志打印等级--> <logger name="sy" level="INFO"> <appender-ref ref="sy"/> </logger> </configuration> ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java
@@ -19,7 +19,7 @@ import javax.crypto.spec.SecretKeySpec; import javax.xml.bind.DatatypeConverter; @Slf4j(topic="Authorize") @Slf4j(topic="authorize") public class AuthorizeUtil { public static String MachineCode=""; @@ -36,9 +36,9 @@ public static void main(String[] args) { AuthorizeUtil ss = new AuthorizeUtil(); System.out.println("sysStr " + ss.parsLicense()); System.out.println("MachineCode " + ss.getMachineCode()); System.out.println("CPUCode " + ss.getCPUCode()); log.debug("sysStr " + ss.parsLicense()); log.debug("MachineCode " + ss.getMachineCode()); log.debug("CPUCode " + ss.getCPUCode()); //String codeString=ss.parsLicense("b1db709f19d9769e536e2e29888e38b2"); //System.out.println(codeString); //ss.makeTempLicense(); @@ -103,7 +103,9 @@ } catch (Exception e) { log.error("获取机器码异常："+e.getMessage()); } return Md5Utils.hash(sb.toString().toUpperCase()); String code = Md5Utils.hash(sb.toString().toUpperCase()); log.debug("机器码:"+code); return code; } public static String getCPUCode() {
