From 4eb24b581a99f66194abf9531ee2d0b1cf115a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 13 Feb 2020 16:06:15 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. spring cloud alibaba 2.2.0

---
 pig-auth/src/main/resources/bootstrap.yml              | 6 ++++--
 pig-codegen/src/main/resources/bootstrap.yml           | 5 +++--
 pig-codegen/src/main/resources/template/Mapper.java.vm | 2 ++
 pig-gateway/src/main/resources/bootstrap.yml           | 5 +++--
 pig-monitor/src/main/resources/bootstrap.yml           | 5 +++--
 pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml | 3 ++-
 pom.xml                                                | 2 +-
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pig-auth/src/main/resources/bootstrap.yml b/pig-auth/src/main/resources/bootstrap.yml
index fa091002..c838d450 100755
--- a/pig-auth/src/main/resources/bootstrap.yml
+++ b/pig-auth/src/main/resources/bootstrap.yml
@@ -11,6 +11,8 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:
-    active: @profiles.active@
+    active: dev
+
diff --git a/pig-codegen/src/main/resources/bootstrap.yml b/pig-codegen/src/main/resources/bootstrap.yml
index 5f611d89..67f2f778 100755
--- a/pig-codegen/src/main/resources/bootstrap.yml
+++ b/pig-codegen/src/main/resources/bootstrap.yml
@@ -11,6 +11,7 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:
-    active: @profiles.active@
+    active: dev
diff --git a/pig-codegen/src/main/resources/template/Mapper.java.vm b/pig-codegen/src/main/resources/template/Mapper.java.vm
index ed44ab23..acb78a82 100755
--- a/pig-codegen/src/main/resources/template/Mapper.java.vm
+++ b/pig-codegen/src/main/resources/template/Mapper.java.vm
@@ -18,6 +18,7 @@ package ${package}.${moduleName}.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${package}.${moduleName}.entity.${className};
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * ${comments}
@@ -25,6 +26,7 @@ import ${package}.${moduleName}.entity.${className};
  * @author ${author}
  * @date ${datetime}
  */
+@Mapper
 public interface ${className}Mapper extends BaseMapper<${className}> {
 
 }
diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml
index 7d56a03e..0a0d2316 100755
--- a/pig-gateway/src/main/resources/bootstrap.yml
+++ b/pig-gateway/src/main/resources/bootstrap.yml
@@ -11,8 +11,9 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:
-    active: @profiles.active@
+    active: dev
 
 
diff --git a/pig-monitor/src/main/resources/bootstrap.yml b/pig-monitor/src/main/resources/bootstrap.yml
index 572d82d6..ed44a653 100755
--- a/pig-monitor/src/main/resources/bootstrap.yml
+++ b/pig-monitor/src/main/resources/bootstrap.yml
@@ -11,6 +11,7 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:
-    active: @profiles.active@
+    active: dev
diff --git a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml
index 548bbb3e..27883645 100644
--- a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml
+++ b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml
@@ -11,6 +11,7 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:
     active: @profiles.active@
diff --git a/pom.xml b/pom.xml
index 1a8034b9..c71d0a49 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 	<properties>
 		<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
 		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
-		<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
+		<spring-cloud-alibaba.version>2.2.0.RELEASE</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>