diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index 2b125c828ff6f906fcc09ec32d44672ef99a0b4a..0d0990300a1abf113b7b16af9e33557c3b8b77a9 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -74,7 +74,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ WebContext.setAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI, request.getParameter(SOCIALSIGNON_REDIRECT_URI)); SocialsAssociate socialSignOnUser =new SocialsAssociate(); socialSignOnUser.setProvider(provider); - socialSignOnUser.setUid(WebContext.getUserInfo().getId()); + socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername()); _logger.debug("Social Sign On unbind "+provider+" from user "+WebContext.getUserInfo().getUsername()); @@ -119,7 +119,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ _logger.debug(this.accountId); socialsAssociate =new SocialsAssociate(); socialsAssociate.setProvider(provider); - socialsAssociate.setSocialuid(this.accountId); + socialsAssociate.setSocialUserId(this.accountId); //for login String socialSignOnType= ""; @@ -153,7 +153,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ } socialsAssociate.setSocialUserInfo(accountJsonString); - socialsAssociate.setUid(WebContext.getUserInfo().getId()); + socialsAssociate.setUserId(WebContext.getUserInfo().getId()); socialsAssociate.setUsername(WebContext.getUserInfo().getUsername()); //socialsAssociate.setAccessToken(JsonUtils.object2Json(accessToken)); //socialsAssociate.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java index e34f07410b84b51d153aad2c3decca0ec5b69d57..ddecf2f98839a0010a601a1912474afb34e7d906 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java @@ -31,15 +31,15 @@ import org.springframework.jdbc.core.RowMapper; public class JdbcSocialsAssociateService implements SocialsAssociateService{ private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialsAssociateService.class); - private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; + private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; - private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; + private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)"; - private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where provider = ? and socialuid = ?"; + private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where provider = ? and socialuserid = ?"; - private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where uid = ?" ; + private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where userid = ?" ; - private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "delete from mxk_socials_associate where uid = ? and provider = ?"; + private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "delete from mxk_socials_associate where userid = ? and provider = ?"; private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "update mxk_socials_associate set accesstoken = ? , socialuserinfo = ? , exattribute = ? ,updateddate = ? where id = ?"; @@ -63,10 +63,10 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ jdbcTemplate.update("Oracle".equals(jdbcType)?DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE:DEFAULT_DEFAULT_INSERT_STATEMENT, new Object[] { socialsAssociate.getId(), - socialsAssociate.getUid(), + socialsAssociate.getUserId(), socialsAssociate.getUsername(), socialsAssociate.getProvider(), - socialsAssociate.getSocialuid(), + socialsAssociate.getSocialUserId(), socialsAssociate.getAccessToken(), socialsAssociate.getSocialUserInfo(), socialsAssociate.getExAttribute()}, @@ -78,7 +78,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ public boolean delete(SocialsAssociate socialsAssociate) { jdbcTemplate.update(DEFAULT_DEFAULT_DELETE_STATEMENT, new Object[] { - socialsAssociate.getUid(), + socialsAssociate.getUserId(), socialsAssociate.getProvider() }, new int[] {Types.VARCHAR, Types.VARCHAR}); @@ -91,7 +91,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT, new SocialsAssociateRowMapper(), socialsAssociate.getProvider(), - socialsAssociate.getSocialuid()); + socialsAssociate.getSocialUserId()); _logger.debug("list socialsAssociate "+listsocialsAssociate); return (listsocialsAssociate.size()>0)?listsocialsAssociate.get(0):null; } @@ -102,7 +102,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ List listsocialsAssociate=jdbcTemplate.query( DEFAULT_DEFAULT_BIND_SELECT_STATEMENT, new SocialsAssociateRowMapper(), - socialsAssociate.getUid()); + socialsAssociate.getUserId()); _logger.debug("query bind SocialSignOnUser "+listsocialsAssociate); return listsocialsAssociate; } @@ -122,10 +122,10 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{ throws SQLException { SocialsAssociate socialsAssociate=new SocialsAssociate(); socialsAssociate.setId(rs.getString(1)); - socialsAssociate.setUid(rs.getString(2)); + socialsAssociate.setUserId(rs.getString(2)); socialsAssociate.setUsername(rs.getString(3)); socialsAssociate.setProvider(rs.getString(4)); - socialsAssociate.setSocialuid(rs.getString(5)); + socialsAssociate.setSocialUserId(rs.getString(5)); socialsAssociate.setAccessToken(rs.getString(6)); socialsAssociate.setSocialUserInfo(rs.getString(7)); socialsAssociate.setExAttribute(rs.getString(8)); diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java index 8303ae8e8ec6d59f2d2f94ca0018048c5d8b2d93..b269fbcac1fafa83bbd8f58b827b95008ed7e79a 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java @@ -31,9 +31,9 @@ public class SocialsAssociate extends JpaBaseEntity { private static final long serialVersionUID = 2151179554190800162L; private String id; private String provider; - private String uid; + private String userId; private String username; - private String socialuid; + private String socialUserId; private String socialUserInfo; private String accessToken; private String exAttribute; @@ -64,16 +64,16 @@ public class SocialsAssociate extends JpaBaseEntity { this.provider = provider; } - public String getUid() { - return uid; + public String getUserId() { + return userId; } - public void setUid(String uid) { - this.uid = uid; + public void setUserId(String uid) { + this.userId = uid; } - public String getSocialuid() { - return socialuid; + public String getSocialUserId() { + return socialUserId; } public String getUsername() { @@ -84,8 +84,8 @@ public class SocialsAssociate extends JpaBaseEntity { this.username = username; } - public void setSocialuid(String socialuid) { - this.socialuid = socialuid; + public void setSocialUserId(String socialUserId) { + this.socialUserId = socialUserId; } public String getSocialUserInfo() { @@ -136,11 +136,11 @@ public class SocialsAssociate extends JpaBaseEntity { builder.append(", provider="); builder.append(provider); builder.append(", uid="); - builder.append(uid); + builder.append(userId); builder.append(", username="); builder.append(username); builder.append(", socialuid="); - builder.append(socialuid); + builder.append(socialUserId); builder.append(", socialUserInfo="); builder.append(socialUserInfo); builder.append(", accessToken="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java index c3e04aca18e797c916c06761733c62c2b817cd8d..e160bc1ab0b4ddcb6ef7bff10cb40d347d53ea29 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java @@ -45,7 +45,7 @@ public class Accounts extends JpaBaseEntity implements Serializable { @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") private String id; @Column - private String uid; + private String userId; @Column private String username; @Column @@ -72,22 +72,22 @@ public class Accounts extends JpaBaseEntity implements Serializable { } public Accounts(String uid, String appId) { - this.uid = uid; + this.userId = uid; this.appId = appId; } public Accounts(String uid, String appId, String password) { - this.uid = uid; + this.userId = uid; this.appId = appId; this.relatedPassword = password; } - public String getUid() { - return uid; + public String getUserId() { + return userId; } - public void setUid(String uid) { - this.uid = uid; + public void setUserId(String uid) { + this.userId = uid; } public String getUsername() { @@ -158,7 +158,7 @@ public class Accounts extends JpaBaseEntity implements Serializable { @Override public String toString() { - return "AppAccounts [uid=" + uid + ", username=" + username + ", displayName=" + displayName + ", appId=" + return "AppAccounts [uid=" + userId + ", username=" + username + ", displayName=" + displayName + ", appId=" + appId + ", appName=" + appName + ", relatedUsername=" + relatedUsername + ", relatedPassword=" + relatedPassword + "]"; } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java index 991130f0c5d5f0b371ff2fd4b971460d667aa7d9..5b0ccd51fa0b1869c265f16ccf62f6a8a06c8b97 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java @@ -27,7 +27,7 @@ public class ChangePassword extends JpaBaseEntity{ private static final long serialVersionUID = -2362608803392892403L; private String id; - private String uid; + private String userId; private String username; private String email; private String mobile; @@ -66,16 +66,16 @@ public class ChangePassword extends JpaBaseEntity{ /** * @return the uid */ - public String getUid() { - return uid; + public String getUserId() { + return userId; } /** * @param uid the uid to set */ - public void setUid(String uid) { - this.uid = uid; + public void setUserId(String uid) { + this.userId = uid; } @@ -215,7 +215,7 @@ public class ChangePassword extends JpaBaseEntity{ builder.append("ChangePassword [id="); builder.append(id); builder.append(", uid="); - builder.append(uid); + builder.append(userId); builder.append(", username="); builder.append(username); builder.append(", displayName="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java index 685e62b6acbfde1578eb96baf4688061b9c246f0..58c7d0690b2058d4f7027c2eec8512f3b68cb2f7 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java @@ -48,7 +48,7 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{ @Column String sessionId; @Column - String uid; + String userId; @Column String username; @Column @@ -99,12 +99,12 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{ this.sessionId = sessionId; } - public String getUid() { - return uid; + public String getUserId() { + return userId; } - public void setUid(String uid) { - this.uid = uid; + public void setUserId(String userId) { + this.userId = userId; } public String getUsername() { @@ -234,8 +234,8 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{ builder.append(id); builder.append(", sessionId="); builder.append(sessionId); - builder.append(", uid="); - builder.append(uid); + builder.append(", userId="); + builder.append(userId); builder.append(", username="); builder.append(username); builder.append(", displayName="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java index 39b43fdacfcbdd91eb3414fee27371da9063e5fe..7320497eecf00e785f82cd42b724fa4340e8dc76 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java @@ -46,7 +46,7 @@ public class HistoryLoginApps extends JpaBaseEntity { @Column private String appName; @Column - private String uid; + private String userId; @Column private String username; @Column @@ -144,18 +144,18 @@ public class HistoryLoginApps extends JpaBaseEntity { /** - * @return the uid + * @return the userId */ - public String getUid() { - return uid; + public String getUserId() { + return userId; } /** * @param uid the uid to set */ - public void setUid(String uid) { - this.uid = uid; + public void setUserId(String uid) { + this.userId = uid; } @@ -222,8 +222,8 @@ public class HistoryLoginApps extends JpaBaseEntity { builder.append(appId); builder.append(", appName="); builder.append(appName); - builder.append(", uid="); - builder.append(uid); + builder.append(", userId="); + builder.append(userId); builder.append(", username="); builder.append(username); builder.append(", displayName="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java index 13d095f5c24d7281581f7050865596299e1bf769..a613845b4008ad204c65c540fc80d5e21df9ea05 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java @@ -28,7 +28,7 @@ import javax.persistence.Table; /* ID varchar(40) not null, APPROLEID varchar(40) null, - UID varchar(40) null + USERID varchar(40) null constraint PK_ROLES primary key clustered (ID) */ @Entity diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java index 7e8bd84b780da2967a4ecc9313b805690e2091c2..357dd3756a2ba4f3bdb2a198b9445b409616593d 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java @@ -28,7 +28,7 @@ import org.springframework.jdbc.core.JdbcTemplate; public class LoginHistoryService { private static Logger _logger = LoggerFactory.getLogger(LoginHistoryService.class); - private static final String HISTORY_LOGIN_INSERT_STATEMENT = "insert into mxk_history_login (id , sessionid , uid , username , displayname , logintype , message , code , provider , sourceip , browser , platform , application , loginurl , sessionstatus)values( ? , ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)"; + private static final String HISTORY_LOGIN_INSERT_STATEMENT = "insert into mxk_history_login (id , sessionid , userid , username , displayname , logintype , message , code , provider , sourceip , browser , platform , application , loginurl , sessionstatus)values( ? , ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)"; private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "update mxk_history_login set logouttime = ? ,sessionstatus = 7 where sessionid = ?"; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index ac8211fef28429bb9e38ebd672c6ece6eaa6696b..5f40816b022ea757418e769629232f8177c1dc8c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java @@ -53,7 +53,7 @@ public class AccountsService extends JpaBaseService{ public boolean insert(Accounts account) { if (super.insert(account)) { if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) { - UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUid()); + UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUserId()); account.setUserInfo(loadUserInfo); kafkaPersistService.send( KafkaIdentityTopic.ACCOUNT_TOPIC, @@ -69,7 +69,7 @@ public class AccountsService extends JpaBaseService{ public boolean update(Accounts account) { if (super.update(account)) { if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) { - UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUid()); + UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUserId()); account.setUserInfo(loadUserInfo); kafkaPersistService.send( KafkaIdentityTopic.ACCOUNT_TOPIC, @@ -87,7 +87,7 @@ public class AccountsService extends JpaBaseService{ if (super.remove(id)) { UserInfo loadUserInfo = null; if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) { - loadUserInfo = userInfoService.loadUserRelated(account.getUid()); + loadUserInfo = userInfoService.loadUserRelated(account.getUserId()); account.setUserInfo(loadUserInfo); kafkaPersistService.send( KafkaIdentityTopic.ACCOUNT_TOPIC, diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java index d45422359433aeedb31caad05939d97695d34e42..c464ccd8d7581c3723f640335628263679daa730 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java @@ -297,7 +297,7 @@ public class UserInfoService extends JpaBaseService { if(userInfo.getPassword()!=null && !userInfo.getPassword().equals("")) { ChangePassword changePassword=new ChangePassword(); changePassword.setId(userInfo.getId()); - changePassword.setUid(userInfo.getId()); + changePassword.setUserId(userInfo.getId()); changePassword.setUsername(userInfo.getUsername()); changePassword.setDecipherable(userInfo.getDecipherable()); changePassword.setPassword(userInfo.getPassword()); diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginAppsMapper.xml index ba27ae8e0a29a12da7fcdbb0957eac4fd33adf35..5e9d35fe407af130876db0a583a23e1e0dc8b5a4 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginAppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginAppsMapper.xml @@ -15,8 +15,8 @@ and appname like concat('%',#{appName},'%') - - and uid = #{uid} + + and userId = #{userId} and username like concat('%',#{username},'%') @@ -39,7 +39,7 @@ sessionid, appid, appname, - uid, + userId, username, displayname, to_char(logintime,'YYYY-MM-DD HH24:MI:SS') as logintime diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginMapper.xml index ffde7d882ba2b0c7ee2daea0d41dbf1d1f3e3ff8..d98784d15e46459e8b67866f2b6be6aee81bd237 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginMapper.xml @@ -6,8 +6,8 @@ and id = #{id} - - and uid = #{uid} + + and userId = #{userId} and lower(username) like lower(concat('%',#{username},'%')) @@ -42,7 +42,7 @@ select id, sessionid, - uid, + userId, username, displayname, logintype, diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml index ca9415fd8a91107c21f919223e92c367a96da247..0cd713af2cf3bee9629fa3b8bdb7d08ea0c916c3 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml @@ -15,8 +15,8 @@ and appname like concat('%',#{appName},'%') - - and uid = #{uid} + + and userId = #{userId} and username = #{username} @@ -39,7 +39,7 @@ sessionid, appid, appname, - uid, + userId, username, displayname, date_format(logintime, '%Y-%m-%d %H:%i:%s') as logintime diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml index dfdc1a14eb1eda2128bdf6dd2f27a9ba72cf0c07..372e613ca29b5202ac856b071bc37bd0641800a8 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml @@ -6,8 +6,8 @@ and id = #{id} - - and uid = #{uid} + + and userId = #{userId} and lower(username) like lower(concat('%',#{username},'%')) @@ -42,7 +42,7 @@ select id, sessionid, - uid, + userId, username, displayname, logintype, @@ -68,7 +68,7 @@ select sessionid id, sessionid, - uid, + userId, username, displayname, logintype, diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginAppsMapper.xml index c202e5026fd65fde2a2a909e6f052eecc712d2f0..61c6c589fbd9fc1cddabc757ac460c73930ba7ef 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginAppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginAppsMapper.xml @@ -15,8 +15,8 @@ and appname like concat('%',#{appName},'%') - - and uid = #{uid} + + and userId = #{userId} and username like concat('%',#{username},'%') diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginMapper.xml index 8f0accdcd013988473f43747b631dde5a67a4bae..953fb0af9b06ff13f57ce3d4bae064b4e3bc7c1b 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginMapper.xml @@ -6,8 +6,8 @@ and id = #{id} - - and uid = #{uid} + + and userId = #{userId} and lower(username) like lower(concat('%',#{username},'%')) @@ -42,7 +42,7 @@ select id, sessionid, - uid, + userId, username, displayname, logintype, 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 a0e6598820d21d45fba7842f23323372e1cb9456..d6c41ca891af0e689a58c98fb9ca756e27bbf17a 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 @@ -89,7 +89,7 @@ public class AuthorizeBaseEndpoint { }else if(application.getCredential()==Apps.CREDENTIALS.SYSTEM){ - if(application.getSystemUserAttr().equalsIgnoreCase("uid")){ + if(application.getSystemUserAttr().equalsIgnoreCase("userId")){ account.setUsername(userInfo.getId()); }else if(application.getSystemUserAttr().equalsIgnoreCase("username")){ account.setUsername(userInfo.getUsername()); 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 773130f7be6ba6fde52b94b32515358bf18ac788..17c3944105992f433f182f377140592d9c0418f0 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 @@ -47,7 +47,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ modelAndView.addObject("username", ""); modelAndView.addObject("password", ""); modelAndView.addObject("setpassword", true); - modelAndView.addObject("uid", WebContext.getUserInfo().getId()); + modelAndView.addObject("userId", WebContext.getUserInfo().getId()); modelAndView.addObject("appId", appId); modelAndView.addObject("appName",getApp(appId).getName()); modelAndView.addObject("redirect_uri", redirect_uri); @@ -57,7 +57,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ @RequestMapping("/authz/credential") public ModelAndView authorizeCredential( HttpServletRequest request, - @RequestParam("uid") String uid, + @RequestParam("userId") String userId, @RequestParam("appId") String appId, @RequestParam("identity_username") String identity_username, @RequestParam("identity_password") String identity_password, @@ -68,7 +68,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ UserInfo userInfo=WebContext.getUserInfo(); appUser.setId(appUser.generateId()); - appUser.setUid(userInfo.getId()); + appUser.setUserId(userInfo.getId()); appUser.setUsername(userInfo.getUsername()); appUser.setDisplayName(userInfo.getDisplayName()); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index 86e3bd033ae07fa81227bbd7f4f5155b995c2bc4..f2129f0b160b55f22b470e2bdfe37e44c1fb3078 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -200,7 +200,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); serviceResponseBuilder.setFormat(HttpResponseConstants.FORMAT_TYPE.JSON); //for user - serviceResponseBuilder.setAttribute("uid", userInfo.getId()); + serviceResponseBuilder.setAttribute("userId", userInfo.getId()); serviceResponseBuilder.setAttribute("displayName",userInfo.getDisplayName()); serviceResponseBuilder.setAttribute("firstName", userInfo.getGivenName()); serviceResponseBuilder.setAttribute("lastname", userInfo.getFamilyName()); 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 a2e36e1fcaaa2e0944fa5ecc0899bf211f0097ce..316a894977a9f3736cb59c003ac0d2a9101a4a81 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 @@ -63,7 +63,7 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{ String username =""; String password =""; if(apps.getCredential()==1) { - if(apps.getSystemUserAttr().equalsIgnoreCase("uid")) { + if(apps.getSystemUserAttr().equalsIgnoreCase("userId")) { username = userInfo.getId(); }else if(apps.getSystemUserAttr().equalsIgnoreCase("username")) { username = userInfo.getUsername(); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index 7aae02b1c1882a5a032b2f275560c9e99f1f5733..91d86dc01529b16ad72df87edf692828b2fcfe81 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -33,7 +33,7 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter { public String generateInfo(SigninPrincipal authentication,UserInfo userInfo,Object app) { HashMap beanMap = new HashMap(); beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); - beanMap.put("uid", userInfo.getId()); + beanMap.put("userId", userInfo.getId()); //for spring security oauth2 beanMap.put("user", userInfo.getUsername()); beanMap.put("username", userInfo.getUsername()); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java index 5499289d960a9ce227710edd3f194e41994f8f66..b24a0b68a355416c26c5544bdcc7592cf5eaa1c4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java @@ -271,9 +271,9 @@ public class OpenIdConnectUserInfoEndpoint { return atfe; } - public UserInfo queryUserInfo(String uid){ - _logger.debug("uid : "+uid); - UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid); + public UserInfo queryUserInfo(String userId){ + _logger.debug("userId : "+userId); + UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId); return userInfo; } 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 5cfe9b0d456924c506bce95b0af07be3af954f32..a2f6f4d7f72cdaeb9ed95c3ddf53219ad2e9584e 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 @@ -157,9 +157,9 @@ public class UserInfoEndpoint { return atfe; } - public UserInfo queryUserInfo(String uid){ - _logger.debug("uid : "+uid); - UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid); + public UserInfo queryUserInfo(String userId){ + _logger.debug("userId : "+userId); + UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId); return userInfo; } 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 536e20957ca2d1522e3db7535f98badab84fad14..9733ec92b96092d9cf197b67e8ee51f6078c3b8a 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 @@ -42,8 +42,8 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter { beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) { - if(details.getUserPropertys().indexOf("uid")>-1){ - beanMap.put("uid",userInfo.getId()); + if(details.getUserPropertys().indexOf("userId")>-1){ + beanMap.put("userId",userInfo.getId()); } if(details.getUserPropertys().indexOf("username")>-1){ 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 ce68aeaa7ad8740f09fe3840e73e037968e79b24..94ad4bc492d2fb03d3589f5b1dcff82512b05923 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 @@ -37,7 +37,7 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter { String tokenUsername = userInfo.getUsername(); if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) { - if(details.getUserPropertys().indexOf("uid")>-1){ + if(details.getUserPropertys().indexOf("userId")>-1){ tokenUsername=userInfo.getId(); }else if(details.getUserPropertys().indexOf("username")>-1){ tokenUsername= userInfo.getUsername(); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index cb4563811713c73d4266e4dc7732d102b3b2d905..d34be53de8ca47a8f7f5da408efcd72d96788b07 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -120,7 +120,7 @@ public class AppListController { } else { modelAndView.addObject("protectedappId", false); } - modelAndView.addObject("uid", userInfo.getId()); + modelAndView.addObject("userId", userInfo.getId()); modelAndView.addObject("appId", appId); modelAndView.addObject("protocol", protocol); modelAndView.addObject("credential", credential); @@ -223,7 +223,7 @@ public class AppListController { modelAndView.addObject("password", false); } - modelAndView.addObject("uid", userInfo.getId()); + modelAndView.addObject("userId", userInfo.getId()); modelAndView.addObject("appId", appId); modelAndView.addObject("protocol", protocol); modelAndView.addObject("credential", credential); @@ -242,7 +242,7 @@ public class AppListController { Accounts appUsers = new Accounts(); appUsers.setAppId(appId); - appUsers.setUid(userInfo.getId()); + appUsers.setUserId(userInfo.getId()); if (identity_password != null && !identity_password.equals("") && credential == Apps.CREDENTIALS.USER_DEFINED) { appUsers = appUsersService.load(new Accounts(userInfo.getId(), appId)); @@ -251,7 +251,7 @@ public class AppListController { appUsers.setId(appUsers.generateId()); appUsers.setAppId(appId); appUsers.setAppName(app.getName()); - appUsers.setUid(userInfo.getId()); + appUsers.setUserId(userInfo.getId()); appUsers.setUsername(userInfo.getUsername()); appUsers.setDisplayName(userInfo.getDisplayName()); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java index 65809861a18535082919a0b4b52eb497470b16c0..b3957b028d9594ff2f399b4ad8551e73850c7735 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java @@ -58,7 +58,7 @@ public class SocialSignOnListController { List listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders(); SocialsAssociate socialSignOnUser=new SocialsAssociate(); - socialSignOnUser.setUid(WebContext.getUserInfo().getId()); + socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); List listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser); List listBindSocialSignOnProvider=new ArrayList(); _logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java index 642475b97b464cf34ca4930c86f4e0c48829ae19..b1895b6cabc34b0b9b3c6e646709b10f837eb80b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java @@ -69,7 +69,7 @@ public class HistoryLoginController { @ResponseBody public JpaPageResults logAuthsGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) { _logger.debug("history/login/grid/ logsGrid() " + historyLogin); - historyLogin.setUid(WebContext.getUserInfo().getId()); + historyLogin.setUserId(WebContext.getUserInfo().getId()); return historyLoginService.queryPageResults(historyLogin); } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java index eeb8009732504ec6777274897014f28e5306f819..e409f2f994170182b2224e4fa034674d8210019f 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java @@ -89,7 +89,7 @@ public class LoginSessionController { @ResponseBody public JpaPageResults loginSessionListGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) { _logger.debug("history/loginsession/ loginSessionListGrid() " + historyLogin); - historyLogin.setUid(WebContext.getUserInfo().getId()); + historyLogin.setUserId(WebContext.getUserInfo().getId()); return historyLoginService.queryOnlineSession(historyLogin); } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java index 43c5404544b17dc561c58ce7d29762d86a50bdb2..0a6771c7637f4eb515834da46739127dcac6d60b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java @@ -91,7 +91,7 @@ public class HistoryLoginAppAdapter implements AsyncHandlerInterceptor { historyLoginApps.setAppId(app.getId()); historyLoginApps.setSessionId(sessionId); historyLoginApps.setAppName(app.getName()); - historyLoginApps.setUid(userInfo.getId()); + historyLoginApps.setUserId(userInfo.getId()); historyLoginApps.setUsername(userInfo.getUsername()); historyLoginApps.setDisplayName(userInfo.getDisplayName()); historyLoginAppsService.insert(historyLoginApps); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties index 1b01b33badbf593220fae0780b46a6b9439a379f..98d62eb55ecac1576d40a52b9a5dea6b5d716849 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties @@ -22,5 +22,5 @@ application.formatted-version=v2.9.0 GA ############################################################################ #spring.profiles.active https/http; default https # ############################################################################ -spring.profiles.active=http +spring.profiles.active=https diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl index e5eb66c2f4831bb008af9a1c1b93b6d76c56f6cd..947d71bf3dec082e2fcd6a9bb9ca6e45f89d1d6d 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl @@ -22,8 +22,8 @@ - uid - + userId + appId diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl index f3a8b3ac8c7ce10b31e6e315a69a636e738669f6..ca72e9935b09fe5f39aa3c9fcaec4d154b9adbe9 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl @@ -77,9 +77,9 @@ <@locale code="log.loginhistory.logoutTime"/> <@locale code="log.loginhistory.platform"/> <@locale code="log.loginhistory.application"/> - <@locale code="log.loginhistory.loginUrl"/> - <@locale code="log.loginhistory.code"/> - <@locale code="log.loginhistory.rpUserInfo"/> + <@locale code="log.loginhistory.loginUrl"/> + <@locale code="log.loginhistory.code"/> + <@locale code="log.loginhistory.rpUserInfo"/> diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl index 78bbd14f5521bb8da1a72232eb78a1ed1f28870b..b936e0ca4cbc02790aec8871eff14894168bf0b8 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl @@ -32,7 +32,7 @@ uid - + appId diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl index 59c047d91c7a4b0c227b971cbb41bd160a5dbd34..0137c9f5449bd07831385a3336efe5ce23b9cedf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl @@ -71,7 +71,7 @@ - + "/> "/> diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl index 3f075fdd563062b9663a4f1aee364bf2fc613c22..80b537bd64f6d27c6360cb3e4804c86fa0bd68e0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl @@ -93,7 +93,7 @@ $(function(){ <@locale code="apps.systemUserAttr"/>： - diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl index b143f79df215a63bee6e53b7de9f020b9ded4fa4..5b8d2bf190b417de84f19dcb1f0ab37265f68cb2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl @@ -1,5 +1,5 @@