Merge pull request #7 from cloudhubs/bug-fixes

Bug fixes

ts-admin-service/src/main/java/com/cloudhubs/trainticket/adminservice/service/impl/AdminOrderServiceImpl.java

@@ -3,6 +3,7 @@
 import com.cloudhubs.trainticket.adminservice.entity.Order;
 import com.cloudhubs.trainticket.adminservice.service.AdminOrderService;
 import com.cloudhubs.trainticket.adminservice.service.ServiceResolver;
+import com.cloudhubs.trainticket.adminservice.util.HeadersUtils;
 import com.cloudhubs.trainticket.adminservice.util.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,7 +122,7 @@ public Response updateOrder(Order request, HttpHeaders headers) {
  if (request.getTrainNumber().startsWith("G") || request.getTrainNumber().startsWith("D")) {
 
  AdminOrderServiceImpl.LOGGER.info("[updateOrder][Update Order][trainNumber starts With G or D]");
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  String order_service_url = serviceResolver.getServiceUrl("ts-order-service");
  ResponseEntity<Response> re = restTemplate.exchange(
  order_service_url + "/api/v1/orderservice/order/admin",
@@ -132,7 +133,7 @@ public Response updateOrder(Order request, HttpHeaders headers) {
 
  } else {
  AdminOrderServiceImpl.LOGGER.info("[updateOrder][Add New Order Other][trainNumber doesn't starts With G or D]");
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  String order_other_service_url = serviceResolver.getServiceUrl("ts-order-other-service");
  ResponseEntity<Response> re = restTemplate.exchange(
  order_other_service_url + "/api/v1/orderOtherService/orderOther/admin",
@@ -152,7 +153,7 @@ public Response addOrder(Order request, HttpHeaders headers) {
  LOGGER.info("[addOrder][ADD ORDER][request info: {}]", request.toString());
  if (request.getTrainNumber().startsWith("G") || request.getTrainNumber().startsWith("D")) {
  AdminOrderServiceImpl.LOGGER.info("[addOrder][Add New Order][trainNumber starts With G or D]");
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  String order_service_url = serviceResolver.getServiceUrl("ts-order-service");
  ResponseEntity<Response> re = restTemplate.exchange(
  order_service_url + "/api/v1/orderservice/order/admin",
@@ -163,7 +164,7 @@ public Response addOrder(Order request, HttpHeaders headers) {
 
  } else {
  AdminOrderServiceImpl.LOGGER.info("[addOrder][Add New Order Other][trainNumber doesn't starts With G or D]");
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  String order_other_service_url = serviceResolver.getServiceUrl("ts-order-other-service");
  ResponseEntity<Response> re = restTemplate.exchange(
  order_other_service_url + "/api/v1/orderOtherService/orderOther/admin",

ts-admin-service/src/main/java/com/cloudhubs/trainticket/adminservice/util/HeadersUtils.java

@@ -0,0 +1,12 @@
+package com.cloudhubs.trainticket.adminservice.util;
+
+import org.springframework.http.HttpHeaders;
+
+public class HeadersUtils {
+ public static HttpHeaders prepareForSent(HttpHeaders headers) {
+ var sentHeaders = new HttpHeaders(headers);
+ sentHeaders.remove("content-length");
+
+ return sentHeaders;
+ }
+}

ts-assurance-service/src/main/java/com/cloudhubs/trainticket/assurance/service/impl/AdminTravelServiceImpl.java

@@ -6,6 +6,7 @@
 import com.cloudhubs.trainticket.assurance.entity.TravelInfo;
 import com.cloudhubs.trainticket.assurance.service.AdminTravelService;
 import com.cloudhubs.trainticket.assurance.service.ServiceResolver;
+import com.cloudhubs.trainticket.assurance.util.HeadersUtils;
 import com.cloudhubs.trainticket.assurance.util.JsonUtils;
 import com.cloudhubs.trainticket.assurance.util.Response;
 import org.slf4j.Logger;
@@ -104,7 +105,7 @@ public Response addTravel(TravelInfo request, HttpHeaders headers) {
  } else {
  requestUrl = travel2_service_url + "/api/v1/travel2service/trips";
  }
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  ResponseEntity<Response> re = restTemplate.exchange(
  requestUrl,
  HttpMethod.POST,
@@ -139,7 +140,7 @@ public Response updateTravel(TravelInfo request, HttpHeaders headers) {
  } else {
  requestUrl = travel2_service_url + "/api/v1/travel2service/trips";
  }
- HttpEntity requestEntity = new HttpEntity(request, headers);
+ HttpEntity requestEntity = new HttpEntity(request, HeadersUtils.prepareForSent(headers));
  ResponseEntity<Response> re = restTemplate.exchange(
  requestUrl,
  HttpMethod.PUT,

ts-assurance-service/src/main/java/com/cloudhubs/trainticket/assurance/service/impl/InsidePaymentServiceImpl.java

@@ -5,6 +5,7 @@
 import com.cloudhubs.trainticket.assurance.repository.InsidePaymentRepository;
 import com.cloudhubs.trainticket.assurance.service.InsidePaymentService;
 import com.cloudhubs.trainticket.assurance.service.ServiceResolver;
+import com.cloudhubs.trainticket.assurance.util.HeadersUtils;
 import com.cloudhubs.trainticket.assurance.util.Response;
 import com.cloudhubs.trainticket.assurance.entity.PaymentInfo;
 import com.cloudhubs.trainticket.assurance.entity.InsidePayment;
@@ -112,7 +113,7 @@ public Response pay(PaymentInfo info, HttpHeaders headers) {
 
  /****这里调用第三方支付***/
 
- HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, headers);
+ HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, HeadersUtils.prepareForSent(headers));
  String payment_service_url = serviceResolver.getServiceUrl("ts-payment-service");
  ResponseEntity<Response> reOutsidePaySuccess = restTemplate.exchange(
  payment_service_url + "/api/v1/paymentservice/payment",
@@ -299,7 +300,7 @@ public Response payDifference(PaymentInfo info, HttpHeaders headers) {
  outsidePaymentInfo.setUserId(userId);
  outsidePaymentInfo.setPrice(info.getPrice());
 
- HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, headers);
+ HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, HeadersUtils.prepareForSent(headers));
  String payment_service_url = serviceResolver.getServiceUrl("ts-payment-service");
  ResponseEntity<Response> reOutsidePaySuccess = restTemplate.exchange(
  payment_service_url + "/api/v1/paymentservice/payment",

ts-assurance-service/src/main/java/com/cloudhubs/trainticket/assurance/util/HeadersUtils.java

@@ -0,0 +1,12 @@
+package com.cloudhubs.trainticket.assurance.util;
+
+import org.springframework.http.HttpHeaders;
+
+public class HeadersUtils {
+ public static HttpHeaders prepareForSent(HttpHeaders headers) {
+ var sentHeaders = new HttpHeaders(headers);
+ sentHeaders.remove("content-length");
+
+ return sentHeaders;
+ }
+}

ts-order-related-service/src/main/java/com/cloudhubs/trainticket/orderrelated/init/ConsignPriceInitData.java → ts-consign-service/src/main/java/com/cloudhubs/trainticket/consign/init/ConsignPriceInitData.java

@@ -1,7 +1,7 @@
-package com.cloudhubs.trainticket.orderrelated.init;
+package com.cloudhubs.trainticket.consign.init;
 
-import com.cloudhubs.trainticket.orderrelated.entity.ConsignPrice;
-import com.cloudhubs.trainticket.orderrelated.service.ConsignPriceService;
+import com.cloudhubs.trainticket.consign.entity.ConsignPrice;
+import com.cloudhubs.trainticket.consign.service.ConsignPriceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

ts-order-related-service/src/main/java/com/cloudhubs/trainticket/orderrelated/init/PriceInitData.java → ts-consign-service/src/main/java/com/cloudhubs/trainticket/consign/init/PriceInitData.java

@@ -1,10 +1,10 @@
-package com.cloudhubs.trainticket.orderrelated.init;
+package com.cloudhubs.trainticket.consign.init;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import com.cloudhubs.trainticket.orderrelated.entity.PriceConfig;
-import com.cloudhubs.trainticket.orderrelated.service.PriceService;
+import com.cloudhubs.trainticket.consign.entity.PriceConfig;
+import com.cloudhubs.trainticket.consign.service.PriceService;
 
 import java.util.UUID;
 

ts-order-related-service/src/main/java/com/cloudhubs/trainticket/orderrelated/service/PriceService.java → ts-consign-service/src/main/java/com/cloudhubs/trainticket/consign/service/PriceService.java

@@ -1,8 +1,8 @@
-package com.cloudhubs.trainticket.orderrelated.service;
+package com.cloudhubs.trainticket.consign.service;
 
-import com.cloudhubs.trainticket.orderrelated.util.Response;
+import com.cloudhubs.trainticket.consign.util.Response;
 import org.springframework.http.HttpHeaders;
-import com.cloudhubs.trainticket.orderrelated.entity.PriceConfig;
+import com.cloudhubs.trainticket.consign.entity.PriceConfig;
 
 import java.util.List;
 

ts-order-related-service/src/main/java/com/cloudhubs/trainticket/orderrelated/service/impl/PriceServiceImpl.java → ts-consign-service/src/main/java/com/cloudhubs/trainticket/consign/service/impl/PriceServiceImpl.java

@@ -1,14 +1,15 @@
-package com.cloudhubs.trainticket.orderrelated.service.impl;
+package com.cloudhubs.trainticket.consign.service.impl;
 
-import com.cloudhubs.trainticket.orderrelated.util.Response;
+import com.cloudhubs.trainticket.consign.util.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
-import com.cloudhubs.trainticket.orderrelated.entity.PriceConfig;
-import com.cloudhubs.trainticket.orderrelated.repository.PriceConfigRepository;
-import com.cloudhubs.trainticket.orderrelated.service.PriceService;
+
+import com.cloudhubs.trainticket.consign.service.PriceService;
+import com.cloudhubs.trainticket.consign.entity.PriceConfig;
+import com.cloudhubs.trainticket.consign.repository.PriceConfigRepository;
 
 import java.util.*;
 

ts-contacts-service/src/main/java/com/cloudhubs/trainticket/contacts/service/impl/AdminBasicInfoServiceImpl.java

@@ -7,6 +7,7 @@
 import com.cloudhubs.trainticket.contacts.entity.Station;
 import com.cloudhubs.trainticket.contacts.service.AdminBasicInfoService;
 import com.cloudhubs.trainticket.contacts.service.ServiceResolver;
+import com.cloudhubs.trainticket.contacts.util.HeadersUtils;
 import com.cloudhubs.trainticket.contacts.util.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -117,7 +118,7 @@ public Response getAllStations(HttpHeaders headers) {
  @Override
  public Response addStation(Station s, HttpHeaders headers) {
  Response result;
- HttpEntity requestEntity = new HttpEntity(s, headers);
+ HttpEntity requestEntity = new HttpEntity(s, HeadersUtils.prepareForSent(headers));
  String station_service_url = serviceResolver.getServiceUrl("ts-station-service");
  String stations = station_service_url + "/api/v1/stationservice/stations";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -147,7 +148,7 @@ public Response deleteStation(String id, HttpHeaders headers) {
  @Override
  public Response modifyStation(Station s, HttpHeaders headers) {
  Response result;
- HttpEntity requestEntity = new HttpEntity(s, headers);
+ HttpEntity requestEntity = new HttpEntity(s, HeadersUtils.prepareForSent(headers));
  String station_service_url = serviceResolver.getServiceUrl("ts-station-service");
  String stations = station_service_url + "/api/v1/stationservice/stations";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -209,7 +210,7 @@ public Response deleteTrain(String id, HttpHeaders headers) {
  @Override
  public Response modifyTrain(TrainType t, HttpHeaders headers) {
  Response result;
- HttpEntity requestEntity = new HttpEntity(t, headers);
+ HttpEntity requestEntity = new HttpEntity(t, HeadersUtils.prepareForSent(headers));
  String train_service_url = serviceResolver.getServiceUrl("ts-train-service");
  String trains = train_service_url + "/api/v1/trainservice/trains";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -237,7 +238,7 @@ public Response getAllConfigs(HttpHeaders headers) {
 
  @Override
  public Response addConfig(Config c, HttpHeaders headers) {
- HttpEntity requestEntity = new HttpEntity(c, headers);
+ HttpEntity requestEntity = new HttpEntity(c, HeadersUtils.prepareForSent(headers));
  String config_service_url = serviceResolver.getServiceUrl("ts-config-service");
  String configs = config_service_url + "/api/v1/configservice/configs";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -262,7 +263,7 @@ public Response deleteConfig(String name, HttpHeaders headers) {
 
  @Override
  public Response modifyConfig(Config c, HttpHeaders headers) {
- HttpEntity requestEntity = new HttpEntity(c, headers);
+ HttpEntity requestEntity = new HttpEntity(c, HeadersUtils.prepareForSent(headers));
  String config_service_url = serviceResolver.getServiceUrl("ts-config-service");
  String configs = config_service_url + "/api/v1/configservice/configs";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -288,7 +289,7 @@ public Response getAllPrices(HttpHeaders headers) {
 
  @Override
  public Response addPrice(PriceInfo pi, HttpHeaders headers) {
- HttpEntity requestEntity = new HttpEntity(pi, headers);
+ HttpEntity requestEntity = new HttpEntity(pi, HeadersUtils.prepareForSent(headers));
  String price_service_url = serviceResolver.getServiceUrl("ts-price-service");
  String prices = price_service_url + "/api/v1/priceservice/prices";
  ResponseEntity<Response> re = restTemplate.exchange(
@@ -316,7 +317,7 @@ public Response deletePrice(String pricesId, HttpHeaders headers) {
 
  @Override
  public Response modifyPrice(PriceInfo pi, HttpHeaders headers) {
- HttpEntity requestEntity = new HttpEntity(pi, headers);
+ HttpEntity requestEntity = new HttpEntity(pi, HeadersUtils.prepareForSent(headers));
  String price_service_url = serviceResolver.getServiceUrl("ts-price-service");
  String prices = price_service_url + "/api/v1/priceservice/prices";
  ResponseEntity<Response> re = restTemplate.exchange(

ts-contacts-service/src/main/java/com/cloudhubs/trainticket/contacts/util/HeadersUtils.java

@@ -0,0 +1,12 @@
+package com.cloudhubs.trainticket.contacts.util;
+
+import org.springframework.http.HttpHeaders;
+
+public class HeadersUtils {
+ public static HttpHeaders prepareForSent(HttpHeaders headers) {
+ var sentHeaders = new HttpHeaders(headers);
+ sentHeaders.remove("content-length");
+
+ return sentHeaders;
+ }
+}

ts-delivery-service/src/main/java/com/cloudhubs/trainticket/delivery/service/impl/InsidePaymentServiceImpl.java

@@ -5,6 +5,7 @@
 import com.cloudhubs.trainticket.delivery.repository.InsidePaymentRepository;
 import com.cloudhubs.trainticket.delivery.service.InsidePaymentService;
 import com.cloudhubs.trainticket.delivery.service.ServiceResolver;
+import com.cloudhubs.trainticket.delivery.util.HeadersUtils;
 import com.cloudhubs.trainticket.delivery.util.Response;
 import com.cloudhubs.trainticket.delivery.entity.PaymentInfo;
 import com.cloudhubs.trainticket.delivery.entity.InsidePayment;
@@ -112,7 +113,7 @@ public Response pay(PaymentInfo info, HttpHeaders headers) {
 
  /****这里调用第三方支付***/
 
- HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, headers);
+ HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, HeadersUtils.prepareForSent(headers));
  String payment_service_url = serviceResolver.getServiceUrl("ts-payment-service");
  ResponseEntity<Response> reOutsidePaySuccess = restTemplate.exchange(
  payment_service_url + "/api/v1/paymentservice/payment",
@@ -299,7 +300,7 @@ public Response payDifference(PaymentInfo info, HttpHeaders headers) {
  outsidePaymentInfo.setUserId(userId);
  outsidePaymentInfo.setPrice(info.getPrice());
 
- HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, headers);
+ HttpEntity requestEntityOutsidePaySuccess = new HttpEntity(outsidePaymentInfo, HeadersUtils.prepareForSent(headers));
  String payment_service_url = serviceResolver.getServiceUrl("ts-payment-service");
  ResponseEntity<Response> reOutsidePaySuccess = restTemplate.exchange(
  payment_service_url + "/api/v1/paymentservice/payment",

ts-delivery-service/src/main/java/com/cloudhubs/trainticket/delivery/util/HeadersUtils.java

@@ -0,0 +1,12 @@
+package com.cloudhubs.trainticket.delivery.util;
+
+import org.springframework.http.HttpHeaders;
+
+public class HeadersUtils {
+ public static HttpHeaders prepareForSent(HttpHeaders headers) {
+ var sentHeaders = new HttpHeaders(headers);
+ sentHeaders.remove("content-length");
+
+ return sentHeaders;
+ }
+}