- 后端：临时解决 Dubbo 内嵌在 Spring Boot 时，对本地的 Dubbo Service 引用报错的问题。

- 前端：完善商品推荐 - 前端：完善优惠劵
2019-05-07 19:33:16 +08:00
parent ab5d051f75
commit d39a416080
69 changed files with 743 additions and 202 deletions
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java
@@ -20,7 +20,9 @@ import java.util.Set;
@EnableWebMvc
@Configuration
@Import(value = {GlobalExceptionHandler.class,  // 统一全局返回
-        AdminSecurityInterceptor.class})
+        AdminAccessLogInterceptor.class,
+        AdminSecurityInterceptor.class
+})
 public class MVCConfiguration implements WebMvcConfigurer {

 //    @Autowired
@@ -36,7 +38,6 @@ public class MVCConfiguration implements WebMvcConfigurer {

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(securityInterceptor).addPathPatterns("/user/**", "/admin/**"); // 只拦截我们定义的接口
        registry.addInterceptor(adminAccessLogInterceptor).addPathPatterns("/admins/**");
        registry.addInterceptor(adminSecurityInterceptor.setIgnoreUrls(ignoreUrls)).addPathPatterns("/admins/**")
                .excludePathPatterns("/admins/passport/login"); // 排除登陆接口
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
@@ -23,7 +23,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

 import java.util.*;
@@ -34,14 +33,11 @@ import java.util.stream.Collectors;
@Api("管理员模块")
 public class AdminController {

-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.ResourceService.version}")
    private ResourceService resourceService;
-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.AdminService.version}")
    private AdminService adminService;
-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.RoleService.version}")
    private RoleService roleService;

    // =========== 当前管理员相关的资源 API ===========
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
@@ -9,14 +9,13 @@ import cn.iocoder.mall.admin.application.convert.DataDictConvert;
 import cn.iocoder.mall.admin.application.vo.DataDictEnumVO;
 import cn.iocoder.mall.admin.application.vo.DataDictVO;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
-import org.apache.dubbo.config.annotation.Reference;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Multimaps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.*;

 import java.util.ArrayList;
@@ -27,8 +26,7 @@ import java.util.List;
@Api("数据字典模块")
 public class DataDictController {

-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.DataDictService.version}")
    private DataDictService dataDictService;

    @GetMapping("/list")
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,8 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
@Api("Admin Passport 模块")
 public class PassportController {

-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.OAuth2Service.version}")
    private OAuth2Service oauth2Service;

    @PostMapping("/login")
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
@@ -10,12 +10,11 @@ import cn.iocoder.mall.admin.application.convert.ResourceConvert;
 import cn.iocoder.mall.admin.application.vo.ResourceTreeNodeVO;
 import cn.iocoder.mall.admin.application.vo.ResourceVO;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
-import org.apache.dubbo.config.annotation.Reference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.*;

 import java.util.ArrayList;
@@ -29,8 +28,7 @@ import java.util.stream.Collectors;
@Api("资源模块")
 public class ResourceController {

-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.ResourceService.version}")
    private ResourceService resourceService;

    @SuppressWarnings("Duplicates")
--- a/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
+++ b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
@@ -16,11 +16,10 @@ import cn.iocoder.mall.admin.application.vo.RolePageVO;
 import cn.iocoder.mall.admin.application.vo.RoleResourceTreeNodeVO;
 import cn.iocoder.mall.admin.application.vo.RoleVO;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
-import org.apache.dubbo.config.annotation.Reference;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.*;

 import java.util.*;
@@ -30,11 +29,9 @@ import java.util.stream.Collectors;
@RequestMapping("admins/role")
 public class RoleController {

-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.RoleService.version}")
    private RoleService roleService;
-    @Reference(validation = "true")
-    @Autowired // TODO Dubbo 2.7.2 移除 bug
+    @Reference(validation = "true", version = "${dubbo.provider.ResourceService.version}")
    private ResourceService resourceService;

    @GetMapping("/page")