template method 2 -> 1

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java

@@ -81,22 +81,17 @@ public class ContextInfo {
 	
 	private UserInfoMap userInfoMap;
 
-    /**
+	/**
-     * 模板方法1，从外部输入的request来构建自定义的ContextInfo
+	 * 模板方法，用来自定义ContextInfo。
-     * @param request
+	 * 
+     * @param httpRequest, 从外部输入的request
+     * @param userInfoMap pudge /user 这个auth api返回的所有的KV内容
      */
-	public void buildCustomInfoByRequest(HttpServletRequest request) {
+	public void buildCustomInfo(HttpServletRequest httpRequest, UserInfoMap infoMap) {
+		// TODO Auto-generated method stub
 		
 	}
-
+    
-	/**
-	 * 模板方法2，从内部pudge的返回值UserInfoMap来构建自定义的ContextInfo
-	 * 
-	 * @param userInfoMap pudge /user 这个auth api返回的所有的KV内容
-	 */
-    public void buildCustomInfoByUserInfoMap(UserInfoMap userInfoMap){
-    	this.userInfoMap = userInfoMap;
-    }
     
 	/**
 	 * 
@@ -156,4 +151,5 @@ public class ContextInfo {
 				.ipAddress(this.systemAndDeviceInfo.getIpAddress())
 				.build();
 	}
+
 }

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java

@@ -90,8 +90,7 @@ public class ContextInfoBuilderAspect {
 			buildContextInfoByRemoteAuthResponse(contextInfo, authResultJson);
 
 			// 定制一些信息的处理
-			contextInfo.buildCustomInfoByRequest(httpRequest);
+			contextInfo.buildCustomInfo(httpRequest, contextInfo.getUserInfoMap());
-			contextInfo.buildCustomInfoByUserInfoMap(contextInfo.getUserInfoMap());
 			
 			// 把ContextInfo放到ThreadLocal中
 			ContextInfoHolder.set(contextInfo);