From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/security/model/token/JwtTokenFactory.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
index 6db2228..226397e 100644
--- a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
@@ -30,7 +30,7 @@
@Autowired
public JwtTokenFactory(JwtSettings settings) {
- this.settings = settings;
+ this.settings = settings;;
}
/**
@@ -75,8 +75,7 @@
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
claims.put("mode",userContext.getMode());
-// claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
-
+ claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
String token = Jwts.builder()
.setClaims(claims)
.setIssuer(settings.getTokenIssuer())
--
Gitblit v1.8.0