新增 SaOAuth2DataResolver 数据解析器，负责 Web 交互层面的数据进出

sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java

@@ -1,17 +1,15 @@
 package com.pj.oauth2;
 
-import javax.servlet.http.HttpServletRequest;
-
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.ejlchina.okhttps.OkHttps;
+import com.pj.utils.SoMap;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.ejlchina.okhttps.OkHttps;
-import com.pj.utils.SoMap;
-
-import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Sa-OAuth2 Client端 控制器 
@@ -21,9 +19,9 @@ import cn.dev33.satoken.util.SaResult;
 public class SaOAuthClientController {
 
 	// 相关参数配置 
-	private String clientId = "1001";								// 应用id 
-	private String clientSecret = "aaaa-bbbb-cccc-dddd-eeee";		// 应用秘钥 
-	private String serverUrl = "http://sa-oauth-server.com:8001";	// 服务端接口 
+	private final String clientId = "1001";								// 应用id
+	private final String clientSecret = "aaaa-bbbb-cccc-dddd-eeee";		// 应用秘钥
+	private final String serverUrl = "http://sa-oauth-server.com:8001";	// 服务端接口
 	
 	// 进入首页 
 	@RequestMapping("/")
@@ -52,14 +50,13 @@ public class SaOAuthClientController {
 			return SaResult.error(so.getString("msg"));
 		}
 
-		// 根据openid获取其对应的userId  
-		SoMap data = so.getMap("data");
-		long uid = getUserIdByOpenid(data.getString("openid"));
-		data.set("uid", uid);
+		// 根据openid获取其对应的userId
+		long uid = getUserIdByOpenid(so.getString("openid"));
+		so.set("uid", uid);
 		
 		// 返回相关参数 
 		StpUtil.login(uid);
-		return SaResult.data(data);
+		return SaResult.data(so);
 	}
 	
 	// 根据 Refresh-Token 去刷新 Access-Token 
@@ -82,9 +79,8 @@ public class SaOAuthClientController {
 			return SaResult.error(so.getString("msg"));
 		}
 
-		// 返回相关参数 (data=新的Access-Token )
-		SoMap data = so.getMap("data");
-		return SaResult.data(data);
+		// 返回相关参数
+		return SaResult.data(so);
 	}
 	
 	// 模式三：密码式-授权登录
@@ -108,14 +104,13 @@ public class SaOAuthClientController {
 			return SaResult.error(so.getString("msg"));
 		}
 
-		// 根据openid获取其对应的userId  
-		SoMap data = so.getMap("data");
-		long uid = getUserIdByOpenid(data.getString("openid"));
-		data.set("uid", uid);
+		// 根据openid获取其对应的userId
+		long uid = getUserIdByOpenid(so.getString("openid"));
+		so.set("uid", uid);
 		
 		// 返回相关参数 
 		StpUtil.login(uid);
-		return SaResult.data(data);
+		return SaResult.data(so);
 	}
 	
 	// 模式四：获取应用的 Client-Token 
@@ -137,9 +132,8 @@ public class SaOAuthClientController {
 			return SaResult.error(so.getString("msg"));
 		}
 
-		// 返回相关参数 (data=新的Client-Token ) 
-		SoMap data = so.getMap("data");
-		return SaResult.data(data);
+		// 返回相关参数
+		return SaResult.data(so);
 	}
 	
 	// 注销登录 
@@ -166,9 +160,8 @@ public class SaOAuthClientController {
 			return SaResult.error(so.getString("msg"));
 		}
 
-		// 返回相关参数 (data=获取到的资源 ) 
-		SoMap data = so.getMap("data");
-		return SaResult.data(data);
+		// 返回相关参数 (data=获取到的资源 )
+		return SaResult.data(so);
 	}
 	
 	// 全局异常拦截 

sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml

@@ -58,7 +58,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
-		
+
 		<!-- 热刷新 -->
 		<!--<dependency>
 			<groupId>org.springframework.boot</groupId>

sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2DataLoaderImpl.java

@@ -1,6 +1,6 @@
 package com.pj.oauth2;
 
-import cn.dev33.satoken.oauth2.dataloader.SaOAuth2DataLoader;
+import cn.dev33.satoken.oauth2.data.loader.SaOAuth2DataLoader;
 import cn.dev33.satoken.oauth2.model.SaClientModel;
 import org.springframework.stereotype.Component;
 

sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java

@@ -80,12 +80,13 @@ public class SaOAuth2ServerController {
 		
 		// 模拟账号信息 （真实环境需要查询数据库获取信息）
 		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		map.put("userId", "10008");
 		map.put("nickname", "shengzhang_");
 		map.put("avatar", "http://xxx.com/1.jpg");
 		map.put("age", "18");
 		map.put("sex", "男");
 		map.put("address", "山东省 青岛市 城阳区");
-		return SaResult.data(map);
+		return SaResult.ok().setMap(map);
 	}
 	
 }