Merge remote-tracking branch 'origin/master-for-apisix' into master-for-apisix

# Conflicts:
#	axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/BuilderUserInfoAspect.java

auth-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java

@@ -1,11 +1,14 @@
 package cn.axzo.framework.auth.domain;
 
+import cn.hutool.json.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 
 @Data
@@ -55,4 +58,16 @@ public class UserInfo {
     private String appVersion;
     private String token;
     private String visitTo;
+
+    /**
+     * 使用http request 设置自定义字段
+     * @param request http请求
+     */
+    public void buildCustomField(HttpServletRequest request) {}
+
+    /**
+     * 使用用户信息map 设置自定义字段
+     * @param userInfo  用户信息
+     */
+    public void buildCustomField(Map userInfo) {}
 }

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/annotation/PreBuildUser.java

@@ -6,6 +6,5 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface PreBuildUser {
-    //todo  default
+    String value() default "";
-    String value();
 }