diff --git a/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..cb77b7b3e77e7222fce6710f0f9ee2373b950c92 --- /dev/null +++ b/maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java @@ -0,0 +1,81 @@ +package org.apache.mybatis.jpa.test; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +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.AppsFormBasedDetailsService; +import org.maxkey.dao.service.AppsService; +import org.maxkey.domain.Accounts; +import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.AppsFormBasedDetails; +import org.maxkey.util.PathUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class AppsServiceTest { + + private static final Logger _logger = LoggerFactory.getLogger(AppsServiceTest.class); + + public static ApplicationContext context; + + public static AppsService service; + + public AppsService getservice() { + service=(AppsService)WebContext.getBean("appsService"); + return service; + } + + + @Test + public void get() throws Exception{ + _logger.info("get..."); + Apps a=new Apps(); + a.setPageNumber(2); + a.setPageSize(10); + ; + getservice().queryPageResults(a); + // _logger.info("apps "+); + + } + + + + @Before + public void initSpringContext(){ + if(context!=null) return; + _logger.info("init Spring Context..."); + SimpleDateFormat sdf_ymdhms =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String startTime=sdf_ymdhms.format(new Date()); + + try{ + AppsServiceTest runner=new AppsServiceTest(); + runner.init(); + + }catch(Exception e){ + e.printStackTrace(); + } + + _logger.info("-- --Init Start at " + startTime+" , End at "+sdf_ymdhms.format(new Date())); + } + + //Initialization ApplicationContext for Project + public void init(){ + _logger.info("init ..."); + + _logger.info("Application dir "+System.getProperty("user.dir")); + context = new ClassPathXmlApplicationContext(new String[] {"spring/applicationContext.xml"}); + WebContext.applicationContext=context; + getservice(); + System.out.println("init ..."); + + } + +} diff --git a/maxkey-lib/other/mybatis-jpa-extra-1.0.jar b/maxkey-lib/other/mybatis-jpa-extra-1.0.jar index 2566c7eba7ce06af55e5fd7165fcb2cfba7ad4c9..9d0a3867eed342e95bf931dfc1567691ba9e2c20 100644 Binary files a/maxkey-lib/other/mybatis-jpa-extra-1.0.jar and b/maxkey-lib/other/mybatis-jpa-extra-1.0.jar differ diff --git a/maxkey-lib/other/mybatis-jpa-extra-2.1-api-1.0.jar b/maxkey-lib/other/mybatis-jpa-extra-2.1-api-1.0.jar index 9211fcfa3caef5b7d30f76f45105d754cfc05b87..9bf9165576e205ada0e2120d9ba45fa36008dadc 100644 Binary files a/maxkey-lib/other/mybatis-jpa-extra-2.1-api-1.0.jar and b/maxkey-lib/other/mybatis-jpa-extra-2.1-api-1.0.jar differ 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 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ 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 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/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 0000000000000000000000000000000000000000..c2d9872a163058f798b9d0d7e3b38f8d6f1c1a01 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore @@ -0,0 +1 @@ +/com/ diff --git a/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar index 7ae5bd6af6ab9370a49c367ada727832abd35ab5..b2482d23d93691309c04b639e1c61a70e617f824 100644 Binary files a/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html b/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html index bb47baaec645ce33808e93716e687ad41b467ce3..2bc82560c1fe8622c421dd134082a31af756d0af 100644 --- a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html +++ b/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html @@ -85,7 +85,7 @@ Generated by -Gradle 5.4.1 at 2019-11-10 12:36:07

+Gradle 5.4.1 at 2019-11-27 22:38:38

diff --git a/maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF index 2068d6bb41194244108bf68d3733b45e408cc923..1e44d84e720ad0fa592cad3af47b194587443541 100644 --- a/maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-cas Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.516+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.726+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar index 3b6b2918ea859cebc0202a95d8de24077a585561..85806f751370d42f609e9297fb8c996b0e5fc743 100644 Binary files a/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF index cecd2dd3f81adda4119bfef60e090c78f999a094..35e96e1c6ae4b026aa9b25c13aeb8cc72e85afc3 100644 --- a/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-desktop Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.610+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.726+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar index 6f36c549babcb20686ac2a46fc99d8a3a95e7b71..7da4a6d43f18d9be6839b8564c19959ddc9681f9 100644 Binary files a/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF index 050abef6da123eda1d7f51a6f170892eca1b94a5..efe95c22399dbb15e6eb50d10dff79035c29358d 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-extendapi Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.620+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar index 3a92fff894c5e10c2930dd58104ceb0dd8454f98..f28057f613cee8c48c993cae18d8fab85920b5c4 100644 Binary files a/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF index 088c1547c9535e6bd33f116ed12d7d3c851bd189..69bcb90ccca52c7d2ac910e21302f1eaf4cc1d9e 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-formbased Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.630+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar index 112af08dc6d07f7502b6d53a795c29f938529402..1f1bb4054e3c539e926822edf7b036ed04b1139f 100644 Binary files a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF index 5290265b045f34950e782a55d7b425e4cd79baeb..178c16e5b65c28333adbb4abfaa091471414e84e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-oauth-2.0 Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.644+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59d60644b4b20c86a3761ebd029d638e07834723 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar index bb0c901162eb9256ed79c340d8149df4436c60f3..0eac63ea8ee88ebb58b10c8887b9a353847f5c56 100644 Binary files a/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF index fabdab16bdeaf486624b19177c807e1cecf0387a..f78f5016b67fb225df0c0fa94799eaf44aa0b8b8 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-saml-2.0 Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.653+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.758+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar index 8e1e91b6cc50b062f7723114176be6b93a4df73b..be2416a24572058cf4402e99d2e34ac465401b71 100644 Binary files a/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar and b/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar differ diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF index fcf3c87f6cd237f48b49b5681a55c183ce23a33e..cec472a1f271fd8c927a6197c3bfc3b3eb87ef11 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF +++ b/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Implementation-Title: maxkey-protocol-tokenbased Implementation-Version: 1.0.0.RELEASE -Implementation-Date: 2019-11-12T23:06:23.669+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-27T22:38:18.758+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-web-manage/.project b/maxkey-web-manage/.project index 8b006b9d5d6359f683e0ab8fcc84ccbd5766994b..38ccd7a671cf340bfce313ac7419934fdb8a666b 100644 --- a/maxkey-web-manage/.project +++ b/maxkey-web-manage/.project @@ -3,13 +3,13 @@ maxkey-web-manage maxkey-web-manage - maxkey-protocol-oauth-2.0 maxkey-protocol-authorize - maxkey-protocol-saml-2.0 - maxkey-dao maxkey-core maxkey-jose-jwt + maxkey-dao maxkey-client-sdk + maxkey-protocol-oauth-2.0 + maxkey-protocol-saml-2.0 diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java index a14390c01412c7c8b713feb088373aa2762e00d2..987bdab9b5cdc543e9b8a9b910fd65ec576ec785 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -1,6 +1,7 @@ package org.maxkey; +import java.io.File; import java.util.Date; import javax.servlet.ServletException; @@ -33,9 +34,10 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer { } public static void main(String[] args) { - ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyMgtApplication.class, args); InitApplicationContext initWebContext=new InitApplicationContext(applicationContext); + + try { initWebContext.init(null); } catch (ServletException e) { diff --git a/maxkey-web-manage/src/main/resources/log4j2.xml b/maxkey-web-manage/src/main/resources/log4j2.xml index 1f3a1cea64ba40d13cd558dd5851514fc09705d1..09399541f670a8d6a995eceacc6d86ad73ea5517 100644 --- a/maxkey-web-manage/src/main/resources/log4j2.xml +++ b/maxkey-web-manage/src/main/resources/log4j2.xml @@ -24,7 +24,7 @@ - + diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index e8adaef868c30a9583e92a15d7f94997332fdc78..3f41a06486d1b17484801179f7b1440c794dc486 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -366,6 +366,7 @@ apps.oauth.connect.idTokenEncryptionMethod=idToken\u52A0\u5BC6\u65B9\u6CD5 apps.oauth.connect.userInfoEncryptionMethod=\u7528\u6237\u52A0\u5BC6\u65B9\u6CD5 #group +group.id=\u7EC4\u7F16\u7801 group.name=\u7528\u6237\u7EC4 #account 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 ff71d0f7e5dc43d5cab4a36a2bd00d36be4d7867..f0b37750b5a9a1dede9f96ba022fe7715612bcf4 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 @@ -37,7 +37,7 @@ <@locale code="userinfo.displayName" />： - + @@ -56,14 +56,14 @@ <@locale code="account.relatedUsername" />： - + <@locale code="account.relatedPassword" />： - + @@ -74,7 +74,7 @@ "/> - "/> + "/> diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl index 1ca8f96446bfdee3f824a6c01148736e6fd17f2a..eb272de3a3a5fe808318a190601e71df43f12437 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl @@ -25,7 +25,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
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 4ff30b528cc01dd11993f4d152cd8329cd9daa9c..fd5f8be12fd1ec802aa25c979df52cef31e4d49b 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 @@ -103,7 +103,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
@@ -126,22 +126,23 @@
- - - <@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.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" /> +
- " /> - " /> + " /> + " />
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 index a37c406b91be2f85a5a3f712e55bfa4ae509cf61..090a561ee84e47044d9c543cf8931f747915c768 100644 --- 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 @@ -44,8 +44,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 index c91ecf4f33baa9d03c9c0b1828a6b4b529ec69ad..ce8c3856fa92c880047d3c96a4602c48b3a365b3 100644 --- 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 @@ -53,8 +53,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 8e776f6d6e26049f5cd122f44cfa50f4a29b0b86..03a3ea06a28031ada9e319a05f798625b3c51624 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 @@ -61,8 +61,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 f4a671ef468308571a3cf145a08d2c764a58c8f8..6fcf68171c85d2df45b520004414ee5b859d7a7a 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 @@ -69,8 +69,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 75796f7e4c2fdb831de13b8763871c3027962555..7d4dd98ff779c8356581c8974ac53d62e2096adf 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 @@ -221,8 +221,8 @@ $(function(){ - "/> - "/> + "/> + "/> \ 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 8fe990fe471810e13850380ffc9ef396b950ab7b..34c9021152547d58f034942dc52b32afccfe204f 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 @@ -225,8 +225,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 399b0143910894ac4fb9cb705ba383e4026824f6..2732e4d534ae3da4643b352eb7d347d3eb67dcf3 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 @@ -163,8 +163,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 d2ead4fc7398dad39a7155651112195c0ec03657..06b153e0faafa0a69a3ff128e395816db483cc18 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 @@ -175,8 +175,8 @@ $(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 3ed1fc3d1f83378486f168669136ed0edd2090f0..0ba16d389c6017923debb72bb4604073809e8995 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 @@ -183,8 +183,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 37f05f689b761cefae99b9381ab5fbc6d56d19eb..9cbe374483154f4a04d79a33b5b272deb053e72d 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 @@ -190,8 +190,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 ceddba82f7a30d1981a2bb400894ac124ad59b83..7763c130cfe0d4904e18dc765f881405123e7f87 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 @@ -228,8 +228,8 @@ $(function(){ - "/> - "/> + "/> + "/> diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl index 897b3ccbdb3e7a6bab87848b6843b5c18a9d9fd9..b5dc39c88b82189274f66b0a7f47979c8f217f81 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl @@ -239,8 +239,8 @@ $(function(){ - "/> - "/> + "/> + "/> \ 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 05b42062db544bb1e8ac337ab6ead245f4f85feb..fb44b1eef2461bda903c3c77e9b55983051cf781 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 @@ -162,8 +162,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 37e8db4235d740863f05e52fcd0a6ae4d7e528c8..a343273e61f1979630a95013eb1403004359da76 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 @@ -174,8 +174,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 3dc6ade8c45974cfd7a6c17b1f47dedd3a6773c5..f469d69a5523c9ded4cf5a41a62e8fb57aa758ca 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 @@ -34,8 +34,8 @@ <@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 7e169e90192f3f7e27abe8ac11558d3bd6ee9343..63eb258842779de869a9e378ec2060b92f76cf10 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 @@ -141,8 +141,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 b3fe62b6e12ebe5fd99852f06f472202bbe98f8b..b680daf7f6fc5158924f8bea04d153d6da632705 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 @@ -148,8 +148,8 @@ $(function(){ - "/> - "/> + "/> + "/> 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 5337111bc13aaedd39d6ca215e8a769573e0bb14..d26a5fedb25e7aca33c612ad5da23e521010b746 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 @@ -49,7 +49,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl index 8b340dd7e10f58b0ea79d9846c2fed4ed4ac7ff2..0774bd5b69d5be33068510c25696fab019b6c9fe 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl @@ -50,13 +50,13 @@ <@locale code="apps.name"/>:
- - "> + + ">
- "> + ">
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl index 1c44bdca278ade188f5bdd780701306112fbb492..98d299f69d3a4c5742b2024747d492a20109c949 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl @@ -44,7 +44,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
@@ -60,23 +60,23 @@ - - diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl index 01254af1bea56a4a0532e3e32f75a83ad55de58c..d26764c88588ab12f7fc59fd641cfb6859d56974 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl @@ -17,8 +17,7 @@ @@ -26,7 +25,7 @@ "> - "> + "> diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl index 59c2f79d4b07a066ab48592738d123cabcc259d8..2669ceea886b2daf57570dbc743fcfdca817b7f0 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl @@ -14,17 +14,16 @@
<@locale code="group.name"/>: +
- - " + + " wurl="<@base/>/groups/selectGroupsList" wwidth="700" wheight="500" target="window"> - "> - + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
- " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - "> - " +
+ "> + " wurl="<@base/>/groupPrivileges/delete" />
<@locale code="group.name" />： - - * +
- - + + @@ -32,7 +31,7 @@ "> - "> + "> diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl index 7381fe270a788dedbce15e8f52e717abd1bac8a0..b751b3b98d44baa76401d49c45d307d77923c9fa 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl @@ -25,7 +25,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
@@ -51,14 +51,14 @@
" wurl="<@base/>/groups/forwardAdd" - wwidth="400" - wheight="300" + wwidth="500" + wheight="200" target="window"> " wurl="<@base/>/groups/forwardUpdate" - wwidth="400" - wheight="300" + wwidth="500" + wheight="200" target="window"> " diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl index 9146839c729d083f748ffc427dadb4a19376b0b0..e5d7f9042886d20b224de3061160ffd06b171358 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl @@ -27,16 +27,16 @@
：
<@locale code="group.id" />： - +
<@locale code="group.name" />： - - * +
- + diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl index 642855f88e0c36f003a5c8ff26ab7a73b1b6d473..a37dcf39672d9d137e0f8770fed5533300583329 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl @@ -54,13 +54,13 @@ diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl index c0ab69d8527ac2d629169a544559799e30cad075..5a21b1547e59007c51375b38f842201741de47f7 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl @@ -45,7 +45,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
@@ -60,23 +60,24 @@
:<@locale code="group.name"/>: - - "> + + ">
- " > + " >
<@locale code="userinfo.username"/>:
- - "> + + ">
- "> + ">
- - diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl index 19d5691d9f8bdb6cd36e160fc1fe395af7c7ef74..cd8db5a16d9afe6b3e776a26e9e4948e9ea3a34e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl @@ -38,7 +38,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl index e0a37fec018ed884b3bc675f737b9e90ff64c595..52bc3403be9260d48eb0bb8061250014a1649430 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl @@ -38,7 +38,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl index b7f3467d61c93f7198a1d3b38216ce5046c0f24c..91efca2119db87ed2f140968d62e7b1dfd7ffd28 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl @@ -38,7 +38,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/main.ftl b/maxkey-web-manage/src/main/resources/templates/views/main.ftl index bc18a67939555dc49f7100dd99318de46340c50b..c788eca04db35a95c74bfc42b73aca7596166636 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/main.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/main.ftl @@ -34,7 +34,7 @@
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl index 78babef03c51cee9e4ef49b517501c6df306f294..5509ad50416ed79746f848dc8d28ccc0747b0b0f 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl @@ -155,7 +155,7 @@ $(function () {
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoSelect.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoSelect.ftl index ba77ce2151a81ae1d04de24e9643d64553f558fe..8e65e318ccb94e02445ea91b62c483c950e4e262 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoSelect.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoSelect.ftl @@ -155,7 +155,7 @@
- + " >
<@locale code="group.name"/>: -
+
+ - - " + + " wurl="<@base/>/groups/selectGroupsList" wwidth="700" wheight="500" target="window"> - "> + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
- " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
- "> - " + "> + " wurl="<@base/>/groupMember/delete"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl index 659c30c2b3a14c21b7ca88433e7974c4d47c1d3d..166985cccdd349b9ae2922cec35e323de10dd035 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl @@ -165,7 +165,7 @@ $(function () {
    -
  1. Dashboard
    2. +
  2. Dashboard
  3. / Dashboard 2