Merge branch 'v2.2.9' into dev

community-service/src/main/java/com/tanpu/community/feign/community/FeignClientForCommunity.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(value = "service-community",  url = "${tanpu.community.svc:}", path = "/community")
+@FeignClient(value = "service-community",  url = "${tanpu.community.svc:http://tp-community-svc}", path = "/community")
 // @FeignClient(value = "service-community", contextId = "community", fallbackFactory = FeignBackClientForCommunity.class, url = "http://127.0.0.1:8202/community")
 public interface FeignClientForCommunity {
 

community-service/src/main/java/com/tanpu/community/feign/course/FeignClientForCourse.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 
-@FeignClient(value = "service-course", contextId = "course", url = "${tanpu.course.svc:}", path = "/course")
+@FeignClient(value = "service-course", contextId = "course", url = "${tanpu.course.svc:http://tp-course-svc}", path = "/course")
 //@FeignClient(value = "service-course", contextId = "course", fallbackFactory = FeignBackClientForCourse.class, url = "http://172.20.1.249:8060/course")
 
 public interface FeignClientForCourse {

community-service/src/main/java/com/tanpu/community/feign/diagnose/FeignClientForDiagnose.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 
-@FeignClient(value = "service-diagnose",  url = "${tanpu.diagnose.svc:}", path = "/diagnose")
+@FeignClient(value = "service-diagnose",  url = "${tanpu.diagnose.svc:http://tp-diagnose-svc}", path = "/diagnose")
 //@FeignClient(value = "service-diagnose", contextId = "diagnose", fallbackFactory = FeignBackClientForDiagnose.class, path = "http://172.20.1.249:8201/diagnose")
 public interface FeignClientForDiagnose {
 

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "fatools", contextId = "fatools",  url = "${tanpu.fatools.svc:}", path = "/fatools")
+@FeignClient(value = "fatools", contextId = "fatools",  url = "${tanpu.fatools.svc:http://tp-fatools-svc}", path = "/fatools")
 //@FeignClient(value = "fatools", contextId = "fatoolsUser", fallbackFactory = FeignbackForFatools.class, path = "/fatools")
 public interface FeignClientForFatools {
 

community-service/src/main/java/com/tanpu/community/feign/product/FeignClientForProducts.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(value = "service-product", url = "${tanpu.product.svc:}", path = "/product")
+@FeignClient(value = "service-product", url = "${tanpu.product.svc:http://tp-product-svc}", path = "/product")
 //@FeignClient(value = "service-product", contextId = "product", fallbackFactory = FeignBackClientForProducts.class, url = "http://172.20.0.68:8194/product")
 public interface FeignClientForProducts {
 

community-service/src/main/java/com/tanpu/community/feign/product/FeignForFund.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 //@FeignClient(value = "service-fund", url = "http://127.0.0.1:8194/fund")
-@FeignClient(value = "service-fund", url = "${tanpu.fund.svc:}", path = "/fund")
+@FeignClient(value = "service-fund", url = "${tanpu.fund.svc:http://tp-fund-svc}", path = "/fund")
 //@FeignClient(value = "service-fund", path = "/fund")
 public interface FeignForFund {
 

community-service/src/main/java/com/tanpu/community/feign/product/FeignForPublicFund.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(value = "service-fundpublic", contextId = "fundpublic", url = "${tanpu.fundpublic.svc:}", path = "/fundpublic")
+@FeignClient(value = "service-fundpublic", contextId = "fundpublic", url = "${tanpu.fundpublic.svc:http://tp-fundpublic-svc}", path = "/fundpublic")
 //@FeignClient(value = "service-fundpublic",path = "/fundpublic")
 public interface FeignForPublicFund {
 

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/FeignClientForTanpuroom.java

@@ -4,9 +4,7 @@ import com.tanpu.common.api.CommonResp;
 import com.tanpu.community.api.beans.vo.feign.course.CurriCulumInfoDetailDto;
 import com.tanpu.community.api.beans.vo.feign.course.CurriculumDetailVo;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
-import com.tanpu.community.feign.product.FeignbackForPublicFund;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(value = "service-tanpuroom",  url = "${tanpu.tanpuroom.svc:}", path = "/tanpuroom")
+@FeignClient(value = "service-tanpuroom",  url = "${tanpu.tanpuroom.svc:http://tp-tanpuroom-svc}", path = "/tanpuroom")
 //@FeignClient(value = "service-tanpuroom", contextId = "tanpuroom", fallbackFactory = FeignBackClientForTanpuroom.class, url = "http://172.20.0.183:8086/tanpuroom")
 public interface FeignClientForTanpuroom {
 

community-service/src/main/java/com/tanpu/community/feign/zhibo/FeignClientForZhibo.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(value = "service-zhibo", url = "${tanpu.feo-zhibo.svc:}",  path = "/zhibo")
+@FeignClient(value = "service-zhibo", url = "${tanpu.feo-zhibo.svc:http://tp-zhibo-svc}",  path = "/zhibo")
 //@FeignClient(value = "service-zhibo", fallbackFactory = FeignbackForZhibo.class, url = "http://172.20.0.169:8183/zhibo")
 public interface FeignClientForZhibo {