diff --git a/config/nacos/dk-job.yml b/config/nacos/dk-job.yml
index 6af577b..09f6fdc 100644
--- a/config/nacos/dk-job.yml
+++ b/config/nacos/dk-job.yml
@@ -6,7 +6,7 @@ spring:
       seata: true
       datasource:
         # 主库数据源
-        master:
+        sample:
           type: ${spring.datasource.type}
           driver-class-name: com.mysql.cj.jdbc.Driver
           url: ${datasource.job.url}
diff --git a/config/nacos/dk-snailjob-server.yml b/config/nacos/dk-snailjob-server.yml
index cc9c1ed..6c5c2f5 100644
--- a/config/nacos/dk-snailjob-server.yml
+++ b/config/nacos/dk-snailjob-server.yml
@@ -13,6 +13,7 @@ spring:
       idle-timeout: 600000
       max-lifetime: 900000
       keepaliveTime: 30000
+
   cloud:
     nacos:
       discovery:
diff --git a/dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConfigurationTemplate.java b/dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConfigurationTemplate.java
new file mode 100644
index 0000000..d88e005
--- /dev/null
+++ b/dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConfigurationTemplate.java
@@ -0,0 +1,63 @@
+package org.dromara.common.redis.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author sean
+ * @version 1.0
+ * @date 2022/4/19
+ */
+@Configuration
+@EnableRedisRepositories
+public class RedisConfigurationTemplate {
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        JavaTimeModule timeModule = new JavaTimeModule();
+        timeModule.addDeserializer(LocalDateTime.class,
+                new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        timeModule.addSerializer(LocalDateTime.class,
+                new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        objectMapper.disable(MapperFeature.IGNORE_DUPLICATE_MODULE_REGISTRATIONS);
+        objectMapper.registerModules(timeModule);
+        objectMapper.activateDefaultTyping(objectMapper.getPolymorphicTypeValidator(),
+                ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+
+        objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+
+        StringRedisSerializer serializer = new StringRedisSerializer();
+        redisTemplate.setKeySerializer(serializer);
+        redisTemplate.setHashKeySerializer(serializer);
+
+        GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
+        redisTemplate.setValueSerializer(jsonRedisSerializer);
+        redisTemplate.setHashValueSerializer(jsonRedisSerializer);
+        redisTemplate.afterPropertiesSet();
+        return redisTemplate;
+
+    }
+}
diff --git a/dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java b/dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java
deleted file mode 100644
index 1be68dc..0000000
--- a/dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.dromara.common.redis.utils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author sean
- * @version 1.0
- * @date 2022/4/19
- */
-@Component
-public class RedisOpsUtils {
-
-    private static RedisTemplate<String, Object> redisTemplate;
-
-    @Autowired
-    public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
-        RedisOpsUtils.redisTemplate = redisTemplate;
-    }
-
-    /**
-     * HSET
-     * @param key
-     * @param field
-     * @param value
-     */
-    public static void hashSet(String key, String field, Object value) {
-        redisTemplate.opsForHash().put(key, field, value);
-    }
-
-    /**
-     * HGET
-     * @param key
-     * @param field
-     * @return
-     */
-    public static Object hashGet(String key, String field) {
-        return redisTemplate.opsForHash().get(key, field);
-    }
-
-    /**
-     * HKEYS
-     * @param key
-     * @return
-     */
-    public static Set<Object> hashKeys(String key) {
-        return redisTemplate.opsForHash().keys(key);
-    }
-
-    /**
-     * HEXISTS
-     * @param key
-     * @param field
-     * @return
-     */
-    public static boolean hashCheck(String key, String field) {
-        return redisTemplate.opsForHash().hasKey(key, field);
-    }
-
-    /**
-     * HDEL
-     * @param key
-     * @param fields
-     * @return
-     */
-    public static boolean hashDel(String key, Object[] fields) {
-        return redisTemplate.opsForHash().delete(key, fields) > 0;
-    }
-
-    /**
-     * HLEN
-     * @param key
-     * @return
-     */
-    public static long hashLen(String key) {
-        return redisTemplate.opsForHash().size(key);
-    }
-
-    /**
-     * EXPIRE
-     * @param key
-     * @param timeout
-     * @return
-     */
-    public static boolean expireKey(String key, long timeout) {
-        return redisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    /**
-     * SET
-     * @param key
-     * @param value
-     */
-    public static void set(String key, Object value) {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    /**
-     * GET
-     * @param key
-     * @return
-     */
-    public static Object get(String key) {
-        return redisTemplate.opsForValue().get(key);
-    }
-
-    /**
-     * SETEX
-     * @param key
-     * @param value
-     * @param expire
-     */
-    public static void setWithExpire(String key, Object value, long expire) {
-        redisTemplate.opsForValue().set(key, value, expire, TimeUnit.SECONDS);
-    }
-
-    /**
-     * TTL
-     * @param key
-     * @return
-     */
-    public static long getExpire(String key) {
-        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
-    }
-
-    /**
-     * EXISTS
-     * @param key
-     * @return
-     */
-    public static boolean checkExist(String key) {
-        return redisTemplate.hasKey(key);
-    }
-
-    /**
-     * DEL
-     * @param key
-     * @return
-     */
-    public static boolean del(String key) {
-        return RedisOpsUtils.checkExist(key) && redisTemplate.delete(key);
-    }
-
-    /**
-     * KEYS
-     * @param pattern
-     * @return
-     */
-    public static Set<String> getAllKeys(String pattern) {
-        return redisTemplate.keys(pattern);
-    }
-
-    /**
-     * RPUSH
-     * @param key
-     * @param value
-     */
-    public static void listRPush(String key, Object... value) {
-        if (value.length == 0) {
-            return;
-        }
-        for (Object val : value) {
-            redisTemplate.opsForList().rightPush(key, val);
-        }
-    }
-
-    /**
-     * LRANGE
-     * @param key
-     * @param start
-     * @param end
-     * @return
-     */
-    public static List<Object> listGet(String key, long start, long end) {
-        return redisTemplate.opsForList().range(key, start, end);
-    }
-
-    /**
-     * LRANGE
-     * @param key
-     * @return
-     */
-    public static List<Object> listGetAll(String key) {
-        return redisTemplate.opsForList().range(key, 0, -1);
-    }
-
-    /**
-     * LLen
-     * @param key
-     * @return
-     */
-    public static Long listLen(String key) {
-        return redisTemplate.opsForList().size(key);
-    }
-
-    /**
-     * ZADD
-     * @param key
-     * @param value
-     * @param score
-     */
-    public static Boolean zAdd(String key, Object value, double score) {
-        return redisTemplate.opsForZSet().add(key, value, score);
-    }
-
-    /**
-     * ZREM
-     * @param key
-     * @param value
-     */
-    public static Boolean zRemove(String key, Object... value) {
-        return redisTemplate.opsForZSet().remove(key, value) > 0;
-    }
-    /**
-     * ZRANGE
-     * @param key
-     * @param start
-     * @param end
-     * @return
-     */
-    public static Set<Object> zRange(String key, long start, long end) {
-        return redisTemplate.opsForZSet().range(key, start, end);
-    }
-
-    /**
-     * ZRANGE
-     * @param key
-     * @return
-     */
-    public static Object zGetMin(String key) {
-        Set<Object> objects = zRange(key, 0, 0);
-        if (CollectionUtils.isEmpty(objects)) {
-            return null;
-        }
-        return objects.iterator().next();
-    }
-
-    /**
-     * ZSCORE
-     * @param key
-     * @param value
-     * @return
-     */
-    public static Double zScore(String key, Object value) {
-        return redisTemplate.opsForZSet().score(key, value);
-    }
-
-    /**
-     * ZINCRBY
-     * @param key
-     * @param value
-     * @param delta
-     */
-    public static Double zIncrement(String key, Object value, double delta) {
-        return redisTemplate.opsForZSet().incrementScore(key, value, delta);
-    }
-}
diff --git a/dk-modules/sample/pom.xml b/dk-modules/sample/pom.xml
index 5368199..93c7b26 100644
--- a/dk-modules/sample/pom.xml
+++ b/dk-modules/sample/pom.xml
@@ -18,10 +18,6 @@
             <groupId>org.dromara</groupId>
             <artifactId>common-nacos</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>common-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>common-cloudsdk</artifactId>
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
index a58256a..fef6810 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
@@ -4,10 +4,11 @@ import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
-@MapperScan("org.dromara.sample.*.mapper")
 @EnableDubbo
-@SpringBootApplication(scanBasePackages = {"org.dromara.common.sdk.**","org.dromara.sample.**"})
+@SpringBootApplication
+@ComponentScan("org.dromara")
 public class CloudApiSampleApplication {
 
 	public static void main(String[] args) {
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java
index 9480f33..4b2af3d 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java
@@ -27,6 +27,8 @@ public class ApplicationBootInitial implements CommandLineRunner {
 
     @Autowired
     private IDeviceRedisService deviceRedisService;
+    @Autowired
+    private RedisOpsUtils redisOpsUtils;
 
     /**
      * Subscribe to the devices that exist in the redis when the program starts,
@@ -38,7 +40,7 @@ public class ApplicationBootInitial implements CommandLineRunner {
     public void run(String... args) throws Exception {
         int start = RedisConst.DEVICE_ONLINE_PREFIX.length();
 
-        RedisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*")
+        redisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*")
                 .stream()
                 .map(key -> key.substring(start))
                 .map(deviceRedisService::getDeviceOnline)
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptioSampleHandler.java
similarity index 96%
rename from dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java
rename to dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptioSampleHandler.java
index 5451562..fbfc502 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptioSampleHandler.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  */
 @ControllerAdvice
 @ResponseBody
-public class GlobalExceptionHandler {
+public class GlobalExceptioSampleHandler {
 
     /**
      * Please do not return directly like this, there is a risk.
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java
index 2def2b5..1a07f5e 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java
@@ -33,6 +33,9 @@ public class GlobalScheduleService {
 
     @Autowired
     private ObjectMapper mapper;
+
+    @Autowired
+    private RedisOpsUtils redisOpsUtils;
     /**
      * Check the status of the devices every 30 seconds. It is recommended to use cache.
      */
@@ -40,10 +43,10 @@ public class GlobalScheduleService {
     private void deviceStatusListen() {
         int start = RedisConst.DEVICE_ONLINE_PREFIX.length();
 
-        RedisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> {
-            long expire = RedisOpsUtils.getExpire(key);
+        redisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> {
+            long expire = redisOpsUtils.getExpire(key);
             if (expire <= 30) {
-                DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(key);
+                DeviceDTO device = (DeviceDTO) redisOpsUtils.get(key);
                 if (null == device) {
                     return;
                 }
@@ -52,7 +55,7 @@ public class GlobalScheduleService {
                 } else {
                     deviceService.gatewayOffline(key.substring(start));
                 }
-                RedisOpsUtils.del(key);
+                redisOpsUtils.del(key);
             }
         });
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java
index 1c04c7a..22e021d 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity;
 
@@ -9,5 +10,5 @@ import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity;
  * @date 2021/11/15
  * @version 0.1
  */
-public interface IDeviceDictionaryMapper extends BaseMapperPlus<DeviceDictionaryEntity,BaseMapperPlus> {
+public interface IDeviceDictionaryMapper extends BaseMapper<DeviceDictionaryEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
index ac3dd19..c4ea1f3 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
@@ -1,6 +1,7 @@
 package org.dromara.sample.manage.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -13,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
  * @version 1.2
  * @date 2022/8/16
  */
-public interface IDeviceFirmwareMapper extends BaseMapperPlus<DeviceFirmwareEntity,DeviceFirmwareEntity> {
+public interface IDeviceFirmwareMapper extends BaseMapper<DeviceFirmwareEntity> {
     String sql = "<script> \n" +
                 "SELECT \n" +
                 "  * \n" +
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java
index e81ef9a..1d41753 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DeviceHmsEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.DeviceHmsEntity;
  * @version 1.1
  * @date 2022/7/6
  */
-public interface IDeviceHmsMapper extends BaseMapperPlus<DeviceHmsEntity,DeviceHmsEntity> {
+public interface IDeviceHmsMapper extends BaseMapper<DeviceHmsEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java
index 8a82a82..4412004 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DeviceLogsEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.DeviceLogsEntity;
  * @version 1.2
  * @date 2022/9/7
  */
-public interface IDeviceLogsMapper extends BaseMapperPlus<DeviceLogsEntity,DeviceLogsEntity> {
+public interface IDeviceLogsMapper extends BaseMapper<DeviceLogsEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java
index 4cdc6c6..17a3bf5 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DeviceEntity;
 
@@ -9,6 +10,6 @@ import org.dromara.sample.manage.model.entity.DeviceEntity;
  * @date 2021/11/10
  * @version 0.1
  */
-public interface IDeviceMapper extends BaseMapperPlus<DeviceEntity,DeviceEntity> {
+public interface IDeviceMapper extends BaseMapper<DeviceEntity> {
 
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java
index 09cb672..048a88a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DevicePayloadEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.DevicePayloadEntity;
  * @date 2021/11/19
  * @version 0.1
  */
-public interface IDevicePayloadMapper extends BaseMapperPlus<DevicePayloadEntity,DevicePayloadEntity> {
+public interface IDevicePayloadMapper extends BaseMapper<DevicePayloadEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java
index 7350f98..9d7e91c 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.FirmwareModelEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.FirmwareModelEntity;
  * @version 1.3
  * @date 2022/12/21
  */
-public interface IFirmwareModelMapper extends BaseMapperPlus<FirmwareModelEntity,FirmwareModelEntity> {
+public interface IFirmwareModelMapper extends BaseMapper<FirmwareModelEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java
index 2c03840..e5f078b 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.LogsFileIndexEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.LogsFileIndexEntity;
  * @version 1.2
  * @date 2022/9/8
  */
-public interface ILogsFileIndexMapper extends BaseMapperPlus<LogsFileIndexEntity,LogsFileIndexEntity> {
+public interface ILogsFileIndexMapper extends BaseMapper<LogsFileIndexEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java
index 9f6b1b3..226071a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.LogsFileEntity;
 
@@ -8,5 +9,5 @@ import org.dromara.sample.manage.model.entity.LogsFileEntity;
  * @version 1.2
  * @date 2022/9/7
  */
-public interface ILogsFileMapper extends BaseMapperPlus<LogsFileEntity,LogsFileEntity> {
+public interface ILogsFileMapper extends BaseMapper<LogsFileEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java
index 1e8e60f..2684991 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java
@@ -33,7 +33,5 @@ public class WorkspaceEntity implements Serializable {
     @TableField(value = "bind_code")
     private String bindCode;
 
-    @TableField(value = "tenant_id")
-    private String tenantId;
 
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
index db885f6..e6521a8 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
@@ -35,7 +35,7 @@ public class WorkspaceServiceImpl implements IWorkspaceService {
         return Optional.ofNullable(entityConvertToDto(
             mapper.selectOne(
                 new LambdaQueryWrapper<WorkspaceEntity>()
-                    .eq(WorkspaceEntity::getTenantId, tenantId))));
+                    .eq(WorkspaceEntity::getWorkspaceId, tenantId))));
     }
 
     @Override
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java
index 9e32197..8db5d3a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity;
  * @version 1.9
  * @date 2023/11/23
  */
-public interface IDeviceFlightAreaMapper extends BaseMapperPlus<DeviceFlightAreaEntity,DeviceFlightAreaEntity> {
+public interface IDeviceFlightAreaMapper extends BaseMapper<DeviceFlightAreaEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java
index 576155c..eb91266 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java
@@ -10,5 +10,5 @@ import org.dromara.sample.map.model.entity.ElementCoordinateEntity;
  * @version 0.2
  * @date 2021/11/29
  */
-public interface IElementCoordinateMapper extends BaseMapperPlus<ElementCoordinateEntity, ElementCoordinateEntity> {
+public interface IElementCoordinateMapper extends BaseMapper< ElementCoordinateEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java
index a29801e..2dad043 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java
@@ -10,5 +10,5 @@ import org.dromara.sample.map.model.entity.FlightAreaFileEntity;
  * @version 1.9
  * @date 2023/11/22
  */
-public interface IFlightAreaFileMapper extends BaseMapperPlus<FlightAreaFileEntity, FlightAreaFileEntity> {
+public interface IFlightAreaFileMapper extends BaseMapper<FlightAreaFileEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java
index cd6acbf..cbff58d 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity;
  * @version 1.9
  * @date 2023/11/21
  */
-public interface IFlightAreaPropertyMapper extends BaseMapperPlus<FlightAreaPropertyEntity,FlightAreaPropertyEntity> {
+public interface IFlightAreaPropertyMapper extends BaseMapper<FlightAreaPropertyEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java
index be2cf2c..f116e7a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.map.model.entity.GroupElementEntity;
  * @version 0.2
  * @date 2021/11/29
  */
-public interface IGroupElementMapper extends BaseMapperPlus<GroupElementEntity,GroupElementEntity> {
+public interface IGroupElementMapper extends BaseMapper<GroupElementEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java
index 7737510..646f228 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.map.model.entity.GroupEntity;
  * @version 0.2
  * @date 2021/11/29
  */
-public interface IGroupMapper extends BaseMapperPlus<GroupEntity,GroupEntity> {
+public interface IGroupMapper extends BaseMapper<GroupEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java
index 88a7922..0f36215 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.media.model.MediaFileEntity;
  * @version 0.2
  * @date 2021/12/9
  */
-public interface IFileMapper extends BaseMapperPlus<MediaFileEntity,MediaFileEntity> {
+public interface IFileMapper extends BaseMapper<MediaFileEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
index 393e729..d8300ae 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
@@ -9,5 +9,5 @@ import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
  * @version 0.3
  * @date 2021/12/22
  */
-public interface IWaylineFileMapper extends BaseMapperPlus<WaylineFileEntity,WaylineFileEntity> {
+public interface IWaylineFileMapper extends BaseMapper<WaylineFileEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java
index e941956..87dd757 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java
@@ -10,5 +10,5 @@ import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
  * @version 1.1
  * @date 2022/6/1
  */
-public interface IWaylineJobMapper extends BaseMapperPlus<WaylineJobEntity, WaylineFileEntity> {
+public interface IWaylineJobMapper extends BaseMapper<WaylineJobEntity> {
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java
index 43b4157..efabd9a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java
@@ -3,6 +3,7 @@ package org.dromara.sample.wayline.service.impl;
 
 import org.dromara.common.redis.config.RedisConst;
 import org.dromara.common.redis.utils.RedisOpsUtils;
+import org.dromara.common.redis.utils.RedisOpsUtils;
 import org.dromara.common.sdk.cloudapi.wayline.FlighttaskProgress;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
 import org.dromara.sample.wayline.model.dto.ConditionalWaylineJobKey;
diff --git a/dk-modules/sample/src/main/resources/application.yml b/dk-modules/sample/src/main/resources/application.yml
index 9f82ea4..5406afe 100644
--- a/dk-modules/sample/src/main/resources/application.yml
+++ b/dk-modules/sample/src/main/resources/application.yml
@@ -7,11 +7,11 @@ spring:
   application:
     # 应用名称
     name: sample
-
   profiles:
     # 环境配置
     active: @profiles.active@
 
+
 --- # nacos 配置
 spring:
   cloud:
@@ -34,6 +34,95 @@ spring:
       - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml
 
+mqtt:
+  # @see org.dromara.sample.component.mqtt.model.MqttUseEnum
+  # BASIC parameters are required.
+  BASIC:
+    protocol: MQTT
+    host: 114.235.183.162
+    port: 1883
+    username: adminPCBASIC
+    password: yongqiang666
+    client-id: gengbao1211
+    # If the protocol is ws/wss, this value is required.
+    path:
+  DRC:
+    protocol: WS
+    host: 114.235.183.162
+    port: 8083
+    path: /mqtt
+    username: adminPCDRC
+    password: yongqiang666
+
+cloud-sdk:
+  mqtt:
+    # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
+    inbound-topic: sys/product/+/status,thing/product/+/requests
+
+url:
+  manage:
+    prefix: manage
+    version: /api/v1
+  map:
+    prefix: map
+    version: /api/v1
+  media:
+    prefix: media
+    version: /api/v1
+  wayline:
+    prefix: wayline
+    version: /api/v1
+  storage:
+    prefix: storage
+    version: /api/v1
+  control:
+    prefix: control
+    version: /api/v1
+logging:
+  level:
+    com.dji: debug
+  file:
+    name: logs/cloud-api-sample.log
+
+ntp:
+  server:
+    host: ntp.aliyun.com
+
+# To create a license for an application: https://developer.dji.com/user/apps/#all
+cloud-api:
+  app:
+    id: 125297
+    key: 182ae1ca69d9ba5103c0148bf16d68b
+    license: FixRisR747uGMZwaNbgCAWZojgrcUgZB1qhRyMTtptyKPKI/uETVwMK41HikhP+wbCjSKODdaQH4JIGAvzxdN/4HMrsEj3srLyGXi+BeJyFNyi94mpprv1Cx59fknCrBexAxLoc3f9GcgojEWrB0wCYxGp7l8mulwSDMP5yl++w=
+
+livestream:
+  url:
+    # It is recommended to use a program to create Token. https://github.com/AgoraIO/Tools/blob/master/DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/RtcTokenBuilder2.java
+    agora:
+      channel: cloud
+      token: 007eJxTYBBinhSg416uaGdw6G9J4bSDxYZ/mTm5HErajtq2+j09r6bAYGpinGKUkphokmYMxBZJiebJqWYGaanJyUnG5haGyda/RNMaAhkZNp5YxcrIAIEgPitDck5+aQoDAwC1CB6R
+      uid:  65432
+
+    # RTMP  Note: This IP is the address of the streaming server. If you want to see livestream on web page, you need to convert the RTMP stream to WebRTC stream.
+    rtmp:
+      url: rtmp://114.235.183.163/live/livesteam/  # Example: 'rtmp://192.168.1.1/live/'
+    rtsp:
+      username: Please enter the username.
+      password: Please enter the password.
+      port: 8554
+
+    # GB28181 Note:If you don't know what these parameters mean, you can go to Pilot2 and select the GB28181 page in the cloud platform. Where the parameters same as these parameters.
+    gb28181:
+      serverIP: Please enter the server ip.
+      serverPort: 7788
+      serverID: Please enter the server id.
+      agentID: Please enter the agent id.
+      agentPassword: Please enter the agent password.
+      localPort: 7788
+      channel: Please enter the channel.
+      # Webrtc: Only supports using whip standard
+    whip:
+      url: http://114.235.183.163:1985/rtc/v1/whip/?app=live/livesteam&stream= #  Example：http://192.168.1.1:1985/rtc/v1/whip/?app=live&stream=
 
 
 
diff --git a/dk-visual/nacos/src/main/resources/application.properties b/dk-visual/nacos/src/main/resources/application.properties
index 3ac148a..b33d857 100644
--- a/dk-visual/nacos/src/main/resources/application.properties
+++ b/dk-visual/nacos/src/main/resources/application.properties
@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://114.235.183.147:3306/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://127.0.0.1:3306/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=dk123456!
+db.password.0=dkcy@yf
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50
@@ -84,7 +84,7 @@ nacos.naming.empty-service.clean.period-time-ms=30000
 
 #*************** Metrics Related Configurations ***************#
 # 指向 ruoyi-monitor 监控
-spring.boot.admin.client.url=http://114.235.183.173:9100
+spring.boot.admin.client.url=http://127.0.0.1:9100
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=123456
 spring.boot.admin.client.instance.service-host-type=IP