升级 Dubbo 到 2.7.1 。目前 Dubbo 引用服务存在 Bug ，所以需要使用 @Autowire 解决下。

2019-04-30 21:32:05 +08:00
parent 038073d9a8
commit 903489bcc7
80 changed files with 225 additions and 208 deletions
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java
@@ -1,9 +1,12 @@
 package cn.iocoder.mall.admin.application.config;

 import cn.iocoder.common.framework.config.GlobalExceptionHandler;
+import cn.iocoder.common.framework.servlet.CorsFilter;
 import cn.iocoder.mall.admin.sdk.interceptor.AdminAccessLogInterceptor;
 import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.*;
@@ -37,13 +40,12 @@ public class MVCConfiguration implements WebMvcConfigurer {
        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
    }

-    // TODO 芋艿，允许跨域
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedHeaders("*")
-                .allowedMethods("*")
-                .allowedOrigins("*");
+    @Bean
+    public FilterRegistrationBean<CorsFilter> corsFilter() {
+        FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new CorsFilter());
+        registrationBean.addUrlPatterns("/*");
+        return registrationBean;
    }

-}
+}
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
@@ -18,11 +18,11 @@ import cn.iocoder.mall.admin.application.vo.AdminPageVO;
 import cn.iocoder.mall.admin.application.vo.AdminRoleVO;
 import cn.iocoder.mall.admin.application.vo.AdminVO;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
-import com.alibaba.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.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.*;

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

-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private ResourceService resourceService;
-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private AdminService adminService;
-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private RoleService roleService;

    // =========== 当前管理员相关的资源 API ===========
@@ -171,4 +171,4 @@ public class AdminController {
        return adminService.assignRole(AdminSecurityContextHolder.getContext().getAdminId(), id, roleIds);
    }

-}
+}
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
@@ -9,7 +9,7 @@ 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 com.alibaba.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.Reference;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Multimaps;
 import io.swagger.annotations.Api;
@@ -26,7 +26,7 @@ import java.util.List;
@Api("数据字典模块")
 public class DataDictController {

-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private DataDictService dataDictService;

    @GetMapping("/list")
@@ -107,4 +107,4 @@ public class DataDictController {
        return dataDictService.deleteDataDict(AdminSecurityContextHolder.getContext().getAdminId(), id);
    }

-}
+}
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
@@ -5,11 +5,11 @@ import cn.iocoder.mall.admin.api.OAuth2Service;
 import cn.iocoder.mall.admin.api.bo.OAuth2AccessTokenBO;
 import cn.iocoder.mall.admin.application.convert.PassportConvert;
 import cn.iocoder.mall.admin.application.vo.PassportLoginVO;
-import com.alibaba.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.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
@Api("Admin Passport 模块")
 public class PassportController {

-    @Reference
+    @Reference(validation = "true", lazy = true)
    private OAuth2Service oauth2Service;

    @PostMapping("/login")
@@ -39,4 +39,4 @@ public class PassportController {

    // TODO 功能 refresh_token

-}
+}
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
@@ -10,7 +10,7 @@ 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 com.alibaba.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.Reference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
@Api("资源模块")
 public class ResourceController {

-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private ResourceService resourceService;

    @SuppressWarnings("Duplicates")
@@ -106,4 +106,4 @@ public class ResourceController {
        return resourceService.deleteResource(AdminSecurityContextHolder.getContext().getAdminId(), id);
    }

-}
+}
--- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
+++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
@@ -16,7 +16,7 @@ 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 com.alibaba.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.Reference;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -29,9 +29,9 @@ import java.util.stream.Collectors;
@RequestMapping("admins/role")
 public class RoleController {

-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private RoleService roleService;
-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
    private ResourceService resourceService;

    @GetMapping("/page")
@@ -124,4 +124,4 @@ public class RoleController {
        return roleService.assignResource(AdminSecurityContextHolder.getContext().getAdminId(), id, resourceIds);
    }

-}
+}