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

system改造

Browse Source
This commit is contained in:
zhuyang
2021-10-13 17:07:09 +08:00
parent 341404eafa
commit db27985036
57 changed files with 855 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
management-web-app/src/main/java/cn/iocoder/mall/managementweb/ManagementWebApplication.java
View File

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"cn.iocoder.mall.productservice.rpc","cn.iocoder.mall.payservice.rpc"
,"cn.iocoder.mall.promotion.api.rpc"})
,"cn.iocoder.mall.promotion.api.rpc","cn.iocoder.mall.systemservice.rpc"})
public class ManagementWebApplication {
public static void main(String[] args) {

42
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java
View File

@@ -10,13 +10,13 @@ import cn.iocoder.mall.managementweb.controller.admin.dto.AdminUpdateStatusDTO;
import cn.iocoder.mall.managementweb.controller.admin.vo.AdminPageItemVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.AdminVO;
import cn.iocoder.mall.managementweb.convert.admin.AdminConvert;
import cn.iocoder.mall.systemservice.rpc.admin.AdminRpc;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentRpc;
import cn.iocoder.mall.systemservice.rpc.admin.AdminFeign;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentFeign;
import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO;
import cn.iocoder.mall.systemservice.rpc.permission.PermissionRpc;
import cn.iocoder.mall.systemservice.rpc.permission.RoleRpc;
import cn.iocoder.mall.systemservice.rpc.permission.PermissionFeign;
import cn.iocoder.mall.systemservice.rpc.permission.RoleFeign;
import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -27,18 +27,18 @@ import java.util.*;
@Validated
public class AdminManager {
@Reference(version = "${dubbo.consumer.AdminRpc.version}")
private AdminRpc adminRpc;
@Reference(version = "${dubbo.consumer.RoleRpc.version}")
private RoleRpc roleRpc;
@Reference(version = "${dubbo.consumer.DepartmentRpc.version}")
private DepartmentRpc departmentRpc;
@Reference(version = "${dubbo.consumer.PermissionRpc.version}")
private PermissionRpc permissionRpc;
@Autowired
private AdminFeign adminFeign;
@Autowired
private RoleFeign roleFeign;
@Autowired
private DepartmentFeign departmentFeign;
@Autowired
private PermissionFeign permissionFeign;
public PageResult<AdminPageItemVO> pageAdmin(AdminPageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO>> pageResult =
adminRpc.pageAdmin(AdminConvert.INSTANCE.convert(pageDTO));
adminFeign.pageAdmin(AdminConvert.INSTANCE.convert(pageDTO));
pageResult.checkError();
// 转换结果
PageResult<AdminPageItemVO> adminPageVO = new PageResult<>();
@@ -50,7 +50,7 @@ public class AdminManager {
Map<Integer, List<RoleVO>> adminRoleMap = this.listAdminRoles(CollectionUtils.convertList(pageResult.getData().getList(),
cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO::getId));
// 查询部门
CommonResult<List<DepartmentVO>> listDepartmentsResult = departmentRpc.listDepartments(
CommonResult<List<DepartmentVO>> listDepartmentsResult = departmentFeign.listDepartments(
CollectionUtils.convertSet(pageResult.getData().getList(),
cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO::getDepartmentId));
listDepartmentsResult.checkError();
@@ -72,12 +72,12 @@ public class AdminManager {
private Map<Integer, List<RoleVO>> listAdminRoles(List<Integer> adminIds) {
// 获得管理员拥有的角色
CommonResult<Map<Integer, Set<Integer>>> mapAdminRoleIdsResult = permissionRpc.mapAdminRoleIds(adminIds);
CommonResult<Map<Integer, Set<Integer>>> mapAdminRoleIdsResult = permissionFeign.mapAdminRoleIds(adminIds);
mapAdminRoleIdsResult.checkError();
// 获得角色列表
Set<Integer> roleIds = new HashSet<>();
mapAdminRoleIdsResult.getData().values().forEach(roleIds::addAll);
CommonResult<List<RoleVO>> listRolesResult = roleRpc.listRoles(roleIds);
CommonResult<List<RoleVO>> listRolesResult = roleFeign.listRoles(roleIds);
listRolesResult.checkError();
Map<Integer, RoleVO> roleVOMap = CollectionUtils.convertMap(listRolesResult.getData(), RoleVO::getId);
// 拼接结果
@@ -96,24 +96,24 @@ public class AdminManager {
}
public Integer createAdmin(AdminCreateDTO createDTO, Integer createAdminId, String createIp) {
CommonResult<Integer> createAdminResult = adminRpc.createAdmin(AdminConvert.INSTANCE.convert(createDTO)
CommonResult<Integer> createAdminResult = adminFeign.createAdmin(AdminConvert.INSTANCE.convert(createDTO)
.setCreateAdminId(createAdminId).setCreateIp(createIp));
createAdminResult.checkError();
return createAdminResult.getData();
}
public void updateAdmin(AdminUpdateInfoDTO updateInfoDTO) {
CommonResult<Boolean> updateAdminResult = adminRpc.updateAdmin(AdminConvert.INSTANCE.convert(updateInfoDTO));
CommonResult<Boolean> updateAdminResult = adminFeign.updateAdmin(AdminConvert.INSTANCE.convert(updateInfoDTO));
updateAdminResult.checkError();
}
public void updateAdminStatus(@Valid AdminUpdateStatusDTO updateStatusDTO) {
CommonResult<Boolean> updateAdminResult = adminRpc.updateAdmin(AdminConvert.INSTANCE.convert(updateStatusDTO));
CommonResult<Boolean> updateAdminResult = adminFeign.updateAdmin(AdminConvert.INSTANCE.convert(updateStatusDTO));
updateAdminResult.checkError();
}
public AdminVO getAdmin(Integer adminId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO> getAdminResult = adminRpc.getAdmin(adminId);
CommonResult<cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO> getAdminResult = adminFeign.getAdmin(adminId);
getAdminResult.checkError();
return AdminConvert.INSTANCE.convert(getAdminResult.getData());
}

21
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java
View File

@@ -7,9 +7,9 @@ import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentTreeNodeVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentVO;
import cn.iocoder.mall.managementweb.convert.admin.DepartmentConvert;
import cn.iocoder.mall.systemservice.enums.admin.DepartmentIdEnum;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentRpc;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentFeign;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -22,9 +22,8 @@ import java.util.stream.Collectors;
@Slf4j
public class DepartmentManager {
@Reference(version = "${dubbo.consumer.DepartmentRpc.version}")
private DepartmentRpc departmentRpc;
@Autowired
private DepartmentFeign departmentFeign;
/**
* 创建部门
*
@@ -32,7 +31,7 @@ public class DepartmentManager {
* @return 部门
*/
public Integer createDepartment(DepartmentCreateDTO createDTO) {
CommonResult<Integer> createDepartmentResult = departmentRpc.createDepartment(DepartmentConvert.INSTANCE.convert(createDTO));
CommonResult<Integer> createDepartmentResult = departmentFeign.createDepartment(DepartmentConvert.INSTANCE.convert(createDTO));
createDepartmentResult.checkError();
return createDepartmentResult.getData();
}
@@ -43,7 +42,7 @@ public class DepartmentManager {
* @param updateDTO 更新部门 DTO
*/
public void updateDepartment(DepartmentUpdateDTO updateDTO) {
CommonResult<Boolean> updateDepartmentResult = departmentRpc.updateDepartment(DepartmentConvert.INSTANCE.convert(updateDTO));
CommonResult<Boolean> updateDepartmentResult = departmentFeign.updateDepartment(DepartmentConvert.INSTANCE.convert(updateDTO));
updateDepartmentResult.checkError();
}
@@ -53,7 +52,7 @@ public class DepartmentManager {
* @param departmentId 部门编号
*/
public void deleteDepartment(Integer departmentId) {
CommonResult<Boolean> deleteDepartmentResult = departmentRpc.deleteDepartment(departmentId);
CommonResult<Boolean> deleteDepartmentResult = departmentFeign.deleteDepartment(departmentId);
deleteDepartmentResult.checkError();
}
@@ -64,7 +63,7 @@ public class DepartmentManager {
* @return 部门
*/
public DepartmentVO getDepartment(Integer departmentId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO> getDepartmentResult = departmentRpc.getDepartment(departmentId);
CommonResult<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO> getDepartmentResult = departmentFeign.getDepartment(departmentId);
getDepartmentResult.checkError();
return DepartmentConvert.INSTANCE.convert(getDepartmentResult.getData());
}
@@ -76,7 +75,7 @@ public class DepartmentManager {
* @return 部门列表
*/
public List<DepartmentVO> listDepartments(List<Integer> departmentIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentRpc.listDepartments(departmentIds);
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentFeign.listDepartments(departmentIds);
listDepartmentResult.checkError();
return DepartmentConvert.INSTANCE.convertList(listDepartmentResult.getData());
}
@@ -88,7 +87,7 @@ public class DepartmentManager {
*/
public List<DepartmentTreeNodeVO> treeDepartment() {
// 获得资源全列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentRpc.listDepartments();
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentFeign.listDepartments();
listDepartmentResult.checkError();
// 构建菜单树
return buildDepartmentTree(listDepartmentResult.getData());

23
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/datadict/DataDictManager.java
View File

@@ -6,8 +6,8 @@ import cn.iocoder.mall.managementweb.controller.datadict.dto.DataDictUpdateDTO;
import cn.iocoder.mall.managementweb.controller.datadict.vo.DataDictSimpleVO;
import cn.iocoder.mall.managementweb.controller.datadict.vo.DataDictVO;
import cn.iocoder.mall.managementweb.convert.datadict.DataDictConvert;
import cn.iocoder.mall.systemservice.rpc.datadict.DataDictRpc;
import org.apache.dubbo.config.annotation.Reference;
import cn.iocoder.mall.systemservice.rpc.datadict.DataDictFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Comparator;
@@ -23,9 +23,8 @@ public class DataDictManager {
.comparing(cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO::getEnumValue)
.thenComparingInt(cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO::getSort);
@Reference(version = "${dubbo.consumer.DataDictRpc.version}")
private DataDictRpc dataDictRpc;
@Autowired
private DataDictFeign dataDictFeign;
/**
* 创建数据字典
*
@@ -33,7 +32,7 @@ public class DataDictManager {
* @return 数据字典
*/
public Integer createDataDict(DataDictCreateDTO createDTO) {
CommonResult<Integer> createDataDictResult = dataDictRpc.createDataDict(DataDictConvert.INSTANCE.convert(createDTO));
CommonResult<Integer> createDataDictResult = dataDictFeign.createDataDict(DataDictConvert.INSTANCE.convert(createDTO));
createDataDictResult.checkError();
return createDataDictResult.getData();
}
@@ -44,7 +43,7 @@ public class DataDictManager {
* @param updateDTO 更新数据字典 DTO
*/
public void updateDataDict(DataDictUpdateDTO updateDTO) {
CommonResult<Boolean> updateDataDictResult = dataDictRpc.updateDataDict(DataDictConvert.INSTANCE.convert(updateDTO));
CommonResult<Boolean> updateDataDictResult = dataDictFeign.updateDataDict(DataDictConvert.INSTANCE.convert(updateDTO));
updateDataDictResult.checkError();
}
@@ -54,7 +53,7 @@ public class DataDictManager {
* @param dataDictId 数据字典编号
*/
public void deleteDataDict(Integer dataDictId) {
CommonResult<Boolean> deleteDataDictResult = dataDictRpc.deleteDataDict(dataDictId);
CommonResult<Boolean> deleteDataDictResult = dataDictFeign.deleteDataDict(dataDictId);
deleteDataDictResult.checkError();
}
@@ -65,7 +64,7 @@ public class DataDictManager {
* @return 数据字典
*/
public DataDictVO getDataDict(Integer dataDictId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO> getDataDictResult = dataDictRpc.getDataDict(dataDictId);
CommonResult<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO> getDataDictResult = dataDictFeign.getDataDict(dataDictId);
getDataDictResult.checkError();
return DataDictConvert.INSTANCE.convert(getDataDictResult.getData());
}
@@ -77,7 +76,7 @@ public class DataDictManager {
* @return 数据字典列表
*/
public List<DataDictVO> listDataDicts(List<Integer> dataDictIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictRpc.listDataDicts(dataDictIds);
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictFeign.listDataDicts(dataDictIds);
listDataDictResult.checkError();
return DataDictConvert.INSTANCE.convertList(listDataDictResult.getData());
}
@@ -88,7 +87,7 @@ public class DataDictManager {
* @return 数据字典列表
*/
public List<DataDictVO> listDataDicts() {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictRpc.listDataDicts();
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictFeign.listDataDicts();
listDataDictResult.checkError();
// 按照 enumValue 和 sort 排序
listDataDictResult.getData().sort(COMPARATOR_ENUM_VALUE_SORT);
@@ -103,7 +102,7 @@ public class DataDictManager {
* @return 数据字典列表
*/
public List<DataDictSimpleVO> listSimpleDataDicts() {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictRpc.listDataDicts();
CommonResult<List<cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO>> listDataDictResult = dataDictFeign.listDataDicts();
listDataDictResult.checkError();
// 按照 enumValue 和 sort 排序
listDataDictResult.getData().sort(COMPARATOR_ENUM_VALUE_SORT);

21
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/errorcode/ErrorCodeManager.java
View File

@@ -8,8 +8,8 @@ import cn.iocoder.mall.managementweb.controller.errorcode.dto.ErrorCodeUpdateDTO
import cn.iocoder.mall.managementweb.controller.errorcode.vo.ErrorCodeVO;
import cn.iocoder.mall.managementweb.convert.errorcode.ErrorCodeConvert;
import cn.iocoder.mall.systemservice.enums.errorcode.ErrorCodeTypeEnum;
import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeRpc;
import org.apache.dubbo.config.annotation.Reference;
import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -20,9 +20,8 @@ import java.util.List;
@Service
public class ErrorCodeManager {
@Reference(version = "${dubbo.consumer.ErrorCodeRpc.version}", validation = "false")
private ErrorCodeRpc errorCodeRpc;
@Autowired
private ErrorCodeFeign errorCodeFeign;
/**
* 创建错误码
*
@@ -30,7 +29,7 @@ public class ErrorCodeManager {
* @return 错误码
*/
public Integer createErrorCode(ErrorCodeCreateDTO createDTO) {
CommonResult<Integer> createErrorCodeResult = errorCodeRpc.createErrorCode(ErrorCodeConvert.INSTANCE.convert(createDTO)
CommonResult<Integer> createErrorCodeResult = errorCodeFeign.createErrorCode(ErrorCodeConvert.INSTANCE.convert(createDTO)
.setType(ErrorCodeTypeEnum.MANUAL_OPERATION.getType()));
createErrorCodeResult.checkError();
return createErrorCodeResult.getData();
@@ -42,7 +41,7 @@ public class ErrorCodeManager {
* @param updateDTO 更新错误码 DTO
*/
public void updateErrorCode(ErrorCodeUpdateDTO updateDTO) {
CommonResult<Boolean> updateErrorCodeResult = errorCodeRpc.updateErrorCode(ErrorCodeConvert.INSTANCE.convert(updateDTO)
CommonResult<Boolean> updateErrorCodeResult = errorCodeFeign.updateErrorCode(ErrorCodeConvert.INSTANCE.convert(updateDTO)
.setType(ErrorCodeTypeEnum.MANUAL_OPERATION.getType()));
updateErrorCodeResult.checkError();
}
@@ -53,7 +52,7 @@ public class ErrorCodeManager {
* @param errorCodeId 错误码编号
*/
public void deleteErrorCode(Integer errorCodeId) {
CommonResult<Boolean> deleteErrorCodeResult = errorCodeRpc.deleteErrorCode(errorCodeId);
CommonResult<Boolean> deleteErrorCodeResult = errorCodeFeign.deleteErrorCode(errorCodeId);
deleteErrorCodeResult.checkError();
}
@@ -64,7 +63,7 @@ public class ErrorCodeManager {
* @return 错误码
*/
public ErrorCodeVO getErrorCode(Integer errorCodeId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO> getErrorCodeResult = errorCodeRpc.getErrorCode(errorCodeId);
CommonResult<cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO> getErrorCodeResult = errorCodeFeign.getErrorCode(errorCodeId);
getErrorCodeResult.checkError();
return ErrorCodeConvert.INSTANCE.convert(getErrorCodeResult.getData());
}
@@ -76,7 +75,7 @@ public class ErrorCodeManager {
* @return 错误码列表
*/
public List<ErrorCodeVO> listErrorCodes(List<Integer> errorCodeIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO>> listErrorCodeResult = errorCodeRpc.listErrorCodes(errorCodeIds);
CommonResult<List<cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO>> listErrorCodeResult = errorCodeFeign.listErrorCodes(errorCodeIds);
listErrorCodeResult.checkError();
return ErrorCodeConvert.INSTANCE.convertList(listErrorCodeResult.getData());
}
@@ -89,7 +88,7 @@ public class ErrorCodeManager {
*/
public PageResult<ErrorCodeVO> pageErrorCode(ErrorCodePageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO>> pageErrorCodeResult
= errorCodeRpc.pageErrorCode(ErrorCodeConvert.INSTANCE.convert(pageDTO));
= errorCodeFeign.pageErrorCode(ErrorCodeConvert.INSTANCE.convert(pageDTO));
pageErrorCodeResult.checkError();
return ErrorCodeConvert.INSTANCE.convertPage(pageErrorCodeResult.getData());
}

44
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/passport/PassportManager.java
View File

@@ -12,16 +12,16 @@ import cn.iocoder.mall.managementweb.convert.passport.AdminPassportConvert;
import cn.iocoder.mall.managementweb.convert.permission.ResourceConvert;
import cn.iocoder.mall.managementweb.manager.permission.ResourceManager;
import cn.iocoder.mall.systemservice.enums.permission.ResourceTypeEnum;
import cn.iocoder.mall.systemservice.rpc.admin.AdminRpc;
import cn.iocoder.mall.systemservice.rpc.admin.AdminFeign;
import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO;
import cn.iocoder.mall.systemservice.rpc.oauth.OAuth2Rpc;
import cn.iocoder.mall.systemservice.rpc.oauth.OAuthFeign;
import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2AccessTokenRespDTO;
import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2CreateAccessTokenReqDTO;
import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RefreshAccessTokenReqDTO;
import cn.iocoder.mall.systemservice.rpc.permission.ResourceRpc;
import cn.iocoder.mall.systemservice.rpc.permission.RoleRpc;
import cn.iocoder.mall.systemservice.rpc.permission.ResourceFeign;
import cn.iocoder.mall.systemservice.rpc.permission.RoleFeign;
import cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
@@ -31,22 +31,22 @@ import java.util.Set;
@Service
public class PassportManager {
@DubboReference(version = "${dubbo.consumer.AdminRpc.version}")
private AdminRpc adminRpc;
@DubboReference(version = "${dubbo.consumer.OAuth2Rpc.version}")
private OAuth2Rpc oauth2Rpc;
@DubboReference(version = "${dubbo.consumer.RoleRpc.version}")
private RoleRpc roleRpc;
@DubboReference(version = "${dubbo.consumer.ResourceRpc.version}")
private ResourceRpc resourceRpc;
@Autowired
private AdminFeign adminFeign;
@Autowired
private OAuthFeign oAuthFeign;
@Autowired
private RoleFeign roleFeign;
@Autowired
private ResourceFeign resourceFeign;
public PassportAccessTokenVO login(PassportLoginDTO loginDTO, String ip) {
// 校验管理员密码
// CommonResult<AdminVO> verifyPasswordResult = adminRpc.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip));
CommonResult<AdminVO> verifyPasswordResult = adminRpc.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip));
// CommonResult<AdminVO> verifyPasswordResult = adminFeign.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip));
CommonResult<AdminVO> verifyPasswordResult = adminFeign.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip));
verifyPasswordResult.checkError();
// 创建访问令牌
CommonResult<OAuth2AccessTokenRespDTO> createAccessTokenResult = oauth2Rpc.createAccessToken(
CommonResult<OAuth2AccessTokenRespDTO> createAccessTokenResult = oAuthFeign.createAccessToken(
new OAuth2CreateAccessTokenReqDTO().setUserId(verifyPasswordResult.getData().getId())
.setUserType(UserTypeEnum.ADMIN.getValue()).setCreateIp(ip));
createAccessTokenResult.checkError();
@@ -55,13 +55,13 @@ public class PassportManager {
}
public PassportAdminVO getAdmin(Integer adminId) {
CommonResult<AdminVO> getAdminResult = adminRpc.getAdmin(adminId);
CommonResult<AdminVO> getAdminResult = adminFeign.getAdmin(adminId);
getAdminResult.checkError();
return AdminPassportConvert.INSTANCE.convert(getAdminResult.getData());
}
public PassportAccessTokenVO refreshToken(String refreshToken, String ip) {
CommonResult<OAuth2AccessTokenRespDTO> refreshAccessTokenResult = oauth2Rpc.refreshAccessToken(
CommonResult<OAuth2AccessTokenRespDTO> refreshAccessTokenResult = oAuthFeign.refreshAccessToken(
new OAuth2RefreshAccessTokenReqDTO().setRefreshToken(refreshToken).setCreateIp(ip));
refreshAccessTokenResult.checkError();
return AdminPassportConvert.INSTANCE.convert(refreshAccessTokenResult.getData());
@@ -75,13 +75,13 @@ public class PassportManager {
*/
public Set<String> listAdminPermission(Integer adminId) {
// 获得管理员拥有的角色编号列表
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleFeign.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
return Collections.emptySet();
}
// 获得角色拥有的资源列表
CommonResult<List<ResourceVO>> resourceVOResult = resourceRpc.listRoleResource(
CommonResult<List<ResourceVO>> resourceVOResult = resourceFeign.listRoleResource(
listAdminRoleIdsResult.getData(), null);
resourceVOResult.checkError();
return CollectionUtils.convertSet(resourceVOResult.getData(), cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO::getPermission);
@@ -95,13 +95,13 @@ public class PassportManager {
*/
public List<PassportAdminMenuTreeNodeVO> treeAdminMenu(Integer adminId) {
// 获得管理员拥有的角色编号列表
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleFeign.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
return Collections.emptyList();
}
// 获得角色拥有的资源（菜单）列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> resourceVOResult = resourceRpc.listRoleResource(
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> resourceVOResult = resourceFeign.listRoleResource(
listAdminRoleIdsResult.getData(), ResourceTypeEnum.MENU.getType());
resourceVOResult.checkError();
// 构建菜单树

16
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/PermissionManager.java
View File

@@ -4,8 +4,8 @@ import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.managementweb.controller.permission.dto.PermissionAssignAdminRoleDTO;
import cn.iocoder.mall.managementweb.controller.permission.dto.PermissionAssignRoleResourceDTO;
import cn.iocoder.mall.managementweb.convert.permission.PermissionConvert;
import cn.iocoder.mall.systemservice.rpc.permission.PermissionRpc;
import org.apache.dubbo.config.annotation.Reference;
import cn.iocoder.mall.systemservice.rpc.permission.PermissionFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Set;
@@ -16,9 +16,9 @@ import java.util.Set;
@Service
public class PermissionManager {
@Reference(version = "${dubbo.consumer.PermissionRpc.version}")
private PermissionRpc permissionRpc;
@Autowired
private PermissionFeign permissionFeign;
/**
* 获得角色拥有的资源编号列表
*
@@ -26,7 +26,7 @@ public class PermissionManager {
* @return 资源编号列表
*/
public Set<Integer> listRoleResources(Integer roleId) {
CommonResult<Set<Integer>> listRoleResourceIdsResult = permissionRpc.listRoleResourceIds(roleId);
CommonResult<Set<Integer>> listRoleResourceIdsResult = permissionFeign.listRoleResourceIds(roleId);
listRoleResourceIdsResult.checkError();
return listRoleResourceIdsResult.getData();
}
@@ -37,7 +37,7 @@ public class PermissionManager {
* @param assignRoleResourceDTO 赋予角色资源 DTO
*/
public void assignRoleResource(PermissionAssignRoleResourceDTO assignRoleResourceDTO) {
CommonResult<Boolean> assignRoleResourceResult = permissionRpc.assignRoleResource(
CommonResult<Boolean> assignRoleResourceResult = permissionFeign.assignRoleResource(
PermissionConvert.INSTANCE.convert(assignRoleResourceDTO));
assignRoleResourceResult.checkError();
}
@@ -48,7 +48,7 @@ public class PermissionManager {
* @param assignAdminRoleDTO 赋予用户角色 DTO
*/
public void assignAdminRole(PermissionAssignAdminRoleDTO assignAdminRoleDTO) {
CommonResult<Boolean> assignAdminRoleResult = permissionRpc.assignAdminRole(
CommonResult<Boolean> assignAdminRoleResult = permissionFeign.assignAdminRole(
PermissionConvert.INSTANCE.convert(assignAdminRoleDTO));
assignAdminRoleResult.checkError();
}
@@ -60,7 +60,7 @@ public class PermissionManager {
* @return 角色编号列表
*/
public Set<Integer> listAdminRoles(Integer adminId) {
CommonResult<Set<Integer>> listAdminRoleIdsResult = permissionRpc.listAdminRoleIds(adminId);
CommonResult<Set<Integer>> listAdminRoleIdsResult = permissionFeign.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
return listAdminRoleIdsResult.getData();
}

26
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java
View File

@@ -7,10 +7,10 @@ import cn.iocoder.mall.managementweb.controller.permission.vo.ResourceTreeNodeVO
import cn.iocoder.mall.managementweb.controller.permission.vo.ResourceVO;
import cn.iocoder.mall.managementweb.convert.permission.ResourceConvert;
import cn.iocoder.mall.systemservice.enums.permission.ResourceIdEnum;
import cn.iocoder.mall.systemservice.rpc.permission.ResourceRpc;
import cn.iocoder.mall.systemservice.rpc.permission.RoleRpc;
import cn.iocoder.mall.systemservice.rpc.permission.ResourceFeign;
import cn.iocoder.mall.systemservice.rpc.permission.RoleFeign;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -23,11 +23,11 @@ import java.util.stream.Collectors;
@Slf4j
public class ResourceManager {
@Reference(version = "${dubbo.consumer.ResourceRpc.version}")
private ResourceRpc resourceRpc;
@Reference(version = "${dubbo.consumer.RoleRpc.version}")
private RoleRpc roleRpc;
@Autowired
private ResourceFeign resourceFeign;
@Autowired
private RoleFeign roleFeign;
/**
* 创建资源
*
@@ -35,7 +35,7 @@ public class ResourceManager {
* @return 资源
*/
public Integer createResource(ResourceCreateDTO createDTO, Integer createAdminId) {
CommonResult<Integer> createResourceResult = resourceRpc.createResource(ResourceConvert.INSTANCE.convert(createDTO)
CommonResult<Integer> createResourceResult = resourceFeign.createResource(ResourceConvert.INSTANCE.convert(createDTO)
.setCreateAdminId(createAdminId));
createResourceResult.checkError();
return createResourceResult.getData();
@@ -47,7 +47,7 @@ public class ResourceManager {
* @param updateDTO 更新资源 DTO
*/
public void updateResource(ResourceUpdateDTO updateDTO) {
CommonResult<Boolean> updateResourceResult = resourceRpc.updateResource(ResourceConvert.INSTANCE.convert(updateDTO));
CommonResult<Boolean> updateResourceResult = resourceFeign.updateResource(ResourceConvert.INSTANCE.convert(updateDTO));
updateResourceResult.checkError();
}
@@ -57,7 +57,7 @@ public class ResourceManager {
* @param resourceId 资源编号
*/
public void deleteResource(Integer resourceId) {
CommonResult<Boolean> deleteResourceResult = resourceRpc.deleteResource(resourceId);
CommonResult<Boolean> deleteResourceResult = resourceFeign.deleteResource(resourceId);
deleteResourceResult.checkError();
}
@@ -68,7 +68,7 @@ public class ResourceManager {
* @return 资源
*/
public ResourceVO getResource(Integer resourceId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO> getResourceResult = resourceRpc.getResource(resourceId);
CommonResult<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO> getResourceResult = resourceFeign.getResource(resourceId);
getResourceResult.checkError();
return ResourceConvert.INSTANCE.convert(getResourceResult.getData());
}
@@ -80,7 +80,7 @@ public class ResourceManager {
* @return 资源列表
*/
public List<ResourceVO> listResources(List<Integer> resourceIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> listResourceResult = resourceRpc.listResource(resourceIds);
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> listResourceResult = resourceFeign.listResource(resourceIds);
return ResourceConvert.INSTANCE.convertList(listResourceResult.getData());
}
@@ -91,7 +91,7 @@ public class ResourceManager {
*/
public List<ResourceTreeNodeVO> treeResource() {
// 获得资源全列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> listResourceResult = resourceRpc.listResource();
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> listResourceResult = resourceFeign.listResource();
listResourceResult.checkError();
// 构建菜单树
return buildResourceTree(listResourceResult.getData());

22
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/RoleManager.java
View File

@@ -7,8 +7,8 @@ import cn.iocoder.mall.managementweb.controller.permission.dto.RolePageDTO;
import cn.iocoder.mall.managementweb.controller.permission.dto.RoleUpdateDTO;
import cn.iocoder.mall.managementweb.controller.permission.vo.RoleVO;
import cn.iocoder.mall.managementweb.convert.permission.RoleConvert;
import cn.iocoder.mall.systemservice.rpc.permission.RoleRpc;
import org.apache.dubbo.config.annotation.Reference;
import cn.iocoder.mall.systemservice.rpc.permission.RoleFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -19,9 +19,9 @@ import java.util.List;
@Service
public class RoleManager {
@Reference(version = "${dubbo.consumer.RoleRpc.version}")
private RoleRpc roleRpc;
@Autowired
private RoleFeign roleFeign;
/**
* 创建角色
*
@@ -29,7 +29,7 @@ public class RoleManager {
* @return 角色
*/
public Integer createRole(RoleCreateDTO createDTO, Integer createAdminId) {
CommonResult<Integer> createRoleResult = roleRpc.createRole(RoleConvert.INSTANCE.convert(createDTO).setCreateAdminId(createAdminId));
CommonResult<Integer> createRoleResult = roleFeign.createRole(RoleConvert.INSTANCE.convert(createDTO).setCreateAdminId(createAdminId));
createRoleResult.checkError();
return createRoleResult.getData();
}
@@ -40,7 +40,7 @@ public class RoleManager {
* @param updateDTO 更新角色 DTO
*/
public void updateRole(RoleUpdateDTO updateDTO) {
CommonResult<Boolean> updateRoleResult = roleRpc.updateRole(RoleConvert.INSTANCE.convert(updateDTO));
CommonResult<Boolean> updateRoleResult = roleFeign.updateRole(RoleConvert.INSTANCE.convert(updateDTO));
updateRoleResult.checkError();
}
@@ -50,7 +50,7 @@ public class RoleManager {
* @param roleId 角色编号
*/
public void deleteRole(Integer roleId) {
CommonResult<Boolean> deleteRoleResult = roleRpc.deleteRole(roleId);
CommonResult<Boolean> deleteRoleResult = roleFeign.deleteRole(roleId);
deleteRoleResult.checkError();
}
@@ -61,7 +61,7 @@ public class RoleManager {
* @return 角色
*/
public RoleVO getRole(Integer roleId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO> getRoleResult = roleRpc.getRole(roleId);
CommonResult<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO> getRoleResult = roleFeign.getRole(roleId);
getRoleResult.checkError();
return RoleConvert.INSTANCE.convert(getRoleResult.getData());
}
@@ -72,7 +72,7 @@ public class RoleManager {
* @return 角色列表
*/
public List<RoleVO> listAllRoles() {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO>> listRoleResult = roleRpc.listAllRoles();
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO>> listRoleResult = roleFeign.listAllRoles();
listRoleResult.checkError();
return RoleConvert.INSTANCE.convertList(listRoleResult.getData());
}
@@ -84,7 +84,7 @@ public class RoleManager {
* @return 角色列表
*/
public List<RoleVO> listRoles(List<Integer> roleIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO>> listRoleResult = roleRpc.listRoles(roleIds);
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO>> listRoleResult = roleFeign.listRoles(roleIds);
listRoleResult.checkError();
return RoleConvert.INSTANCE.convertList(listRoleResult.getData());
}
@@ -97,7 +97,7 @@ public class RoleManager {
*/
public PageResult<RoleVO> pageRole(RolePageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO>> pageRoleResult =
roleRpc.pageRole(RoleConvert.INSTANCE.convert(pageDTO));
roleFeign.pageRole(RoleConvert.INSTANCE.convert(pageDTO));
pageRoleResult.checkError();
return RoleConvert.INSTANCE.convertPage(pageRoleResult.getData());
}

11
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemAccessLogManager.java
View File

@@ -5,8 +5,8 @@ import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.managementweb.controller.systemlog.dto.SystemAccessLogPageDTO;
import cn.iocoder.mall.managementweb.controller.systemlog.vo.SystemAccessLogVO;
import cn.iocoder.mall.managementweb.convert.systemlog.SystemAccessLogConvert;
import cn.iocoder.mall.systemservice.rpc.systemlog.SystemAccessLogRpc;
import org.apache.dubbo.config.annotation.DubboReference;
import cn.iocoder.mall.systemservice.rpc.systemlog.SystemAccessLogFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -15,9 +15,8 @@ import org.springframework.stereotype.Service;
@Service
public class SystemAccessLogManager {
@DubboReference(version = "${dubbo.consumer.SystemAccessLogRpc.version}")
private SystemAccessLogRpc systemAccessLogRpc;
@Autowired
private SystemAccessLogFeign systemAccessLogFeign;
/**
* 获得系统访问日志分页
*
@@ -26,7 +25,7 @@ public class SystemAccessLogManager {
*/
public PageResult<SystemAccessLogVO> pageSystemAccessLog(SystemAccessLogPageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogVO>> pageSystemAccessLogResult =
systemAccessLogRpc.pageSystemAccessLog(SystemAccessLogConvert.INSTANCE.convert(pageDTO));
systemAccessLogFeign.pageSystemAccessLog(SystemAccessLogConvert.INSTANCE.convert(pageDTO));
pageSystemAccessLogResult.checkError();
return SystemAccessLogConvert.INSTANCE.convertPage(pageSystemAccessLogResult.getData());
}

25
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemExceptionLogManager.java
View File

@@ -7,22 +7,23 @@ import cn.iocoder.mall.managementweb.controller.systemlog.dto.SystemExceptionLog
import cn.iocoder.mall.managementweb.controller.systemlog.vo.SystemExceptionLogDetailVO;
import cn.iocoder.mall.managementweb.controller.systemlog.vo.SystemExceptionLogVO;
import cn.iocoder.mall.managementweb.convert.systemlog.SystemExceptionLogConvert;
import cn.iocoder.mall.systemservice.rpc.admin.AdminRpc;
import cn.iocoder.mall.systemservice.rpc.admin.AdminFeign;
import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO;
import cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogRpc;
import org.apache.dubbo.config.annotation.Reference;
import cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
;
/**
* 系统异常日志 Manager
*/
@Service
public class SystemExceptionLogManager {
@Reference(version = "${dubbo.consumer.SystemExceptionLogRpc.version}")
private SystemExceptionLogRpc systemExceptionLogRpc;
@Reference(version = "${dubbo.consumer.AdminRpc.version}")
private AdminRpc adminRpc;
@Autowired
private AdminFeign adminFeign;
@Autowired
private SystemExceptionLogFeign systemExceptionLogFeign;
/**
* 获得系统异常日志
@@ -33,12 +34,12 @@ public class SystemExceptionLogManager {
public SystemExceptionLogDetailVO getSystemExceptionLogDetail(Integer systemExceptionLogId) {
// 获得系统异常明细
CommonResult<cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemExceptionLogVO> getSystemExceptionLogResult
= systemExceptionLogRpc.getSystemExceptionLog(systemExceptionLogId);
= systemExceptionLogFeign.getSystemExceptionLog(systemExceptionLogId);
getSystemExceptionLogResult.checkError();
SystemExceptionLogDetailVO logDetailVO = SystemExceptionLogConvert.INSTANCE.convert(getSystemExceptionLogResult.getData());
// 拼接处理管理员信息
if (getSystemExceptionLogResult.getData().getProcessAdminId() != null) {
CommonResult<AdminVO> adminVOResult = adminRpc.getAdmin(getSystemExceptionLogResult.getData().getProcessAdminId());
CommonResult<AdminVO> adminVOResult = adminFeign.getAdmin(getSystemExceptionLogResult.getData().getProcessAdminId());
adminVOResult.checkError();
if (adminVOResult.getData() != null) {
SystemExceptionLogDetailVO.Admin admin = SystemExceptionLogConvert.INSTANCE.convert(adminVOResult.getData());
@@ -56,7 +57,7 @@ public class SystemExceptionLogManager {
*/
public PageResult<SystemExceptionLogVO> pageSystemExceptionLog(SystemExceptionLogPageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemExceptionLogVO>> pageSystemExceptionLogResult
= systemExceptionLogRpc.pageSystemExceptionLog(SystemExceptionLogConvert.INSTANCE.convert(pageDTO));
= systemExceptionLogFeign.pageSystemExceptionLog(SystemExceptionLogConvert.INSTANCE.convert(pageDTO));
pageSystemExceptionLogResult.checkError();
return SystemExceptionLogConvert.INSTANCE.convertPage(pageSystemExceptionLogResult.getData());
}
@@ -68,7 +69,7 @@ public class SystemExceptionLogManager {
* @param processDTO 处理系统异常日志 DTO
*/
public void processSystemExceptionLog(Integer processAdminId, SystemExceptionLogProcessDTO processDTO) {
CommonResult<Boolean> processSystemExceptionLogResult = systemExceptionLogRpc.processSystemExceptionLog(
CommonResult<Boolean> processSystemExceptionLogResult = systemExceptionLogFeign.processSystemExceptionLog(
SystemExceptionLogConvert.INSTANCE.convert(processDTO).setProcessAdminId(processAdminId));
processSystemExceptionLogResult.checkError();
}