diff --git a/.gitignore b/.gitignore index 70c09acff..310ab32cd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ jdk/* */org/apache/mybatis/jpa/* org/apache/mybatis/jpa/* /.gradle/ +/build/ diff --git a/build.gradle b/build.gradle index 5b7408e0b..b6147933f 100644 --- a/build.gradle +++ b/build.gradle @@ -123,12 +123,16 @@ subprojects { mavenLocal() mavenCentral() jcenter() + maven { url "https://maven.eveoh.nl/content/repositories/releases" } maven { url "http://mvn.gt.igexin.com/nexus/content/repositories/releases"} - maven { url "https://plugins.gradle.org/m2/" } + maven { url "https://plugins.gradle.org/m2/" } maven { url "http://repo.spring.io/plugins-release" } maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo1.maven.org/maven2/" } + maven { url "https://oss.sonatype.org/content/repositories/releases/" } + maven { url "https://maven.repository.redhat.com/ga/" } } dependencies { @@ -257,7 +261,7 @@ subprojects { compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.1' compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.47' compile group: 'com.mchange', name: 'c3p0', version: '0.9.5.4' - //compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.15' + compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.16' compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.0.17.Final' compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: '6.0.17.Final' compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: '6.0.17.Final' @@ -296,7 +300,6 @@ subprojects { compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*/*.jar') compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.5.47' - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.5.47' compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' //compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1' diff --git a/maxkey-authentications/.gitignore b/maxkey-authentications/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-authentications/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java b/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java index 5f8f74d91..117cc8f34 100644 --- a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java @@ -6,7 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PathUtils { - private final Logger _logger = LoggerFactory.getLogger(getClass()); + private final Logger _logger = LoggerFactory.getLogger(PathUtils.class); private static PathUtils instance = null; private String classPath; private String appPath; @@ -23,6 +23,7 @@ public class PathUtils { public PathUtils() { try { classPath = java.net.URLDecoder.decode(PathUtils.class.getResource("PathUtils.properties").getFile(),"UTF-8"); + _logger.debug("PathUtils() PathUtils " +classPath); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/maxkey-lib/other/mchange-commons-java-0.2.16.jar b/maxkey-lib/other/mchange-commons-java-0.2.16.jar deleted file mode 100644 index 115ec1cc6..000000000 Binary files a/maxkey-lib/other/mchange-commons-java-0.2.16.jar and /dev/null differ diff --git a/maxkey-lib/other/mybatis-jpa-extra-1.0.jar b/maxkey-lib/other/mybatis-jpa-extra-1.0.jar index 28e5d0352..2566c7eba 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-protocols/.gitignore b/maxkey-protocols/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore deleted file mode 100644 index cf1db2eed..000000000 --- a/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/ diff --git a/maxkey-protocols/maxkey-protocol-cas/.gitignore b/maxkey-protocols/maxkey-protocol-cas/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/.gitignore @@ -0,0 +1 @@ +/build/ 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 ac9a70a15..7ae5bd6af 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/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF index 2357620ba..2068d6bb4 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-10T12:35:40.160+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.516+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-desktop/.gitignore b/maxkey-protocols/maxkey-protocol-desktop/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-desktop/.gitignore @@ -0,0 +1 @@ +/build/ 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 a42585e21..3b6b2918e 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 12fac2ac4..cecd2dd3f 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-10T12:35:40.172+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.610+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-extendapi/.gitignore b/maxkey-protocols/maxkey-protocol-extendapi/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-extendapi/.gitignore @@ -0,0 +1 @@ +/build/ 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 908b4802f..6f36c549b 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 7bf1d73bd..050abef6d 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-10T12:35:40.185+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.620+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-formbased/.gitignore b/maxkey-protocols/maxkey-protocol-formbased/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-formbased/.gitignore @@ -0,0 +1 @@ +/build/ 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 692879957..3a92fff89 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 ee8cd60e4..088c1547c 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-10T12:35:40.194+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.630+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/.gitignore b/maxkey-protocols/maxkey-protocol-oauth-2.0/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore deleted file mode 100644 index cf1db2eed..000000000 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/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 a43a8bf8a..112af08dc 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 090f3deda..5290265b0 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-10T12:35:40.204+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.644+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/.gitignore b/maxkey-protocols/maxkey-protocol-saml-2.0/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/.gitignore @@ -0,0 +1 @@ +/build/ 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 614143efd..bb0c90116 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 ad0af86f5..fabdab16b 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-10T12:35:40.214+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.653+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/.gitignore b/maxkey-protocols/maxkey-protocol-tokenbased/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-tokenbased/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore deleted file mode 100644 index cf1db2eed..000000000 --- a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/ 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 8bb5fbb26..8e1e91b6c 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 090006810..fcf3c87f6 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-10T12:35:40.220+08:00[Asia/Shanghai] +Implementation-Date: 2019-11-12T23:06:23.669+08:00[Asia/Shanghai] Created-By: org.maxkey Implementation-Vendor: https://github.com/shimingxy/MaxKey diff --git a/maxkey-web-manage/.gitignore b/maxkey-web-manage/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-web-manage/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-web-maxkey/.gitignore b/maxkey-web-maxkey/.gitignore new file mode 100644 index 000000000..84c048a73 --- /dev/null +++ b/maxkey-web-maxkey/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java index 3826d7da6..09271f618 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java @@ -4,6 +4,8 @@ import java.util.Date; import javax.servlet.ServletException; +import org.apache.ibatis.io.VFS; +import org.apache.mybatis.jpa.SpringBootVFS; import org.maxkey.web.InitApplicationContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,18 +14,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; @SpringBootApplication public class MaxKeyApplication extends SpringBootServletInitializer { private static final Logger _logger = LoggerFactory.getLogger(MaxKeyApplication.class); - @Bean - MaxKeyConfig MaxKeyConfig() { - return new MaxKeyConfig(); - } - public static void main(String[] args) { + VFS.addImplClass(SpringBootVFS.class); ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyApplication.class, args); InitApplicationContext initWebContext=new InitApplicationContext(applicationContext); try {