Merge branch 'dev' of https://gitee.com/dromara/sa-token into dev

click33 · click33 · commit 4ee161031f57 · 2021-04-23T19:50:14.000+08:00
# Conflicts:
#	sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -45,8 +45,8 @@ public static boolean isExists(String sessionId) {
 	public static SaSession getSessionById(String sessionId, boolean isCreate) {
 		SaSession session = SaManager.getSaTokenDao().getSession(splicingSessionKey(sessionId));
 		if (session == null && isCreate) {
-			session = SaManager.getSaTokenAction().createSession(sessionId);
-			SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());
+			session = SaManager.getSaTokenAction().createSession(splicingSessionKey(sessionId));
+			SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());		
 		}
 		return session;
 	}

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public static boolean isExists(String sessionId) {`
`45`	`45`	`public static SaSession getSessionById(String sessionId, boolean isCreate) {`
`46`	`46`	`SaSession session = SaManager.getSaTokenDao().getSession(splicingSessionKey(sessionId));`
`47`	`47`	`if (session == null && isCreate) {`
`48`		`- session = SaManager.getSaTokenAction().createSession(sessionId);`
`49`		`- SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());`
	`48`	`+ session = SaManager.getSaTokenAction().createSession(splicingSessionKey(sessionId));`
	`49`	`+ SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());`
`50`	`50`	`}`
`51`	`51`	`return session;`
`52`	`52`	`}`