Merge branches 'feature/20210518_邮件告警升级' and 'master' of…

Merge branches 'feature/20210518_邮件告警升级' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

assortment-ordercenter-sdk/pom.xml

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.3.9-SNAPSHOT</version>
+            <version>1.5.7-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.2.RELEASE</version>
+            <version>1.5.7-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

call-back-service/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.4.RELEASE</version>
+            <version>1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-application-service/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.4.RELEASE</version>
+            <version>1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/src/main/resources/application-dev.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 spring.profiles.active=dev
 

order-application-service/src/main/resources/application-pre-release.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 logging.config=classpath:logback.xml
 

order-application-service/src/main/resources/application-pro.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 spring.profiles.active=pro
 

order-application-service/src/main/resources/application-qa.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 spring.profiles.active=qa
 

order-application-service/src/main/resources/application-test.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 spring.profiles.active=test
 saas.customScoreClient.feign.url=http://saastestapi.sandload.cn/customer-application-service

order-application-service/src/main/resources/application.properties

 spring.application.name=order-application-service
+freemud.business.group=order
 server.port=9212
 spring.profiles.active=default
 logging.config=classpath:logback.xml

order-management/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.4.RELEASE</version>
+            <version>1.5.7-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -111,7 +111,7 @@
             <dependency>
                 <groupId>com.freemud.application.service.sdk</groupId>
                 <artifactId>sdk-common-base</artifactId>
-                <version>1.5.2.RELEASE</version>
+                <version>1.5.7-SNAPSHOT</version>
             </dependency>
 
             <!--              mybatis            -->
@@ -150,7 +150,7 @@
             <dependency>
                 <groupId>org.apache.skywalking</groupId>
                 <artifactId>apm-toolkit-logback-1.x</artifactId>
-                <version>6.2.0</version>
+                <version>8.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>

shopping-cart-application-service/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.5.4.RELEASE</version>
+            <version>1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/resources/application-dev.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 spring.profiles.active=dev
 

shopping-cart-application-service/src/main/resources/application-pre-release.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 logging.config=classpath:logback.xml
 

shopping-cart-application-service/src/main/resources/application-pro.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 spring.profiles.active=pro
 

shopping-cart-application-service/src/main/resources/application-qa.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 spring.profiles.active=qa
 

shopping-cart-application-service/src/main/resources/application-test.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 spring.profiles.active=test
 saas.newcustomerclient.feign.url=https://saastestapi.sandload.cn/customer-application-service

shopping-cart-application-service/src/main/resources/application.properties

 spring.application.name=shopping-cart-application-service
+freemud.business.group=order
 server.port=9211
 spring.profiles.active=default
 logging.config=classpath:logback.xml