Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java

@@ -1,7 +1,6 @@
 package com.zd.alg.iot.vmp.gb28181.event.offline;
 
 import com.zd.alg.iot.vmp.gb28181.event.EventPublisher;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,6 @@ import com.zd.alg.iot.vmp.common.VideoManagerConstants;
  * @date:   2020年5月6日 上午11:35:46
  */
 @Component
-@Slf4j
 public class KeepliveTimeoutListener extends KeyExpirationEventMessageListener {
 
     private Logger logger = LoggerFactory.getLogger(KeepliveTimeoutListener.class);
@@ -37,7 +35,6 @@ public class KeepliveTimeoutListener extends KeyExpirationEventMessageListener {
      */
     @Override
     public void onMessage(Message message, byte[] pattern) {
-
         //  获取失效的key
         String expiredKey = message.toString();
         if(!expiredKey.startsWith(VideoManagerConstants.KEEPLIVEKEY_PREFIX)){

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/controller/UploadController.java

@@ -23,7 +23,7 @@ public class UploadController {
     private IUploadService uploadService;
 
     /**
-     * 检查分片是否存��
+     * 检查分片是否存在
      *
      * @return
      */
@@ -39,9 +39,9 @@ public class UploadController {
     }
 
     /**
-     * 检查分片是否存��
+     * 检查分片是否存在
      * @param identifier  文件秘钥
-     * @param filename 文件��
+     * @param filename 文件名
      * @param totalChunks 分片总数
      * @return
      */
@@ -51,7 +51,7 @@ public class UploadController {
                                               @RequestParam("totalChunks") Integer totalChunks) {
         FileChunkResultDTO fileChunkCheckDTO;
         try {
-            log.info("apk文件上传入参 identifier {}��filename {}, totalChunks {}", identifier, filename, totalChunks);
+            log.info("apk文件上传入参 identifier {}, filename {}, totalChunks {}", identifier, filename, totalChunks);
             FileChunkDTO chunkDTO = new FileChunkDTO();
             chunkDTO.setIdentifier(identifier);
             chunkDTO.setFilename(filename);
@@ -63,7 +63,6 @@ public class UploadController {
         }
     }
 
-
     /**
      * 上传文件分片
      *

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredAndAddListener.java

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
  * @Description:
  */
 @Component
-@Slf4j
 public class RedisExpiredAndAddListener extends KeyExpirationEventMessageListener {
 
     //监听的主题  现在只监听0号数据库

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysStudentServiceImpl.java

@@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.text.SimpleDateFormat;
 import java.util.*;