Merge branch 'master' of https://github.com/java110/MicroCommunity

StoreService/src/main/java/com/java110/store/smo/impl/StoreInnerServiceSMOImpl.java

@@ -11,6 +11,7 @@ import com.java110.store.dao.IStoreServiceDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -22,14 +23,14 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/9/20
  **/
-@Service("StoreInnerServiceSMOImpl")
+@RestController
 public class StoreInnerServiceSMOImpl  extends BaseServiceSMO implements IStoreInnerServiceSMO {
 
     @Autowired
     private IStoreServiceDao storeServiceDaoImpl;
 
     @Override
-    public List<StoreDto> getStores(StoreDto storeDto) {
+    public List<StoreDto> getStores(@RequestBody StoreDto storeDto) {
         //校验是否传了 分页信息
 
         int page = storeDto.getPage();

java110-core/src/main/java/com/java110/core/smo/store/IStoreInnerServiceSMO.java

@@ -1,6 +1,11 @@
 package com.java110.core.smo.store;
 
+import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.store.StoreDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
 
@@ -8,7 +13,10 @@ import java.util.List;
  * 商户 服务内部交互接口类
  * add by wuxw 2019-09-19
  */
+@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/storeApi")
 public interface IStoreInnerServiceSMO {
 
-    public List<StoreDto> getStores(StoreDto storeDto);
+    @RequestMapping(value = "/getStores", method = RequestMethod.POST)
+    public List<StoreDto> getStores(@RequestBody StoreDto storeDto);
 }