diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
index 28158e8fd..2b673eca1 100644
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
@@ -3,7 +3,7 @@ package cn.lili.controller.passport.connect;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.AuthCallback;
diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
index 9dc1c8f20..61a8a1489 100644
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.passport.connect;
 
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
index 23d84cf04..13f8c7142 100755
--- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
+++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
@@ -6,7 +6,7 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
index 990ea870c..25b010ad1 100644
--- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
+++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
@@ -1,7 +1,7 @@
 package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.trigger.message.BroadcastMessage;
 import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.modules.goods.service.StudioService;
 import cn.lili.trigger.TimeTriggerExecutor;
diff --git a/framework/pom.xml b/framework/pom.xml
index 3c8ae0215..9568b25df 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -63,11 +63,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
-        <!-- Thymeleaf -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
         <!-- JPA -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java
index 457ab59f8..3f76bb046 100644
--- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java
+++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java
@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
-import cn.lili.cache.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
diff --git a/framework/src/main/java/cn/lili/cache/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
similarity index 94%
rename from framework/src/main/java/cn/lili/cache/token/SecretKeyUtil.java
rename to framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
index de74e922b..e5fe970cc 100644
--- a/framework/src/main/java/cn/lili/cache/token/SecretKeyUtil.java
+++ b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.cache.token;
+package cn.lili.common.security.token;
 
 import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;
diff --git a/framework/src/main/java/cn/lili/cache/token/Token.java b/framework/src/main/java/cn/lili/common/security/token/Token.java
similarity index 87%
rename from framework/src/main/java/cn/lili/cache/token/Token.java
rename to framework/src/main/java/cn/lili/common/security/token/Token.java
index d77e59172..81286345b 100644
--- a/framework/src/main/java/cn/lili/cache/token/Token.java
+++ b/framework/src/main/java/cn/lili/common/security/token/Token.java
@@ -1,4 +1,4 @@
-package cn.lili.cache.token;
+package cn.lili.common.security.token;
 
 import lombok.Data;
 
diff --git a/framework/src/main/java/cn/lili/cache/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
similarity index 99%
rename from framework/src/main/java/cn/lili/cache/token/TokenUtil.java
rename to framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
index 0d528c9df..a019854a6 100644
--- a/framework/src/main/java/cn/lili/cache/token/TokenUtil.java
+++ b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.cache.token;
+package cn.lili.common.security.token;
 
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
diff --git a/framework/src/main/java/cn/lili/cache/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
similarity index 88%
rename from framework/src/main/java/cn/lili/cache/token/base/AbstractTokenGenerate.java
rename to framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
index 312c39494..08912782d 100644
--- a/framework/src/main/java/cn/lili/cache/token/base/AbstractTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
@@ -1,7 +1,7 @@
-package cn.lili.cache.token.base;
+package cn.lili.common.security.token.base;
 
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 
 /**
  * AbstractToken
diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
index 58df83d89..7a33b102c 100644
--- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
+++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.service;
 
 import cn.lili.cache.CachePrefix;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index 66106af57..527fe185a 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -8,7 +8,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.member.token.MemberTokenGenerate;
 import cn.lili.common.utils.CookieUtil;
 import cn.lili.common.utils.StringUtils;
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
index 52c37011c..9b9516b07 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
@@ -6,7 +6,7 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.properties.ApiProperties;
 import cn.lili.common.properties.DomainProperties;
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
index d102dd7a3..8933c05c9 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.service;
 
-import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.trigger.message.BroadcastMessage;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.vos.StudioVO;
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
index 762218531..7c77195be 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.trigger.message.BroadcastMessage;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index d4e98a0bf..acbe240bf 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.member.service;
 
 
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.member.entity.dos.Member;
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index afa8af331..ea5fda3e8 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -12,7 +12,7 @@ import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.member.token.MemberTokenGenerate;
 import cn.lili.modules.member.token.StoreTokenGenerate;
 import cn.lili.common.utils.*;
diff --git a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
index c4c74560a..d7ee50d63 100644
--- a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
@@ -2,9 +2,9 @@ package cn.lili.modules.member.token;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.Token;
-import cn.lili.cache.token.TokenUtil;
-import cn.lili.cache.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.dos.Member;
diff --git a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
index 853e64500..9d10db60e 100644
--- a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
@@ -4,9 +4,9 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.Token;
-import cn.lili.cache.token.TokenUtil;
-import cn.lili.cache.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.store.entity.dos.Store;
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
index 2977a76a7..1ee25e7e1 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.permission.service;
 
 
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.dto.AdminUserDTO;
 import cn.lili.modules.permission.entity.vo.AdminUserVO;
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
index 02900ae82..27b4d31a8 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.system.token.ManagerTokenGenerate;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.StringUtils;
diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
index 15b576d50..8643c6325 100644
--- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
@@ -5,9 +5,9 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.security.enums.PermissionEnum;
-import cn.lili.cache.token.Token;
-import cn.lili.cache.token.TokenUtil;
-import cn.lili.cache.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.vo.UserMenuVO;
 import cn.lili.modules.permission.service.AdminUserService;
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
index e1ea4d25e..49fc14d55 100644
--- a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
-import org.thymeleaf.util.ListUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -236,15 +235,13 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner {
             nodes = new SensitiveWordsNode[DEFAULT_INITIAL_CAPACITY];
             //加入平台添加的敏感词
             List<SensitiveWords> list = sensitiveWordsService.list();
-            if (ListUtils.isEmpty(list)) {
+            if (list != null && list.size() > 0) {
                 for (SensitiveWords sensitiveWords : list) {
                     put(sensitiveWords.getSensitiveWord());
                 }
             }
         } catch (Exception e) {
-            log.error("初始化敏感词错误",e);
+            log.error("初始化敏感词错误", e);
         }
-
-
     }
 }
diff --git a/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
index 42e96cbf6..5fb264bfd 100644
--- a/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
+++ b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
@@ -1,11 +1,8 @@
-package cn.lili.common.delayqueue;
+package cn.lili.trigger.message;
 
-import cn.hutool.core.date.DateTime;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
 /**
  * 直播消息实体
  *
diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
index 6dad9df91..e06a2d5e1 100644
--- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.cache.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.verification.enums.VerificationEnums;
diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
index 627f76658..d8fa20ed4 100755
--- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
+++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
@@ -6,7 +6,7 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
diff --git a/pom.xml b/pom.xml
index 411f37da2..453977cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,12 @@
                     </resources>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java
index d8861bed2..7b20ea1fc 100755
--- a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java
+++ b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java
@@ -6,7 +6,7 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.cache.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;