supprot extra

1.5.2

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-id-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyLoginFilter.java

@@ -8,6 +8,7 @@
 import com.codingapi.springboot.security.dto.response.LoginResponse;
 import com.codingapi.springboot.security.jwt.Jwt;
 import com.codingapi.springboot.security.jwt.Token;
+import com.codingapi.springboot.security.jwt.TokenContext;
 import com.codingapi.springboot.security.properties.SecurityJwtProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -71,7 +72,9 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
         User user = (User) authResult.getPrincipal();
         LoginRequest loginRequest = LoginRequestContext.getInstance().get();
 
-        Token token = jwt.create(user.getUsername(), loginRequest.getPassword(), user.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()));
+        Token token = jwt.create(user.getUsername(), loginRequest.getPassword(),
+                user.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()),
+                TokenContext.getExtra());
 
         LoginResponse login = new LoginResponse();
         login.setUsername(user.getUsername());

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/jwt/Token.java

@@ -79,6 +79,7 @@ public UsernamePasswordAuthenticationToken getAuthenticationToken() {
         for (String authority : authorities) {
             simpleGrantedAuthorities.add(new SimpleGrantedAuthority(authority));
         }
+        TokenContext.pushExtra(extra);
         return new UsernamePasswordAuthenticationToken(this, iv, simpleGrantedAuthorities);
     }
 

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/jwt/TokenContext.java

@@ -4,10 +4,20 @@
 
 public class TokenContext {
 
+    private static final ThreadLocal<String> threadLocal = new ThreadLocal<>();
+
     private TokenContext() {
     }
 
     public static Token current() {
         return (Token) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
     }
+
+    public static void pushExtra(String extra){
+        threadLocal.set(extra);
+    }
+
+    public static String getExtra(){
+        return threadLocal.get();
+    }
 }

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
     <artifactId>springboot-starter</artifactId>