LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0GA

Browse Source 
v2.0.0GA
This commit is contained in:
shimingxy
2020-07-04 09:43:15 +08:00
parent 585397b926
commit ca3d6e036b
26 changed files with 730 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
maxkey-core/src/main/java/org/maxkey/constants/ContentType.java Normal file
View File

@@ -0,0 +1,33 @@
package org.maxkey.constants;
public class ContentType {
public static final String TEXT_PLAIN = "text/plain";
public static final String TEXT_PLAIN_UTF8 = "text/plain;charset=UTF-8";
public static final String TEXT_XML = "text/xml";
public static final String TEXT_XML_UTF8 = "text/xml;charset=UTF-8";
public static final String APPLICATION_JSON = "application/json";
public static final String APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8";
public static final String APPLICATION_JWT = "application/jwt";
public static final String APPLICATION_JWT_UTF8 = "application/jwt;charset=UTF-8";
public static final String APPLICATION_XML = "application/xml";
public static final String APPLICATION_XML_UTF8 = "application/xml;charset=UTF-8";
public static final String IMAGE_GIF = "image/gif";
public static final String IMAGE_JPEG = "image/jpeg";
public static final String IMAGE_PNG = "image/png";
}

96
maxkey-core/src/main/java/org/maxkey/domain/Organizations.java
View File

@@ -1,18 +1,18 @@
package org.maxkey.domain;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
@Table(name = "ORGANIZATIONS")
public class Organizations extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 5085413816404119803L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@@ -24,15 +24,15 @@ public class Organizations extends JpaBaseDomain implements Serializable {
@Column
private String fullName;
@Column
private String pId;
private String parentId;
@Column
private String pName;
private String parentName;
@Column
private String type;
@Column
private String xPath;
private String codePath;
@Column
private String xNamePath;
private String namePath;
@Column
private String level;
@Column
@@ -60,15 +60,10 @@ public class Organizations extends JpaBaseDomain implements Serializable {
@Column
private String email;
@Column
private String sortOrder;
private String sortIndex;
@Column
private String description;
/**
*
*/
private static final long serialVersionUID = 5085413816404119803L;
public Organizations() {
// TODO Auto-generated constructor stub
}
@@ -105,20 +100,22 @@ public class Organizations extends JpaBaseDomain implements Serializable {
this.fullName = fullName;
}
public String getpId() {
return pId;
public String getParentId() {
return parentId;
}
public void setpId(String pId) {
this.pId = pId;
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getpName() {
return pName;
public String getParentName() {
return parentName;
}
public void setpName(String pName) {
this.pName = pName;
public void setParentName(String parentName) {
this.parentName = parentName;
}
public String getType() {
@@ -129,22 +126,6 @@ public class Organizations extends JpaBaseDomain implements Serializable {
this.type = type;
}
public String getxPath() {
return xPath;
}
public void setxPath(String xPath) {
this.xPath = xPath;
}
public String getxNamePath() {
return xNamePath;
}
public void setxNamePath(String xNamePath) {
this.xNamePath = xNamePath;
}
public String getLevel() {
return level;
}
@@ -265,14 +246,41 @@ public class Organizations extends JpaBaseDomain implements Serializable {
this.description = description;
}
@Override
public String toString() {
return "Organizations [id=" + id + ", code=" + code + ", name=" + name + ", fullName=" + fullName + ", pId="
+ pId + ", pName=" + pName + ", type=" + type + ", xPath=" + xPath + ", xNamePath=" + xNamePath
+ ", level=" + level + ", hasChild=" + hasChild + ", division=" + division + ", country=" + country
+ ", region=" + region + ", locality=" + locality + ", street=" + street + ", address=" + address
+ ", contact=" + contact + ", postalCode=" + postalCode + ", phone=" + phone + ", fax=" + fax
+ ", email=" + email + ", sortOrder=" + sortOrder + ", description=" + description + "]";
public String getCodePath() {
return codePath;
}
public void setCodePath(String codePath) {
this.codePath = codePath;
}
public String getNamePath() {
return namePath;
}
public void setNamePath(String namePath) {
this.namePath = namePath;
}
public String getSortIndex() {
return sortIndex;
}
public void setSortIndex(String sortIndex) {
this.sortIndex = sortIndex;
}
@Override
public String toString() {
return "Organizations [id=" + id + ", code=" + code + ", name=" + name + ", fullName=" + fullName
+ ", parentId=" + parentId + ", parentName=" + parentName + ", type=" + type + ", codePath=" + codePath
+ ", namePath=" + namePath + ", level=" + level + ", hasChild=" + hasChild + ", division=" + division
+ ", country=" + country + ", region=" + region + ", locality=" + locality + ", street=" + street
+ ", address=" + address + ", contact=" + contact + ", postalCode=" + postalCode + ", phone=" + phone
+ ", fax=" + fax + ", email=" + email + ", sortIndex=" + sortIndex + ", description=" + description
+ "]";
}
}

1079
maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java
View File

File diff suppressed because it is too large Load Diff

88
maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java
View File

@@ -6,55 +6,45 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@Table(name = "APPS_CAS_DETAILS")
@Table(name = "APPS_CAS_DETAILS")
public class AppsCasDetails extends Apps {
/**
*
*/
private static final long serialVersionUID = -4272290765948322084L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
private String id;
@Column
private String service;
@Column
private String validation;
/**
* @return the service
*/
public String getService() {
return service;
}
/**
* @param service the service to set
*/
public void setService(String service) {
this.service = service;
}
/**
* @return the validation
*/
public String getValidation() {
return validation;
}
/**
* @param validation the validation to set
*/
public void setValidation(String validation) {
this.validation = validation;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "CASDetails [service=" + service + ", validation=" + validation
+ "]";
}
/**
*
*/
private static final long serialVersionUID = -4272290765948322084L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
private String id;
@Column
private String service;
@Column
private String callbackUrl;
/**
* @return the service
*/
public String getService() {
return service;
}
/**
* @param service the service to set
*/
public void setService(String service) {
this.service = service;
}
public String getCallbackUrl() {
return callbackUrl;
}
public void setCallbackUrl(String callbackUrl) {
this.callbackUrl = callbackUrl;
}
}

14
maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java
View File

@@ -77,13 +77,13 @@ public class AppsSAML20Details extends Apps {
@Column
private int nameIdConvert;
public static class BINDINGTYPE {
public String Redirect_Post = "Redirect-Post";
public String Post_Post = "Post-Post";
public String IdpInit_Post = "IdpInit-Post";
public String Redirect_PostSimpleSign = "Redirect-PostSimpleSign";
public String Post_PostSimpleSign = "Post-PostSimpleSign";
public String IdpInit_PostSimpleSign = "IdpInit-PostSimpleSign";
public static final class BindingType {
public static final String Redirect_Post = "Redirect-Post";
public static final String Post_Post = "Post-Post";
public static final String IdpInit_Post = "IdpInit-Post";
public static final String Redirect_PostSimpleSign = "Redirect-PostSimpleSign";
public static final String Post_PostSimpleSign = "Post-PostSimpleSign";
public static final String IdpInit_PostSimpleSign = "IdpInit-PostSimpleSign";
}
/**

3
maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java
View File

@@ -10,6 +10,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.maxkey.configuration.ApplicationConfig;
import org.maxkey.constants.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +49,7 @@ public class AbstractImageEndpoint {
// Set standard HTTP/1.0 no-cache header.
response.setHeader("Pragma", "no-cache");
// return a jpeg/gif
response.setContentType("image/gif");
response.setContentType(ContentType.IMAGE_GIF);
_logger.trace("create the image");
// create the image
if (bufferedImage != null) {