From ed5a12463864a88f1c7807ba005ea5d4ca923d38 Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Sun, 26 Nov 2017 14:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8maven=E4=B8=BA=E7=83=AD?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BE=9D=E8=B5=96=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boot-starter-security-demo/pom.xml        |  7 ++-
 .../BootStarterSecurityDemoApplication.java   |  2 +-
 .../fast/security/demo/mock/WireMockMian.java | 10 ++++
 ms/pom.xml                                    |  1 -
 pa/pom.xml                                    |  1 -
 pom.xml                                       | 48 ++++++++++++++++++-
 6 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/mock/WireMockMian.java

diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml
index 5383875..7305f79 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml
+++ b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml
@@ -15,7 +15,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
-
 	<dependencies>
 		<dependency>
 			<groupId>com.micro.fast</groupId>
@@ -30,7 +29,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
 		</dependency>
 		<!--根据代码自动生成文档-->
 		<dependency>
@@ -41,6 +39,11 @@
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
 		</dependency>
+        <!--数据模拟依赖-->
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java
index 5017174..ddb6e5c 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java
@@ -16,6 +16,6 @@ public class BootStarterSecurityDemoApplication {
 	}
 	@GetMapping("/hello")
 	public String hello(){
-		return "hello security!!!!!";
+		return "hello security!!!";
 	}
 }
diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/mock/WireMockMian.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/mock/WireMockMian.java
new file mode 100644
index 0000000..8c9c21e
--- /dev/null
+++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/mock/WireMockMian.java
@@ -0,0 +1,10 @@
+package com.micro.fast.security.demo.mock;
+
+import com.github.tomakehurst.wiremock.client.WireMock;
+
+public class WireMockMian {
+  //进行对wiremock服务器进行设置
+  public static void main(String[] args) {
+
+  }
+}
diff --git a/ms/pom.xml b/ms/pom.xml
index 5fab3d0..50449c3 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -19,7 +19,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
 		</dependency>
 	</dependencies>
 
diff --git a/pa/pom.xml b/pa/pom.xml
index dd5db0d..4dfd7e8 100644
--- a/pa/pom.xml
+++ b/pa/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 5abe3d3..7a28ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,8 @@
     </modules>
 
     <properties>
+        <micro.fast.version>0.0.1-SNAPSHOT</micro.fast.version>
+        <springboot.version>1.5.6.RELEASE</springboot.version>
         <docker.repository>registry.cn-hangzhou.aliyuncs.com/lishouyu/hub</docker.repository>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -32,7 +34,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
         <spring-cloud.version>Dalston.SR3</spring-cloud.version>
-        <micro.fast.version>0.0.1-SNAPSHOT</micro.fast.version>
         <transport.version>5.6.0</transport.version>
         <lombok.version>1.16.6</lombok.version>
         <guava.version>20.0</guava.version>
@@ -59,8 +60,44 @@
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
         <maven.javadoc.plugin.version>2.10.2</maven.javadoc.plugin.version>
         <docker.maven.plugin.version>0.4.3</docker.maven.plugin.version>
+        <wiremock.version>2.11.0</wiremock.version>
+        <spring-boot-devtools.optional>true</spring-boot-devtools.optional>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>ubuntu-dev</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-devtools</artifactId>
+                        <version>${springboot.version}</version>
+                        <optional>true</optional>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+        <profile>
+            <id>ubuntu-deploy</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-devtools</artifactId>
+                        <version>${springboot.version}</version>
+                        <optional>false</optional>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
     <!--对依赖的版本进行统一管理-->
     <dependencyManagement>
         <dependencies>
@@ -80,6 +117,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!--wiremock客户端-->
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>${wiremock.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!--使用注解简化pojo代码-->
             <dependency>
                 <groupId>org.projectlombok</groupId>
@@ -302,5 +347,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
 </project>