diff --git a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/CloudwalkEventInitializing.java b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/CloudwalkEventInitializing.java
index 56e650c0..7cebf44e 100644
--- a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/CloudwalkEventInitializing.java
+++ b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/CloudwalkEventInitializing.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadFactory;
@@ -176,7 +177,7 @@ public class CloudwalkEventInitializing implements CommandLineRunner {
     private EventType getEventType(Class<? extends BaseEvent> eventClass) {
         for (EventType eventType : EventType.values()) {
             BaseEvent prototype = eventType.getEventClass();
-            if (prototype != null && prototype.getClass().equals(eventClass)) {
+            if (prototype != null && Objects.equals(eventClass, prototype.getClass())) {
                 return eventType;
             }
         }
diff --git a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/handler/EventHandlerMapping.java b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/handler/EventHandlerMapping.java
index 1ac9c2b6..c6bf5960 100644
--- a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/handler/EventHandlerMapping.java
+++ b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/handler/EventHandlerMapping.java
@@ -3,9 +3,11 @@ package cn.cloudwalk.event.handler;
 import cn.cloudwalk.cwos.client.event.event.BaseEvent;
 import cn.cloudwalk.cwos.client.event.event.EventType;
 import cn.cloudwalk.cwos.client.event.handler.EventListener;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class EventHandlerMapping {
     private final Map<String, Map<EventType, Map<String, List<EventHandler>>>> handlerMap = new HashMap<>();
@@ -27,7 +29,7 @@ public class EventHandlerMapping {
         Class<? extends BaseEvent> eventClass) {
         for (EventType eventType : EventType.values()) {
             BaseEvent prototype = eventType.getEventClass();
-            if (prototype != null && prototype.getClass().equals(eventClass)) {
+            if (prototype != null && Objects.equals(eventClass, prototype.getClass())) {
                 return getServiceCodeHandlerListMap(groupId, eventType);
             }
         }
@@ -62,14 +64,14 @@ public class EventHandlerMapping {
     }
 
     public Map<String, Map<EventType, Map<String, List<EventHandler>>>> getHandlerMap() {
-        return this.handlerMap;
+        return Collections.unmodifiableMap(this.handlerMap);
     }
 
     public Map<String, Map<String, Map<String, List<CustomEventHandler>>>> getCustomHandlerMap() {
-        return this.customHandlerMap;
+        return Collections.unmodifiableMap(this.customHandlerMap);
     }
 
     public Map<Class<? extends EventListener>, String> getListenerClassGroupMap() {
-        return this.listenerClassGroupMap;
+        return Collections.unmodifiableMap(this.listenerClassGroupMap);
     }
 }
diff --git a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java
index c109c28b..e6d46944 100644
--- a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java
+++ b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext;
 
 public abstract class GroupEventListener implements EventListener {
     public static ApplicationContext applicationContext;
-    private static final Logger LOGGER = LoggerFactory.getLogger(GroupEventListener.class);
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     public void messageListener(BaseEvent baseEvent) throws RuntimeException {
         try {
@@ -18,13 +18,13 @@ public abstract class GroupEventListener implements EventListener {
                 (CloudwalkEventManager)applicationContext.getBean(CloudwalkEventManager.class);
             cloudwalkEventManager.handle(getClass(), baseEvent);
         } catch (BeansException e) {
-            LOGGER.error("事件处理出现异常（容器 Bean 解析失败），原因：", e);
+            this.logger.error("事件处理出现异常（容器 Bean 解析失败），原因：", e);
             throw new RuntimeException(e);
         } catch (RuntimeException e) {
-            LOGGER.error("事件处理出现异常，原因：", e);
+            this.logger.error("事件处理出现异常，原因：", e);
             throw e;
         } catch (Exception e) {
-            LOGGER.error("事件处理出现异常，原因：", e);
+            this.logger.error("事件处理出现异常，原因：", e);
             throw new RuntimeException(e);
         }
     }
diff --git a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java
index 888b556d..0480e6ac 100644
--- a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java
+++ b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java
@@ -76,6 +76,6 @@ public abstract class AbstractCloudwalkController {
         } catch (Exception e) {
             this.LOGGER.error("转换文件名字符类型失败，原因：", e);
         }
-        return codedFilename;
+        return codedFilename != null ? codedFilename : fileNames;
     }
 }