Merge remote-tracking branch 'origin/dev' into dev

build.gradle

@@ -1,17 +1,17 @@
 
-allprojects {
+/**allprojects {
     group = 'com.uas.sso'
     version = '0.0.1-SNAPSHOT'
 
     apply plugin: 'maven'
 }
 
-subprojects {
+/***subprojects {
     apply plugin: 'java'
     sourceCompatibility = 1.8
 
     repositories {
-        /*mavenLocal()*/
+        //*mavenLocal()*
 
         jcenter()
         maven { url "http://113.105.74.141:8081/artifactory/libs-release" }
@@ -20,3 +20,75 @@ subprojects {
 
     [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 }
+*/
+
+buildscript {
+    repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'http://113.105.74.141:8081/artifactory/libs-release-local' }
+        maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.uas.demo.mesh:spring-boot-docker-plugin:1.0.0'
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.6.RELEASE"
+    }
+}
+
+group 'com.uas.sso'
+version '0.0.1-SNAPSHOT'
+
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: "org.springframework.boot"
+apply plugin: 'com.uas.docker.spring.boot'
+
+sourceCompatibility = 1.8
+
+repositories {
+    maven { url 'http://10.10.101.21:8081/artifactory/libs-snapshot' }
+    maven { url 'http://10.10.101.21:8081/artifactory/libs-release' }
+    maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
+    jcenter()
+    mavenCentral()
+}
+
+dependencyManagement {
+    imports {
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR5'
+    }
+}
+
+dependencies {
+    compile "org.springframework.boot:spring-boot-starter-web"
+    compile("org.springframework.boot:spring-boot-starter-thymeleaf")
+    // Spring Boot will create a MultipartConfigElement bean and make itself ready for file uploads.
+    compile("org.springframework.cloud:spring-cloud-starter-feign")
+    compile("org.springframework.cloud:spring-cloud-starter-ribbon")
+    compile("org.springframework.cloud:spring-cloud-starter-hystrix")
+    compile "com.uas.cloud.base.commons:common:0.1.0"
+
+    compile("org.springframework.boot:spring-boot-devtools")
+
+    compile("org.springframework.boot:spring-boot-starter-actuator")
+    compile("org.webjars:webjars-locator")
+
+    compile "commons-fileupload:commons-fileupload:1.3.1"
+
+    testCompile "org.springframework.boot:spring-boot-starter-test"
+}
+
+customDocker {
+    baseImage 'hub.c.163.com/library/java:8-jre-alpine'
+    registry '10.10.100.200:5000'
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: "http://10.10.101.21:8081/artifactory/libs-release-local") {
+                authentication(userName: "yingp", password: "111111")
+            }
+        }
+    }
+}.dependsOn build