Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

svr/svr-base/pom.xml

@@ -133,6 +133,9 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.SvrBaseApplication</mainClass>
                </configuration>
            </plugin>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/MessageManager.java

@@ -47,9 +47,11 @@ public class MessageManager {
                });
                groups.put(mqMessageDo.getTopic(), subUrl);
            }
            executorService = Executors.newFixedThreadPool(groups.size());
            for (String key : groups.keySet()) {
                executorService.execute(new ConsumerRunner(key, groups.get(key)));
            if(groups.size()>0){
                executorService = Executors.newFixedThreadPool(groups.size());
                for (String key : groups.keySet()) {
                    executorService.execute(new ConsumerRunner(key, groups.get(key)));
                }
            }
        } catch (Exception e) {
            LOGGER.error(e.getMessage(), e);

svr/svr-base/src/main/resources/application.yml

@@ -62,8 +62,8 @@ spring:
    broker-url: tcp://172.19.103.87:61616
    user: admin
    password: admin
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
@@ -86,8 +86,8 @@ spring:
    broker-url: tcp://172.19.103.87:61616
    user: admin
    password: admin
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
@@ -110,7 +110,7 @@ spring:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
    password: jkzlehr
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/

svr/svr-base/src/main/resources/bootstrap.yml

@@ -25,8 +25,8 @@ spring:
---
spring:
  profiles: jwprod
  profiles: prod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwprod}
      uri: ${wlyy.pring.config.uri:http://192.168.120.153:1221}
      label: ${wlyy.spring.config.label:prod}