Browse Source

调整dmp-org配置,解决启动不起来的问题

lijie 3 years ago
parent
commit
14676c5cc5
2 changed files with 21 additions and 1 deletions
  1. 20 0
      dmp-org/pom.xml
  2. 1 1
      dmp-org/src/main/resources/bootstrap-dev.yml

+ 20 - 0
dmp-org/pom.xml

@@ -38,6 +38,16 @@
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
@@ -60,6 +70,16 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 配置中心 -->

+ 1 - 1
dmp-org/src/main/resources/bootstrap-dev.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: dmp-rwd
+    name: dmp-org
   cloud:
     config:
       profile: dev2