Sfoglia il codice sorgente

修改docker-compose 网络模式

wuxw 6 anni fa
parent
commit
198ce729bd

+ 1 - 0
Api/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8008:8008"
        volumes:
        - ../target/Api.jar:/root/target/Api.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
CommunityService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8009:8009"
        volumes:
        - ../target/CommunityService.jar:/root/target/CommunityService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
FeeService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8010:8010"
        volumes:
        - ../target/FeeService.jar:/root/target/FeeService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
OrderService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8001:8001"
        volumes:
        - ../target/OrderService.jar:/root/target/OrderService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
ShopService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8007:8007"
        volumes:
        - ../target/ShopService.jar:/root/target/ShopService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
StoreService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8006:8006"
        volumes:
        - ../target/StoreService.jar:/root/target/StoreService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
UserService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8002:8002"
        volumes:
        - ../target/UserService.jar:/root/target/UserService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
WebService/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "443:8443"
        volumes:
        - ../target/WebService.jar:/root/target/WebService.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 0
eureka/docker/docker-compose.yml

@@ -10,6 +10,7 @@ services:
        - "8761:8761"
        volumes:
        - ../target/eureka.jar:/root/target/eureka.jar
+       network_mode: "host"
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 35 - 23
java110-bean/src/main/java/com/java110/dto/FeeDto.java

@@ -14,17 +14,17 @@ import java.util.Date;
 public class FeeDto extends PageDto implements Serializable {
 
     private String amount;
-private String incomeObjId;
-private String feeTypeCd;
-private Date startTime;
-private Date endTime;
-private String communityId;
-private String feeId;
-private String userId;
-private String payerObjId;
-private String[] feeTypeCds;
+    private String incomeObjId;
+    private String feeTypeCd;
+    private Date startTime;
+    private Date endTime;
+    private String communityId;
+    private String feeId;
+    private String userId;
+    private String payerObjId;
+    private String[] feeTypeCds;
 
-private Date arrearsEndTime;
+    private Date arrearsEndTime;
 
 
     private Date createTime;
@@ -35,44 +35,56 @@ private Date arrearsEndTime;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getIncomeObjId() {
+
+    public String getIncomeObjId() {
         return incomeObjId;
     }
-public void setIncomeObjId(String incomeObjId) {
+
+    public void setIncomeObjId(String incomeObjId) {
         this.incomeObjId = incomeObjId;
     }
-public String getFeeTypeCd() {
+
+    public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
 
-public String getCommunityId() {
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getPayerObjId() {
+
+    public String getPayerObjId() {
         return payerObjId;
     }
-public void setPayerObjId(String payerObjId) {
+
+    public void setPayerObjId(String payerObjId) {
         this.payerObjId = payerObjId;
     }