From ee713fcaaf5d72039c3033a1d3985b2fd97a8fca Mon Sep 17 00:00:00 2001 From: bynt Date: Fri, 23 Dec 2022 14:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/baiye/config/AuthServerConfig.java | 1 + .../main/java/com/baiye/entity/OnlineUser.java | 4 ++-- .../baiye/service/impl/OnlineServiceImpl.java | 18 ++++++------------ .../src/main/resources/config/bootstrap.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ad-platform-auth/src/main/java/com/baiye/config/AuthServerConfig.java b/ad-platform-auth/src/main/java/com/baiye/config/AuthServerConfig.java index b1966028..9c758b3d 100644 --- a/ad-platform-auth/src/main/java/com/baiye/config/AuthServerConfig.java +++ b/ad-platform-auth/src/main/java/com/baiye/config/AuthServerConfig.java @@ -129,6 +129,7 @@ public class AuthServerConfig extends AuthorizationServerConfigurerAdapter { endpoints .tokenGranter(tokenGranter(endpoints, tokenServices)) .tokenServices(tokenServices) + .accessTokenConverter(jwtAccessTokenConverter()) // 配置请求方式 .allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST) // 配置token的存储位置 diff --git a/ad-platform-auth/src/main/java/com/baiye/entity/OnlineUser.java b/ad-platform-auth/src/main/java/com/baiye/entity/OnlineUser.java index eeac85df..d01b78ba 100644 --- a/ad-platform-auth/src/main/java/com/baiye/entity/OnlineUser.java +++ b/ad-platform-auth/src/main/java/com/baiye/entity/OnlineUser.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * @@ -49,7 +49,7 @@ public class OnlineUser implements Serializable { /** * 登录时间 */ - private LocalDateTime loginTime; + private Date loginTime; /** * 访问token diff --git a/ad-platform-auth/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java b/ad-platform-auth/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java index e393bee2..95d7964d 100644 --- a/ad-platform-auth/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java +++ b/ad-platform-auth/src/main/java/com/baiye/service/impl/OnlineServiceImpl.java @@ -2,10 +2,9 @@ package com.baiye.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.text.CharSequenceUtil; +import com.baiye.constant.SecurityConstants; import com.baiye.entity.OnlineUser; import com.baiye.service.IOnlineUserService; - -import com.baiye.constant.SecurityConstants; import com.baiye.util.CacheKey; import com.baiye.util.PageUtil; import com.baiye.util.RedisUtils; @@ -22,12 +21,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -67,8 +61,7 @@ public class OnlineServiceImpl implements IOnlineUserService { String tokenValue = accessToken.getValue(); int expiresIn = accessToken.getExpiresIn(); String refreshToken = accessToken.getRefreshToken().getValue(); - OnlineUser onlineUser = new OnlineUser(userId, username, browser, ip, cityInfo, - LocalDateTime.now(ZoneId.systemDefault()), tokenValue, refreshToken, expiresIn); + OnlineUser onlineUser = new OnlineUser(userId, username, browser, ip, cityInfo, new Date(), tokenValue, refreshToken, expiresIn); this.redisUtils.set(CacheKey.ONLINE_USER + userId, onlineUser, expiresIn, TimeUnit.SECONDS); } @@ -99,12 +92,13 @@ public class OnlineServiceImpl implements IOnlineUserService { } else if (userId == null) { userId = (Long) oAuth2AccessToken.getAdditionalInformation().get(SecurityConstants.DETAILS_USER_ID); } - String username = (String) oAuth2AccessToken.getAdditionalInformation().get(SecurityConstants.DETAILS_USERNAME); - // 判断oAuth2AccessToken是否为空，oAuth2AccessToken是否有token的值 if (BeanUtil.isEmpty(oAuth2AccessToken)) { // 都为空说明已经注销，直接返回true return true; } + String username = (String) oAuth2AccessToken.getAdditionalInformation().get(SecurityConstants.DETAILS_USERNAME); + // 判断oAuth2AccessToken是否为空，oAuth2AccessToken是否有token的值 + // 清理redis中存储的信息 this.redisTokenStore.removeAccessToken(oAuth2AccessToken); // 清空刷新token diff --git a/ad-platform-gateway/src/main/resources/config/bootstrap.yml b/ad-platform-gateway/src/main/resources/config/bootstrap.yml index 2ac5132a..b52906a0 100644 --- a/ad-platform-gateway/src/main/resources/config/bootstrap.yml +++ b/ad-platform-gateway/src/main/resources/config/bootstrap.yml @@ -15,7 +15,7 @@ spring: active: @profiles.active@ security: decode: - private-key: MIICWwIBAAKBgHy7lujT2jh9wYypztbDFCJnmtHgSVIRZ2wq44qGz35Cpl+H7bcGAOkIrhoOqmsvlcVzNSQrwYlQK0XDmLsbwWdGrnf+sGQheBrF1AfgsI98LoqfFE420+jDsGnYIwMLiRs0wOPZ9drGhYBWwotHQb4kKt5WMJSK0IbjiR3lGWatAgMBAAECgYAfXYy1P5DAY98n4AuDNcr6W9Mys5O8b2Pyb1aInx3OQjRUEXpVa80OzH/7TXTNP0oKPM5AKkCgpug6wtTFOFWJp1s/oUP6qC/fiCEVhTkBu6NvPPsfq5kLJAswtM+12sM4+4Ip3wfICJllU8wzmC0DfOF9sZCnETsd0h4axZ+2gQJBANgs7hVPq9eKmzdCSjfOpP5CXmI+I/drHwklfd4GAeKSq8WEyl+XXELIRwsfbOivpfcTZ4jr16mwbo/1+aVrQPsCQQCTth8XjQYke4ucemoNEYdANBTeOqDyeVXz25/sMDmqUBn0h5K/r+gjx3JBbFL+IFQrhebY+crEwellCT+H1/Z3AkEAmWUIbEbkgUXxbfyz/XW8zk75+mxtyRtSIoNgFTPeEpBRIw9fKwWUii7jepkKBvLcqb4zMY1osxhm2/CG/UJmEQJAU82Z6kSqXXxygv64uF1ffL+Pr11X/vl0GHxcSSY7MTNs5l0clwB4FgSMAC4zD9bLqj238RYXQnY5socCslGGlQJAFAbIpNZoC1aOcsAjULEew//4aVh5e8mrBhBcDzhO48WGSsYGSW06QML3gnuPxWkUI91W61WEe58zXk/7mM7qfw== + private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkbpCJ9l0XRYYA6h/bYP7hRoSwe/ZOmyKXCNpZ5w+IrvnWnlXXCthFSrjmtJwgdeESWsrwvS7jmWI8KE8Z53rxkyGCLqdlhxwyNWGgA/909Np3TSECCQmYsENNqam7YPY8xIe0finhN9saip/HTrWESho+NMiYSTsgeKcwG7qNhnFZcZ8Xv4+bN0J/br1wd6Qw0chMVI16qHPhoII/yD1Jop6rEX8elJqA2JjR/CTvwtO1547W1ZdgDr/XhePz9W1Ms7Zcrh+4+JOuLE67pOHMA8xEA1Hg7qgCB+vdVezchgQaRxG/0y1WawezvSrVjYpL/v3KyedUn0oASWKbp/yzAgMBAAECggEAFY9Nslk0MYXzIRGRpcEdCkqlwUIvtHTQ3z7Q6nLKbaCLr6FJHg4U91jpz44k3ni2TyLKczBLApqs77hVTs80JpKlFR2q4zwI7WhkaYe8qggk0Pmy90JaGMQbvwYc9C2te6BFLtxP/3DEcMF2W7qtQDA7KqbfGmCXuRU4zq0EE+Qy3TEZ1JJkJkxPynz5f3G5Jh1OqjAwjGu/sXOq6u5f1CIPT845pGznaB/6FPv1ZPouSnmchUA1YMBtn+vMe8iAxyJVZEUvs4cEIi81yIpg3pvh6Y0w+mUQwqDP/rQY9yom0qgXfGX+zmvgZRCHQfi+xj90rWZ9FSkJGl4P/ZMY6QKBgQD9XWw+F8RzXl2V3op1z1u2Cg0rt3zF9kNGzOky/BnxXW4onSzJmZq9ABu+Ip07zIBoPmosvSsQa1CSdBDaIUDpPU12xUbhiyFIZtsx4SgRro8NRE16Mi4Ch5b2qFpQYWLlhbVCEjmqbVjsNvUdVg3PZcUXdX6b4pJFI/gAn+dSfwKBgQCmJFwpVDmmv59ACzIJWisi25cJdI2Te5Fp0fjPf/DUHXvUK5RoOGzG3D8RS1vcVEeJNYispKcF1wvc4YXjbxymoRt0oecM0qCTqpoxU+nl3QYk0F5E2gneqFzrVJ5uxdJLgw36kEUx3Ved6s3xHxfLX9Q5Eal7TSpL3zuI5vSTzQKBgCO/rckpE1fv5aaCyuiKhHcv/eHANwO7loyD1xeRiJuMwkFKxAoB+VpXjJKMUcEhPrD2tYZwfoYHjkvLwqD0djMyqh5rAXBLcDvF/4GPMlckWRzXGVN3hxRmSz+sS2nyA8E813FmHurUGOrjajxkavhrdJ61vlKCan8E7zYvWbVDAoGAdtUM4jau4Zivc+RODqhisBT2C7pExRcd491eJDQzcdQAzLm69WxeSUIhDeKjuozBed9DeZBvMlskzgC0ff7sNDaJZ7uhgedpGRVuIhgN9O5Ixa4Prxlw88PiaiPlCgAOMRp0tiHYjBjv4TCfynXd1AYfyg3a9ik0Nn5dm8btaoUCgYEAmLjwTtcGllLy6FgSdbWfqhVQh8noRzlCfB0r9270yd2bFN+gmp7leuIMuFkvzsfCeBqkOu7el9f6Y5ZYPrBCj57voMmBJlOnYY5gcciLAdggQlsnn42AV8l1ooJqPAhnsd4V1shSX+KJmwwzGQsSxGUhJyZ9n+GH6F2BoBNXpEk= diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml index c1856ea3..b677238c 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml @@ -82,7 +82,7 @@ code: #密码加密传输，前端公钥加密，后端私钥解密 rsa: - private_key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKLhn7fPqFSK9z3Ao4yFFisDO8YV1dOn1I3wpwj1IIu3Z7vkaHyynBf7eF8fo86EQRvnJIo3jVO2jUw5Lor2OYcZVK72oxD5LIULVYI/eXJogzd1C+tJ5IHC7dmTJ37qfjP9VV3mDWlsRusdCoVPE2xUI13H4bPOCE4DyyeldXlFAgMBAAECgYBakWx3D5+AyvipPKl0JDhsWFLvVQrdss+M0Uh/wZWEOsoSfvHejI4hA7It6nDyDzYI5uC5fiQ2bSZqQM1xdXIMmq4F0WM2+ni4Q/bYbaLt9UDGs6GXwHcg3gOTBJoSJq0SZxBpflxbfVOj63ITehTl51q0FvaedxWl63hf6bikQQJBANT3s1usMZmubYxQPLrBeK1mcXG1JxwKDK6n7bJnlBeZy1GCUZ7bwBgr32gRvUXtgqrzT3IyZlld5cUScX601TUCQQDDyxVAPExwbpxD0Ao7CZE9LRYC8YaMQ46NENqaIhnmhMa4vqoTky8t2nLZITmk0EqecTBt/Io+37+X/KCHD+XRAkAraGmIb+qUNndhuCEIt9KPFWheEtxr3KiFGPlb+by3qsNEU9mrFYNr6dVZcvQvQp/1lC5HSnqOEJN6va2gc99ZAkEAnYtF+EAMydNXDgHSmZqjMXSb55Zsy2R4ye2r2KZj7Ocd9/4DYGjoZ58FFs3zUjkAMemmLHouy1TDGAsBKGyUYQJBAJ1io1DxuejCE+sN/bu4Y2S7oQ2Mpfjh7jRYGruDzhdqVnnLxf0spaqJZ5HekQz3uMpkQQGkcN1MZZcRpoWJ7XU= + private_key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkbpCJ9l0XRYYA6h/bYP7hRoSwe/ZOmyKXCNpZ5w+IrvnWnlXXCthFSrjmtJwgdeESWsrwvS7jmWI8KE8Z53rxkyGCLqdlhxwyNWGgA/909Np3TSECCQmYsENNqam7YPY8xIe0finhN9saip/HTrWESho+NMiYSTsgeKcwG7qNhnFZcZ8Xv4+bN0J/br1wd6Qw0chMVI16qHPhoII/yD1Jop6rEX8elJqA2JjR/CTvwtO1547W1ZdgDr/XhePz9W1Ms7Zcrh+4+JOuLE67pOHMA8xEA1Hg7qgCB+vdVezchgQaRxG/0y1WawezvSrVjYpL/v3KyedUn0oASWKbp/yzAgMBAAECggEAFY9Nslk0MYXzIRGRpcEdCkqlwUIvtHTQ3z7Q6nLKbaCLr6FJHg4U91jpz44k3ni2TyLKczBLApqs77hVTs80JpKlFR2q4zwI7WhkaYe8qggk0Pmy90JaGMQbvwYc9C2te6BFLtxP/3DEcMF2W7qtQDA7KqbfGmCXuRU4zq0EE+Qy3TEZ1JJkJkxPynz5f3G5Jh1OqjAwjGu/sXOq6u5f1CIPT845pGznaB/6FPv1ZPouSnmchUA1YMBtn+vMe8iAxyJVZEUvs4cEIi81yIpg3pvh6Y0w+mUQwqDP/rQY9yom0qgXfGX+zmvgZRCHQfi+xj90rWZ9FSkJGl4P/ZMY6QKBgQD9XWw+F8RzXl2V3op1z1u2Cg0rt3zF9kNGzOky/BnxXW4onSzJmZq9ABu+Ip07zIBoPmosvSsQa1CSdBDaIUDpPU12xUbhiyFIZtsx4SgRro8NRE16Mi4Ch5b2qFpQYWLlhbVCEjmqbVjsNvUdVg3PZcUXdX6b4pJFI/gAn+dSfwKBgQCmJFwpVDmmv59ACzIJWisi25cJdI2Te5Fp0fjPf/DUHXvUK5RoOGzG3D8RS1vcVEeJNYispKcF1wvc4YXjbxymoRt0oecM0qCTqpoxU+nl3QYk0F5E2gneqFzrVJ5uxdJLgw36kEUx3Ved6s3xHxfLX9Q5Eal7TSpL3zuI5vSTzQKBgCO/rckpE1fv5aaCyuiKhHcv/eHANwO7loyD1xeRiJuMwkFKxAoB+VpXjJKMUcEhPrD2tYZwfoYHjkvLwqD0djMyqh5rAXBLcDvF/4GPMlckWRzXGVN3hxRmSz+sS2nyA8E813FmHurUGOrjajxkavhrdJ61vlKCan8E7zYvWbVDAoGAdtUM4jau4Zivc+RODqhisBT2C7pExRcd491eJDQzcdQAzLm69WxeSUIhDeKjuozBed9DeZBvMlskzgC0ff7sNDaJZ7uhgedpGRVuIhgN9O5Ixa4Prxlw88PiaiPlCgAOMRp0tiHYjBjv4TCfynXd1AYfyg3a9ik0Nn5dm8btaoUCgYEAmLjwTtcGllLy6FgSdbWfqhVQh8noRzlCfB0r9270yd2bFN+gmp7leuIMuFkvzsfCeBqkOu7el9f6Y5ZYPrBCj57voMmBJlOnYY5gcciLAdggQlsnn42AV8l1ooJqPAhnsd4V1shSX+KJmwwzGQsSxGUhJyZ9n+GH6F2BoBNXpEk= #配置短信参数 sms: