Bladeren bron

springcloud2.0修改为spring.cloud.client.ip-address

吴学文 7 jaren geleden
bovenliggende
commit
b65e2e4814
35 gewijzigde bestanden met toevoegingen van 45 en 34 verwijderingen
  1. 1 1
      Api/src/main/resources/application-dev.yml
  2. 1 1
      Api/src/main/resources/application-prod.yml
  3. 1 1
      Api/src/main/resources/application-test.yml
  4. 1 1
      CodeService/src/main/resources/application-dev.yml
  5. 1 1
      CodeService/src/main/resources/application-prod.yml
  6. 1 1
      CodeService/src/main/resources/application-test.yml
  7. 1 1
      CommentService/src/main/resources/application-dev.yml
  8. 1 1
      CommentService/src/main/resources/application-prod.yml
  9. 1 1
      CommentService/src/main/resources/application-test.yml
  10. 1 1
      CommunityService/src/main/resources/application-dev.yml
  11. 1 1
      CommunityService/src/main/resources/application-prod.yml
  12. 1 1
      CommunityService/src/main/resources/application-test.yml
  13. 1 1
      FeeService/src/main/resources/application-dev.yml
  14. 1 1
      FeeService/src/main/resources/application-prod.yml
  15. 1 1
      FeeService/src/main/resources/application-test.yml
  16. 1 1
      LogService/src/main/resources/application-dev.yml
  17. 1 1
      LogService/src/main/resources/application-prod.yml
  18. 1 1
      LogService/src/main/resources/application-test.yml
  19. 1 1
      OrderService/src/main/resources/application-dev.yml
  20. 1 1
      OrderService/src/main/resources/application-prod.yml
  21. 1 1
      OrderService/src/main/resources/application-test.yml
  22. 1 1
      ShopService/src/main/resources/application-dev.yml
  23. 1 1
      ShopService/src/main/resources/application-prod.yml
  24. 1 1
      ShopService/src/main/resources/application-test.yml
  25. 1 1
      StoreService/src/main/resources/application-dev.yml
  26. 1 1
      StoreService/src/main/resources/application-prod.yml
  27. 1 1
      StoreService/src/main/resources/application-test.yml
  28. 1 1
      UserService/src/main/resources/application-dev.yml
  29. 1 1
      UserService/src/main/resources/application-prod.yml
  30. 1 1
      UserService/src/main/resources/application-test.yml
  31. 1 1
      WebService/src/main/resources/application-dev.yml
  32. 1 1
      WebService/src/main/resources/application-prod.yml
  33. 1 1
      WebService/src/main/resources/application-test.yml
  34. 5 0
      java110-service/pom.xml
  35. 7 1
      pom.xml

+ 1 - 1
Api/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
Api/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
Api/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
CodeService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
CodeService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
CodeService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
CommentService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
CommentService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
CommentService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
CommunityService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
CommunityService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
CommunityService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
FeeService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
FeeService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
FeeService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
LogService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
LogService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
LogService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
OrderService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
OrderService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
OrderService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
ShopService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
ShopService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
ShopService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
StoreService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
StoreService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
StoreService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
UserService/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
UserService/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
UserService/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 1 - 1
WebService/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/

+ 1 - 1
WebService/src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://prod.java110.com:8761/eureka/

+ 1 - 1
WebService/src/main/resources/application-test.yml

@@ -15,7 +15,7 @@ eureka:
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://test.java110.com:8761/eureka/

+ 5 - 0
java110-service/pom.xml

@@ -91,6 +91,11 @@
             <scope>test</scope>
             <version>RELEASE</version>
         </dependency>-->
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

+ 7 - 1
pom.xml

@@ -56,7 +56,7 @@
         <mybatis.version>3.4.1</mybatis.version>
         <log4j.version>1.2.17</log4j.version>
         <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
-        <druid.version>1.0.18</druid.version>
+        <druid.version>1.1.10</druid.version>
         <mybatis-spring.version>1.3.1</mybatis-spring.version>
         <mysql.version>5.1.39</mysql.version>
         <commons-pool2.version>2.2</commons-pool2.version>
@@ -198,6 +198,12 @@
                 <version>${logback.vaersion}</version>
             </dependency>
 
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+
             <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
             <dependency>
                 <groupId>com.mchange</groupId>