yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1/head
YunaiV 2019-05-01 12:08:43 +08:00
parent 903489bcc7
commit 7f5038e562
14 changed files with 54 additions and 38 deletions
Show Stats 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

34
product/product-application/pom.xml
View File

@ -27,6 +27,11 @@
<artifactId>product-service-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--<dependency>-->
<!--<groupId>cn.iocoder.mall</groupId>-->
@ -44,34 +49,12 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</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>
@ -80,12 +63,7 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java
View File

@ -18,6 +18,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.List;
@ -28,6 +29,7 @@ import java.util.List;
public class AdminsProductAttrController {
@Reference(validation = "true")
@Autowired
private ProductAttrService productAttrService;
@GetMapping("/attr/page")

2
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.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;
@ -29,6 +30,7 @@ import java.util.stream.Collectors;
public class AdminsProductCategoryController {
@Reference(validation = "true")
@Autowired
private ProductCategoryService productCategoryService;
@GetMapping("/tree")

1
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java
View File

@ -31,6 +31,7 @@ import java.util.List;
public class AdminsProductSpuController {
@Reference(validation = "true")
@Autowired
private ProductSpuService productSpuService;
@Autowired

2
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java
View File

@ -10,6 +10,7 @@ import org.apache.dubbo.config.annotation.Reference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -23,6 +24,7 @@ import java.util.List;
public class UsersProductCategoryController {
@Reference(validation = "true")
@Autowired
private ProductCategoryService productCategoryService;
@GetMapping("/list")

2
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java
View File

@ -13,6 +13,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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
public class UsersProductSpuController {
@Reference(validation = "true")
@Autowired
private ProductSpuService productSpuService;
@GetMapping("/info")

12
product/product-service-impl/pom.xml
View File

@ -36,6 +36,18 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>