diff --git a/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminSecurityInterceptor.java b/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminSecurityInterceptor.java index 8997f95aa..2e18d74a1 100644 --- a/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminSecurityInterceptor.java +++ b/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminSecurityInterceptor.java @@ -2,20 +2,20 @@ package cn.iocoder.mall.security.admin.core.interceptor; import cn.iocoder.common.framework.enums.UserTypeEnum; import cn.iocoder.common.framework.exception.GlobalException; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.CollectionUtils; import cn.iocoder.common.framework.util.HttpUtil; -import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.security.admin.core.context.AdminSecurityContext; import cn.iocoder.mall.security.admin.core.context.AdminSecurityContextHolder; -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.permission.PermissionRpc; +import cn.iocoder.mall.systemservice.rpc.permission.PermissionFeign; import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionCheckDTO; import cn.iocoder.mall.web.core.util.CommonWebUtil; import cn.iocoder.security.annotations.RequiresNone; import cn.iocoder.security.annotations.RequiresPermissions; -import org.apache.dubbo.config.annotation.Reference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -28,11 +28,11 @@ import static cn.iocoder.mall.systemservice.enums.SystemErrorCodeConstants.OAUTH public class AdminSecurityInterceptor extends HandlerInterceptorAdapter { - @Reference(version = "${dubbo.consumer.OAuth2Rpc.version}") - private OAuth2Rpc oauth2Rpc; - @Reference(version = "${dubbo.consumer.PermissionRpc.version}") - private PermissionRpc permissionRpc; + @Autowired + private OAuthFeign oAuthFeign; + @Autowired + private PermissionFeign permissionFeign; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { // 获得访问令牌 @@ -48,7 +48,7 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter { String accessToken = HttpUtil.obtainAuthorization(request); Integer adminId = null; if (accessToken != null) { - CommonResult checkAccessTokenResult = oauth2Rpc.checkAccessToken(accessToken); + CommonResult checkAccessTokenResult = oAuthFeign.checkAccessToken(accessToken); checkAccessTokenResult.checkError(); // 校验用户类型正确 if (!UserTypeEnum.ADMIN.getValue().equals(checkAccessTokenResult.getData().getUserType())) { @@ -83,7 +83,7 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter { return; } // 权限验证 - permissionRpc.checkPermission(new PermissionCheckDTO().setAdminId(adminId).setPermissions(Arrays.asList(permissions))) + permissionFeign.checkPermission(new PermissionCheckDTO().setAdminId(adminId).setPermissions(Arrays.asList(permissions))) .checkError(); } diff --git a/common/mall-spring-boot-starter-security-user/src/main/java/cn/iocoder/mall/security/user/core/interceptor/UserSecurityInterceptor.java b/common/mall-spring-boot-starter-security-user/src/main/java/cn/iocoder/mall/security/user/core/interceptor/UserSecurityInterceptor.java index 6e9c40ab3..2de13636c 100644 --- a/common/mall-spring-boot-starter-security-user/src/main/java/cn/iocoder/mall/security/user/core/interceptor/UserSecurityInterceptor.java +++ b/common/mall-spring-boot-starter-security-user/src/main/java/cn/iocoder/mall/security/user/core/interceptor/UserSecurityInterceptor.java @@ -6,12 +6,12 @@ import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.security.user.core.context.UserSecurityContext; import cn.iocoder.mall.security.user.core.context.UserSecurityContextHolder; -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.web.core.util.CommonWebUtil; import cn.iocoder.security.annotations.RequiresAuthenticate; import cn.iocoder.security.annotations.RequiresPermissions; -import org.apache.dubbo.config.annotation.Reference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -23,8 +23,8 @@ import static cn.iocoder.mall.systemservice.enums.SystemErrorCodeConstants.OAUTH public class UserSecurityInterceptor extends HandlerInterceptorAdapter { - @Reference(version = "${dubbo.consumer.OAuth2Rpc.version}") - private OAuth2Rpc oauth2Rpc; + @Autowired + private OAuthFeign oAuthFeign; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { @@ -39,7 +39,7 @@ public class UserSecurityInterceptor extends HandlerInterceptorAdapter { String accessToken = HttpUtil.obtainAuthorization(request); Integer userId = null; if (accessToken != null) { - CommonResult checkAccessTokenResult = oauth2Rpc.checkAccessToken(accessToken); + CommonResult checkAccessTokenResult = oAuthFeign.checkAccessToken(accessToken); checkAccessTokenResult.checkError(); // 校验用户类型正确 if (!UserTypeEnum.USER.getValue().equals(checkAccessTokenResult.getData().getUserType())) { diff --git a/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeAutoGenerator.java b/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeAutoGenerator.java index 49adbef56..ae8cfc289 100644 --- a/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeAutoGenerator.java +++ b/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeAutoGenerator.java @@ -3,11 +3,11 @@ package cn.iocoder.mall.system.errorcode.core; import cn.iocoder.common.framework.exception.ErrorCode; import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeRpc; +import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeFeign; import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeAutoGenerateDTO; -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.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; @@ -29,9 +29,9 @@ public class ErrorCodeAutoGenerator { */ private String errorCodeConstantsClass; - @Reference(version = "${dubbo.consumer.ErrorCodeRpc.version}") - private ErrorCodeRpc errorCodeRpc; + @Autowired + private ErrorCodeFeign errorCodeFeign; public ErrorCodeAutoGenerator(String group) { this.group = group; } @@ -72,7 +72,7 @@ public class ErrorCodeAutoGenerator { throw new RuntimeException(e); } }); - CommonResult autoGenerateErrorCodesResult = errorCodeRpc.autoGenerateErrorCodes(autoGenerateDTOs); + CommonResult autoGenerateErrorCodesResult = errorCodeFeign.autoGenerateErrorCodes(autoGenerateDTOs); if (autoGenerateErrorCodesResult.isSuccess()) { logger.info("[execute][自动将 ({}) 类的错误码，成功写入到 system-service 服务]", errorCodeConstantsClass); } else { diff --git a/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeRemoteLoader.java b/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeRemoteLoader.java index 527d64491..ef05ab853 100644 --- a/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeRemoteLoader.java +++ b/common/mall-spring-boot-starter-system-error-code/src/main/java/cn/iocoder/mall/system/errorcode/core/ErrorCodeRemoteLoader.java @@ -1,14 +1,14 @@ package cn.iocoder.mall.system.errorcode.core; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.CollectionUtils; import cn.iocoder.common.framework.util.DateUtil; -import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeRpc; +import cn.iocoder.mall.systemservice.rpc.errorcode.ErrorCodeFeign; import cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO; -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.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Scheduled; @@ -27,9 +27,8 @@ public class ErrorCodeRemoteLoader { */ private final String group; - @Reference(version = "${dubbo.consumer.ErrorCodeRpc.version}") - private ErrorCodeRpc errorCodeRpc; - + @Autowired + private ErrorCodeFeign errorCodeFeign; private Date maxUpdateTime; public ErrorCodeRemoteLoader(String group) { @@ -38,8 +37,8 @@ public class ErrorCodeRemoteLoader { @EventListener(ApplicationReadyEvent.class) public void loadErrorCodes() { - // 从 ErrorCodeRpc 全量加载 ErrorCode 错误码 - CommonResult> listErrorCodesResult = errorCodeRpc.listErrorCodes(group, null); + // 从 errorCodeFeign 全量加载 ErrorCode 错误码 + CommonResult> listErrorCodesResult = errorCodeFeign.listErrorCodes(group, null); listErrorCodesResult.checkError(); logger.info("[loadErrorCodes][从 group({}) 全量加载到 {} 个 ErrorCode 错误码]", group, listErrorCodesResult.getData().size()); // 写入到 ServiceExceptionUtil 到 @@ -52,9 +51,9 @@ public class ErrorCodeRemoteLoader { @Scheduled(fixedDelay = REFRESH_ERROR_CODE_PERIOD, initialDelay = REFRESH_ERROR_CODE_PERIOD) public void refreshErrorCodes() { - // 从 ErrorCodeRpc 增量加载 ErrorCode 错误码 + // 从 errorCodeFeign 增量加载 ErrorCode 错误码 // TODO 优化点：假设删除错误码的配置，会存在问题； - CommonResult> listErrorCodesResult = errorCodeRpc.listErrorCodes(group, maxUpdateTime); + CommonResult> listErrorCodesResult = errorCodeFeign.listErrorCodes(group, maxUpdateTime); listErrorCodesResult.checkError(); if (CollectionUtils.isEmpty(listErrorCodesResult.getData())) { return; diff --git a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java index 1c46dd417..1c6e4c5e9 100644 --- a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java +++ b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java @@ -48,7 +48,7 @@ public class CommonWebAutoConfiguration implements WebMvcConfigurer { // ========== 拦截器相关 ========== @Bean - @ConditionalOnClass(name = {"cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogRpc", "org.apache.dubbo.config.annotation.Reference"}) + @ConditionalOnClass(name = {"cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogFeign", "org.apache.dubbo.config.annotation.Reference"}) @ConditionalOnMissingBean(AccessLogInterceptor.class) public AccessLogInterceptor accessLogInterceptor() { return new AccessLogInterceptor(); diff --git a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/handler/GlobalExceptionHandler.java b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/handler/GlobalExceptionHandler.java index 976d9c1f7..500f8137e 100644 --- a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/handler/GlobalExceptionHandler.java +++ b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/handler/GlobalExceptionHandler.java @@ -7,14 +7,14 @@ import cn.iocoder.common.framework.util.ExceptionUtil; import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.common.framework.util.MallUtils; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogRpc; +import cn.iocoder.mall.systemservice.rpc.systemlog.SystemExceptionLogFeign; import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogCreateDTO; import cn.iocoder.mall.web.core.util.CommonWebUtil; 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.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.util.Assert; @@ -34,7 +34,8 @@ import javax.validation.ConstraintViolationException; import javax.validation.ValidationException; import java.util.Date; -import static cn.iocoder.common.framework.exception.enums.GlobalErrorCodeConstants.*; +import static cn.iocoder.common.framework.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; +import static cn.iocoder.common.framework.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; /** * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 @@ -55,9 +56,9 @@ public class GlobalExceptionHandler { private String applicationName; // TODO 目前存在一个问题，如果未引入 system-rpc-api 依赖，GlobalExceptionHandler 会报类不存在。未来封装出 Repository 解决该问题 - @Reference(version = "${dubbo.consumer.SystemExceptionLogRpc.version}") - private SystemExceptionLogRpc systemExceptionLogRpc; + @Autowired + private SystemExceptionLogFeign systemExceptionLogFeign; /** * 处理 SpringMVC 请求参数缺失 * @@ -216,7 +217,7 @@ public class GlobalExceptionHandler { @Async public void createExceptionLog(SystemExceptionLogCreateDTO exceptionLog) { try { - systemExceptionLogRpc.createSystemExceptionLog(exceptionLog); + systemExceptionLogFeign.createSystemExceptionLog(exceptionLog); } catch (Throwable th) { logger.error("[addAccessLog][插入异常日志({}) 发生异常({})", JSON.toJSONString(exceptionLog), ExceptionUtils.getRootCauseMessage(th)); } diff --git a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/interceptor/AccessLogInterceptor.java b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/interceptor/AccessLogInterceptor.java index a8f54379c..d7b642822 100644 --- a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/interceptor/AccessLogInterceptor.java +++ b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/interceptor/AccessLogInterceptor.java @@ -3,14 +3,14 @@ package cn.iocoder.mall.web.core.interceptor; import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.common.framework.util.MallUtils; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.systemlog.SystemAccessLogRpc; +import cn.iocoder.mall.systemservice.rpc.systemlog.SystemAccessLogFeign; import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemAccessLogCreateDTO; import cn.iocoder.mall.web.core.util.CommonWebUtil; 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.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -26,9 +26,9 @@ public class AccessLogInterceptor extends HandlerInterceptorAdapter { private Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "${dubbo.consumer.SystemAccessLogRpc.version}") - private SystemAccessLogRpc systemAccessLogRpc; + @Autowired + private SystemAccessLogFeign systemAccessLogFeign; @Value("${spring.application.name}") private String applicationName; @@ -81,7 +81,7 @@ public class AccessLogInterceptor extends HandlerInterceptorAdapter { @Async // 异步入库 public void addAccessLog(SystemAccessLogCreateDTO accessLog) { try { - systemAccessLogRpc.createSystemAccessLog(accessLog); + systemAccessLogFeign.createSystemAccessLog(accessLog); } catch (Throwable th) { logger.error("[addAccessLog][插入访问日志({}) 发生异常({})", JSON.toJSONString(accessLog), ExceptionUtils.getRootCauseMessage(th)); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/ManagementWebApplication.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/ManagementWebApplication.java index c64424110..71f0e93b4 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/ManagementWebApplication.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/ManagementWebApplication.java @@ -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) { diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java index 363b3674b..d2f3f9833 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java @@ -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 pageAdmin(AdminPageDTO pageDTO) { CommonResult> pageResult = - adminRpc.pageAdmin(AdminConvert.INSTANCE.convert(pageDTO)); + adminFeign.pageAdmin(AdminConvert.INSTANCE.convert(pageDTO)); pageResult.checkError(); // 转换结果 PageResult adminPageVO = new PageResult<>(); @@ -50,7 +50,7 @@ public class AdminManager { Map> adminRoleMap = this.listAdminRoles(CollectionUtils.convertList(pageResult.getData().getList(), cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO::getId)); // 查询部门 - CommonResult> listDepartmentsResult = departmentRpc.listDepartments( + CommonResult> 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> listAdminRoles(List adminIds) { // 获得管理员拥有的角色 - CommonResult>> mapAdminRoleIdsResult = permissionRpc.mapAdminRoleIds(adminIds); + CommonResult>> mapAdminRoleIdsResult = permissionFeign.mapAdminRoleIds(adminIds); mapAdminRoleIdsResult.checkError(); // 获得角色列表 Set roleIds = new HashSet<>(); mapAdminRoleIdsResult.getData().values().forEach(roleIds::addAll); - CommonResult> listRolesResult = roleRpc.listRoles(roleIds); + CommonResult> listRolesResult = roleFeign.listRoles(roleIds); listRolesResult.checkError(); Map roleVOMap = CollectionUtils.convertMap(listRolesResult.getData(), RoleVO::getId); // 拼接结果 @@ -96,24 +96,24 @@ public class AdminManager { } public Integer createAdmin(AdminCreateDTO createDTO, Integer createAdminId, String createIp) { - CommonResult createAdminResult = adminRpc.createAdmin(AdminConvert.INSTANCE.convert(createDTO) + CommonResult createAdminResult = adminFeign.createAdmin(AdminConvert.INSTANCE.convert(createDTO) .setCreateAdminId(createAdminId).setCreateIp(createIp)); createAdminResult.checkError(); return createAdminResult.getData(); } public void updateAdmin(AdminUpdateInfoDTO updateInfoDTO) { - CommonResult updateAdminResult = adminRpc.updateAdmin(AdminConvert.INSTANCE.convert(updateInfoDTO)); + CommonResult updateAdminResult = adminFeign.updateAdmin(AdminConvert.INSTANCE.convert(updateInfoDTO)); updateAdminResult.checkError(); } public void updateAdminStatus(@Valid AdminUpdateStatusDTO updateStatusDTO) { - CommonResult updateAdminResult = adminRpc.updateAdmin(AdminConvert.INSTANCE.convert(updateStatusDTO)); + CommonResult updateAdminResult = adminFeign.updateAdmin(AdminConvert.INSTANCE.convert(updateStatusDTO)); updateAdminResult.checkError(); } public AdminVO getAdmin(Integer adminId) { - CommonResult getAdminResult = adminRpc.getAdmin(adminId); + CommonResult getAdminResult = adminFeign.getAdmin(adminId); getAdminResult.checkError(); return AdminConvert.INSTANCE.convert(getAdminResult.getData()); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java index 1374e2f0c..ee6c59ebe 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java @@ -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 createDepartmentResult = departmentRpc.createDepartment(DepartmentConvert.INSTANCE.convert(createDTO)); + CommonResult 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 updateDepartmentResult = departmentRpc.updateDepartment(DepartmentConvert.INSTANCE.convert(updateDTO)); + CommonResult updateDepartmentResult = departmentFeign.updateDepartment(DepartmentConvert.INSTANCE.convert(updateDTO)); updateDepartmentResult.checkError(); } @@ -53,7 +52,7 @@ public class DepartmentManager { * @param departmentId 部门编号 */ public void deleteDepartment(Integer departmentId) { - CommonResult deleteDepartmentResult = departmentRpc.deleteDepartment(departmentId); + CommonResult deleteDepartmentResult = departmentFeign.deleteDepartment(departmentId); deleteDepartmentResult.checkError(); } @@ -64,7 +63,7 @@ public class DepartmentManager { * @return 部门 */ public DepartmentVO getDepartment(Integer departmentId) { - CommonResult getDepartmentResult = departmentRpc.getDepartment(departmentId); + CommonResult getDepartmentResult = departmentFeign.getDepartment(departmentId); getDepartmentResult.checkError(); return DepartmentConvert.INSTANCE.convert(getDepartmentResult.getData()); } @@ -76,7 +75,7 @@ public class DepartmentManager { * @return 部门列表 */ public List listDepartments(List departmentIds) { - CommonResult> listDepartmentResult = departmentRpc.listDepartments(departmentIds); + CommonResult> listDepartmentResult = departmentFeign.listDepartments(departmentIds); listDepartmentResult.checkError(); return DepartmentConvert.INSTANCE.convertList(listDepartmentResult.getData()); } @@ -88,7 +87,7 @@ public class DepartmentManager { */ public List treeDepartment() { // 获得资源全列表 - CommonResult> listDepartmentResult = departmentRpc.listDepartments(); + CommonResult> listDepartmentResult = departmentFeign.listDepartments(); listDepartmentResult.checkError(); // 构建菜单树 return buildDepartmentTree(listDepartmentResult.getData()); diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/datadict/DataDictManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/datadict/DataDictManager.java index 627ea7de1..63f4c5e91 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/datadict/DataDictManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/datadict/DataDictManager.java @@ -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 createDataDictResult = dataDictRpc.createDataDict(DataDictConvert.INSTANCE.convert(createDTO)); + CommonResult 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 updateDataDictResult = dataDictRpc.updateDataDict(DataDictConvert.INSTANCE.convert(updateDTO)); + CommonResult updateDataDictResult = dataDictFeign.updateDataDict(DataDictConvert.INSTANCE.convert(updateDTO)); updateDataDictResult.checkError(); } @@ -54,7 +53,7 @@ public class DataDictManager { * @param dataDictId 数据字典编号 */ public void deleteDataDict(Integer dataDictId) { - CommonResult deleteDataDictResult = dataDictRpc.deleteDataDict(dataDictId); + CommonResult deleteDataDictResult = dataDictFeign.deleteDataDict(dataDictId); deleteDataDictResult.checkError(); } @@ -65,7 +64,7 @@ public class DataDictManager { * @return 数据字典 */ public DataDictVO getDataDict(Integer dataDictId) { - CommonResult getDataDictResult = dataDictRpc.getDataDict(dataDictId); + CommonResult getDataDictResult = dataDictFeign.getDataDict(dataDictId); getDataDictResult.checkError(); return DataDictConvert.INSTANCE.convert(getDataDictResult.getData()); } @@ -77,7 +76,7 @@ public class DataDictManager { * @return 数据字典列表 */ public List listDataDicts(List dataDictIds) { - CommonResult> listDataDictResult = dataDictRpc.listDataDicts(dataDictIds); + CommonResult> listDataDictResult = dataDictFeign.listDataDicts(dataDictIds); listDataDictResult.checkError(); return DataDictConvert.INSTANCE.convertList(listDataDictResult.getData()); } @@ -88,7 +87,7 @@ public class DataDictManager { * @return 数据字典列表 */ public List listDataDicts() { - CommonResult> listDataDictResult = dataDictRpc.listDataDicts(); + CommonResult> listDataDictResult = dataDictFeign.listDataDicts(); listDataDictResult.checkError(); // 按照 enumValue 和 sort 排序 listDataDictResult.getData().sort(COMPARATOR_ENUM_VALUE_SORT); @@ -103,7 +102,7 @@ public class DataDictManager { * @return 数据字典列表 */ public List listSimpleDataDicts() { - CommonResult> listDataDictResult = dataDictRpc.listDataDicts(); + CommonResult> listDataDictResult = dataDictFeign.listDataDicts(); listDataDictResult.checkError(); // 按照 enumValue 和 sort 排序 listDataDictResult.getData().sort(COMPARATOR_ENUM_VALUE_SORT); diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/errorcode/ErrorCodeManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/errorcode/ErrorCodeManager.java index da8059d1d..a655736c7 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/errorcode/ErrorCodeManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/errorcode/ErrorCodeManager.java @@ -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 createErrorCodeResult = errorCodeRpc.createErrorCode(ErrorCodeConvert.INSTANCE.convert(createDTO) + CommonResult 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 updateErrorCodeResult = errorCodeRpc.updateErrorCode(ErrorCodeConvert.INSTANCE.convert(updateDTO) + CommonResult 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 deleteErrorCodeResult = errorCodeRpc.deleteErrorCode(errorCodeId); + CommonResult deleteErrorCodeResult = errorCodeFeign.deleteErrorCode(errorCodeId); deleteErrorCodeResult.checkError(); } @@ -64,7 +63,7 @@ public class ErrorCodeManager { * @return 错误码 */ public ErrorCodeVO getErrorCode(Integer errorCodeId) { - CommonResult getErrorCodeResult = errorCodeRpc.getErrorCode(errorCodeId); + CommonResult getErrorCodeResult = errorCodeFeign.getErrorCode(errorCodeId); getErrorCodeResult.checkError(); return ErrorCodeConvert.INSTANCE.convert(getErrorCodeResult.getData()); } @@ -76,7 +75,7 @@ public class ErrorCodeManager { * @return 错误码列表 */ public List listErrorCodes(List errorCodeIds) { - CommonResult> listErrorCodeResult = errorCodeRpc.listErrorCodes(errorCodeIds); + CommonResult> listErrorCodeResult = errorCodeFeign.listErrorCodes(errorCodeIds); listErrorCodeResult.checkError(); return ErrorCodeConvert.INSTANCE.convertList(listErrorCodeResult.getData()); } @@ -89,7 +88,7 @@ public class ErrorCodeManager { */ public PageResult pageErrorCode(ErrorCodePageDTO pageDTO) { CommonResult> pageErrorCodeResult - = errorCodeRpc.pageErrorCode(ErrorCodeConvert.INSTANCE.convert(pageDTO)); + = errorCodeFeign.pageErrorCode(ErrorCodeConvert.INSTANCE.convert(pageDTO)); pageErrorCodeResult.checkError(); return ErrorCodeConvert.INSTANCE.convertPage(pageErrorCodeResult.getData()); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/passport/PassportManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/passport/PassportManager.java index 6535b0114..6752c91fa 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/passport/PassportManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/passport/PassportManager.java @@ -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 verifyPasswordResult = adminRpc.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip)); - CommonResult verifyPasswordResult = adminRpc.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip)); +// CommonResult verifyPasswordResult = adminFeign.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip)); + CommonResult verifyPasswordResult = adminFeign.verifyPassword(AdminPassportConvert.INSTANCE.convert(loginDTO).setIp(ip)); verifyPasswordResult.checkError(); // 创建访问令牌 - CommonResult createAccessTokenResult = oauth2Rpc.createAccessToken( + CommonResult 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 getAdminResult = adminRpc.getAdmin(adminId); + CommonResult getAdminResult = adminFeign.getAdmin(adminId); getAdminResult.checkError(); return AdminPassportConvert.INSTANCE.convert(getAdminResult.getData()); } public PassportAccessTokenVO refreshToken(String refreshToken, String ip) { - CommonResult refreshAccessTokenResult = oauth2Rpc.refreshAccessToken( + CommonResult 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 listAdminPermission(Integer adminId) { // 获得管理员拥有的角色编号列表 - CommonResult> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId); + CommonResult> listAdminRoleIdsResult = roleFeign.listAdminRoleIds(adminId); listAdminRoleIdsResult.checkError(); if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) { return Collections.emptySet(); } // 获得角色拥有的资源列表 - CommonResult> resourceVOResult = resourceRpc.listRoleResource( + CommonResult> 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 treeAdminMenu(Integer adminId) { // 获得管理员拥有的角色编号列表 - CommonResult> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId); + CommonResult> listAdminRoleIdsResult = roleFeign.listAdminRoleIds(adminId); listAdminRoleIdsResult.checkError(); if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) { return Collections.emptyList(); } // 获得角色拥有的资源（菜单）列表 - CommonResult> resourceVOResult = resourceRpc.listRoleResource( + CommonResult> resourceVOResult = resourceFeign.listRoleResource( listAdminRoleIdsResult.getData(), ResourceTypeEnum.MENU.getType()); resourceVOResult.checkError(); // 构建菜单树 diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/PermissionManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/PermissionManager.java index d6850b4a6..64c953656 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/PermissionManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/PermissionManager.java @@ -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 listRoleResources(Integer roleId) { - CommonResult> listRoleResourceIdsResult = permissionRpc.listRoleResourceIds(roleId); + CommonResult> 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 assignRoleResourceResult = permissionRpc.assignRoleResource( + CommonResult 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 assignAdminRoleResult = permissionRpc.assignAdminRole( + CommonResult assignAdminRoleResult = permissionFeign.assignAdminRole( PermissionConvert.INSTANCE.convert(assignAdminRoleDTO)); assignAdminRoleResult.checkError(); } @@ -60,7 +60,7 @@ public class PermissionManager { * @return 角色编号列表 */ public Set listAdminRoles(Integer adminId) { - CommonResult> listAdminRoleIdsResult = permissionRpc.listAdminRoleIds(adminId); + CommonResult> listAdminRoleIdsResult = permissionFeign.listAdminRoleIds(adminId); listAdminRoleIdsResult.checkError(); return listAdminRoleIdsResult.getData(); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java index 8243951de..e4afae5c1 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java @@ -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 createResourceResult = resourceRpc.createResource(ResourceConvert.INSTANCE.convert(createDTO) + CommonResult 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 updateResourceResult = resourceRpc.updateResource(ResourceConvert.INSTANCE.convert(updateDTO)); + CommonResult updateResourceResult = resourceFeign.updateResource(ResourceConvert.INSTANCE.convert(updateDTO)); updateResourceResult.checkError(); } @@ -57,7 +57,7 @@ public class ResourceManager { * @param resourceId 资源编号 */ public void deleteResource(Integer resourceId) { - CommonResult deleteResourceResult = resourceRpc.deleteResource(resourceId); + CommonResult deleteResourceResult = resourceFeign.deleteResource(resourceId); deleteResourceResult.checkError(); } @@ -68,7 +68,7 @@ public class ResourceManager { * @return 资源 */ public ResourceVO getResource(Integer resourceId) { - CommonResult getResourceResult = resourceRpc.getResource(resourceId); + CommonResult getResourceResult = resourceFeign.getResource(resourceId); getResourceResult.checkError(); return ResourceConvert.INSTANCE.convert(getResourceResult.getData()); } @@ -80,7 +80,7 @@ public class ResourceManager { * @return 资源列表 */ public List listResources(List resourceIds) { - CommonResult> listResourceResult = resourceRpc.listResource(resourceIds); + CommonResult> listResourceResult = resourceFeign.listResource(resourceIds); return ResourceConvert.INSTANCE.convertList(listResourceResult.getData()); } @@ -91,7 +91,7 @@ public class ResourceManager { */ public List treeResource() { // 获得资源全列表 - CommonResult> listResourceResult = resourceRpc.listResource(); + CommonResult> listResourceResult = resourceFeign.listResource(); listResourceResult.checkError(); // 构建菜单树 return buildResourceTree(listResourceResult.getData()); diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/RoleManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/RoleManager.java index 1abe627f0..0725d44aa 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/RoleManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/RoleManager.java @@ -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 createRoleResult = roleRpc.createRole(RoleConvert.INSTANCE.convert(createDTO).setCreateAdminId(createAdminId)); + CommonResult 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 updateRoleResult = roleRpc.updateRole(RoleConvert.INSTANCE.convert(updateDTO)); + CommonResult updateRoleResult = roleFeign.updateRole(RoleConvert.INSTANCE.convert(updateDTO)); updateRoleResult.checkError(); } @@ -50,7 +50,7 @@ public class RoleManager { * @param roleId 角色编号 */ public void deleteRole(Integer roleId) { - CommonResult deleteRoleResult = roleRpc.deleteRole(roleId); + CommonResult deleteRoleResult = roleFeign.deleteRole(roleId); deleteRoleResult.checkError(); } @@ -61,7 +61,7 @@ public class RoleManager { * @return 角色 */ public RoleVO getRole(Integer roleId) { - CommonResult getRoleResult = roleRpc.getRole(roleId); + CommonResult getRoleResult = roleFeign.getRole(roleId); getRoleResult.checkError(); return RoleConvert.INSTANCE.convert(getRoleResult.getData()); } @@ -72,7 +72,7 @@ public class RoleManager { * @return 角色列表 */ public List listAllRoles() { - CommonResult> listRoleResult = roleRpc.listAllRoles(); + CommonResult> listRoleResult = roleFeign.listAllRoles(); listRoleResult.checkError(); return RoleConvert.INSTANCE.convertList(listRoleResult.getData()); } @@ -84,7 +84,7 @@ public class RoleManager { * @return 角色列表 */ public List listRoles(List roleIds) { - CommonResult> listRoleResult = roleRpc.listRoles(roleIds); + CommonResult> listRoleResult = roleFeign.listRoles(roleIds); listRoleResult.checkError(); return RoleConvert.INSTANCE.convertList(listRoleResult.getData()); } @@ -97,7 +97,7 @@ public class RoleManager { */ public PageResult pageRole(RolePageDTO pageDTO) { CommonResult> pageRoleResult = - roleRpc.pageRole(RoleConvert.INSTANCE.convert(pageDTO)); + roleFeign.pageRole(RoleConvert.INSTANCE.convert(pageDTO)); pageRoleResult.checkError(); return RoleConvert.INSTANCE.convertPage(pageRoleResult.getData()); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemAccessLogManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemAccessLogManager.java index 6e4d21e64..544bce61e 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemAccessLogManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemAccessLogManager.java @@ -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 pageSystemAccessLog(SystemAccessLogPageDTO pageDTO) { CommonResult> pageSystemAccessLogResult = - systemAccessLogRpc.pageSystemAccessLog(SystemAccessLogConvert.INSTANCE.convert(pageDTO)); + systemAccessLogFeign.pageSystemAccessLog(SystemAccessLogConvert.INSTANCE.convert(pageDTO)); pageSystemAccessLogResult.checkError(); return SystemAccessLogConvert.INSTANCE.convertPage(pageSystemAccessLogResult.getData()); } diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemExceptionLogManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemExceptionLogManager.java index 992f1398f..cc5512313 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemExceptionLogManager.java +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/systemlog/SystemExceptionLogManager.java @@ -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 getSystemExceptionLogResult - = systemExceptionLogRpc.getSystemExceptionLog(systemExceptionLogId); + = systemExceptionLogFeign.getSystemExceptionLog(systemExceptionLogId); getSystemExceptionLogResult.checkError(); SystemExceptionLogDetailVO logDetailVO = SystemExceptionLogConvert.INSTANCE.convert(getSystemExceptionLogResult.getData()); // 拼接处理管理员信息 if (getSystemExceptionLogResult.getData().getProcessAdminId() != null) { - CommonResult adminVOResult = adminRpc.getAdmin(getSystemExceptionLogResult.getData().getProcessAdminId()); + CommonResult 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 pageSystemExceptionLog(SystemExceptionLogPageDTO pageDTO) { CommonResult> 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 processSystemExceptionLogResult = systemExceptionLogRpc.processSystemExceptionLog( + CommonResult processSystemExceptionLogResult = systemExceptionLogFeign.processSystemExceptionLog( SystemExceptionLogConvert.INSTANCE.convert(processDTO).setProcessAdminId(processAdminId)); processSystemExceptionLogResult.checkError(); } diff --git a/pay-service-project/pay-service-app/src/main/java/controller/PayTransactionController.java b/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PayTransactionController.java similarity index 98% rename from pay-service-project/pay-service-app/src/main/java/controller/PayTransactionController.java rename to pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PayTransactionController.java index cdba02531..f3e1050c1 100644 --- a/pay-service-project/pay-service-app/src/main/java/controller/PayTransactionController.java +++ b/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PayTransactionController.java @@ -1,4 +1,4 @@ -package controller; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/ShopWebApplication.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/ShopWebApplication.java index a6b488a0b..a8cb222ac 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/ShopWebApplication.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/ShopWebApplication.java @@ -8,7 +8,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients(basePackages = {"cn.iocoder.mall.productservice.rpc","cn.iocoder.mall.searchservice.rpc", - "cn.iocoder.mall.tradeservice.rpc","cn.iocoder.mall.payservice.rpc","cn.iocoder.mall.promotion.api.rpc"}) + "cn.iocoder.mall.tradeservice.rpc","cn.iocoder.mall.payservice.rpc","cn.iocoder.mall.promotion.api.rpc", +"cn.iocoder.mall.systemservice.rpc"}) public class ShopWebApplication { public static void main(String[] args) { diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/user/PassportManager.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/user/PassportManager.java index 3e261067b..0ca4a5441 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/user/PassportManager.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/user/PassportManager.java @@ -6,7 +6,7 @@ import cn.iocoder.mall.shopweb.controller.user.vo.passport.PassportAccessTokenRe import cn.iocoder.mall.shopweb.controller.user.vo.passport.PassportLoginBySmsReqVO; import cn.iocoder.mall.shopweb.controller.user.vo.passport.PassportSendSmsRespVO; import cn.iocoder.mall.shopweb.convert.user.PassportConvert; -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; @@ -15,6 +15,7 @@ import cn.iocoder.mall.userservice.rpc.sms.UserSmsCodeRpc; import cn.iocoder.mall.userservice.rpc.user.UserRpc; import cn.iocoder.mall.userservice.rpc.user.dto.UserRespDTO; import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service @@ -24,8 +25,9 @@ public class PassportManager { private UserSmsCodeRpc userSmsCodeRpc; @DubboReference(version = "${dubbo.consumer.UserRpc.version}", validation = "false") private UserRpc userRpc; - @DubboReference(version = "${dubbo.consumer.OAuth2Rpc.version}", validation = "false") - private OAuth2Rpc oauth2Rpc; + + @Autowired + private OAuthFeign oAuthFeign; public PassportAccessTokenRespVO loginBySms(PassportLoginBySmsReqVO loginBySmsDTO, String ip) { // 校验验证码 @@ -37,7 +39,7 @@ public class PassportManager { PassportConvert.INSTANCE.convert02(loginBySmsDTO).setIp(ip)); createUserResult.checkError(); // 创建访问令牌 - CommonResult createAccessTokenResult = oauth2Rpc.createAccessToken( + CommonResult createAccessTokenResult = oAuthFeign.createAccessToken( new OAuth2CreateAccessTokenReqDTO().setUserId(createUserResult.getData().getId()) .setUserType(UserTypeEnum.USER.getValue()).setCreateIp(ip)); createAccessTokenResult.checkError(); @@ -52,7 +54,7 @@ public class PassportManager { } public PassportAccessTokenRespVO refreshToken(String refreshToken, String ip) { - CommonResult refreshAccessTokenResult = oauth2Rpc.refreshAccessToken( + CommonResult refreshAccessTokenResult = oAuthFeign.refreshAccessToken( new OAuth2RefreshAccessTokenReqDTO().setRefreshToken(refreshToken).setCreateIp(ip)); refreshAccessTokenResult.checkError(); return PassportConvert.INSTANCE.convert(refreshAccessTokenResult.getData()); diff --git a/system-service-project/system-service-api/pom.xml b/system-service-project/system-service-api/pom.xml index 7b8572d9e..31d1aa6a3 100644 --- a/system-service-project/system-service-api/pom.xml +++ b/system-service-project/system-service-api/pom.xml @@ -31,6 +31,10 @@ org.projectlombok lombok + + org.springframework.cloud + spring-cloud-starter-openfeign + diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminFeign.java new file mode 100644 index 000000000..7d94c0e6c --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminFeign.java @@ -0,0 +1,40 @@ +package cn.iocoder.mall.systemservice.rpc.admin; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminCreateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminPageDTO; +import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminVerifyPasswordDTO; +import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@FeignClient("system-service") +public interface AdminFeign { + @PostMapping("/system/admin/verifyPassword") + public CommonResult verifyPassword(@RequestBody AdminVerifyPasswordDTO verifyPasswordDTO) ; + + @PostMapping("/system/admin/createAdmin") + public CommonResult createAdmin(@RequestBody AdminCreateDTO createDTO) ; + + @PostMapping("/system/admin/updateAdmin") + public CommonResult updateAdmin(@RequestBody AdminUpdateDTO updateDTO) ; + + @PostMapping("/system/admin/pageAdmin") + public CommonResult> pageAdmin(@RequestBody AdminPageDTO pageDTO); + + @GetMapping("/system/admin/getAdmin") + public CommonResult getAdmin(@RequestParam("adminId") Integer adminId) ; + +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpc.java deleted file mode 100644 index a50106da6..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpc.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.admin; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminCreateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminPageDTO; -import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminVerifyPasswordDTO; -import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO; - -/** - * 管理员 RPC 接口 - */ -public interface AdminRpc { - - CommonResult verifyPassword(AdminVerifyPasswordDTO verifyPasswordDTO); - - CommonResult createAdmin(AdminCreateDTO createDTO); - - CommonResult updateAdmin(AdminUpdateDTO updateDTO); - - CommonResult> pageAdmin(AdminPageDTO pageDTO); - - CommonResult getAdmin(Integer adminId); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentFeign.java new file mode 100644 index 000000000..a300d05d2 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentFeign.java @@ -0,0 +1,42 @@ +package cn.iocoder.mall.systemservice.rpc.admin; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentCreateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Collection; +import java.util.List; + +import static cn.iocoder.common.framework.vo.CommonResult.success; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface DepartmentFeign { + @PostMapping("/system/department/createDepartment") + public CommonResult createDepartment(@RequestBody DepartmentCreateDTO createDTO) ; + + @PostMapping("/system/department/updateDepartment") + public CommonResult updateDepartment(@RequestBody DepartmentUpdateDTO updateDTO); + + @GetMapping("/system/department/deleteDepartment") + public CommonResult deleteDepartment(@RequestParam("departmentId")Integer departmentId); + + @GetMapping("/system/department/getDepartment") + public CommonResult getDepartment(@RequestParam("departmentId") Integer departmentId) ; + + @GetMapping("/system/department/listDepartments") + public CommonResult> listDepartments(@RequestParam("departmentIds")Collection departmentIds) ; + + @GetMapping("/system/department/listAllDepartments") + public CommonResult> listDepartments(); + + +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpc.java deleted file mode 100644 index 36ea7bf82..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpc.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.admin; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentCreateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO; - -import java.util.Collection; -import java.util.List; - -/** -* 部门 Rpc 接口 -*/ -public interface DepartmentRpc { - - /** - * 创建部门 - * - * @param createDTO 创建部门 DTO - * @return 部门编号 - */ - CommonResult createDepartment(DepartmentCreateDTO createDTO); - - /** - * 更新部门 - * - * @param updateDTO 更新部门 DTO - */ - CommonResult updateDepartment(DepartmentUpdateDTO updateDTO); - - /** - * 删除部门 - * - * @param departmentId 部门编号 - */ - CommonResult deleteDepartment(Integer departmentId); - - /** - * 获得部门 - * - * @param departmentId 部门编号 - * @return 部门 - */ - CommonResult getDepartment(Integer departmentId); - - /** - * 获得部门列表 - * - * @param departmentIds 部门编号列表 - * @return 部门列表 - */ - CommonResult> listDepartments(Collection departmentIds); - - /** - * 获得部门全列表 - * - * @return 资源列表 - */ - CommonResult> listDepartments(); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictFeign.java new file mode 100644 index 000000000..d4f78ad97 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictFeign.java @@ -0,0 +1,45 @@ +package cn.iocoder.mall.systemservice.rpc.datadict; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentCreateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO; +import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictCreateDTO; +import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Collection; +import java.util.List; + +import static cn.iocoder.common.framework.vo.CommonResult.success; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface DataDictFeign { + @PostMapping("/system/datadict/createDataDict") + public CommonResult createDataDict(@RequestBody DataDictCreateDTO createDTO) ; + + @PostMapping("/system/datadict/updateDataDict") + public CommonResult updateDataDict(@RequestBody DataDictUpdateDTO updateDTO); + + @GetMapping("/system/datadict/deleteDataDict") + public CommonResult deleteDataDict(@RequestParam("dataDictId") Integer dataDictId); + + @GetMapping("/system/datadict/getDataDict") + public CommonResult getDataDict(@RequestParam("dataDictId") Integer dataDictId); + + @GetMapping("/system/datadict/listAllDataDicts") + public CommonResult> listDataDicts() ; + + @GetMapping("/system/datadict/listDataDicts") + public CommonResult> listDataDicts(@RequestParam("dataDictIds") List dataDictIds); + + +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpc.java deleted file mode 100644 index 81baf190c..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpc.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.datadict; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictCreateDTO; -import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO; - -import java.util.List; - -/** -* 数据字典 Rpc 接口 -*/ -public interface DataDictRpc { - - /** - * 创建数据字典 - * - * @param createDTO 创建数据字典 DTO - * @return 数据字典编号 - */ - CommonResult createDataDict(DataDictCreateDTO createDTO); - - /** - * 更新数据字典 - * - * @param updateDTO 更新数据字典 DTO - */ - CommonResult updateDataDict(DataDictUpdateDTO updateDTO); - - /** - * 删除数据字典 - * - * @param dataDictId 数据字典编号 - */ - CommonResult deleteDataDict(Integer dataDictId); - - /** - * 获得数据字典 - * - * @param dataDictId 数据字典编号 - * @return 数据字典 - */ - CommonResult getDataDict(Integer dataDictId); - - /** - * 获得全部数据字典 - * - * @return 数据字典列表 - */ - CommonResult> listDataDicts(); - - /** - * 获得数据字典列表 - * - * @param dataDictIds 数据字典编号列表 - * @return 数据字典列表 - */ - CommonResult> listDataDicts(List dataDictIds); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeFeign.java new file mode 100644 index 000000000..a06510136 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeFeign.java @@ -0,0 +1,49 @@ +package cn.iocoder.mall.systemservice.rpc.errorcode; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeAutoGenerateDTO; +import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeCreateDTO; +import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodePageDTO; +import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Date; +import java.util.List; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface ErrorCodeFeign { + + @GetMapping("/system/errorcode/listErrorCodes") + public CommonResult> listErrorCodes(@RequestParam("group") String group, @RequestParam("minUpdateTime") Date minUpdateTime) ; + + @PostMapping("/system/errorcode/autoGenerateErrorCodes") + public CommonResult autoGenerateErrorCodes(@RequestBody List autoGenerateDTOs); + + @PostMapping("/system/errorcode/createErrorCode") + public CommonResult createErrorCode(@RequestBody ErrorCodeCreateDTO createDTO) ; + + @PostMapping("/system/errorcode/updateErrorCode") + public CommonResult updateErrorCode(@RequestBody ErrorCodeUpdateDTO updateDTO) ; + + @GetMapping("/system/errorcode/deleteErrorCode") + public CommonResult deleteErrorCode(@RequestParam("errorCodeId")Integer errorCodeId) ; + + @GetMapping("/system/errorcode/getErrorCode") + public CommonResult getErrorCode(@RequestParam("errorCodeId")Integer errorCodeId) ; + + @GetMapping("/system/errorcode/listErrorCodesByIds") + public CommonResult> listErrorCodes(@RequestParam("errorCodeIds")List errorCodeIds) ; + + @PostMapping("/system/errorcode/pageErrorCode") + public CommonResult> pageErrorCode(@RequestBody ErrorCodePageDTO pageDTO); + +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpc.java deleted file mode 100644 index 837e12dcc..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpc.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.errorcode; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeAutoGenerateDTO; -import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeCreateDTO; -import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodePageDTO; -import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO; - -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.List; - -public interface ErrorCodeRpc { - - /** - * 获得指定分组下的错误码列表 - * - * @param group 错误码分组 - * @param minUpdateTime 最小更新时间，允许为空。 - * 通过该参数，我们可以增量获取超过 minUpdateTime 时间的错误码 - * @return 错误码列表 - */ - CommonResult> listErrorCodes(@NotNull(message = "错误码分组不能为空") String group, Date minUpdateTime); - - /** - * 自动生成错误码 - * - * @param autoGenerateDTOs 自动生成信息 DTO - */ - CommonResult autoGenerateErrorCodes(List autoGenerateDTOs); - - /** - * 创建错误码 - * - * @param createDTO 创建错误码 DTO - * @return 错误码编号 - */ - CommonResult createErrorCode(ErrorCodeCreateDTO createDTO); - - /** - * 更新错误码 - * - * @param updateDTO 更新错误码 DTO - */ - CommonResult updateErrorCode(ErrorCodeUpdateDTO updateDTO); - - /** - * 删除错误码 - * - * @param errorCodeId 错误码编号 - */ - CommonResult deleteErrorCode(Integer errorCodeId); - - /** - * 获得错误码 - * - * @param errorCodeId 错误码编号 - * @return 错误码 - */ - CommonResult getErrorCode(Integer errorCodeId); - - /** - * 获得错误码列表 - * - * @param errorCodeIds 错误码编号列表 - * @return 错误码列表 - */ - CommonResult> listErrorCodes(List errorCodeIds); - - /** - * 获得错误码分页 - * - * @param pageDTO 错误码分页查询 - * @return 错误码分页结果 - */ - CommonResult> pageErrorCode(ErrorCodePageDTO pageDTO); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2Rpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2Rpc.java deleted file mode 100644 index 3d69c3c90..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2Rpc.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.oauth; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2CreateAccessTokenReqDTO; -import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RefreshAccessTokenReqDTO; -import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2AccessTokenRespDTO; -import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RemoveTokenByUserReqDTO; - -public interface OAuth2Rpc { - - CommonResult createAccessToken(OAuth2CreateAccessTokenReqDTO createAccessTokenDTO); - - CommonResult checkAccessToken(String accessToken); - - CommonResult refreshAccessToken(OAuth2RefreshAccessTokenReqDTO refreshAccessTokenDTO); - - CommonResult removeToken(OAuth2RemoveTokenByUserReqDTO removeTokenDTO); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuthFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuthFeign.java new file mode 100644 index 000000000..483a20cb7 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuthFeign.java @@ -0,0 +1,29 @@ +package cn.iocoder.mall.systemservice.rpc.oauth; + +import cn.iocoder.common.framework.vo.CommonResult; +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.oauth.dto.OAuth2RemoveTokenByUserReqDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface OAuthFeign { + + @PostMapping("ccreateAccessToken") + public CommonResult createAccessToken(@RequestBody OAuth2CreateAccessTokenReqDTO createAccessTokenDTO); + + @PostMapping("/system/oauthcheckAccessToken") + public CommonResult checkAccessToken(@RequestParam("accessToken") String accessToken) ; + + @PostMapping("/system/oauthrefreshAccessToken") + public CommonResult refreshAccessToken(@RequestBody OAuth2RefreshAccessTokenReqDTO refreshAccessTokenDTO); + @PostMapping("/system/oauthremoveToken") + public CommonResult removeToken(@RequestBody OAuth2RemoveTokenByUserReqDTO removeTokenDTO); +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionFeign.java new file mode 100644 index 000000000..91d260069 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionFeign.java @@ -0,0 +1,39 @@ +package cn.iocoder.mall.systemservice.rpc.permission; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignAdminRoleDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignRoleResourceDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionCheckDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +/** +*/ +@FeignClient("system-service") +public interface PermissionFeign { + + @GetMapping("/system/permission/listRoleResourceIds") + public CommonResult> listRoleResourceIds(@RequestParam("roleId")Integer roleId) ; + + @PostMapping("/system/permission/assignRoleResource") + public CommonResult assignRoleResource(@RequestBody PermissionAssignRoleResourceDTO assignRoleResourceDTO); + + @GetMapping("/system/permission/listAdminRoleIds") + public CommonResult> listAdminRoleIds(@RequestParam("adminId")Integer adminId); + + @GetMapping("/system/permission/mapAdminRoleIds") + public CommonResult>> mapAdminRoleIds(@RequestParam("adminIds") Collection adminIds); + + @PostMapping("/system/permission/assignAdminRole") + public CommonResult assignAdminRole(@RequestBody PermissionAssignAdminRoleDTO assignAdminRoleDTO); + + @PostMapping("/system/permission/scheckPermission") + public CommonResult checkPermission(@RequestBody PermissionCheckDTO checkDTO) ; +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpc.java deleted file mode 100644 index acc9e29b9..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpc.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.permission; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignAdminRoleDTO; -import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignRoleResourceDTO; -import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionCheckDTO; - -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -/** - * 权限 Rpc 接口 - */ -public interface PermissionRpc { - - /** - * 获得角色拥有的资源编号 - * - * @param roleId 角色编号 - * @return 资源编号列表 - */ - CommonResult> listRoleResourceIds(Integer roleId); - - /** - * 赋予角色资源 - * - * @param assignRoleResourceDTO 赋予角色资源 DTO - * @return 成功 - */ - CommonResult assignRoleResource(PermissionAssignRoleResourceDTO assignRoleResourceDTO); - - /** - * 获得管理员拥有的角色编号列表 - * - * @param adminId 管理员编号 - * @return 资源编号列表 - */ - CommonResult> listAdminRoleIds(Integer adminId); - - /** - * 获得每个管理员拥有的角色编号 - * 返回的结果，key 为管理员编号 - * - * @param adminIds 管理员编号列表 - * @return 每个管理员拥有的角色编号 - */ - CommonResult>> mapAdminRoleIds(Collection adminIds); - - /** - * 赋予管理员角色 - * - * @param assignAdminRoleDTO 赋予管理员角色 DTO - * @return 成功 - */ - CommonResult assignAdminRole(PermissionAssignAdminRoleDTO assignAdminRoleDTO); - - /** - * 校验管理员是否拥有指定权限。 - * - * 如果没有，则抛出 {@link cn.iocoder.common.framework.exception.ServiceException} 异常 - * - * @param checkDTO 校验权限 DTO - * @return 成功 - */ - CommonResult checkPermission(PermissionCheckDTO checkDTO); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceFeign.java new file mode 100644 index 000000000..61d62713b --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceFeign.java @@ -0,0 +1,42 @@ +package cn.iocoder.mall.systemservice.rpc.permission; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceCreateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Collection; +import java.util.List; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface ResourceFeign { + + @PostMapping("/system/resource/createResource") + public CommonResult createResource(@RequestBody ResourceCreateDTO createDTO); + + @PostMapping("/system/resource/updateResource") + public CommonResult updateResource(@RequestBody ResourceUpdateDTO updateDTO); + + @GetMapping("/system/resource/deleteResource") + public CommonResult deleteResource(@RequestParam("resourceId") Integer resourceId) ; + @GetMapping("/system/resource/getResource") + public CommonResult getResource(@RequestParam("resourceId") Integer resourceId); + + @GetMapping("/system/resource/listAllResource") + public CommonResult> listResource() ; + + @GetMapping("/system/resource/listResource") + public CommonResult> listResource(@RequestParam("resourceIds") List resourceIds); + + @GetMapping("/system/resource/listRoleResource") + public CommonResult> listRoleResource(@RequestParam("roleIds") Collection roleIds, @RequestParam("type") Integer type) ; + +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpc.java deleted file mode 100644 index fcc8bbee2..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpc.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.permission; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceCreateDTO; -import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO; - -import javax.validation.constraints.NotNull; -import java.util.Collection; -import java.util.List; - -/** -* 资源 Rpc 接口 -*/ -public interface ResourceRpc { - - /** - * 创建资源 - * - * @param createDTO 创建资源 DTO - * @return 资源 - */ - CommonResult createResource(ResourceCreateDTO createDTO); - - /** - * 更新资源 - * - * @param updateDTO 更新资源 DTO - */ - CommonResult updateResource(ResourceUpdateDTO updateDTO); - - /** - * 删除资源 - * - * @param resourceId 资源编号 - */ - CommonResult deleteResource(Integer resourceId); - - /** - * 获得资源 - * - * @param resourceId 资源编号 - * @return 资源 - */ - CommonResult getResource(Integer resourceId); - - /** - * 获得资源全列表 - * - * @return 资源列表 - */ - CommonResult> listResource(); - - /** - * 获得资源列表 - * - * @param resourceIds 资源编号列表 - * @return 资源列表 - */ - CommonResult> listResource(List resourceIds); - - /** - * 获得指定角色的资源列表 - * - * @param roleIds 角色编号列表 - * @param type 资源类型 - * @return 资源列表 - */ - CommonResult> listRoleResource(@NotNull(message = "角色编号列表不能为空") Collection roleIds, Integer type); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleFeign.java new file mode 100644 index 000000000..f6a55ed73 --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleFeign.java @@ -0,0 +1,52 @@ +package cn.iocoder.mall.systemservice.rpc.permission; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceCreateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.RolePageDTO; +import cn.iocoder.mall.systemservice.rpc.permission.dto.RoleUpdateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO; +import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleCreateDTO; +import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface RoleFeign { + + + @PostMapping("/system/role/createRole") + public CommonResult createRole(@RequestBody RoleCreateDTO createDTO) ; + + @PostMapping("/system/role/updateRole") + public CommonResult updateRole(@RequestBody RoleUpdateDTO updateDTO); + + @GetMapping("/system/role/deleteRole") + public CommonResult deleteRole(@RequestParam("roleId")Integer roleId) ; + + @GetMapping("/system/role/getRole") + public CommonResult getRole(@RequestParam("roleId")Integer roleId); + + @GetMapping("/system/role/listAllRoles") + public CommonResult> listAllRoles() ; + + @GetMapping("/system/role/listRoles") + public CommonResult> listRoles(@RequestParam("roleIds")Collection roleIds) ; + + @PostMapping("/system/role/pageRole") + public CommonResult> pageRole(@RequestBody RolePageDTO pageDTO); + + @GetMapping("/system/role/listAdminRoleIds") + public CommonResult> listAdminRoleIds(@RequestParam("adminId") Integer adminId) ; +} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpc.java deleted file mode 100644 index adbd7cf2b..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpc.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.permission; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.permission.dto.RolePageDTO; -import cn.iocoder.mall.systemservice.rpc.permission.dto.RoleUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleCreateDTO; -import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO; - -import java.util.Collection; -import java.util.List; -import java.util.Set; - -/** -* 角色 Rpc 接口 -*/ -public interface RoleRpc { - - /** - * 创建角色 - * - * @param createDTO 创建角色 DTO - * @return 角色编号 - */ - CommonResult createRole(RoleCreateDTO createDTO); - - /** - * 更新角色 - * - * @param updateDTO 更新角色 DTO - */ - CommonResult updateRole(RoleUpdateDTO updateDTO); - - /** - * 删除角色 - * - * @param roleId 角色编号 - */ - CommonResult deleteRole(Integer roleId); - - /** - * 获得角色 - * - * @param roleId 角色编号 - * @return 角色 - */ - CommonResult getRole(Integer roleId); - - /** - * 获得所有角色 - * - * @return 角色列表 - */ - CommonResult> listAllRoles(); - - /** - * 获得角色列表 - * - * @param roleIds 角色编号列表 - * @return 角色列表 - */ - CommonResult> listRoles(Collection roleIds); - - /** - * 获得角色分页 - * - * @param pageDTO 角色分页查询 - * @return 角色分页结果 - */ - CommonResult> pageRole(RolePageDTO pageDTO); - - /** - * 获得管理员拥有的角色编号列表 - * - * @param adminId 管理员编号 - * @return 角色编号列表 - */ - CommonResult> listAdminRoleIds(Integer adminId); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogFeign.java new file mode 100644 index 000000000..1a52c8abd --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogFeign.java @@ -0,0 +1,24 @@ +package cn.iocoder.mall.systemservice.rpc.systemlog; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemAccessLogCreateDTO; +import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogPageDTO; +import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface SystemAccessLogFeign { + + @PostMapping("/system/accesslog/createSystemAccessLog") + public CommonResult createSystemAccessLog(@RequestBody SystemAccessLogCreateDTO createDTO); + + @PostMapping("/system/accesslog/pageSystemAccessLog") + public CommonResult> pageSystemAccessLog(@RequestBody SystemAccessLogPageDTO pageDTO); + +} \ No newline at end of file diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpc.java deleted file mode 100644 index d5053e0ec..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpc.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.systemlog; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemAccessLogCreateDTO; -import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogPageDTO; -import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogVO; - -/** -* 系统访问日志 Rpc 接口 -*/ -public interface SystemAccessLogRpc { - - /** - * 创建系统访问日志 - * - * @param createDTO 创建系统访问日志 DTO - * @return 系统访问日志编号 - */ - CommonResult createSystemAccessLog(SystemAccessLogCreateDTO createDTO); - - /** - * 获得系统访问日志分页 - * - * @param pageDTO 系统访问日志分页查询 - * @return 系统访问日志分页结果 - */ - CommonResult> pageSystemAccessLog(SystemAccessLogPageDTO pageDTO); - -} diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogFeign.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogFeign.java new file mode 100644 index 000000000..4871297dc --- /dev/null +++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogFeign.java @@ -0,0 +1,31 @@ +package cn.iocoder.mall.systemservice.rpc.systemlog; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogCreateDTO; +import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogPageDTO; +import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogProcessDTO; +import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemExceptionLogVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +/** +* 部门 Rpc 接口 +*/ +@FeignClient("system-service") +public interface SystemExceptionLogFeign { + + @PostMapping("/system/exceptionlog/createSystemExceptionLog") + public CommonResult createSystemExceptionLog(@RequestBody SystemExceptionLogCreateDTO createDTO); + + @GetMapping("/system/exceptionlog/getSystemExceptionLog") + public CommonResult getSystemExceptionLog(@RequestParam("systemExceptionLogId") Integer systemExceptionLogId); + @PostMapping("/system/exceptionlog/pageSystemExceptionLog") + public CommonResult> pageSystemExceptionLog(@RequestBody SystemExceptionLogPageDTO pageDTO) ; + + @PostMapping("/system/exceptionlog/processSystemExceptionLog") + public CommonResult processSystemExceptionLog(@RequestBody SystemExceptionLogProcessDTO processDTO) ; +} \ No newline at end of file diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpc.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpc.java deleted file mode 100644 index 21353f01f..000000000 --- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpc.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.systemlog; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogCreateDTO; -import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogPageDTO; -import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogProcessDTO; -import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemExceptionLogVO; - -/** - * 系统异常日志 Rpc 接口 - */ -public interface SystemExceptionLogRpc { - - /** - * 创建系统异常日志 - * - * @param createDTO 创建系统异常日志 DTO - * @return 成功 - */ - CommonResult createSystemExceptionLog(SystemExceptionLogCreateDTO createDTO); - - /** - * 获得系统异常日志 - * - * @param systemExceptionLogId 系统异常日志编号 - * @return 系统异常日志 - */ - CommonResult getSystemExceptionLog(Integer systemExceptionLogId); - - /** - * 获得系统异常日志分页 - * - * @param pageDTO 系统异常日志分页查询 - * @return 系统异常日志分页结果 - */ - CommonResult> pageSystemExceptionLog(SystemExceptionLogPageDTO pageDTO); - - /** - * 处理系统异常日志，完成或者忽略 - * - * @param processDTO 处理 DTO - * @return 成功 - */ - CommonResult processSystemExceptionLog(SystemExceptionLogProcessDTO processDTO); - -} diff --git a/system-service-project/system-service-app/pom.xml b/system-service-project/system-service-app/pom.xml index eb42f234e..a80e56c5f 100644 --- a/system-service-project/system-service-app/pom.xml +++ b/system-service-project/system-service-app/pom.xml @@ -86,7 +86,10 @@ org.mapstruct mapstruct-jdk8 - + + org.springframework.cloud + spring-cloud-starter-openfeign + diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/SystemServiceApplication.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/SystemServiceApplication.java index 13349c96a..babf0e66d 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/SystemServiceApplication.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/SystemServiceApplication.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.systemservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients(basePackages = {"cn.iocoder.mall.systemservice.rpc"}) public class SystemServiceApplication { public static void main(String[] args) { diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/AdminController.java similarity index 55% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/AdminController.java index a8b8d8356..4eb7ab379 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/AdminRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/AdminController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.admin; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -8,41 +8,49 @@ import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminPageDTO; import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminUpdateDTO; import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminVerifyPasswordDTO; import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import static cn.iocoder.common.framework.vo.CommonResult.success; -@Service(version = "${dubbo.provider.AdminRpc.version}") -public class AdminRpcImpl implements AdminRpc { - +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/admin") +public class AdminController { @Autowired private AdminManager adminManager; - @Override - public CommonResult verifyPassword(AdminVerifyPasswordDTO verifyPasswordDTO) { + + @PostMapping("verifyPassword") + public CommonResult verifyPassword(@RequestBody AdminVerifyPasswordDTO verifyPasswordDTO) { return success(adminManager.verifyPassword(verifyPasswordDTO)); } - @Override - public CommonResult createAdmin(AdminCreateDTO createDTO) { + @PostMapping("createAdmin") + public CommonResult createAdmin(@RequestBody AdminCreateDTO createDTO) { AdminVO adminVO = adminManager.createAdmin(createDTO); return success(adminVO.getId()); } - @Override - public CommonResult updateAdmin(AdminUpdateDTO updateDTO) { + @PostMapping("updateAdmin") + public CommonResult updateAdmin(@RequestBody AdminUpdateDTO updateDTO) { adminManager.updateAdmin(updateDTO); return success(true); } - @Override - public CommonResult> pageAdmin(AdminPageDTO pageDTO) { + @PostMapping("pageAdmin") + public CommonResult> pageAdmin(@RequestBody AdminPageDTO pageDTO) { return success(adminManager.pageAdmin(pageDTO)); } - @Override - public CommonResult getAdmin(Integer adminId) { + @GetMapping("getAdmin") + public CommonResult getAdmin(@RequestParam("adminId") Integer adminId) { return success(adminManager.getAdmin(adminId)); } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DataDictController.java similarity index 52% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DataDictController.java index 337805a4b..d4fee5fe1 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/datadict/DataDictRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DataDictController.java @@ -1,55 +1,59 @@ -package cn.iocoder.mall.systemservice.rpc.datadict; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.systemservice.manager.datadict.DataDictManager; import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictCreateDTO; import cn.iocoder.mall.systemservice.rpc.datadict.dto.DataDictUpdateDTO; import cn.iocoder.mall.systemservice.rpc.datadict.vo.DataDictVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; import static cn.iocoder.common.framework.vo.CommonResult.success; /** -* 数据字典 Rpc 实现类 -*/ -@Service(version = "${dubbo.provider.DataDictRpc.version}") -public class DataDictRpcImpl implements DataDictRpc { - + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/datadict") +public class DataDictController { @Autowired private DataDictManager dataDictManager; - @Override - public CommonResult createDataDict(DataDictCreateDTO createDTO) { + @PostMapping("createDataDict") + public CommonResult createDataDict(@RequestBody DataDictCreateDTO createDTO) { return success(dataDictManager.createDataDict(createDTO)); } - @Override - public CommonResult updateDataDict(DataDictUpdateDTO updateDTO) { + @PostMapping("updateDataDict") + public CommonResult updateDataDict(@RequestBody DataDictUpdateDTO updateDTO) { dataDictManager.updateDataDict(updateDTO); return success(true); } - @Override - public CommonResult deleteDataDict(Integer dataDictId) { + @GetMapping("deleteDataDict") + public CommonResult deleteDataDict(@RequestParam("dataDictId") Integer dataDictId) { dataDictManager.deleteDataDict(dataDictId); return success(true); } - @Override - public CommonResult getDataDict(Integer dataDictId) { + @GetMapping("getDataDict") + public CommonResult getDataDict(@RequestParam("dataDictId") Integer dataDictId) { return success(dataDictManager.getDataDict(dataDictId)); } - @Override + @GetMapping("listAllDataDicts") public CommonResult> listDataDicts() { return success(dataDictManager.listDataDicts()); } - @Override - public CommonResult> listDataDicts(List dataDictIds) { + @GetMapping("listDataDicts") + public CommonResult> listDataDicts(@RequestParam("dataDictIds") List dataDictIds) { return success(dataDictManager.listDataDicts(dataDictIds)); } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DepartmentController.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DepartmentController.java new file mode 100644 index 000000000..c45b7942f --- /dev/null +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/DepartmentController.java @@ -0,0 +1,61 @@ +package cn.iocoder.mall.systemservice.controller; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.systemservice.manager.admin.DepartmentManager; +import cn.iocoder.mall.systemservice.rpc.admin.dto.*; +import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Collection; +import java.util.List; + +import static cn.iocoder.common.framework.vo.CommonResult.success; + +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/department") +public class DepartmentController { + @Autowired + private DepartmentManager departmentManager; + + @PostMapping("createDepartment") + public CommonResult createDepartment(@RequestBody DepartmentCreateDTO createDTO) { + return success(departmentManager.createDepartment(createDTO)); + } + + @PostMapping("updateDepartment") + public CommonResult updateDepartment(@RequestBody DepartmentUpdateDTO updateDTO) { + departmentManager.updateDepartment(updateDTO); + return success(true); + } + + @GetMapping("deleteDepartment") + public CommonResult deleteDepartment(@RequestParam("departmentId")Integer departmentId) { + departmentManager.deleteDepartment(departmentId); + return success(true); + } + + @GetMapping("getDepartment") + public CommonResult getDepartment(@RequestParam("departmentId") Integer departmentId) { + return success(departmentManager.getDepartment(departmentId)); + } + + @GetMapping("listDepartments") + public CommonResult> listDepartments(@RequestParam("departmentIds")Collection departmentIds) { + return success(departmentManager.listDepartments(departmentIds)); + } + + @GetMapping("listAllDepartments") + public CommonResult> listDepartments() { + return success(departmentManager.listDepartments()); + } + + +} diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ErrorCodeController.java similarity index 50% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ErrorCodeController.java index a9add651e..8f8822061 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/errorcode/ErrorCodeRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ErrorCodeController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.errorcode; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -8,61 +8,67 @@ import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeCreateDTO; import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodePageDTO; import cn.iocoder.mall.systemservice.rpc.errorcode.dto.ErrorCodeUpdateDTO; import cn.iocoder.mall.systemservice.rpc.errorcode.vo.ErrorCodeVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; import static cn.iocoder.common.framework.vo.CommonResult.success; -@Service(version = "${dubbo.provider.ErrorCodeRpc.version}") -public class ErrorCodeRpcImpl implements ErrorCodeRpc { - +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/errorcode") +public class ErrorCodeController { @Autowired private ErrorCodeManager errorCodeManager; - @Override - public CommonResult> listErrorCodes(String group, Date minUpdateTime) { + @GetMapping("listErrorCodes") + public CommonResult> listErrorCodes(@RequestParam("group") String group, @RequestParam("minUpdateTime") Date minUpdateTime) { return success(errorCodeManager.listErrorCodes(group, minUpdateTime)); } - @Override - public CommonResult autoGenerateErrorCodes(List autoGenerateDTOs) { + @PostMapping("autoGenerateErrorCodes") + public CommonResult autoGenerateErrorCodes(@RequestBody List autoGenerateDTOs) { errorCodeManager.autoGenerateErrorCodes(autoGenerateDTOs); return success(true); } - @Override - public CommonResult createErrorCode(ErrorCodeCreateDTO createDTO) { + @PostMapping("createErrorCode") + public CommonResult createErrorCode(@RequestBody ErrorCodeCreateDTO createDTO) { return success(errorCodeManager.createErrorCode(createDTO)); } - @Override - public CommonResult updateErrorCode(ErrorCodeUpdateDTO updateDTO) { + @PostMapping("updateErrorCode") + public CommonResult updateErrorCode(@RequestBody ErrorCodeUpdateDTO updateDTO) { errorCodeManager.updateErrorCode(updateDTO); return success(true); } - @Override - public CommonResult deleteErrorCode(Integer errorCodeId) { + @GetMapping("deleteErrorCode") + public CommonResult deleteErrorCode(@RequestParam("errorCodeId")Integer errorCodeId) { errorCodeManager.deleteErrorCode(errorCodeId); return success(true); } - @Override - public CommonResult getErrorCode(Integer errorCodeId) { + @GetMapping("getErrorCode") + public CommonResult getErrorCode(@RequestParam("errorCodeId")Integer errorCodeId) { return success(errorCodeManager.getErrorCode(errorCodeId)); } - @Override - public CommonResult> listErrorCodes(List errorCodeIds) { + @GetMapping("listErrorCodesByIds") + public CommonResult> listErrorCodes(@RequestParam("errorCodeIds")List errorCodeIds) { return success(errorCodeManager.listErrorCodes(errorCodeIds)); } - @Override - public CommonResult> pageErrorCode(ErrorCodePageDTO pageDTO) { + @PostMapping("pageErrorCode") + public CommonResult> pageErrorCode(@RequestBody ErrorCodePageDTO pageDTO) { return success(errorCodeManager.pageErrorCode(pageDTO)); } - } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2RpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/OAuthController.java similarity index 61% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2RpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/OAuthController.java index f585bc979..8f1ca8ba7 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/oauth/OAuth2RpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/OAuthController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.oauth; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2AccessTokenRespDTO; @@ -6,36 +6,43 @@ import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2CreateAccessTokenReqDTO import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RefreshAccessTokenReqDTO; import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RemoveTokenByUserReqDTO; import cn.iocoder.mall.systemservice.service.oauth.OAuth2Service; -import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import static cn.iocoder.common.framework.vo.CommonResult.success; -@DubboService -public class OAuth2RpcImpl implements OAuth2Rpc { +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/oauth") +public class OAuthController { @Autowired private OAuth2Service oAuth2Service; - @Override - public CommonResult createAccessToken(OAuth2CreateAccessTokenReqDTO createAccessTokenDTO) { + @PostMapping("createAccessToken") + public CommonResult createAccessToken(@RequestBody OAuth2CreateAccessTokenReqDTO createAccessTokenDTO) { return success(oAuth2Service.createAccessToken(createAccessTokenDTO)); } - @Override - public CommonResult checkAccessToken(String accessToken) { + @PostMapping("checkAccessToken") + public CommonResult checkAccessToken(@RequestParam("accessToken") String accessToken) { return success(oAuth2Service.checkAccessToken(accessToken)); } - @Override - public CommonResult refreshAccessToken(OAuth2RefreshAccessTokenReqDTO refreshAccessTokenDTO) { + @PostMapping("refreshAccessToken") + public CommonResult refreshAccessToken(@RequestBody OAuth2RefreshAccessTokenReqDTO refreshAccessTokenDTO) { return success(oAuth2Service.refreshAccessToken(refreshAccessTokenDTO)); } - @Override - public CommonResult removeToken(OAuth2RemoveTokenByUserReqDTO removeTokenDTO) { + @PostMapping("removeToken") + public CommonResult removeToken(@RequestBody OAuth2RemoveTokenByUserReqDTO removeTokenDTO) { oAuth2Service.removeToken(removeTokenDTO); return success(true); } - } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PermissionController.java similarity index 53% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PermissionController.java index 88d0264ba..64e939262 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/PermissionRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/PermissionController.java @@ -1,12 +1,12 @@ -package cn.iocoder.mall.systemservice.rpc.permission; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.systemservice.manager.permission.PermissionManager; import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignAdminRoleDTO; import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionAssignRoleResourceDTO; import cn.iocoder.mall.systemservice.rpc.permission.dto.PermissionCheckDTO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.Collection; import java.util.Map; @@ -15,45 +15,48 @@ import java.util.Set; import static cn.iocoder.common.framework.vo.CommonResult.success; /** - * 权限 Rpc 实现类 + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 */ -@Service(version = "${dubbo.provider.PermissionRpc.version}") -public class PermissionRpcImpl implements PermissionRpc { - +@RestController +@RequestMapping("/system/permission") +public class PermissionController { @Autowired private PermissionManager permissionManager; - @Override - public CommonResult> listRoleResourceIds(Integer roleId) { + @GetMapping("listRoleResourceIds") + public CommonResult> listRoleResourceIds(@RequestParam("roleId")Integer roleId) { return success(permissionManager.listRoleResourceIds(roleId)); } - @Override - public CommonResult assignRoleResource(PermissionAssignRoleResourceDTO assignRoleResourceDTO) { + @PostMapping("assignRoleResource") + public CommonResult assignRoleResource(@RequestBody PermissionAssignRoleResourceDTO assignRoleResourceDTO) { permissionManager.assignRoleResource(assignRoleResourceDTO); return success(true); } - @Override - public CommonResult> listAdminRoleIds(Integer adminId) { + @GetMapping("listAdminRoleIds") + public CommonResult> listAdminRoleIds(@RequestParam("adminId")Integer adminId) { return success(permissionManager.listAdminRoleIds(adminId)); } - @Override - public CommonResult>> mapAdminRoleIds(Collection adminIds) { + @GetMapping("mapAdminRoleIds") + public CommonResult>> mapAdminRoleIds(@RequestParam("adminIds") Collection adminIds) { return success(permissionManager.mapAdminRoleIds(adminIds)); } - @Override - public CommonResult assignAdminRole(PermissionAssignAdminRoleDTO assignAdminRoleDTO) { + @PostMapping("assignAdminRole") + public CommonResult assignAdminRole(@RequestBody PermissionAssignAdminRoleDTO assignAdminRoleDTO) { permissionManager.assignAdminRole(assignAdminRoleDTO); return success(true); } - @Override - public CommonResult checkPermission(PermissionCheckDTO checkDTO) { + @PostMapping("checkPermission") + public CommonResult checkPermission(@RequestBody PermissionCheckDTO checkDTO) { permissionManager.checkPermission(checkDTO); return success(true); } - } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ResourceController.java similarity index 51% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ResourceController.java index feb5be727..12945397b 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/ResourceRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/ResourceController.java @@ -1,12 +1,12 @@ -package cn.iocoder.mall.systemservice.rpc.permission; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.systemservice.manager.permission.ResourceManager; import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceCreateDTO; import cn.iocoder.mall.systemservice.rpc.permission.dto.ResourceUpdateDTO; import cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.Collection; import java.util.List; @@ -14,48 +14,53 @@ import java.util.List; import static cn.iocoder.common.framework.vo.CommonResult.success; /** -* 资源 Rpc 实现类 -*/ -@Service(version = "${dubbo.provider.ResourceRpc.version}") -public class ResourceRpcImpl implements ResourceRpc { + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/resource") +public class ResourceController { @Autowired private ResourceManager resourceManager; - @Override - public CommonResult createResource(ResourceCreateDTO createDTO) { + @PostMapping("createResource") + public CommonResult createResource(@RequestBody ResourceCreateDTO createDTO) { return success(resourceManager.createResource(createDTO)); } - @Override - public CommonResult updateResource(ResourceUpdateDTO updateDTO) { + @PostMapping("updateResource") + public CommonResult updateResource(@RequestBody ResourceUpdateDTO updateDTO) { resourceManager.updateResource(updateDTO); return success(true); } - @Override - public CommonResult deleteResource(Integer resourceId) { + @GetMapping("deleteResource") + public CommonResult deleteResource(@RequestParam("resourceId")Integer resourceId) { resourceManager.deleteResource(resourceId); return success(true); } - @Override - public CommonResult getResource(Integer resourceId) { + @GetMapping("getResource") + public CommonResult getResource(@RequestParam("resourceId")Integer resourceId) { return success(resourceManager.getResource(resourceId)); } - @Override + @GetMapping("listAllResource") public CommonResult> listResource() { return success(resourceManager.listResources()); } - @Override - public CommonResult> listResource(List resourceIds) { + @GetMapping("listResource") + public CommonResult> listResource(@RequestParam("resourceIds")List resourceIds) { return success(resourceManager.listResources(resourceIds)); } - @Override - public CommonResult> listRoleResource(Collection roleIds, Integer type) { + @GetMapping("listRoleResource") + public CommonResult> listRoleResource(@RequestParam("roleIds") Collection roleIds, @RequestParam("type")Integer type) { return success(resourceManager.listRoleResources(roleIds, type)); } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/RoleController.java similarity index 53% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/RoleController.java index fc640c7b8..4dac14c7b 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/RoleRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/RoleController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.permission; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -7,8 +7,8 @@ import cn.iocoder.mall.systemservice.rpc.permission.dto.RolePageDTO; import cn.iocoder.mall.systemservice.rpc.permission.dto.RoleUpdateDTO; import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleCreateDTO; import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.Collection; import java.util.List; @@ -17,53 +17,58 @@ import java.util.Set; import static cn.iocoder.common.framework.vo.CommonResult.success; /** -* 角色 Rpc 实现类 -*/ -@Service(version = "${dubbo.provider.RoleRpc.version}") -public class RoleRpcImpl implements RoleRpc { + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/role") +public class RoleController { @Autowired private RoleManager roleManager; - @Override - public CommonResult createRole(RoleCreateDTO createDTO) { + @PostMapping("createRole") + public CommonResult createRole(@RequestBody RoleCreateDTO createDTO) { return success(roleManager.createRole(createDTO)); } - @Override - public CommonResult updateRole(RoleUpdateDTO updateDTO) { + @PostMapping("updateRole") + public CommonResult updateRole(@RequestBody RoleUpdateDTO updateDTO) { roleManager.updateRole(updateDTO); return success(true); } - @Override - public CommonResult deleteRole(Integer roleId) { + @GetMapping("deleteRole") + public CommonResult deleteRole(@RequestParam("roleId")Integer roleId) { roleManager.deleteRole(roleId); return success(true); } - @Override - public CommonResult getRole(Integer roleId) { + @GetMapping("getRole") + public CommonResult getRole(@RequestParam("roleId")Integer roleId) { return success(roleManager.getRole(roleId)); } - @Override + @GetMapping("listAllRoles") public CommonResult> listAllRoles() { return success(roleManager.listAllRoles()); } - @Override - public CommonResult> listRoles(Collection roleIds) { + @GetMapping("listRoles") + public CommonResult> listRoles(@RequestParam("roleIds")Collection roleIds) { return success(roleManager.listRoles(roleIds)); } - @Override - public CommonResult> pageRole(RolePageDTO pageDTO) { + @PostMapping("pageRole") + public CommonResult> pageRole(@RequestBody RolePageDTO pageDTO) { return success(roleManager.pageRole(pageDTO)); } - @Override - public CommonResult> listAdminRoleIds(Integer adminId) { + @GetMapping("listAdminRoleIds") + public CommonResult> listAdminRoleIds(@RequestParam("adminId") Integer adminId) { return success(roleManager.listAdminRoleIds(adminId)); } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemAccessLogController.java similarity index 55% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemAccessLogController.java index 59dcd5e9e..3bdf90b52 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemAccessLogRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemAccessLogController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.systemlog; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -6,28 +6,35 @@ import cn.iocoder.mall.systemservice.manager.systemlog.SystemAccessLogManager; import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemAccessLogCreateDTO; import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogPageDTO; import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemAccessLogVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import static cn.iocoder.common.framework.vo.CommonResult.success; /** -* 系统访问日志 Rpc 实现类 -*/ -@Service(version = "${dubbo.provider.SystemAccessLogRpc.version}") -public class SystemAccessLogRpcImpl implements SystemAccessLogRpc { - + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/accesslog") +public class SystemAccessLogController { @Autowired private SystemAccessLogManager systemAccessLogManager; - @Override - public CommonResult createSystemAccessLog(SystemAccessLogCreateDTO createDTO) { + @PostMapping("createSystemAccessLog") + public CommonResult createSystemAccessLog(@RequestBody SystemAccessLogCreateDTO createDTO) { systemAccessLogManager.createSystemAccessLog(createDTO); return success(true); } - @Override - public CommonResult> pageSystemAccessLog(SystemAccessLogPageDTO pageDTO) { + @PostMapping("pageSystemAccessLog") + public CommonResult> pageSystemAccessLog(@RequestBody SystemAccessLogPageDTO pageDTO) { return success(systemAccessLogManager.pageSystemAccessLog(pageDTO)); } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemExceptionLogController.java similarity index 60% rename from system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpcImpl.java rename to system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemExceptionLogController.java index ce50a075b..fdad7d958 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemExceptionLogRpcImpl.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/controller/SystemExceptionLogController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.systemservice.rpc.systemlog; +package cn.iocoder.mall.systemservice.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -7,37 +7,43 @@ import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogCreateD import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogPageDTO; import cn.iocoder.mall.systemservice.rpc.systemlog.dto.SystemExceptionLogProcessDTO; import cn.iocoder.mall.systemservice.rpc.systemlog.vo.SystemExceptionLogVO; -import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import static cn.iocoder.common.framework.vo.CommonResult.success; -@Service(version = "${dubbo.provider.SystemExceptionLogRpc.version}") -public class SystemExceptionLogRpcImpl implements SystemExceptionLogRpc { - +/** + * Title: + * Description: + * + * @author zhuyang + * @version 1.0 2021/10/11 + */ +@RestController +@RequestMapping("/system/exceptionlog") +public class SystemExceptionLogController { @Autowired private SystemExceptionLogManager systemExceptionLogManager; - @Override - public CommonResult createSystemExceptionLog(SystemExceptionLogCreateDTO createDTO) { + @PostMapping("createSystemExceptionLog") + public CommonResult createSystemExceptionLog(@RequestBody SystemExceptionLogCreateDTO createDTO) { systemExceptionLogManager.createSystemExceptionLog(createDTO); return success(true); } - @Override - public CommonResult getSystemExceptionLog(Integer systemExceptionLogId) { + @GetMapping("getSystemExceptionLog") + public CommonResult getSystemExceptionLog(@RequestParam("systemExceptionLogId") Integer systemExceptionLogId) { return success(systemExceptionLogManager.getSystemExceptionLog(systemExceptionLogId)); } - @Override - public CommonResult> pageSystemExceptionLog(SystemExceptionLogPageDTO pageDTO) { + @PostMapping("pageSystemExceptionLog") + public CommonResult> pageSystemExceptionLog(@RequestBody SystemExceptionLogPageDTO pageDTO) { return success(systemExceptionLogManager.pageSystemExceptionLog(pageDTO)); } - @Override - public CommonResult processSystemExceptionLog(SystemExceptionLogProcessDTO processDTO) { + @PostMapping("processSystemExceptionLog") + public CommonResult processSystemExceptionLog(@RequestBody SystemExceptionLogProcessDTO processDTO) { systemExceptionLogManager.processSystemExceptionLog(processDTO); return CommonResult.success(true); } - } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpcImpl.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpcImpl.java deleted file mode 100644 index 55241e23b..000000000 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/admin/DepartmentRpcImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.mall.systemservice.rpc.admin; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.systemservice.manager.admin.DepartmentManager; -import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentCreateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentUpdateDTO; -import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO; -import org.apache.dubbo.config.annotation.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.common.framework.vo.CommonResult.success; - -/** -* 部门 Rpc 实现类 -*/ -@Service(version = "${dubbo.provider.DepartmentRpc.version}") -public class DepartmentRpcImpl implements DepartmentRpc { - - @Autowired - private DepartmentManager departmentManager; - - @Override - public CommonResult createDepartment(DepartmentCreateDTO createDTO) { - return success(departmentManager.createDepartment(createDTO)); - } - - @Override - public CommonResult updateDepartment(DepartmentUpdateDTO updateDTO) { - departmentManager.updateDepartment(updateDTO); - return success(true); - } - - @Override - public CommonResult deleteDepartment(Integer departmentId) { - departmentManager.deleteDepartment(departmentId); - return success(true); - } - - @Override - public CommonResult getDepartment(Integer departmentId) { - return success(departmentManager.getDepartment(departmentId)); - } - - @Override - public CommonResult> listDepartments(Collection departmentIds) { - return success(departmentManager.listDepartments(departmentIds)); - } - - @Override - public CommonResult> listDepartments() { - return success(departmentManager.listDepartments()); - } - -} diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java index 418096767..18017dc4d 100644 --- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java +++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.userservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableFeignClients(basePackages = {"cn.iocoder.mall.systemservice.rpc"}) +@EnableDiscoveryClient public class UserServiceApplication { public static void main(String[] args) { diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java index 3bb87a444..e77a5e3f3 100644 --- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java +++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java @@ -4,7 +4,7 @@ import cn.iocoder.common.framework.enums.CommonStatusEnum; import cn.iocoder.common.framework.enums.UserTypeEnum; import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.systemservice.rpc.oauth.OAuth2Rpc; +import cn.iocoder.mall.systemservice.rpc.oauth.OAuthFeign; import cn.iocoder.mall.systemservice.rpc.oauth.dto.OAuth2RemoveTokenByUserReqDTO; import cn.iocoder.mall.userservice.convert.user.UserConvert; import cn.iocoder.mall.userservice.rpc.user.dto.UserCreateReqDTO; @@ -13,7 +13,6 @@ import cn.iocoder.mall.userservice.rpc.user.dto.UserRespDTO; import cn.iocoder.mall.userservice.rpc.user.dto.UserUpdateReqDTO; import cn.iocoder.mall.userservice.service.user.UserService; import cn.iocoder.mall.userservice.service.user.bo.UserBO; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,8 +24,9 @@ public class UserManager { @Autowired private UserService userService; - @DubboReference(version = "${dubbo.consumer.OAuth2Rpc.version}") - private OAuth2Rpc oauth2Rpc; + + @Autowired + private OAuthFeign oAuthFeign; public UserRespDTO createUserIfAbsent(UserCreateReqDTO createDTO) { // 用户已经存在 @@ -50,7 +50,7 @@ public class UserManager { // 如果修改密码，或者禁用管理员 if (StringUtils.hasText(updateDTO.getPassword()) || CommonStatusEnum.DISABLE.getValue().equals(updateDTO.getStatus())) { - oauth2Rpc.removeToken(new OAuth2RemoveTokenByUserReqDTO().setUserId(updateDTO.getId()) + oAuthFeign.removeToken(new OAuth2RemoveTokenByUserReqDTO().setUserId(updateDTO.getId()) .setUserType(UserTypeEnum.ADMIN.getValue())); } }