Merge pull request #14 from coderqianlq/dev

Dev
coderqianlq · Dec 16, 2018 · ac19859 · ac19859
2 parents 991dd04 + feb7004
commit ac19859
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 5 deletions.
diff --git a/config-coderqian/service-customer-mysql-dev.properties b/config-coderqian/service-customer-mysql-dev.properties
@@ -0,0 +1 @@
+mysql=mysql-dev
diff --git a/config-coderqian/service-customer-mysql-master.properties b/config-coderqian/service-customer-mysql-master.properties
@@ -0,0 +1 @@
+mysql=mysql-master
diff --git a/config-coderqian/service-customer-mysql.properties b/config-coderqian/service-customer-mysql.properties
diff --git a/config-coderqian/service-customer-redis-dev.properties b/config-coderqian/service-customer-redis-dev.properties
@@ -0,0 +1 @@
+redis=redis-dev
diff --git a/config-coderqian/service-customer-redis-matser.properties b/config-coderqian/service-customer-redis-matser.properties
@@ -0,0 +1 @@
+redis=redis-master
diff --git a/config-coderqian/service-customer-redis.properties b/config-coderqian/service-customer-redis.properties
diff --git a/config-server/src/main/resources/application.properties b/config-server/src/main/resources/application.properties
@@ -3,7 +3,8 @@ server.port=1201
 
 spring.cloud.config.server.git.uri=https://github.com/coderqianlq/spring-cloud-cli/
 spring.cloud.config.server.git.search-paths=config-coderqian
-spring.cloud.config.server.git.username=
-spring.cloud.config.server.git.password=
+spring.cloud.config.server.git.username=1242202279@qq.com
+spring.cloud.config.server.git.password=qlq1995/
+
 # spring.cloud.config.server.git.repos.special.pattern=
 
diff --git a/pom.xml b/pom.xml
@@ -31,6 +31,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Dalston.RELEASE</spring-cloud.version>
+        <docker.image.prefix>qianlq</docker.image.prefix>
     </properties>
 
     <dependencies>
@@ -64,6 +65,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.13</version>
+                <configuration>
+                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
+                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/service-customer/src/main/resources/bootstrap.properties b/service-customer/src/main/resources/bootstrap.properties
@@ -9,7 +9,7 @@ spring.cloud.config.profile=dev
 spring.profiles.active=dev
 
 # 指定具体的配置文件
-# spring.cloud.config.name=service-customer-mysql,service-customer-redis
+spring.cloud.config.name=service-customer,service-customer-mysql,service-customer-redis
 spring.cloud.config.uri=http://127.0.0.1:1201/
 
 spring.zipkin.base-url=http://127.0.0.1:9411