feign替换dubbo

pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.chelvc.framework</groupId>
-        <artifactId>framework-cloud-nacos-dubbo</artifactId>
+        <artifactId>framework-cloud-nacos-feign</artifactId>
         <version>1.0.0-RELEASE</version>
         <relativePath/>
     </parent>
@@ -16,8 +16,8 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
-        <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
-        <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
+        <user-client.version>1.0.0-SNAPSHOT</user-client.version>
+        <vehicle-client.version>1.0.0-SNAPSHOT</vehicle-client.version>
         <framework-sms.version>1.0.0-RELEASE</framework-sms.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
         <framework-oauth.version>1.0.0-RELEASE</framework-oauth.version>
@@ -29,13 +29,13 @@
     <dependencies>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>uc-api</artifactId>
-            <version>${uc-api.version}</version>
+            <artifactId>user-client</artifactId>
+            <version>${user-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>vehicle-api</artifactId>
-            <version>${vehicle-api.version}</version>
+            <artifactId>vehicle-client</artifactId>
+            <version>${vehicle-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>

src/main/java/com/chelvc/cloud/maintain/controller/AssessController.java

@@ -1,30 +1,30 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.GoodsAssessDto;
-import com.chelvc.cloud.vehicle.api.param.AssessModifyParam;
-import com.chelvc.cloud.vehicle.api.param.AssessQueryParam;
-import com.chelvc.cloud.vehicle.api.param.AssessRecoverModifyParam;
-import com.chelvc.cloud.vehicle.api.service.AssessService;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import javax.validation.constraints.Min;
+
+import com.chelvc.cloud.vehicle.client.AssessClient;
+import com.chelvc.cloud.vehicle.client.dto.GoodsAssessDto;
+import com.chelvc.cloud.vehicle.client.param.AssessModifyParam;
+import com.chelvc.cloud.vehicle.client.param.AssessQueryParam;
+import com.chelvc.cloud.vehicle.client.param.AssessRecoverModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.redis.config.RedisConfigurer;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.Min;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 评价管理
+ *
  * @author valley
  * @date 2024/01/26 00:08
  **/
@@ -32,30 +32,31 @@ import java.util.Map;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AssessController {
+    private static final String DEFAULT_MSG = "亲爱的顾客，感谢您认可我们的服务，我们会努力做的更好，祝您生活愉快！";
 
-    private static final String DEFAULT_MSG= "亲爱的顾客，感谢您认可我们的服务，我们会努力做的更好，祝您生活愉快！";
     @Autowired
     private RedisConfigurer redis;
-    @DubboReference
-    AssessService assessService;
+
+    private final AssessClient assessClient;
 
     /**
      * @return 获取默认评价内容
      */
     @GetMapping("/assess/getDefaultMsg")
-    public String getDefaultAssessMsg(){
-            Long userId = SessionContextHolder.getSession().getId();
-            Object obj = redis.redisTemplate().opsForValue().get("assess:defaultAssess " + userId);
-            return obj == null ? DEFAULT_MSG : obj.toString();
+    public String getDefaultAssessMsg() {
+        Long userId = SessionContextHolder.getSession().getId();
+        Object obj = redis.redisTemplate().opsForValue().get("assess:defaultAssess " + userId);
+        return obj == null ? DEFAULT_MSG : obj.toString();
     }
 
     /**
      * @param msg 评价内容
-     * 修改默认评价
+     *            修改默认评价
      */
     @PostMapping("/assess/saveDefaultMsg")
-    public void getDefaultAssessMsg(String msg){
+    public void getDefaultAssessMsg(String msg) {
         Long userId = SessionContextHolder.getSession().getId();
         redis.redisTemplate().opsForValue().set("assess:defaultAssess " + userId, msg);
     }
@@ -64,38 +65,39 @@ public class AssessController {
      * 针对订单发布评价
      */
     @PostMapping("/assess/add")
-    public Long addAssess(@RequestBody AssessModifyParam param){
-        return assessService.add(param);
+    public Long addAssess(@RequestBody AssessModifyParam param) {
+        return assessClient.add(param);
     }
+
     /**
      * 评价查询
      */
     @PostMapping("/assess/query")
-    public List<GoodsAssessDto> addAssess(@RequestBody AssessQueryParam param){
-        return assessService.query(param);
+    public List<GoodsAssessDto> addAssess(@RequestBody AssessQueryParam param) {
+        return assessClient.query(param);
     }
 
     /**
      * 评价回复
      */
     @PostMapping("/assess/recover/add")
-    public Long addAssessRecover(@RequestBody AssessRecoverModifyParam param){
-        return assessService.addAssessRecover(param);
+    public Long addAssessRecover(@RequestBody AssessRecoverModifyParam param) {
+        return assessClient.addAssessRecover(param);
     }
 
     /**
      * 90天评价所有商品得分计算
      */
     @PostMapping("/assess/computeAvgScore")
-    public void addAssessRecover(){
-        assessService.computeAvgScore();
+    public void addAssessRecover() {
+        assessClient.computeAvgScore();
     }
 
     /**
      * 获取商品分数，包含总平均分、各周期平均分
      */
     @GetMapping("/goodsScore")
-    public Map<String, BigDecimal> getGoodsScore(@Min(value = 0, message = "商品id必须大于0") Long goodsId){
-        return assessService.getGoodsScore(goodsId);
+    public Map<String, BigDecimal> getGoodsScore(@Min(value = 0, message = "商品id必须大于0") Long goodsId) {
+        return assessClient.getGoodsScore(goodsId);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/AttentionController.java

@@ -1,20 +1,24 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.AttentionTotalDTO;
-import com.chelvc.cloud.vehicle.api.dto.AttentionUserDTO;
-import com.chelvc.cloud.vehicle.api.param.QueryAttentionParam;
-import com.chelvc.cloud.vehicle.api.service.AttentionService;
+import com.chelvc.cloud.vehicle.client.AttentionClient;
+import com.chelvc.cloud.vehicle.client.dto.AttentionTotalDTO;
+import com.chelvc.cloud.vehicle.client.dto.AttentionUserDTO;
+import com.chelvc.cloud.vehicle.client.param.QueryAttentionParam;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 用户关注
+ *
  * @PACKAGE_NAME: net.yeeu.collision.user.client.controller
  * @NAME: AttentionController
  * @USER: igl
@@ -25,43 +29,42 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/client/attention")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AttentionController {
+    private final AttentionClient attentionClient;
 
-  @DubboReference
-  private AttentionService attentionService;
+    /**
+     * 关注/取关用户
+     *
+     * @param targetUserId 目标用户标识
+     * @author igl
+     * @date 2023/2/25 19:42
+     * @apiNote 如果已关注，则会取消关注
+     */
+    @PostMapping("/concern")
+    public void concern(@RequestParam("targetUserId") Long targetUserId) {
+        attentionClient.concern(SessionContextHolder.getId(), targetUserId);
+    }
 
-  /**
-   * 关注/取关用户
-   *
-   * @param targetUserId 目标用户标识
-   * @author igl
-   * @date 2023/2/25 19:42
-   * @apiNote 如果已关注，则会取消关注
-   */
-  @PostMapping("/concern")
-  public void concern(@RequestParam("targetUserId") Long targetUserId) {
-    attentionService.concern(SessionContextHolder.getId(), targetUserId);
-  }
+    /**
+     * 分页查看关注、粉丝、好友
+     *
+     * @param page
+     * @param param
+     * @author igl
+     * @date 2023/8/14 12:42
+     */
+    @GetMapping("/list")
+    public Pagination<AttentionUserDTO> page(Paging page, @Validated QueryAttentionParam param) {
+        return attentionClient.page(page, param, SessionContextHolder.getId());
+    }
 
-  /**
-   * 分页查看关注、粉丝、好友
-   *
-   * @param page
-   * @param param
-   * @author igl
-   * @date 2023/8/14 12:42
-   */
-  @GetMapping("/list")
-  public Pagination<AttentionUserDTO> page(Paging page, @Validated QueryAttentionParam param) {
-    return attentionService.page(page, param, SessionContextHolder.getId());
-  }
-
-  /**
-   * 查看关注、粉丝、好友总数
-   * @author igl
-   * @date 2023/8/15 19:42
-   */
-  @GetMapping("/total")
-  public AttentionTotalDTO queryTotalByUserId(){
-    return attentionService.queryTotalByUserId(SessionContextHolder.getId());
-  }
+    /**
+     * 查看关注、粉丝、好友总数
+     *
+     * @author igl
+     * @date 2023/8/15 19:42
+     */
+    @GetMapping("/total")
+    public AttentionTotalDTO queryTotalByUserId() {
+        return attentionClient.queryTotalByUserId(SessionContextHolder.getId());
+    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/AuthorizeController.java

@@ -3,16 +3,15 @@ package com.chelvc.cloud.maintain.controller;
 import javax.validation.Valid;
 
 import com.chelvc.cloud.maintain.param.MobileParam;
-import com.chelvc.cloud.uc.api.AuthorizeClient;
-import com.chelvc.cloud.uc.api.model.Authorization;
-import com.chelvc.cloud.uc.api.param.AuthorizeParam;
-import com.chelvc.cloud.uc.api.service.UserService;
+import com.chelvc.cloud.user.client.AuthorizeClient;
+import com.chelvc.cloud.user.client.UserClient;
+import com.chelvc.cloud.user.client.model.Authorization;
+import com.chelvc.cloud.user.client.param.AuthorizeParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.oauth.annotation.Authorize;
 import com.chelvc.framework.sms.CaptchaSmsHandler;
 import com.chelvc.framework.sms.SmsSession;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,12 +28,10 @@ import org.springframework.web.bind.annotation.RestController;
 @ResponseWrapping
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AuthorizeController {
+    private final UserClient userClient;
     private final AuthorizeClient authorizeClient;
     private final CaptchaSmsHandler captchaSmsHandler;
 
-    @DubboReference
-    private UserService userService;
-
     /**
      * 发送验证码短信
      *
@@ -98,6 +95,6 @@ public class AuthorizeController {
      */
     @DeleteMapping("/unregister")
     public void unregister() {
-        this.userService.unregister();
+        this.userClient.unregister();
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CarouselImagesController.java

@@ -1,14 +1,16 @@
 package com.chelvc.cloud.maintain.controller;
-import com.chelvc.cloud.vehicle.api.dto.CarouselImagesDTO;
-import com.chelvc.cloud.vehicle.api.service.CarouselImagesService;
+
+import java.util.List;
+
+import com.chelvc.cloud.vehicle.client.CarouselImagesClient;
+import com.chelvc.cloud.vehicle.client.dto.CarouselImagesDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 轮播图接口
  *
@@ -18,9 +20,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CarouselImagesController {
-    @DubboReference
-    private CarouselImagesService carouselImagesService;
+    private final CarouselImagesClient carouselImagesClient;
 
     /**
      * 轮播图列表查询
@@ -29,9 +31,6 @@ public class CarouselImagesController {
      */
     @GetMapping("/listCarouselImages/")
     public List<CarouselImagesDTO> listCarouselImages() {
-        return this.carouselImagesService.listCarouselImages();
+        return this.carouselImagesClient.listCarouselImages();
     }
-
-
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/CartItemController.java

@@ -1,24 +1,24 @@
 package com.chelvc.cloud.maintain.controller;
-import com.chelvc.cloud.vehicle.api.dto.MerchantCartItemDTO;
-import com.chelvc.cloud.vehicle.api.dto.OmsCartItemDTO;
-import com.chelvc.cloud.vehicle.api.param.OmsCartItemModifyParam;
-import com.chelvc.cloud.vehicle.api.service.OmsCartItemService;
+
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+
+import com.chelvc.cloud.vehicle.client.OmsCartItemClient;
+import com.chelvc.cloud.vehicle.client.dto.MerchantCartItemDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsCartItemDTO;
+import com.chelvc.cloud.vehicle.client.param.OmsCartItemModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
 /**
  * 购物车接口
  *
@@ -28,9 +28,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CartItemController {
-    @DubboReference
-    private OmsCartItemService cartItemService;
+    private final OmsCartItemClient omsCartItemClient;
 
     /**
      * 新增购物车商品
@@ -40,7 +40,7 @@ public class CartItemController {
      */
     @PostMapping("/cartItem")
     public Integer addCartItem(@RequestBody @Valid OmsCartItemModifyParam param) {
-        return this.cartItemService.add(param);
+        return this.omsCartItemClient.add(param);
     }
 
     /**
@@ -50,7 +50,7 @@ public class CartItemController {
      */
     @GetMapping("/listCartItem")
     public List<OmsCartItemDTO> listCartItem() {
-        return this.cartItemService.listCartItem();
+        return this.omsCartItemClient.listCartItem();
     }
 
     /**
@@ -60,8 +60,8 @@ public class CartItemController {
      */
     @GetMapping("/cartItem/{id}")
     public Integer updateCartItem(@PathVariable("id") @Min
-            (value = 1, message = "优惠券主键不能小于1") Long id,Integer quantity) {
-        return this.cartItemService.updateQuantity(id,quantity);
+            (value = 1, message = "优惠券主键不能小于1") Long id, Integer quantity) {
+        return this.omsCartItemClient.updateQuantity(id, quantity);
     }
 
     /**
@@ -70,8 +70,8 @@ public class CartItemController {
      * @return 购物车主键
      */
     @PostMapping("/cartItem/deleteCartItem/{ids}")
-    public void deleteCartItem( @PathVariable("ids") @NotEmpty(message = "购物车ID不能为空") List<Long> ids) {
-         this.cartItemService.delete(ids);
+    public void deleteCartItem(@PathVariable("ids") @NotEmpty(message = "购物车ID不能为空") List<Long> ids) {
+        this.omsCartItemClient.delete(ids);
     }
 
     /**
@@ -82,7 +82,7 @@ public class CartItemController {
      */
     @PostMapping("/cartItem/updateAttr")
     public Integer updateAttr(@RequestBody @Valid OmsCartItemModifyParam param) {
-        return this.cartItemService.updateAttr(param);
+        return this.omsCartItemClient.updateAttr(param);
     }
 
     /**
@@ -91,7 +91,8 @@ public class CartItemController {
      * @return 购物车主键
      */
     @GetMapping("/listCartItem/{merchantId}")
-    public MerchantCartItemDTO listCartItem(@PathVariable("merchantId") @Min(value = 1, message = "商家主键不能小于1") Long merchantId) {
-        return this.cartItemService.listCartItem(merchantId);
+    public MerchantCartItemDTO listCartItem(
+            @PathVariable("merchantId") @Min(value = 1, message = "商家主键不能小于1") Long merchantId) {
+        return this.omsCartItemClient.listMerchantCartItem(merchantId);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CategoryController.java

@@ -1,21 +1,20 @@
 package com.chelvc.cloud.maintain.controller;
 
 import java.util.List;
+import javax.validation.Valid;
 
 import com.chelvc.cloud.maintain.copier.CategoryCopier;
 import com.chelvc.cloud.maintain.vo.CategoryVO;
-import com.chelvc.cloud.vehicle.api.param.CategoryListParam;
-import com.chelvc.cloud.vehicle.api.service.CategoryService;
+import com.chelvc.cloud.vehicle.client.CategoryClient;
+import com.chelvc.cloud.vehicle.client.param.CategoryListParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 /**
  * 分类接口
  *
@@ -25,9 +24,9 @@ import javax.validation.Valid;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CategoryController {
-    @DubboReference
-    private CategoryService categoryService;
+    private final CategoryClient categoryClient;
 
     /**
      * 获取分类列表
@@ -36,6 +35,6 @@ public class CategoryController {
      */
     @PostMapping("/categories")
     public List<CategoryVO> listCategories(@RequestBody @Valid CategoryListParam param) {
-        return CategoryCopier.INSTANCE.copying(this.categoryService.listCategory(param));
+        return CategoryCopier.INSTANCE.copying(this.categoryClient.listCategory(param));
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CommentController.java

@@ -1,18 +1,24 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+
 import com.chelvc.cloud.maintain.copier.CommentCopier;
 import com.chelvc.cloud.maintain.vo.CommentVO;
-import com.chelvc.cloud.vehicle.api.param.AddGoodsCommentParam;
-import com.chelvc.cloud.vehicle.api.param.CommentQueryParam;
-import com.chelvc.cloud.vehicle.api.service.CommentService;
+import com.chelvc.cloud.vehicle.client.CommentClient;
+import com.chelvc.cloud.vehicle.client.dto.CommentDTO;
+import com.chelvc.cloud.vehicle.client.param.AddGoodsCommentParam;
+import com.chelvc.cloud.vehicle.client.param.CommentQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 商品评价接口
@@ -23,17 +29,17 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CommentController {
-    @DubboReference
-    private CommentService commentService;
+    private final CommentClient commentClient;
 
     /**
      * 获取商品评价列表
      *
-     * @param goodsId 商品ID
+     * @param goodsId    商品ID
      * @param parentId   父级评论id
-     * @param merchantId   商户id
-     * @param param   查询参数
+     * @param merchantId 商户id
+     * @param param      查询参数
      * @return 商品评价列表
      */
     @GetMapping("/goods/{goodsId}/comments")
@@ -42,16 +48,17 @@ public class CommentController {
             @PathVariable("parentId") Long parentId,
             @PathVariable("merchantId") Long merchantId,
             @Valid CommentQueryParam param) {
-        return CommentCopier.INSTANCE.copying(this.commentService.listGoodsComments(goodsId, parentId, merchantId, param));
+        List<CommentDTO> comments = this.commentClient.listGoodsComments(goodsId, parentId, merchantId, param);
+        return CommentCopier.INSTANCE.copying(comments);
     }
 
     /**
      * 新增商品评价
      *
-     * @param param   新增参数
+     * @param param 新增参数
      */
     @PostMapping("/goods/comments/add")
     public void addGoodsComments(@Validated @RequestBody AddGoodsCommentParam param) {
-        this.commentService.addGoodsComments(param, SessionContextHolder.getId());
+        this.commentClient.addGoodsComments(param, SessionContextHolder.getId());
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CommissionConfigController.java

@@ -1,16 +1,13 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.param.IncomeRecordModifyParam;
-import com.chelvc.cloud.vehicle.api.service.CommissionConfigService;
-import com.chelvc.cloud.vehicle.api.service.IncomeRecordService;
+import com.chelvc.cloud.vehicle.client.CommissionConfigClient;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 /**
  * 分佣抽成配置接口
  *
@@ -20,20 +17,19 @@ import javax.validation.Valid;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CommissionConfigController {
-    @DubboReference
-    private CommissionConfigService commissionConfigService;
+    private final CommissionConfigClient commissionConfigClient;
 
     /**
+     * 分佣抽成配置列表
      *
-     *分佣抽成配置列表
      * @param
      */
     @PostMapping("/commissionConfig/list")
     public void listCommissionConfig() {
-        this.commissionConfigService.listCommissionConfig();
+        this.commissionConfigClient.listCommissionConfig();
     }
 
 
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/CommonController.java

@@ -1,36 +1,35 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.RegionDTO;
-import com.chelvc.cloud.vehicle.api.service.CommonService;
+import java.util.List;
+
+import com.chelvc.cloud.vehicle.client.CommonClient;
+import com.chelvc.cloud.vehicle.client.dto.RegionDTO;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 公共口
  */
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping("/common")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CommonController {
-
-    @DubboReference
-    CommonService commonService;
+    private final CommonClient commonClient;
 
     /**
      * 根据上级id查询省市区
+     *
      * @param pid 不传默认查询第一级
      * @author igl
      * @date 2024/2/26 16:12
      */
     @GetMapping("/region/query")
     public List<RegionDTO> getRegionByPid(Integer pid) {
-        return this.commonService.getRegionByPid(pid);
+        return this.commonClient.getRegionByPid(pid);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CouponController.java

@@ -6,15 +6,16 @@ import javax.validation.constraints.Min;
 
 import com.chelvc.cloud.maintain.copier.CouponCopier;
 import com.chelvc.cloud.maintain.vo.CouponVO;
-import com.chelvc.cloud.vehicle.api.constant.CouponClaimType;
-import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
-import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
-import com.chelvc.cloud.vehicle.api.param.CouponModifyParam;
-import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
-import com.chelvc.cloud.vehicle.api.service.CouponService;
+import com.chelvc.cloud.vehicle.client.CouponClient;
+import com.chelvc.cloud.vehicle.client.constant.CouponClaimType;
+import com.chelvc.cloud.vehicle.client.constant.CouponStatus;
+import com.chelvc.cloud.vehicle.client.dto.CouponDTO;
+import com.chelvc.cloud.vehicle.client.param.CouponModifyParam;
+import com.chelvc.cloud.vehicle.client.param.CouponPagingParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -34,9 +35,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CouponController {
-    @DubboReference
-    private CouponService couponService;
+    private final CouponClient couponClient;
 
     /**
      * 新增优惠券
@@ -46,7 +47,7 @@ public class CouponController {
      */
     @PostMapping("/coupon")
     public Long addCoupon(@RequestBody @Valid CouponModifyParam param) {
-        return this.couponService.addCoupon(param);
+        return this.couponClient.addCoupon(param);
     }
 
     /**
@@ -58,7 +59,7 @@ public class CouponController {
     @PutMapping("/coupon/{id}")
     public void updateCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id,
                              @RequestBody @Valid CouponModifyParam param) {
-        this.couponService.updateCoupon(id, param);
+        this.couponClient.updateCoupon(id, param);
     }
 
     /**
@@ -69,7 +70,7 @@ public class CouponController {
      */
     @GetMapping("/coupon/{id}")
     public CouponVO getCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
-        return CouponCopier.INSTANCE.copying(this.couponService.getCoupon(id));
+        return CouponCopier.INSTANCE.copying(this.couponClient.getCoupon(id));
     }
 
     /**
@@ -80,7 +81,7 @@ public class CouponController {
      */
     @GetMapping("/coupon/paging")
     public Pagination<CouponVO> getCouponPaging(@Valid CouponPagingParam param) {
-        Pagination<CouponDTO> pagination = this.couponService.getCouponPaging(param);
+        Pagination<CouponDTO> pagination = this.couponClient.getCouponPaging(param);
         List<CouponDTO> records = pagination.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();
@@ -100,7 +101,7 @@ public class CouponController {
     @GetMapping("/coupon/{merchantId}/paging")
     public Pagination<CouponVO> listCoupons(@PathVariable("merchantId") @Min(value = 1, message = "优惠券主键不能小于1")
                                                     Long merchantId, @Valid CouponPagingParam param) {
-        Pagination<CouponDTO> pagination = this.couponService.getMerchantCouponPaging(merchantId, param);
+        Pagination<CouponDTO> pagination = this.couponClient.getMerchantCouponPaging(merchantId, param);
         List<CouponDTO> records = pagination.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();

src/main/java/com/chelvc/cloud/maintain/controller/CurrencyRecordController.java

@@ -1,17 +1,18 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.CurrencyRecordDTO;
-import com.chelvc.cloud.vehicle.api.dto.EarningsDTO;
-import com.chelvc.cloud.vehicle.api.service.CurrencyRecordService;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+
+import com.chelvc.cloud.vehicle.client.CurrencyRecordClient;
+import com.chelvc.cloud.vehicle.client.dto.CurrencyRecordDTO;
+import com.chelvc.cloud.vehicle.client.dto.EarningsDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
 /**
  * 收益记录接口
  *
@@ -21,9 +22,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CurrencyRecordController {
-    @DubboReference
-    private CurrencyRecordService currencyRecordService;
+    private final CurrencyRecordClient currencyRecordClient;
 
     /**
      * 用户收益记录列表查询
@@ -32,7 +33,7 @@ public class CurrencyRecordController {
      */
     @GetMapping("/listCurrencyRecord")
     public List<CurrencyRecordDTO> listCurrencyRecord(@NotNull(message = "查询类型不能为空") Integer type) {
-        return this.currencyRecordService.listCurrencyRecord(type);
+        return this.currencyRecordClient.listCurrencyRecord(type);
     }
 
     /**
@@ -42,6 +43,6 @@ public class CurrencyRecordController {
      */
     @GetMapping("/getCurrencyRecord")
     public EarningsDTO getCurrencyRecord(@NotNull(message = "查询类型不能为空") Integer type) {
-        return this.currencyRecordService.getCurrencyRecord(type);
+        return this.currencyRecordClient.getCurrencyRecord(type);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/DynamicCommentController.java

@@ -1,16 +1,20 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
-import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
-import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
-import com.chelvc.cloud.vehicle.api.service.DynamicCommentService;
+import com.chelvc.cloud.vehicle.client.DynamicCommentClient;
+import com.chelvc.cloud.vehicle.client.dto.DynamicCommentDTO;
+import com.chelvc.cloud.vehicle.client.param.AddDynamicCommentParam;
+import com.chelvc.cloud.vehicle.client.param.QueryDynamicCommentParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 动态评论
@@ -19,42 +23,43 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023-02-25
  */
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/comment")
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DynamicCommentController {
-
-    @DubboReference
-    private DynamicCommentService iDynamicCommentService;
+    private final DynamicCommentClient dynamicCommentClient;
 
     /**
      * 查询列表
-     * @param param 查询参数
+     *
+     * @param param    查询参数
      * @param pageCode
      * @param pageSize
      * @author igl
      * @date 2023/8/9 17:25
      */
     @GetMapping("/page")
-    public Pagination<DynamicCommentDTO> list(@Validated QueryDynamicCommentParam param, Integer pageCode, Integer pageSize) {
+    public Pagination<DynamicCommentDTO> list(@Validated QueryDynamicCommentParam param, Integer pageCode,
+                                              Integer pageSize) {
         if (pageCode == null) {
             pageCode = 1;
         }
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.iDynamicCommentService.queryPageList(param, pageCode, pageSize);
+        return this.dynamicCommentClient.queryPageList(param, pageCode, pageSize);
     }
 
     /**
      * 新增
+     *
      * @param param
      * @author igl
      * @date 2023/8/9 17:25
      */
     @PostMapping("/add")
     public void add(@Validated @RequestBody AddDynamicCommentParam param) {
-        this.iDynamicCommentService.insertByBo(param, SessionContextHolder.getId());
+        this.dynamicCommentClient.insertByBo(param, SessionContextHolder.getId());
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/DynamicContentController.java

@@ -1,19 +1,24 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO;
-import com.chelvc.cloud.vehicle.api.param.AddDynamicContentParam;
-import com.chelvc.cloud.vehicle.api.param.QueryDynamicContentParam;
-import com.chelvc.cloud.vehicle.api.service.DynamicContentService;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
+
+import com.chelvc.cloud.vehicle.client.DynamicContentClient;
+import com.chelvc.cloud.vehicle.client.dto.DynamicContentDTO;
+import com.chelvc.cloud.vehicle.client.param.AddDynamicContentParam;
+import com.chelvc.cloud.vehicle.client.param.QueryDynamicContentParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.NotNull;
-import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 动态信息
@@ -22,84 +27,89 @@ import java.util.Map;
  * @date 2023-02-25
  */
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/content")
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DynamicContentController {
-
-    @DubboReference
-    private DynamicContentService iDynamicContentService;
+    private final DynamicContentClient dynamicContentClient;
 
     /**
      * 查询列表
+     *
      * @param param
-     * @param pageNum 主键
+     * @param pageNum  主键
      * @param pageSize 主键
      * @author igl
      * @date 2023/8/9 17:25
      */
     @GetMapping("/page")
-    public Pagination<DynamicContentDTO> list(@Validated QueryDynamicContentParam param, Integer pageNum, Integer pageSize) {
+    public Pagination<DynamicContentDTO> list(@Validated QueryDynamicContentParam param, Integer pageNum,
+                                              Integer pageSize) {
         if (pageNum == null) {
             pageNum = 1;
         }
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.iDynamicContentService.queryPageList(param, pageNum, pageSize, SessionContextHolder.getId());
+        return this.dynamicContentClient.queryPageList(param, pageNum, pageSize, SessionContextHolder.getId());
     }
 
     /**
      * 根据用户id查询动态列表
-     * @param userId 主键
-     * @param pageNum 主键
+     *
+     * @param userId   主键
+     * @param pageNum  主键
      * @param pageSize 主键
      * @author igl
      * @date 2023/8/9 17:25
      */
     @GetMapping("/query-user")
-    public Pagination<DynamicContentDTO> queryUserById(@NotNull(message = "用户标识不能为空") Long userId, Integer pageNum, Integer pageSize) {
+    public Pagination<DynamicContentDTO> queryUserById(@NotNull(message = "用户标识不能为空") Long userId, Integer pageNum,
+                                                       Integer pageSize) {
         if (pageNum == null) {
             pageNum = 1;
         }
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.iDynamicContentService.queryUserById(SessionContextHolder.getId(), userId, pageNum, pageSize);
+        return this.dynamicContentClient.queryUserById(SessionContextHolder.getId(), userId, pageNum, pageSize);
     }
 
     /**
      * 获取动态详情
+     *
      * @param id 主键
      * @author igl
      * @date 2023/8/9 17:25
      */
     @GetMapping("/query")
     public DynamicContentDTO getInfo(@NotNull(message = "主键不能为空") Long id) {
-        return this.iDynamicContentService.queryById(id, SessionContextHolder.getId());
+        return this.dynamicContentClient.queryById(id, SessionContextHolder.getId());
     }
 
     /**
      * 新增
+     *
      * @param param
      * @author igl
      * @date 2023/8/9 17:25
      */
     @PostMapping("/add")
     public void add(@Validated @RequestBody AddDynamicContentParam param) {
-        this.iDynamicContentService.insertByBo(param, SessionContextHolder.getId());
+        this.dynamicContentClient.insertByBo(param, SessionContextHolder.getId());
     }
 
     /**
      * 删除
+     *
      * @param id 主键
      * @author igl
      * @date 2023/8/9 17:25
      */
     @DeleteMapping("/del")
     public void remove(@NotNull(message = "主键不能为空") Long id) {
-        this.iDynamicContentService.deleteByIds(id, SessionContextHolder.getId());
+        this.dynamicContentClient.deleteByIds(id, SessionContextHolder.getId());
     }
 
     /**
@@ -112,6 +122,6 @@ public class DynamicContentController {
     @PostMapping("/tencent/video/audit/call")
     //@SkipRespBodyFormatHandler
     public void videoAuditCallback(@RequestBody Map<String, Object> param) {
-        this.iDynamicContentService.videoAuditCallback(param);
+        this.dynamicContentClient.videoAuditCallback(param);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/DynamicEvaluateRecordController.java

@@ -1,11 +1,11 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.param.AddDynamicEvaluateRecordParam;
-import com.chelvc.cloud.vehicle.api.service.DynamicEvaluateRecordService;
+import com.chelvc.cloud.vehicle.client.DynamicEvaluateRecordClient;
+import com.chelvc.cloud.vehicle.client.param.AddDynamicEvaluateRecordParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,23 +19,22 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2023-08-08
  */
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/evaluate-record")
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DynamicEvaluateRecordController {
-
-    @DubboReference
-    private DynamicEvaluateRecordService iDynamicEvaluateRecordService;
+    private final DynamicEvaluateRecordClient dynamicEvaluateRecordClient;
 
     /**
      * 新增内容评价(点赞/踩)
+     *
      * @param param
      * @author igl
      * @date 2023/8/9 17:25
      */
     @PostMapping("/add")
     public void updateRecord(@Validated @RequestBody AddDynamicEvaluateRecordParam param) {
-        this.iDynamicEvaluateRecordService.updateRecord(param, SessionContextHolder.getId());
+        this.dynamicEvaluateRecordClient.updateRecord(param, SessionContextHolder.getId());
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/FavoriteController.java

@@ -1,16 +1,23 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.FavoriteCopier;
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.FavoriteVO;
-import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
-import com.chelvc.cloud.vehicle.api.dto.FavoriteDTO;
-import com.chelvc.cloud.vehicle.api.param.FavoritePagingParam;
-import com.chelvc.cloud.vehicle.api.param.FavoriteQueryParam;
-import com.chelvc.cloud.vehicle.api.service.FavoriteService;
+import com.chelvc.cloud.vehicle.client.FavoriteClient;
+import com.chelvc.cloud.vehicle.client.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.client.dto.FavoriteDTO;
+import com.chelvc.cloud.vehicle.client.param.FavoritePagingParam;
+import com.chelvc.cloud.vehicle.client.param.FavoriteQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -18,12 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 收藏接口
  *
@@ -33,9 +34,9 @@ import java.util.stream.Collectors;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class FavoriteController {
-    @DubboReference
-    private FavoriteService favoriteService;
+    private final FavoriteClient favoriteClient;
 
     /**
      * 取消收藏
@@ -44,7 +45,7 @@ public class FavoriteController {
      */
     @DeleteMapping("/favorite/{id}")
     public void deleteMineFavorite(@PathVariable("id") @Min(value = 1, message = "收藏ID不能小于1") Long id) {
-        this.favoriteService.deleteMineFavorite(id);
+        this.favoriteClient.deleteMineFavorite(id);
     }
 
     /**
@@ -57,7 +58,7 @@ public class FavoriteController {
     public List<FavoriteVO> listUserFavorites(@Valid FavoriteQueryParam param) {
         // 查询收藏的店铺
         if (FavoriteType.MERCHANT.equals(param.getType())) {
-            List<FavoriteDTO> favoriteMerchants = this.favoriteService.listFavoriteMerchants(param);
+            List<FavoriteDTO> favoriteMerchants = this.favoriteClient.listFavoriteMerchants(param);
             if (CollectionUtils.isEmpty(favoriteMerchants)) {
                 return Collections.emptyList();
             }
@@ -96,6 +97,6 @@ public class FavoriteController {
     @GetMapping("/favorites/goods")
     public List<FavoriteDTO> listUserFavoritesGoods() {
         // 查询收藏的店铺
-        return this.favoriteService.listFavoriteGoods();
+        return this.favoriteClient.listFavoriteGoods();
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/FeedbackController.java

@@ -1,9 +1,16 @@
 package com.chelvc.cloud.maintain.controller;
-import com.chelvc.cloud.vehicle.api.dto.FeedBackDTO;
-import com.chelvc.cloud.vehicle.api.param.FeedBackModifyParam;
-import com.chelvc.cloud.vehicle.api.service.FeedbackService;
+
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+
+import com.chelvc.cloud.vehicle.client.FeedbackClient;
+import com.chelvc.cloud.vehicle.client.dto.FeedBackDTO;
+import com.chelvc.cloud.vehicle.client.param.FeedBackModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,11 +19,6 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
 /**
  * 意见反馈接口
  *
@@ -26,9 +28,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class FeedbackController {
-    @DubboReference
-    private FeedbackService feedbackService;
+    private final FeedbackClient feedbackClient;
 
     /**
      * 新增意见反馈
@@ -38,7 +40,7 @@ public class FeedbackController {
      */
     @PostMapping("/feedback")
     public Long addFeedback(@RequestBody @Valid FeedBackModifyParam param) {
-        return this.feedbackService.addFeedback(param);
+        return this.feedbackClient.addFeedback(param);
     }
 
     /**
@@ -49,8 +51,8 @@ public class FeedbackController {
      */
     @PutMapping("/feedback/{id}")
     public void updateFeedback(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
-                                   @RequestBody @Valid FeedBackModifyParam param) {
-        this.feedbackService.updateFeedback(id, param);
+                               @RequestBody @Valid FeedBackModifyParam param) {
+        this.feedbackClient.updateFeedback(id, param);
     }
 
     /**
@@ -58,9 +60,8 @@ public class FeedbackController {
      */
     @GetMapping("/feedback/query")
     public List<FeedBackDTO> queryById(@Valid @NotEmpty String channel) {
-        return this.feedbackService.getFeedback(channel);
+        return this.feedbackClient.getFeedback(channel);
     }
 
 
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/FeedbackReplyController.java

@@ -1,16 +1,19 @@
 package com.chelvc.cloud.maintain.controller;
-import com.chelvc.cloud.vehicle.api.param.FeedBackReplyModifyParam;
-import com.chelvc.cloud.vehicle.api.service.FeedbackReplyService;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
+import com.chelvc.cloud.vehicle.client.FeedbackReplyClient;
+import com.chelvc.cloud.vehicle.client.param.FeedBackReplyModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
 
 /**
  * 意见反馈回复接口
@@ -21,9 +24,9 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class FeedbackReplyController {
-    @DubboReference
-    private FeedbackReplyService feedbackReplyService;
+    private final FeedbackReplyClient feedbackReplyClient;
 
     /**
      * 新增意见反馈回复
@@ -33,7 +36,7 @@ public class FeedbackReplyController {
      */
     @PostMapping("/feedbackReply")
     public Long addFeedbackReply(@RequestBody @Valid FeedBackReplyModifyParam param) {
-        return this.feedbackReplyService.addFeedbackReply(param);
+        return this.feedbackReplyClient.addFeedbackReply(param);
     }
 
     /**
@@ -44,10 +47,9 @@ public class FeedbackReplyController {
      */
     @PutMapping("/feedbackReply/{id}")
     public void updateFeedbackReply(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
-                                   @RequestBody @Valid FeedBackReplyModifyParam param) {
-        this.feedbackReplyService.updateFeedbackReply(id, param);
+                                    @RequestBody @Valid FeedBackReplyModifyParam param) {
+        this.feedbackReplyClient.updateFeedbackReply(id, param);
     }
 
 
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/GoodsController.java

@@ -6,14 +6,14 @@ import javax.validation.Valid;
 import javax.validation.constraints.Min;
 
 import com.chelvc.cloud.maintain.copier.GoodsCopier;
-import com.chelvc.cloud.maintain.vo.GoodsDetailVO;
 import com.chelvc.cloud.maintain.vo.SimpleGoodsVO;
-import com.chelvc.cloud.vehicle.api.dto.GoodsDetailDTO;
-import com.chelvc.cloud.vehicle.api.param.GoodsQueryParam;
-import com.chelvc.cloud.vehicle.api.service.FavoriteService;
-import com.chelvc.cloud.vehicle.api.service.GoodsService;
+import com.chelvc.cloud.vehicle.client.FavoriteClient;
+import com.chelvc.cloud.vehicle.client.GoodsClient;
+import com.chelvc.cloud.vehicle.client.dto.GoodsDetailDTO;
+import com.chelvc.cloud.vehicle.client.param.GoodsQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -30,12 +30,10 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class GoodsController {
-    @DubboReference
-    private GoodsService goodsService;
-
-    @DubboReference
-    private FavoriteService favoriteService;
+    private final GoodsClient goodsClient;
+    private final FavoriteClient favoriteClient;
 
     /**
      * 获取商品详情
@@ -45,7 +43,7 @@ public class GoodsController {
      */
     @GetMapping("/goods/{id}")
     public GoodsDetailDTO getGoodsDetail(@PathVariable("id") @Min(value = 1, message = "商品ID不能小于1") Long id) {
-        return this.goodsService.getGoodsDetail(id);
+        return this.goodsClient.getGoodsDetail(id);
     }
 
     /**
@@ -59,7 +57,7 @@ public class GoodsController {
     public List<SimpleGoodsVO> listMerchantSimpleGoods(
             @PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId,
             @Valid GoodsQueryParam param) {
-        return GoodsCopier.INSTANCE.copying(this.goodsService.listMerchantSimpleGoods(merchantId, param));
+        return GoodsCopier.INSTANCE.copying(this.goodsClient.listMerchantSimpleGoods(merchantId, param));
     }
 
 
@@ -71,7 +69,7 @@ public class GoodsController {
      */
     @PostMapping("/goods/{id}/favorite")
     public Long addMerchantFavorite(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
-        return this.favoriteService.addMerchantFavorite(id,"GOODS");
+        return this.favoriteClient.addMerchantFavorite(id, "GOODS");
     }
 
     /**
@@ -81,8 +79,8 @@ public class GoodsController {
      * @return 商家端商品信息
      */
     @PostMapping("/merchant/goodsList")
-    public Map<String,Object> getMerchantGoodsList(@RequestBody @Valid GoodsQueryParam param) {
-        return this.goodsService.getCategoryAndGoods(param);
+    public Map<String, Object> getMerchantGoodsList(@RequestBody @Valid GoodsQueryParam param) {
+        return this.goodsClient.getCategoryAndGoods(param);
     }
 
 

src/main/java/com/chelvc/cloud/maintain/controller/HelpCategoryController.java

@@ -1,21 +1,17 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.param.HelpCategoryModifyParam;
-import com.chelvc.cloud.vehicle.api.service.HotMerchantService;
-import com.chelvc.cloud.vehicle.api.service.IHelpCategoryService;
+import java.util.List;
+
+import com.chelvc.cloud.vehicle.client.HelpCategoryClient;
+import com.chelvc.cloud.vehicle.client.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.client.param.HelpCategoryModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.Min;
-import java.util.List;
-
 /**
  * 客服中心接口
  *
@@ -25,9 +21,10 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class HelpCategoryController {
-    @DubboReference
-    private IHelpCategoryService categoryService;
+    private final HelpCategoryClient helpCategoryClient;
+
     /**
      * 客服中心问题查询
      *
@@ -35,7 +32,7 @@ public class HelpCategoryController {
      */
     @PostMapping("/problem/list")
     public List<HelpCategoryDTO> selectHelpCategoryList(HelpCategoryModifyParam helpCategory) {
-       return this.categoryService.selectHelpCategoryList(helpCategory);
+        return this.helpCategoryClient.selectHelpCategoryList(helpCategory);
     }
 
 

src/main/java/com/chelvc/cloud/maintain/controller/HotMerchantController.java

@@ -1,21 +1,21 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.param.HotMerchantModifyParam;
-import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
-import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
-import com.chelvc.cloud.vehicle.api.service.HotMerchantService;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
+import com.chelvc.cloud.vehicle.client.HotMerchantClient;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
+import com.chelvc.cloud.vehicle.client.param.LocationQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.List;
 
 /**
  * 热门搜索接口
@@ -26,9 +26,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class HotMerchantController {
-    @DubboReference
-    private HotMerchantService hotMerchantService;
+    private final HotMerchantClient hotMerchantClient;
 
     /**
      * 添加用户点击埋点
@@ -37,7 +37,7 @@ public class HotMerchantController {
      */
     @GetMapping("/hotMerchant/{id}")
     public void addHotMerchant(@PathVariable("id") @Min(value = 1, message = "商品ID不能小于1") Long id) {
-        this.hotMerchantService.addHotMerchant(id);
+        this.hotMerchantClient.addHotMerchant(id);
     }
 
 
@@ -48,7 +48,7 @@ public class HotMerchantController {
      */
     @PostMapping("/listHotMerchant/")
     public List<MerchantDTO> listHotMerchant(@Valid @RequestBody LocationQueryParam param) {
-       return this.hotMerchantService.listHotMerchant(param);
+        return this.hotMerchantClient.listHotMerchant(param);
     }
 
     /**
@@ -58,7 +58,7 @@ public class HotMerchantController {
      */
     @PostMapping("/likeMerchant/")
     public List<MerchantDTO> likeMerchant(@Valid @RequestBody LocationQueryParam param) {
-       return this.hotMerchantService.likeMerchant(param);
+        return this.hotMerchantClient.likeMerchant(param);
     }
 
 

src/main/java/com/chelvc/cloud/maintain/controller/IncomeRecordController.java

@@ -1,16 +1,16 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.param.IncomeRecordModifyParam;
-import com.chelvc.cloud.vehicle.api.service.IncomeRecordService;
+import javax.validation.Valid;
+
+import com.chelvc.cloud.vehicle.client.IncomeRecordClient;
+import com.chelvc.cloud.vehicle.client.param.IncomeRecordModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 /**
  * 收益记录接口
  *
@@ -20,9 +20,9 @@ import javax.validation.Valid;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class IncomeRecordController {
-    @DubboReference
-    private IncomeRecordService incomeRecordService;
+    private final IncomeRecordClient incomeRecordClient;
 
     /**
      * 添加收益记录
@@ -31,7 +31,7 @@ public class IncomeRecordController {
      */
     @PostMapping("/incomeRecord/")
     public void addIncomeRecord(@Valid IncomeRecordModifyParam param) {
-        this.incomeRecordService.addIncomeRecord(param);
+        this.incomeRecordClient.addIncomeRecord(param);
     }
 
     /**
@@ -39,11 +39,8 @@ public class IncomeRecordController {
      */
     @PostMapping("/incomeRecord/list")
     public void listIncomeRecord() {
-        this.incomeRecordService.listIncomeRecord();
+        this.incomeRecordClient.listIncomeRecord();
     }
 
 
-
-
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/IndexController.java

@@ -7,12 +7,11 @@ import com.chelvc.cloud.maintain.copier.CategoryCopier;
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.ConfigurationVO;
 import com.chelvc.cloud.maintain.vo.CustomerIndexVO;
-import com.chelvc.cloud.uc.api.service.UsageService;
-import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
-import com.chelvc.cloud.vehicle.api.service.CategoryService;
-import com.chelvc.cloud.vehicle.api.service.MerchantService;
+import com.chelvc.cloud.vehicle.client.CategoryClient;
+import com.chelvc.cloud.vehicle.client.MerchantClient;
+import com.chelvc.cloud.vehicle.client.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
+import com.chelvc.cloud.vehicle.client.param.LocationQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.location.Address;
@@ -20,12 +19,10 @@ import com.chelvc.framework.location.LocationHandler;
 import com.chelvc.framework.oauth.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,17 +38,10 @@ import org.springframework.web.bind.annotation.RestController;
 @ResponseWrapping
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class IndexController {
+    private final CategoryClient categoryClient;
+    private final MerchantClient merchantClient;
     private final LocationHandler locationHandler;
 
-    @DubboReference
-    private UsageService usageService;
-
-    @DubboReference
-    private CategoryService categoryService;
-
-    @DubboReference
-    private MerchantService merchantService;
-
     /**
      * 获取系统配置
      *
@@ -78,14 +68,6 @@ public class IndexController {
         return this.locationHandler.location2address(point);
     }
 
-    /**
-     * 刷新用户使用记录
-     */
-    @PostMapping("/usage")
-    public void refreshUsage() {
-        this.usageService.refresh();
-    }
-
     /**
      * 顾客端首页信息
      *
@@ -99,7 +81,8 @@ public class IndexController {
 
         // 加载推荐分类列表
         try {
-            List<CategoryDTO> categories = this.categoryService.listRecommendCategories(param.getPageSize().getCatPageSize());
+            List<CategoryDTO> categories =
+                    this.categoryClient.listRecommendCategories(param.getPageSize().getCatPageSize());
             index.setCategories(CategoryCopier.INSTANCE.copying(categories));
         } catch (Exception e) {
             log.error("Load recommend categories failed", e);
@@ -107,7 +90,8 @@ public class IndexController {
 
         // 加载附近商家列表
         try {
-            List<MerchantDTO> merchants = this.merchantService.listNearbyMerchants(param, param.getPageSize().getNearPageSize());
+            List<MerchantDTO> merchants =
+                    this.merchantClient.listNearbyMerchants(param, param.getPageSize().getNearPageSize());
             index.setNears(MerchantCopier.INSTANCE.copying(merchants));
         } catch (Exception e) {
             log.error("Load nearby merchants failed", e);
@@ -115,7 +99,8 @@ public class IndexController {
 
         // 加载推荐商家列表
         try {
-            List<MerchantDTO> merchants = this.merchantService.listRecommendMerchants(param, param.getPageSize().getRecPageSize());
+            List<MerchantDTO> merchants =
+                    this.merchantClient.listRecommendMerchants(param, param.getPageSize().getRecPageSize());
             index.setRecommends(MerchantCopier.INSTANCE.copying(merchants));
         } catch (Exception e) {
             log.error("Load recommend merchants failed", e);

src/main/java/com/chelvc/cloud/maintain/controller/InformController.java

@@ -1,24 +1,31 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.constant.SystemInformType;
-import com.chelvc.cloud.vehicle.api.dto.*;
-import com.chelvc.cloud.vehicle.api.service.InformService;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.chelvc.cloud.vehicle.client.InformClient;
+import com.chelvc.cloud.vehicle.client.constant.SystemInformType;
+import com.chelvc.cloud.vehicle.client.dto.CommentDTO;
+import com.chelvc.cloud.vehicle.client.dto.EvaluateDTO;
+import com.chelvc.cloud.vehicle.client.dto.NewInformDTO;
+import com.chelvc.cloud.vehicle.client.dto.NewMerchantInformDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsOrderOperateHistoryDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyIdsDTO;
+import com.chelvc.cloud.vehicle.client.dto.UserCouponDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
 /**
  * 订单通知接口
  *
@@ -26,14 +33,12 @@ import javax.validation.constraints.NotNull;
  * @Date 2023/12/13
  **/
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class InformController {
-
-    @DubboReference
-    private InformService informService;
+    private final InformClient informClient;
 
 
     /**
@@ -44,37 +49,34 @@ public class InformController {
      */
     @GetMapping("/order/inform")
     public Pagination<OmsOrderOperateHistoryDTO> listUserOrderInform(@Valid Paging paging) {
-        return informService.selectOmsOrderOperateHistoryListByUserId(SessionContextHolder.getId(), paging);
+        return informClient.selectOmsOrderOperateHistoryListByUserId(SessionContextHolder.getId(), paging);
     }
 
     /**
      * 将新系统通知标识未读改为已读
-     *
      */
     @PutMapping("/system/inform/flag")
     public void changeSystemInformFlag(SystemInformType type) {
-        if(type == null){
+        if (type == null) {
             throw new ResourceUnavailableException("参数错误");
         }
-        informService.changeSystemInformFlag(type, SessionContextHolder.getId());
+        informClient.changeSystemInformFlag(type, SessionContextHolder.getId());
     }
 
     /**
      * 查看是否有系统新消息
-     *
      */
     @GetMapping("/new/inform")
     public NewInformDTO getNewInform() {
-        return informService.getNewInform(SessionContextHolder.getId());
+        return informClient.getNewInform(SessionContextHolder.getId());
     }
 
     /**
      * (商家端)查看是否有系统新消息
-     *
      */
     @GetMapping("/merchant/new/inform")
     public NewMerchantInformDTO getMerchantNewInform(@NotNull(message = "商家标识不能为空") Long merchantId) {
-        return informService.getMerchantNewInform(merchantId);
+        return informClient.getMerchantNewInform(merchantId);
     }
 
     /**
@@ -84,8 +86,9 @@ public class InformController {
      * @return 用户的订单列表
      */
     @GetMapping("/order/return/apply")
-    public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(@NotNull(message = "商家标识不能为空") Long merchantId, @Valid Paging paging) {
-        return informService.listOrderReturnApply(merchantId, paging);
+    public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(@NotNull(message = "商家标识不能为空") Long merchantId,
+                                                                      @Valid Paging paging) {
+        return informClient.listOrderReturnApply(merchantId, paging);
     }
 
     /**
@@ -96,7 +99,7 @@ public class InformController {
      */
     @GetMapping("/pay/inform")
     public Pagination<OmsOrderDTO> listUserPayInform(@Valid Paging paging) {
-        return informService.selectOmsOrderPayHistoryListByUserId(SessionContextHolder.getId(), paging);
+        return informClient.selectOmsOrderPayHistoryListByUserId(SessionContextHolder.getId(), paging);
     }
 
     /**
@@ -107,7 +110,7 @@ public class InformController {
      */
     @GetMapping("/evaluate/inform")
     public Pagination<EvaluateDTO> listEvaluate(@Valid Paging paging) {
-        return informService.selectEvaluateListByUserId(SessionContextHolder.getId(), paging);
+        return informClient.selectEvaluateListByUserId(SessionContextHolder.getId(), paging);
     }
 
     /**
@@ -118,7 +121,7 @@ public class InformController {
      */
     @GetMapping("/comment/inform")
     public Pagination<CommentDTO> listCommentInform(@Valid Paging paging) {
-        return informService.selectCommentListByUserId(SessionContextHolder.getId(), paging);
+        return informClient.selectCommentListByUserId(SessionContextHolder.getId(), paging);
     }
 
     /**
@@ -129,6 +132,6 @@ public class InformController {
      */
     @GetMapping("/coupon/inform")
     public Pagination<UserCouponDTO> listUserCouponInform(@Valid Paging paging) {
-        return informService.selectUserCouponListByUserId(SessionContextHolder.getId(), paging);
+        return informClient.selectUserCouponListByUserId(SessionContextHolder.getId(), paging);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/MerchantAuthController.java

@@ -1,21 +1,21 @@
 package com.chelvc.cloud.maintain.controller;
-import com.chelvc.cloud.vehicle.api.dto.MerchantAuthDTO;
-import com.chelvc.cloud.vehicle.api.param.MerchantAuthModifyParam;
-import com.chelvc.cloud.vehicle.api.service.CarouselImagesService;
-import com.chelvc.cloud.vehicle.api.service.MerchantAuthService;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
+import com.chelvc.cloud.vehicle.client.MerchantAuthClient;
+import com.chelvc.cloud.vehicle.client.dto.MerchantAuthDTO;
+import com.chelvc.cloud.vehicle.client.param.MerchantAuthModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
 /**
  * 商家认证接口
  *
@@ -25,9 +25,9 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class MerchantAuthController {
-    @DubboReference
-    private MerchantAuthService merchantAuthService;
+    private final MerchantAuthClient merchantAuthClient;
 
     /**
      * 新增商家认证
@@ -37,7 +37,7 @@ public class MerchantAuthController {
      */
     @PostMapping("/merchantAuth")
     public Long addMerchantAuth(@RequestBody @Valid MerchantAuthModifyParam param) {
-        return this.merchantAuthService.addMerchantAuth(param);
+        return this.merchantAuthClient.addMerchantAuth(param);
     }
 
     /**
@@ -49,7 +49,7 @@ public class MerchantAuthController {
     @PutMapping("/merchantAuth/{id}")
     public void updateMerchantAuth(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
                                    @RequestBody @Valid MerchantAuthModifyParam param) {
-        this.merchantAuthService.updateMerchantAuth(id, param);
+        this.merchantAuthClient.updateMerchantAuth(id, param);
     }
 
     /**
@@ -57,9 +57,8 @@ public class MerchantAuthController {
      */
     @PostMapping("/merchantAuth/queryById")
     public MerchantAuthDTO queryById() {
-        return this.merchantAuthService.queryById();
+        return this.merchantAuthClient.queryById();
     }
 
 
-
 }

src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -1,21 +1,31 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
-import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
-import com.chelvc.cloud.vehicle.api.dto.BalanceDetailDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
-import com.chelvc.cloud.vehicle.api.param.*;
-import com.chelvc.cloud.vehicle.api.service.BalanceDetailService;
-import com.chelvc.cloud.vehicle.api.service.FavoriteService;
-import com.chelvc.cloud.vehicle.api.service.GoodsService;
-import com.chelvc.cloud.vehicle.api.service.MerchantService;
+import com.chelvc.cloud.vehicle.client.BalanceDetailClient;
+import com.chelvc.cloud.vehicle.client.FavoriteClient;
+import com.chelvc.cloud.vehicle.client.GoodsClient;
+import com.chelvc.cloud.vehicle.client.MerchantClient;
+import com.chelvc.cloud.vehicle.client.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.client.dto.BalanceDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantRankDTO;
+import com.chelvc.cloud.vehicle.client.param.LocationQueryParam;
+import com.chelvc.cloud.vehicle.client.param.MerchantQueryParam;
+import com.chelvc.cloud.vehicle.client.param.MerchantRankParam;
+import com.chelvc.cloud.vehicle.client.param.OmsCartItemPagingParam;
+import com.chelvc.cloud.vehicle.client.param.QueryMerchantBalanceParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,11 +33,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
 /**
  * 商家接口
  *
@@ -37,17 +42,12 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class MerchantController {
-    @DubboReference
-    private MerchantService merchantService;
-
-    @DubboReference
-    private FavoriteService favoriteService;
-
-    @DubboReference
-    private BalanceDetailService balanceDetailService;
-    @DubboReference
-    private GoodsService goodsService;
+    private final GoodsClient goodsClient;
+    private final MerchantClient merchantClient;
+    private final FavoriteClient favoriteClient;
+    private final BalanceDetailClient balanceDetailClient;
 
     /**
      * 获取商家列表
@@ -57,7 +57,7 @@ public class MerchantController {
      */
     @GetMapping("/merchantSort")
     public List<SimpleMerchantVO> listSimpleMerchants(@Valid MerchantQueryParam param) {
-        return MerchantCopier.INSTANCE.copying(this.merchantService.listSimpleMerchants(param));
+        return MerchantCopier.INSTANCE.copying(this.merchantClient.listSimpleMerchants(param));
     }
 
     /**
@@ -68,20 +68,20 @@ public class MerchantController {
      */
     @GetMapping("/merchants/rank")
     public List<MerchantRankDTO> listRankMerchants(@Valid MerchantRankParam param) {
-        return this.merchantService.listRankMerchants(param, SessionContextHolder.getId());
+        return this.merchantClient.listUserRankMerchants(param, SessionContextHolder.getId());
     }
 
     /**
      * 获取商家详情
      *
-     * @param id 商家ID
+     * @param id    商家ID
      * @param param 查询参数
      * @return 商家详情
      */
     @GetMapping("/merchant/{id}")
     public MerchantDetailDTO getMerchantDetail(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id,
                                                @Valid LocationQueryParam param) {
-        return this.merchantService.getMerchantDetail(id, param);
+        return this.merchantClient.queryMerchantDetail(id, param);
     }
 
     /**
@@ -92,70 +92,70 @@ public class MerchantController {
      */
     @PostMapping("/merchant/{id}/favorite")
     public Long addMerchantFavorite(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
-        return this.favoriteService.addMerchantFavorite(id,"MERCHANT");
+        return this.favoriteClient.addMerchantFavorite(id, "MERCHANT");
     }
 
     /**
      * 查询商家余额明细
      *
-     * @param param 查询条件
+     * @param param    查询条件
      * @param pageNum
      * @param pageSize
      * @return 收藏ID
      */
     @GetMapping("/merchant/balance/detail")
-    public Pagination<BalanceDetailDTO> queryBalanceDetail(@Validated QueryMerchantBalanceParam param, Integer pageNum, Integer pageSize) {
+    public Pagination<BalanceDetailDTO> queryBalanceDetail(@Validated QueryMerchantBalanceParam param,
+                                                           Integer pageNum, Integer pageSize) {
         if (pageNum == null) {
             pageNum = 1;
         }
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.balanceDetailService.queryByMerchantId(param, pageNum, pageSize, 2);
+        return this.balanceDetailClient.queryByMerchantId(param, pageNum, pageSize, 2);
     }
 
 
     /**
      * 我的购物车列表
-     *
      */
     @GetMapping("/mineCartList")
     public Pagination<MerchantDTO> mineCartList(@Valid OmsCartItemPagingParam param) {
-        return this.merchantService.getUserMineCartPaging(param);
+        return this.merchantClient.getUserMineCartPaging(param);
     }
 
 
     /**
      * 上架商品
      *
-     * @param goodsIds    商品ID集合
+     * @param goodsIds 商品ID集合
      */
     @PutMapping("/merchant/list-goods/{goodsIds}")
     public void listGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
-        this.goodsService.updateGoodsStatus(goodsIds, GoodsStatus.ONLINE);
+        this.goodsClient.updateGoodsStatus(goodsIds, GoodsStatus.ONLINE);
     }
 
     /**
      * 下架商品
      *
-     * @param goodsIds    商品ID集合
+     * @param goodsIds 商品ID集合
      */
     @PutMapping("/merchant/delist-goods/{goodsIds}")
     public void delistGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
-        this.goodsService.updateGoodsStatus(goodsIds, GoodsStatus.OFFLINE);
+        this.goodsClient.updateGoodsStatus(goodsIds, GoodsStatus.OFFLINE);
     }
 
 
     /**
      * 修改商家营业状态
      *
-     * @param id    商家主键
+     * @param id             商家主键
      * @param businessStatus 修改参数  营业状态 0-营业中，1-休息中
      */
     @PutMapping("/merchant/updateBusinessStatus/{id}")
     public void updateMerchant(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
                                String businessStatus) {
-        this.merchantService.updateMerchantBusinessStatus(id,businessStatus);
+        this.merchantClient.updateMerchantBusinessStatus(id, businessStatus);
     }
 
 }

src/main/java/com/chelvc/cloud/maintain/controller/NoticeController.java

@@ -1,14 +1,16 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.NoticeDTO;
-import com.chelvc.cloud.vehicle.api.service.NoticeService;
+import java.util.List;
+import javax.validation.Valid;
+
+import com.chelvc.cloud.vehicle.client.NoticeClient;
+import com.chelvc.cloud.vehicle.client.dto.NoticeDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 通知配置接口
@@ -19,9 +21,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class NoticeController {
-    @DubboReference
-    private NoticeService noticeService;
+    private final NoticeClient noticeClient;
 
     /**
      * 查询通知配置列表
@@ -31,6 +33,6 @@ public class NoticeController {
      */
     @GetMapping("/notice/list")
     public List<NoticeDTO> getNoticeList(@Valid String type) {
-        return this.noticeService.getNoticeList(type);
+        return this.noticeClient.getNoticeList(type);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -1,22 +1,27 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.ConfirmOrderResultDTO;
-import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
-import com.chelvc.cloud.vehicle.api.dto.OmsOrderReturnApplyDTO;
-import com.chelvc.cloud.vehicle.api.param.OmsOrderModifyParam;
-import com.chelvc.cloud.vehicle.api.param.OrderPagingParam;
-import com.chelvc.cloud.vehicle.api.service.IOmsOrderReturnApplyService;
-import com.chelvc.cloud.vehicle.api.service.IOmsOrderService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
+import java.util.Map;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.Map;
+
+import com.chelvc.cloud.vehicle.client.OmsOrderClient;
+import com.chelvc.cloud.vehicle.client.OmsOrderReturnApplyClient;
+import com.chelvc.cloud.vehicle.client.dto.ConfirmOrderResultDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
+import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
+import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.common.model.Pagination;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 订单接口
@@ -27,31 +32,31 @@ import java.util.Map;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OmsOrderController {
-    @DubboReference
-    private IOmsOrderService omsOrderService;
-
-    @DubboReference
-    private IOmsOrderReturnApplyService iOmsOrderReturnApplyService;
+    private final OmsOrderClient omsOrderClient;
+    private final OmsOrderReturnApplyClient omsOrderReturnApplyClient;
 
     /**
      * 根据购物车信息生成确认单信息
+     *
      * @param orderParam
      * @return
      */
     @PostMapping("/generateConfirmOrder")
     public ConfirmOrderResultDTO generateConfirmOrder(@RequestBody @Valid OmsOrderModifyParam orderParam) {
-        return this.omsOrderService.generateConfirmOrder(orderParam);
+        return this.omsOrderClient.generateConfirmOrder(orderParam);
     }
 
     /**
-     *根据购物车信息生成订单
+     * 根据购物车信息生成订单
+     *
      * @param orderParam
      * @return
      */
     @PostMapping("/generateOrder")
-    public Map<String, Object>  generateOrder(@RequestBody @Valid OmsOrderModifyParam orderParam) {
-        Map<String, Object> result = omsOrderService.generateOrder(orderParam);
+    public Map<String, Object> generateOrder(@RequestBody @Valid OmsOrderModifyParam orderParam) {
+        Map<String, Object> result = omsOrderClient.generateOrder(orderParam);
         return result;
     }
 
@@ -63,55 +68,60 @@ public class OmsOrderController {
      */
     @GetMapping("/order/paging")
     public Pagination<OmsOrderDTO> getOrderPaging(@Valid OrderPagingParam param) {
-        return this.omsOrderService.getOrderPaging(param);
+        return this.omsOrderClient.getOrderPaging(param);
     }
 
     /**
      * 确认订单
+     *
      * @param id 查询参数
      */
     @GetMapping("/confirmReceiveOrder/{id}")
     public void confirmReceiveOrder(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
-        this.omsOrderService.confirmReceiveOrder(id);
+        this.omsOrderClient.confirmReceiveOrder(id);
     }
 
     /**
      * 手动取消订单
+     *
      * @param id 查询参数
      */
     @GetMapping("/cancelOrder/{id}")
     public void cancelOrder(@PathVariable("id") @Min(value = 1, message = "订单ID不能小于1") Long id) {
-        this.omsOrderService.cancelOrder(id);
+        this.omsOrderClient.cancelOrder(id);
     }
 
 
     /**
      * 删除订单
+     *
      * @param id 查询参数
      */
     @GetMapping("/deleteOrder/{id}")
     public void deleteOrder(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
-        this.omsOrderService.deleteOrder(id);
+        this.omsOrderClient.deleteOrder(id);
     }
 
     /**
      * 支付成功回调
+     *
      * @param id 查询参数
      */
     @GetMapping("/paySuccess/{id}")
     public void paySuccess(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id,
                            Integer payType) {
-        this.omsOrderService.paySuccess(id,payType);
+        this.omsOrderClient.paySuccess(id, payType);
     }
 
     /**
      * 查看退款订单信息
+     *
      * @param id
      * @return
      */
     @GetMapping("/getOrderReturnApplyInfo")
     public OmsOrderReturnApplyDTO getOrderReturnApplyInfo(@PathVariable("id") Long id) {
-        return this.iOmsOrderReturnApplyService.getOrderReturnApplyInfo(id);
+        return this.omsOrderReturnApplyClient.getOrderReturnApplyInfo(id);
     }
 
 
@@ -123,7 +133,7 @@ public class OmsOrderController {
      */
     @GetMapping("/order/merchantPaging")
     public Pagination<OmsOrderDTO> getMerchantOrderPaging(@Valid OrderPagingParam param) {
-        return this.omsOrderService.getMerchantOrderPaging(param);
+        return this.omsOrderClient.getMerchantOrderPaging(param);
     }
 
 
@@ -133,8 +143,9 @@ public class OmsOrderController {
      * @return 订单量以及今日收入
      */
     @GetMapping("/order/getOrderQuantity/{merchantId}")
-    public Map<String, Object> getOrderQuantity(@PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1")Long merchantId) {
-        return this.omsOrderService.getOrderQuantity(merchantId);
+    public Map<String, Object> getOrderQuantity(
+            @PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId) {
+        return this.omsOrderClient.getOrderQuantity(merchantId);
     }
 
     /**
@@ -147,6 +158,6 @@ public class OmsOrderController {
     @GetMapping("/order/verification/{orderId}/{merchantId}")
     public void orderVerification(@PathVariable("orderId") @NotNull(message = "订单错误") Long orderId,
                                   @PathVariable("merchantId") @NotNull(message = "订单错误") Long merchantId) {
-        this.omsOrderService.orderVerification(orderId, merchantId);
+        this.omsOrderClient.orderVerification(orderId, merchantId);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/OrderController.java

@@ -1,17 +1,22 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.Collections;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
-import com.chelvc.cloud.vehicle.api.param.OrderQueryParam;
-import com.chelvc.cloud.vehicle.api.service.UserCouponService;
+import com.chelvc.cloud.vehicle.client.UserCouponClient;
+import com.chelvc.cloud.vehicle.client.param.OrderQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.Collections;
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 订单接口
@@ -22,9 +27,9 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderController {
-    @DubboReference
-    private UserCouponService userCouponService;
+    private final UserCouponClient userCouponClient;
 
 
     /**

src/main/java/com/chelvc/cloud/maintain/controller/ReservationController.java

@@ -1,14 +1,21 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.copier.ReservationCopier;
 import com.chelvc.cloud.maintain.vo.ReservationVO;
-import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
-import com.chelvc.cloud.vehicle.api.param.ReservationModifyParam;
-import com.chelvc.cloud.vehicle.api.param.ReservationQueryParam;
-import com.chelvc.cloud.vehicle.api.service.ReservationService;
+import com.chelvc.cloud.vehicle.client.ReservationClient;
+import com.chelvc.cloud.vehicle.client.dto.ReservationDTO;
+import com.chelvc.cloud.vehicle.client.param.ReservationModifyParam;
+import com.chelvc.cloud.vehicle.client.param.ReservationQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,12 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 预约接口
  *
@@ -33,9 +34,9 @@ import java.util.stream.Collectors;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ReservationController {
-    @DubboReference
-    private ReservationService reservationService;
+    private final ReservationClient reservationClient;
 
     /**
      * 新增预约
@@ -46,7 +47,7 @@ public class ReservationController {
     @PostMapping("/merchant/{merchantId}/reservation")
     public void addReservation(@PathVariable("merchantId") @Min(value = 1, message = "商家主键不能小于1") Long merchantId,
                                @RequestBody @Valid ReservationModifyParam param) {
-        this.reservationService.addReservation(merchantId, param);
+        this.reservationClient.addReservation(merchantId, param);
     }
 
     /**
@@ -57,7 +58,7 @@ public class ReservationController {
      */
     @GetMapping("/reservations")
     public List<ReservationVO> listUserReservations(@Valid ReservationQueryParam param) {
-        List<ReservationDTO> reservations = this.reservationService.listUserReservations(param);
+        List<ReservationDTO> reservations = this.reservationClient.listUserReservations(param);
         if (CollectionUtils.isEmpty(reservations)) {
             return Collections.emptyList();
         }
@@ -74,15 +75,14 @@ public class ReservationController {
     /**
      * 取消预约
      *
-     * @param id    预约主键
+     * @param id 预约主键
      */
     @PutMapping("/reservation/{id}")
     public void deleteReservation(@PathVariable("id") @Min(value = 1, message = "预约主键不能小于1") Long id) {
-        this.reservationService.deleteReservation(id);
+        this.reservationClient.deleteReservation(id);
     }
 
 
-
     /**
      * 查询商家被预约列表
      *
@@ -91,7 +91,7 @@ public class ReservationController {
      */
     @PostMapping("/listMerchantReservations")
     public List<ReservationVO> listMerchantReservations(@RequestBody @Valid ReservationQueryParam param) {
-        List<ReservationDTO> reservations = this.reservationService.listMerchantReservations(param);
+        List<ReservationDTO> reservations = this.reservationClient.listMerchantReservations(param);
         if (CollectionUtils.isEmpty(reservations)) {
             return Collections.emptyList();
         }

src/main/java/com/chelvc/cloud/maintain/controller/UserController.java

@@ -4,10 +4,11 @@ import javax.validation.Valid;
 
 import com.chelvc.cloud.maintain.copier.UserCopier;
 import com.chelvc.cloud.maintain.vo.PersonalVO;
-import com.chelvc.cloud.uc.api.param.PersonalModifyParam;
-import com.chelvc.cloud.uc.api.service.UserService;
+import com.chelvc.cloud.user.client.UserClient;
+import com.chelvc.cloud.user.client.param.PersonalModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -23,9 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserController {
-    @DubboReference
-    private UserService userService;
+    private final UserClient userClient;
 
     /**
      * 获取用户个人信息
@@ -34,7 +35,7 @@ public class UserController {
      */
     @GetMapping("/user/mine")
     public PersonalVO getPersonal() {
-        return UserCopier.INSTANCE.copying(this.userService.getPersonal());
+        return UserCopier.INSTANCE.copying(this.userClient.getPersonal());
     }
 
     /**
@@ -44,6 +45,6 @@ public class UserController {
      */
     @PutMapping("/user/mine")
     public void updatePersonal(@RequestBody @Valid PersonalModifyParam param) {
-        this.userService.updatePersonal(param);
+        this.userClient.updatePersonal(param);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java

@@ -8,13 +8,14 @@ import javax.validation.constraints.Min;
 
 import com.chelvc.cloud.maintain.copier.UserCouponCopier;
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
-import com.chelvc.cloud.vehicle.api.dto.UserCouponDTO;
-import com.chelvc.cloud.vehicle.api.param.UserCouponPagingParam;
-import com.chelvc.cloud.vehicle.api.param.UserCouponQueryParam;
-import com.chelvc.cloud.vehicle.api.service.UserCouponService;
+import com.chelvc.cloud.vehicle.client.UserCouponClient;
+import com.chelvc.cloud.vehicle.client.dto.UserCouponDTO;
+import com.chelvc.cloud.vehicle.client.param.UserCouponPagingParam;
+import com.chelvc.cloud.vehicle.client.param.UserCouponQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,9 +32,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserCouponController {
-    @DubboReference
-    private UserCouponService userCouponService;
+    private final UserCouponClient userCouponClient;
 
     /**
      * 领取优惠券
@@ -43,7 +44,7 @@ public class UserCouponController {
      */
     @PostMapping("/usercoupon/{couponId}/claim")
     public Long claimCoupon(@PathVariable("couponId") @Min(value = 1, message = "优惠券主键不能小于1") Long couponId) {
-        return this.userCouponService.claimCoupon(couponId);
+        return this.userCouponClient.claimCoupon(couponId);
     }
 
     /**
@@ -62,7 +63,7 @@ public class UserCouponController {
      */
     @GetMapping("/usercoupons")
     public List<UserCouponVO> listUserCoupons(@Valid UserCouponQueryParam param) {
-        List<UserCouponDTO> userCoupons = this.userCouponService.listUserCoupons(param);
+        List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCoupons(param);
         if (CollectionUtils.isEmpty(userCoupons)) {
             return Collections.emptyList();
         }
@@ -80,7 +81,7 @@ public class UserCouponController {
      */
     @GetMapping("/canusecoupons")
     public List<UserCouponVO> listUserCanUseCoupons(@Valid UserCouponQueryParam param) {
-        List<UserCouponDTO> userCoupons = this.userCouponService.listUserCanUseCoupons(param);
+        List<UserCouponDTO> userCoupons = this.userCouponClient.listUserCanUseCoupons(param);
         if (CollectionUtils.isEmpty(userCoupons)) {
             return Collections.emptyList();
         }
@@ -98,7 +99,7 @@ public class UserCouponController {
      */
     @GetMapping("/usercoupon/{id}")
     public UserCouponVO getUserCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券领取记录主键不能小于1") Long id) {
-        return UserCouponCopier.INSTANCE.copying(this.userCouponService.getUserCoupon(id));
+        return UserCouponCopier.INSTANCE.copying(this.userCouponClient.getUserCoupon(id));
     }
 
     /**
@@ -109,7 +110,7 @@ public class UserCouponController {
      */
     @GetMapping("/usercoupon/paging")
     public Pagination<UserCouponVO> getUserCouponPaging(@Valid UserCouponPagingParam param) {
-        Pagination<UserCouponDTO> pagination = this.userCouponService.getUserCouponPaging(param);
+        Pagination<UserCouponDTO> pagination = this.userCouponClient.getUserCouponPaging(param);
         List<UserCouponDTO> records = pagination.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();

src/main/java/com/chelvc/cloud/maintain/controller/UserInviteController.java

@@ -1,50 +1,54 @@
 package com.chelvc.cloud.maintain.controller;
 
-import com.chelvc.cloud.vehicle.api.dto.TeamDTO;
-import com.chelvc.cloud.vehicle.api.param.TeamInvitePageParam;
-import com.chelvc.cloud.vehicle.api.param.UserInviteParams;
-import com.chelvc.cloud.vehicle.api.service.UserInviteService;
+import javax.validation.Valid;
+
+import com.chelvc.cloud.vehicle.client.UserInviteClient;
+import com.chelvc.cloud.vehicle.client.dto.TeamDTO;
+import com.chelvc.cloud.vehicle.client.param.TeamInvitePageParam;
+import com.chelvc.cloud.vehicle.client.param.UserInviteParams;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import lombok.RequiredArgsConstructor;
-import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 用户邀请接口
  */
 @Validated
-@RequiredArgsConstructor
 @RestController
 @RequestMapping("/invite")
 @ResponseWrapping
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserInviteController {
-
-    @DubboReference
-    private UserInviteService userInviteService;
+    private final UserInviteClient userInviteClient;
 
     /**
      * 绑定关系
+     *
      * @param param
      * @author igl
      * @date 2024/2/23 17:25
      */
     @PostMapping("/bind")
     public void bindInvite(@Validated @RequestBody UserInviteParams param) {
-        this.userInviteService.bindInvite(param);
+        this.userInviteClient.bindInvite(param);
     }
 
     /**
      * 我的团队
+     *
      * @param param 类型：1-用户；2-商家；不传值-查所有
      * @author igl
      * @date 2024/2/26 10:12
      */
     @GetMapping("/team/page")
     public TeamDTO teamList(@Valid TeamInvitePageParam param) {
-        return this.userInviteService.teamList(param, SessionContextHolder.getId());
+        return this.userInviteClient.teamList(param, SessionContextHolder.getId());
     }
 }

src/main/java/com/chelvc/cloud/maintain/copier/CategoryCopier.java

@@ -4,7 +4,7 @@ import java.util.Collection;
 import java.util.List;
 
 import com.chelvc.cloud.maintain.vo.CategoryVO;
-import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.client.dto.CategoryDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/CommentCopier.java

@@ -4,7 +4,7 @@ import java.util.Collection;
 import java.util.List;
 
 import com.chelvc.cloud.maintain.vo.CommentVO;
-import com.chelvc.cloud.vehicle.api.dto.CommentDTO;
+import com.chelvc.cloud.vehicle.client.dto.CommentDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/CouponCopier.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.maintain.copier;
 
 import com.chelvc.cloud.maintain.vo.CouponVO;
-import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
+import com.chelvc.cloud.vehicle.client.dto.CouponDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;

src/main/java/com/chelvc/cloud/maintain/copier/FavoriteCopier.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.maintain.copier;
 
 import com.chelvc.cloud.maintain.vo.FavoriteVO;
-import com.chelvc.cloud.vehicle.api.dto.FavoriteDTO;
+import com.chelvc.cloud.vehicle.client.dto.FavoriteDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/GoodsCopier.java

@@ -5,8 +5,8 @@ import java.util.List;
 
 import com.chelvc.cloud.maintain.vo.GoodsDetailVO;
 import com.chelvc.cloud.maintain.vo.SimpleGoodsVO;
-import com.chelvc.cloud.vehicle.api.dto.GoodsDTO;
-import com.chelvc.cloud.vehicle.api.dto.GoodsDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.GoodsDTO;
+import com.chelvc.cloud.vehicle.client.dto.GoodsDetailDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/MerchantCopier.java

@@ -6,8 +6,8 @@ import java.util.List;
 import com.chelvc.cloud.maintain.vo.MerchantDetailVO;
 import com.chelvc.cloud.maintain.vo.MerchantVO;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
+import com.chelvc.cloud.vehicle.client.dto.MerchantDetailDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/ReservationCopier.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.maintain.copier;
 
 import com.chelvc.cloud.maintain.vo.ReservationVO;
-import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
+import com.chelvc.cloud.vehicle.client.dto.ReservationDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/com/chelvc/cloud/maintain/copier/UserCopier.java

@@ -5,8 +5,8 @@ import java.util.List;
 
 import com.chelvc.cloud.maintain.vo.PersonalVO;
 import com.chelvc.cloud.maintain.vo.UserVO;
-import com.chelvc.cloud.uc.api.dto.UserDTO;
-import com.chelvc.cloud.uc.api.dto.UserPersonalDTO;
+import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.UserPersonalDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;

src/main/java/com/chelvc/cloud/maintain/copier/UserCouponCopier.java

@@ -1,8 +1,8 @@
 package com.chelvc.cloud.maintain.copier;
 
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
-import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
-import com.chelvc.cloud.vehicle.api.dto.UserCouponDTO;
+import com.chelvc.cloud.vehicle.client.dto.CouponDTO;
+import com.chelvc.cloud.vehicle.client.dto.UserCouponDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

src/main/java/com/chelvc/cloud/maintain/vo/AdvertisementVO.java

@@ -2,7 +2,7 @@ package com.chelvc.cloud.maintain.vo;
 
 import java.io.Serializable;
 
-import com.chelvc.cloud.vehicle.api.constant.Adsource;
+import com.chelvc.cloud.vehicle.client.constant.Adsource;
 import com.chelvc.framework.common.model.Media;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/chelvc/cloud/maintain/vo/CategoryVO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.client.dto.CategoryDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/CouponVO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/FavoriteVO.java

@@ -1,5 +1,5 @@
 package com.chelvc.cloud.maintain.vo;
-import com.chelvc.cloud.vehicle.api.constant.FavoriteType;
+import com.chelvc.cloud.vehicle.client.constant.FavoriteType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/MerchantDetailVO.java

@@ -3,8 +3,8 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
-import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.client.constant.CategoryType;
+import com.chelvc.cloud.vehicle.client.dto.CategoryDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/PersonalVO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.chelvc.cloud.uc.api.model.Gender;
+import com.chelvc.cloud.user.client.model.Gender;
 import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/ReservationVO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/UserCouponVO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.maintain.vo;
 
-import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.client.constant.CouponType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/chelvc/cloud/maintain/vo/UserVO.java

@@ -2,7 +2,7 @@ package com.chelvc.cloud.maintain.vo;
 
 import java.io.Serializable;
 
-import com.chelvc.cloud.uc.api.model.Gender;
+import com.chelvc.cloud.user.client.model.Gender;
 import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;

src/main/resources/application-dev.yml

@@ -8,10 +8,6 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://47.108.128.78:6848
-
 nacos:
   config:
     server-addr: 47.108.128.78:6848

src/main/resources/application-pre.yml

@@ -8,10 +8,6 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848

src/main/resources/application-prod.yml

@@ -8,10 +8,6 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848

src/main/resources/application-test.yml

@@ -8,10 +8,6 @@ spring:
     port: 7031
     password: Chelvc@2023
 
-dubbo:
-  registry:
-    address: nacos://127.0.0.1:6848
-
 nacos:
   config:
     server-addr: 127.0.0.1:6848

src/main/resources/application.yml

@@ -37,20 +37,4 @@ spring:
 
 nacos:
   config:
-    namespace: ${spring.profiles.active}
-
-dubbo:
-  protocol:
-    name: dubbo
-    port: 20200
-  application:
-    name: ${spring.application.name}
-    register-mode: instance
-  provider:
-    group: ${spring.profiles.active}
-    filter: -exception,customException
-  consumer:
-    group: ${spring.profiles.active}
-    check: false
-    timeout: 10000
-    retries: 0
+    namespace: ${spring.profiles.active}

src/main/resources/logback-spring.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<contextName>maintain</contextName>
-
-	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
+	<property name="app" value="maintain"/>
+	<springProperty name="path" source="logging.path" defaultValue="./"/>
 
 	<turboFilter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 
@@ -14,13 +13,13 @@
 	</appender>
 
 	<appender name="FILE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${LOG_PATH}/maintain.log</file>
+		<file>${path}/${app}.log</file>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>
 		</encoder>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_PATH}/maintain-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<fileNamePattern>${path}/${app}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<maxFileSize>10MB</maxFileSize>
 			<maxHistory>7</maxHistory>
 		</rollingPolicy>