shimingxy 5 лет назад
Родитель
Сommit
bb8b55cf9f
34 измененных файлов с 30 добавлено и 20 удалено
  1. 1 0
      .gitignore
  2. 6 3
      build.gradle
  3. 1 0
      maxkey-authentications/.gitignore
  4. 2 1
      maxkey-core/src/main/java/org/maxkey/util/PathUtils.java
  5. BIN
      maxkey-lib/other/mchange-commons-java-0.2.16.jar
  6. BIN
      maxkey-lib/other/mybatis-jpa-extra-1.0.jar
  7. 1 0
      maxkey-protocols/.gitignore
  8. 0 1
      maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore
  9. 1 0
      maxkey-protocols/maxkey-protocol-cas/.gitignore
  10. BIN
      maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar
  11. 1 1
      maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF
  12. 1 0
      maxkey-protocols/maxkey-protocol-desktop/.gitignore
  13. BIN
      maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar
  14. 1 1
      maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF
  15. 1 0
      maxkey-protocols/maxkey-protocol-extendapi/.gitignore
  16. BIN
      maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar
  17. 1 1
      maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF
  18. 1 0
      maxkey-protocols/maxkey-protocol-formbased/.gitignore
  19. BIN
      maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar
  20. 1 1
      maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF
  21. 1 0
      maxkey-protocols/maxkey-protocol-oauth-2.0/.gitignore
  22. 0 1
      maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore
  23. BIN
      maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar
  24. 1 1
      maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF
  25. 1 0
      maxkey-protocols/maxkey-protocol-saml-2.0/.gitignore
  26. BIN
      maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar
  27. 1 1
      maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF
  28. 1 0
      maxkey-protocols/maxkey-protocol-tokenbased/.gitignore
  29. 0 1
      maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore
  30. BIN
      maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar
  31. 1 1
      maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF
  32. 1 0
      maxkey-web-manage/.gitignore
  33. 1 0
      maxkey-web-maxkey/.gitignore
  34. 3 6
      maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java

+ 1 - 0
.gitignore

@@ -18,3 +18,4 @@ jdk/*
 */org/apache/mybatis/jpa/*
 org/apache/mybatis/jpa/*
 /.gradle/
+/build/

+ 6 - 3
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'

+ 1 - 0
maxkey-authentications/.gitignore

@@ -0,0 +1 @@
+/build/

+ 2 - 1
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();
 		}

BIN
maxkey-lib/other/mchange-commons-java-0.2.16.jar


BIN
maxkey-lib/other/mybatis-jpa-extra-1.0.jar


+ 1 - 0
maxkey-protocols/.gitignore

@@ -0,0 +1 @@
+/build/

+ 0 - 1
maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore

@@ -1 +0,0 @@
-/org/

+ 1 - 0
maxkey-protocols/maxkey-protocol-cas/.gitignore

@@ -0,0 +1 @@
+/build/

BIN
maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-desktop/.gitignore

@@ -0,0 +1 @@
+/build/

BIN
maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-extendapi/.gitignore

@@ -0,0 +1 @@
+/build/

BIN
maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-formbased/.gitignore

@@ -0,0 +1 @@
+/build/

BIN
maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-oauth-2.0/.gitignore

@@ -0,0 +1 @@
+/build/

+ 0 - 1
maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore

@@ -1 +0,0 @@
-/org/

BIN
maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-saml-2.0/.gitignore

@@ -0,0 +1 @@
+/build/

BIN
maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-protocols/maxkey-protocol-tokenbased/.gitignore

@@ -0,0 +1 @@
+/build/

+ 0 - 1
maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore

@@ -1 +0,0 @@
-/org/

BIN
maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-1.0.0.RELEASE.jar


+ 1 - 1
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
 

+ 1 - 0
maxkey-web-manage/.gitignore

@@ -0,0 +1 @@
+/build/

+ 1 - 0
maxkey-web-maxkey/.gitignore

@@ -0,0 +1 @@
+/build/

+ 3 - 6
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 {