public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-15 13:02:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

splite

Browse Source
This commit is contained in:
shimingxy
2019-07-21 23:46:41 +08:00
parent b2d376f960
commit e677d567b7
1183 changed files with 666 additions and 105342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
View File

@@ -10,10 +10,11 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.maxkey.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @author Crystal.Sea
*

33
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java
View File

@@ -24,59 +24,43 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
*/
@SuppressWarnings("serial")
@org.codehaus.jackson.map.annotate.JsonSerialize(include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_DEFAULT)
@org.codehaus.jackson.annotate.JsonIgnoreProperties(ignoreUnknown = true)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT)
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true)
public class BaseClientDetails implements ClientDetails {
@org.codehaus.jackson.annotate.JsonProperty("client_id")
@com.fasterxml.jackson.annotation.JsonProperty("client_id")
private String clientId;
@org.codehaus.jackson.annotate.JsonProperty("client_secret")
@com.fasterxml.jackson.annotation.JsonProperty("client_secret")
private String clientSecret;
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private Set<String> scope = Collections.emptySet();
@org.codehaus.jackson.annotate.JsonProperty("resource_ids")
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.annotation.JsonProperty("resource_ids")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private Set<String> resourceIds = Collections.emptySet();
@org.codehaus.jackson.annotate.JsonProperty("authorized_grant_types")
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.annotation.JsonProperty("authorized_grant_types")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private Set<String> authorizedGrantTypes = Collections.emptySet();
@org.codehaus.jackson.annotate.JsonProperty("redirect_uri")
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.annotation.JsonProperty("redirect_uri")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private Set<String> registeredRedirectUris;
@org.codehaus.jackson.annotate.JsonProperty("autoapprove")
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.annotation.JsonProperty("autoapprove")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private Set<String> autoApproveScopes;
private List<GrantedAuthority> authorities = Collections.emptyList();
@org.codehaus.jackson.annotate.JsonProperty("access_token_validity")
@com.fasterxml.jackson.annotation.JsonProperty("access_token_validity")
private Integer accessTokenValiditySeconds;
@org.codehaus.jackson.annotate.JsonProperty("refresh_token_validity")
@com.fasterxml.jackson.annotation.JsonProperty("refresh_token_validity")
private Integer refreshTokenValiditySeconds;
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
private Map<String, Object> additionalInformation = new LinkedHashMap<String, Object>();
@@ -154,7 +138,6 @@ public class BaseClientDetails implements ClientDetails {
}
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public String getClientId() {
return clientId;
@@ -181,19 +164,16 @@ public class BaseClientDetails implements ClientDetails {
return false;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Set<String> getAutoApproveScopes() {
return autoApproveScopes;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public boolean isSecretRequired() {
return this.clientSecret != null;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public String getClientSecret() {
return clientSecret;
@@ -203,7 +183,6 @@ public class BaseClientDetails implements ClientDetails {
this.clientSecret = clientSecret;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public boolean isScoped() {
return this.scope != null && !this.scope.isEmpty();
@@ -218,7 +197,6 @@ public class BaseClientDetails implements ClientDetails {
: new LinkedHashSet<String>(scope);
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Set<String> getResourceIds() {
return resourceIds;
@@ -229,7 +207,6 @@ public class BaseClientDetails implements ClientDetails {
.<String> emptySet() : new LinkedHashSet<String>(resourceIds);
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Set<String> getAuthorizedGrantTypes() {
return authorizedGrantTypes;
@@ -240,7 +217,6 @@ public class BaseClientDetails implements ClientDetails {
authorizedGrantTypes);
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Set<String> getRegisteredRedirectUri() {
return registeredRedirectUris;
@@ -251,15 +227,12 @@ public class BaseClientDetails implements ClientDetails {
: new LinkedHashSet<String>(registeredRedirectUris);
}
@org.codehaus.jackson.annotate.JsonProperty("authorities")
@com.fasterxml.jackson.annotation.JsonProperty("authorities")
private List<String> getAuthoritiesAsStrings() {
return new ArrayList<String>(
AuthorityUtils.authorityListToSet(authorities));
}
@org.codehaus.jackson.annotate.JsonProperty("authorities")
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
@com.fasterxml.jackson.annotation.JsonProperty("authorities")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
private void setAuthoritiesAsStrings(Set<String> values) {
@@ -267,20 +240,17 @@ public class BaseClientDetails implements ClientDetails {
.toArray(new String[values.size()])));
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Collection<GrantedAuthority> getAuthorities() {
return authorities;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public void setAuthorities(
Collection<? extends GrantedAuthority> authorities) {
this.authorities = new ArrayList<GrantedAuthority>(authorities);
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Integer getAccessTokenValiditySeconds() {
return accessTokenValiditySeconds;
@@ -290,7 +260,6 @@ public class BaseClientDetails implements ClientDetails {
this.accessTokenValiditySeconds = accessTokenValiditySeconds;
}
@org.codehaus.jackson.annotate.JsonIgnore
@com.fasterxml.jackson.annotation.JsonIgnore
public Integer getRefreshTokenValiditySeconds() {
return refreshTokenValiditySeconds;
@@ -306,13 +275,11 @@ public class BaseClientDetails implements ClientDetails {
additionalInformation);
}
@org.codehaus.jackson.annotate.JsonAnyGetter
@com.fasterxml.jackson.annotation.JsonAnyGetter
public Map<String, Object> getAdditionalInformation() {
return Collections.unmodifiableMap(this.additionalInformation);
}
@org.codehaus.jackson.annotate.JsonAnySetter
@com.fasterxml.jackson.annotation.JsonAnySetter
public void addAdditionalInformation(String key, Object value) {
this.additionalInformation.put(key, value);

41
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/JacksonArrayOrStringDeserializer.java
View File

@@ -1,41 +0,0 @@
package org.maxkey.domain.apps.oauth2.provider.client;
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.JsonToken;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.deser.std.StdDeserializer;
import org.codehaus.jackson.map.type.SimpleType;
import org.codehaus.jackson.type.JavaType;
import org.codehaus.jackson.type.TypeReference;
import org.springframework.util.StringUtils;
public class JacksonArrayOrStringDeserializer extends StdDeserializer<Set<String>> {
public JacksonArrayOrStringDeserializer() {
super(Set.class);
}
@Override
public JavaType getValueType() {
return SimpleType.construct(String.class);
}
@Override
public Set<String> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException,
JsonProcessingException {
JsonToken token = jp.getCurrentToken();
if (token.isScalarValue()) {
String list = jp.getText();
list = list.replaceAll("\\s+", ",");
return new LinkedHashSet<String>(Arrays.asList(StringUtils.commaDelimitedListToStringArray(list)));
}
return jp.readValueAs(new TypeReference<Set<String>>() {
});
}
}

9
maxkey-core/src/main/java/org/maxkey/json/JsonDateSerializer.java
View File

@@ -3,12 +3,13 @@ package org.maxkey.json;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.JsonSerializer;
import org.codehaus.jackson.map.SerializerProvider;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
/**
* 日期json序列化格式
* @author Crystal.Sea

9
maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java
View File

@@ -5,12 +5,13 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
@Component
public class JsonDateTimeDeserializer extends JsonDeserializer<Date>{
private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

9
maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java
View File

@@ -3,12 +3,13 @@ package org.maxkey.json;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.JsonSerializer;
import org.codehaus.jackson.map.SerializerProvider;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
/**
* 日期时间json序列化格式
* @author Crystal.Sea

11
maxkey-core/src/main/java/org/maxkey/json/JsonISODateDeserializer.java
View File

@@ -12,17 +12,18 @@
*/
package org.maxkey.json;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
/**
* JSON deserializer for Jackson to handle regular date instances as timestamps in ISO format.
*

9
maxkey-core/src/main/java/org/maxkey/json/JsonISODateSerializer.java
View File

@@ -12,15 +12,16 @@
*/
package org.maxkey.json;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.JsonSerializer;
import org.codehaus.jackson.map.SerializerProvider;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
/**
* JSON serializer for Jackson to handle regular date instances as timestamps in ISO format.
*

6
maxkey-core/src/main/java/org/maxkey/pretty/impl/JsonPretty.java
View File

@@ -2,11 +2,11 @@ package org.maxkey.pretty.impl;
import java.io.IOException;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.maxkey.pretty.Pretty;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParser;

11
maxkey-core/src/main/java/org/maxkey/util/JsonUtils.java
View File

@@ -2,14 +2,11 @@ package org.maxkey.util;
import java.io.IOException;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParser;
public class JsonUtils {