From e59da0e1ada9f0d4987d0b0a78b14f73ff1616fe Mon Sep 17 00:00:00 2001
From: zpli <lizhiping@dianmi365.com>
Date: Tue, 23 Mar 2021 11:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 375 +++++++++++-------
 .../com/dianmi/SpringbootbemoApplication.java |   3 +-
 2 files changed, 230 insertions(+), 148 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3aa97cb..9e5e512 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,155 +1,236 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.4.3</version>
+		<relativePath /> <!-- lookup parent from repository -->
+	</parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
-        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.1.0.RELEASE</spring-cloud-alibaba.version>
-        <spring-platform.version>Cairo-SR8</spring-platform.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
-        <security.oauth.version>2.3.6.RELEASE</security.oauth.version>
-        <pagehelper-spring-boot-starter.version>1.2.12</pagehelper-spring-boot-starter.version>
-        <tk-mybatis.version>2.1.5</tk-mybatis.version>
-        <swagger.fox.version>2.7.0</swagger.fox.version>
-        <swagger-bootstrap-ui.version>1.9.5</swagger-bootstrap-ui.version>
-        <fastjson.version>1.2.61</fastjson.version>
-        <xstream.version>1.4.10</xstream.version>
-        <javax-email.version>1.4.7</javax-email.version>
-        <commons-lang.version>2.6</commons-lang.version>
-        <guava.version>28.0-jre</guava.version>
-        <org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
-        <spring-boot-starter-actuator.version>2.1.6.RELEASE</spring-boot-starter-actuator.version>
-    </properties>
+	<properties>
+		<java.version>1.8</java.version>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+		<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
+		<spring-cloud-alibaba.version>2.1.0.RELEASE</spring-cloud-alibaba.version>
+		<spring-platform.version>Cairo-SR8</spring-platform.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
+		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
+		<pagehelper-spring-boot-starter.version>1.2.12</pagehelper-spring-boot-starter.version>
+		<tk-mybatis.version>2.1.5</tk-mybatis.version>
+		<swagger.fox.version>2.7.0</swagger.fox.version>
+		<swagger-bootstrap-ui.version>1.9.5</swagger-bootstrap-ui.version>
+		<fastjson.version>1.2.61</fastjson.version>
+		<xstream.version>1.4.10</xstream.version>
+		<javax-email.version>1.4.7</javax-email.version>
+		<commons-lang.version>2.6</commons-lang.version>
+		<guava.version>28.0-jre</guava.version>
+		<org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
+		<spring-boot-starter-actuator.version>2.1.6.RELEASE</spring-boot-starter-actuator.version>
+	</properties>
 
-    <groupId>com.example</groupId>
-    <artifactId>springbootbemo</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>springbootbemo</name>
-    <description>Demo project for Spring Boot</description>
+	<groupId>com.example</groupId>
+	<artifactId>springbootbemo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>springbootbemo</name>
+	<description>Demo project for Spring Boot</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
-            <version>2.1.0.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-nacos-config</artifactId>
-            <version>2.1.0.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.1.2.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-alibaba-nacos-config</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-dependencies</artifactId>
-            <version>${spring-cloud.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>${spring-cloud-alibaba.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.30</version>
-        </dependency>
-        <!-- 寮曞叆lombok渚濊禆 -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-        </dependency>
-    </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-generator</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-engine-core</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+		</dependency>
+		<!-- 寮曞叆lombok渚濊禆 -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.alibaba.cloud</groupId>
+				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
+				<version>${spring-cloud-alibaba.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<build>
+		<finalName>${project.name}</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+				<profiles.active>dev</profiles.active>
+				<nacos.addr>hro-nacos-dev-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace></nacos.namespace>
+				<nacos.group>DEFAULT_GROUP</nacos.group>
+			</properties>
+			<activation>
+				<!-- 榛樿鐜 -->
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>yyk</id>
+			<properties>
+				<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+				<profiles.active>dev</profiles.active>
+				<nacos.addr>hro-nacos-dev-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace>86a55193-0a32-4857-a708-54eaf69cd415</nacos.namespace>
+				<nacos.group>DEFAULT_GROUP</nacos.group>
+			</properties>
+		</profile>
+		<profile>
+			<id>test</id>
+			<properties>
+				<profiles.active>test</profiles.active>
+				<nacos.addr>hro-nacos-test-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace></nacos.namespace>
+				<nacos.group>DEFAULT_GROUP</nacos.group>
+			</properties>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<properties>
+				<profiles.active>prod</profiles.active>
+				<nacos.addr>hro-nacos-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace>97465489-df35-4a8d-bdd0-a627088c3639</nacos.namespace>
+				<nacos.group>prod</nacos.group>
+			</properties>
+		</profile>
+		<profile>
+			<id>ext</id>
+			<properties>
+				<profiles.active>ext</profiles.active>
+				<nacos.addr>hro-nacos-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace>b12326f3-f03d-4ceb-8f5d-086b5ab46479</nacos.namespace>
+				<nacos.group>ext</nacos.group>
+			</properties>
+		</profile>
 
+		<!--鐢ㄦ潵鎷夊彇娴嬭瘯鐜鏁版嵁鍒版湰鍦拌皟璇� -->
+		<profile>
+			<id>local_test</id>
+			<properties>
+				<profiles.active>local_test</profiles.active>
+				<nacos.addr>hro-nacos-dev-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace>967e48e1-78c5-407a-8fe0-10ccbbf229b3</nacos.namespace>
+				<nacos.group>DEFAULT_GROUP</nacos.group>
+			</properties>
+		</profile>
+
+		<!--鐢ㄦ潵鎷夊彇鐢熶骇鐜鏁版嵁鍒版湰鍦拌皟璇� -->
+		<profile>
+			<id>local_prod</id>
+			<properties>
+				<profiles.active>local_prod</profiles.active>
+				<nacos.addr>hro-nacos-dev-lan.2haohro.com:8848</nacos.addr>
+				<nacos.namespace>bd212c2e-5479-4aba-9e0c-4e04deb06174</nacos.namespace>
+				<nacos.group>DEFAULT_GROUP</nacos.group>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/src/main/java/com/dianmi/SpringbootbemoApplication.java b/src/main/java/com/dianmi/SpringbootbemoApplication.java
index 1845722..c1682ed 100644
--- a/src/main/java/com/dianmi/SpringbootbemoApplication.java
+++ b/src/main/java/com/dianmi/SpringbootbemoApplication.java
@@ -2,7 +2,8 @@ package com.dianmi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+@EnableDiscoveryClient
 @SpringBootApplication
 public class SpringbootbemoApplication {
 
-- 
2.18.1