From c07aea5788cf6bb9eaabdb410ad008e18db5ffa5 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sat, 9 Nov 2019 22:53:27 +0800 Subject: [PATCH] Maxkey v1.0 GA Maxkey v1.0 GA --- .../main/java/org/maxkey/authn/Package.java | 1 - .../main/java/org/maxkey/package-info.java | 8 - .../{ConnsecApi10a.java => MaxkeyApi10a.java} | 4 +- .../{ConnsecApi20.java => MaxkeyApi20.java} | 4 +- ...ordApi20.java => MaxkeyPasswordApi20.java} | 4 +- .../oauth/oauth/OAuth10aServiceImpl.java | 2 +- .../oauth/oauth/OAuth20ServiceImpl.java | 2 +- .../oauth/oauth/OAuthPasswordService.java | 10 +- .../web/authn/AuthenticationFilter.java | 4 +- .../client/oauth/test/Connsec10aExample.java | 4 +- .../oauth/test/Connsec10aVerifierExample.java | 4 +- .../client/oauth/test/Connsec20Example.java | 4 +- .../oauth/test/ConnsecPasswordDemo.java | 4 +- .../org/maxkey/domain/GroupPrivileges.java | 2 +- .../dao/persistence/UserInfoMapper.java | 2 + .../maxkey/dao/service/UserInfoService.java | 3 + .../xml/mysql/MyAppsListMapper.xml | 8 +- .../persistence/xml/mysql/UserInfoMapper.xml | 8 + .../cas/endpoint/Cas10AuthorizeEndpoint.java | 5 +- .../cas/endpoint/Cas20AuthorizeEndpoint.java | 8 +- .../cas/endpoint/Cas30AuthorizeEndpoint.java | 13 +- .../cas/endpoint/CasAuthorizeEndpoint.java | 2 +- .../endpoint/DesktopAuthorizeEndpoint.java | 2 +- .../endpoint/FormBasedAuthorizeEndpoint.java | 2 +- .../maxkey-protocol-ltpa/.classpath | 12 - .../maxkey-protocol-ltpa/.project | 29 - .../org.eclipse.buildship.core.prefs | 10 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 16 - .../.settings/org.eclipse.jdt.launching.prefs | 2 - .../org.eclipse.wst.common.component | 5 - ....eclipse.wst.common.project.facet.core.xml | 7 - .../org.springframework.ide.eclipse.prefs | 2 - .../bin/main/META-INF/MANIFEST.MF | 3 - .../maxkey-protocol-ltpa/build.gradle | 16 - .../src/main/java/META-INF/MANIFEST.MF | 3 - .../ltpa/endpoint/LtpaAuthorizeEndpoint.java | 105 - .../endpoint/adapter/LtpaDefaultAdapter.java | 83 - .../OAuth20AccessConfirmationController.java | 7 +- .../TokenEndpointAuthenticationFilter.java | 2 + .../userinfo/endpoint/UserInfoEndpoint.java | 10 +- .../bin/main/.gitignore | 0 .../provider/endpoint/IdpInitEndpoint.java | 2 +- .../endpoint/SingleSignOnEndpoint.java | 2 +- .../bin/main/.gitignore | 1 + .../endpoint/TokenBasedAuthorizeEndpoint.java | 45 +- .../contorller/DesktopDetailsController.java | 4 +- .../FormBasedDetailsController.java | 4 +- .../contorller/SAML20DetailsController.java | 4 +- .../TokenBasedDetailsController.java | 4 +- .../src/main/resources/static/js/Chart.min.js | 7 + .../templates/views/layout/common.cssjs.ftl | 1 + .../main/resources/templates/views/main.ftl | 367 +--- maxkey-web-maxkey/.project | 1 - .../.settings/org.eclipse.jdt.core.prefs | 11 + .../main/java/org/maxkey/MaxKeyConfig.java | 12 + .../web/contorller/AppListController.java | 4 +- .../web/contorller/ProfileController.java | 4 +- .../spring/maxkey-protocol-oauth2.0.xml | 1 + .../main/resources/spring/maxkey-security.xml | 4 +- .../src/main/resources/static/css/login.css | 12 +- ...formbased_netease_163email_sso_submint.ftl | 6 +- .../authorize/oauth_access_confirmation.ftl | 16 +- .../templates/views/layout/nav_primary.ftl | 8 +- .../main/resources/templates/views/login.ftl | 10 +- .../templates/views/profile/myProfile.ftl | 4 +- .../views/social/socialSignOnProvider.ftl | 65 +- sql/maxkey_v1.0.sql | 911 +++++++++ sql/secdb-20160918.sql | 1730 ----------------- 69 files changed, 1198 insertions(+), 2466 deletions(-) delete mode 100644 maxkey-authentications/src/main/java/org/maxkey/authn/Package.java delete mode 100644 maxkey-authentications/src/main/java/org/maxkey/package-info.java rename maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/{ConnsecApi10a.java => MaxkeyApi10a.java} (89%) rename maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/{ConnsecApi20.java => MaxkeyApi20.java} (96%) rename maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/{ConnsecPasswordApi20.java => MaxkeyPasswordApi20.java} (94%) delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.classpath delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.project delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.jdt.core.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/build.gradle delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/src/main/java/META-INF/MANIFEST.MF delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java delete mode 100644 maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/adapter/LtpaDefaultAdapter.java rename maxkey-protocols/{maxkey-protocol-authorize => maxkey-protocol-saml-2.0}/bin/main/.gitignore (100%) create mode 100644 maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore create mode 100644 maxkey-web-manage/src/main/resources/static/js/Chart.min.js create mode 100644 sql/maxkey_v1.0.sql delete mode 100644 sql/secdb-20160918.sql diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/Package.java b/maxkey-authentications/src/main/java/org/maxkey/authn/Package.java deleted file mode 100644 index c82626e9b..000000000 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/Package.java +++ /dev/null @@ -1 +0,0 @@ -package org.maxkey.authn; diff --git a/maxkey-authentications/src/main/java/org/maxkey/package-info.java b/maxkey-authentications/src/main/java/org/maxkey/package-info.java deleted file mode 100644 index 94a702e9f..000000000 --- a/maxkey-authentications/src/main/java/org/maxkey/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * - */ -/** - * @author Administrator - * - */ -package org.maxkey; \ No newline at end of file diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi10a.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java similarity index 89% rename from maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi10a.java rename to maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java index f5eedf26c..2bc4b82e1 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi10a.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java @@ -2,12 +2,12 @@ package org.maxkey.client.oauth.builder.api; import org.maxkey.client.oauth.model.Token; -public class ConnsecApi10a extends DefaultApi10a +public class MaxkeyApi10a extends DefaultApi10a { private static final String DEFAULT_WEB_URL = "http://sso.maxkey.org/maxkey"; private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s"; - public ConnsecApi10a() { + public MaxkeyApi10a() { } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java similarity index 96% rename from maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi20.java rename to maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java index 0cbe6d319..54e218053 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecApi20.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java @@ -7,7 +7,7 @@ import org.maxkey.client.oauth.model.OAuthConfig; import org.maxkey.client.utils.HttpEncoder; import org.maxkey.client.utils.Preconditions; -public class ConnsecApi20 extends DefaultApi20 { +public class MaxkeyApi20 extends DefaultApi20 { //approval_prompt:force or auto private static final String DEFAULT_WEB_URL = "http://sso.maxkey.org/maxkey"; @@ -15,7 +15,7 @@ public class ConnsecApi20 extends DefaultApi20 { private static final String SCOPED_AUTHORIZE_URL = String.format("%s&scope=%%s", AUTHORIZATION_URL); - public ConnsecApi20() { + public MaxkeyApi20() { } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecPasswordApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java similarity index 94% rename from maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecPasswordApi20.java rename to maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java index 2cd18efee..5d3922117 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/ConnsecPasswordApi20.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java @@ -10,7 +10,7 @@ import org.maxkey.client.oauth.model.OAuthConfig; /** * OAuth 2.0 api. */ -public class ConnsecPasswordApi20 extends DefaultApi20 { +public class MaxkeyPasswordApi20 extends DefaultApi20 { private String accessTokenUrl; private String grantType = "password"; @@ -19,7 +19,7 @@ public class ConnsecPasswordApi20 extends DefaultApi20 { private static final String AUTHORIZE_PARAM = "&client_id=%s&client_secret=%s&username=%s&password=%s"; - public ConnsecPasswordApi20(String accessTokenUrl) { + public MaxkeyPasswordApi20(String accessTokenUrl) { super(); this.accessTokenUrl = accessTokenUrl; } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth10aServiceImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth10aServiceImpl.java index fd19bfa08..d8d8f9d0e 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth10aServiceImpl.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth10aServiceImpl.java @@ -45,7 +45,7 @@ public class OAuth10aServiceImpl implements OAuthService */ public OAuth10aServiceImpl(String clientId, String clientSecret,String redirectUri) { - this.api = new ConnsecApi10a(); + this.api = new MaxkeyApi10a(); this.config =new OAuthConfig(clientId,clientSecret,redirectUri); } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java index 8dd684429..70d014800 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java @@ -35,7 +35,7 @@ public class OAuth20ServiceImpl implements OAuthService */ public OAuth20ServiceImpl(String clientId, String clientSecret,String redirectUri) { - this.api=new ConnsecApi20(); + this.api=new MaxkeyApi20(); this.config =new OAuthConfig(clientId,clientSecret,redirectUri); } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java index 4798a2d64..c54caafcc 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java @@ -3,7 +3,7 @@ package org.maxkey.client.oauth.oauth; import org.maxkey.client.http.HttpVerb; import org.maxkey.client.http.Response; import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.ConnsecPasswordApi20; +import org.maxkey.client.oauth.builder.api.MaxkeyPasswordApi20; import org.maxkey.client.oauth.model.OAuthConfig; import org.maxkey.client.oauth.model.OAuthRequest; import org.maxkey.client.oauth.model.Token; @@ -16,13 +16,13 @@ public class OAuthPasswordService { private OAuthConfig config; - private ConnsecPasswordApi20 passwordApi20; + private MaxkeyPasswordApi20 passwordApi20; public OAuthPasswordService() { super(); } - public OAuthPasswordService(OAuthConfig config,ConnsecPasswordApi20 passwordApi20) { + public OAuthPasswordService(OAuthConfig config,MaxkeyPasswordApi20 passwordApi20) { super(); this.passwordApi20=passwordApi20; this.config = config; @@ -59,11 +59,11 @@ public class OAuthPasswordService { this.config = config; } - public ConnsecPasswordApi20 getPasswordApi20() { + public MaxkeyPasswordApi20 getPasswordApi20() { return passwordApi20; } - public void setPasswordApi20(ConnsecPasswordApi20 passwordApi20) { + public void setPasswordApi20(MaxkeyPasswordApi20 passwordApi20) { this.passwordApi20 = passwordApi20; } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java index 6a78bd1a4..804f826cd 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.maxkey.client.oauth.OAuthClient; import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.ConnsecApi20; +import org.maxkey.client.oauth.builder.api.MaxkeyApi20; import org.maxkey.client.oauth.domain.UserInfo; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.model.Verifier; @@ -88,7 +88,7 @@ public class AuthenticationFilter implements Filter { log.debug("enable : "+enable); service = new ServiceBuilder() - .provider(ConnsecApi20.class) + .provider(MaxkeyApi20.class) .apiKey(this.clientId) .apiSecret(this.clientSecret) .callback(this.callBackUri) diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java index c171e7a88..df5161d54 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java @@ -3,7 +3,7 @@ package com.connsec.client.oauth.test; import java.util.*; import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.ConnsecApi10a; +import org.maxkey.client.oauth.builder.api.MaxkeyApi10a; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.oauth.OAuthService; @@ -15,7 +15,7 @@ public class Connsec10aExample public static void main(String[] args) { OAuthService service = new ServiceBuilder() - .provider(ConnsecApi10a.class) + .provider(MaxkeyApi10a.class) .apiKey("tonr-consumer-key") .apiSecret("SHHHHH!!!!!!!!!!") .callback(PROTECTED_RESOURCE_URL) diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java index b0f192ff5..9724ce3ec 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java @@ -5,7 +5,7 @@ import java.util.*; import org.maxkey.client.http.HttpVerb; import org.maxkey.client.http.Response; import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.ConnsecApi10a; +import org.maxkey.client.oauth.builder.api.MaxkeyApi10a; import org.maxkey.client.oauth.model.OAuthRequest; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.model.Verifier; @@ -19,7 +19,7 @@ public class Connsec10aVerifierExample public static void main(String[] args) { OAuthService service = new ServiceBuilder() - .provider(ConnsecApi10a.class) + .provider(MaxkeyApi10a.class) .apiKey("tonr-consumer-key") .apiSecret("SHHHHH!!!!!!!!!!") .callback(PROTECTED_RESOURCE_URL) diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java index bc45cef2c..99688ce3d 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java @@ -5,7 +5,7 @@ import java.util.*; import org.maxkey.client.http.HttpVerb; import org.maxkey.client.http.Response; import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.ConnsecApi20; +import org.maxkey.client.oauth.builder.api.MaxkeyApi20; import org.maxkey.client.oauth.model.OAuthRequest; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.model.Verifier; @@ -23,7 +23,7 @@ public class Connsec20Example String apiKey = "your_api_key"; String apiSecret = "your_api_secret"; OAuthService service = new ServiceBuilder() - .provider(ConnsecApi20.class) + .provider(MaxkeyApi20.class) .apiKey(apiKey) .apiSecret(apiSecret) .callback("http://www.dajie.com/oauth/sina") diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java index 7ac18b437..08974026e 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java @@ -1,7 +1,7 @@ package com.connsec.client.oauth.test; import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.api.ConnsecPasswordApi20; +import org.maxkey.client.oauth.builder.api.MaxkeyPasswordApi20; import org.maxkey.client.oauth.model.OAuthConfig; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.oauth.OAuthPasswordService; @@ -23,7 +23,7 @@ public class ConnsecPasswordDemo { String approvalprompt = "auto"; OAuthConfig oauthServiceConfig=new OAuthConfig(clientId,clientSerect,callback); - ConnsecPasswordApi20 ConnsecPasswordApi20=new ConnsecPasswordApi20(accessTokenUrl); + MaxkeyPasswordApi20 ConnsecPasswordApi20=new MaxkeyPasswordApi20(accessTokenUrl); OAuthPasswordService oAuthPasswordService=new OAuthPasswordService(oauthServiceConfig,ConnsecPasswordApi20); Token accessToken = null; 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 72f92c43c..9f325ea58 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java @@ -17,7 +17,7 @@ import org.maxkey.domain.apps.Apps; MENUID varchar(40) null constraint PK_ROLES primary key clustered (ID) */ -@Table(name = "GROUP_APP") +@Table(name = "GROUP_PRIVILEGES") public class GroupPrivileges extends Apps implements Serializable{ /** diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java index 953dd27aa..feb15873a 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java @@ -16,6 +16,8 @@ public interface UserInfoMapper extends IJpaBaseMapper{ public int logisticDeleteAllByCid(String cid); + public UserInfo loadByUsername(String username); + public void locked(UserInfo userInfo); public void unlock(UserInfo userInfo); diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java index 975637422..af049d3bf 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java @@ -75,6 +75,9 @@ public class UserInfoService extends JpaBaseService { return false; } + public UserInfo loadByUsername(String username) { + return getMapper().loadByUsername(username); + } public UserInfo loadByAppIdAndUsername(String appId,String username){ try { 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 6e65aa46a..a6c19ab7b 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 @@ -6,10 +6,10 @@ SELECT DISTINCT APP.* FROM - APPLICATIONS APP,GROUP_APP GA + APPS APP,GROUP_PRIVILEGES GP WHERE - APP.ID=GA.APPID - AND GA.GROUPID IN( + APP.ID=GP.APPID + AND GP.GROUPID IN( SELECT G.ID FROM @@ -34,7 +34,7 @@ AND NAME = #{name} - ORDER BY SORTORDER + ORDER BY SORTINDEX \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml index 406b80163..ef2a49b67 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml @@ -2,6 +2,14 @@ + +