From 417b43929f1d754385315bf44284e4e46658fa13 Mon Sep 17 00:00:00 2001 From: zhult13 Date: Sun, 26 Jun 2022 16:51:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1demo(=E6=97=A0=E7=BD=91=E7=BB=9C=E9=9A=94?= =?UTF-8?q?=E7=A6=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resolver/TokenArgumentResolver.java | 45 ++++++++++------ zlt-demo/pom.xml | 2 + zlt-demo/resources-server-demo/README.md | 36 +++++++++++++ zlt-demo/resources-server-demo/pom.xml | 51 +++++++++++++++++++ .../main/java/org/zlt/ResourcesServerApp.java | 18 +++++++ .../java/org/zlt/config/MyResourceConfig.java | 20 ++++++++ .../java/org/zlt/config/WebMvcConfig.java | 18 +++++++ .../org/zlt/controller/TestController.java | 28 ++++++++++ .../src/main/resources/bootstrap.yml | 14 +++++ 9 files changed, 217 insertions(+), 15 deletions(-) create mode 100644 zlt-demo/resources-server-demo/README.md create mode 100644 zlt-demo/resources-server-demo/pom.xml create mode 100644 zlt-demo/resources-server-demo/src/main/java/org/zlt/ResourcesServerApp.java create mode 100644 zlt-demo/resources-server-demo/src/main/java/org/zlt/config/MyResourceConfig.java create mode 100644 zlt-demo/resources-server-demo/src/main/java/org/zlt/config/WebMvcConfig.java create mode 100644 zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java create mode 100644 zlt-demo/resources-server-demo/src/main/resources/bootstrap.yml diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java index 32e5ef37..5d3024a1 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java @@ -8,6 +8,9 @@ import com.central.common.model.SysRole; import com.central.common.model.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.method.support.HandlerMethodArgumentResolver; @@ -66,25 +69,37 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver { String roles = request.getHeader(SecurityConstants.ROLE_HEADER); //账号类型 String accountType = request.getHeader(SecurityConstants.ACCOUNT_TYPE_HEADER); + + SysUser user = null; if (StrUtil.isBlank(username)) { log.warn("resolveArgument error username is empty"); - return null; - } - SysUser user; - if (isFull) { - user = userService.selectByUsername(username); + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) { + Object principal = authentication.getPrincipal(); + //客户端模式只返回一个clientId + if (principal instanceof SysUser) { + user = (SysUser)principal; + } + } + if (user == null) { + return null; + } } else { - user = new SysUser(); - user.setId(Long.valueOf(userId)); - user.setUsername(username); + if (isFull) { + user = userService.selectByUsername(username); + } else { + user = new SysUser(); + user.setId(Long.valueOf(userId)); + user.setUsername(username); + } + List sysRoleList = new ArrayList<>(); + Arrays.stream(roles.split(",")).forEach(role -> { + SysRole sysRole = new SysRole(); + sysRole.setCode(role); + sysRoleList.add(sysRole); + }); + user.setRoles(sysRoleList); } - List sysRoleList = new ArrayList<>(); - Arrays.stream(roles.split(",")).forEach(role -> { - SysRole sysRole = new SysRole(); - sysRole.setCode(role); - sysRoleList.add(sysRole); - }); - user.setRoles(sysRoleList); return user; } } diff --git a/zlt-demo/pom.xml b/zlt-demo/pom.xml index cfb80491..b4cea10c 100644 --- a/zlt-demo/pom.xml +++ b/zlt-demo/pom.xml @@ -24,5 +24,7 @@ dubbo-demo websocket-demo + + resources-server-demo \ No newline at end of file diff --git a/zlt-demo/resources-server-demo/README.md b/zlt-demo/resources-server-demo/README.md new file mode 100644 index 00000000..22c99efd --- /dev/null +++ b/zlt-demo/resources-server-demo/README.md @@ -0,0 +1,36 @@ +## 一、说明 +资源服务器 demo 样例，以最简化的代码演示如何快速集成一个带鉴权功能的服务，适用于 `无网络隔离` 架构。 + +> 关于无网络隔离架构的设计可参考文档：[无网络隔离架构](https://www.kancloud.cn/zlt2000/microservices-platform/1153640) + +  +## 二、启动以下服务 +1. zlt-uaa：统一认证中心 +2. user-center：用户服务 +3. sc-gateway：api网关 +4. resources-server-demo + +> 环境配置与启动参考文档：https://www.kancloud.cn/zlt2000/microservices-platform/919418 + +  +## 三、测试 +### 3.1. 测试接口一 +http://localhost:8093/test/notAuth +> 无需token访问 + +  +### 3.2. 测试接口二 +http://localhost:8093/test/auth?access_token=xxx +> - xxx 需替换为正确的 access_token +> - 可以通过修改 `bootstrap.yml` 文件中的 `zlt.security.ignore.httpUrls` 参数添加排除校验的url。 + +  +## 四、获取access_token +可使用任意授权模式获取； + +例如：密码模式授权 +- 请求方式：POST +- 请求头：Authorization:Basic d2ViQXBwOndlYkFwcA== +- 请求地址：http://localhost:9900/api-uaa/oauth/token?grant_type=password&username=admin&password=admin + +> 授权接口清单参考文档：https://www.kancloud.cn/zlt2000/microservices-platform/1158135 diff --git a/zlt-demo/resources-server-demo/pom.xml b/zlt-demo/resources-server-demo/pom.xml new file mode 100644 index 00000000..008864a1 --- /dev/null +++ b/zlt-demo/resources-server-demo/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.zlt + zlt-demo + 5.3.0 + + resources-server-demo + + + + com.zlt + zlt-config + + + com.zlt + zlt-auth-client-spring-boot-starter + + + com.zlt + zlt-redis-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + com.baomidou + mybatis-plus-extension + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/zlt-demo/resources-server-demo/src/main/java/org/zlt/ResourcesServerApp.java b/zlt-demo/resources-server-demo/src/main/java/org/zlt/ResourcesServerApp.java new file mode 100644 index 00000000..58306000 --- /dev/null +++ b/zlt-demo/resources-server-demo/src/main/java/org/zlt/ResourcesServerApp.java @@ -0,0 +1,18 @@ +package org.zlt; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author zlt + * @date 2022/6/25 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +@SpringBootApplication +public class ResourcesServerApp { + public static void main(String[] args) { + SpringApplication.run(ResourcesServerApp.class, args); + } +} diff --git a/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/MyResourceConfig.java b/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/MyResourceConfig.java new file mode 100644 index 00000000..06582143 --- /dev/null +++ b/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/MyResourceConfig.java @@ -0,0 +1,20 @@ +package org.zlt.config; + +import com.central.oauth2.common.config.DefaultResourceServerConf; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; + +/** + * security资源服务器配置 + * + * @author zlt + * @version 1.0 + * @date 2022/6/25 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +@Configuration +@EnableResourceServer +public class MyResourceConfig extends DefaultResourceServerConf { +} diff --git a/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/WebMvcConfig.java b/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/WebMvcConfig.java new file mode 100644 index 00000000..f2d06702 --- /dev/null +++ b/zlt-demo/resources-server-demo/src/main/java/org/zlt/config/WebMvcConfig.java @@ -0,0 +1,18 @@ +package org.zlt.config; + +import com.central.common.config.DefaultWebMvcConfig; +import org.springframework.context.annotation.Configuration; + +/** + * web服务器配置 + * + * @author zlt + * @version 1.0 + * @date 2022/6/25 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +@Configuration +public class WebMvcConfig extends DefaultWebMvcConfig { +} diff --git a/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java b/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java new file mode 100644 index 00000000..8d357018 --- /dev/null +++ b/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java @@ -0,0 +1,28 @@ +package org.zlt.controller; + +import com.central.common.annotation.LoginUser; +import com.central.common.model.SysUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author zlt + * @date 2022/6/25 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +@Slf4j +@RestController +public class TestController { + @GetMapping("/test/auth") + public String auth(@LoginUser SysUser user) { + return "auth：" + user.getUsername(); + } + + @GetMapping("/test/notAuth") + public String notAuth() { + return "notAuth：ok"; + } +} diff --git a/zlt-demo/resources-server-demo/src/main/resources/bootstrap.yml b/zlt-demo/resources-server-demo/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..cd2bc3d3 --- /dev/null +++ b/zlt-demo/resources-server-demo/src/main/resources/bootstrap.yml @@ -0,0 +1,14 @@ +server: + port: 8093 + +spring: + application: + name: zlt-resources-server + main: + allow-bean-definition-overriding: true + +zlt: + security: + ignore: + httpUrls: > + /test/notAuth \ No newline at end of file -- Gitee From bbdfdf3d4ad07364ed1aa6c474d0c64baefefae1 Mon Sep 17 00:00:00 2001 From: zhult13 Date: Sun, 26 Jun 2022 23:14:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0LoginUserContextHolder?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../central/oauth2/common/util/AuthUtils.java | 4 +- .../context/LoginUserContextHolder.java | 29 ++++++++ .../resolver/TokenArgumentResolver.java | 36 +--------- .../central/common/utils/LoginUserUtils.java | 69 +++++++++++++++++++ .../common/filter/LoginUserFilter.java | 40 +++++++++++ .../main/resources/META-INF/spring.factories | 3 +- zlt-demo/resources-server-demo/README.md | 9 +++ zlt-demo/resources-server-demo/pom.xml | 4 ++ .../org/zlt/controller/TestController.java | 12 ++++ 9 files changed, 168 insertions(+), 38 deletions(-) create mode 100644 zlt-commons/zlt-common-core/src/main/java/com/central/common/context/LoginUserContextHolder.java create mode 100644 zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/LoginUserUtils.java create mode 100644 zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/filter/LoginUserFilter.java diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java index 609e81c2..00d21775 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java @@ -15,9 +15,7 @@ import org.springframework.security.oauth2.provider.token.TokenStore; import javax.servlet.http.HttpServletRequest; import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.Enumeration; -import java.util.Map; +import java.util.*; /** * 认证授权相关工具类 diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/context/LoginUserContextHolder.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/context/LoginUserContextHolder.java new file mode 100644 index 00000000..64500e98 --- /dev/null +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/context/LoginUserContextHolder.java @@ -0,0 +1,29 @@ +package com.central.common.context; + +import com.alibaba.ttl.TransmittableThreadLocal; +import com.central.common.model.SysUser; + +/** + * 登录用户holder + * + * @author zlt + * @date 2022/6/26 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +public class LoginUserContextHolder { + private static final ThreadLocal CONTEXT = new TransmittableThreadLocal<>(); + + public static void setUser(SysUser user) { + CONTEXT.set(user); + } + + public static SysUser getUser() { + return CONTEXT.get(); + } + + public static void clear() { + CONTEXT.remove(); + } +} \ No newline at end of file diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java index 5d3024a1..d035c708 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/resolver/TokenArgumentResolver.java @@ -6,6 +6,7 @@ import com.central.common.constant.SecurityConstants; import com.central.common.feign.UserService; import com.central.common.model.SysRole; import com.central.common.model.SysUser; +import com.central.common.utils.LoginUserUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; import org.springframework.security.authentication.AnonymousAuthenticationToken; @@ -64,42 +65,9 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver { LoginUser loginUser = methodParameter.getParameterAnnotation(LoginUser.class); boolean isFull = loginUser.isFull(); HttpServletRequest request = nativeWebRequest.getNativeRequest(HttpServletRequest.class); - String userId = request.getHeader(SecurityConstants.USER_ID_HEADER); - String username = request.getHeader(SecurityConstants.USER_HEADER); - String roles = request.getHeader(SecurityConstants.ROLE_HEADER); //账号类型 String accountType = request.getHeader(SecurityConstants.ACCOUNT_TYPE_HEADER); - SysUser user = null; - if (StrUtil.isBlank(username)) { - log.warn("resolveArgument error username is empty"); - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) { - Object principal = authentication.getPrincipal(); - //客户端模式只返回一个clientId - if (principal instanceof SysUser) { - user = (SysUser)principal; - } - } - if (user == null) { - return null; - } - } else { - if (isFull) { - user = userService.selectByUsername(username); - } else { - user = new SysUser(); - user.setId(Long.valueOf(userId)); - user.setUsername(username); - } - List sysRoleList = new ArrayList<>(); - Arrays.stream(roles.split(",")).forEach(role -> { - SysRole sysRole = new SysRole(); - sysRole.setCode(role); - sysRoleList.add(sysRole); - }); - user.setRoles(sysRoleList); - } - return user; + return LoginUserUtils.getCurrentUser(request, isFull); } } diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/LoginUserUtils.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/LoginUserUtils.java new file mode 100644 index 00000000..3fdf1be4 --- /dev/null +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/utils/LoginUserUtils.java @@ -0,0 +1,69 @@ +package com.central.common.utils; + +import cn.hutool.core.util.StrUtil; +import com.central.common.constant.SecurityConstants; +import com.central.common.feign.UserService; +import com.central.common.model.SysRole; +import com.central.common.model.SysUser; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 获取当前登录人工具类 + * + * @author zlt + * @version 1.0 + * @date 2022/6/26 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +public class LoginUserUtils { + /** + * 获取当前登录人 + */ + public static SysUser getCurrentUser(HttpServletRequest request, boolean isFull) { + SysUser user = null; + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) { + Object principal = authentication.getPrincipal(); + //客户端模式只返回一个clientId + if (principal instanceof SysUser) { + user = (SysUser)principal; + } + } + if (user == null) { + String userId = request.getHeader(SecurityConstants.USER_ID_HEADER); + String username = request.getHeader(SecurityConstants.USER_HEADER); + String roles = request.getHeader(SecurityConstants.ROLE_HEADER); + + if (StrUtil.isAllNotBlank(username, userId)) { + if (isFull) { + UserService userService = SpringUtil.getBean(UserService.class); + user = userService.selectByUsername(username); + } else { + user = new SysUser(); + user.setId(Long.valueOf(userId)); + user.setUsername(username); + } + if (StrUtil.isNotBlank(roles)) { + List sysRoleList = new ArrayList<>(); + Arrays.stream(roles.split(",")).forEach(role -> { + SysRole sysRole = new SysRole(); + sysRole.setCode(role); + sysRoleList.add(sysRole); + }); + user.setRoles(sysRoleList); + } + } + } + return user; + } +} diff --git a/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/filter/LoginUserFilter.java b/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/filter/LoginUserFilter.java new file mode 100644 index 00000000..21c9a3eb --- /dev/null +++ b/zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/filter/LoginUserFilter.java @@ -0,0 +1,40 @@ +package com.central.common.filter; + +import com.central.common.context.LoginUserContextHolder; +import com.central.common.model.SysUser; +import com.central.common.utils.LoginUserUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.core.annotation.Order; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * 获取当前登录人过滤器 + * + * @author zlt + * @date 2022/6/26 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 + */ +@ConditionalOnClass(Filter.class) +@Order +public class LoginUserFilter extends OncePerRequestFilter { + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) throws IOException, ServletException { + try { + SysUser user = LoginUserUtils.getCurrentUser(request, false); + LoginUserContextHolder.setUser(user); + filterChain.doFilter(request, response); + } finally { + LoginUserContextHolder.clear(); + } + } +} diff --git a/zlt-commons/zlt-common-spring-boot-starter/src/main/resources/META-INF/spring.factories b/zlt-commons/zlt-common-spring-boot-starter/src/main/resources/META-INF/spring.factories index baf1f730..ffb5ffd9 100644 --- a/zlt-commons/zlt-common-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/zlt-commons/zlt-common-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.central.common.filter.TenantFilter \ No newline at end of file +com.central.common.filter.TenantFilter, \ +com.central.common.filter.LoginUserFilter \ No newline at end of file diff --git a/zlt-demo/resources-server-demo/README.md b/zlt-demo/resources-server-demo/README.md index 22c99efd..3abae7a9 100644 --- a/zlt-demo/resources-server-demo/README.md +++ b/zlt-demo/resources-server-demo/README.md @@ -20,10 +20,19 @@ http://localhost:8093/test/notAuth   ### 3.2. 测试接口二 +通过 @LoginUser 获取当前登录人 + http://localhost:8093/test/auth?access_token=xxx > - xxx 需替换为正确的 access_token > - 可以通过修改 `bootstrap.yml` 文件中的 `zlt.security.ignore.httpUrls` 参数添加排除校验的url。 +  +### 3.3. 测试接口三 +通过 LoginUserContextHolder 获取当前登录人 + +http://localhost:8093/test/auth2?access_token=xxx +> - xxx 需替换为正确的 access_token +   ## 四、获取access_token 可使用任意授权模式获取； diff --git a/zlt-demo/resources-server-demo/pom.xml b/zlt-demo/resources-server-demo/pom.xml index 008864a1..ffb4f8d5 100644 --- a/zlt-demo/resources-server-demo/pom.xml +++ b/zlt-demo/resources-server-demo/pom.xml @@ -15,6 +15,10 @@ com.zlt zlt-config + + com.zlt + zlt-common-spring-boot-starter + com.zlt zlt-auth-client-spring-boot-starter diff --git a/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java b/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java index 8d357018..5ea4eb6f 100644 --- a/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java +++ b/zlt-demo/resources-server-demo/src/main/java/org/zlt/controller/TestController.java @@ -1,6 +1,7 @@ package org.zlt.controller; import com.central.common.annotation.LoginUser; +import com.central.common.context.LoginUserContextHolder; import com.central.common.model.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -16,11 +17,22 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController public class TestController { + /** + * 通过 @LoginUser 获取当前登录人 + */ @GetMapping("/test/auth") public String auth(@LoginUser SysUser user) { return "auth：" + user.getUsername(); } + /** + * 通过 LoginUserContextHolder 获取当前登录人 + */ + @GetMapping("/test/auth2") + public String auth() { + return "auth2：" + LoginUserContextHolder.getUser().getUsername(); + } + @GetMapping("/test/notAuth") public String notAuth() { return "notAuth：ok"; -- Gitee From 4e62d08bbbfee33dbcdcc926ca43ffd845c2921e Mon Sep 17 00:00:00 2001 From: zhult13 Date: Thu, 30 Jun 2022 15:05:12 +0800 Subject: [PATCH 3/7] fix #I5DUGM --- zlt-config/src/main/resources/bootstrap.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zlt-config/src/main/resources/bootstrap.properties b/zlt-config/src/main/resources/bootstrap.properties index 5fe08308..639ab88d 100644 --- a/zlt-config/src/main/resources/bootstrap.properties +++ b/zlt-config/src/main/resources/bootstrap.properties @@ -7,8 +7,8 @@ spring.cloud.nacos.server-addr=192.168.28.130:8848 #spring.cloud.nacos.username=nacos #spring.cloud.nacos.password=nacos spring.cloud.nacos.config.file-extension=yml -spring.cloud.nacos.config.shared-dataids=common.yml -spring.cloud.nacos.config.refreshable-dataids=common.yml +spring.cloud.nacos.config.shared-configs[0].data-id=common.yml +spring.cloud.nacos.config.shared-configs[0].refresh=true ##### spring-boot-actuator配置 management.endpoints.web.exposure.include=* -- Gitee From 2a5a9444e13693cc437574bcc0f5c2417d70f8e6 Mon Sep 17 00:00:00 2001 From: zhult13 Date: Sun, 10 Jul 2022 11:19:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B02.5.1?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../error/CustomErrorWebFluxAutoConfiguration.java | 12 ++++++------ .../gateway/error/JsonErrorWebExceptionHandler.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d0004a8a..52dc2b74 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 8 2021.1 - 2.5.13 + 2.5.14 2020.0.5 4.4 2.0.1 diff --git a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/CustomErrorWebFluxAutoConfiguration.java b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/CustomErrorWebFluxAutoConfiguration.java index 830f33d8..174d70c0 100644 --- a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/CustomErrorWebFluxAutoConfiguration.java +++ b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/CustomErrorWebFluxAutoConfiguration.java @@ -4,8 +4,8 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.autoconfigure.web.ResourceProperties; import org.springframework.boot.autoconfigure.web.ServerProperties; +import org.springframework.boot.autoconfigure.web.WebProperties; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.reactive.error.ErrorAttributes; @@ -35,26 +35,26 @@ import java.util.List; @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnClass(WebFluxConfigurer.class) @AutoConfigureBefore(WebFluxAutoConfiguration.class) -@EnableConfigurationProperties({ServerProperties.class, ResourceProperties.class}) +@EnableConfigurationProperties({ServerProperties.class, WebProperties.class}) public class CustomErrorWebFluxAutoConfiguration { private final ServerProperties serverProperties; private final ApplicationContext applicationContext; - private final ResourceProperties resourceProperties; + private final WebProperties webProperties; private final List viewResolvers; private final ServerCodecConfigurer serverCodecConfigurer; public CustomErrorWebFluxAutoConfiguration(ServerProperties serverProperties, - ResourceProperties resourceProperties, + WebProperties webProperties, ObjectProvider> viewResolversProvider, ServerCodecConfigurer serverCodecConfigurer, ApplicationContext applicationContext) { this.serverProperties = serverProperties; this.applicationContext = applicationContext; - this.resourceProperties = resourceProperties; + this.webProperties = webProperties; this.viewResolvers = viewResolversProvider.getIfAvailable(Collections::emptyList); this.serverCodecConfigurer = serverCodecConfigurer; } @@ -64,7 +64,7 @@ public class CustomErrorWebFluxAutoConfiguration { public ErrorWebExceptionHandler errorWebExceptionHandler(ErrorAttributes errorAttributes) { JsonErrorWebExceptionHandler exceptionHandler = new JsonErrorWebExceptionHandler( errorAttributes, - this.resourceProperties, + this.webProperties.getResources(), this.serverProperties.getError(), this.applicationContext); exceptionHandler.setViewResolvers(this.viewResolvers); diff --git a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java index 6cd1101f..93814e37 100644 --- a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java +++ b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java @@ -1,7 +1,7 @@ package com.central.gateway.error; import org.springframework.boot.autoconfigure.web.ErrorProperties; -import org.springframework.boot.autoconfigure.web.ResourceProperties; +import org.springframework.boot.autoconfigure.web.WebProperties; import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWebExceptionHandler; import org.springframework.boot.web.error.ErrorAttributeOptions; import org.springframework.boot.web.reactive.error.ErrorAttributes; @@ -23,7 +23,7 @@ import java.util.Map; * Github: https://github.com/zlt2000 */ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandler { - public JsonErrorWebExceptionHandler(ErrorAttributes errorAttributes, ResourceProperties resourceProperties, + public JsonErrorWebExceptionHandler(ErrorAttributes errorAttributes, WebProperties.Resources resourceProperties, ErrorProperties errorProperties, ApplicationContext applicationContext) { super(errorAttributes, resourceProperties, errorProperties, applicationContext); } -- Gitee From 8cb3fbfcedcf900da60c1100674c04e40e3a0f8c Mon Sep 17 00:00:00 2001 From: zhult13 Date: Sun, 10 Jul 2022 12:33:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=20context=20=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../central/oauth2/common/util/AuthUtils.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java index 00d21775..2ed47e13 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/util/AuthUtils.java @@ -2,11 +2,14 @@ package com.central.oauth2.common.util; import com.central.common.constant.CommonConstant; import com.central.common.constant.SecurityConstants; +import com.central.common.context.LoginUserContextHolder; import com.central.common.model.SysUser; import com.central.common.utils.SpringUtil; import com.central.oauth2.common.token.CustomWebAuthenticationDetails; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException; @@ -22,6 +25,9 @@ import java.util.*; * * @author zlt * @date 2018/5/13 + *

+ * Blog: https://zlt2000.gitee.io + * Github: https://github.com/zlt2000 */ @Slf4j public class AuthUtils { @@ -71,12 +77,12 @@ public class AuthUtils { /** * 校验accessToken */ - public static void checkAccessToken(HttpServletRequest request) { + public static SysUser checkAccessToken(HttpServletRequest request) { String accessToken = extractToken(request); - checkAccessToken(accessToken); + return checkAccessToken(accessToken); } - public static void checkAccessToken(String accessTokenValue) { + public static SysUser checkAccessToken(String accessTokenValue) { TokenStore tokenStore = SpringUtil.getBean(TokenStore.class); OAuth2AccessToken accessToken = tokenStore.readAccessToken(accessTokenValue); if (accessToken == null || accessToken.getValue() == null) { @@ -89,6 +95,17 @@ public class AuthUtils { if (result == null) { throw new InvalidTokenException("Invalid access token: " + accessTokenValue); } + return setContext(result); + } + + /** + * 用户信息赋值 context 对象 + */ + public static SysUser setContext(Authentication authentication) { + SecurityContextHolder.getContext().setAuthentication(authentication); + SysUser user = getUser(authentication); + LoginUserContextHolder.setUser(user); + return user; } /** @@ -132,6 +149,21 @@ public class AuthUtils { return username; } + /** + * 获取登陆的用户对象 + */ + public static SysUser getUser(Authentication authentication) { + SysUser user = null; + if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) { + Object principal = authentication.getPrincipal(); + //客户端模式只返回一个clientId + if (principal instanceof SysUser) { + user = (SysUser)principal; + } + } + return user; + } + /** * 获取登陆的帐户类型 */ -- Gitee From 70ed1d38834abc1057e084a2dbc47c38fc7e8437 Mon Sep 17 00:00:00 2001 From: zhult13 Date: Sun, 10 Jul 2022 13:31:08 +0800 Subject: [PATCH 6/7] update to v5.4.0 --- pom.xml | 2 +- zlt-business/code-generator/pom.xml | 2 +- zlt-business/file-center/pom.xml | 2 +- zlt-business/pom.xml | 2 +- zlt-business/search-center/pom.xml | 2 +- zlt-business/search-center/search-client/pom.xml | 2 +- zlt-business/search-center/search-server/pom.xml | 2 +- zlt-business/user-center/pom.xml | 2 +- zlt-commons/pom.xml | 2 +- zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-common-core/pom.xml | 2 +- .../main/java/com/central/common/constant/CommonConstant.java | 2 +- zlt-commons/zlt-common-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-db-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-log-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-oss-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-redis-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-swagger2-spring-boot-starter/pom.xml | 2 +- zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml | 2 +- zlt-config/pom.xml | 2 +- zlt-demo/dubbo-demo/pom.xml | 2 +- zlt-demo/pom.xml | 2 +- zlt-demo/resources-server-demo/pom.xml | 2 +- zlt-demo/rocketmq-demo/pom.xml | 2 +- zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml | 2 +- zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml | 2 +- zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml | 2 +- zlt-demo/seata-demo/account-service/pom.xml | 2 +- zlt-demo/seata-demo/business-service/pom.xml | 2 +- zlt-demo/seata-demo/order-service/pom.xml | 2 +- zlt-demo/seata-demo/pom.xml | 2 +- zlt-demo/seata-demo/seata-common-starter/pom.xml | 2 +- zlt-demo/seata-demo/storage-service/pom.xml | 2 +- zlt-demo/sharding-jdbc-demo/pom.xml | 2 +- zlt-demo/sso-demo/oidc-sso/pom.xml | 2 +- zlt-demo/sso-demo/pom.xml | 2 +- zlt-demo/sso-demo/ss-sso/pom.xml | 2 +- zlt-demo/sso-demo/web-sso/pom.xml | 2 +- zlt-demo/txlcn-demo/pom.xml | 2 +- zlt-demo/txlcn-demo/txlcn-demo-common/pom.xml | 2 +- zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/pom.xml | 2 +- zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/pom.xml | 2 +- zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/pom.xml | 2 +- zlt-demo/websocket-demo/pom.xml | 2 +- zlt-gateway/pom.xml | 2 +- zlt-gateway/sc-gateway/pom.xml | 2 +- zlt-job/job-admin/pom.xml | 2 +- zlt-job/job-core/pom.xml | 2 +- zlt-job/job-executor-samples/pom.xml | 2 +- zlt-job/pom.xml | 2 +- zlt-monitor/log-center/pom.xml | 2 +- zlt-monitor/pom.xml | 2 +- zlt-monitor/sc-admin/pom.xml | 2 +- zlt-transaction/pom.xml | 2 +- zlt-transaction/txlcn-tm/pom.xml | 2 +- zlt-uaa/pom.xml | 2 +- zlt-web/back-web/pom.xml | 2 +- zlt-web/pom.xml | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) diff --git a/pom.xml b/pom.xml index 52dc2b74..cd9c7b6c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.zlt central-platform - 5.3.0 + 5.4.0 pom diff --git a/zlt-business/code-generator/pom.xml b/zlt-business/code-generator/pom.xml index a0bdc421..276283ad 100644 --- a/zlt-business/code-generator/pom.xml +++ b/zlt-business/code-generator/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-business - 5.3.0 + 5.4.0 code-generator diff --git a/zlt-business/file-center/pom.xml b/zlt-business/file-center/pom.xml index 351485ff..38a2e06f 100644 --- a/zlt-business/file-center/pom.xml +++ b/zlt-business/file-center/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-business - 5.3.0 + 5.4.0 file-center 文件中心 diff --git a/zlt-business/pom.xml b/zlt-business/pom.xml index dffd738b..a5ec9e4f 100644 --- a/zlt-business/pom.xml +++ b/zlt-business/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-business 业务中心 diff --git a/zlt-business/search-center/pom.xml b/zlt-business/search-center/pom.xml index ea8eb12f..6a62964c 100644 --- a/zlt-business/search-center/pom.xml +++ b/zlt-business/search-center/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-business - 5.3.0 + 5.4.0 search-center 搜索中心 diff --git a/zlt-business/search-center/search-client/pom.xml b/zlt-business/search-center/search-client/pom.xml index 9ede2871..30188b40 100644 --- a/zlt-business/search-center/search-client/pom.xml +++ b/zlt-business/search-center/search-client/pom.xml @@ -4,7 +4,7 @@ com.zlt search-center - 5.3.0 + 5.4.0 search-client 搜索中心客户端 diff --git a/zlt-business/search-center/search-server/pom.xml b/zlt-business/search-center/search-server/pom.xml index a971e9c6..8a2330d7 100644 --- a/zlt-business/search-center/search-server/pom.xml +++ b/zlt-business/search-center/search-server/pom.xml @@ -4,7 +4,7 @@ com.zlt search-center - 5.3.0 + 5.4.0 search-server 搜索中心服务端 diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml index 5a2bce6c..acbf12b1 100644 --- a/zlt-business/user-center/pom.xml +++ b/zlt-business/user-center/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-business - 5.3.0 + 5.4.0 user-center 用户中心 diff --git a/zlt-commons/pom.xml b/zlt-commons/pom.xml index cad68d5e..617efea0 100644 --- a/zlt-commons/pom.xml +++ b/zlt-commons/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-commons 通用组件 diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml b/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml index 7986d8b2..f6a3d8a4 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-common-core/pom.xml b/zlt-commons/zlt-common-core/pom.xml index 8d0c9467..55e6d540 100644 --- a/zlt-commons/zlt-common-core/pom.xml +++ b/zlt-commons/zlt-common-core/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 zlt-common-core 公共通用组件 diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java index c2d97a8b..e5a83b24 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java @@ -10,7 +10,7 @@ public interface CommonConstant { /** * 项目版本号(banner使用) */ - String PROJECT_VERSION = "5.3.0"; + String PROJECT_VERSION = "5.4.0"; /** * token请求头名称 diff --git a/zlt-commons/zlt-common-spring-boot-starter/pom.xml b/zlt-commons/zlt-common-spring-boot-starter/pom.xml index f948cf19..c327e8d9 100644 --- a/zlt-commons/zlt-common-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-common-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 zlt-common-spring-boot-starter 公共通用组件 diff --git a/zlt-commons/zlt-db-spring-boot-starter/pom.xml b/zlt-commons/zlt-db-spring-boot-starter/pom.xml index cc8201b0..f4dd384c 100644 --- a/zlt-commons/zlt-db-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-db-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml b/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml index 4d2bce09..97cea36f 100644 --- a/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml b/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml index 8336ea38..ae21c49f 100644 --- a/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-log-spring-boot-starter/pom.xml b/zlt-commons/zlt-log-spring-boot-starter/pom.xml index 6ba3e818..d7ad982a 100644 --- a/zlt-commons/zlt-log-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-log-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-oss-spring-boot-starter/pom.xml b/zlt-commons/zlt-oss-spring-boot-starter/pom.xml index 207c7709..5b909027 100644 --- a/zlt-commons/zlt-oss-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-oss-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-redis-spring-boot-starter/pom.xml b/zlt-commons/zlt-redis-spring-boot-starter/pom.xml index 29fa499f..7360b0b1 100644 --- a/zlt-commons/zlt-redis-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-redis-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml b/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml index 2370b915..ebe27115 100644 --- a/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-swagger2-spring-boot-starter/pom.xml b/zlt-commons/zlt-swagger2-spring-boot-starter/pom.xml index b699bc74..9e6471bb 100644 --- a/zlt-commons/zlt-swagger2-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-swagger2-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml b/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml index 601b894a..776ac56a 100644 --- a/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt zlt-commons - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-config/pom.xml b/zlt-config/pom.xml index bd4ed8a4..f6f7c460 100644 --- a/zlt-config/pom.xml +++ b/zlt-config/pom.xml @@ -5,7 +5,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 4.0.0 jar diff --git a/zlt-demo/dubbo-demo/pom.xml b/zlt-demo/dubbo-demo/pom.xml index 46ef12a8..3f5aa128 100644 --- a/zlt-demo/dubbo-demo/pom.xml +++ b/zlt-demo/dubbo-demo/pom.xml @@ -6,7 +6,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 dubbo-demo diff --git a/zlt-demo/pom.xml b/zlt-demo/pom.xml index b4cea10c..26595a2b 100644 --- a/zlt-demo/pom.xml +++ b/zlt-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-demo pom diff --git a/zlt-demo/resources-server-demo/pom.xml b/zlt-demo/resources-server-demo/pom.xml index ffb4f8d5..e8f420de 100644 --- a/zlt-demo/resources-server-demo/pom.xml +++ b/zlt-demo/resources-server-demo/pom.xml @@ -6,7 +6,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 resources-server-demo diff --git a/zlt-demo/rocketmq-demo/pom.xml b/zlt-demo/rocketmq-demo/pom.xml index 2fb80a0b..91a15231 100644 --- a/zlt-demo/rocketmq-demo/pom.xml +++ b/zlt-demo/rocketmq-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 rocketmq-demo pom diff --git a/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml index ee15dd55..afddb73e 100644 --- a/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml +++ b/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml @@ -4,7 +4,7 @@ com.zlt rocketmq-demo - 5.3.0 + 5.4.0 rocketmq-consume rocketMQ消费者demo diff --git a/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml index 2201711e..2bccffc4 100644 --- a/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml +++ b/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml @@ -4,7 +4,7 @@ com.zlt rocketmq-demo - 5.3.0 + 5.4.0 rocketmq-produce rocketMQ生产者demo diff --git a/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml index 0973e0e9..2fd9aa7a 100644 --- a/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml +++ b/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml @@ -4,7 +4,7 @@ com.zlt rocketmq-demo - 5.3.0 + 5.4.0 rocketmq-transactional rocketMQ事务消息demo diff --git a/zlt-demo/seata-demo/account-service/pom.xml b/zlt-demo/seata-demo/account-service/pom.xml index 4c5f4143..5daa83ea 100644 --- a/zlt-demo/seata-demo/account-service/pom.xml +++ b/zlt-demo/seata-demo/account-service/pom.xml @@ -5,7 +5,7 @@ com.zlt seata-demo - 5.3.0 + 5.4.0 account-service diff --git a/zlt-demo/seata-demo/business-service/pom.xml b/zlt-demo/seata-demo/business-service/pom.xml index a29e3f52..39aff9c1 100644 --- a/zlt-demo/seata-demo/business-service/pom.xml +++ b/zlt-demo/seata-demo/business-service/pom.xml @@ -5,7 +5,7 @@ com.zlt seata-demo - 5.3.0 + 5.4.0 business-service diff --git a/zlt-demo/seata-demo/order-service/pom.xml b/zlt-demo/seata-demo/order-service/pom.xml index 230e9cba..da9d834b 100644 --- a/zlt-demo/seata-demo/order-service/pom.xml +++ b/zlt-demo/seata-demo/order-service/pom.xml @@ -5,7 +5,7 @@ com.zlt seata-demo - 5.3.0 + 5.4.0 order-service diff --git a/zlt-demo/seata-demo/pom.xml b/zlt-demo/seata-demo/pom.xml index 0a9ced3a..dcf2c700 100644 --- a/zlt-demo/seata-demo/pom.xml +++ b/zlt-demo/seata-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 seata-demo seata分布式事务demo diff --git a/zlt-demo/seata-demo/seata-common-starter/pom.xml b/zlt-demo/seata-demo/seata-common-starter/pom.xml index 0a82b22d..390556fa 100644 --- a/zlt-demo/seata-demo/seata-common-starter/pom.xml +++ b/zlt-demo/seata-demo/seata-common-starter/pom.xml @@ -5,7 +5,7 @@ com.zlt seata-demo - 5.3.0 + 5.4.0 seata-common-starter diff --git a/zlt-demo/seata-demo/storage-service/pom.xml b/zlt-demo/seata-demo/storage-service/pom.xml index 2a524d5c..03675083 100644 --- a/zlt-demo/seata-demo/storage-service/pom.xml +++ b/zlt-demo/seata-demo/storage-service/pom.xml @@ -5,7 +5,7 @@ com.zlt seata-demo - 5.3.0 + 5.4.0 storage-service diff --git a/zlt-demo/sharding-jdbc-demo/pom.xml b/zlt-demo/sharding-jdbc-demo/pom.xml index f5781259..88cdc985 100644 --- a/zlt-demo/sharding-jdbc-demo/pom.xml +++ b/zlt-demo/sharding-jdbc-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 sharding-jdbc-demo sharding-jdbc分库分表demo diff --git a/zlt-demo/sso-demo/oidc-sso/pom.xml b/zlt-demo/sso-demo/oidc-sso/pom.xml index fd756698..84d2665a 100644 --- a/zlt-demo/sso-demo/oidc-sso/pom.xml +++ b/zlt-demo/sso-demo/oidc-sso/pom.xml @@ -4,7 +4,7 @@ com.zlt sso-demo - 5.3.0 + 5.4.0 oidc-sso OIDC协议单点登录demo diff --git a/zlt-demo/sso-demo/pom.xml b/zlt-demo/sso-demo/pom.xml index b2e0bdb0..de8b07ce 100644 --- a/zlt-demo/sso-demo/pom.xml +++ b/zlt-demo/sso-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 sso-demo pom diff --git a/zlt-demo/sso-demo/ss-sso/pom.xml b/zlt-demo/sso-demo/ss-sso/pom.xml index bdf85770..ab6584ac 100644 --- a/zlt-demo/sso-demo/ss-sso/pom.xml +++ b/zlt-demo/sso-demo/ss-sso/pom.xml @@ -4,7 +4,7 @@ com.zlt sso-demo - 5.3.0 + 5.4.0 ss-sso springSecurity单点登录demo diff --git a/zlt-demo/sso-demo/web-sso/pom.xml b/zlt-demo/sso-demo/web-sso/pom.xml index d1a1984f..b6be2dc2 100644 --- a/zlt-demo/sso-demo/web-sso/pom.xml +++ b/zlt-demo/sso-demo/web-sso/pom.xml @@ -4,7 +4,7 @@ com.zlt sso-demo - 5.3.0 + 5.4.0 web-sso 前后端分离单点登录demo diff --git a/zlt-demo/txlcn-demo/pom.xml b/zlt-demo/txlcn-demo/pom.xml index 0ce4dae3..5f111095 100644 --- a/zlt-demo/txlcn-demo/pom.xml +++ b/zlt-demo/txlcn-demo/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 txlcn-demo txlcn分布式事务demo diff --git a/zlt-demo/txlcn-demo/txlcn-demo-common/pom.xml b/zlt-demo/txlcn-demo/txlcn-demo-common/pom.xml index 72ac8d04..06594420 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-common/pom.xml +++ b/zlt-demo/txlcn-demo/txlcn-demo-common/pom.xml @@ -4,7 +4,7 @@ com.zlt txlcn-demo - 5.3.0 + 5.4.0 txlcn-demo-common demo-common diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/pom.xml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/pom.xml index bff2f2d7..2f15e2ab 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/pom.xml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/pom.xml @@ -3,7 +3,7 @@ com.zlt txlcn-demo - 5.3.0 + 5.4.0 4.0.0 diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/pom.xml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/pom.xml index 8877bd4e..86dca534 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/pom.xml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/pom.xml @@ -3,7 +3,7 @@ com.zlt txlcn-demo - 5.3.0 + 5.4.0 4.0.0 txlcn-demo-spring-service-b diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/pom.xml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/pom.xml index ee7f3671..9c6690e6 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/pom.xml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/pom.xml @@ -3,7 +3,7 @@ com.zlt txlcn-demo - 5.3.0 + 5.4.0 4.0.0 txlcn-demo-spring-service-c diff --git a/zlt-demo/websocket-demo/pom.xml b/zlt-demo/websocket-demo/pom.xml index ee322a0b..2644e330 100644 --- a/zlt-demo/websocket-demo/pom.xml +++ b/zlt-demo/websocket-demo/pom.xml @@ -6,7 +6,7 @@ com.zlt zlt-demo - 5.3.0 + 5.4.0 websocket-demo diff --git a/zlt-gateway/pom.xml b/zlt-gateway/pom.xml index e58ce502..e34d5a20 100644 --- a/zlt-gateway/pom.xml +++ b/zlt-gateway/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-gateway pom diff --git a/zlt-gateway/sc-gateway/pom.xml b/zlt-gateway/sc-gateway/pom.xml index d15fdfd7..8d28f24e 100644 --- a/zlt-gateway/sc-gateway/pom.xml +++ b/zlt-gateway/sc-gateway/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-gateway - 5.3.0 + 5.4.0 sc-gateway spring cloud gateway网关 diff --git a/zlt-job/job-admin/pom.xml b/zlt-job/job-admin/pom.xml index 102da016..ae520d5a 100644 --- a/zlt-job/job-admin/pom.xml +++ b/zlt-job/job-admin/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-job - 5.3.0 + 5.4.0 job-admin jar diff --git a/zlt-job/job-core/pom.xml b/zlt-job/job-core/pom.xml index 7a279d19..e97b0bf2 100644 --- a/zlt-job/job-core/pom.xml +++ b/zlt-job/job-core/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-job - 5.3.0 + 5.4.0 job-core jar diff --git a/zlt-job/job-executor-samples/pom.xml b/zlt-job/job-executor-samples/pom.xml index 2a31f63c..b0a91ce9 100644 --- a/zlt-job/job-executor-samples/pom.xml +++ b/zlt-job/job-executor-samples/pom.xml @@ -6,7 +6,7 @@ com.zlt zlt-job - 5.3.0 + 5.4.0 job-executor-samples jar diff --git a/zlt-job/pom.xml b/zlt-job/pom.xml index 60747d33..06202f4c 100644 --- a/zlt-job/pom.xml +++ b/zlt-job/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-job pom diff --git a/zlt-monitor/log-center/pom.xml b/zlt-monitor/log-center/pom.xml index 87e0bb0c..8f5ae3fb 100644 --- a/zlt-monitor/log-center/pom.xml +++ b/zlt-monitor/log-center/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-monitor - 5.3.0 + 5.4.0 log-center diff --git a/zlt-monitor/pom.xml b/zlt-monitor/pom.xml index 724bb280..b98b8f49 100644 --- a/zlt-monitor/pom.xml +++ b/zlt-monitor/pom.xml @@ -3,7 +3,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-monitor pom diff --git a/zlt-monitor/sc-admin/pom.xml b/zlt-monitor/sc-admin/pom.xml index e544528b..707ed0b3 100644 --- a/zlt-monitor/sc-admin/pom.xml +++ b/zlt-monitor/sc-admin/pom.xml @@ -4,7 +4,7 @@ com.zlt zlt-monitor - 5.3.0 + 5.4.0 sc-admin diff --git a/zlt-transaction/pom.xml b/zlt-transaction/pom.xml index 9e0140b2..fad9d2d4 100644 --- a/zlt-transaction/pom.xml +++ b/zlt-transaction/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-transaction 事务 diff --git a/zlt-transaction/txlcn-tm/pom.xml b/zlt-transaction/txlcn-tm/pom.xml index 405b7c43..6f36da1f 100644 --- a/zlt-transaction/txlcn-tm/pom.xml +++ b/zlt-transaction/txlcn-tm/pom.xml @@ -3,7 +3,7 @@ com.zlt zlt-transaction - 5.3.0 + 5.4.0 4.0.0 txlcn-tm diff --git a/zlt-uaa/pom.xml b/zlt-uaa/pom.xml index fe987f50..10c2c963 100644 --- a/zlt-uaa/pom.xml +++ b/zlt-uaa/pom.xml @@ -4,7 +4,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-uaa 认证中心 diff --git a/zlt-web/back-web/pom.xml b/zlt-web/back-web/pom.xml index d18a4eaf..e30a22c3 100644 --- a/zlt-web/back-web/pom.xml +++ b/zlt-web/back-web/pom.xml @@ -6,7 +6,7 @@ com.zlt zlt-web - 5.3.0 + 5.4.0 back-web 后台管理前端 diff --git a/zlt-web/pom.xml b/zlt-web/pom.xml index 1ea73fdd..34169a1c 100644 --- a/zlt-web/pom.xml +++ b/zlt-web/pom.xml @@ -6,7 +6,7 @@ com.zlt central-platform - 5.3.0 + 5.4.0 zlt-web 前端 -- Gitee From 4eed9279111c0f512917587bac3ecdf1bf4b52ea Mon Sep 17 00:00:00 2001 From: zhult13 Date: Mon, 11 Jul 2022 06:59:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32fd4c39..3d1d61d8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # zlt-microservices-platform

- Downloads - Downloads + Downloads + Downloads Downloads Downloads Downloads -- Gitee