diff --git a/sky-common/src/main/java/com/sky/common/config/AddResourceConfiguration.java b/sky-common/src/main/java/com/sky/common/config/AddResourceConfiguration.java
deleted file mode 100644
index e2429b9..0000000
--- a/sky-common/src/main/java/com/sky/common/config/AddResourceConfiguration.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.sky.common.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-@Configuration
-@Slf4j
-public class AddResourceConfiguration extends WebMvcConfigurationSupport {
-    /**
-     * 设置静态资源映射
-     *
-     * @param registry ResourceHandlerRegistry
-     */
-    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
-        log.info("设置静态资源映射");
-        registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-}
diff --git a/sky-common/src/main/java/com/sky/common/config/RedisConfiguration.java b/sky-common/src/main/java/com/sky/common/config/RedisConfiguration.java
index 66d355e..9f53845 100644
--- a/sky-common/src/main/java/com/sky/common/config/RedisConfiguration.java
+++ b/sky-common/src/main/java/com/sky/common/config/RedisConfiguration.java
@@ -35,8 +35,8 @@ public class RedisConfiguration {
      * 使用StringRedisSerializer序列化为字符串
      */
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory connectionFactory) {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+    public RedisTemplate<Object, Object> redisTemplate(LettuceConnectionFactory connectionFactory) {
+        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(connectionFactory);
         // 设置key序列化为string
         redisTemplate.setKeySerializer(new StringRedisSerializer());
diff --git a/sky-common/src/main/java/com/sky/common/config/WebMvcConfiguration.java b/sky-common/src/main/java/com/sky/common/config/WebMvcConfiguration.java
index 30a4bf2..9c2e4a2 100644
--- a/sky-common/src/main/java/com/sky/common/config/WebMvcConfiguration.java
+++ b/sky-common/src/main/java/com/sky/common/config/WebMvcConfiguration.java
@@ -3,22 +3,24 @@ package com.sky.common.config;
 import com.sky.common.interceptor.JwtTokenAdminInterceptor;
 import com.sky.common.interceptor.JwtTokenUserInterceptor;
 import com.sky.common.json.JacksonObjectMapper;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 import java.util.List;
 
 @Configuration
-@RequiredArgsConstructor
 @Slf4j
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
-    private final JwtTokenAdminInterceptor jwtTokenAdminInterceptor;
-    private final JwtTokenUserInterceptor jwtTokenUserInterceptor;
+    @Autowired
+    private JwtTokenAdminInterceptor jwtTokenAdminInterceptor;
+    @Autowired
+    private JwtTokenUserInterceptor jwtTokenUserInterceptor;
 
     /**
      * 注册自定义拦截器
@@ -50,4 +52,15 @@ public class WebMvcConfiguration extends WebMvcConfigurationSupport {
         // 将自己的消息转化器加入容器中
         converters.add(0, converter);
     }
+
+    /**
+     * 设置静态资源映射
+     *
+     * @param registry ResourceHandlerRegistry
+     */
+    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+        log.info("设置静态资源映射");
+        registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
 }
diff --git a/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java b/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java
index 7d2930d..54bcfc2 100644
--- a/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java
+++ b/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java
@@ -11,5 +11,4 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class AutoFillAspect {
-
 }
diff --git a/sky-server/src/main/java/com/sky/task/OrderTask.java b/sky-server/src/main/java/com/sky/task/OrderTask.java
index 2a2de85..0cdaf71 100644
--- a/sky-server/src/main/java/com/sky/task/OrderTask.java
+++ b/sky-server/src/main/java/com/sky/task/OrderTask.java
@@ -1,10 +1,54 @@
 package com.sky.task;
 
+import com.sky.mapper.OrderMapper;
+import com.sky.pojo.entity.Orders;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Component
 @Slf4j
 public class OrderTask {
+    @Resource
+    private OrderMapper orderMapper;
 
+    /**
+     * 处理超时订单
+     */
+    @Scheduled(cron = "0 * * * * ?")
+    // @Scheduled(cron = "0/5 * * * * ?")
+    public void processTImeOrder() {
+        log.info("定时处理超时订单：{}", LocalDateTime.now());
+        LocalDateTime time = LocalDateTime.now().plusMinutes(-15);
+        List<Orders> list = orderMapper.getByStatusAndOrderTime(Orders.PENDING_PAYMENT, time);
+        if (list != null && !list.isEmpty()) {
+            for (Orders orders : list) {
+                orders.setStatus(Orders.CANCELLED);
+                orders.setCancelReason("订单超时，自动取消");
+                orders.setCancelTime(LocalDateTime.now());
+                orderMapper.update(orders);
+            }
+        }
+    }
+
+    /**
+     * 处理一直派送中的订单
+     */
+    @Scheduled(cron = "0 0 1 * * ?")
+    // @Scheduled(cron = "0/5 * * * * ?")
+    public void processDeliveryOrder() {
+        log.info("定时处理处于派送中的订单：{}", LocalDateTime.now());
+        LocalDateTime time = LocalDateTime.now().plusMinutes(-60);
+        List<Orders> list = orderMapper.getByStatusAndOrderTime(Orders.DELIVERY_IN_PROGRESS, time);
+        if (list != null && !list.isEmpty()) {
+            for (Orders orders : list) {
+                orders.setStatus(Orders.COMPLETED);
+                orderMapper.update(orders);
+            }
+        }
+    }
 }
diff --git a/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java b/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java
index e2d06d3..94711b5 100644
--- a/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java
+++ b/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Component
-@ServerEndpoint("/es/{sid}")
+@ServerEndpoint("/ws/{sid}")
 @Slf4j
 public class WebSocketServer {
     // 存放会话对象