Browse Source

zen modules ok!

mgr-gxzc 7 years ago
parent
commit
e727da949f

+ 44 - 28
build.gradle

@@ -9,14 +9,23 @@ buildscript {
         commons_logging_version = '1.1.3'
         commons_lang3_version = '3.5'
 
-        spring_mvc_version = '5.0.2.RELEASE'
-        spring_mvc_mongodb_version='1.10.7.RELEASE'
+        spring_boot_version = '1.5.9.RELEASE'
+        spring_data_version = '2.0.2.RELEASE'
+        spring_data_elasticsearch_version = '3.0.2.RELEASE'
+        spring_rabbitmq_version = '2.0.1.RELEASE'
 
+        ehcache_version = '3.4.0'
+        ehcache_core_version = '2.6.11'
         mysql_connector_version = '5.1.45'
         alidruid_version = '1.1.6'
         mybatis_version = '3.4.5'
         mybatiss_version = '1.3.1'
-        mybatis_plus_version = '2.1.6'
+        mybatis_plus_version = '2.1.7'
+        mybatis_plus_boot_version = '1.0.4'
+        activiti_version = '7-201712-EA'
+        rabbitmq_version = '5.1.2'
+        xxljob_version = '1.9.0'
+        swagger_version = '2.7.0'
 
         fastjson_version = '1.2.44'
     }
@@ -26,6 +35,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_version"
     }
 }
 
@@ -44,9 +54,11 @@ subprojects {
     }
 
     dependencies {
-        compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-        compile("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
-        testCompile group: 'junit', name: 'junit', version: '4.12'
+        compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+        compile("org.jetbrains.kotlin:kotlin-reflect")
+        compile("org.springframework.boot:spring-boot-starter-web")
+        testCompile("junit:junit:4.12")
+        testCompile("org.springframework.boot:spring-boot-starter-test")
 
         compile ("commons-io:commons-io:$commons_io_version")
         compile ("commons-logging:commons-logging:$commons_logging_version")
@@ -55,37 +67,39 @@ subprojects {
         compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
         compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
         compile group: 'log4j', name: 'log4j', version: '1.2.17'
-        compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
-        compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.7'
+        compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+        compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25'
 
         // https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
         compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-        compile group: 'javax.servlet', name: 'jstl', version: '1.2'
         compile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
-        compile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
-
-        // https://mvnrepository.com/artifact/org.springframework/spring-context
-        compile ("org.springframework:spring-core:$spring_mvc_version")
-        compile ("org.springframework:spring-beans:$spring_mvc_version")
-        compile ("org.springframework:spring-context:$spring_mvc_version")
-        compile ("org.springframework:spring-context-support:$spring_mvc_version")
-        compile ("org.springframework:spring-aop:$spring_mvc_version")
-        compile ("org.springframework:spring-tx:$spring_mvc_version")
-        compile ("org.springframework:spring-orm:$spring_mvc_version")
-        compile ("org.springframework:spring-jdbc:$spring_mvc_version")
-        compile ("org.springframework:spring-webmvc:$spring_mvc_version")
-        compile ("org.springframework:spring-web:$spring_mvc_version")
-        compile ("org.springframework:spring-oxm:$spring_mvc_version")
-        compile ("org.springframework:spring-test:$spring_mvc_version")
-        compile ("org.springframework.data:spring-data-mongodb:$spring_mvc_mongodb_version")
+//        compile group: 'javax.servlet', name: 'jstl', version: '1.2'
+//        compile group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
+
+        compile ("org.springframework.amqp:spring-rabbit:$spring_rabbitmq_version")
+        compile ("org.springframework.data:spring-data-commons-core:1.4.1.RELEASE")
+        compile ("org.springframework.data:spring-data-commons:$spring_data_version")
+        compile ("org.springframework.data:spring-data-redis:$spring_data_version")
+        compile ("org.springframework.data:spring-data-jpa:$spring_data_version")
+        compile ("org.springframework.data:spring-data-elasticsearch:$spring_data_elasticsearch_version")
 
-        compile ("mysql:mysql-connector-java:$mysql_connector_version")
         compile ("com.alibaba:druid:$alidruid_version")
+        compile ("org.ehcache:ehcache:$ehcache_version")
+        compile ("org.activiti:activiti-engine:$activiti_version")
+        compile ("org.activiti:activiti-spring:$activiti_version")
+        compile ("net.sf.ehcache:ehcache-core:$ehcache_core_version")
+        compile ("mysql:mysql-connector-java:$mysql_connector_version")
 //        compile ("org.mybatis:mybatis:$mybatis_version")
 //        compile ("org.mybatis:mybatis-spring:$mybatiss_version")
         compile ("com.baomidou:mybatis-plus:$mybatis_plus_version")
-
-        compile group: 'com.google.guava', name: 'guava', version: '20.0'
+        compile ("com.baomidou:mybatisplus-spring-boot-starter:$mybatis_plus_boot_version")
+        compile ("com.rabbitmq:amqp-client:$rabbitmq_version")
+        compile ("com.xuxueli:xxl-job-core:$xxljob_version")
+        compile ("io.springfox:springfox-swagger2:$swagger_version")
+        compile ("io.springfox:springfox-swagger2-ui:$swagger_version")
+
+        compile ("com.google.guava:guava:23.6-jre")
+        compile ("com.github.penggle:kaptcha:2.3.2")
         compile ("com.alibaba:fastjson:$fastjson_version")
         compile ("com.fasterxml.jackson.core:jackson-core:2.9.3")
         compile ("com.fasterxml.jackson.core:jackson-databind:2.9.3")
@@ -93,5 +107,7 @@ subprojects {
 
 
         compile ("com.baomidou:kisso:3.6.11")
+        compile ("io.jsonwebtoken:jjwt:0.7.0")
+        compile ("org.projectlombok:lombok:1.16.18")
     }
 }

+ 5 - 0
settings.gradle

@@ -2,4 +2,9 @@ rootProject.name = 'zen'
 include 'zen-common'
 include 'zen-log'
 include 'zen-config'
+include 'zen-umps'
+include 'zen-orm'
+include 'zen-api'
+include 'zen-admin'
+include 'zen-ui'
 

+ 5 - 0
zen-admin/build.gradle

@@ -0,0 +1,5 @@
+apply plugin: 'war'
+
+dependencies {
+    compile project(":zen-api")
+}

+ 16 - 0
zen-admin/src/main/webapp/index.jsp

@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: mgr
+  Date: 18-1-20
+  Time: 上午11:23
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <head>
+    <title>$Title$</title>
+  </head>
+  <body>
+  $END$
+  </body>
+</html>

+ 4 - 0
zen-api/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile project(":zen-umps")
+    compile project(":zen-orm")
+}

+ 5 - 0
zen-orm/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    compile project(":zen-common")
+    compile project(":zen-config")
+    compile project(":zen-log")
+}

+ 5 - 0
zen-ui/build.gradle

@@ -0,0 +1,5 @@
+apply plugin: 'war'
+
+dependencies {
+
+}

+ 16 - 0
zen-ui/src/main/webapp/index.jsp

@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: mgr
+  Date: 18-1-20
+  Time: 上午11:24
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <head>
+    <title>$Title$</title>
+  </head>
+  <body>
+  $END$
+  </body>
+</html>

+ 5 - 0
zen-umps/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    compile project(":zen-common")
+    compile project(":zen-config")
+    compile project(":zen-log")
+}