diff --git a/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java index c73b0487a..ce9ccbf74 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -51,13 +51,13 @@ public abstract class AbstractAuthenticationRealm{ private static final String BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT = "UPDATE USERINFO SET BADPASSWORDCOUNT = ? , ISLOCKED = ? ,UNLOCKTIME = ? WHERE ID = ?"; - private static final String HISTORY_LOGIN_INSERT_STATEMENT = "INSERT INTO LOGIN_HISTORY (ID , SESSIONID , UID , USERNAME , DISPLAYNAME , LOGINTYPE , MESSAGE , CODE , PROVIDER , SOURCEIP , BROWSER , PLATFORM , APPLICATION , LOGINURL )VALUES( ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)"; + private static final String HISTORY_LOGIN_INSERT_STATEMENT = "INSERT INTO HISTORY_LOGIN (ID , SESSIONID , UID , USERNAME , DISPLAYNAME , LOGINTYPE , MESSAGE , CODE , PROVIDER , SOURCEIP , BROWSER , PLATFORM , APPLICATION , LOGINURL )VALUES( ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)"; private static final String LOGIN_USERINFO_UPDATE_STATEMENT = "UPDATE USERINFO SET LASTLOGINTIME = ? , LASTLOGINIP = ? , LOGINCOUNT = ?, ONLINE = "+UserInfo.ONLINE.ONLINE+" WHERE ID = ?"; private static final String LOGOUT_USERINFO_UPDATE_STATEMENT = "UPDATE USERINFO SET LASTLOGOFFTIME = ? , ONLINE = "+UserInfo.ONLINE.OFFLINE+" WHERE ID = ?"; - private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE LOGIN_HISTORY SET LOGOUTTIME = ? WHERE SESSIONID = ?"; + private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE HISTORY_LOGIN SET LOGOUTTIME = ? WHERE SESSIONID = ?"; private static final String GROUPS_SELECT_STATEMENT = "SELECT DISTINCT G.ID,G.NAME FROM USERINFO U,GROUPS G,GROUP_MEMBER GM WHERE U.ID = ? AND U.ID=GM.MEMBERID AND GM.GROUPID=G.ID "; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/PROTOCOLS.java b/maxkey-core/src/main/java/org/maxkey/constants/PROTOCOLS.java index f6dbc2a77..5ac0a5b34 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/PROTOCOLS.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/PROTOCOLS.java @@ -17,18 +17,13 @@ public final class PROTOCOLS { public static final String FORMBASED = "Form_Based"; - public static final String COOKIEBASED = "Cookie_Based"; public static final String TOKENBASED = "Token_Based"; - public static final String LTPA = "LTPA"; - //OAuth - public static final String OAUTH10A = "OAuth v1.0a"; - public static final String OAUTH20 = "OAuth v2.0"; + public static final String OAUTH20 = "OAuth_v2.0"; //SAML - public static final String SAML11 = "SAML v1.1"; - public static final String SAML20 = "SAML v2.0"; + public static final String SAML20 = "SAML_v2.0"; public static final String OPEN_ID_CONNECT = "OpenID_Connect"; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java index 31a545365..72f92c43c 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java @@ -8,7 +8,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; /* @@ -18,7 +18,7 @@ import org.maxkey.domain.apps.Applications; constraint PK_ROLES primary key clustered (ID) */ @Table(name = "GROUP_APP") -public class GroupPrivileges extends Applications implements Serializable{ +public class GroupPrivileges extends Apps implements Serializable{ /** * diff --git a/maxkey-core/src/main/java/org/maxkey/domain/LoginHistory.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/domain/LoginHistory.java rename to maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java index 6ea06458f..25caa2425 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/LoginHistory.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java @@ -15,8 +15,8 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain; * @author Crystal.Sea * */ -@Table(name = "LOGIN_HISTORY") -public class LoginHistory extends JpaBaseDomain implements Serializable{ +@Table(name = "HISTORY_LOGIN") +public class HistoryLogin extends JpaBaseDomain implements Serializable{ /** * @@ -60,7 +60,7 @@ public class LoginHistory extends JpaBaseDomain implements Serializable{ String startDate; String endDate; - public LoginHistory() { + public HistoryLogin() { super(); } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/LoginAppsHistory.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java similarity index 94% rename from maxkey-core/src/main/java/org/maxkey/domain/LoginAppsHistory.java rename to maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java index 3c1f5eba9..5c8e8039d 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/LoginAppsHistory.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java @@ -13,8 +13,8 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain; * */ -@Table(name = "LOGIN_APPS_HISTORY") -public class LoginAppsHistory extends JpaBaseDomain { +@Table(name = "HISTORY_LOGIN_APPS") +public class HistoryLoginApps extends JpaBaseDomain { private static final long serialVersionUID = 5085201575292304749L; @Id @@ -42,7 +42,7 @@ public class LoginAppsHistory extends JpaBaseDomain { /** * */ - public LoginAppsHistory() { + public HistoryLoginApps() { super(); // TODO Auto-generated constructor stub } @@ -68,7 +68,7 @@ public class LoginAppsHistory extends JpaBaseDomain { * @param sessionId * @param appId */ - public LoginAppsHistory(String sessionId, String appId) { + public HistoryLoginApps(String sessionId, String appId) { super(); this.sessionId = sessionId; this.appId = appId; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Logs.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java similarity index 92% rename from maxkey-core/src/main/java/org/maxkey/domain/Logs.java rename to maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java index 8e031bc5d..cb14b9f5e 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Logs.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java @@ -2,6 +2,8 @@ package org.maxkey.domain; import java.io.Serializable; +import javax.persistence.Table; + import org.apache.mybatis.jpa.persistence.JpaBaseDomain; @@ -9,7 +11,8 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain; * @author Crystal.Sea * */ -public class Logs extends JpaBaseDomain implements Serializable { +@Table(name = "HISTORY_LOGS") +public class HistoryLogs extends JpaBaseDomain implements Serializable { /** * @@ -31,11 +34,11 @@ public class Logs extends JpaBaseDomain implements Serializable { String startDate; String endDate; - public Logs() { + public HistoryLogs() { super(); } - public Logs(String serviceName, String code, String message, + public HistoryLogs(String serviceName, String code, String message, String content, String messageType, String operateType, String createdBy, String username, String cname) { super(); diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/Applications.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java similarity index 87% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/Applications.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java index 70f0df3dd..1c2f0f798 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/Applications.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java @@ -14,8 +14,8 @@ import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.Accounts; import org.springframework.web.multipart.MultipartFile; -@Table(name = "APPLICATIONS") -public class Applications extends JpaBaseDomain implements Serializable{ +@Table(name = "APPS") +public class Apps extends JpaBaseDomain implements Serializable{ /** * @@ -43,28 +43,33 @@ public class Applications extends JpaBaseDomain implements Serializable{ /** * */ + @Column private String name; /* * Login url */ + @Column private String loginUrl; - + @Column private String category; - + @Column private String protocol; - + @Column private String secret; /* * icon and icon upload field iconField */ + @Column private byte[] icon; private MultipartFile iconFile; - + @Column private int visible; /* * vendor */ + @Column private String vendor; + @Column private String vendorUrl; /* @@ -74,13 +79,19 @@ public class Applications extends JpaBaseDomain implements Serializable{ * SHARED * NONE */ + @Column private int credential; + @Column private String sharedUsername; + @Column private String sharedPassword; + @Column private String systemUserAttr; //获取第三方token凭证 + @Column private String principal; + @Column private String credentials; /* @@ -98,19 +109,31 @@ public class Applications extends JpaBaseDomain implements Serializable{ * issuer is domain name * subject is app id append domain name */ + @Column private int isSignature; - + @Column private int isAdapter; - + @Column private String adapter; protected Accounts appUser; - + @Column protected int sortIndex; + @Column + protected int status; + @Column + protected String createdBy; + @Column + protected String createdDate; + @Column + protected String modifiedBy; + @Column + protected String modifiedDate; + @Column protected String description; - public Applications() { + public Apps() { super(); isSignature=BOOLEAN.FALSE; credential=CREDENTIALS.NONE; @@ -592,6 +615,46 @@ public class Applications extends JpaBaseDomain implements Serializable{ this.credentials = credentials; } + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(String createdDate) { + this.createdDate = createdDate; + } + + public String getModifiedBy() { + return modifiedBy; + } + + public void setModifiedBy(String modifiedBy) { + this.modifiedBy = modifiedBy; + } + + public String getModifiedDate() { + return modifiedDate; + } + + public void setModifiedDate(String modifiedDate) { + this.modifiedDate = modifiedDate; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + @Override public String toString() { return "Applications [name=" + name + ", loginUrl=" + loginUrl diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/CasDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java similarity index 93% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/CasDetails.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java index 01e8ca5a5..bc7d3bc67 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/CasDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java @@ -6,8 +6,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -@Table(name = "CAS_DETAILS") -public class CasDetails extends Applications { +@Table(name = "APPS_CAS_DETAILS") +public class AppsCasDetails extends Apps { /** * diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/DesktopDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/DesktopDetails.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java index b3db32e8e..11aed3735 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/DesktopDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java @@ -3,6 +3,8 @@ */ package org.maxkey.domain.apps; +import javax.persistence.Table; + import org.maxkey.domain.Accounts; @@ -10,7 +12,8 @@ import org.maxkey.domain.Accounts; * @author Crystal.Sea * */ -public class DesktopDetails extends Applications { +@Table(name = "APPS_DESKTOP_DETAILS") +public class AppsDesktopDetails extends Apps { public static final class ParameterType{ @@ -52,7 +55,7 @@ public class DesktopDetails extends Applications { /** * */ - public DesktopDetails() { + public AppsDesktopDetails() { } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/ExtendApiDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java similarity index 50% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/ExtendApiDetails.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java index 45d4c8c52..378fcbfc0 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/ExtendApiDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java @@ -1,7 +1,9 @@ package org.maxkey.domain.apps; +import javax.persistence.Table; -public class ExtendApiDetails extends Applications { +@Table(name = "APPS_EXTENDAPI_DETAILS") +public class AppsExtendApiDetails extends Apps { /** * diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/FormBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java similarity index 93% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/FormBasedDetails.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java index 05cb191bc..3d4a87244 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/FormBasedDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java @@ -10,8 +10,8 @@ import javax.persistence.Table; * @author Crystal.Sea * */ -@Table(name = "FORM_BASED_DETAILS") -public class FormBasedDetails extends Applications { +@Table(name = "APPS_FORM_BASED_DETAILS") +public class AppsFormBasedDetails extends Apps { /** * */ @@ -34,7 +34,7 @@ public class FormBasedDetails extends Applications { /** * */ - public FormBasedDetails() { + public AppsFormBasedDetails() { } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/OAuth20Details.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/OAuth20Details.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java index e842f4f66..5c0988ead 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/OAuth20Details.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java @@ -1,10 +1,13 @@ package org.maxkey.domain.apps; +import javax.persistence.Table; + import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails; import org.springframework.util.StringUtils; -public class OAuth20Details extends Applications { +@Table(name = "APPS_OAUTH_CLIENT_DETAILS") +public class AppsOAuth20Details extends Apps { /** * @@ -46,7 +49,7 @@ public class OAuth20Details extends Applications { /** * */ - public OAuth20Details() { + public AppsOAuth20Details() { super(); } @@ -54,7 +57,7 @@ public class OAuth20Details extends Applications { /** * */ - public OAuth20Details(Applications application,BaseClientDetails baseClientDetails) { + public AppsOAuth20Details(Apps application,BaseClientDetails baseClientDetails) { super(); this.id=application.getId(); this.setName(application.getName()); diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/SAML20Details.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/SAML20Details.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java index 4fb0512c6..1aacb59d5 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/SAML20Details.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java @@ -14,8 +14,8 @@ import org.springframework.web.multipart.MultipartFile; * @author Crystal.Sea * */ -@Table(name = "SAML_V20_DETAILS") -public class SAML20Details extends Applications { +@Table(name = "APPS_SAML_V20_DETAILS") +public class AppsSAML20Details extends Apps { /** * @@ -66,12 +66,10 @@ public class SAML20Details extends Applications { /** * for upload */ - @Column private MultipartFile certMetaFile; /** * metadata or certificate */ - @Column private String fileType; /** @@ -97,7 +95,7 @@ public class SAML20Details extends Applications { /** * */ - public SAML20Details() { + public AppsSAML20Details() { super(); } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/TokenBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java similarity index 90% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/TokenBasedDetails.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java index 983e419c5..9b75d4ab1 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/TokenBasedDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java @@ -13,8 +13,8 @@ import javax.persistence.Table; * @author Crystal.Sea * */ -@Table(name = "TOKEN_BASED_DETAILS") -public class TokenBasedDetails extends Applications { +@Table(name = "APPS_TOKEN_BASED_DETAILS") +public class AppsTokenBasedDetails extends Apps { /** * @@ -32,6 +32,8 @@ public class TokenBasedDetails extends Applications { private String redirectUri; // @Column + private String tokenType; + @Column private String cookieName; @Column private String algorithm; @@ -58,7 +60,7 @@ public class TokenBasedDetails extends Applications { - public TokenBasedDetails() { + public AppsTokenBasedDetails() { super(); } @@ -172,6 +174,18 @@ public class TokenBasedDetails extends Applications { + public String getTokenType() { + return tokenType; + } + + + + public void setTokenType(String tokenType) { + this.tokenType = tokenType; + } + + + public int getEmployeeNumber() { return employeeNumber; } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApplications.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java similarity index 91% rename from maxkey-core/src/main/java/org/maxkey/domain/apps/UserApplications.java rename to maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java index 093f7e34f..8ba46e587 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApplications.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java @@ -7,7 +7,7 @@ package org.maxkey.domain.apps; * @author Crystal.Sea * */ -public class UserApplications extends Applications { +public class UserApps extends Apps { /** * @@ -23,7 +23,7 @@ public class UserApplications extends Applications { /** * */ - public UserApplications() { + public UserApps() { } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ApplicationsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ApplicationsMapper.java deleted file mode 100644 index eff3af269..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/ApplicationsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.Applications; - -/** - * @author Crystal.sea - * - */ -public interface ApplicationsMapper extends IJpaBaseMapper { - - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java new file mode 100644 index 000000000..cdb44aee2 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsCasDetailsMapper.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.AppsCasDetails; + +/** + * @author Crystal.sea + * + */ +public interface AppsCasDetailsMapper extends IJpaBaseMapper { + + public AppsCasDetails getAppDetails(String id) ; +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java new file mode 100644 index 000000000..441fcf3ac --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsDesktopDetailsMapper.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.AppsDesktopDetails; + +/** + * @author Crystal.sea + * + */ +public interface AppsDesktopDetailsMapper extends IJpaBaseMapper { + + public AppsDesktopDetails getAppDetails(String id); +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java new file mode 100644 index 000000000..1278614c5 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsFormBasedDetailsMapper.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.AppsFormBasedDetails; + +/** + * @author Crystal.sea + * + */ +public interface AppsFormBasedDetailsMapper extends IJpaBaseMapper { + + public AppsFormBasedDetails getAppDetails(String id) ; +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java new file mode 100644 index 000000000..1e93b7b06 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java @@ -0,0 +1,18 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.Apps; + +/** + * @author Crystal.sea + * + */ +public interface AppsMapper extends IJpaBaseMapper { + + public int insertApp(Apps app); + + public int updateApp(Apps app); +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java new file mode 100644 index 000000000..da2c0f2bd --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsSaml20DetailsMapper.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.AppsSAML20Details; + +/** + * @author Crystal.sea + * + */ +public interface AppsSaml20DetailsMapper extends IJpaBaseMapper { + + public AppsSAML20Details getAppDetails(String id); +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java new file mode 100644 index 000000000..90e3f6628 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsTokenBasedDetailsMapper.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.maxkey.dao.persistence; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.apps.AppsTokenBasedDetails; + +/** + * @author Crystal.sea + * + */ +public interface AppsTokenBasedDetailsMapper extends IJpaBaseMapper { + + public AppsTokenBasedDetails getAppDetails(String id); +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/CasDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/CasDetailsMapper.java deleted file mode 100644 index 0a8b6f403..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/CasDetailsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.CasDetails; - -/** - * @author Crystal.sea - * - */ -public interface CasDetailsMapper extends IJpaBaseMapper { - - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/DesktopDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/DesktopDetailsMapper.java deleted file mode 100644 index ad6dbfd55..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/DesktopDetailsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.DesktopDetails; - -/** - * @author Crystal.sea - * - */ -public interface DesktopDetailsMapper extends IJpaBaseMapper { - - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/FormBasedDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/FormBasedDetailsMapper.java deleted file mode 100644 index f50fac299..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/FormBasedDetailsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.FormBasedDetails; - -/** - * @author Crystal.sea - * - */ -public interface FormBasedDetailsMapper extends IJpaBaseMapper { - - public FormBasedDetails getSassTemplet(String id); -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginAppsHistoryMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java similarity index 51% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginAppsHistoryMapper.java rename to maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java index 85e93e4ec..e169819f6 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginAppsHistoryMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginAppsMapper.java @@ -1,12 +1,12 @@ package org.maxkey.dao.persistence; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.LoginAppsHistory; +import org.maxkey.domain.HistoryLoginApps; /** * @author Crystal.sea * */ -public interface LoginAppsHistoryMapper extends IJpaBaseMapper { +public interface HistoryLoginAppsMapper extends IJpaBaseMapper { } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginHistoryMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java similarity index 54% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginHistoryMapper.java rename to maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java index 4077d61eb..8737a30ed 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LoginHistoryMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLoginMapper.java @@ -2,12 +2,12 @@ package org.maxkey.dao.persistence; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.LoginHistory; +import org.maxkey.domain.HistoryLogin; /** * @author Crystal.sea * */ -public interface LoginHistoryMapper extends IJpaBaseMapper { +public interface HistoryLoginMapper extends IJpaBaseMapper { } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LogsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java similarity index 56% rename from maxkey-dao/src/main/java/org/maxkey/dao/persistence/LogsMapper.java rename to maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java index ef37dc3e9..9a0f77709 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/LogsMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/HistoryLogsMapper.java @@ -4,13 +4,13 @@ package org.maxkey.dao.persistence; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Logs; +import org.maxkey.domain.HistoryLogs; /** * @author Crystal.sea * */ -public interface LogsMapper extends IJpaBaseMapper { +public interface HistoryLogsMapper extends IJpaBaseMapper { } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java index 5ba106352..f7ae779ae 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java @@ -6,13 +6,13 @@ package org.maxkey.dao.persistence; import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.UserApplications; +import org.maxkey.domain.apps.UserApps; /** * @author Crystal.sea * */ -public interface MyAppsListMapper extends IJpaBaseMapper { +public interface MyAppsListMapper extends IJpaBaseMapper { - public List queryMyApps(UserApplications userApplications); + public List queryMyApps(UserApps userApplications); } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/Saml20DetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/Saml20DetailsMapper.java deleted file mode 100644 index 64993a740..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/Saml20DetailsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.SAML20Details; - -/** - * @author Crystal.sea - * - */ -public interface Saml20DetailsMapper extends IJpaBaseMapper { - - public SAML20Details getSassTemplet(String id); -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/TokenBasedDetailsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/TokenBasedDetailsMapper.java deleted file mode 100644 index 658bbe9cd..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/TokenBasedDetailsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.TokenBasedDetails; - -/** - * @author Crystal.sea - * - */ -public interface TokenBasedDetailsMapper extends IJpaBaseMapper { - - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/ApplicationsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/ApplicationsService.java deleted file mode 100644 index f9d152253..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/ApplicationsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.ApplicationsMapper; -import org.maxkey.domain.apps.Applications; -import org.springframework.stereotype.Service; - -@Service -public class ApplicationsService extends JpaBaseService{ - - public ApplicationsService() { - super(ApplicationsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public ApplicationsMapper getMapper() { - // TODO Auto-generated method stub - return (ApplicationsMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java new file mode 100644 index 000000000..965f42972 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsCasDetailsService.java @@ -0,0 +1,27 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsCasDetailsMapper; +import org.maxkey.domain.apps.AppsCasDetails; +import org.springframework.stereotype.Service; + +@Service +public class AppsCasDetailsService extends JpaBaseService{ + + public AppsCasDetailsService() { + super(AppsCasDetailsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsCasDetailsMapper getMapper() { + // TODO Auto-generated method stub + return (AppsCasDetailsMapper)super.getMapper(); + } + + public AppsCasDetails getAppDetails(String id) { + return getMapper().getAppDetails(id); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java new file mode 100644 index 000000000..16538d4a7 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsDesktopDetailsService.java @@ -0,0 +1,27 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsDesktopDetailsMapper; +import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.domain.apps.AppsDesktopDetails; +import org.springframework.stereotype.Service; + +@Service +public class AppsDesktopDetailsService extends JpaBaseService{ + + public AppsDesktopDetailsService() { + super(AppsDesktopDetailsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsDesktopDetailsMapper getMapper() { + // TODO Auto-generated method stub + return (AppsDesktopDetailsMapper)super.getMapper(); + } + public AppsDesktopDetails getAppDetails(String id) { + return getMapper().getAppDetails(id); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java new file mode 100644 index 000000000..fe5f06f69 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsFormBasedDetailsService.java @@ -0,0 +1,27 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsFormBasedDetailsMapper; +import org.maxkey.domain.apps.AppsCasDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.springframework.stereotype.Service; + +@Service +public class AppsFormBasedDetailsService extends JpaBaseService{ + + public AppsFormBasedDetailsService() { + super(AppsFormBasedDetailsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsFormBasedDetailsMapper getMapper() { + return (AppsFormBasedDetailsMapper)super.getMapper(); + } + + public AppsFormBasedDetails getAppDetails(String id) { + return getMapper().getAppDetails(id); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java new file mode 100644 index 000000000..1dd5efc48 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsSaml20DetailsService.java @@ -0,0 +1,27 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsSaml20DetailsMapper; +import org.maxkey.domain.apps.AppsSAML20Details; +import org.springframework.stereotype.Service; + +@Service +public class AppsSaml20DetailsService extends JpaBaseService{ + + public AppsSaml20DetailsService() { + super(AppsSaml20DetailsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsSaml20DetailsMapper getMapper() { + // TODO Auto-generated method stub + return (AppsSaml20DetailsMapper)super.getMapper(); + } + + public AppsSAML20Details getAppDetails(String id){ + return getMapper().getAppDetails(id); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java new file mode 100644 index 000000000..fe85bc753 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java @@ -0,0 +1,31 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsMapper; +import org.maxkey.domain.apps.Apps; +import org.springframework.stereotype.Service; + +@Service +public class AppsService extends JpaBaseService{ + + public AppsService() { + super(AppsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsMapper getMapper() { + // TODO Auto-generated method stub + return (AppsMapper)super.getMapper(); + } + + public boolean insertApp(Apps app) { + return ((AppsMapper)super.getMapper()).insertApp(app)>0; + }; + public boolean updateApp(Apps app) { + return ((AppsMapper)super.getMapper()).updateApp(app)>0; + }; + +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java new file mode 100644 index 000000000..c397ecd12 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsTokenBasedDetailsService.java @@ -0,0 +1,27 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.AppsTokenBasedDetailsMapper; +import org.maxkey.domain.apps.AppsTokenBasedDetails; +import org.springframework.stereotype.Service; + +@Service +public class AppsTokenBasedDetailsService extends JpaBaseService{ + + public AppsTokenBasedDetailsService() { + super(AppsTokenBasedDetailsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public AppsTokenBasedDetailsMapper getMapper() { + // TODO Auto-generated method stub + return (AppsTokenBasedDetailsMapper)super.getMapper(); + } + + public AppsTokenBasedDetails getAppDetails(String id) { + return getMapper().getAppDetails(id); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/CasDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/CasDetailsService.java deleted file mode 100644 index e574ed264..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/CasDetailsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.CasDetailsMapper; -import org.maxkey.domain.apps.CasDetails; -import org.springframework.stereotype.Service; - -@Service -public class CasDetailsService extends JpaBaseService{ - - public CasDetailsService() { - super(CasDetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public CasDetailsMapper getMapper() { - // TODO Auto-generated method stub - return (CasDetailsMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/DesktopDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/DesktopDetailsService.java deleted file mode 100644 index cbe93c4fa..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/DesktopDetailsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.DesktopDetailsMapper; -import org.maxkey.domain.apps.DesktopDetails; -import org.springframework.stereotype.Service; - -@Service -public class DesktopDetailsService extends JpaBaseService{ - - public DesktopDetailsService() { - super(DesktopDetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public DesktopDetailsMapper getMapper() { - // TODO Auto-generated method stub - return (DesktopDetailsMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/FormBasedDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/FormBasedDetailsService.java deleted file mode 100644 index 950786dc6..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/FormBasedDetailsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.FormBasedDetailsMapper; -import org.maxkey.domain.apps.FormBasedDetails; -import org.springframework.stereotype.Service; - -@Service -public class FormBasedDetailsService extends JpaBaseService{ - - public FormBasedDetailsService() { - super(FormBasedDetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public FormBasedDetailsMapper getMapper() { - return (FormBasedDetailsMapper)super.getMapper(); - } - - public FormBasedDetails getSassTemplet(String id){ - return getMapper().getSassTemplet(id); - } -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java new file mode 100644 index 000000000..332464b18 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginAppsService.java @@ -0,0 +1,28 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.HistoryLoginAppsMapper; +import org.maxkey.domain.HistoryLoginApps; +import org.springframework.stereotype.Service; + +@Service +public class HistoryLoginAppsService extends JpaBaseService{ + + public HistoryLoginAppsService() { + super(HistoryLoginAppsMapper.class); + } + + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public HistoryLoginAppsMapper getMapper() { + // TODO Auto-generated method stub + return (HistoryLoginAppsMapper)super.getMapper(); + } + + public boolean insert(HistoryLoginApps loginAppsHistory){ + return getMapper().insert(loginAppsHistory)> 0; + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java new file mode 100644 index 000000000..f5a041622 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLoginService.java @@ -0,0 +1,23 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.HistoryLoginMapper; +import org.maxkey.domain.HistoryLogin; +import org.springframework.stereotype.Service; + +@Service +public class HistoryLoginService extends JpaBaseService{ + + public HistoryLoginService() { + super(HistoryLoginMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public HistoryLoginMapper getMapper() { + // TODO Auto-generated method stub + return (HistoryLoginMapper)super.getMapper(); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java new file mode 100644 index 000000000..897331f25 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/HistoryLogsService.java @@ -0,0 +1,24 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.HistoryLogsMapper; +import org.maxkey.domain.HistoryLogs; +import org.springframework.stereotype.Service; + +@Service +public class HistoryLogsService extends JpaBaseService{ + + public HistoryLogsService() { + super(HistoryLogsMapper.class); + + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public HistoryLogsMapper getMapper() { + // TODO Auto-generated method stub + return (HistoryLogsMapper)super.getMapper(); + } +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginAppsHistoryService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginAppsHistoryService.java deleted file mode 100644 index 3224fada5..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginAppsHistoryService.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.LoginAppsHistoryMapper; -import org.maxkey.domain.LoginAppsHistory; -import org.springframework.stereotype.Service; - -@Service -public class LoginAppsHistoryService extends JpaBaseService{ - - public LoginAppsHistoryService() { - super(LoginAppsHistoryMapper.class); - } - - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public LoginAppsHistoryMapper getMapper() { - // TODO Auto-generated method stub - return (LoginAppsHistoryMapper)super.getMapper(); - } - - public boolean insert(LoginAppsHistory loginAppsHistory){ - return getMapper().insert(loginAppsHistory)> 0; - } -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginHistoryService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginHistoryService.java deleted file mode 100644 index 9d01eafd3..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/LoginHistoryService.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.LoginHistoryMapper; -import org.maxkey.domain.LoginHistory; -import org.springframework.stereotype.Service; - -@Service -public class LoginHistoryService extends JpaBaseService{ - - public LoginHistoryService() { - super(LoginHistoryMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public LoginHistoryMapper getMapper() { - // TODO Auto-generated method stub - return (LoginHistoryMapper)super.getMapper(); - } -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/LogsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/LogsService.java deleted file mode 100644 index 8aba9e23e..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/LogsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.LogsMapper; -import org.maxkey.domain.Logs; -import org.springframework.stereotype.Service; - -@Service -public class LogsService extends JpaBaseService{ - - public LogsService() { - super(LogsMapper.class); - - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public LogsMapper getMapper() { - // TODO Auto-generated method stub - return (LogsMapper)super.getMapper(); - } -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java index ba761ce65..85d4fd879 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java @@ -4,17 +4,17 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.maxkey.dao.persistence.MyAppsListMapper; -import org.maxkey.domain.apps.UserApplications; +import org.maxkey.domain.apps.UserApps; import org.springframework.stereotype.Service; @Service -public class MyAppsListService extends JpaBaseService{ +public class MyAppsListService extends JpaBaseService{ public MyAppsListService() { super(MyAppsListMapper.class); } - public List queryMyApps(UserApplications userApplications){ + public List queryMyApps(UserApps userApplications){ return getMapper().queryMyApps(userApplications); } /* (non-Javadoc) diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/Saml20DetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/Saml20DetailsService.java deleted file mode 100644 index 17eb6bd70..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/Saml20DetailsService.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.Saml20DetailsMapper; -import org.maxkey.domain.apps.SAML20Details; -import org.springframework.stereotype.Service; - -@Service -public class Saml20DetailsService extends JpaBaseService{ - - public Saml20DetailsService() { - super(Saml20DetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public Saml20DetailsMapper getMapper() { - // TODO Auto-generated method stub - return (Saml20DetailsMapper)super.getMapper(); - } - - public SAML20Details getSassTemplet(String id){ - return getMapper().getSassTemplet(id); - } -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/TokenBasedDetailsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/TokenBasedDetailsService.java deleted file mode 100644 index 5c0de9c32..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/TokenBasedDetailsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.TokenBasedDetailsMapper; -import org.maxkey.domain.apps.TokenBasedDetails; -import org.springframework.stereotype.Service; - -@Service -public class TokenBasedDetailsService extends JpaBaseService{ - - public TokenBasedDetailsService() { - super(TokenBasedDetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public TokenBasedDetailsMapper getMapper() { - // TODO Auto-generated method stub - return (TokenBasedDetailsMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml deleted file mode 100644 index 6a6e9cead..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - AND ID = #{id} - - - AND NAME LIKE '%${name}%' - - - AND PROTOCOL = #{protocol} - - - AND CREDENTIAL = #{credential} - - - AND CATEGORY = #{category} - - - AND VENDOR = #{vendor} - - - - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml new file mode 100644 index 000000000..0f0269324 --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsCasDetailsMapper.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsDesktopDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsDesktopDetailsMapper.xml new file mode 100644 index 000000000..78c159a41 --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsDesktopDetailsMapper.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml new file mode 100644 index 000000000..7f47096fc --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsFormBasedDetailsMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml new file mode 100644 index 000000000..a08a7308a --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml @@ -0,0 +1,155 @@ + + + + + + + AND ID = #{id} + + + AND NAME LIKE '%${name}%' + + + AND PROTOCOL = #{protocol} + + + AND CREDENTIAL = #{credential} + + + AND CATEGORY = #{category} + + + AND VENDOR = #{vendor} + + + + + + + + + INSERT INTO APPS( + ID, + NAME, + ICON, + LOGINURL, + PROTOCOL, + CATEGORY, + SECRET, + DESCRIPTION, + VENDOR, + VENDORURL, + + CREDENTIAL, + SHAREDUSERNAME, + SHAREDPASSWORD, + SYSTEMUSERATTR, + + ISEXTENDATTR, + EXTENDATTR, + + ISSIGNATURE, + + ISADAPTER, + ADAPTER, + + PRINCIPAL, + CREDENTIALS, + + VISIBLE, + + SORTINDEX, + + CREATEDBY, + CREATEDDATE, + + STATUS + )VALUES( + #{id}, + #{name}, + #{icon}, + #{loginUrl}, + #{protocol}, + #{category}, + #{secret}, + #{description}, + #{vendor} , + #{vendorUrl}, + + #{credential}, + #{sharedUsername}, + #{sharedPassword}, + #{systemUserAttr}, + + #{isExtendAttr}, + #{extendAttr}, + + #{isSignature}, + + #{isAdapter}, + #{adapter}, + + #{principal}, + #{credentials}, + + #{visible}, + + #{sortIndex}, + + #{createdBy}, + #{createdDate} , + + #{status} + ) + + + + UPDATE APPS SET + NAME = #{name}, + + ICON = #{icon}, + + LOGINURL = #{loginUrl}, + PROTOCOL = #{protocol}, + CATEGORY = #{category}, + SECRET = #{secret}, + DESCRIPTION = #{description}, + VENDOR = #{vendor}, + VENDORURL = #{vendorUrl}, + + CREDENTIAL = #{credential}, + SHAREDUSERNAME = #{sharedUsername}, + SHAREDPASSWORD = #{sharedPassword}, + SYSTEMUSERATTR = #{systemUserAttr}, + + ISEXTENDATTR = #{isExtendAttr}, + EXTENDATTR = #{extendAttr}, + + ISSIGNATURE = #{isSignature}, + + + ISADAPTER = #{isAdapter}, + ADAPTER = #{adapter}, + + PRINCIPAL = #{principal}, + CREDENTIALS = #{credentials}, + VISIBLE = #{visible}, + SORTINDEX = #{sortIndex}, + + MODIFIEDBY = #{modifiedBy}, + MODIFIEDDATE = #{modifiedDate}, + + STATUS = #{status} + WHERE + ID = #{id} + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsSaml20DetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsSaml20DetailsMapper.xml new file mode 100644 index 000000000..437e1c6a7 --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsSaml20DetailsMapper.xml @@ -0,0 +1,31 @@ + + + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml new file mode 100644 index 000000000..1df316a89 --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsTokenBasedDetailsMapper.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml deleted file mode 100644 index 7d5f69f43..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml deleted file mode 100644 index dc830d5ff..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml deleted file mode 100644 index afbf9902a..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml index 1c30d46ca..cb7220dd1 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml @@ -22,11 +22,11 @@ SELECT * FROM - APPLICATIONS APPS, - GROUP_APP GA + APPS APPS, + GROUP_PRIVILEGES GP WHERE - GA.APPID=APPS.ID - AND GA.GROUPID = #{groupId} + GP.APPID=APPS.ID + AND GP.GROUPID = #{groupId} @@ -34,14 +34,14 @@ SELECT * FROM - APPLICATIONS APPS + APPS APPS WHERE 1 = 1 AND APPS.ID NOT IN( SELECT APPID FROM - GROUP_APP + GROUP_PRIVILEGES WHERE GROUPID = #{groupId} ) diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginAppsMapper.xml similarity index 87% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml rename to maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginAppsMapper.xml index aef8901d6..f9b7c1c5e 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginAppsMapper.xml @@ -1,6 +1,6 @@ - + @@ -33,7 +33,7 @@ - SELECT ID, SESSIONID, @@ -44,7 +44,7 @@ DISPLAYNAME, DATE_FORMAT(LOGINTIME, '%Y-%m-%d %H:%i:%s') AS LOGINTIME - FROM LOGIN_APPS_HISTORY + FROM HISTORY_LOGIN_APPS WHERE 1 = 1 diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginMapper.xml similarity index 89% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml rename to maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginMapper.xml index bff504cf9..4c121a7f3 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLoginMapper.xml @@ -1,6 +1,6 @@ - + @@ -38,7 +38,7 @@ - SELECT ID, SESSIONID, @@ -56,7 +56,7 @@ LOGINURL, DATE_FORMAT(LOGINTIME, '%Y-%m-%d %H:%i:%s') AS LOGINTIME, DATE_FORMAT(LOGOUTTIME, '%Y-%m-%d %H:%i:%s') AS LOGOUTTIME - FROM LOGIN_HISTORY + FROM HISTORY_LOGIN WHERE 1 = 1 @@ -64,7 +64,7 @@ - UPDATE LOGIN_HISTORY SET + UPDATE HISTORY_LOGIN SET LOGOUTTIME = current_timestamp() WHERE SESSIONID = #{value} diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLogsMapper.xml similarity index 88% rename from maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml rename to maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLogsMapper.xml index 9c41fba33..f6a1ea6b9 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/HistoryLogsMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - SELECT ID, TID, @@ -45,7 +45,7 @@ USERNAME, CREATEDDATE, CREATEDBY - FROM LOGS + FROM HISTORY_LOGS WHERE 1 = 1 diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml index b890d626e..6e65aa46a 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml @@ -2,7 +2,7 @@ - SELECT DISTINCT APP.* FROM diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml deleted file mode 100644 index ebaba4111..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml deleted file mode 100644 index d8789683f..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java index 8c829c8d9..899952ade 100644 --- a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java +++ b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java @@ -9,9 +9,9 @@ import org.apache.mybatis.jpa.util.WebContext; import org.junit.Before; import org.junit.Test; import org.maxkey.dao.service.AccountsService; -import org.maxkey.dao.service.FormBasedDetailsService; +import org.maxkey.dao.service.AppsFormBasedDetailsService; import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.maxkey.util.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java index edcdf9980..c3e9a44c1 100644 --- a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java +++ b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java @@ -8,8 +8,8 @@ import java.util.List; import org.apache.mybatis.jpa.util.WebContext; import org.junit.Before; import org.junit.Test; -import org.maxkey.dao.service.FormBasedDetailsService; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.dao.service.AppsFormBasedDetailsService; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.maxkey.util.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,10 +22,10 @@ public class FormBasedDetailsServiceTest { public static ApplicationContext context; - public static FormBasedDetailsService service; + public static AppsFormBasedDetailsService service; - public FormBasedDetailsService getservice() { - service=(FormBasedDetailsService)WebContext.getBean("formBasedDetailsService"); + public AppsFormBasedDetailsService getservice() { + service=(AppsFormBasedDetailsService)WebContext.getBean("formBasedDetailsService"); return service; } @@ -33,7 +33,7 @@ public class FormBasedDetailsServiceTest { public void insert() throws Exception{ _logger.info("insert..."); - FormBasedDetails formBasedDetails=new FormBasedDetails(); + AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); service.insert(formBasedDetails); @@ -45,7 +45,7 @@ public class FormBasedDetailsServiceTest { @Test public void get() throws Exception{ _logger.info("get..."); - FormBasedDetails formBasedDetails=service.get("850379a1-7923-4f6b-90be-d363b2dfd2ca"); + AppsFormBasedDetails formBasedDetails=service.get("850379a1-7923-4f6b-90be-d363b2dfd2ca"); _logger.info("formBasedDetails "+formBasedDetails); @@ -56,7 +56,7 @@ public class FormBasedDetailsServiceTest { public void remove() throws Exception{ _logger.info("remove..."); - FormBasedDetails formBasedDetails=new FormBasedDetails(); + AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setId("921d3377-937a-4578-b1e2-92fb23b5e512"); service.remove(formBasedDetails.getId()); @@ -77,7 +77,7 @@ public class FormBasedDetailsServiceTest { public void queryPageResults() throws Exception{ _logger.info("queryPageResults..."); - FormBasedDetails formBasedDetails=new FormBasedDetails(); + AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); //student.setId("af04d610-6092-481e-9558-30bd63ef783c"); // student.setStdGender("M"); //student.setStdMajor(政治"); @@ -90,7 +90,7 @@ public class FormBasedDetailsServiceTest { public void queryPageResultsByMapperId() throws Exception{ _logger.info("queryPageResults by mapperId..."); - FormBasedDetails formBasedDetails=new FormBasedDetails(); + AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); // student.setStdGender("M"); //student.setStdMajor(政治"); // student.setPageResults(10); diff --git a/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore new file mode 100644 index 000000000..cf1db2eed --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore @@ -0,0 +1 @@ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index 258740a38..97f9e2aa0 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -6,10 +6,10 @@ package org.maxkey.authz.endpoint; import org.maxkey.config.ApplicationConfig; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.AccountsService; -import org.maxkey.dao.service.ApplicationsService; +import org.maxkey.dao.service.AppsService; import org.maxkey.domain.Accounts; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +25,8 @@ public class AuthorizeBaseEndpoint { final static Logger _logger = LoggerFactory.getLogger(AuthorizeBaseEndpoint.class); @Autowired - @Qualifier("applicationsService") - protected ApplicationsService applicationsService; + @Qualifier("appsService") + protected AppsService appsService; @Autowired @Qualifier("applicationConfig") @@ -36,58 +36,58 @@ public class AuthorizeBaseEndpoint { AccountsService accountsService; - protected Applications getApplication(String id){ - Applications application=(Applications)WebContext.getAttribute(AuthorizeBaseEndpoint.class.getName()); + protected Apps getApp(String id){ + Apps app=(Apps)WebContext.getAttribute(AuthorizeBaseEndpoint.class.getName()); //session中为空或者id不一致重新加载 - if(application==null||!application.getId().equalsIgnoreCase(id)) { - application=applicationsService.get(id); + if(app==null||!app.getId().equalsIgnoreCase(id)) { + app=appsService.get(id); } - if(application == null){ + if(app == null){ _logger.error("Applications for id "+id + " is null"); } - WebContext.setAttribute(AuthorizeBaseEndpoint.class.getName(), application); - return application; + WebContext.setAttribute(AuthorizeBaseEndpoint.class.getName(), app); + return app; } - protected Accounts getAppAccounts(Applications app){ - Accounts appAccount=new Accounts(); + protected Accounts getAccounts(Apps app){ + Accounts account=new Accounts(); UserInfo userInfo=WebContext.getUserInfo(); - Applications application= getApplication(app.getId()); - if(application.getCredential()==Applications.CREDENTIALS.USER_DEFINED){ + Apps application= getApp(app.getId()); + if(application.getCredential()==Apps.CREDENTIALS.USER_DEFINED){ - appAccount=accountsService.load(new Accounts(userInfo.getId(),application.getId())); - if(appAccount!=null){ - appAccount.setRelatedPassword(ReciprocalUtils.decoder(appAccount.getRelatedPassword())); + account=accountsService.load(new Accounts(userInfo.getId(),application.getId())); + if(account!=null){ + account.setRelatedPassword(ReciprocalUtils.decoder(account.getRelatedPassword())); } - }else if(application.getCredential()==Applications.CREDENTIALS.SHARED){ + }else if(application.getCredential()==Apps.CREDENTIALS.SHARED){ - appAccount.setRelatedUsername(application.getSharedUsername()); - appAccount.setRelatedPassword(ReciprocalUtils.decoder(application.getSharedPassword())); + account.setRelatedUsername(application.getSharedUsername()); + account.setRelatedPassword(ReciprocalUtils.decoder(application.getSharedPassword())); - }else if(application.getCredential()==Applications.CREDENTIALS.SYSTEM){ + }else if(application.getCredential()==Apps.CREDENTIALS.SYSTEM){ if(application.getSystemUserAttr().equalsIgnoreCase("uid")){ - appAccount.setUsername(userInfo.getId()); + account.setUsername(userInfo.getId()); }else if(application.getSystemUserAttr().equalsIgnoreCase("username")){ - appAccount.setUsername(userInfo.getUsername()); + account.setUsername(userInfo.getUsername()); }else if(application.getSystemUserAttr().equalsIgnoreCase("employeeNumber")){ - appAccount.setUsername(userInfo.getEmployeeNumber()); + account.setUsername(userInfo.getEmployeeNumber()); }else if(application.getSystemUserAttr().equalsIgnoreCase("email")){ - appAccount.setUsername(userInfo.getEmail()); + account.setUsername(userInfo.getEmail()); }else if(application.getSystemUserAttr().equalsIgnoreCase("windowsAccount")){ - appAccount.setUsername(userInfo.getWindowsAccount()); + account.setUsername(userInfo.getWindowsAccount()); } //decoder database stored encode password - appAccount.setRelatedPassword(ReciprocalUtils.decoder(WebContext.getUserInfo().getDecipherable())); + account.setRelatedPassword(ReciprocalUtils.decoder(WebContext.getUserInfo().getDecipherable())); - }else if(application.getCredential()==Applications.CREDENTIALS.NONE){ + }else if(application.getCredential()==Apps.CREDENTIALS.NONE){ - appAccount.setUsername(userInfo.getUsername()); - appAccount.setRelatedPassword(userInfo.getUsername()); + account.setUsername(userInfo.getUsername()); + account.setRelatedPassword(userInfo.getUsername()); } - return appAccount; + return account; } public ModelAndView generateInitCredentialModelAndView(String appId,String redirect_uri){ diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java index 3ac3f50dc..13269af3b 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java @@ -55,7 +55,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ appUser.setDisplayName(userInfo.getDisplayName()); appUser.setAppId(appId); - appUser.setAppName(getApplication(appId).getName()); + appUser.setAppName(getApp(appId).getName()); appUser.setRelatedUsername(identity_username); appUser.setRelatedPassword(ReciprocalUtils.encode(identity_password)); diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java index 517bad327..cb14e6491 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java @@ -8,8 +8,8 @@ import javax.servlet.http.HttpServletRequest; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.client.utils.HttpEncoder; import org.maxkey.constants.PROTOCOLS; -import org.maxkey.dao.service.CasDetailsService; -import org.maxkey.domain.apps.Applications; +import org.maxkey.dao.service.AppsCasDetailsService; +import org.maxkey.domain.apps.Apps; import org.maxkey.domain.apps.oauth2.provider.ClientDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; @@ -33,7 +33,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ private ClientDetailsService clientDetailsService; @Autowired - CasDetailsService casDetailsService; + AppsCasDetailsService casDetailsService; //all single sign on url @RequestMapping("/authz/{id}") @@ -43,7 +43,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ ModelAndView modelAndView=null; - Applications application=getApplication(id); + Apps application=getApp(id); WebContext.setAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID, id); if(application.getProtocol().equalsIgnoreCase(PROTOCOLS.EXTEND_API)){ @@ -68,8 +68,6 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ modelAndView=WebContext.forward("/authz/saml20/idpinit/"+application.getId()); }else if (application.getProtocol().equalsIgnoreCase(PROTOCOLS.TOKENBASED)){ modelAndView=WebContext.forward("/authorize/tokenbased/"+id); - }else if (application.getProtocol().equalsIgnoreCase(PROTOCOLS.LTPA)){ - modelAndView=WebContext.forward("/authz/ltpa/"+id); }else if (application.getProtocol().equalsIgnoreCase(PROTOCOLS.CAS)){ modelAndView=WebContext.forward("/authz/cas/"+id); }else if (application.getProtocol().equalsIgnoreCase(PROTOCOLS.DESKTOP)){ @@ -87,7 +85,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{ public ModelAndView authorizeOAuth10a( @PathVariable("id") String id){ - String redirec_uri=getApplication(id).getLoginUrl(); + String redirec_uri=getApp(id).getLoginUrl(); return WebContext.redirect(redirec_uri); } diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java index edc5b71ec..765550dea 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java @@ -9,7 +9,7 @@ import org.maxkey.crypto.cert.CertSigner; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ public abstract class AbstractAuthorizeAdapter { public abstract String generateInfo(UserInfo userInfo,Object app); - public String sign(String data,Applications app){ + public String sign(String data,Apps app){ if(BOOLEAN.isTrue(app.getIsSignature())){ KeyStoreLoader keyStoreLoader=(KeyStoreLoader)WebContext.getBean("keyStoreLoader"); try { diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore new file mode 100644 index 000000000..cf1db2eed --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore @@ -0,0 +1 @@ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore new file mode 100644 index 000000000..c2d9872a1 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore @@ -0,0 +1 @@ +/com/ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 445a3776c..959997628 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -15,7 +15,7 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.CasDetailsService; +import org.maxkey.dao.service.AppsCasDetailsService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; import org.maxkey.util.Instance; @@ -37,7 +37,7 @@ public class Cas20AuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(Cas20AuthorizeEndpoint.class); @Autowired - CasDetailsService casDetailsService; + AppsCasDetailsService casDetailsService; @Autowired ApplicationConfig applicationConfig; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 6f1c5269f..9cf53d9cb 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -14,7 +14,7 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.CasDetailsService; +import org.maxkey.dao.service.AppsCasDetailsService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; import org.maxkey.util.Instance; @@ -36,7 +36,7 @@ public class Cas30AuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(Cas30AuthorizeEndpoint.class); @Autowired - CasDetailsService casDetailsService; + AppsCasDetailsService casDetailsService; @Autowired ApplicationConfig applicationConfig; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 09e02f887..d50c5987f 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -13,8 +13,8 @@ import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.config.ApplicationConfig; -import org.maxkey.dao.service.CasDetailsService; -import org.maxkey.domain.apps.CasDetails; +import org.maxkey.dao.service.AppsCasDetailsService; +import org.maxkey.domain.apps.AppsCasDetails; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -37,7 +37,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(CasAuthorizeEndpoint.class); @Autowired - CasDetailsService casDetailsService; + AppsCasDetailsService casDetailsService; @Autowired ApplicationConfig applicationConfig; @@ -52,10 +52,10 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{ HttpServletResponse response, @RequestParam(value=CasConstants.PARAMETER.SERVICE,required=false) String casService){ - CasDetails casDetails=new CasDetails(); + AppsCasDetails casDetails=new AppsCasDetails(); casDetails.setService(casService); - List casDetailsList=casDetailsService.query(casDetails); + List casDetailsList=casDetailsService.query(casDetails); casDetails=(casDetailsList!=null && casDetailsList.size()==1)?casDetailsList.get(0):null; @@ -69,12 +69,12 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{ HttpServletResponse response, @PathVariable("id") String id){ - CasDetails casDetails=casDetailsService.get(id); + AppsCasDetails casDetails=casDetailsService.get(id); return buildCasModelAndView(casDetails); } - private ModelAndView buildCasModelAndView(CasDetails casDetails){ + private ModelAndView buildCasModelAndView(AppsCasDetails casDetails){ _logger.debug(""+casDetails); @@ -88,7 +88,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{ HttpServletRequest request, HttpServletResponse response){ - CasDetails casDetails=(CasDetails)WebContext.getAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS); + AppsCasDetails casDetails=(AppsCasDetails)WebContext.getAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS); ServiceTicketImpl serviceTicket=new ServiceTicketImpl(WebContext.getAuthentication(),casDetails); String ticket=ticketServices.createTicket(serviceTicket); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java index cf6fdf2e1..c205b2c8b 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java @@ -1,7 +1,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.maxkey.domain.apps.CasDetails; +import org.maxkey.domain.apps.AppsCasDetails; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; @@ -55,7 +55,7 @@ public abstract class AbstractTicket implements Ticket { protected Authentication authentication; - protected CasDetails casDetails; + protected AppsCasDetails casDetails; /** * Instantiates a new abstract ticket. */ @@ -131,7 +131,7 @@ public abstract class AbstractTicket implements Ticket { } @Override - public CasDetails getCasDetails() { + public AppsCasDetails getCasDetails() { // TODO Auto-generated method stub return this.casDetails; } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java index de5f7eabe..3cf1cb00a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java @@ -1,7 +1,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import org.apache.commons.lang3.builder.EqualsBuilder; -import org.maxkey.domain.apps.CasDetails; +import org.maxkey.domain.apps.AppsCasDetails; import org.springframework.security.core.Authentication; import javax.persistence.Column; @@ -55,7 +55,7 @@ public class ServiceTicketImpl extends AbstractTicket { /** * Instantiates a new service ticket impl. */ - public ServiceTicketImpl(Authentication authentication,CasDetails casDetails) { + public ServiceTicketImpl(Authentication authentication,AppsCasDetails casDetails) { // exists for JPA purposes this.authentication=authentication; this.casDetails=casDetails; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java index 14b7247fe..b77a5dd5a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/Ticket.java @@ -3,7 +3,7 @@ package org.maxkey.authz.cas.endpoint.ticket; import java.io.Serializable; import java.time.ZonedDateTime; -import org.maxkey.domain.apps.CasDetails; +import org.maxkey.domain.apps.AppsCasDetails; import org.springframework.security.core.Authentication; /** @@ -78,7 +78,7 @@ public interface Ticket extends Serializable, Comparable { ZonedDateTime getPreviousTimeUsed(); - CasDetails getCasDetails(); + AppsCasDetails getCasDetails(); } diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java index 98ebe637a..1245e417b 100644 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java @@ -9,9 +9,9 @@ import org.maxkey.authz.desktop.endpoint.adapter.DesktopDefaultAdapter; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.DesktopDetailsService; +import org.maxkey.dao.service.AppsDesktopDetailsService; import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.DesktopDetails; +import org.maxkey.domain.apps.AppsDesktopDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -31,7 +31,7 @@ public class DesktopAuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(DesktopAuthorizeEndpoint.class); @Autowired - DesktopDetailsService desktopDetailsService; + AppsDesktopDetailsService desktopDetailsService; DesktopDefaultAdapter defaultDesktopAdapter=new DesktopDefaultAdapter(); @@ -39,10 +39,10 @@ public class DesktopAuthorizeEndpoint extends AuthorizeBaseEndpoint{ public ModelAndView authorize( HttpServletRequest request, @PathVariable("id") String id){ - DesktopDetails desktopDetails=desktopDetailsService.get(id); + AppsDesktopDetails desktopDetails=desktopDetailsService.get(id); _logger.debug(""+desktopDetails); - Accounts appUser=getAppAccounts(desktopDetails); + Accounts appUser=getAccounts(desktopDetails); if(appUser == null){ return generateInitCredentialModelAndView(id,"/authorize/desktop/"+id); diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java index d82c937c9..6a16a10d7 100644 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java @@ -5,8 +5,8 @@ import java.util.HashMap; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.HexUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.DesktopDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsDesktopDetails; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; import org.slf4j.Logger; @@ -17,14 +17,14 @@ public class DesktopDefaultAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(DesktopDefaultAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - DesktopDetails details=(DesktopDetails)app; + AppsDesktopDetails details=(AppsDesktopDetails)app; String parameter=details.getParameter()==null?"":details.getParameter(); - if(details.getUsernameType().equalsIgnoreCase(DesktopDetails.ParameterType.PARAMETER)){ + if(details.getUsernameType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ parameter = parameter+ " "+details.getUsernameParameter(); parameter = parameter+ " "+ details.getAppUser().getRelatedUsername(); } - if(details.getPasswordType().equalsIgnoreCase(DesktopDetails.ParameterType.PARAMETER)){ + if(details.getPasswordType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ parameter = parameter+ " "+details.getPasswordParameter(); parameter = parameter+ " "+ details.getAppUser().getRelatedPassword(); } @@ -64,7 +64,7 @@ public class DesktopDefaultAdapter extends AbstractAuthorizeAdapter { * @see com.connsec.web.authorize.endpoint.adapter.AbstractAuthorizeAdapter#sign(java.lang.String, com.connsec.domain.apps.Applications) */ @Override - public String sign(String data, Applications app) { + public String sign(String data, Apps app) { String signData=super.sign(data, app); return signData; } @@ -72,7 +72,7 @@ public class DesktopDefaultAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/desktop_sso_execute"); - DesktopDetails details=(DesktopDetails)app; + AppsDesktopDetails details=(AppsDesktopDetails)app; modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); modelAndView.addObject("encoderParam", data); diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java index 337a3c3f0..109301273 100644 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java +++ b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java @@ -5,8 +5,8 @@ import java.util.HashMap; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.HexUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.DesktopDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsDesktopDetails; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; import org.slf4j.Logger; @@ -17,14 +17,14 @@ public class DesktopQQAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(DesktopQQAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - DesktopDetails details=(DesktopDetails)app; + AppsDesktopDetails details=(AppsDesktopDetails)app; String parameter=details.getParameter()==null?"":details.getParameter(); - if(details.getUsernameType().equalsIgnoreCase(DesktopDetails.ParameterType.PARAMETER)){ + if(details.getUsernameType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ parameter = parameter+ " "+details.getUsernameParameter(); parameter = parameter+ " "+ details.getAppUser().getRelatedUsername(); } - if(details.getPasswordType().equalsIgnoreCase(DesktopDetails.ParameterType.PARAMETER)){ + if(details.getPasswordType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ parameter = parameter+ " "+details.getPasswordParameter(); parameter = parameter+ " "+ details.getAppUser().getRelatedPassword(); } @@ -64,7 +64,7 @@ public class DesktopQQAdapter extends AbstractAuthorizeAdapter { * @see com.connsec.web.authorize.endpoint.adapter.AbstractAuthorizeAdapter#sign(java.lang.String, com.connsec.domain.apps.Applications) */ @Override - public String sign(String data, Applications app) { + public String sign(String data, Apps app) { String signData=super.sign(data, app); return signData; } @@ -72,7 +72,7 @@ public class DesktopQQAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/desktop_qq_sso_execute"); - DesktopDetails details=(DesktopDetails)app; + AppsDesktopDetails details=(AppsDesktopDetails)app; modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); modelAndView.addObject("encoderParam", data); diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java index b5a84ebc1..d7144a1c2 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java @@ -9,7 +9,7 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -30,11 +30,11 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{ @RequestMapping("/authz/api/{id}") public ModelAndView authorize(HttpServletRequest request,@PathVariable("id") String id){ - Applications apps=getApplication(id); + Apps apps=getApp(id); _logger.debug(""+apps); if(BOOLEAN.isTrue(apps.getIsAdapter())){ - Accounts appUser=getAppAccounts(apps); + Accounts appUser=getAccounts(apps); if(appUser == null){ return generateInitCredentialModelAndView(id,"/authorize/api/"+id); @@ -53,7 +53,7 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{ modelAndView); return modelAndView; }else{ - String redirec_uri=getApplication(id).getLoginUrl(); + String redirec_uri=getApp(id).getLoginUrl(); return WebContext.redirect(redirec_uri); } diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailDefaultAdapter.java index b3f8fe84c..b61585831 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailDefaultAdapter.java @@ -8,7 +8,7 @@ import org.maxkey.client.oauth.model.Token; import org.maxkey.client.utils.JsonUtils; import org.maxkey.domain.ExtraAttrs; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ public class ExtendApiQQExmailDefaultAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { - Applications details=(Applications)app; + Apps details=(Apps)app; //extraAttrs from Applications ExtraAttrs extraAttrs=null; if(details.getIsExtendAttr()==1){ diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 454ac72d6..ab48a25bd 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -9,10 +9,10 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.formbased.endpoint.adapter.FormBasedDefaultAdapter; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.FormBasedDetailsService; +import org.maxkey.dao.service.AppsFormBasedDetailsService; import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -32,7 +32,7 @@ public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(FormBasedAuthorizeEndpoint.class); @Autowired - FormBasedDetailsService formBasedDetailsService; + AppsFormBasedDetailsService formBasedDetailsService; FormBasedDefaultAdapter defaultFormBasedAdapter=new FormBasedDefaultAdapter(); @@ -40,14 +40,14 @@ public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ public ModelAndView authorize( HttpServletRequest request, @PathVariable("id") String id){ - FormBasedDetails formBasedDetails=formBasedDetailsService.get(id); + AppsFormBasedDetails formBasedDetails=formBasedDetailsService.get(id); _logger.debug(""+formBasedDetails); - Applications application= getApplication(id); + Apps application= getApp(id); formBasedDetails.setAdapter(application.getAdapter()); formBasedDetails.setIsAdapter(application.getIsAdapter()); ModelAndView modelAndView=null; - Accounts appUser=getAppAccounts(formBasedDetails); + Accounts appUser=getAccounts(formBasedDetails); _logger.debug("Accounts "+appUser); if(appUser == null){ diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java index f51edaa9f..b7da4b7d1 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java @@ -4,7 +4,7 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.crypto.DigestUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedDefaultAdapter extends AbstractAuthorizeAdapter { @@ -23,7 +23,7 @@ public class FormBasedDefaultAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/formbased_sso_submint"); - FormBasedDetails details=(FormBasedDetails)app; + AppsFormBasedDetails details=(AppsFormBasedDetails)app; modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java index c6deeb113..1d7c8bc06 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java @@ -3,7 +3,7 @@ package org.maxkey.authz.formbased.endpoint.adapter; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedNetease163EmailAdapter extends AbstractAuthorizeAdapter { @@ -22,7 +22,7 @@ public class FormBasedNetease163EmailAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/formbased_netease_163email_sso_submint"); - FormBasedDetails details=(FormBasedDetails)app; + AppsFormBasedDetails details=(AppsFormBasedDetails)app; modelAndView.addObject("username", details.getAppUser().getRelatedUsername().substring(details.getAppUser().getRelatedUsername().indexOf("@"))); modelAndView.addObject("email", details.getAppUser().getRelatedUsername()); modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java index 97b2fb17b..dd2dbeebe 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java @@ -5,7 +5,7 @@ import java.util.Date; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.crypto.DigestUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.springframework.web.servlet.ModelAndView; public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter { @@ -24,7 +24,7 @@ public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/formbased_netease_noteyoudao_sso_submint"); - FormBasedDetails details=(FormBasedDetails)app; + AppsFormBasedDetails details=(AppsFormBasedDetails)app; modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); modelAndView.addObject("password", DigestUtils.md5Hex(details.getAppUser().getRelatedPassword())); modelAndView.addObject("currentTime", (new Date()).getTime()); diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java index 1530e3d6e..997ddf783 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java @@ -4,7 +4,7 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.crypto.DigestUtils; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.maxkey.web.WebContext; import org.springframework.web.servlet.ModelAndView; @@ -24,7 +24,7 @@ public class FormBasedRedirectAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/formbased_redirect_submint"); - FormBasedDetails details=(FormBasedDetails)app; + AppsFormBasedDetails details=(AppsFormBasedDetails)app; modelAndView.addObject("id", details.getId()); modelAndView.addObject("action", details.getRedirectUri()); diff --git a/maxkey-protocols/maxkey-protocol-ltpa/.project b/maxkey-protocols/maxkey-protocol-ltpa/.project index 32c214e9a..b51954ca3 100644 --- a/maxkey-protocols/maxkey-protocol-ltpa/.project +++ b/maxkey-protocols/maxkey-protocol-ltpa/.project @@ -10,11 +10,6 @@ - - org.eclipse.buildship.core.gradleprojectbuilder - - - org.eclipse.wst.common.project.facet.core.builder @@ -28,7 +23,6 @@ org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.buildship.core.prefs b/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.buildship.core.prefs index 4115f6f39..4219f08ce 100644 --- a/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.buildship.core.prefs +++ b/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.buildship.core.prefs @@ -3,7 +3,6 @@ connection.arguments= connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.java.home=null connection.jvm.arguments= -connection.project.dir=../.. containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/ derived.resources=.gradle,build eclipse.preferences.version=1 diff --git a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java index d9289ff27..6fb5ee58f 100644 --- a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java @@ -12,9 +12,9 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.ltpa.endpoint.adapter.LtpaDefaultAdapter; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.TokenBasedDetailsService; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.dao.service.AppsTokenBasedDetailsService; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -34,7 +34,7 @@ public class LtpaAuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(LtpaAuthorizeEndpoint.class); @Autowired - TokenBasedDetailsService tokenBasedDetailsService; + AppsTokenBasedDetailsService tokenBasedDetailsService; @Autowired ApplicationConfig applicationConfig; @@ -48,10 +48,10 @@ public class LtpaAuthorizeEndpoint extends AuthorizeBaseEndpoint{ @PathVariable("id") String id){ - TokenBasedDetails ltpaDetails=tokenBasedDetailsService.get(id); + AppsTokenBasedDetails ltpaDetails=tokenBasedDetailsService.get(id); _logger.debug(""+ltpaDetails); String cookieValue=""; - Applications application= getApplication(id); + Apps application= getApp(id); ltpaDetails.setAdapter(application.getAdapter()); ltpaDetails.setIsAdapter(application.getIsAdapter()); diff --git a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/adapter/LtpaDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/adapter/LtpaDefaultAdapter.java index a48ac6293..2d761db3f 100644 --- a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/adapter/LtpaDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/adapter/LtpaDefaultAdapter.java @@ -6,7 +6,7 @@ import java.util.HashMap; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.util.DateUtils; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; @@ -18,7 +18,7 @@ public class LtpaDefaultAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(LtpaDefaultAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; HashMap beanMap=new HashMap(); beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index b2fca52d5..69e01f4ea 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java @@ -67,22 +67,22 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg private static final String CLIENT_FIELDS = "client_secret, " + CLIENT_FIELDS_FOR_UPDATE; private static final String BASE_FIND_STATEMENT = "select client_id, " + CLIENT_FIELDS - + " from oauth_client_details"; + + " from apps_oauth_client_details"; private static final String DEFAULT_FIND_STATEMENT = BASE_FIND_STATEMENT + " order by client_id"; private static final String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ?"; - private static final String DEFAULT_INSERT_STATEMENT = "insert into oauth_client_details (" + CLIENT_FIELDS + private static final String DEFAULT_INSERT_STATEMENT = "insert into apps_oauth_client_details (" + CLIENT_FIELDS + ", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - private static final String DEFAULT_UPDATE_STATEMENT = "update oauth_client_details " + "set " + private static final String DEFAULT_UPDATE_STATEMENT = "update apps_oauth_client_details " + "set " + CLIENT_FIELDS_FOR_UPDATE.replaceAll(", ", "=?, ") + "=? where client_id = ?"; - private static final String DEFAULT_UPDATE_SECRET_STATEMENT = "update oauth_client_details " + private static final String DEFAULT_UPDATE_SECRET_STATEMENT = "update apps_oauth_client_details " + "set client_secret = ? where client_id = ?"; - private static final String DEFAULT_DELETE_STATEMENT = "delete from oauth_client_details where client_id = ?"; + private static final String DEFAULT_DELETE_STATEMENT = "delete from apps_oauth_client_details where client_id = ?"; private RowMapper rowMapper = new ClientDetailsRowMapper(); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index 1a069d308..e64ce7c3e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -17,10 +17,10 @@ import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionServic import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; -import org.maxkey.dao.service.ApplicationsService; +import org.maxkey.dao.service.AppsService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.domain.apps.oauth2.provider.ClientDetails; import org.maxkey.util.Instance; import org.maxkey.util.JsonUtils; @@ -65,7 +65,7 @@ public class UserInfoEndpoint { @Autowired @Qualifier("applicationsService") - protected ApplicationsService applicationsService; + protected AppsService applicationsService; @Autowired @Qualifier("jwtSignerValidationService") @@ -100,7 +100,7 @@ public class UserInfoEndpoint { String client_id= oAuth2Authentication.getOAuth2Request().getClientId(); UserInfo userInfo=queryUserInfo(principal); - Applications app=applicationsService.get(client_id); + Apps app=applicationsService.get(client_id); String userJson=""; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/BindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/BindingAdapter.java index c99962a9b..ee2802774 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/BindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/BindingAdapter.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.authz.saml.common.AuthnRequestInfo; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.opensaml.common.SignableSAMLObject; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.metadata.Endpoint; @@ -34,7 +34,7 @@ public interface BindingAdapter { public void setRelayState(String relayState); - public SAML20Details getSaml20Details(); + public AppsSAML20Details getSaml20Details(); public AuthnRequestInfo getAuthnRequestInfo(); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractBindingAdapter.java index 80fb04b96..9afafa344 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractBindingAdapter.java @@ -6,7 +6,7 @@ import java.security.KeyStore; import javax.servlet.http.HttpServletRequest; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.ws.message.decoder.MessageDecodingException; import org.opensaml.ws.security.SecurityPolicyResolver; @@ -29,9 +29,9 @@ public interface ExtractBindingAdapter { public void buildSecurityPolicyResolver(KeyStore trustKeyStore); - public void setSaml20Detail(SAML20Details saml20Detail); + public void setSaml20Detail(AppsSAML20Details saml20Detail); - public SAML20Details getSaml20Detail(); + public AppsSAML20Details getSaml20Detail(); public KeyStoreLoader getKeyStoreLoader(); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractPostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractPostBindingAdapter.java index f96101d80..9b78ef5b4 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractPostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/ExtractPostBindingAdapter.java @@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.maxkey.authz.saml.common.TrustResolver; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.opensaml.common.binding.BasicSAMLMessageContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.common.binding.decoding.SAMLMessageDecoder; @@ -35,7 +35,7 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial protected KeyStoreLoader keyStoreLoader; protected CredentialResolver credentialResolver; - protected SAML20Details saml20Detail; + protected AppsSAML20Details saml20Detail; public ExtractPostBindingAdapter() { @@ -119,11 +119,11 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial } @Override - public void setSaml20Detail(SAML20Details saml20Detail) { + public void setSaml20Detail(AppsSAML20Details saml20Detail) { this.saml20Detail=saml20Detail; } - public SAML20Details getSaml20Detail() { + public AppsSAML20Details getSaml20Detail() { return saml20Detail; } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/PostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/PostBindingAdapter.java index e9e04b813..9143d2cd4 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/PostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/PostBindingAdapter.java @@ -11,7 +11,7 @@ import org.maxkey.authz.saml.common.AuthnRequestInfo; import org.maxkey.authz.saml.common.TrustResolver; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.opensaml.common.SignableSAMLObject; import org.opensaml.common.binding.BasicSAMLMessageContext; import org.opensaml.common.binding.decoding.SAMLMessageDecoder; @@ -209,7 +209,7 @@ public class PostBindingAdapter implements BindingAdapter, InitializingBean{ } @Override - public SAML20Details getSaml20Details() { + public AppsSAML20Details getSaml20Details() { return extractBindingAdapter.getSaml20Detail(); } } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index 59c83ec2b..4b56d7315 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -25,8 +25,8 @@ import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; import org.maxkey.constants.LOGINTYPE; import org.maxkey.crypto.keystore.KeyStoreLoader; -import org.maxkey.dao.service.Saml20DetailsService; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.dao.service.AppsSaml20DetailsService; +import org.maxkey.domain.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.common.binding.security.IssueInstantRule; @@ -80,7 +80,7 @@ public class ConsumerEndpoint { private ExtractBindingAdapter extractBindingAdapter; @Autowired - private Saml20DetailsService saml20DetailsService; + private AppsSaml20DetailsService saml20DetailsService; @Autowired @Qualifier("issueInstantRule") @@ -200,7 +200,7 @@ public class ConsumerEndpoint { */ private void initCredential(String spId) throws Exception { // 1. 获取 sp keyStore - SAML20Details saml20Details = saml20DetailsService.get(spId); + AppsSAML20Details saml20Details = saml20DetailsService.get(spId); if (saml20Details == null) { // TODO logger.error("spid[" + spId + "] not exists"); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java index f712304ac..9e8cc014d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java @@ -11,7 +11,7 @@ import org.maxkey.authz.saml.common.AuthnRequestInfo; import org.maxkey.authz.saml.common.EndpointGenerator; import org.maxkey.authz.saml20.BindingAdapter; import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.opensaml.saml2.core.Response; import org.opensaml.saml2.metadata.Endpoint; @@ -47,7 +47,7 @@ public class AssertionEndpoint { logger.debug("saml20 assertion start."); bindingAdapter = (BindingAdapter) request.getSession().getAttribute("samlv20Adapter"); logger.debug("saml20 assertion get session samlv20Adapter "+bindingAdapter); - SAML20Details saml20Details = bindingAdapter.getSaml20Details(); + AppsSAML20Details saml20Details = bindingAdapter.getSaml20Details(); AuthnRequestInfo authnRequestInfo = bindingAdapter.getAuthnRequestInfo(); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java index 0d5483843..38175e8d3 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java @@ -10,8 +10,8 @@ import org.maxkey.authz.saml20.BindingAdapter; import org.maxkey.authz.saml20.ExtractBindingAdapter; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.dao.service.Saml20DetailsService; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.dao.service.AppsSaml20DetailsService; +import org.maxkey.domain.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +52,7 @@ public class IdpInitEndpoint { private KeyStoreLoader keyStoreLoader; @Autowired - private Saml20DetailsService saml20DetailsService; + private AppsSaml20DetailsService saml20DetailsService; /** * @@ -70,7 +70,7 @@ public class IdpInitEndpoint { HttpServletResponse response, @PathVariable("appid") String appId)throws Exception { logger.debug("SAML IDP init , app id is "+appId); - SAML20Details saml20Details = saml20DetailsService.get(appId); + AppsSAML20Details saml20Details = saml20DetailsService.get(appId); if (saml20Details == null) { logger.error("samlId[" + appId + "] Error ."); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java index 29544bcf8..200504bc2 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java @@ -10,8 +10,8 @@ import org.maxkey.authz.saml20.BindingAdapter; import org.maxkey.authz.saml20.ExtractBindingAdapter; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.dao.service.Saml20DetailsService; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.dao.service.AppsSaml20DetailsService; +import org.maxkey.domain.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.core.AuthnRequest; @@ -55,7 +55,7 @@ public class SingleSignOnEndpoint { private SAML2ValidatorSuite validatorSuite; @Autowired - private Saml20DetailsService saml20DetailsService; + private AppsSaml20DetailsService saml20DetailsService; @RequestMapping(value = "/authz/saml20/{appid}", method=RequestMethod.POST) public ModelAndView authorizePost( @@ -89,7 +89,7 @@ public class SingleSignOnEndpoint { } public void extractSaml20Detail(ExtractBindingAdapter extractBindingAdapter,String samlId) throws Exception{ - SAML20Details saml20Details = saml20DetailsService.get(samlId); + AppsSAML20Details saml20Details = saml20DetailsService.get(samlId); if (saml20Details == null) { logger.error("Request SAML APPID [" + samlId + "] is not exist ."); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java index 939a30f8d..ce70cc6ae 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/provider/xml/AuthnResponseGenerator.java @@ -11,7 +11,7 @@ import org.maxkey.authz.saml.service.IDService; import org.maxkey.authz.saml.service.TimeService; import org.maxkey.authz.saml20.xml.IssuerGenerator; import org.maxkey.constants.BOOLEAN; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.domain.apps.AppsSAML20Details; import org.opensaml.Configuration; import org.opensaml.saml2.core.Assertion; import org.opensaml.saml2.core.EncryptedAssertion; @@ -55,7 +55,7 @@ public class AuthnResponseGenerator { } - public Response generateAuthnResponse( SAML20Details saml20Details, + public Response generateAuthnResponse( AppsSAML20Details saml20Details, AuthnRequestInfo authnRequestInfo, String nameIdValue, String clientAddress, diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index 8959023a2..bbf506435 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -11,9 +11,9 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.BOOLEAN; -import org.maxkey.dao.service.TokenBasedDetailsService; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.dao.service.AppsTokenBasedDetailsService; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -33,7 +33,7 @@ public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ final static Logger _logger = LoggerFactory.getLogger(TokenBasedAuthorizeEndpoint.class); @Autowired - TokenBasedDetailsService tokenBasedDetailsService; + AppsTokenBasedDetailsService tokenBasedDetailsService; TokenBasedDefaultAdapter defaultTokenBasedAdapter=new TokenBasedDefaultAdapter(); @@ -48,11 +48,11 @@ public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ ModelAndView modelAndView=new ModelAndView(); - TokenBasedDetails tokenBasedDetails=null; + AppsTokenBasedDetails tokenBasedDetails=null; tokenBasedDetails=tokenBasedDetailsService.get(id); _logger.debug(""+tokenBasedDetails); - Applications application= getApplication(id); + Apps application= getApp(id); tokenBasedDetails.setAdapter(application.getAdapter()); tokenBasedDetails.setIsAdapter(application.getIsAdapter()); diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java index 9df841db4..2ccb58f1f 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java @@ -6,7 +6,7 @@ import java.util.HashMap; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.util.DateUtils; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringGenerator; @@ -18,7 +18,7 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(TokenBasedDefaultAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; HashMap beanMap=new HashMap(); beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); @@ -77,7 +77,7 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/tokenbased_sso_submint"); - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; modelAndView.addObject("action", details.getRedirectUri()); modelAndView.addObject("token",data ); diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java index 756ec464a..4a4bfeb7b 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTAdapter.java @@ -9,8 +9,8 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.config.oidc.OIDCProviderMetadata; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ public class TokenBasedJWTAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(TokenBasedJWTAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; JwtSigningAndValidationService jwtSignerService= (JwtSigningAndValidationService)WebContext.getBean("jwtSignerValidationService"); @@ -84,7 +84,7 @@ public class TokenBasedJWTAdapter extends AbstractAuthorizeAdapter { } @Override - public String sign(String data, Applications app) { + public String sign(String data, Apps app) { return data; } @@ -92,7 +92,7 @@ public class TokenBasedJWTAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/tokenbased_jwt_sso_submint"); - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; modelAndView.addObject("action", details.getRedirectUri()); _logger.debug("jwt Token data : "+data); diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java index a28ed3360..dc27e76f6 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedJWTHS256Adapter.java @@ -11,8 +11,8 @@ import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService; import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ public class TokenBasedJWTHS256Adapter extends AbstractAuthorizeAdapter { @Override public String generateInfo(UserInfo userInfo,Object app) { - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; OIDCProviderMetadata providerMetadata= (OIDCProviderMetadata)WebContext.getBean("oidcProviderMetadata"); @@ -81,7 +81,7 @@ public class TokenBasedJWTHS256Adapter extends AbstractAuthorizeAdapter { } @Override - public String sign(String data, Applications app) { + public String sign(String data, Apps app) { return data; } @@ -89,7 +89,7 @@ public class TokenBasedJWTHS256Adapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/tokenbased_jwt_sso_submint"); - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; modelAndView.addObject("action", details.getRedirectUri()); _logger.debug("jwt Token data : "+data); diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java index af7777105..f3a497931 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java @@ -5,7 +5,7 @@ import java.util.Date; import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +15,7 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter { final static Logger _logger = LoggerFactory.getLogger(TokenBasedSimpleAdapter.class); @Override public String generateInfo(UserInfo userInfo,Object app) { - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; String tokenUsername=""; @@ -55,7 +55,7 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter { @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { modelAndView.setViewName("authorize/tokenbased_sso_submint"); - TokenBasedDetails details=(TokenBasedDetails)app; + AppsTokenBasedDetails details=(AppsTokenBasedDetails)app; modelAndView.addObject("action", details.getRedirectUri()); modelAndView.addObject("token",data); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java index 144d86c8b..a2e24bbb7 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java @@ -4,7 +4,7 @@ package org.maxkey.web.apps.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -36,10 +36,10 @@ public class ApplicationsController extends BaseAppContorller { @RequestMapping(value = { "/grid" }) @ResponseBody - public JpaPageResults queryDataGrid(@ModelAttribute("applications") Applications applications) { - JpaPageResults jqGridApp=applicationsService.queryPageResults(applications); + public JpaPageResults queryDataGrid(@ModelAttribute("applications") Apps applications) { + JpaPageResults jqGridApp=appsService.queryPageResults(applications); if(jqGridApp!=null&&jqGridApp.getRows()!=null){ - for (Applications app : jqGridApp.getRows()){ + for (Apps app : jqGridApp.getRows()){ WebContext.setAttribute(app.getId(), app.getIcon()); } } @@ -54,12 +54,12 @@ public class ApplicationsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/add"}) - public Message insert(@ModelAttribute("application") Applications application) { + public Message insert(@ModelAttribute("application") Apps application) { _logger.debug("-Add :" + application); transform(application); - if (applicationsService.insert(application)) { + if (appsService.insert(application)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -75,9 +75,9 @@ public class ApplicationsController extends BaseAppContorller { */ @ResponseBody @RequestMapping(value={"/query"}) - public Message query(@ModelAttribute("application") Applications application) { + public Message query(@ModelAttribute("application") Apps application) { _logger.debug("-query :" + application); - if (applicationsService.load(application)!=null) { + if (appsService.load(application)!=null) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -93,9 +93,9 @@ public class ApplicationsController extends BaseAppContorller { */ @ResponseBody @RequestMapping(value={"/update"}) - public Message update(@ModelAttribute("application") Applications application) { + public Message update(@ModelAttribute("application") Apps application) { _logger.debug("-update application :" + application); - if (applicationsService.update(application)) { + if (appsService.update(application)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -107,9 +107,9 @@ public class ApplicationsController extends BaseAppContorller { @ResponseBody @RequestMapping(value={"/delete"}) - public Message delete(@ModelAttribute("application") Applications application) { + public Message delete(@ModelAttribute("application") Apps application) { _logger.debug("-delete application :" + application); - if (applicationsService.delete(application)) { + if (appsService.delete(application)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java index 85e4799c8..c079c2baa 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java @@ -8,9 +8,9 @@ import java.io.IOException; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; -import org.maxkey.dao.service.ApplicationsService; +import org.maxkey.dao.service.AppsService; import org.maxkey.domain.ExtraAttrs; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,21 +26,20 @@ public class BaseAppContorller { final static Logger _logger = LoggerFactory.getLogger(BaseAppContorller.class); @Autowired - @Qualifier("applicationsService") - protected ApplicationsService applicationsService; + @Qualifier("appsService") + protected AppsService appsService; @Autowired @Qualifier("passwordReciprocal") protected PasswordReciprocal passwordReciprocal; - - - public void setApplicationsService(ApplicationsService applicationsService) { - this.applicationsService = applicationsService; - } - protected void transform(Applications application) { + public void setAppsService(AppsService appsService) { + this.appsService = appsService; + } + + protected void transform(Apps application) { encodeSharedPassword(application); @@ -70,8 +69,8 @@ public class BaseAppContorller { } - protected void encodeSharedPassword(Applications application){ - if(application.getCredential()!=Applications.CREDENTIALS.SHARED){ + protected void encodeSharedPassword(Apps application){ + if(application.getCredential()!=Apps.CREDENTIALS.SHARED){ if(application.getProtocol().equals(PROTOCOLS.DESKTOP)||application.getProtocol().equals(PROTOCOLS.FORMBASED)){ if(StringUtils.isNotEmpty(application.getSharedPassword())){ application.setSharedPassword(ReciprocalUtils.encode(application.getSharedPassword())); @@ -80,8 +79,8 @@ public class BaseAppContorller { } } - protected void decoderSharedPassword(Applications application){ - if(application.getCredential()!=Applications.CREDENTIALS.SHARED){ + protected void decoderSharedPassword(Apps application){ + if(application.getCredential()!=Apps.CREDENTIALS.SHARED){ if(application.getProtocol().equals(PROTOCOLS.DESKTOP)||application.getProtocol().equals(PROTOCOLS.FORMBASED)){ if(StringUtils.isNotEmpty(application.getSharedPassword())){ application.setSharedPassword(ReciprocalUtils.decoder(application.getSharedPassword())); @@ -90,7 +89,7 @@ public class BaseAppContorller { } } - protected void encoding(Applications application){ + protected void encoding(Apps application){ //application.setName(WebContext.encoding(application.getName())); if(null!=application.getDescription()){ @@ -100,7 +99,7 @@ public class BaseAppContorller { } - protected void encodeSecret(Applications application){ + protected void encodeSecret(Apps application){ if(application.getSecret()!=null&&!application.getSecret().equals("")){ // String encodeSecret=passwordReciprocal.encode(application.getSecret()); @@ -108,14 +107,14 @@ public class BaseAppContorller { } } - protected void decoderSecret(Applications application){ + protected void decoderSecret(Apps application){ if(application.getSecret()!=null&&!application.getSecret().equals("")){ String decodeSecret=passwordReciprocal.decoder(application.getSecret()); application.setSecret(decodeSecret); } } - protected void convertExtendAttr(Applications application) { + protected void convertExtendAttr(Apps application) { if(application.getAttribute()!=null){ String []attributes=application.getAttribute().split(","); String []attributeValue=application.getAttributeValue().split(","); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java index d42fe8742..c14439010 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BasicDetailsController.java @@ -5,7 +5,7 @@ import java.util.List; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -28,7 +28,7 @@ public class BasicDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/basic/appAdd"); - Applications appDetails =new Applications(); + Apps appDetails =new Apps(); appDetails.setId(appDetails.generateId()); appDetails.setProtocol(PROTOCOLS.BASIC); appDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.DES)); @@ -38,12 +38,12 @@ public class BasicDetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("appDetails") Applications appDetails ) { + public ModelAndView insert(@ModelAttribute("appDetails") Apps appDetails ) { _logger.debug("-Add :" + appDetails); transform(appDetails); - if (applicationsService.insert(appDetails)) { + if (appsService.insert(appDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -55,7 +55,7 @@ public class BasicDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/basic/appUpdate"); - Applications appDetails=applicationsService.get(id); + Apps appDetails=appsService.get(id); super.decoderSecret(appDetails); WebContext.setAttribute(appDetails.getId(), appDetails.getIcon()); modelAndView.addObject("model",appDetails); @@ -68,12 +68,12 @@ public class BasicDetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("appDetails") Applications appDetails) { + public ModelAndView update(@ModelAttribute("appDetails") Apps appDetails) { // _logger.debug("-update application :" + appDetails); transform(appDetails); - if (applicationsService.update(appDetails)) { + if (appsService.update(appDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -87,7 +87,7 @@ public class BasicDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (applicationsService.remove(id)) { + if (appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java index 5a162fbed..ec2686e9a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/CasDetailsController.java @@ -1,12 +1,10 @@ package org.maxkey.web.apps.contorller; -import java.util.List; - import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.dao.service.CasDetailsService; -import org.maxkey.domain.apps.CasDetails; +import org.maxkey.dao.service.AppsCasDetailsService; +import org.maxkey.domain.apps.AppsCasDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -27,12 +25,12 @@ public class CasDetailsController extends BaseAppContorller { final static Logger _logger = LoggerFactory.getLogger(CasDetailsController.class); @Autowired - CasDetailsService casDetailsService; + AppsCasDetailsService casDetailsService; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/cas/appAdd"); - CasDetails casDetails =new CasDetails(); + AppsCasDetails casDetails =new AppsCasDetails(); casDetails.setId(casDetails.generateId()); casDetails.setProtocol(PROTOCOLS.CAS); casDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.DES)); @@ -42,12 +40,12 @@ public class CasDetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("casDetails") CasDetails casDetails) { + public ModelAndView insert(@ModelAttribute("casDetails") AppsCasDetails casDetails) { _logger.debug("-Add :" + casDetails); transform(casDetails); - if (casDetailsService.insert(casDetails)&&applicationsService.insert(casDetails)) { + if (casDetailsService.insert(casDetails)&&appsService.insertApp(casDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -59,7 +57,7 @@ public class CasDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/cas/appUpdate"); - CasDetails casDetails=casDetailsService.get(id); + AppsCasDetails casDetails=casDetailsService.getAppDetails(id); super.decoderSecret(casDetails); WebContext.setAttribute(casDetails.getId(), casDetails.getIcon()); @@ -73,12 +71,12 @@ public class CasDetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("casDetails") CasDetails casDetails) { + public ModelAndView update(@ModelAttribute("casDetails") AppsCasDetails casDetails) { // _logger.debug("-update application :" + casDetails); transform(casDetails); - if (casDetailsService.update(casDetails)&&applicationsService.update(casDetails)) { + if (casDetailsService.update(casDetails)&&appsService.updateApp(casDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -92,7 +90,7 @@ public class CasDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (casDetailsService.remove(id)&&applicationsService.remove(id)) { + if (casDetailsService.remove(id)&&appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java index b2e026644..951e5aa0b 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java @@ -5,8 +5,8 @@ import java.util.List; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.dao.service.DesktopDetailsService; -import org.maxkey.domain.apps.DesktopDetails; +import org.maxkey.dao.service.AppsDesktopDetailsService; +import org.maxkey.domain.apps.AppsDesktopDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -27,12 +27,12 @@ public class DesktopDetailsController extends BaseAppContorller { final static Logger _logger = LoggerFactory.getLogger(DesktopDetailsController.class); @Autowired - DesktopDetailsService desktopDetailsService; + AppsDesktopDetailsService desktopDetailsService; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/desktop/appAdd"); - DesktopDetails desktopDetails=new DesktopDetails(); + AppsDesktopDetails desktopDetails=new AppsDesktopDetails(); desktopDetails.setId(desktopDetails.generateId()); desktopDetails.setProtocol(PROTOCOLS.DESKTOP); desktopDetails.setSecret(ReciprocalUtils.generateKey("")); @@ -44,12 +44,12 @@ public class DesktopDetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("desktopDetails") DesktopDetails desktopDetails) { + public ModelAndView insert(@ModelAttribute("desktopDetails") AppsDesktopDetails desktopDetails) { _logger.debug("-Add :" + desktopDetails); transform(desktopDetails); desktopDetailsService.insert(desktopDetails); - if (applicationsService.insert(desktopDetails)) { + if (appsService.insert(desktopDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -61,7 +61,7 @@ public class DesktopDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/desktop/appUpdate"); - DesktopDetails desktopDetails=desktopDetailsService.get(id); + AppsDesktopDetails desktopDetails=desktopDetailsService.getAppDetails(id); decoderSecret(desktopDetails); decoderSharedPassword(desktopDetails); WebContext.setAttribute(desktopDetails.getId(), desktopDetails.getIcon()); @@ -76,12 +76,12 @@ public class DesktopDetailsController extends BaseAppContorller { */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("desktopDetails") DesktopDetails desktopDetails) { + public ModelAndView update(@ModelAttribute("desktopDetails") AppsDesktopDetails desktopDetails) { // _logger.debug("-update application :" + desktopDetails); transform(desktopDetails); - if (desktopDetailsService.update(desktopDetails)&&applicationsService.update(desktopDetails)) { + if (desktopDetailsService.update(desktopDetails)&&appsService.update(desktopDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -94,7 +94,7 @@ public class DesktopDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (desktopDetailsService.remove(id)&&applicationsService.remove(id)) { + if (desktopDetailsService.remove(id)&&appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java index 628ec0dc5..1aabeafbf 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ExtendApiDetailsController.java @@ -5,8 +5,8 @@ import java.util.List; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.ExtendApiDetails; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsExtendApiDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -30,7 +30,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/extendapi/appAdd"); - ExtendApiDetails extendApiDetails=new ExtendApiDetails(); + AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); extendApiDetails.setId(extendApiDetails.generateId()); extendApiDetails.setProtocol(PROTOCOLS.EXTEND_API); extendApiDetails.setSecret(ReciprocalUtils.generateKey("")); @@ -40,12 +40,12 @@ public class ExtendApiDetailsController extends BaseAppContorller { } @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("extendApiDetails") ExtendApiDetails extendApiDetails) { + public ModelAndView insert(@ModelAttribute("extendApiDetails") AppsExtendApiDetails extendApiDetails) { _logger.debug("-Add :" + extendApiDetails); transform(extendApiDetails); - if (applicationsService.insert(extendApiDetails)) { + if (appsService.insert(extendApiDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -57,9 +57,9 @@ public class ExtendApiDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/extendapi/appUpdate"); - Applications application= applicationsService.get(id); + Apps application= appsService.get(id); super.decoderSecret(application); - ExtendApiDetails extendApiDetails=new ExtendApiDetails(); + AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails(); BeanUtils.copyProperties(application, extendApiDetails); WebContext.setAttribute(extendApiDetails.getId(), extendApiDetails.getIcon()); @@ -74,11 +74,11 @@ public class ExtendApiDetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("extendApiDetails") ExtendApiDetails extendApiDetails) { + public ModelAndView update(@ModelAttribute("extendApiDetails") AppsExtendApiDetails extendApiDetails) { _logger.debug("-update extendApiDetails :" + extendApiDetails); transform(extendApiDetails); - if (applicationsService.update(extendApiDetails)) { + if (appsService.update(extendApiDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -92,7 +92,7 @@ public class ExtendApiDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (applicationsService.remove(id)) { + if (appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java index 132309ef9..c4bb1707d 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java @@ -5,8 +5,8 @@ import java.util.List; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.dao.service.FormBasedDetailsService; -import org.maxkey.domain.apps.FormBasedDetails; +import org.maxkey.dao.service.AppsFormBasedDetailsService; +import org.maxkey.domain.apps.AppsFormBasedDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -27,13 +27,13 @@ public class FormBasedDetailsController extends BaseAppContorller { final static Logger _logger = LoggerFactory.getLogger(FormBasedDetailsController.class); @Autowired - FormBasedDetailsService formBasedDetailsService; + AppsFormBasedDetailsService formBasedDetailsService; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/formbased/appAdd"); - FormBasedDetails formBasedDetails=new FormBasedDetails(); + AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setId(formBasedDetails.generateId()); formBasedDetails.setProtocol(PROTOCOLS.FORMBASED); formBasedDetails.setSecret(ReciprocalUtils.generateKey("")); @@ -45,12 +45,12 @@ public class FormBasedDetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("formBasedDetails") FormBasedDetails formBasedDetails) { + public ModelAndView insert(@ModelAttribute("formBasedDetails") AppsFormBasedDetails formBasedDetails) { _logger.debug("-Add :" + formBasedDetails); transform(formBasedDetails); - if (formBasedDetailsService.insert(formBasedDetails)&&applicationsService.insert(formBasedDetails)) { + if (formBasedDetailsService.insert(formBasedDetails)&&appsService.insert(formBasedDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -62,7 +62,7 @@ public class FormBasedDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/formbased/appUpdate"); - FormBasedDetails formBasedDetails=formBasedDetailsService.get(id); + AppsFormBasedDetails formBasedDetails=formBasedDetailsService.getAppDetails(id); decoderSecret(formBasedDetails); decoderSharedPassword(formBasedDetails); WebContext.setAttribute(formBasedDetails.getId(), formBasedDetails.getIcon()); @@ -76,11 +76,11 @@ public class FormBasedDetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("formBasedDetails") FormBasedDetails formBasedDetails) { + public ModelAndView update(@ModelAttribute("formBasedDetails") AppsFormBasedDetails formBasedDetails) { // _logger.debug("-update application :" + formBasedDetails); transform(formBasedDetails); - if (formBasedDetailsService.update(formBasedDetails)&&applicationsService.update(formBasedDetails)) { + if (formBasedDetailsService.update(formBasedDetails)&&appsService.update(formBasedDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -94,7 +94,7 @@ public class FormBasedDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (formBasedDetailsService.remove(id)&&applicationsService.remove(id)) { + if (formBasedDetailsService.remove(id)&&appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/LtpaDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/LtpaDetailsController.java deleted file mode 100644 index 43cd856eb..000000000 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/LtpaDetailsController.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.maxkey.web.apps.contorller; - -import java.util.List; - -import org.maxkey.constants.OPERATEMESSAGE; -import org.maxkey.constants.PROTOCOLS; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.dao.service.TokenBasedDetailsService; -import org.maxkey.domain.apps.TokenBasedDetails; -import org.maxkey.web.WebContext; -import org.maxkey.web.message.Message; -import org.maxkey.web.message.MessageType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - - -@Controller -@RequestMapping(value={"/apps/ltpa"}) -public class LtpaDetailsController extends BaseAppContorller { - final static Logger _logger = LoggerFactory.getLogger(TokenBasedDetailsController.class); - - @Autowired - TokenBasedDetailsService tokenBasedDetailsService; - - @RequestMapping(value = { "/forwardAdd" }) - public ModelAndView forwardAdd() { - ModelAndView modelAndView=new ModelAndView("apps/ltpa/appAdd"); - TokenBasedDetails ltpaDetails =new TokenBasedDetails(); - ltpaDetails.setProtocol(PROTOCOLS.LTPA); - ltpaDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.DES)); - ltpaDetails.setAlgorithmKey(ltpaDetails.getSecret()); - modelAndView.addObject("model",ltpaDetails); - return modelAndView; - } - - - - @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("ltpaDetails") TokenBasedDetails ltpaDetails) { - _logger.debug("-Add :" + ltpaDetails); - transform(ltpaDetails); - - if (tokenBasedDetailsService.insert(ltpaDetails)&&applicationsService.insert(ltpaDetails)) { - new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); - - } else { - new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.error); - } - return WebContext.forward("forwardUpdate/"+ltpaDetails.getId()); - } - - @RequestMapping(value = { "/forwardUpdate/{id}" }) - public ModelAndView forwardUpdate(@PathVariable("id") String id) { - ModelAndView modelAndView=new ModelAndView("apps/ltpa/appUpdate"); - TokenBasedDetails ltpaDetails=tokenBasedDetailsService.get(id); - decoderSecret(ltpaDetails); - String algorithmKey=passwordReciprocal.decoder(ltpaDetails.getAlgorithmKey()); - ltpaDetails.setAlgorithmKey(algorithmKey); - WebContext.setAttribute(ltpaDetails.getId(), ltpaDetails.getIcon()); - - modelAndView.addObject("model",ltpaDetails); - return modelAndView; - } - - /** - * modify - * @param application - * @return - */ - - @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("ltpaDetails") TokenBasedDetails ltpaDetails) { - // - _logger.debug("-update application :" + ltpaDetails); - System.out.println(); - transform(ltpaDetails); - ltpaDetails.setAlgorithmKey(ltpaDetails.getSecret()); - if (tokenBasedDetailsService.update(ltpaDetails)&&applicationsService.update(ltpaDetails)) { - new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); - - } else { - new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_ERROR),MessageType.error); - } - return WebContext.forward("forwardUpdate/"+ltpaDetails.getId()); - } - - - @ResponseBody - @RequestMapping(value={"/delete/{id}"}) - public Message delete(@PathVariable("id") String id) { - _logger.debug("-delete application :" + id); - if (tokenBasedDetailsService.remove(id)&&applicationsService.remove(id)) { - return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); - - } else { - return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_ERROR),MessageType.error); - } - } - - -} diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java index dcb11ffc6..025acece3 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java @@ -6,8 +6,8 @@ import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.OAuth20Details; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsOAuth20Details; import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; @@ -35,7 +35,7 @@ public class OAuth20DetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/oauth20/appAdd"); - OAuth20Details oauth20Details=new OAuth20Details(); + AppsOAuth20Details oauth20Details=new AppsOAuth20Details(); oauth20Details.setId(oauth20Details.generateId()); oauth20Details.setSecret(ReciprocalUtils.generateKey("")); oauth20Details.setClientId(oauth20Details.getId()); @@ -47,7 +47,7 @@ public class OAuth20DetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("oauth20Details") OAuth20Details oauth20Details) { + public ModelAndView insert(@ModelAttribute("oauth20Details") AppsOAuth20Details oauth20Details ) { _logger.debug("-Add :" + oauth20Details); transform(oauth20Details); @@ -55,7 +55,7 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20JdbcClientDetailsService.addClientDetails(oauth20Details.clientDetailsRowMapper()); - if (applicationsService.insert(oauth20Details)) { + if (appsService.insertApp(oauth20Details)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -68,9 +68,9 @@ public class OAuth20DetailsController extends BaseAppContorller { public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/oauth20/appUpdate"); BaseClientDetails baseClientDetails=(BaseClientDetails)oauth20JdbcClientDetailsService.loadClientByClientId(id); - Applications application=applicationsService.get(id);// + Apps application=appsService.get(id);// decoderSecret(application); - OAuth20Details oauth20Details=new OAuth20Details(application,baseClientDetails); + AppsOAuth20Details oauth20Details=new AppsOAuth20Details(application,baseClientDetails); oauth20Details.setSecret(application.getSecret()); oauth20Details.setClientSecret(application.getSecret()); _logger.debug("forwardUpdate "+oauth20Details); @@ -84,7 +84,7 @@ public class OAuth20DetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("oauth20Details") OAuth20Details oauth20Details) { + public ModelAndView update( @ModelAttribute("oauth20Details") AppsOAuth20Details oauth20Details) { // _logger.debug("-update application :" + oauth20Details); _logger.debug("-update oauth20Details use oauth20JdbcClientDetails" ); @@ -93,7 +93,7 @@ public class OAuth20DetailsController extends BaseAppContorller { oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20JdbcClientDetailsService.updateClientDetails(oauth20Details.clientDetailsRowMapper()); oauth20JdbcClientDetailsService.updateClientSecret(oauth20Details.getClientId(), oauth20Details.getClientSecret()); - if (applicationsService.update(oauth20Details)) { + if (appsService.updateApp(oauth20Details)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_ERROR),MessageType.error); @@ -107,7 +107,7 @@ public class OAuth20DetailsController extends BaseAppContorller { public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); oauth20JdbcClientDetailsService.removeClientDetails(id); - if (applicationsService.remove(id)) { + if (appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java index f3b4f5ccf..f2743fac8 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -14,8 +14,8 @@ import org.maxkey.crypto.cert.NameUtil; import org.maxkey.crypto.cert.X509CertUtils; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.keystore.KeyStoreUtil; -import org.maxkey.dao.service.Saml20DetailsService; -import org.maxkey.domain.apps.SAML20Details; +import org.maxkey.dao.service.AppsSaml20DetailsService; +import org.maxkey.domain.apps.AppsSAML20Details; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -44,12 +44,12 @@ public class SAML20DetailsController extends BaseAppContorller { private KeyStoreLoader idpKeyStoreLoader; @Autowired - Saml20DetailsService saml20DetailsService; + AppsSaml20DetailsService saml20DetailsService; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/saml20/appAdd"); - SAML20Details saml20Details=new SAML20Details(); + AppsSAML20Details saml20Details=new AppsSAML20Details(); saml20Details.setSecret(ReciprocalUtils.generateKey("")); saml20Details.setProtocol(PROTOCOLS.SAML20); modelAndView.addObject("model",saml20Details); @@ -59,7 +59,7 @@ public class SAML20DetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("saml20Details") SAML20Details saml20Details) { + public ModelAndView insert(@ModelAttribute("saml20Details") AppsSAML20Details saml20Details) { _logger.debug("-Add :" + saml20Details); try { @@ -68,7 +68,7 @@ public class SAML20DetailsController extends BaseAppContorller { e.printStackTrace(); } saml20DetailsService.insert(saml20Details); - if (applicationsService.insert(saml20Details)) { + if (appsService.insert(saml20Details)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -80,7 +80,7 @@ public class SAML20DetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/saml20/appUpdate"); - SAML20Details saml20Details=saml20DetailsService.get(id); + AppsSAML20Details saml20Details=saml20DetailsService.getAppDetails(id); decoderSecret(saml20Details); WebContext.setAttribute(saml20Details.getId(), saml20Details.getIcon()); modelAndView.addObject("model",saml20Details); @@ -92,7 +92,7 @@ public class SAML20DetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("saml20Details") SAML20Details saml20Details) { + public ModelAndView update(@ModelAttribute("saml20Details") AppsSAML20Details saml20Details) { // _logger.debug("-update application :" + saml20Details); _logger.debug(""); @@ -102,7 +102,7 @@ public class SAML20DetailsController extends BaseAppContorller { e.printStackTrace(); } saml20DetailsService.update(saml20Details); - if (applicationsService.update(saml20Details)) { + if (appsService.update(saml20Details)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -116,7 +116,7 @@ public class SAML20DetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (saml20DetailsService.remove(id)&&applicationsService.remove(id)) { + if (saml20DetailsService.remove(id)&&appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { @@ -124,7 +124,7 @@ public class SAML20DetailsController extends BaseAppContorller { } } - protected SAML20Details transform(SAML20Details samlDetails) throws Exception{ + protected AppsSAML20Details transform(AppsSAML20Details samlDetails) throws Exception{ super.transform(samlDetails); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java index 3d30c139e..07a7235e2 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java @@ -5,8 +5,8 @@ import java.util.List; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.dao.service.TokenBasedDetailsService; -import org.maxkey.domain.apps.TokenBasedDetails; +import org.maxkey.dao.service.AppsTokenBasedDetailsService; +import org.maxkey.domain.apps.AppsTokenBasedDetails; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -27,13 +27,13 @@ public class TokenBasedDetailsController extends BaseAppContorller { final static Logger _logger = LoggerFactory.getLogger(TokenBasedDetailsController.class); @Autowired - TokenBasedDetailsService tokenBasedDetailsService; + AppsTokenBasedDetailsService tokenBasedDetailsService; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { ModelAndView modelAndView=new ModelAndView("apps/tokenbased/appAdd"); - TokenBasedDetails tokenBasedDetails =new TokenBasedDetails(); + AppsTokenBasedDetails tokenBasedDetails =new AppsTokenBasedDetails(); tokenBasedDetails.setProtocol(PROTOCOLS.TOKENBASED); tokenBasedDetails.setSecret(ReciprocalUtils.generateKey(ReciprocalUtils.Algorithm.AES)); tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret()); @@ -43,14 +43,14 @@ public class TokenBasedDetailsController extends BaseAppContorller { @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("tokenBasedDetails") TokenBasedDetails tokenBasedDetails) { + public ModelAndView insert(@ModelAttribute("tokenBasedDetails") AppsTokenBasedDetails tokenBasedDetails) { _logger.debug("-Add :" + tokenBasedDetails); transform(tokenBasedDetails); tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret()); - if (tokenBasedDetailsService.insert(tokenBasedDetails)&&applicationsService.insert(tokenBasedDetails)) { + if (tokenBasedDetailsService.insert(tokenBasedDetails)&&appsService.insert(tokenBasedDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success); } else { @@ -62,7 +62,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { @RequestMapping(value = { "/forwardUpdate/{id}" }) public ModelAndView forwardUpdate(@PathVariable("id") String id) { ModelAndView modelAndView=new ModelAndView("apps/tokenbased/appUpdate"); - TokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.get(id); + AppsTokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.getAppDetails(id); decoderSecret(tokenBasedDetails); String algorithmKey=passwordReciprocal.decoder(tokenBasedDetails.getAlgorithmKey()); tokenBasedDetails.setAlgorithmKey(algorithmKey); @@ -77,12 +77,12 @@ public class TokenBasedDetailsController extends BaseAppContorller { * @return */ @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("tokenBasedDetails") TokenBasedDetails tokenBasedDetails) { + public ModelAndView update(@ModelAttribute("tokenBasedDetails") AppsTokenBasedDetails tokenBasedDetails) { // _logger.debug("-update application :" + tokenBasedDetails); transform(tokenBasedDetails); tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret()); - if (tokenBasedDetailsService.update(tokenBasedDetails)&&applicationsService.update(tokenBasedDetails)) { + if (tokenBasedDetailsService.update(tokenBasedDetails)&&appsService.update(tokenBasedDetails)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success); } else { @@ -96,7 +96,7 @@ public class TokenBasedDetailsController extends BaseAppContorller { @RequestMapping(value={"/delete/{id}"}) public Message delete(@PathVariable("id") String id) { _logger.debug("-delete application :" + id); - if (tokenBasedDetailsService.remove(id)&&applicationsService.remove(id)) { + if (tokenBasedDetailsService.remove(id)&&appsService.remove(id)) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java index 915741c9c..3213fbb6c 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java @@ -4,11 +4,11 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.AccountsService; -import org.maxkey.dao.service.ApplicationsService; +import org.maxkey.dao.service.AppsService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.Accounts; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -34,8 +34,8 @@ public class AccountsController { AccountsService accountsService; @Autowired - @Qualifier("applicationsService") - protected ApplicationsService applicationsService; + @Qualifier("appsService") + protected AppsService appsService; @Autowired @Qualifier("userInfoService") @@ -64,7 +64,7 @@ public class AccountsController { @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd(@ModelAttribute("appAccounts") Accounts appAccounts) { ModelAndView modelAndView=new ModelAndView("/accounts/appAccountsAdd"); - //Applications app= applicationsService.get(appAccounts.getAppId()); + //Applications app= appsService.get(appAccounts.getAppId()); //appAccounts.setAppName(app.getName()); modelAndView.addObject("model",appAccounts); return modelAndView; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java index fdc33dcd5..66fa21747 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java @@ -4,7 +4,7 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.dao.service.GroupPrivilegesService; import org.maxkey.domain.GroupPrivileges; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -44,7 +44,7 @@ public class GroupPrivilegesController { jqGridApp= groupPrivilegesService.queryPageResults("appsInGroup",groupApp); if(jqGridApp!=null&&jqGridApp.getRows()!=null){ - for (Applications app : jqGridApp.getRows()){ + for (Apps app : jqGridApp.getRows()){ WebContext.setAttribute(app.getId(), app.getIcon()); } } @@ -68,7 +68,7 @@ public class GroupPrivilegesController { jqGridApp= groupPrivilegesService.queryPageResults("appsNotInGroup",groupApp); if(jqGridApp!=null&&jqGridApp.getRows()!=null){ - for (Applications app : jqGridApp.getRows()){ + for (Apps app : jqGridApp.getRows()){ WebContext.setAttribute(app.getId(), app.getIcon()); } } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java index 0fb774a42..9952ae928 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java @@ -4,12 +4,12 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.dao.service.LoginAppsHistoryService; -import org.maxkey.dao.service.LoginHistoryService; -import org.maxkey.dao.service.LogsService; -import org.maxkey.domain.LoginAppsHistory; -import org.maxkey.domain.LoginHistory; -import org.maxkey.domain.Logs; +import org.maxkey.dao.service.HistoryLoginAppsService; +import org.maxkey.dao.service.HistoryLoginService; +import org.maxkey.dao.service.HistoryLogsService; +import org.maxkey.domain.HistoryLoginApps; +import org.maxkey.domain.HistoryLogin; +import org.maxkey.domain.HistoryLogs; import org.maxkey.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,13 +35,13 @@ public class LogsController { final static Logger _logger = LoggerFactory.getLogger(LogsController.class); @Autowired - LoginHistoryService loginHistoryService; + HistoryLoginService loginHistoryService; @Autowired - protected LoginAppsHistoryService loginAppsHistoryService; + protected HistoryLoginAppsService loginAppsHistoryService; @Autowired - LogsService logsService; + HistoryLogsService logsService; /** * 查询操作日志 @@ -50,7 +50,7 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class); */ @RequestMapping(value={"/grid"}) @ResponseBody - public JpaPageResults logsDataGrid(@ModelAttribute("logs") Logs logs){ + public JpaPageResults logsDataGrid(@ModelAttribute("logs") HistoryLogs logs){ _logger.debug("logs/datagrid/ logsGrid() "+logs); return logsService.queryPageResults(logs); } @@ -67,12 +67,12 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class); } /** - * @param LoginHistory + * @param HistoryLogin * @return */ @RequestMapping(value={"/loginHistory/grid"}) @ResponseBody - public JpaPageResults logAuthsGrid(@ModelAttribute("loginHistory") LoginHistory loginHistory){ + public JpaPageResults logAuthsGrid(@ModelAttribute("loginHistory") HistoryLogin loginHistory){ _logger.debug("logs/loginHistory/datagrid/ logsGrid() "+loginHistory); return loginHistoryService.queryPageResults(loginHistory); } @@ -91,7 +91,7 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class); */ @RequestMapping(value={"/loginAppsHistory/grid"}) @ResponseBody - public JpaPageResults loginAppsHistoryGrid(@ModelAttribute("loginAppsHistory") LoginAppsHistory loginAppsHistory){ + public JpaPageResults loginAppsHistoryGrid(@ModelAttribute("loginAppsHistory") HistoryLoginApps loginAppsHistory){ _logger.debug("logs/loginAppsHistory/datagrid/ logsGrid() "+loginAppsHistory); loginAppsHistory.setId(null); return loginAppsHistoryService.queryPageResults(loginAppsHistory); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/LogAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java similarity index 81% rename from maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/LogAdapter.java rename to maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index 87693ddab..4e56a7ee0 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/LogAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -3,8 +3,8 @@ package org.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.dao.service.LogsService; -import org.maxkey.domain.Logs; +import org.maxkey.dao.service.HistoryLogsService; +import org.maxkey.domain.HistoryLogs; import org.maxkey.domain.UserInfo; import org.maxkey.util.JsonUtils; import org.maxkey.web.WebContext; @@ -25,13 +25,13 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * @author Crystal.Sea * */ -public class LogAdapter extends HandlerInterceptorAdapter { +public class HistoryLogsAdapter extends HandlerInterceptorAdapter { - private static final Logger _logger = LoggerFactory.getLogger(LogAdapter.class); + private static final Logger _logger = LoggerFactory.getLogger(HistoryLogsAdapter.class); @Autowired - @Qualifier("logsService") - private LogsService logsService; + @Qualifier("historyLogsService") + private HistoryLogsService historyLogsService; // after the handler is executed @Override @@ -42,7 +42,7 @@ public class LogAdapter extends HandlerInterceptorAdapter { if(message.getMessageScope() == MessageScope.DB || message.getMessageScope() == MessageScope.DB_CLIENT) {//判断message类型 UserInfo userInfo =WebContext.getUserInfo();//取得当前用户信息 //创建日志记录 - Logs logs = new Logs( + HistoryLogs logs = new HistoryLogs( message.getServiceName(), message.getCode(), message.getMessage(), @@ -54,7 +54,7 @@ public class LogAdapter extends HandlerInterceptorAdapter { "" ); _logger.debug("insert db logs content : "+logs); - logsService.insert(logs);//日志插入数据库 + historyLogsService.insert(logs);//日志插入数据库 if(message.getMessageScope() == MessageScope.DB) {//message类型仅插入数据库 WebContext.clearMessage();//清除message } diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index 40dc21ac7..e8adaef86 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -32,7 +32,7 @@ common.text.createdby=\u521B\u5EFA\u4EBA common.text.createddate=\u521B\u5EFA\u65F6\u95F4 common.text.modifiedby=\u4FEE\u6539\u4EBA common.text.modifieddate=\u4FEE\u6539\u65F6\u95F4 - +common.text.sortindex=\u6392\u5E8F common.text.status.start=\u5F00\u59CB common.text.status.normal=\u6B63\u5E38 common.text.status.validated=\u6709\u6548 @@ -96,6 +96,7 @@ login.social.icon=\u56FE\u6807 login.social.provider=\u4F9B\u5E94\u5546 # +userinfo.id=\u7528\u6237\u7F16\u53F7 userinfo.tab.basic=\u57FA\u672C\u4FE1\u606F userinfo.tab.business=\u673A\u6784\u4FE1\u606F userinfo.tab.personal=\u4E2A\u4EBA\u4FE1\u606F @@ -148,6 +149,7 @@ userinfo.windowsAccount=AD\u57DF\u8D26\u53F7 userinfo.organization=\u6240\u5C5E\u673A\u6784 userinfo.division=\u5206\u652F\u673A\u6784 userinfo.department=\u90E8\u95E8 +userinfo.departmentId=\u90E8\u95E8\u7F16\u53F7 userinfo.costCenter=\u6210\u672C\u4E2D\u5FC3 userinfo.jobTitle=\u804C\u4F4D userinfo.jobLevel=\u7EA7\u522B @@ -209,28 +211,28 @@ org.postalcode=\u90AE\u7F16 org.sortorder=\u6392\u5E8F org.description=\u63CF\u8FF0 - +#opt totp login.totp.sharedSecret=\u5171\u4EAB\u5BC6\u7801 login.totp.period=\u5468\u671F login.totp.digits=\u6570\u5B57 login.totp.crypto=\u52A0\u5BC6\u65B9\u5F0F login.totp.generate=\u91CD\u65B0\u751F\u6210 login.totp.title=TimeBased One Time Password - +#opt hotp login.hotp.sharedSecret=\u5171\u4EAB\u5BC6\u7801 login.hotp.period=\u5468\u671F login.hotp.digits=\u6570\u5B57 login.hotp.crypto=\u52A0\u5BC6\u65B9\u5F0F login.hotp.generate=\u91CD\u65B0\u751F\u6210 login.hotp.title=HOTP One Time Password - +#opt counter login.counter.sharedSecret=\u5171\u4EAB\u5BC6\u7801 login.counter.period=\u5468\u671F login.counter.digits=\u6570\u5B57 login.counter.crypto=\u52A0\u5BC6\u65B9\u5F0F login.counter.generate=\u91CD\u65B0\u751F\u6210 login.counter.title=Counter Based One Time Password - +#app apps.icon=\u56FE\u6807 apps.name=\u5E94\u7528\u540D\u79F0 apps.protocol=\u8BBF\u95EE\u534F\u8BAE @@ -245,9 +247,128 @@ apps.protocol.cas=CAS\u8BA4\u8BC1 apps.protocol.extendapi=API\u6269\u5C55\u8BA4\u8BC1 apps.protocol.basic=\u57FA\u672C\u767B\u5F55 apps.vendor=\u4F9B\u5E94\u5546 +apps.vendor.url=\u4F9B\u5E94\u5546\u7F51\u5740 +apps.basic.info=\u5E94\u7528\u57FA\u672C\u4FE1\u606F +apps.id=\u552F\u4E00\u7F16\u7801 +apps.secret=\u5E94\u7528\u79D8\u94A5 +apps.visible=\u6743\u9650\u8303\u56F4 +apps.visible.hidden=\u9690\u85CF +apps.visible.all=\u6240\u6709\u7528\u6237 +apps.visible.internet=\u5185\u90E8\u7528\u6237 +apps.visible.intranet=\u5916\u90E8\u7528\u6237 +apps.loginUrl=\u767B\u5F55\u5730\u5740 +apps.credential=\u51ED\u8BC1\u7C7B\u578B +apps.credential.user-defined=\u7528\u6237\u81EA\u5B9A\u4E49 +apps.credential.shared=\u5E94\u7528\u5171\u4EAB +apps.credential.system=\u7CFB\u7EDF\u914D\u7F6E +apps.systemUserAttr=\u7CFB\u7EDF\u5C5E\u6027 +apps.credential.sharedUsername=\u5171\u4EAB\u7528\u6237\u540D +apps.credential.sharedPassword=\u5171\u4EAB\u51ED\u8BC1 +apps.isAdapter=\u9002\u914D +apps.isAdapter.no=\u7981\u7528 +apps.isAdapter.yes=\u542F\u7528 +apps.adapter=\u9002\u914D\u5668 +apps.extendAttr=\u6269\u5C55\u5C5E\u6027 +apps.isExtendAttr=\u914D\u7F6E\u6269\u5C55\u5C5E\u6027 +apps.extendAttr.parameter=\u53C2\u6570 +apps.extendAttr.parameter.value=\u53C2\u6570\u503C +apps.principal=\u51ED\u8BC1 +apps.credentials=\u79D8\u94A5 +#formbased +apps.formbased.info=\u8868\u5355\u8BA4\u8BC1 +apps.formbased.redirectUri=\u8BA4\u8BC1\u5730\u5740 +apps.formbased.usernameMapping=\u767B\u5F55\u540D\u6620\u5C04 +apps.formbased.passwordMapping=\u767B\u5F55\u51ED\u8BC1\u6620\u5C04 +apps.formbased.authorizeView=\u8BA4\u8BC1\u89C6\u56FE +apps.formbased.parameter=\u53C2\u6570 +apps.formbased.parameter.value=\u53C2\u6570\u503C +#cas +apps.cas.info=CAS\u8BA4\u8BC1 +apps.cas.service=\u670D\u52A1\u5730\u5740 +apps.cas.validation=\u9A8C\u8BC1\u5730\u5740 +#desktop +apps.desktop.info=\u684C\u9762\u8BA4\u8BC1 +apps.desktop.programPath=\u5E94\u7528\u5B89\u88C5\u8DEF\u5F84 +apps.desktop.parameter=\u5E94\u7528\u53C2\u6570 +apps.desktop.usernameType=\u7528\u6237\u7C7B\u578B +apps.desktop.usernameParameter=\u7528\u6237\u53C2\u6570 +apps.desktop.preUsername=\u7528\u6237\u540D\u524D\u671F +apps.desktop.passwordType=\u51ED\u8BC1\u7C7B\u578B +apps.desktop.passwordParameter=\u51ED\u8BC1\u53C2\u6570 +apps.desktop.prePassword=\u51ED\u8BC1\u524D\u671F +apps.desktop.submitType=\u63D0\u4EA4\u7C7B\u578B +apps.desktop.preSubmit=\u63D0\u4EA4\u524D\u671F +#tokenbased +apps.tokenbased.info=\u4EE4\u724C\u8BA4\u8BC1 +apps.tokenbased.redirectUri=\u8BA4\u8BC1\u5730\u5740 +apps.tokenbased.tokenType=\u4EE4\u724C\u7C7B\u578B +apps.tokenbased.cookieName=Cookie\u540D\u79F0 +apps.tokenbased.algorithm=\u52A0\u5BC6\u7B97\u6CD5 +apps.tokenbased.algorithmKey=\u79D8\u94A5 +apps.tokenbased.token.content=\u4EE4\u724C\u5185\u5BB9 +apps.tokenbased.expires=\u8FC7\u671F\u65F6\u95F4 +#SAML +apps.saml.metadata.company=\u516C\u53F8 +apps.saml.spAcsUrl=SP ACS Url +apps.saml.fileType.Certificate=\u8BC1\u4E66 +apps.saml.metadata.orgDisplayName=\u7EC4\u7EC7\u540D\u79F0 +apps.saml.nameIdConvert.original=\u539F\u59CB +apps.saml.certIssuer=\u8BC1\u4E66\u9881\u53D1\u8005 +apps.saml.metadata=SAML\u5143\u6570\u636E +apps.saml.fileType=\u8BC1\u4E66\u7C7B\u578B +apps.saml.nameIdConvert=NameId Convert +apps.saml.target=\u76EE\u6807\u5730\u5740 +apps.saml.metadata.telephoneNumber=\u7535\u8BDD\u53F7\u7801 +apps.saml.fileType.metadata=SAML\u5143\u6570\u636E +apps.saml.metadata.givenName=\u540D +apps.saml.issuer=Issuer +apps.saml.nameIdConvert.upperCase=\u5927\u5199 +apps.saml.metadata.orgURL=\u7EC4\u7EC7\u7AD9\u70B9 +apps.saml.metadata.info=SAML V2.0 \u5143\u6570\u636E\u914D\u7F6E +apps.saml.certSubject=\u8BC1\u4E66\u4E3B\u9898 +apps.saml.certMetaFile=\u8BC1\u4E66\u6587\u4EF6 +apps.saml.encrypted.no=\u4E0D\u52A0\u5BC6 +apps.saml.binding=Binding +apps.saml.metadata.surName=\u59D3 +apps.saml.audience=Audience +apps.saml.v2.0.info=SAML V20 \u8BA4\u8BC1\u914D\u7F6E +apps.saml.metadata.contactType=\u8054\u7CFB\u7C7B\u578B +apps.saml.entityId=Entity Id +apps.saml.nameIdConvert.lowerCase=\u5C0F\u5199 +apps.saml.metadata.orgName=\u7EC4\u7EC7 +apps.saml.certExpiration=\u8BC1\u4E66\u6709\u6548\u671F +apps.saml.encrypted=\u52A0\u5BC6 +apps.saml.validityInterval=\u6709\u6548\u671F +apps.saml.encrypted.yes=\u52A0\u5BC6 +apps.saml.metadata.emailAddress=\u7535\u5B50\u90AE\u7BB1 +apps.saml.nameidFormat=Nameid Format +apps.saml.v1.1.info=SAML 1.1 \u8BA4\u8BC1\u914D\u7F6E +#oauth +apps.oauth.approvalPrompt.force=\u5F3A\u5236 +apps.oauth.accessTokenValiditySeconds=accessToken\u6709\u6548\u671F +apps.oauth.v2.0.clientSecret=Client Secret +apps.oauth.registeredRedirectUris=\u8BA4\u8BC1\u5730\u5740 +apps.oauth.approvalPrompt.auto=\u81EA\u52A8 +apps.oauth.refreshTokenValiditySeconds=refreshToken\u6709\u6548\u671F +apps.oauth.scope=\u4F5C\u7528\u57DF +apps.oauth.approvalPrompt=\u8BB8\u53EF\u786E\u8BA4 +apps.oauth.v2.0.info=OAuth 2.0 \u8BA4\u8BC1\u914D\u7F6E +apps.oauth.GrantTypes=\u6388\u6743\u65B9\u5F0F +apps.oauth.v2.0.clientId=Client Id +apps.oauth.connect.info=OpenID Connect \u8BA4\u8BC1\u914D\u7F6E +apps.oauth.connect.idTokenSigningAlgorithm=idToken\u7B7E\u540D\u7B97\u6CD5 +apps.oauth.connect.userInfoSigningAlgorithm=\u7528\u6237\u7B7E\u540D\u7B97\u6CD5 +apps.oauth.connect.jwksUri=JWKS\u5730\u5740 +apps.oauth.connect.idTokenEncryptedAlgorithm=idToken\u52A0\u5BC6\u7B97\u6CD5 +apps.oauth.connect.userInfoEncryptedAlgorithm=\u7528\u6237\u52A0\u5BC6\u7B97\u6CD5 +apps.oauth.connect.idTokenEncryptionMethod=idToken\u52A0\u5BC6\u65B9\u6CD5 +apps.oauth.connect.userInfoEncryptionMethod=\u7528\u6237\u52A0\u5BC6\u65B9\u6CD5 + +#group group.name=\u7528\u6237\u7EC4 +#account account.username=\u7528\u6237\u540D account.displayName=\u7528\u6237\u59D3\u540D account.appId=\u5E94\u7528\u7F16\u53F7 @@ -268,6 +389,7 @@ button.text.collapsesearch=\u6536\u7F29 button.text.cancel=\u53D6\u6D88 button.text.add.member=\u65B0\u589E\u6210\u5458 button.text.delete.member=\u5220\u9664\u6210\u5458 +button.text.generate=\u751F\u6210 log.loginhistory.id=\u7F16\u53F7 log.loginhistory.sessionId=\u4F1A\u8BDD diff --git a/maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml b/maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml index eaac2c58a..2ade5d143 100644 --- a/maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml +++ b/maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml @@ -91,7 +91,7 @@ - + diff --git a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js index 3fc7d07eb..70bc7ad09 100644 --- a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js +++ b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js @@ -23,6 +23,10 @@ $(function(){ //document forward $.forward=function(config){ + if(config.target){ + window.open(config.url,"_blank") + return; + } if(config.url){//to url document.location.href=config.url; }else if(config.href){//to href diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl index c53a2f432..ff71d0f7e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl @@ -25,7 +25,7 @@ <@locale code="userinfo.username" />： - + " wurl="<@base/>/userinfo/select" wwidth="800" @@ -44,7 +44,7 @@ <@locale code="apps.name" />： - + " wurl="<@base/>/apps/select" wwidth="800" diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl deleted file mode 100644 index f447658b1..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl +++ /dev/null @@ -1,21 +0,0 @@ - -
- - - - - - - - -
<#include "./appAddCommon.ftl"/> -
- - - - "/> - "/> -
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl index 5e7b0d6b3..05815cb68 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -1,6 +1,6 @@ - +
@@ -8,72 +8,64 @@ - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl deleted file mode 100644 index 8c9f12fb9..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - -
<@locale code="apps.basic.info"/>
<@locale code="apps.id"/>： - ${model.id} - + ${model.id!} + <@locale code="apps.secret"/>： - ${model.secret} - + ${model.secret!} +
<@locale code="apps.name"/>： - - * +
<@locale code="apps.loginUrl"/>： - - * +
<@locale code="apps.protocol"/>： - ${model.protocol} - + ${model.protocol!} + <@locale code="apps.category"/>： - +
<@locale code="apps.icon"/>： - - * + <@locale code="common.text.sortorder"/><@locale code="common.text.sortindex"/> - - * +
<@locale code="apps.vendor"/>： - - * + <@locale code="apps.vendor.url"/>： - - * +
<@locale code="apps.visible"/> - @@ -82,8 +74,7 @@ <@locale code="common.text.description"/>： - - * +
- - - - - -
<#include "./appUpdateCommon.ftl"/>
- "/> - "/> - \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl index b998df384..9397acd47 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl @@ -11,7 +11,7 @@ //--> - +
@@ -19,82 +19,73 @@ - - - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl index 86dd59c06..4ff30b528 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl @@ -15,70 +15,45 @@ return value==""?"":value; } }; - - function parserProtocolPath(protocol){ - if(protocol=="<%=PROTOCOLS.FORMBASED%>"){ - protocolPath="formbased"; - }else if(protocol=="<%=PROTOCOLS.TOKENBASED%>"){ - protocolPath="tokenbased"; - }else if(protocol=="<%=PROTOCOLS.OAUTH10A%>"){ - protocolPath="oauth10a"; - }else if(protocol=="<%=PROTOCOLS.OAUTH20%>"){ - protocolPath="oauth20"; - }else if(protocol=="<%=PROTOCOLS.SAML11%>"){ - protocolPath="saml11"; - }else if(protocol=="<%=PROTOCOLS.SAML20%>"){ - protocolPath="saml20"; - }else if(protocol=="<%=PROTOCOLS.DESKTOP%>"){ - protocolPath="desktop"; - }else if(protocol=="<%=PROTOCOLS.BASIC%>"){ - protocolPath="basic"; - }else if(protocol=="<%=PROTOCOLS.EXTEND_API%>"){ - protocolPath="extendapi"; - }else if(protocol=="<%=PROTOCOLS.LTPA%>"){ - protocolPath="ltpa"; - }else if(protocol=="<%=PROTOCOLS.CAS%>"){ - protocolPath="cas"; - } - return protocolPath; - }; + var protocolArray = new Array(); + protocolArray["OAuth_v2.0"]="oauth20"; + protocolArray["SAML_v2.0"]="saml20"; + protocolArray["Token_Based"]="tokenbased"; + protocolArray["Form_Based"]="formbased"; + protocolArray["Extend_API"]="extendapi"; + protocolArray["CAS"]="cas"; + protocolArray["Basic"]="basic"; + protocolArray["Desktop"]="desktop"; $(function () { $("#modifyApps").on("click",function(){ - var selectIds = $("#list").jqGrid("getGridParam", "selrow"); - if(selectIds == null || selectIds == "") { - $.alert({content:$.platform.messages.select.alertText}); - return false; - } - var selData= $("#list").jqGrid("getRowData",selectIds); + var seldata=$.dataGridSelRowsData("#datagrid"); + if(!seldata.length){ + $.alert({content:$.platform.messages.select.alertText}); + return; + } - $.forward({url:"<@base/>/apps/"+parserProtocolPath(selData["protocol"])+"/forwardUpdate/"+selData["id"]}); + $.forward({url:"<@base/>/apps/"+protocolArray[seldata[0]["protocol"]]+"/forwardUpdate/"+seldata[0]["id"],target:"_blank"}); }); //delete and batch delete button $("#deleteApps").click(function(){ - var selectIds = $("#list").jqGrid("getGridParam", "selrow"); - if($("#list")){//get grid list selected ids - if(selectIds == null || selectIds == "") { - $.alert({content:$.platform.messages.select.alertText}); - return; - } - - } - var selData= $("#list").getRowData(selectIds+""); + var seldata=$.dataGridSelRowsData("#datagrid"); + if(!seldata.length){ + $.alert({content:$.platform.messages.select.alertText}); + return; + } var _this=this; $.conform({//conform action content : $.platform.messages.del.conformText, callback : function () { //delete action post to url with ids - var deleteUrl="<@base/>/apps/"+parserProtocolPath(selData["protocol"])+"/delete/"+selData["id"]; + var deleteUrl="<@base/>/apps/"+protocolArray[seldata[0]["protocol"]]+"/delete/"+seldata[0]["id"]; $.post(deleteUrl, {_method:"delete",currTime:(new Date()).getTime()}, function(data) { //alert delete result $.alert({content:data.message,type:$.platform.messages.messageType[data.messageType]}); //refresh grid list - if($("#list")){ - $("#list").jqGrid('setGridParam').trigger("reloadGrid"); - } + $("#searchBtn").click(); }); } }); @@ -87,22 +62,23 @@ $( "#addApps" ).click(function() { var menu = $("#menu").show().position({ - my: "left top", - at: "left bottom", + my: "top", + at: "bottom", of: this }); - $( document ).on( "click", function() { - menu.hide(); - }); + return false; }); - - $(".select-menu-item").mouseover(function() { - $( this ).addClass( 'select-menu-item-selected' ); - }).mouseout(function() { - $( this ).removeClass( 'select-menu-item-selected' ); - }); + $( document ).click( function() { + $("#menu").hide(); + }); + + $(".select-menu-item").mouseover(function() { + $( this ).addClass( 'select-menu-item-selected' ); + }).mouseout(function() { + $( this ).removeClass( 'select-menu-item-selected' ); + }); }); @@ -155,15 +131,14 @@ <@locale code="button.text.add"/>
-
      <@locale code="apps.protocol.formbased" />
-
      <@locale code="apps.protocol.desktop" />
-
      <@locale code="apps.protocol.tokenbased" />
-
      <@locale code="apps.protocol.oauth2.0" />
-
      <@locale code="apps.protocol.saml2.0" />
-
      <@locale code="apps.protocol.ltpa" />
-
      <@locale code="apps.protocol.cas" />
-
      <@locale code="apps.protocol.extendapi" />
-
      <@locale code="apps.protocol.basic" />
+
      <@locale code="apps.protocol.formbased" />
+
      <@locale code="apps.protocol.desktop" />
+
      <@locale code="apps.protocol.tokenbased" />
+
      <@locale code="apps.protocol.oauth2.0" />
+
      <@locale code="apps.protocol.saml2.0" />
+
      <@locale code="apps.protocol.cas" />
+
      <@locale code="apps.protocol.extendapi" />
+
      <@locale code="apps.protocol.basic" />
" /> " /> @@ -185,9 +160,7 @@ - - diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl new file mode 100644 index 000000000..a37c406b9 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl @@ -0,0 +1,62 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + + + + + + +
<@locale code="apps.basic.info"/>
<@locale code="apps.id"/>： -
${model.id}
- - +
${model.id!}
+ + 		<@locale code="apps.secret"/>： "/>
-
${model.secret}
- +
${model.secret!}
+
<@locale code="apps.name"/>： - - * +
<@locale code="apps.loginUrl"/>： - - * +
<@locale code="apps.protocol"/>：${model.protocol} - + + <@locale code="apps.category"/>：
<@locale code="apps.icon"/>： - * + <@locale code="common.text.sortorder"/><@locale code="common.text.sortindex"/> - - * +
<@locale code="apps.vendor"/>： - - * + <@locale code="apps.vendor.url"/>： - - * +
<@locale code="apps.visible"/> - + + + + <@locale code="common.text.description"/>： - - * +
+ + + + + + + + +
<#include "../appAddCommon.ftl"/>
+ + + + + + +
+ + "/> + "/> +
+
+ + + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl new file mode 100644 index 000000000..c91ecf4f3 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl @@ -0,0 +1,70 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + + + +
+ + + + + + + + + + + +
<#include "../appUpdateCommon.ftl"/>
+ + + + + + + +
+ "/> + "/> +
+
+ +
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl index cb8a411c6..8e776f6d6 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl @@ -1,3 +1,15 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + +
- +
- + @@ -52,7 +73,7 @@ $(function(){
<#include "../appAddCommon.ftl"/>
- +
@@ -33,17 +47,24 @@ $(function(){ + + +
<@locale code="apps.cas.info"/>
<@locale code="apps.cas.service"/>： - + *
<@locale code="apps.cas.validation"/>： - + *
+ + "/> + "/> +
- - "/> - "/> -
\ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl index 8b7be70b5..f4a671ef4 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl @@ -1,3 +1,15 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + +
- + <#include "../appUpdateCommon.ftl"/> - +
- + + + +
<@locale code="apps.cas.info"/>
<@locale code="apps.cas.service"/>： - - * +
<@locale code="apps.cas.validation"/>： - - * + +
+ "/> + "/> +
- - - "/> - "/> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl index 1e1ac2066..75796f7e4 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- +
- + -
<#include "../appAddCommon.ftl"/>
- +
@@ -75,7 +88,7 @@ $(function(){ @@ -83,7 +96,7 @@ $(function(){ @@ -91,7 +104,7 @@ $(function(){ @@ -113,7 +126,7 @@ $(function(){ @@ -135,17 +148,17 @@ $(function(){ @@ -153,17 +166,17 @@ $(function(){ - + - + - + @@ -210,4 +223,6 @@ $(function(){ "/> "/> - \ No newline at end of file + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl index 2e2eb478a..8fe990fe4 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + - + - - - - - - - - @@ -145,78 +157,84 @@ $(function(){ - - - style="display:none" > + style="display:none" > - style="display:none"> - + style="display:none"> + - + + + + + +
<@locale code="apps.desktop.info" />
<@locale code="apps.desktop.programPath" />： - + *
<@locale code="apps.desktop.parameter" />： - + *
<@locale code="apps.desktop.usernameType" />： - @@ -99,13 +112,13 @@ $(function(){ <@locale code="apps.desktop.preUsername" />： - + *
<@locale code="apps.desktop.passwordType" />： - @@ -121,13 +134,13 @@ $(function(){ <@locale code="apps.desktop.prePassword" />： - + *
<@locale code="apps.desktop.submitType" />： - - + * <@locale code="apps.desktop.preSubmit" />： - + *
<@locale code="apps.credential" />： - + <@locale code="apps.credential.user-defined" /> - + <@locale code="apps.credential.shared" /> - + <@locale code="apps.credential.system" /> * <@locale code="apps.isAdapter" />： - @@ -172,13 +185,13 @@ $(function(){
<@locale code="apps.adapter" />： - +
<#include "../appUpdateCommon.ftl"/>
@@ -80,64 +93,63 @@ $(function(){
<@locale code="apps.desktop.programPath" />： - - * + +
<@locale code="apps.desktop.parameter" />： - + - *
<@locale code="apps.desktop.usernameType" />： - + + - * + style="display:none" > + style="display:none" > <@locale code="apps.desktop.usernameParameter" />：style="display:none" > - - * + style="display:none" > + + style="display:none" > + style="display:none" > <@locale code="apps.desktop.preUsername" />：style="display:none" > - - * + style="display:none" > + +
<@locale code="apps.desktop.passwordType" />： - + + - * + style="display:none" > + style="display:none" > <@locale code="apps.desktop.passwordParameter" />：style="display:none" > - - * + style="display:none" > + + style="display:none" > + style="display:none" > <@locale code="apps.desktop.prePassword" />：style="display:none" > - - * + style="display:none" > + +
<@locale code="apps.desktop.submitType" />： - + + + - style="display:none" type="text" id="submitKey" name="submitKey" size="3" title="" value="${model.submitKey}"/> - * + style="display:none" type="text" id="submitKey" name="submitKey" size="3" title="" value="${model.submitKey}"/> + style="display:none" > + style="display:none" > <@locale code="apps.desktop.preSubmit" />：style="display:none" > - - * + style="display:none" > + +
<@locale code="apps.credential" />： - checked /> + checked /> <@locale code="apps.credential.user-defined" /> - checked /> + checked /> <@locale code="apps.credential.shared" /> - checked /> + checked /> <@locale code="apps.credential.system" /> - * + <@locale code="apps.isAdapter" />： - + +
<@locale code="apps.adapter" />： - +
<@locale code="apps.credential.system" />： - + + + + + - *
<@locale code="apps.credential.shared.sharedUsername" />：
<@locale code="apps.credential.sharedUsername" />： - - * + + <@locale code="apps.credential.shared.sharedPassword" />：<@locale code="apps.credential.sharedPassword" />： - - * +
+ "/> + "/> +
- "/> - "/> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl index 4a3cbf8b2..399b01439 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl @@ -1,3 +1,15 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + +
- + <#include "../appAddCommon.ftl"/> @@ -79,14 +93,14 @@ $(function(){ - <@locale code="apps.formbased.credential"/>： + <@locale code="apps.credential"/>： - <@locale code="apps.formbased.credential.user-defined"/> + <@locale code="apps.credential.user-defined"/> - <@locale code="apps.formbased.credential.shared"/> + <@locale code="apps.credential.shared"/> - <@locale code="apps.formbased.credential.system"/> + <@locale code="apps.credential.system"/> * <@locale code="apps.isAdapter"/>： @@ -104,7 +118,7 @@ $(function(){ - <@locale code="apps.formbased.systemUserAttr"/>： + <@locale code="apps.systemUserAttr"/>： + "/> + "/> + + + - - - - "/> - "/> + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl index 8d1da0634..d2ead4fc7 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- +
- +
<#include "../appUpdateCommon.ftl"/>
- +
- + - style="display:none" > - + style="display:none" > + - style="display:none"> - + style="display:none"> + - + - + @@ -166,3 +178,5 @@ $(function(){ "/> "/> + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl index d1ccec8e6..3ed1fc3d1 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + -
<@locale code="apps.principal"/>： - - * + + <@locale code="apps.credentials"/>： - - * + +
<@locale code="apps.formbased.credential"/>：<@locale code="apps.credential"/>： - checked /> - <@locale code="apps.formbased.credential.user-defined"/> - checked /> - <@locale code="apps.formbased.credential.shared"/> - checked /> - <@locale code="apps.formbased.credential.system"/> - * + checked /> + <@locale code="apps.credential.user-defined"/> + checked /> + <@locale code="apps.credential.shared"/> + checked /> + <@locale code="apps.credential.system"/> + <@locale code="apps.isAdapter"/>： - + +
<@locale code="apps.adapter"/>： - +
<@locale code="apps.formbased.systemUserAttr"/>：
<@locale code="apps.systemUserAttr"/>： - + - - - - - *
<@locale code="apps.formbased.sharedUsername"/>：
<@locale code="apps.credential.sharedUsername"/>： - - * + + <@locale code="apps.formbased.sharedPassword"/>：<@locale code="apps.credential.sharedPassword"/>： - - * + +
<@locale code="apps.formbased.extendAttr"/>：<@locale code="apps.extendAttr"/>： - checked /> - <@locale code="apps.formbased.isExtendAttr"/> - style="display:none"> - + checked /> + <@locale code="apps.isExtendAttr"/> + style="display:none"> +
+
- + +
<#include "../appAddCommon.ftl"/>
- +
@@ -74,7 +87,7 @@ $(function(){ @@ -82,30 +95,30 @@ $(function(){ - + - + - + - + - + + + + + +
<@locale code="apps.formbased.redirectUri"/>： - + *
<@locale code="apps.formbased.usernameMapping"/>： - + * <@locale code="apps.formbased.passwordMapping"/>： - + *
<@locale code="apps.formbased.credential"/>：<@locale code="apps.credential"/>： - <@locale code="apps.formbased.credential.user-defined"/> + <@locale code="apps.credential.user-defined"/> - <@locale code="apps.formbased.credential.shared"/> + <@locale code="apps.credential.shared"/> - <@locale code="apps.formbased.credential.system"/> + <@locale code="apps.credential.system"/> * <@locale code="apps.isAdapter"/>： - @@ -114,19 +127,19 @@ $(function(){
<@locale code="apps.adapter"/>： - +
<@locale code="apps.formbased.authorizeView"/>： - +
<@locale code="apps.formbased.extendAttr"/>：<@locale code="apps.extendAttr"/>： - <@locale code="apps.formbased.isExtendAttr"/> + <@locale code="apps.isExtendAttr"/>
+ + "/> + "/> +
- - "/> - "/> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl index 19c3a7062..37f05f689 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl @@ -1,4 +1,14 @@ - + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- +
- + -
<#include "../appUpdateCommon.ftl"/>
- +
@@ -86,102 +98,108 @@ $(function(){ + - + - style="display:none" > - + style="display:none" > + - style="display:none"> - + style="display:none"> + - + - + + + + + +
<@locale code="apps.formbased.redirectUri"/>： - - * +
<@locale code="apps.formbased.usernameMapping"/>： - - * + <@locale code="apps.formbased.passwordMapping"/>： - - * + +
<@locale code="apps.formbased.credential"/>：<@locale code="apps.credential"/>： - checked /> - <@locale code="apps.formbased.credential.user-defined"/> - checked /> - <@locale code="apps.formbased.credential.shared"/> - checked /> - <@locale code="apps.formbased.credential.system"/> - * + checked /> + <@locale code="apps.credential.user-defined"/> + checked /> + <@locale code="apps.credential.shared"/> + checked /> + <@locale code="apps.credential.system"/> + <@locale code="apps.isAdapter"/>： - + +
<@locale code="apps.adapter"/>： - +
<@locale code="apps.formbased.authorizeView"/>： - +
<@locale code="apps.formbased.systemUserAttr"/>：
<@locale code="apps.systemUserAttr"/>： - + - - - - - *
<@locale code="apps.formbased.sharedUsername"/>：
<@locale code="apps.credential.sharedUsername"/>： - - * + + <@locale code="apps.formbased.sharedPassword"/>：<@locale code="apps.credential.sharedPassword"/>： - - * + +
<@locale code="apps.formbased.extendAttr"/>：<@locale code="apps.extendAttr"/>： - checked /> - <@locale code="apps.formbased.isExtendAttr"/> - style="display:none"> - + checked /> + <@locale code="apps.isExtendAttr"/> + style="display:none"> +
+ "/> + "/> +
- "/> - "/> -
\ No newline at end of file +
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.ftl deleted file mode 100644 index 41c40fcff..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appAdd.ftl +++ /dev/null @@ -1,115 +0,0 @@ - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
<@locale code="apps.ltpa.info" />
<@locale code="apps.ltpa.redirectUri" />： - - * -
<@locale code="apps.ltpa.cookieName" />： - - * -
<@locale code="apps.ltpa.algorithm" />： - - * - <@locale code="apps.ltpa.algorithmKey" />： - ${model.algorithmKey} - - -
<@locale code="apps.ltpa.token.content" />： - - - - - - - - - - -
<@locale code="userinfo.id" /><@locale code="userinfo.username" /><@locale code="userinfo.email" /><@locale code="userinfo.windowsAccount" /><@locale code="userinfo.employeeNumber" /><@locale code="userinfo.departmentId" /><@locale code="userinfo.department" />
-
<@locale code="apps.ltpa.expires" />： - - <@locale code="apps.isAdapter" />： - -
<@locale code="apps.adapter" />： - -
-
- - - - "/> - "/> -
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.ftl deleted file mode 100644 index cd1efbb11..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/ltpa/appUpdate.ftl +++ /dev/null @@ -1,123 +0,0 @@ - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
<@locale code="apps.ltpa.info" />
<@locale code="apps.ltpa.redirectUri" />： - - * -
<@locale code="apps.ltpa.cookieName" />： - - * -
<@locale code="apps.ltpa.algorithm" />： - - * - <@locale code="apps.ltpa.algorithmKey" />： - ${model.algorithmKey} - - -
<@locale code="apps.ltpa.token.content" />： - - - - - - - - - - -
<@locale code="userinfo.id" />checked /><@locale code="userinfo.username" />checked/><@locale code="userinfo.email" />checked/><@locale code="userinfo.windowsAccount" />checked/><@locale code="userinfo.employeeNumber" />checked/><@locale code="userinfo.departmentId" />checked/><@locale code="userinfo.department" />checked/>
-
<@locale code="apps.ltpa.expires" />： - - <@locale code="apps.isAdapter" />： - -
<@locale code="apps.adapter" />： - -
-
- - - "/> - "/> -
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl index 6a866f3a4..ceddba82f 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl @@ -1,24 +1,36 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + - + +
- +
- +
<#include "../appAddCommon.ftl"/>
- +
@@ -27,13 +39,13 @@ $(function(){ @@ -75,26 +87,29 @@ $(function(){ - + + + + - + - + - + - + - + - + + + + @@ -215,9 +237,7 @@ $(function(){ -
<@locale code="apps.oauth.v2.0.clientId" />： ${model.clientId} - + <@locale code="apps.oauth.v2.0.clientSecret" />： ${model.clientSecret} - +
<@locale code="apps.oauth.registeredRedirectUris" />： - + *
<@locale code="apps.oauth.accessTokenValiditySeconds" />： - + * <@locale code="apps.oauth.refreshTokenValiditySeconds" />： - + *
<@locale code="apps.connect.idTokenSigningAlgorithm" />：<@locale code="apps.oauth.connect.info" />
<@locale code="apps.oauth.connect.idTokenSigningAlgorithm" />： - @@ -107,9 +122,9 @@ $(function(){ <@locale code="apps.connect.userInfoSigningAlgorithm" />：<@locale code="apps.oauth.connect.userInfoSigningAlgorithm" />： - @@ -124,15 +139,15 @@ $(function(){
<@locale code="apps.connect.jwksUri" />：<@locale code="apps.oauth.connect.jwksUri" />： - +
<@locale code="apps.connect.idTokenEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.idTokenEncryptedAlgorithm" />： - @@ -145,9 +160,9 @@ $(function(){ <@locale code="apps.connect.userInfoEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.userInfoEncryptedAlgorithm" />： - @@ -163,9 +178,9 @@ $(function(){
<@locale code="apps.connect.idTokenEncryptionMethod" />：<@locale code="apps.oauth.connect.idTokenEncryptionMethod" />： - @@ -173,9 +188,9 @@ $(function(){ <@locale code="apps.connect.userInfoEncryptionMethod" />：<@locale code="apps.oauth.connect.userInfoEncryptionMethod" />： - @@ -187,7 +202,7 @@ $(function(){
<@locale code="apps.oauth.approvalPrompt" />： - <@locale code="apps.isAdapter" />： -
<@locale code="apps.adapter" />： - + +
+ + "/> + "/>
- - - "/> - "/> - \ No newline at end of file +
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl index 9e4cfe3a9..05b42062d 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- + <#include "../appAddCommon.ftl"/> @@ -28,7 +41,7 @@ $(function(){ <@locale code="apps.saml.entityId" />： - + * @@ -38,7 +51,7 @@ $(function(){ <@locale code="apps.saml.issuer" />： - + * @@ -46,7 +59,7 @@ $(function(){ <@locale code="apps.saml.spAcsUrl" />： - + * @@ -54,14 +67,14 @@ $(function(){ <@locale code="apps.saml.audience" />： - + <@locale code="apps.saml.nameidFormat" />： - @@ -75,7 +88,7 @@ $(function(){ <@locale code="apps.saml.nameIdConvert" />： - @@ -102,14 +115,14 @@ $(function(){ <@locale code="apps.saml.validityInterval" />： - + <@locale code="apps.saml.fileType" />： - @@ -117,7 +130,7 @@ $(function(){ <@locale code="apps.saml.certMetaFile" />： - + * @@ -125,7 +138,7 @@ $(function(){ <@locale code="apps.saml.encrypted" />： - @@ -143,7 +156,14 @@ $(function(){ <@locale code="apps.adapter" />： - + + + + + + + "/> + "/> @@ -152,7 +172,7 @@ $(function(){ - - "/> - "/> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl index 95d14d086..37e8db423 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl @@ -1,8 +1,19 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- +
- + -
<#include "../appUpdateCommon.ftl"/>
- +
@@ -40,87 +53,79 @@ $(function(){ @@ -166,13 +171,19 @@ $(function(){ + + +
<@locale code="apps.saml.entityId" />： - - * +
<@locale code="apps.saml.spAcsUrl" />： - - * +
<@locale code="apps.saml.issuer" />： - - * +
<@locale code="apps.saml.audience" />： - - * +
<@locale code="apps.saml.nameidFormat" />： - + + + + + + + + - * <@locale code="apps.saml.nameIdConvert" />： - + - - - *
<@locale code="apps.saml.binding" />： - + + + + + + - * <@locale code="apps.saml.validityInterval" />： - +
<@locale code="apps.saml.fileType" />： - - * <@locale code="apps.saml.certMetaFile" />： @@ -132,25 +137,25 @@ $(function(){
<@locale code="apps.saml.encrypted" />： - + - <@locale code="apps.isAdapter" />： - + +
<@locale code="apps.adapter" />： - +
${model.certSubject}
+ + "/> + "/> +
- - "/> - "/> -
\ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/metadata.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/metadata.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/apps/saml20/metadata.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/saml20/metadata.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl index c2998e05a..3dc6ade8c 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl @@ -29,8 +29,7 @@
- - +
<@locale code="apps.name"/>: diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl index 61a6c4880..7e169e901 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl @@ -1,3 +1,15 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + + +
- +
- +
<#include "../appAddCommon.ftl"/>
- +
- + - + - + + + + + + + - + - + - + - + - + - + + + + @@ -118,7 +153,7 @@ $(function(){
<@locale code="apps.tokenbased.info" />
：<@locale code="apps.tokenbased.redirectUri" />： - + *
：<@locale code="apps.tokenbased.tokenType" />： + + <@locale code="apps.tokenbased.cookieName" />： + + * +
<@locale code="apps.tokenbased.algorithm" />： - @@ -56,58 +84,65 @@ $(function(){ * ：<@locale code="apps.tokenbased.algorithmKey" />： - ${model.algorithmKey} - + ${model.algorithmKey!} +
：<@locale code="apps.tokenbased.token.content" />： - - - - - - - + + + + + + +
<@locale code="userinfo.id" /><@locale code="userinfo.username" /><@locale code="userinfo.email" /><@locale code="userinfo.windowsAccount" /><@locale code="userinfo.employeeNumber" /><@locale code="userinfo.departmentId" /><@locale code="userinfo.department" />
：<@locale code="apps.tokenbased.expires" />： - + ：<@locale code="apps.isAdapter" />： - + +
：<@locale code="apps.adapter" />： - - - - - + + + +
：<@locale code="apps.adapter" />： - + +
+ + "/> + "/>
- - "/> - "/> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl index f2b7054af..b3fe62b6e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl @@ -1,3 +1,14 @@ + + + + <#include "../../layout/header.ftl"/> + <#include "../../layout/common.cssjs.ftl"/> + + +
- +
- +
<#include "../appUpdateCommon.ftl"/>
- +
- + - + - + + + + + + + - + - + - + - + - + - + + + + @@ -125,9 +157,7 @@ $(function(){ -
<@locale code="apps.tokenbased.info" />
：<@locale code="apps.tokenbased.redirectUri" />： - - * +
：<@locale code="apps.tokenbased.tokenType" />： + + <@locale code="apps.tokenbased.cookieName" />： + + * +
<@locale code="apps.tokenbased.algorithm" />： - + + + + + + - * ：<@locale code="apps.tokenbased.algorithmKey" />： ${model.algorithmKey} @@ -74,50 +99,57 @@ $(function(){
：<@locale code="apps.tokenbased.token.content" />： - - - - - - - + + + + + + +
checked />checked/>checked/>checked/>checked/>checked/>checked/><@locale code="userinfo.id" />checked /><@locale code="userinfo.username" />checked/><@locale code="userinfo.email" />checked/><@locale code="userinfo.windowsAccount" />checked/><@locale code="userinfo.employeeNumber" />checked/><@locale code="userinfo.departmentId" />checked/><@locale code="userinfo.department" />checked/>
：<@locale code="apps.tokenbased.expires" />： - + ：<@locale code="apps.isAdapter" />： - + +
：<@locale code="apps.adapter" />： - - - - - + + + +
：<@locale code="apps.adapter" />： - + +
+ + "/> + "/>
- - - "/> - "/> - \ No newline at end of file +
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl index 2fb415c9e..5337111bc 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl @@ -68,8 +68,8 @@
- - + +
@@ -77,7 +77,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -141,7 +141,7 @@
- +
@@ -162,7 +162,7 @@
- +
diff --git a/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component b/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component index 2fb6a1292..ffee145ef 100644 --- a/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component +++ b/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component @@ -35,9 +35,6 @@ uses - - uses - uses diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index e2fe264c7..57837b9e2 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -34,7 +34,6 @@ dependencies { compile project(":maxkey-protocols:maxkey-protocol-desktop") compile project(":maxkey-protocols:maxkey-protocol-extendapi") compile project(":maxkey-protocols:maxkey-protocol-formbased") - compile project(":maxkey-protocols:maxkey-protocol-ltpa") compile project(":maxkey-protocols:maxkey-protocol-tokenbased") compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index 644d0ae20..b28a98ed3 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -6,13 +6,13 @@ import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.constants.PROTOCOLS; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.AccountsService; -import org.maxkey.dao.service.ApplicationsService; +import org.maxkey.dao.service.AppsService; import org.maxkey.dao.service.MyAppsListService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.Accounts; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; -import org.maxkey.domain.apps.UserApplications; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.UserApps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; import org.maxkey.web.message.MessageType; @@ -44,7 +44,7 @@ public class AppListController{ AccountsService appUsersService; @Autowired - ApplicationsService applicationsService; + AppsService applicationsService; @RequestMapping(value={"/appList"}) public ModelAndView appList(@RequestParam(value="gridList",required = false) String gridList) { @@ -70,12 +70,12 @@ public class AppListController{ } - private List queryAccessableApps(){ - UserApplications userApplications=new UserApplications(); + private List queryAccessableApps(){ + UserApps userApplications=new UserApps(); userApplications.setUsername(WebContext.getUserInfo().getUsername()); - List appList=myAppsListService.queryMyApps(userApplications); - for (UserApplications app : appList){ + List appList=myAppsListService.queryMyApps(userApplications); + for (UserApps app : appList){ WebContext.setAttribute(app.getId(), app.getIcon()); } @@ -162,7 +162,7 @@ public class AppListController{ Accounts appUsers=new Accounts(); UserInfo userInfo=WebContext.getUserInfo(); - if(credential==Applications.CREDENTIALS.USER_DEFINED){ + if(credential==Apps.CREDENTIALS.USER_DEFINED){ appUsers=appUsersService.load(new Accounts(userInfo.getId(),appId)); if(protocol.equalsIgnoreCase(PROTOCOLS.DESKTOP)|| protocol.equalsIgnoreCase(PROTOCOLS.FORMBASED)|| @@ -172,8 +172,7 @@ public class AppListController{ modelAndView.addObject("username",true); modelAndView.addObject("password",true); - }else if(protocol.equalsIgnoreCase(PROTOCOLS.SAML11)|| - protocol.equalsIgnoreCase(PROTOCOLS.SAML20) + }else if(protocol.equalsIgnoreCase(PROTOCOLS.SAML20) ){ modelAndView.addObject("username",true); modelAndView.addObject("password",false); @@ -211,14 +210,14 @@ public class AppListController{ @RequestParam("identity_password") String identity_password ){ - Applications app=applicationsService.get(appId); + Apps app=applicationsService.get(appId); UserInfo userInfo=WebContext.getUserInfo(); Accounts appUsers=new Accounts(); appUsers.setAppId(appId); appUsers.setUid(userInfo.getId()); - if(identity_password!=null&&!identity_password.equals("")&&credential==Applications.CREDENTIALS.USER_DEFINED){ + if(identity_password!=null&&!identity_password.equals("")&&credential==Apps.CREDENTIALS.USER_DEFINED){ appUsers=appUsersService.load(new Accounts(userInfo.getId(),appId)); if(appUsers==null){ appUsers=new Accounts(); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java new file mode 100644 index 000000000..136b28710 --- /dev/null +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/HistorysController.java @@ -0,0 +1,112 @@ +package org.maxkey.web.contorller; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.apache.mybatis.jpa.persistence.JpaPageResults; +import org.maxkey.dao.service.HistoryLoginAppsService; +import org.maxkey.dao.service.HistoryLoginService; +import org.maxkey.dao.service.HistoryLogsService; +import org.maxkey.domain.HistoryLoginApps; +import org.maxkey.domain.HistoryLogin; +import org.maxkey.domain.HistoryLogs; +import org.maxkey.util.DateUtils; +import org.maxkey.web.WebContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.propertyeditors.CustomDateEditor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 登录日志和操作日志查询 + * + * @author Crystal.sea + * + */ + +@Controller +@RequestMapping(value={"/historys"}) +public class HistorysController { +final static Logger _logger = LoggerFactory.getLogger(HistorysController.class); + + @Autowired + HistoryLoginService historyLoginService; + + @Autowired + protected HistoryLoginAppsService historyLoginAppsService; + + @Autowired + HistoryLogsService historyLogsService; + + @RequestMapping(value={"/logs"}) + public String List(){ + return "historys/logsList"; + } + + + /** + * 查询操作日志 + * @param logs + * @return + */ + @RequestMapping(value={"/logs/grid"}) + @ResponseBody + public JpaPageResults logsDataGrid(@ModelAttribute("historyLogs") HistoryLogs historyLogs){ + _logger.debug("history/logs/grid/ logsGrid() "+historyLogs); + return historyLogsService.queryPageResults(historyLogs); + } + + @RequestMapping(value={"/login"}) + public String authList(){ + return "historys/loginList"; + } + + /** + * 查询登录日志 + * @param logsAuth + * @return + */ + @RequestMapping(value={"/login/grid"}) + @ResponseBody + public JpaPageResults logAuthsGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin){ + _logger.debug("history/login/grid/ logsGrid() "+historyLogin); + historyLogin.setUid(WebContext.getUserInfo().getId()); + return historyLoginService.queryPageResults(historyLogin); + } + + @RequestMapping(value={"/loginApps"}) + public String loginAppHistoryList(){ + return "historys/loginAppsList"; + } + + /** + * 查询单点登录日志 + * @param logsSso + * @return + */ + @RequestMapping(value={"/loginApps/grid"}) + @ResponseBody + public JpaPageResults logsSsoGrid(@ModelAttribute("historyLoginApps") HistoryLoginApps historyLoginApps){ + _logger.debug("history/loginApps/grid/ logsGrid() "+historyLoginApps); + historyLoginApps.setId(null); + + return historyLoginAppsService.queryPageResults(historyLoginApps); + + } + + + + + @InitBinder + public void initBinder(WebDataBinder binder) { + SimpleDateFormat dateFormat = new SimpleDateFormat(DateUtils.FORMAT_DATE_HH_MM_SS); + dateFormat.setLenient(false); + binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); + } +} diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogsController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogsController.java deleted file mode 100644 index 5e13a84ef..000000000 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LogsController.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.maxkey.web.contorller; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.apache.mybatis.jpa.persistence.JpaPageResults; -import org.maxkey.dao.service.LoginAppsHistoryService; -import org.maxkey.dao.service.LoginHistoryService; -import org.maxkey.dao.service.LogsService; -import org.maxkey.domain.LoginAppsHistory; -import org.maxkey.domain.LoginHistory; -import org.maxkey.domain.Logs; -import org.maxkey.util.DateUtils; -import org.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * 登录日志和操作日志查询 - * - * @author Crystal.sea - * - */ - -@Controller -@RequestMapping(value={"/logs"}) -public class LogsController { -final static Logger _logger = LoggerFactory.getLogger(LogsController.class); - - @Autowired - LoginHistoryService loginHistoryService; - - @Autowired - protected LoginAppsHistoryService loginAppsHistoryService; - - @Autowired - LogsService logsService; - - /** - * 查询操作日志 - * @param logs - * @return - */ - @RequestMapping(value={"/grid"}) - @ResponseBody - public JpaPageResults logsDataGrid(@ModelAttribute("logs") Logs logs){ - _logger.debug("logs/grid/ logsGrid() "+logs); - return logsService.queryPageResults(logs); - } - - - @RequestMapping(value={"/list"}) - public String List(){ - return "logs/logsList"; - } - - @RequestMapping(value={"/loginHistoryList"}) - public String authList(){ - return "logs/loginHistoryList"; - } - - - /** - * 查询登录日志 - * @param logsAuth - * @return - */ - @RequestMapping(value={"/loginHistory/grid"}) - @ResponseBody - public JpaPageResults logAuthsGrid(@ModelAttribute("loginHistory") LoginHistory loginHistory){ - _logger.debug("logs/loginHistory/grid/ logsGrid() "+loginHistory); - loginHistory.setUid(WebContext.getUserInfo().getId()); - return loginHistoryService.queryPageResults(loginHistory); - } - - @RequestMapping(value={"/loginAppHistoryList"}) - public String loginAppHistoryList(){ - return "logs/loginAppHistoryList"; - } - - - /** - * 查询单点登录日志 - * @param logsSso - * @return - */ - @RequestMapping(value={"/loginAppsHistory/grid"}) - @ResponseBody - public JpaPageResults logsSsoGrid(@ModelAttribute("loginAppsHistory") LoginAppsHistory loginAppsHistory){ - _logger.debug("logs/loginAppsHistory/grid/ logsGrid() "+loginAppsHistory); - loginAppsHistory.setId(null); - - return loginAppsHistoryService.queryPageResults(loginAppsHistory); - - } - - - - - @InitBinder - public void initBinder(WebDataBinder binder) { - SimpleDateFormat dateFormat = new SimpleDateFormat(DateUtils.FORMAT_DATE_HH_MM_SS); - dateFormat.setLenient(false); - binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); - } -} diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LoginAppHistoryAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java similarity index 61% rename from maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LoginAppHistoryAdapter.java rename to maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java index ae9a61cb2..de53e657c 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LoginAppHistoryAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java @@ -5,11 +5,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.dao.service.ApplicationsService; -import org.maxkey.dao.service.LoginAppsHistoryService; -import org.maxkey.domain.LoginAppsHistory; +import org.maxkey.dao.service.AppsService; +import org.maxkey.dao.service.HistoryLoginAppsService; +import org.maxkey.domain.HistoryLoginApps; import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Applications; +import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -19,15 +19,15 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -public class LoginAppHistoryAdapter extends HandlerInterceptorAdapter { - private static final Logger _logger = LoggerFactory.getLogger(LoginAppHistoryAdapter.class); +public class HistoryLoginAppAdapter extends HandlerInterceptorAdapter { + private static final Logger _logger = LoggerFactory.getLogger(HistoryLoginAppAdapter.class); @Autowired - LoginAppsHistoryService loginAppsHistoryService; + HistoryLoginAppsService historyLoginAppsService; @Autowired - @Qualifier("applicationsService") - protected ApplicationsService applicationsService; + @Qualifier("appsService") + protected AppsService appsService; /* * (non-Javadoc) * @see org.springframework.web.servlet.handler.HandlerInterceptorAdapter#preHandle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.Object) @@ -42,19 +42,19 @@ public class LoginAppHistoryAdapter extends HandlerInterceptorAdapter { PreLoginAppAdapter.getAppIdFromRequestURI(request); } //Applications app=applicationsService.get(appId); - Applications app=(Applications)WebContext.getAttribute(AuthorizeBaseEndpoint.class.getName()); + Apps app=(Apps)WebContext.getAttribute(AuthorizeBaseEndpoint.class.getName()); String sessionId=(String)WebContext.getAttribute(WebConstants.CURRENT_USER_SESSION_ID); UserInfo userInfo =WebContext.getUserInfo(); _logger.debug("sessionId : "+sessionId+" ,appId : "+appId); - LoginAppsHistory loginAppsHistory=new LoginAppsHistory(); - loginAppsHistory.setId(loginAppsHistory.generateId()); - loginAppsHistory.setAppId(appId); - loginAppsHistory.setSessionId(sessionId); - loginAppsHistory.setAppName(app.getName()); - loginAppsHistory.setUid(userInfo.getId()); - loginAppsHistory.setUsername(userInfo.getUsername()); - loginAppsHistory.setDisplayName(userInfo.getDisplayName()); - loginAppsHistoryService.insert(loginAppsHistory); + HistoryLoginApps historyLoginApps=new HistoryLoginApps(); + historyLoginApps.setId(historyLoginApps.generateId()); + historyLoginApps.setAppId(appId); + historyLoginApps.setSessionId(sessionId); + historyLoginApps.setAppName(app.getName()); + historyLoginApps.setUid(userInfo.getId()); + historyLoginApps.setUsername(userInfo.getUsername()); + historyLoginApps.setDisplayName(userInfo.getDisplayName()); + historyLoginAppsService.insert(historyLoginApps); WebContext.removeAttribute(WebConstants.CURRENT_SINGLESIGNON_URI); WebContext.removeAttribute(WebConstants.SINGLE_SIGN_ON_APP_ID); } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LogAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java similarity index 78% rename from maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LogAdapter.java rename to maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java index 544e4739d..86118bfe9 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/LogAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLogsAdapter.java @@ -3,8 +3,8 @@ package org.maxkey.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.dao.service.LogsService; -import org.maxkey.domain.Logs; +import org.maxkey.dao.service.HistoryLogsService; +import org.maxkey.domain.HistoryLogs; import org.maxkey.domain.UserInfo; import org.maxkey.util.JsonUtils; import org.maxkey.web.WebContext; @@ -25,13 +25,13 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; * @author Crystal.Sea * */ -public class LogAdapter extends HandlerInterceptorAdapter { +public class HistoryLogsAdapter extends HandlerInterceptorAdapter { - private static final Logger _logger = LoggerFactory.getLogger(LogAdapter.class); + private static final Logger _logger = LoggerFactory.getLogger(HistoryLogsAdapter.class); @Autowired - @Qualifier("logsService") - private LogsService logsService; + @Qualifier("historyLogsService") + private HistoryLogsService historyLogsService; // after the handler is executed public void postHandle(HttpServletRequest request,HttpServletResponse response, Object handler,ModelAndView modelAndView) throws Exception { @@ -43,7 +43,7 @@ public class LogAdapter extends HandlerInterceptorAdapter { UserInfo userInfo =WebContext.getUserInfo();//取得当前用户信息 //创建日志记录 - Logs logs = new Logs( + HistoryLogs historyLogs = new HistoryLogs( message.getServiceName(), message.getCode(), message.getMessage(), @@ -54,8 +54,8 @@ public class LogAdapter extends HandlerInterceptorAdapter { userInfo==null?null:userInfo.getUsername(), "" ); - _logger.debug("insert db logs content : "+logs); - logsService.insert(logs);//日志插入数据库 + _logger.debug("insert db historyLogs content : "+historyLogs); + historyLogsService.insert(historyLogs);//日志插入数据库 if(message.getMessageScope() == MessageScope.DB) {//message类型仅插入数据库 WebContext.clearMessage();//清除message } diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/logs/loginAppHistoryList.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl similarity index 98% rename from maxkey-web-maxkey/src/main/resources/templates/views/logs/loginAppHistoryList.ftl rename to maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl index c9c874ae3..ccd8fce50 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/logs/loginAppHistoryList.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl @@ -50,7 +50,7 @@
- -
-