Rest Api for Orgs and Users

Rest Api for Orgs and Users
This commit is contained in:
shimingxy
2020-06-25 10:13:00 +08:00
parent 670b2376a0
commit e2071a291c
20 changed files with 537 additions and 57 deletions

View File

@@ -3,7 +3,6 @@ package org.maxkey.autoconfigure;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import org.maxkey.constants.ConstantsProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,6 +133,8 @@ public class MvcAutoConfiguration implements InitializingBean {
marshallingHttpMessageConverter.setUnmarshaller(jaxb2Marshaller);
ArrayList<MediaType> mediaTypesList = new ArrayList<MediaType>();
mediaTypesList.add(MediaType.APPLICATION_XML);
mediaTypesList.add(MediaType.TEXT_XML);
mediaTypesList.add(MediaType.TEXT_PLAIN);
marshallingHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
return marshallingHttpMessageConverter;
}
@@ -148,6 +149,7 @@ public class MvcAutoConfiguration implements InitializingBean {
new MappingJackson2HttpMessageConverter();
ArrayList<MediaType> mediaTypesList = new ArrayList<MediaType>();
mediaTypesList.add(MediaType.APPLICATION_JSON);
mediaTypesList.add(MediaType.TEXT_PLAIN);
mappingJacksonHttpMessageConverter.setSupportedMediaTypes(mediaTypesList);
return mappingJacksonHttpMessageConverter;
}
@@ -173,14 +175,14 @@ public class MvcAutoConfiguration implements InitializingBean {
MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter,
MarshallingHttpMessageConverter marshallingHttpMessageConverter,
StringHttpMessageConverter stringHttpMessageConverter) {
RequestMappingHandlerAdapter requestMappingHandlerAdapter =
new RequestMappingHandlerAdapter();
List<HttpMessageConverter<?>> httpMessageConverterList =
new ArrayList<HttpMessageConverter<?>>();
httpMessageConverterList.add(mappingJacksonHttpMessageConverter);
httpMessageConverterList.add(marshallingHttpMessageConverter);
httpMessageConverterList.add(stringHttpMessageConverter);
RequestMappingHandlerAdapter requestMappingHandlerAdapter =
new RequestMappingHandlerAdapter();
requestMappingHandlerAdapter.setMessageConverters(httpMessageConverterList);
return requestMappingHandlerAdapter;
}

View File

@@ -7,59 +7,55 @@ import org.maxkey.crypto.Base64Utils;
*
*/
public class AuthorizationHeaderUtils {
public static String AUTHORIZATION_HEADERNAME="Authorization";
public static String BASIC="Basic ";
public static String BEARER="Bearer ";
public static String createBasic( String username, String password ){
String authUserPass = username + ":" + password;
String encodedAuthUserPass = Base64Utils.encode(authUserPass );
return BASIC + encodedAuthUserPass;
}
public static final String AUTHORIZATION_HEADERNAME = "Authorization";
public static String [] resolveBasic( String basic ){
if(isBasic(basic)){
String[] userPass =basic.split(" ");
String decodeUserPass = Base64Utils.decode(userPass[1] );
return decodeUserPass.split(":");
}else{
return null;
}
}
public static boolean isBasic( String basic ){
if(basic.startsWith(BASIC )){
return true;
}else{
return false;
}
}
public static String resolveBearer( String bearer ){
if(isBearer(bearer)){
return bearer.split(" ")[1];
}else{
return null;
}
}
public static String createBearer(String bearer){
return BEARER +bearer;
}
public static final String BASIC = "Basic ";
public static boolean isBearer( String bearer ){
if(bearer.startsWith(BEARER )){
return true;
}else{
return false;
}
}
public static final String BEARER = "Bearer ";
public static String createBasic(String username, String password) {
String authUserPass = username + ":" + password;
String encodedAuthUserPass = Base64Utils.encode(authUserPass);
return BASIC + encodedAuthUserPass;
}
public static String[] resolveBasic(String basic) {
if (isBasic(basic)) {
String[] userPass = basic.split(" ");
String decodeUserPass = Base64Utils.decode(userPass[1]);
return decodeUserPass.split(":");
} else {
return null;
}
}
public static boolean isBasic(String basic) {
if (basic.startsWith(BASIC)) {
return true;
} else {
return false;
}
}
public static String resolveBearer(String bearer) {
if (isBearer(bearer)) {
return bearer.split(" ")[1];
} else {
return null;
}
}
public static String createBearer(String bearer) {
return BEARER + bearer;
}
public static boolean isBearer(String bearer) {
if (bearer.startsWith(BEARER)) {
return true;
} else {
return false;
}
}
}