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 000000000..cb77b7b3e --- /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 2566c7eba..9d0a3867e 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 9211fcfa3..9bf916557 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 000000000..59d60644b --- /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 000000000..59d60644b --- /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 000000000..c2d9872a1 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore @@ -0,0 +1 @@ +/com/ diff --git a/maxkey-protocols/maxkey-protocol-cas/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 7ae5bd6af..b2482d23d 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 bb47baaec..2bc82560c 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 2068d6bb4..1e44d84e7 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 000000000..59d60644b --- /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 3b6b2918e..85806f751 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 cecd2dd3f..35e96e1c6 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 000000000..59d60644b --- /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 6f36c549b..7da4a6d43 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 050abef6d..efe95c223 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 000000000..59d60644b --- /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 3a92fff89..f28057f61 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 088c1547c..69bcb90cc 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 000000000..59d60644b --- /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 112af08dc..1f1bb4054 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 5290265b0..178c16e5b 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 000000000..59d60644b --- /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 bb0c90116..0eac63ea8 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 fabdab16b..f78f5016b 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 8e1e91b6c..be2416a24 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 fcf3c87f6..cec472a1f 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 8b006b9d5..38ccd7a67 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 a14390c01..987bdab9b 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 1f3a1cea6..09399541f 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 e8adaef86..3f41a0648 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 ff71d0f7e..f0b37750b 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 1ca8f9644..eb272de3a 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 4ff30b528..fd5f8be12 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 a37c406b9..090a561ee 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 c91ecf4f3..ce8c3856f 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 8e776f6d6..03a3ea06a 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 f4a671ef4..6fcf68171 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 75796f7e4..7d4dd98ff 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 8fe990fe4..34c902115 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 399b01439..2732e4d53 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 d2ead4fc7..06b153e0f 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 3ed1fc3d1..0ba16d389 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 37f05f689..9cbe37448 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 ceddba82f..7763c130c 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 897b3ccbd..b5dc39c88 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 05b42062d..fb44b1eef 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 37e8db423..a343273e6 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 3dc6ade8c..f469d69a5 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 7e169e901..63eb25884 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 b3fe62b6e..b680daf7f 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 5337111bc..d26a5fedb 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 8b340dd7e..0774bd5b6 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 1c44bdca2..98d299f69 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 01254af1b..d26764c88 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 59c2f79d4..2669ceea8 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 7381fe270..b751b3b98 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 9146839c7..e5d7f9042 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 642855f88..a37dcf396 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 c0ab69d85..5a21b1547 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 19d5691d9..cd8db5a16 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 e0a37fec0..52bc3403b 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 b7f3467d6..91efca211 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 bc18a6793..c788eca04 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 78babef03..5509ad504 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 ba77ce215..8e65e318c 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 659c30c2b..166985ccc 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