1、修改数据库配置

2、添加docker配置

build.gradle

@@ -1,41 +1,38 @@
 buildscript {
-    ext {
-        springBootVersion = '1.4.4.RELEASE'
-        springloadedVersion = '1.2.6.RELEASE'
-    }
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-    }
+	ext {
+		springBootVersion = '1.4.4.RELEASE'
+		// 0.12.0 升级到了 Gradle 3.4，Gradle 2.14.1 只能使用 0.11.0及以下
+		dockerVersion = '0.11.0'
+		dcokerRegistry = "10.10.100.200:5000"
+	}
+	repositories {
+		maven { url "https://plugins.gradle.org/m2/" }
+		maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
+		mavenCentral()
+		jcenter()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+		classpath "gradle.plugin.com.palantir.gradle.docker:gradle-docker:${dockerVersion}"
+	}
 }
 
-group = 'com.uas.cloud.mall'
-version = '0.1'
+group 'com.uas.cloud.mall'
+version '0.0.1'
 
 apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
+apply plugin: "com.palantir.docker"
+apply plugin: "org.springframework.boot"
 
-sourceCompatibility = 1.8 // 必须在apply java插件之后
-targetCompatibility = 1.8
+apply from: "$rootDir/gradle/tasks.gradle"
+apply from: "$rootDir/gradle/dependencies-base.gradle"
 
-repositories {
-    mavenCentral()
+allprojects {
+	sourceCompatibility = 1.8
 }
 
-dependencyManagement {
-    imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR5'
-    }
-}
 dependencies {
-    compile "org.springframework.boot:spring-boot-starter-data-jpa"
-    compile "mysql:mysql-connector-java:5.1.21"
-    compile 'org.springframework.cloud:spring-cloud-starter-config'
-    compile "org.springframework.cloud:spring-cloud-starter-eureka"
-    compile "com.alibaba:fastjson:1.2.24"
-    compile("org.springframework.boot:spring-boot-devtools")
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
+	compile "org.springframework.boot:spring-boot-starter-data-jpa"
+	compile "mysql:mysql-connector-java:5.1.21"
+	compile "com.alibaba:fastjson:1.2.24"
 }

gradle/dependencies-base.gradle

@@ -0,0 +1,28 @@
+// Gradle Base Dependencies Configurations
+// Created by huxz on 2017-3-17 14:39:36
+repositories {
+	mavenLocal()
+	maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
+	maven {
+		url 'http://10.10.101.21:8081/artifactory/libs-release'
+	}
+	maven {
+		url 'http://10.10.101.21:8081/artifactory/libs-snapshot'
+	}
+	maven {
+		url 'http://10.10.101.21:8081/artifactory/plugins-snapshot'
+	}
+	mavenCentral()
+}
+
+dependencyManagement {
+	imports {
+		mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR5'
+	}
+}
+
+dependencies {
+	compile 'org.springframework.cloud:spring-cloud-starter-config'
+	compile "org.springframework.cloud:spring-cloud-starter-eureka"
+	testCompile 'org.springframework.boot:spring-boot-starter-test'
+}

gradle/tasks.gradle

@@ -0,0 +1,11 @@
+// Gradle Tasks Configurations
+// Created by huxz on 2017-3-17 14:39:36
+bootRun {
+	addResources = true
+}
+
+docker {
+	name "${dcokerRegistry}/${project.name}:${project.version}"
+	dockerfile "${projectDir}/src/main/docker/Dockerfile"
+	files "${buildDir}/libs/${project.name}-${project.version}.jar"
+}.dependsOn build

src/main/docker/Dockerfile

@@ -0,0 +1,5 @@
+FROM hub.c.163.com/library/java:8-jre-alpine
+VOLUME /tmp
+ADD mall-news-service-0.0.1.jar /app.jar
+ENV JAVA_OPTS=""
+ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar --spring.profiles.active=test"]

src/main/java/com/uas/cloud/mall/shop/news/api/NewsController.java

@@ -43,8 +43,7 @@ public class NewsController {
     public News get(@PathVariable Long id) {
         ServiceInstance instance = client.getLocalServiceInstance();
         logger.info("/news, method: get, host:" + instance.getHost() + ", serviceId:" + instance.getServiceId() + ",news: " + id);
-        News news = newsService.findone(id);
-        return news;
+        return newsService.findone(id);
     }
 
     /**
@@ -70,8 +69,7 @@ public class NewsController {
     public List<News> getNewsByViewCount() {
         ServiceInstance instance = client.getLocalServiceInstance();
         logger.info("/news, get, host:" + instance.getHost() + ", serviceId:" + instance.getServiceId() + "get news order by viewcount");
-        List<News> newsList = newsService.findByViewCount();
-        return newsList;
+        return newsService.findByViewCount();
     }
 
 }

src/main/resources/application-dev.yml

@@ -1,26 +1,20 @@
+server:
+  port: 20210
+
 spring:
-  application:
-    name: news-service
   jpa:
-#    hibernate:
-#      ddl-auto:
-#        create-drop
     properties:
       hibernate:
         hbm2ddl:
           auto: update
         dialect: org.hibernate.dialect.MySQL5Dialect
-    # disable open EntityManager in View
     open-in-view: false
   datasource:
-    url: jdbc:mysql://192.168.253.6:3306/dongbw_jpress?useUnicode=true&characterEncoding=utf-8
-    username: usoftchina
-    password: select123***
+    url: jdbc:mysql://10.10.100.18:3306/usoftchina?useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: select
     driver-class-name: com.mysql.jdbc.Driver
 
-server:
-  port: 2258
-
 eureka:
   client:
     serviceUrl:

src/main/resources/application-prod.yml

@@ -1,26 +1,21 @@
+server:
+  port: 20210
+
 spring:
-  application:
-    name: news-service
   jpa:
-#    hibernate:
-#      ddl-auto:
-#        create-drop
     properties:
       hibernate:
         hbm2ddl:
           auto: update
-    # disable open EntityManager in View
+        dialect: org.hibernate.dialect.MySQL5Dialect
     open-in-view: false
   datasource:
-    url: jdbc:mysql://localhost:3306/shop?useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://10.10.100.18:3306/usoftchina?useUnicode=true&characterEncoding=utf-8
     username: root
-    password: mySUN1314
+    password: select
     driver-class-name: com.mysql.jdbc.Driver
 
-server:
-  port: 2258
-
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:1111/eureka/
+      defaultZone: http://10.10.100.23:28000/eureka/

src/main/resources/application-test.yml

@@ -0,0 +1,21 @@
+server:
+  port: 20210
+
+spring:
+  jpa:
+    properties:
+      hibernate:
+        hbm2ddl:
+          auto: update
+        dialect: org.hibernate.dialect.MySQL5Dialect
+    open-in-view: false
+  datasource:
+    url: jdbc:mysql://10.10.100.18:3306/usoftchina?useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: select
+    driver-class-name: com.mysql.jdbc.Driver
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://10.10.100.23:28000/eureka/

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   application:
-    name: news-service
+    name: mall-news-service
   profiles:
     active: dev