diff --git a/das/src/main/java/com/das/common/config/AesProperties.java b/das/src/main/java/com/das/common/config/AesProperties.java
index d7aa81a9..68791bb6 100644
--- a/das/src/main/java/com/das/common/config/AesProperties.java
+++ b/das/src/main/java/com/das/common/config/AesProperties.java
@@ -1,6 +1,5 @@
 package com.das.common.config;
 
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/das/src/main/java/com/das/common/config/SaTokenProperties.java b/das/src/main/java/com/das/common/config/SaTokenProperties.java
index d687ef60..d1acfe56 100644
--- a/das/src/main/java/com/das/common/config/SaTokenProperties.java
+++ b/das/src/main/java/com/das/common/config/SaTokenProperties.java
@@ -15,7 +15,10 @@ import org.springframework.stereotype.Component;
 @Setter
 @ConfigurationProperties(prefix = "sa-token")
 public class SaTokenProperties {
-
+    /**
+     * 是否开启Sa-Token全局拦截器，默认为true
+     */
+    private boolean enabled=true;
     /**
      * token 请求头
      */
diff --git a/das/src/main/java/com/das/common/constant/BaseEntity.java b/das/src/main/java/com/das/common/constant/BaseEntity.java
index 41181930..a5f05257 100644
--- a/das/src/main/java/com/das/common/constant/BaseEntity.java
+++ b/das/src/main/java/com/das/common/constant/BaseEntity.java
@@ -1,8 +1,6 @@
 package com.das.common.constant;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -10,7 +8,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
diff --git a/das/src/main/java/com/das/common/utils/AESUtil.java b/das/src/main/java/com/das/common/utils/AESUtil.java
index a27520f3..8553ac58 100644
--- a/das/src/main/java/com/das/common/utils/AESUtil.java
+++ b/das/src/main/java/com/das/common/utils/AESUtil.java
@@ -1,14 +1,11 @@
 package com.das.common.utils;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import cn.hutool.core.codec.Base64;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.symmetric.AES;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author xxx
@@ -22,10 +19,10 @@ public class AESUtil {
      * @param content 待加密的内容
      * @return 加密后的Base64字符串
      */
-//    public String encrypt(String content, String iv) {
-//        AES aes = new AES(Mode.CBC, Padding.PKCS5Padding, key.getBytes(), iv.getBytes());
-//        return Base64.encode(aes.encrypt(content, Charset.forName("UTF-8")));
-//    }
+    public static String encrypt(String key,String content, String iv) {
+        AES aes = new AES(Mode.CBC, Padding.ZeroPadding, key.getBytes(), iv.getBytes());
+        return Base64.encode(aes.encrypt(content, StandardCharsets.UTF_8));
+    }
 
     /**
      * AES解密
@@ -34,6 +31,6 @@ public class AESUtil {
      */
     public static String decrypt(String key, String encryptStr, String iv) {
         AES aes = new AES(Mode.CBC, Padding.ZeroPadding, key.getBytes(), iv.getBytes());
-        return aes.decryptStr(Base64.decode(encryptStr), Charset.forName("UTF-8"));
+        return aes.decryptStr(Base64.decode(encryptStr), StandardCharsets.UTF_8);
     }
 }
diff --git a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
index 5071350e..72f8b346 100644
--- a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
+++ b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
@@ -5,9 +5,7 @@ import com.das.common.constant.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
 
 /**
  * <p>
diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
index f41a19e0..3a0a4fe2 100644
--- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
+++ b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
@@ -1,6 +1,5 @@
 package com.das.modules.auth.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.das.modules.auth.domain.dto.SysMenuQueryDto;
 import com.das.modules.auth.entity.SysMenu;
diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java
index 3e176a0c..7ee2875c 100644
--- a/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java
+++ b/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java
@@ -3,9 +3,7 @@ package com.das.modules.auth.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.das.modules.auth.domain.dto.SysOrgQueryDto;
-import com.das.modules.auth.domain.dto.SysUserQueryDto;
 import com.das.modules.auth.entity.SysOrg;
-import com.das.modules.auth.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 /**
diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
index a2fa2728..20aa8bfd 100644
--- a/das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
+++ b/das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
@@ -1,9 +1,7 @@
 package com.das.modules.auth.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.das.modules.auth.domain.dto.SysMenuQueryDto;
 import com.das.modules.auth.domain.dto.SysUserQueryDto;
-import com.das.modules.auth.entity.SysMenu;
 import com.das.modules.auth.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
index fc499d2c..92f3721a 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java
@@ -16,7 +16,6 @@ import com.das.modules.auth.domain.vo.SysUserVo;
 import com.das.modules.auth.entity.SysUser;
 import com.das.modules.auth.mapper.SysUserMapper;
 import com.das.modules.auth.service.LoginService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
index 6a9b5517..3665f7f7 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
@@ -11,7 +11,6 @@ import com.das.modules.auth.domain.dto.SysMenuQueryDto;
 import com.das.modules.auth.entity.SysMenu;
 import com.das.modules.auth.mapper.SysMenuMapper;
 import com.das.modules.auth.service.SysMenuService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
index 988ab5c2..8091cca5 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
@@ -9,7 +9,6 @@ import com.das.modules.auth.domain.dto.*;
 import com.das.modules.auth.entity.SysOrg;
 import com.das.modules.auth.mapper.SysOrgMapper;
 import com.das.modules.auth.service.SysOrgService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
index 6a707cf3..da18e593 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
@@ -11,7 +11,6 @@ import com.das.modules.auth.domain.dto.SysUserQueryDto;
 import com.das.modules.auth.entity.SysUser;
 import com.das.modules.auth.mapper.SysUserMapper;
 import com.das.modules.auth.service.SysUserService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;