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-04-30 21:32:05 +08:00
parent 038073d9a8
commit 903489bcc7
80 changed files with 225 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java
View File

@@ -1,17 +1,18 @@
package cn.iocoder.mall.user.application.controller.admins;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.user.application.convert.UserConvert;
import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO;
import cn.iocoder.mall.user.api.dto.UserPageDTO;
import cn.iocoder.mall.user.api.dto.UserUpdateDTO;
import cn.iocoder.mall.user.api.UserService;
import cn.iocoder.mall.user.api.bo.UserPageBO;
import com.alibaba.dubbo.config.annotation.Reference;
import cn.iocoder.mall.user.api.dto.UserPageDTO;
import cn.iocoder.mall.user.api.dto.UserUpdateDTO;
import cn.iocoder.mall.user.application.convert.UserConvert;
import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class AdminsUserController {
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private UserService userService;
// 分页
@@ -66,4 +68,4 @@ public class AdminsUserController {
return userService.updateUserStatus(id, status);
}
}
}

12
user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java
View File

@@ -9,11 +9,12 @@ import cn.iocoder.mall.user.api.OAuth2Service;
import cn.iocoder.mall.user.api.UserService;
import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO;
import cn.iocoder.mall.user.application.vo.users.UsersMobileRegisterVO;
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;
import io.swagger.annotations.ApiOperation;
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;
@@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
@Api("Passport 模块")
public class PassportController {
@Reference
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private OAuth2Service oauth2Service;
@Reference
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private UserService userService;
@Reference
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private MobileCodeService mobileCodeService;
// TODO 功能：手机密码登陆

12
user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java
View File

@@ -1,16 +1,17 @@
package cn.iocoder.mall.user.application.controller.users;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.user.api.UserAddressService;
import cn.iocoder.mall.user.api.bo.UserAddressBO;
import cn.iocoder.mall.user.api.dto.UserAddressAddDTO;
import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO;
import cn.iocoder.mall.user.application.convert.UserAddressConvert;
import cn.iocoder.mall.user.application.po.UserAddressAddPO;
import cn.iocoder.mall.user.application.po.UserAddressUpdatePO;
import cn.iocoder.mall.user.api.dto.UserAddressAddDTO;
import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO;
import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
import cn.iocoder.mall.user.api.UserAddressService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -25,10 +26,11 @@ import java.util.List;
*/
@RestController
@RequestMapping("users/address")
@Api(description = "用户地址API")
@Api(value = "用户地址API")
public class UserAddressController {
@Autowired
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private UserAddressService userAddressService;
@PostMapping("add")

6
user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java
View File

@@ -7,9 +7,10 @@ import cn.iocoder.mall.user.api.dto.UserUpdateDTO;
import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
import cn.iocoder.mall.user.application.vo.users.UsersUserVO;
import cn.iocoder.mall.user.api.UserService;
import com.alibaba.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Reference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
public class UserController {
@Reference(validation = "true")
@Autowired // TODO dubbo 2.7.2 删除，用于解决 bug
private UserService userService;
@GetMapping("/info")
@@ -47,4 +49,4 @@ public class UserController {
return userService.updateUser(userUpdateDTO);
}
}
}