Merge branch 'igl'

# Conflicts:
#	src/main/java/com/chelvc/cloud/admin/controller/DynamicCommentController.java
#	src/main/java/com/chelvc/cloud/admin/controller/DynamicContentController.java

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

@@ -7,6 +7,7 @@ import com.chelvc.cloud.vehicle.api.service.DynamicCommentService;
 import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +22,8 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/comment")
 public class DynamicCommentController {
 
-  private final DynamicCommentService dynamicCommentService;
+  @DubboReference
+  private DynamicCommentService dynamicCommentService;
 
   /**
    * 查询列表
@@ -32,7 +34,7 @@ public class DynamicCommentController {
    */
   @GetMapping("/list")
   public Pagination<DynamicCommentDTO> list(QueryAdminDynamicParam param, PagedDTO page) {
-    return dynamicCommentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
+    return this.dynamicCommentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
   }
 
   /**
@@ -44,6 +46,6 @@ public class DynamicCommentController {
    */
   @PutMapping("/examine")
   public void examine(@Validated @RequestBody ExamineDynamicParam param) {
-    dynamicCommentService.examine(param.getId(), param.getExamine());
+    this.dynamicCommentService.examine(param.getId(), param.getExamine());
   }
 }

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

@@ -8,6 +8,7 @@ import com.chelvc.cloud.vehicle.api.service.DynamicContentService;
 import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,7 +26,8 @@ import javax.validation.constraints.NotNull;
 @RequestMapping("/admin/content")
 public class DynamicContentController {
 
-    private final DynamicContentService iDynamicContentService;
+    @DubboReference
+    private DynamicContentService iDynamicContentService;
 
     /**
      * 查询列表
@@ -36,7 +38,7 @@ public class DynamicContentController {
      */
     @GetMapping("/list")
     public Pagination<DynamicContentDTO> list(QueryAdminDynamicParam param, PagedDTO page) {
-        return iDynamicContentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
+        return this.iDynamicContentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
     }
 
     /**
@@ -47,7 +49,7 @@ public class DynamicContentController {
      */
     @PutMapping("/shield/update")
     public void shieldById(@Validated @RequestBody EditShieldDynamicParam param) {
-        iDynamicContentService.shieldById(param.getId(), param.getPlatformStatus());
+        this.iDynamicContentService.shieldById(param.getId(), param.getPlatformStatus());
     }
 
     /**