diff --git a/README.md b/README.md index 811ca0eea..0e2a7a2b3 100644 --- a/README.md +++ b/README.md @@ -51,18 +51,18 @@ **MaxKey认证** 登录界面 -![mahua](https://github.com/shimingxy/MaxKey/blob/master/maxkey_login.png) +![mahua](https://github.com/shimingxy/MaxKey/blob/master/images/maxkey_login.png) 主界面 -![mahua](https://github.com/shimingxy/MaxKey/blob/master/maxkey_index.png) +![mahua](https://github.com/shimingxy/MaxKey/blob/master/images/maxkey_index.png) **MaxKey管理** 用户管理界面 -![mahua](https://github.com/shimingxy/MaxKey/blob/master/maxkey_mgt_users.png) +![mahua](https://github.com/shimingxy/MaxKey/blob/master/images/maxkey_mgt_users.png) 应用管理界面 -![mahua](https://github.com/shimingxy/MaxKey/blob/master/maxkey_mgt_apps.png) +![mahua](https://github.com/shimingxy/MaxKey/blob/master/images/maxkey_mgt_apps.png) ------------ # 下载 diff --git a/build.gradle b/build.gradle index b8b82ac20..30c718d21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ /* - * This build file was auto generated by running the Gradle 'init' task + * This build file was auto generated by running the Gradle buildrelease.bat */ defaultTasks "clean", "build" - +//Version define ext { jackson2Version = "2.9.8" log4jVersion = "2.12.0" @@ -20,12 +20,6 @@ ext { configurations.all { transitive = false// 为本依赖关闭依赖传递特性 - // 所有需要忽略的包定义在此 - //all*.exclude group: 'commons-logging' - //exclude group: 'org.slf4j', module: 'slf4j-api' - //compile.exclude module: 'commons' - //all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' - //all*.exclude group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j' } @@ -40,13 +34,8 @@ allprojects { configurations.all { transitive = false// 为本依赖关闭依赖传递特性 - //all*.exclude group: 'commons-logging' - //exclude group: 'org.slf4j', module: 'slf4j-api' - //compile.exclude module: 'commons' - //all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' - exclude(group: "org.apache.logging.log4j", module: "log4j-to-slf4j") } - + //JAVA Version sourceCompatibility = 1.8 targetCompatibility = 1.8 compileJava.options.encoding = 'UTF-8' @@ -55,7 +44,7 @@ allprojects { jdt { File f = file('.settings/org.eclipse.core.resources.prefs') f.write('eclipse.preferences.version=1\n') - f.append('encoding/=UTF-8') + f.append('encoding/=UTF-8') //use UTF-8 }/* wtp { facet { @@ -136,13 +125,14 @@ subprojects { maven { url "https://maven.repository.redhat.com/ga/" } maven { url "https://repository.apache.org/content/repositories/releases/" } } - + + //all dependencies dependencies { testCompile 'junit:junit:4.11' compileOnly 'junit:junit:4.11' testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - + //apache compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' compile group: 'commons-codec', name: 'commons-codec', version: '1.12' compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2' @@ -168,7 +158,7 @@ subprojects { compile group: 'velocity', name: 'velocity-dep', version: '1.4' compile group: 'org.freemarker', name: 'freemarker', version: '2.3.28' compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' - + //logs compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}" compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" @@ -180,6 +170,7 @@ subprojects { compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.4.0.Final' + //spring compile group: 'org.springframework', name: 'spring-aop', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-aspects', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-beans', version: "${springVersion}" @@ -201,11 +192,11 @@ subprojects { compile group: 'org.springframework', name: 'spring-webflux', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-webmvc', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-websocket', version: "${springVersion}" - + //spring-security compile group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}" compile group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}" compile group: 'org.springframework.security', name: 'spring-security-crypto', version: "${springSecurityVersion}" - + //srpingboot compile group: 'org.springframework.boot', name: 'spring-boot', version: "${springBootVersion}" compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: "${springBootVersion}" compile group: 'org.springframework.boot', name: 'spring-boot-actuator', version: "${springBootVersion}" @@ -215,7 +206,7 @@ subprojects { compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}" compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: "${springBootVersion}" testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" - + //saml compile group: 'org.opensaml', name: 'opensaml', version: '2.6.4' compile group: 'org.opensaml', name: 'openws', version: '1.5.4' compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4' @@ -243,7 +234,7 @@ subprojects { compile group: 'com.jhlabs', name: 'filters', version: '2.0.235-1' compile group: 'com.github.penggle', name: 'kaptcha', version: '2.3.2' - + //json compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' compile group: 'org.codehaus.jackson', name: 'jackson-all', version: '1.8.5' compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}" @@ -257,17 +248,20 @@ subprojects { compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.2.3' + //database + compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.48' + compile group: 'com.alibaba', name: 'druid', version: '1.1.21' compile group: 'redis.clients', name: 'jedis', version: '3.0.1' compile group: 'org.ehcache', name: 'ehcache', version: '3.5.3' + //mybatis compile group: 'org.mybatis', name: 'mybatis', version: '3.5.3' compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.3' - compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.48' - compile group: 'com.alibaba', name: 'druid', version: '1.1.21' + //hibernate compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: "${hibernateVersion}" compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: "${hibernateVersion}" compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: "${hibernateVersion}" - + //jradius compile group: 'net.jradius', name: 'jradius-core', version: '1.1.5' compile group: 'net.jradius', name: 'jradius-dictionary', version: '1.1.5' @@ -296,14 +290,11 @@ subprojects { //local jars compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar') - + //tomcat compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.29' compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' - - } - jar { def currentTime = java.time.ZonedDateTime.now() @@ -371,8 +362,6 @@ subprojects { } } - - // In this section you declare the dependencies for your production and test code dependencies { diff --git a/images/logo.jpg b/images/logo.jpg new file mode 100644 index 000000000..cf28fcfe7 Binary files /dev/null and b/images/logo.jpg differ diff --git a/maxkey_index.png b/images/maxkey_index.png similarity index 100% rename from maxkey_index.png rename to images/maxkey_index.png diff --git a/maxkey_login.png b/images/maxkey_login.png similarity index 100% rename from maxkey_login.png rename to images/maxkey_login.png diff --git a/maxkey_mgt_apps.png b/images/maxkey_mgt_apps.png similarity index 100% rename from maxkey_mgt_apps.png rename to images/maxkey_mgt_apps.png diff --git a/maxkey_mgt_users.png b/images/maxkey_mgt_users.png similarity index 100% rename from maxkey_mgt_users.png rename to images/maxkey_mgt_users.png