yaozhixue 1 年之前
父节点
当前提交
d270a2bc2e

+ 10 - 10
pom.xml

@@ -19,16 +19,16 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>2.1.0.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>2.1.0.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--            <version>2.1.0.RELEASE</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--            <version>2.1.0.RELEASE</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 4 - 12
src/main/java/com/zfire/jiasm/syncdata/constant/JiasmFeign.java

@@ -1,17 +1,9 @@
 package com.zfire.jiasm.syncdata.constant;
 
-import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
-import com.zfire.jiasm.syncdata.config.FeignConfigure;
-import com.zfire.jiasm.syncdata.service.impl.JiasmFeignClientFallback;
-import com.zfire.jiasm.syncdata.utils.ResponseHelper;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(name = "jiasm-service", path ="/pcapi",
+/*@FeignClient(name = "jiasm-service", path ="/pcapi",
         configuration = FeignConfigure.class,
-        fallback = JiasmFeignClientFallback.class)
+        fallback = JiasmFeignClientFallback.class)*/
 public interface JiasmFeign {
-    @PostMapping("order/add")
-    ResponseHelper orderAdd(@RequestBody OrderAddBeanDTO orderAddBeanDTO);
+    /*@PostMapping("order/add")
+    ResponseHelper orderAdd(@RequestBody OrderAddBeanDTO orderAddBeanDTO);*/
 }

+ 2 - 5
src/main/java/com/zfire/jiasm/syncdata/service/impl/JiasmFeignClientFallback.java

@@ -1,19 +1,16 @@
 package com.zfire.jiasm.syncdata.service.impl;
 
-import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
 import com.zfire.jiasm.syncdata.constant.JiasmFeign;
-import com.zfire.jiasm.syncdata.utils.ResponseHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @Slf4j
 @Component
 public class JiasmFeignClientFallback implements JiasmFeign {
-    @Override
+/*    @Override
     public ResponseHelper orderAdd(@RequestBody OrderAddBeanDTO orderAddBeanDTO){
         log.info("创建工单失败");
         ResponseHelper hr = new ResponseHelper(-1,"创建工单失败");
         return hr;
-    }
+    }*/
 }

+ 4 - 4
src/main/resources/bootstrap-dev.properties

@@ -160,10 +160,10 @@ gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
 jdueurl=https://api-sms.gree.com/api/sso/autoapp-default-server-jingdongorderhandlerjob/
 
 ######################## nacos ########################
-spring.cloud.nacos.config.server-addr=121.43.111.127:8848
-spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
-spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
-spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.config.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
 
 ######################## 工单系统获取工单数据 ########################
 gdbaseurl=http://121.41.110.30:8112/

+ 4 - 4
src/main/resources/bootstrap-prd.properties

@@ -155,10 +155,10 @@ gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
 jdueurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-jingdongorderhandlerjob/
 
 ######################## nacos ########################
-spring.cloud.nacos.config.server-addr=121.43.111.127:8848
-spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
-spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
-spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.config.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
 
 ######################## 工单系统获取工单数据 ########################
 gdbaseurl=http://121.41.110.30:8112/

+ 4 - 4
src/main/resources/bootstrap-test.properties

@@ -161,10 +161,10 @@ gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
 jdueurl=https://api-sms.gree.com/api/sso/autoapp-default-server-jingdongorderhandlerjob/
 
 ######################## nacos ########################
-spring.cloud.nacos.config.server-addr=121.43.111.127:8848
-spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
-spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
-spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.config.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+#spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
+#spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
 
 ######################## 工单系统获取工单数据 ########################
 gdbaseurl=http://121.41.110.30:8112/