Merge branch 'master' of csk/ccnet2.0 into master

build.gradle

@@ -1,31 +1,20 @@
-buildscript {
-	ext {
-		springBootVersion = '1.5.8.RELEASE'
-	}
-	repositories {
-		/*本地仓库*/
-		mavenLocal()
-		jcenter()
-		mavenCentral()
-		maven {
-			url "http://central.maven.org/maven2"
-		}
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
+plugins {
+	id 'org.springframework.boot' version '1.5.9.RELEASE'
 }
 
+group = 'com.emato'
+version = '2.0.0'
+
 apply plugin: 'java'
 apply plugin: 'idea'
+apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
 // 部署为外部服务器时, 配置为war包
 apply plugin: 'war'
 // 此配置在外部部署时, 为请求url的上下文路径
-archivesBaseName='ccnet'
+archivesBaseName='ccnet2.0'
+
 
-group = 'com.emato'
-version = '1.0.0'
 sourceCompatibility = 1.8
 
 repositories {

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'ccnet'
+rootProject.name = 'ccnet2.0'