Browse Source

Revert "过账api方法入参方式修改"

This reverts commit 934fc65
guq 7 years ago
parent
commit
22f74d8dcd

+ 1 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java

@@ -4,7 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 
@@ -14,7 +13,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  **/
  **/
 @SpringBootApplication
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @MapperScan("com.usoftchina.saas.sale.mapper")
-@EnableFeignClients("com.usoftchina.saas")
+@EnableEurekaClient
 public class SaleApplication extends WebMvcConfigurerAdapter{
 public class SaleApplication extends WebMvcConfigurerAdapter{
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(SaleApplication.class, args);
         SpringApplication.run(SaleApplication.class, args);

+ 0 - 22
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -5,19 +5,12 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.document.api.WarehouseApi;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.sale.service.SaleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.reactive.config.EnableWebFlux;
-
-import java.util.HashMap;
-import java.util.Map;
 
 
 /**
 /**
  * @author: guq
  * @author: guq
@@ -28,23 +21,8 @@ import java.util.Map;
 @RequestMapping("/sale")
 @RequestMapping("/sale")
 public class SaleController {
 public class SaleController {
 
 
-
-    private Logger logger = LoggerFactory.getLogger(SaleController.class);
-
     @Autowired
     @Autowired
     private SaleService saleService;
     private SaleService saleService;
-    @Autowired
-    private WarehouseApi warehouseApi;
-
-
-    @RequestMapping("/test")
-    public void test() {
-        logger.info("xxx" + Thread.currentThread().getName() + "test");
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("code", "code");
-        map.put("id", "id");
-        warehouseApi.unPost(map);
-    }
 
 
     /**
     /**
      * 销售订单列表
      * 销售订单列表