v2.0.0RC1

v2.0.0RC1
This commit is contained in:
shimingxy
2020-05-23 21:08:44 +08:00
parent bcbd926bbe
commit 1ad1db9846
14 changed files with 314 additions and 103 deletions

View File

@@ -18,7 +18,16 @@ public class BasicEntryPoint extends HandlerInterceptorAdapter {
boolean enable;
String []skipRequestURI={
public BasicEntryPoint() {
}
public BasicEntryPoint(boolean enable) {
super();
this.enable = enable;
}
String []skipRequestURI={
"/oauth/v20/token",
"/oauth/v10a/request_token",
"/oauth/v10a/access_token"

View File

@@ -23,6 +23,11 @@ public class HttpHeaderConfig {
public void setEnable(boolean enable) {
this.enable = enable;
}
public HttpHeaderConfig(String headerName, boolean enable) {
super();
this.headerName = headerName;
this.enable = enable;
}
}

View File

@@ -7,8 +7,6 @@ import org.maxkey.constants.ConstantsLoginType;
import org.maxkey.web.WebContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -17,8 +15,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
public class HttpHeaderEntryPoint extends HandlerInterceptorAdapter {
private static final Logger _logger = LoggerFactory.getLogger(HttpHeaderEntryPoint.class);
@Autowired
@Qualifier("httpHeaderSupport")
HttpHeaderConfig httpHeaderSupport;
String []skipRequestURI={
@@ -94,7 +91,16 @@ public class HttpHeaderEntryPoint extends HandlerInterceptorAdapter {
return true;
}
public void setHttpHeaderSupport(HttpHeaderConfig httpHeaderSupport) {
public HttpHeaderEntryPoint() {
super();
}
public HttpHeaderEntryPoint(HttpHeaderConfig httpHeaderSupport) {
super();
this.httpHeaderSupport = httpHeaderSupport;
}
public void setHttpHeaderSupport(HttpHeaderConfig httpHeaderSupport) {
this.httpHeaderSupport = httpHeaderSupport;
}

View File

@@ -87,6 +87,13 @@ public class SocialSignOnProvider {
public void setUserBind(boolean userBind) {
this.userBind = userBind;
}
@Override
public String toString() {
return "SocialSignOnProvider [provider=" + provider + ", providerName=" + providerName + ", icon=" + icon
+ ", clientId=" + clientId + ", clientSecret=" + clientSecret + ", accountId=" + accountId
+ ", sortOrder=" + sortOrder + ", userBind=" + userBind + "]";
}

View File

@@ -78,8 +78,9 @@ public class SocialSignOnProviderService{
return ((AuthUser)authResponse.getData()).getUuid();
}else if(provider.equalsIgnoreCase("DingTalk")) {
return ((AuthUser)authResponse.getData()).getUuid();
}else {
return ((AuthUser)authResponse.getData()).getUuid();
}
return null;
}
public List<SocialSignOnProvider> getSocialSignOnProviders() {
return socialSignOnProviders;