From ba60917a9a95b776b6a23d163578b82bfe60c2a6 Mon Sep 17 00:00:00 2001
From: John_Liu <87139327@qq.com>
Date: Sun, 22 Nov 2020 01:50:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E8=8E=B7=E5=8F=96userInfo=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pearadmin/security/SecurityConfig.java | 11 ++++++-----
 .../system/controller/SysUserController.java   |  2 +-
 .../system/mapper/SysPowerMapper.java          |  6 ------
 .../system/mapper/xml/SysPowerMapper.xml       | 18 +++++++-----------
 .../service/impl/SysUserServiceImpl.java       |  7 +++++--
 5 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
index e8089ffe..75edab25 100644
--- a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
+++ b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
@@ -106,6 +106,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         return tokenRepository;
     }
 
+    /** 注册SessionRegistry*/
+    @Bean
+    public SessionRegistry sessionRegistry(){
+        return new SessionRegistryImpl();
+    }
+
 
     /**
      * Describe: 配置 Security 控制逻辑
@@ -160,10 +166,5 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         http.headers().frameOptions().disable();
     }
 
-    /** 注册SessionRegistry*/
-    @Bean
-    public SessionRegistry sessionRegistry(){
-        return new SessionRegistryImpl();
-    }
 
 }
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java
index d63d5a1a..2c230fee 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java
@@ -249,7 +249,7 @@ public class SysUserController extends BaseController {
     @GetMapping("center")
     @ApiOperation(value = "个人资料")
     public ModelAndView center(Model model){
-        SysUser sysUser = (SysUser) ServletUtil.getSession().getAttribute("currentUser");
+        SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal();
         model.addAttribute("userInfo",sysUserService.getById(sysUser.getUserId()));
         return JumpPage(MODULE_PATH + "center");
     }
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/SysPowerMapper.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/SysPowerMapper.java
index 69599de2..36277b20 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/SysPowerMapper.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/SysPowerMapper.java
@@ -45,12 +45,6 @@ public interface SysPowerMapper {
      * */
     List<SysMenu> selectMenuByUsername(String username);
 
-    /**
-     * Describe: 根据 ParentId 查询子菜单
-     * Param: parentId
-     * Return: ResuMenu
-     * */
-    List<SysMenu> selectAdminsMenu();
 
     /**
      * Describe: 修改权限信息
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/xml/SysPowerMapper.xml b/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/xml/SysPowerMapper.xml
index 305f5e05..eeb505a7 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/xml/SysPowerMapper.xml
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/mapper/xml/SysPowerMapper.xml
@@ -31,18 +31,14 @@
 			 left join sys_role sr on sr.role_id = srp.role_id
 			 left join  sys_user_role sur on sur.role_id = sr.role_id
 			 left join sys_user su on su.user_id = sur.user_id
-			 where su.username = #{username}  and sp.enable = 1 order by sp.sort
+			 <where>
+                 <if test="username != null and username != ''">
+                     su.username = #{username}
+                 </if>
+                 and sp.enable = 1 order by sp.sort
+             </where>
     </select>
-
-    <select id="selectAdminsMenu" resultMap="ResuMenuMap">
-        select DISTINCT sp.power_id,sp.* from sys_power sp
-			 left join sys_role_power srp on srp.power_id = sp.power_id
-			 left join sys_role sr on sr.role_id = srp.role_id
-			 left join  sys_user_role sur on sur.role_id = sr.role_id
-			 left join sys_user su on su.user_id = sur.user_id
-			 where  sp.enable = 1 order by sp.sort
-    </select>
-
+    
     <select id="selectList" parameterType="SysPower" resultMap="SysPowerMap">
         select * from sys_power
         <where>
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
index 76c4ea31..567853dc 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
@@ -197,8 +197,11 @@ public class SysUserServiceImpl implements ISysUserService {
      * */
     @Override
     public List<SysMenu> getUserMenu(String username) {
-        if (securityProperty.isSuperAuthOpen() && username.equals(securityProperty.getSuperAdmin())) return sysPowerMapper.selectAdminsMenu();
-        return sysPowerMapper.selectMenuByUsername(username);
+        String name = "";
+        if (!(securityProperty.isSuperAuthOpen() && username.equals(securityProperty.getSuperAdmin()))){
+            name = username;
+        }
+        return sysPowerMapper.selectMenuByUsername(name);
     }
     /**
      * Describe: 递归获取菜单tree
-- 
Gitee


From af87775e35b36f1538c4119bde24e7496fd4aa26 Mon Sep 17 00:00:00 2001
From: John_Liu <87139327@qq.com>
Date: Sun, 22 Nov 2020 02:39:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9remember=20me=E6=8C=81?=
 =?UTF-8?q?=E4=B9=85=E5=8C=96=E5=88=B0redis=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=88=A0=E9=99=A4cookie=20?=
 =?UTF-8?q?remember-me=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pearadmin/common/config/RedisConfig.java  |   2 +
 .../security/support/RedisTokenRepositor.java | 100 ++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
 create mode 100644 pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java

diff --git a/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java b/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
new file mode 100644
index 00000000..57ea3310
--- /dev/null
+++ b/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
@@ -0,0 +1,2 @@
+package com.pearadmin.common.config;public class RedisConfig {
+}
diff --git a/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java b/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java
new file mode 100644
index 00000000..63668ffa
--- /dev/null
+++ b/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java
@@ -0,0 +1,100 @@
+package com.pearadmin.common.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Describe: redis remember me 持久化到redis
+ * Author: John Ming
+ * CreateTime: 2020/11/22
+ * */
+@Component
+public class RedisTokenRepositoryConfig implements PersistentTokenRepository {
+
+    private final static String USERNAME_KEY = "spring:security:rememberMe:username_key:";
+    private final static String SERIES_KEY = "spring:security:rememberMe:series_key:";
+
+    @Autowired
+    RedisTemplate redisTemplate;
+
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Override
+    public void createNewToken(PersistentRememberMeToken persistentRememberMeToken) {
+        String series = persistentRememberMeToken.getSeries();
+        String key = generateKey(series,SERIES_KEY);
+        String usernameKey = generateKey(persistentRememberMeToken.getUsername(),USERNAME_KEY);
+        //用户只要采用账户密码重新登录，那么为了安全就有必要清除之前的token信息。deleteIfPresent方法通过
+        //username查找到用户对应的series，然后删除旧的token信息。
+        deleteIfPresent(usernameKey);
+        HashMap<String,String > hashMap = new HashMap<>();
+        hashMap.put("username",persistentRememberMeToken.getUsername());
+        hashMap.put("token",persistentRememberMeToken.getTokenValue());
+        hashMap.put("date",String.valueOf(persistentRememberMeToken.getDate().getTime()));
+        HashOperations<String ,String ,String> hashOperations = redisTemplate.opsForHash();
+        hashOperations.putAll(key,hashMap);
+        redisTemplate.expire(key,1, TimeUnit.DAYS);//设置token保存期限
+        stringRedisTemplate.opsForValue().set(usernameKey,series);
+        redisTemplate.expire(usernameKey,1, TimeUnit.DAYS);
+    }
+
+    @Override
+    public void updateToken(String s, String s1, Date date) {
+        String key = generateKey(s,SERIES_KEY);
+        if(redisTemplate.hasKey(key))
+            redisTemplate.opsForHash().put(key,"token",s1);
+    }
+
+    @Override
+    public PersistentRememberMeToken getTokenForSeries(String s) {
+        String key = generateKey(s,SERIES_KEY);
+        List<String> hashKeys = new ArrayList<>();
+        hashKeys.add("username");
+        hashKeys.add("token");
+        hashKeys.add("date");
+        List<String> hashValues = redisTemplate.opsForHash().multiGet(key, hashKeys);
+        String username =  hashValues.get(0);
+        String tokenValue = hashValues.get(1);
+        String date = hashValues.get(2);
+        if (null == username || null == tokenValue || null == date) {
+            return null;
+        }
+        Long timestamp = Long.valueOf(date);
+        Date time = new Date(timestamp);
+        return new PersistentRememberMeToken(username, s, tokenValue, time);
+    }
+
+    @Override
+    public void removeUserTokens(String s) {
+        //rememberMeService实现类中调用这个方法传入的参数是username，因此我们必须通过username查找到
+        //对应的series，然后再通过series查找到对应的token信息再删除。
+        String key = generateKey(s,USERNAME_KEY);
+        deleteIfPresent(key);
+    }
+
+    private void deleteIfPresent(String key){
+        //删除token时应该同时删除token信息，以及保存了对应的username与series对照数据。
+        if(redisTemplate.hasKey(key)){
+            String series = generateKey(stringRedisTemplate.opsForValue().get(key),SERIES_KEY);
+            if(series!=null && redisTemplate.hasKey(series)){
+                redisTemplate.delete(series);
+                redisTemplate.delete(key);
+            }
+        }
+    }
+    private String generateKey(String series,String prefix) {
+        return prefix + series;
+    }
+
+}
-- 
Gitee


From 7171b2094d1446645e10ecb7611e3f291e1222d4 Mon Sep 17 00:00:00 2001
From: John_Liu <87139327@qq.com>
Date: Sun, 22 Nov 2020 02:45:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9remember=20me=E6=8C=81?=
 =?UTF-8?q?=E4=B9=85=E5=8C=96=E5=88=B0redis=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=88=A0=E9=99=A4cookie=20?=
 =?UTF-8?q?remember-me=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pear-common/pom.xml                           | 13 +++++-
 .../pearadmin/common/config/RedisConfig.java  | 30 +++++++++++-
 .../pearadmin/security/SecurityConfig.java    | 46 ++++++++++---------
 .../security/support/RedisTokenRepositor.java |  4 +-
 .../main/resources/application-datasource.yml | 18 +++++++-
 .../src/main/resources/templates/login.html   | 26 +++++++++++
 pom.xml                                       | 15 +++++-
 7 files changed, 123 insertions(+), 29 deletions(-)

diff --git a/pear-common/pom.xml b/pear-common/pom.xml
index 635dd41b..d6b15916 100644
--- a/pear-common/pom.xml
+++ b/pear-common/pom.xml
@@ -68,10 +68,21 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+
+        <!-- lettuce pool 缓存连接池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java b/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
index 57ea3310..ff88a3ca 100644
--- a/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
+++ b/pear-common/src/main/java/com/pearadmin/common/config/RedisConfig.java
@@ -1,2 +1,30 @@
-package com.pearadmin.common.config;public class RedisConfig {
+package com.pearadmin.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.io.Serializable;
+
+/**
+ * Describe: redis 序列化配置
+ * Author: John Ming
+ * CreateTime: 2020/11/22
+ * */
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    public RedisTemplate<String, Serializable>
+    redisTemplate(LettuceConnectionFactory connectionFactory) {
+        RedisTemplate<String, Serializable> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        redisTemplate.setConnectionFactory(connectionFactory);
+        return redisTemplate;
+    }
+
 }
diff --git a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
index 75edab25..44d4de0e 100644
--- a/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
+++ b/pear-entrance/src/main/java/com/pearadmin/security/SecurityConfig.java
@@ -3,6 +3,7 @@ package com.pearadmin.security;
 import com.pearadmin.common.config.proprety.SecurityProperty;
 import com.pearadmin.security.domain.SecurityUserDetailsService;
 import com.pearadmin.security.process.*;
+import com.pearadmin.security.support.RedisTokenRepositor;
 import com.pearadmin.security.support.SecurityPermissionEvaluator;
 import com.pearadmin.security.support.SecurityVerifyCodeFilter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +20,6 @@ import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
-import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
@@ -62,8 +61,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
     private SecurityUserDetailsService securityUserDetailsService; //实现userservice
-    @Resource
-    private DataSource dataSource; // 数据源
+
+    @Autowired
+    private RedisTokenRepositor redisTokenRepositor;
+
+//    @Resource
+//    private DataSource dataSource; // 数据源
 
     /**
      * Describe: 自定义权限注解实现
@@ -92,19 +95,19 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     }
 
 
-    /**
-     * 持久化token
-     *
-     * Security中，默认是使用PersistentTokenRepository的子类InMemoryTokenRepositoryImpl，将token放在内存中
-     * 如果使用JdbcTokenRepositoryImpl，会创建表persistent_logins，将token持久化到数据库
-     */
-    @Bean
-    public PersistentTokenRepository persistentTokenRepository() {
-        JdbcTokenRepositoryImpl tokenRepository = new JdbcTokenRepositoryImpl();
-        tokenRepository.setDataSource(dataSource); // 设置数据源
-//    tokenRepository.setCreateTableOnStartup(true); // 启动创建表，创建成功后注释掉
-        return tokenRepository;
-    }
+//    /**
+//     * 持久化token
+//     *
+//     * Security中，默认是使用PersistentTokenRepository的子类InMemoryTokenRepositoryImpl，将token放在内存中
+//     * 如果使用JdbcTokenRepositoryImpl，会创建表persistent_logins，将token持久化到数据库
+//     */
+//    @Bean
+//    public PersistentTokenRepository persistentTokenRepository() {
+//        JdbcTokenRepositoryImpl tokenRepository = new JdbcTokenRepositoryImpl();
+//        tokenRepository.setDataSource(dataSource); // 设置数据源
+////    tokenRepository.setCreateTableOnStartup(true); // 启动创建表，创建成功后注释掉
+//        return tokenRepository;
+//    }
 
     /** 注册SessionRegistry*/
     @Bean
@@ -141,12 +144,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .logoutUrl("/logout")
                 //配置用户登出自定义处理类
                 .logoutSuccessHandler(securityAccessLogoutHander)
+                .deleteCookies("remember-me") //退出登录删除 cookie缓存的rememberMe
                 .and()
                 //配置没有权限自定义处理类
                 .exceptionHandling().accessDeniedHandler(securityAccessDeniedHander)
                 .and()
                 .rememberMe().rememberMeParameter("remember-me")
-                .tokenRepository(persistentTokenRepository())
+                .tokenRepository(redisTokenRepositor)
                 .key(securityProperty.getRememberKey())
                 .and()
                 // 防止iframe 造成跨域
@@ -157,12 +161,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 // 取消跨站请求伪造防护
                 .csrf().disable()
                 .sessionManagement()
-                .invalidSessionUrl("/login") //无效session要跳转到login
+                .invalidSessionUrl("/login?kickout=1") //无效session要跳转到login
                 .maximumSessions(1)//同时登陆多个只保留一个
                 .expiredUrl("/login")//过期session跳转
-                .sessionRegistry(sessionRegistry())
-
-;
+                .sessionRegistry(sessionRegistry());
         http.headers().frameOptions().disable();
     }
 
diff --git a/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java b/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java
index 63668ffa..86b26217 100644
--- a/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java
+++ b/pear-entrance/src/main/java/com/pearadmin/security/support/RedisTokenRepositor.java
@@ -1,4 +1,4 @@
-package com.pearadmin.common.config;
+package com.pearadmin.security.support;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
  * CreateTime: 2020/11/22
  * */
 @Component
-public class RedisTokenRepositoryConfig implements PersistentTokenRepository {
+public class RedisTokenRepositor implements PersistentTokenRepository {
 
     private final static String USERNAME_KEY = "spring:security:rememberMe:username_key:";
     private final static String SERIES_KEY = "spring:security:rememberMe:series_key:";
diff --git a/pear-entrance/src/main/resources/application-datasource.yml b/pear-entrance/src/main/resources/application-datasource.yml
index 251134b8..f57f9369 100644
--- a/pear-entrance/src/main/resources/application-datasource.yml
+++ b/pear-entrance/src/main/resources/application-datasource.yml
@@ -1,5 +1,21 @@
 
 spring:
+  redis:
+    host: 192.168.0.110
+    port: 6379
+    password:
+    database: 0
+    lettuce:
+      pool:
+        # 连接池中的最大空闲连接
+        max-active: 20
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        # 连接池中的最大空闲连接
+        max-idle: 4
+        # 连接池中的最小空闲连接
+        min-idle: 0
+    timeout: 1000
   datasource:
     dynamic:
       primary: master #设置默认的数据源或者数据源组,默认值即为master
@@ -48,4 +64,4 @@ spring:
                 merge-sql: true
               wall:
                 config:
-                  multi-statement-allow: true
\ No newline at end of file
+                  multi-statement-allow: true
diff --git a/pear-entrance/src/main/resources/templates/login.html b/pear-entrance/src/main/resources/templates/login.html
index ed93a388..ce21dc5a 100644
--- a/pear-entrance/src/main/resources/templates/login.html
+++ b/pear-entrance/src/main/resources/templates/login.html
@@ -75,11 +75,37 @@
             document.getElementById("captchaImage").src="/system/captcha/generate?"+Math.random();
         },30000)
 
+
+        validateKickout();
+
     })
+
+
 </script>
 <!-- Session 过期处理 -->
 <script>
     if(window!=top){ top.location.href = location.href; }
+
+    function validateKickout() {
+        if (getParam("kickout") == 1) {
+            layer.alert("<font color='red'>您已在别处登录，请您修改密码或重新登录</font>", {
+                    icon: 0,
+                    title: "系统提示"
+                },
+                function(index) {
+                    //关闭弹窗
+                    layer.close(index);
+                });
+        }
+    }
+
+    function getParam(paramName) {
+        var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return decodeURI(r[2]);
+        return null;
+    }
+
 </script>
 
 </body>
diff --git a/pom.xml b/pom.xml
index fb9ebab2..bb127260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
         <apache.xmlgraphics.version>1.13</apache.xmlgraphics.version>
         <!-- 模 板 引 擎 版 本 -->
         <velocity.version>1.7</velocity.version>
+        <!-- security thymeleaf -->
+        <thymeleaf-extras.version>3.0.4.RELEASE</thymeleaf-extras.version>
+        <!-- dynamic 动态数据库  -->
+        <dynamic.verion>3.2.1</dynamic.verion>
+        <!-- jackson -->
+        <jackson.version>2.9.9</jackson.version>
     </properties>
 
     <!-- 依 赖 管 理 -->
@@ -215,12 +221,17 @@
             <dependency>
                 <groupId>org.thymeleaf.extras</groupId>
                 <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-                <version>3.0.4.RELEASE</version>
+                <version>${thymeleaf-extras.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-                <version>3.2.1</version>
+                <version>${dynamic.verion}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
             </dependency>
 
         </dependencies>
-- 
Gitee