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

MarsW1987 · Apr 30, 2019 · 903489b · 903489b
1 parent 038073d
commit 903489b
Show file tree

Hide file tree

Showing 80 changed files with 225 additions and 208 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ TODO 此处应有一个架构图的装逼 JPG 图。
 | [Redis](https://redis.io/) | key-value 数据库 | 暂未引入，等压测后，部分模块 |
 | [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 暂未引入，等压测后，部分模块 |
 | [Elasticsearch](https://www.elastic.co/cn/) | 分布式搜索引擎 | 6.7.1 |
-| [Dubbo](http://dubbo.apache.org/) | 分布式 RPC 服务框架 | 2.6.5 |
+| [Dubbo](http://dubbo.apache.org/) | 分布式 RPC 服务框架 | 2.7.1 |
 | [RocketMQ](http://dubbo.apache.org/) | 消息中间件 | 4.3.2 |
 | [SkyWalking](http://skywalking.apache.org/) | 分布式应用追踪系统 | 6.0.0 |
 | [Zookeeper](http://zookeeper.apache.org/) | 分布式系统协调 | 3.4.9 作为注册中心 |

diff --git a/admin/admin-application/pom.xml b/admin/admin-application/pom.xml
@@ -39,20 +39,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dubbo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

diff --git a/...-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java b/...-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 void addResourceHandlers(ResourceHandlerRegistry registry) {
         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;
     }
 
-}
+}
diff --git a/...on/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java b/...on/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
@@ -18,11 +18,11 @@
 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 @@
 @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 CommonResult<Boolean> assignRole(@RequestParam("id") Integer id,
         return adminService.assignRole(AdminSecurityContextHolder.getContext().getAdminId(), id, roleIds);
     }
 
-}
+}
diff --git a/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java b/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
@@ -9,7 +9,7 @@
 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 @@
 @Api("数据字典模块")
 public class DataDictController {
 
-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
     private DataDictService dataDictService;
 
     @GetMapping("/list")
@@ -107,4 +107,4 @@ public CommonResult<Boolean> delete(@RequestParam("id") Integer id) {
         return dataDictService.deleteDataDict(AdminSecurityContextHolder.getContext().getAdminId(), id);
     }
 
-}
+}
diff --git a/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java b/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
@@ -5,11 +5,11 @@
 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 @@
 @Api("Admin Passport 模块")
 public class PassportController {
 
-    @Reference
+    @Reference(validation = "true", lazy = true)
     private OAuth2Service oauth2Service;
 
     @PostMapping("/login")
@@ -39,4 +39,4 @@ public CommonResult<PassportLoginVO> login(@RequestParam("username") String user
 
     // TODO 功能 refresh_token
 
-}
+}
diff --git a/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java b/...src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
@@ -10,7 +10,7 @@
 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 @@
 @Api("资源模块")
 public class ResourceController {
 
-    @Reference(validation = "true")
+    @Reference(validation = "true", lazy = true)
     private ResourceService resourceService;
 
     @SuppressWarnings("Duplicates")
@@ -106,4 +106,4 @@ public CommonResult<Boolean> delete(@RequestParam("id") Integer id) {
         return resourceService.deleteResource(AdminSecurityContextHolder.getContext().getAdminId(), id);
     }
 
-}
+}
diff --git a/...ion/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java b/...ion/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
@@ -16,7 +16,7 @@
 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 @@
 @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 CommonResult<Boolean> assignResource(@RequestParam("id") Integer id,
         return roleService.assignResource(AdminSecurityContextHolder.getContext().getAdminId(), id, resourceIds);
     }
 
-}
+}
diff --git a/admin/admin-sdk/pom.xml b/admin/admin-sdk/pom.xml
@@ -17,19 +17,16 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <version>5.1.5.RELEASE</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <version>5.1.5.RELEASE</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
-            <version>2.6.5</version>
         </dependency>
 
         <dependency>

diff --git a/...in-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java b/...in-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java
@@ -3,9 +3,9 @@
 import cn.iocoder.common.framework.util.HttpUtil;
 import cn.iocoder.mall.admin.api.AdminAccessLogService;
 import cn.iocoder.mall.admin.api.dto.AdminAccessLogAddDTO;
-import com.alibaba.dubbo.config.annotation.Reference;
 import com.alibaba.fastjson.JSON;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.dubbo.config.annotation.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@ public class AdminAccessLogInterceptor extends HandlerInterceptorAdapter {
      */
     private static final ThreadLocal<Integer> ADMIN_ID = new ThreadLocal<>();
 
-    @Reference
+    @Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
     private AdminAccessLogService adminAccessLogService;
 
     @Override
@@ -44,6 +44,9 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+        if (adminAccessLogService == null) {
+            throw new IllegalStateException("AdminAccessLogService 服务未引入成功");
+        }
         AdminAccessLogAddDTO accessLog = new AdminAccessLogAddDTO();
         try {
             accessLog.setAdminId(ADMIN_ID.get());

diff --git a/...min-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java b/...min-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java
@@ -8,7 +8,7 @@
 import cn.iocoder.mall.admin.api.constant.AdminErrorCodeEnum;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContext;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -22,7 +22,7 @@
 @Component
 public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
 
-    @Reference
+    @Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
     private OAuth2Service oauth2Service;
 
     @Override
@@ -74,4 +74,4 @@ private void checkPermission(HttpServletRequest request, OAuth2AuthenticationBO
         }
     }
 
-}
+}
diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 管理员 BO
  */
 @Data
 @Accessors(chain = true)
-public class AdminBO {
+public class AdminBO implements Serializable {
 
     /**
      * 管理员编号

diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * 管理员分页 BO
  */
 @Data
 @Accessors(chain = true)
-public class AdminPageBO {
+public class AdminPageBO implements Serializable {
 
     /**
      * 管理员数组

diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 资源 BO
  */
 @Data
 @Accessors(chain = true)
-public class ResourceBO {
+public class ResourceBO implements Serializable {
 
     /**
      * 资源编号

diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 角色 BO
  */
 @Data
 @Accessors(chain = true)
-public class RoleBO {
+public class RoleBO implements Serializable {
 
     /**
      * 角色编号

diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * 角色分页 BO
  */
 @Data
 @Accessors(chain = true)
-public class RolePageBO {
+public class RolePageBO implements Serializable {
 
     /**
      * 角色数组

diff --git a/...n/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java b/...n/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java
@@ -5,14 +5,15 @@
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 管理员访问日志添加 DTO
  */
 @Data
 @Accessors(chain = true)
-public class AdminAccessLogAddDTO {
+public class AdminAccessLogAddDTO implements Serializable {
 
     /**
      * 管理员编号 - 空