diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
index 013f32d..4a63141 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -86,7 +86,6 @@ public class MqttMessageHandler {
     public void devTopic(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
         logDto.setUserName(RequestUtil.getUsername());
         logDto.setLoginName(RequestUtil.getLoginName());
         logDto.setOperate(nDid + "设备主题录入");
@@ -144,7 +143,6 @@ public class MqttMessageHandler {
         log.info("收到注册应答响应--->" + nDid);
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
         logDto.setUserName(RequestUtil.getUsername());
         logDto.setLoginName(RequestUtil.getLoginName());
         logDto.setOperate("收到设备"+nDid+"注册应答响应");
@@ -191,11 +189,14 @@ public class MqttMessageHandler {
     @MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1)
     @Transactional(rollbackFor = Exception.class)
     public void devModelOperation(String topic, MqttMessage message,  @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){
-        //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        try{
+            logDto.setUserName(RequestUtil.getUsername());
+            logDto.setLoginName(RequestUtil.getLoginName());
+        } catch (Exception e) {
+            logDto.setUserName("系统重启或定时任务创建");
+            logDto.setLoginName(null);
+        }
         logDto.setOperate(nDid + "设备类型模板应答");
         logDto.setResult(1);
         //业务处理
@@ -266,13 +267,16 @@ public class MqttMessageHandler {
      * @param payload
      */
     @MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1)
-    @Transactional(rollbackFor = Exception.class)
     public void devAccessOperation(String topic, MqttMessage message,  @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        try{
+            logDto.setUserName(RequestUtil.getUsername());
+            logDto.setLoginName(RequestUtil.getLoginName());
+        } catch (Exception e) {
+            logDto.setUserName("系统重启或定时任务创建");
+            logDto.setLoginName(null);
+        }
         logDto.setResult(1);
         //业务处理
         Gson gson = new Gson();
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
index a0c30c5..2830b29 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
@@ -8,8 +8,6 @@ import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLogsFeignClient;
-import com.njcn.csdevice.enums.DeviceOperate;
-import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.utils.RequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -60,9 +58,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
         }
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setResult(1);
         //判断失效的key是否为MQTT消费端存入的
         String expiredKey = message.toString();
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
index 3d0d3bf..b5ae959 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
@@ -79,9 +79,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
     public void addModel(MultipartFile file) {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setResult(1);
         String json = null;
         try {
@@ -111,9 +110,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
     public void addDict(MultipartFile file) {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setResult(1);
         String json = null;
         try {
@@ -137,9 +135,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
     private CsDevModelPO addCsDevModel(TemplateDto templateDto, String filePath){
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setOperate("新增"+templateDto.getDevType()+"模板数据");
         logDto.setResult(1);
         CsDevModelPO po = devModelFeignClient.findModel(templateDto.getDevType(),templateDto.getVersion(),templateDto.getTime()).getData();
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
index e933775..6f78d7f 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -98,9 +98,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     public void devRegister(String nDid) {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setOperate("当前设备"+nDid+"状态判断");
         logDto.setResult(1);
         //1.判断nDid是否存在
@@ -156,9 +155,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     public Object getModel(String nDid) {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setOperate("获取"+nDid+"设备模板信息");
         logDto.setResult(1);
         Object model = null;
@@ -184,9 +182,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     public void devAccess(DevAccessParam devAccessParam) {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserIndex(RequestUtil.getUserIndex());
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
         logDto.setOperate("设备"+devAccessParam.getNDid()+"注册");
         logDto.setResult(1);
         try {