oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YunaiV
2019-05-01 12:08:43 +08:00
parent 903489bcc7
commit 7f5038e562
14 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java
View File

@@ -23,6 +23,7 @@ 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.*;
@@ -33,11 +34,14 @@ import java.util.stream.Collectors;
@Api("管理员模块")
public class AdminController {
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private ResourceService resourceService;
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private AdminService adminService;
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private RoleService roleService;
// =========== 当前管理员相关的资源 API ===========

4
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java
View File

@@ -16,6 +16,7 @@ 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.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -26,7 +27,8 @@ import java.util.List;
@Api("数据字典模块")
public class DataDictController {
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private DataDictService dataDictService;
@GetMapping("/list")

4
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java
View File

@@ -10,6 +10,7 @@ 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;
@@ -20,7 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
@Api("Admin Passport 模块")
public class PassportController {
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private OAuth2Service oauth2Service;
@PostMapping("/login")

4
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java
View File

@@ -15,6 +15,7 @@ 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.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -28,7 +29,8 @@ import java.util.stream.Collectors;
@Api("资源模块")
public class ResourceController {
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private ResourceService resourceService;
@SuppressWarnings("Duplicates")

7
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java
View File

@@ -20,6 +20,7 @@ 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.springframework.web.bind.annotation.*;
import java.util.*;
@@ -29,9 +30,11 @@ import java.util.stream.Collectors;
@RequestMapping("admins/role")
public class RoleController {
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private RoleService roleService;
@Reference(validation = "true", lazy = true)
@Reference(validation = "true")
@Autowired // TODO Dubbo 2.7.2 移除 bug
private ResourceService resourceService;
@GetMapping("/page")

4
admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java
View File

@@ -8,6 +8,7 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -32,7 +33,8 @@ public class AdminAccessLogInterceptor extends HandlerInterceptorAdapter {
*/
private static final ThreadLocal<Integer> ADMIN_ID = new ThreadLocal<>();
@Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
@Reference(lazy = true)
@Autowired(required = false) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
private AdminAccessLogService adminAccessLogService;
@Override

4
admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java
View File

@@ -9,6 +9,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 org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -22,7 +23,8 @@ import java.util.Set;
@Component
public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
@Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
@Reference(validation = "true")
@Autowired(required = false) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。
private OAuth2Service oauth2Service;
@Override