From 1dadf9344900ba3867183be7ed0bc9bd3cce3c6d Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 21 Jul 2020 08:07:11 +0800 Subject: [PATCH] =?UTF-8?q?Dubbo=20=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=E5=99=A8=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/mall-spring-boot-starter-dubbo/pom.xml | 7 ++ .../config/DubboWebAutoConfiguration.java | 25 +++++ .../core/filter/DubboRouterTagFilter.java | 62 ++++++++++++ .../iocoder/mall/dubbo/core/package-info.java | 4 - .../router/DubboRouterTagContextHolder.java | 25 +++++ .../web/DubboRouterTagWebInterceptor.java | 34 +++++++ .../dubbo/com.alibaba.dubbo.rpc.Filter | 1 + .../main/resources/META-INF/spring.factories | 2 + mall-cache/pom.xml | 34 ------- management-web-app/pom.xml | 4 +- .../admin/DepartmentController.http | 1 + .../src/main/resources/application.yaml | 1 + .../datadict/AdminsDataDictController.java | 63 ------------- .../errorCode/SystemErrorCodeController.java | 71 -------------- .../systemlog/SystemLogController.java | 56 ----------- .../convert/errorcode/ErrorCodeConvert.java | 29 ------ .../rpc/api/errorcode/ErrorCodeRPC.java | 26 ----- .../errorcode/ErrorCodeAddRequest.java | 33 ------- .../response/errorcode/ErrorCodeResponse.java | 33 ------- .../convert/errorcode/ErrorCodeConvert.java | 23 ----- .../convert/systemlog/SystemLogConvert.java | 19 ---- .../rpc/rpc/errorcode/ErrorCodeRPCImpl.java | 69 -------------- .../mall/system/api/SystemLogService.java | 15 --- .../admin/service/SystemLogServiceImpl.java | 94 ------------------- 24 files changed, 160 insertions(+), 571 deletions(-) create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboWebAutoConfiguration.java create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboRouterTagFilter.java delete mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/package-info.java create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/router/DubboRouterTagContextHolder.java create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/web/DubboRouterTagWebInterceptor.java create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/spring.factories delete mode 100644 mall-cache/pom.xml delete mode 100644 system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/datadict/AdminsDataDictController.java delete mode 100644 system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/errorCode/SystemErrorCodeController.java delete mode 100644 system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/systemlog/SystemLogController.java delete mode 100644 system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/errorcode/ErrorCodeConvert.java delete mode 100644 system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/api/errorcode/ErrorCodeRPC.java delete mode 100644 system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/request/errorcode/ErrorCodeAddRequest.java delete mode 100644 system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/response/errorcode/ErrorCodeResponse.java delete mode 100644 system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/errorcode/ErrorCodeConvert.java delete mode 100644 system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/systemlog/SystemLogConvert.java delete mode 100644 system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/rpc/errorcode/ErrorCodeRPCImpl.java delete mode 100644 system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SystemLogService.java delete mode 100644 system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SystemLogServiceImpl.java diff --git a/common/mall-spring-boot-starter-dubbo/pom.xml b/common/mall-spring-boot-starter-dubbo/pom.xml index ca4cfca0d..6fc1417d7 100644 --- a/common/mall-spring-boot-starter-dubbo/pom.xml +++ b/common/mall-spring-boot-starter-dubbo/pom.xml @@ -18,6 +18,13 @@ common-framework + + + org.springframework.boot + spring-boot-starter-web + true + + com.alibaba.cloud diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboWebAutoConfiguration.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboWebAutoConfiguration.java new file mode 100644 index 000000000..7d6c9757a --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboWebAutoConfiguration.java @@ -0,0 +1,25 @@ +package cn.iocoder.mall.dubbo.config; + +import cn.iocoder.mall.dubbo.core.web.DubboRouterTagWebInterceptor; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +public class DubboWebAutoConfiguration implements WebMvcConfigurer { + + // ========== 拦截器相关 ========== + + @Override + public void addInterceptors(InterceptorRegistry registry) { + try { + registry.addInterceptor(new DubboRouterTagWebInterceptor()).order(-1000); + } catch (NoSuchBeanDefinitionException e) { +// logger.warn("[addInterceptors][无法获取 AccessLogInterceptor 拦截器，因此不启动 AccessLog 的记录]"); + } + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboRouterTagFilter.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboRouterTagFilter.java new file mode 100644 index 000000000..002a332cc --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboRouterTagFilter.java @@ -0,0 +1,62 @@ +package cn.iocoder.mall.dubbo.core.filter; + +import cn.iocoder.common.framework.util.StringUtils; +import cn.iocoder.mall.dubbo.core.router.DubboRouterTagContextHolder; +import org.apache.dubbo.common.constants.CommonConstants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.*; + +/** + * 基于 Dubbo 标签路由规则(http://dubbo.apache.org/zh-cn/docs/user/demos/routing-rule.html)，实现如下功能： + * 1. 本地开发调试时，在带有 Dubbo Tag 的情况下，优先调用指定 Tag 的服务提供者。这样，我们可以将本地启动的服务提供者打上相应的 Tag，即可优先调用本地； + * 2. TODO 优化点：蓝绿发布、灰度发布 + * + * 实现逻辑为： + * 1. 对于 Consumer 方，在调用 Provider 时，会将 {@link DubboRouterTagContextHolder} 中的 Tag 通过 Dubbo 隐式传参。 + * 同时，Dubbo 自带 {@link org.apache.dubbo.rpc.cluster.router.tag.TagRouter}，会根据该参数，会选择符合该 Tag 的 Provider。 + * 2. 对于 Provider 方，在通过 Dubbo 隐式传参获得到 Tag 时，会设置到 {@link DubboRouterTagContextHolder} 中。 + * 这样，在 Provider 作为 Consumer 角色时，调用其它 Provider 时，可以继续实现标签路由的功能。 + */ +@Activate(group = {CommonConstants.PROVIDER, CommonConstants.CONSUMER}, order = -1000) +public class DubboRouterTagFilter implements Filter { + + @Override + public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { + // 消费端 + if (RpcContext.getContext().isConsumerSide()) { + // 设置 Dubbo Tag 到 Dubbo 隐式传参 + String dubboTag = DubboRouterTagContextHolder.getTag(); + boolean hasDubboTag = StringUtils.hasText(dubboTag); + if (hasDubboTag) { + invocation.setAttachment(CommonConstants.TAG_KEY, dubboTag); + } + // 继续调用 + try { + return invoker.invoke(invocation); + } finally { + // 解决极端情况下，本地 injvm 调用时，消费端会调用 DubboRouterTagContextHolder.clear() 上下文，导致消费端也被清理了，因为在同一个 JVM 进程内。 + if (hasDubboTag) { + DubboRouterTagContextHolder.setTag(dubboTag); + } + } + // 提供端 + } else { + // 从 Dubbo 隐式传参获得 Dubbo Tag + String dubboTag = invocation.getAttachment(CommonConstants.TAG_KEY); + boolean hasDubboTag = StringUtils.hasText(dubboTag); + if (hasDubboTag) { + invocation.setAttachment(CommonConstants.TAG_KEY, dubboTag); + } + // 继续调用 + try { + return invoker.invoke(invocation); + } finally { + // 清理 + if (hasDubboTag) { + DubboRouterTagContextHolder.clear(); + } + } + } + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/package-info.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/package-info.java deleted file mode 100644 index 7d9fe0e5c..000000000 --- a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占坑 - */ -package cn.iocoder.mall.dubbo.core; diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/router/DubboRouterTagContextHolder.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/router/DubboRouterTagContextHolder.java new file mode 100644 index 000000000..c25bd1c2e --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/router/DubboRouterTagContextHolder.java @@ -0,0 +1,25 @@ +package cn.iocoder.mall.dubbo.core.router; + +/** + * Dubbo 路由 Tag 的上下文 + * + * @see cn.iocoder.mall.dubbo.core.filter.DubboRouterTagFilter + * @see cn.iocoder.mall.dubbo.core.web.DubboRouterTagWebInterceptor + */ +public class DubboRouterTagContextHolder { + + private static ThreadLocal tagContext = new ThreadLocal<>(); + + public static void setTag(String tag) { + tagContext.set(tag); + } + + public static String getTag() { + return tagContext.get(); + } + + public static void clear() { + tagContext.remove(); + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/web/DubboRouterTagWebInterceptor.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/web/DubboRouterTagWebInterceptor.java new file mode 100644 index 000000000..aab2363cb --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/web/DubboRouterTagWebInterceptor.java @@ -0,0 +1,34 @@ +package cn.iocoder.mall.dubbo.core.web; + +import cn.iocoder.common.framework.util.StringUtils; +import cn.iocoder.mall.dubbo.core.router.DubboRouterTagContextHolder; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * Dubbo 路由标签的 Web 拦截器，将请求 Header 中的 {@link #HEADER_DUBBO_TAG} 设置到 {@link DubboRouterTagContextHolder} 中。 + * + * @see cn.iocoder.mall.dubbo.core.filter.DubboRouterTagFilter + */ +public class DubboRouterTagWebInterceptor implements HandlerInterceptor { + + private static final String HEADER_DUBBO_TAG = "dubbo-tag"; + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + String tag = request.getHeader(HEADER_DUBBO_TAG); + if (StringUtils.hasText(tag)) { + DubboRouterTagContextHolder.setTag(tag); + } + return true; + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { + DubboRouterTagContextHolder.clear(); + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter index d7eb81217..b1f85b26f 100644 --- a/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ b/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter @@ -1 +1,2 @@ dubboExceptionFilter=cn.iocoder.mall.dubbo.core.filter.DubboProviderExceptionFilter +dubboRouterTagFilter=cn.iocoder.mall.dubbo.core.filter.DubboRouterTagFilter diff --git a/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/spring.factories b/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..0427a506c --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + cn.iocoder.mall.dubbo.config.DubboWebAutoConfiguration diff --git a/mall-cache/pom.xml b/mall-cache/pom.xml deleted file mode 100644 index 70fd53316..000000000 --- a/mall-cache/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - onemall - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - mall-cache - - - - redis.clients - jedis - 2.7.2 - - - - org.redisson - redisson - 3.10.6 - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - \ No newline at end of file diff --git a/management-web-app/pom.xml b/management-web-app/pom.xml index b4ead34e7..6e7f22392 100644 --- a/management-web-app/pom.xml +++ b/management-web-app/pom.xml @@ -44,8 +44,8 @@ - com.alibaba.cloud - spring-cloud-starter-dubbo + cn.iocoder.mall + mall-spring-boot-starter-dubbo diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.http b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.http index de1876739..ea9701824 100644 --- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.http +++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.http @@ -2,6 +2,7 @@ POST {{baseUrl}}/department/create Content-Type: application/x-www-form-urlencoded Authorization: Bearer {{accessToken}} +dubbo-tag: yunai name=测试部门&pid=0&sort=0 diff --git a/system-service-project/system-service-app/src/main/resources/application.yaml b/system-service-project/system-service-app/src/main/resources/application.yaml index fb911809f..8fd84f97b 100644 --- a/system-service-project/system-service-app/src/main/resources/application.yaml +++ b/system-service-project/system-service-app/src/main/resources/application.yaml @@ -34,6 +34,7 @@ dubbo: provider: filter: -exception validation: true # 开启 Provider 参数校验 + tag: OAuth2Rpc: version: 1.0.0 AdminRpc: diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/datadict/AdminsDataDictController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/datadict/AdminsDataDictController.java deleted file mode 100644 index 9f60ccda8..000000000 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/datadict/AdminsDataDictController.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.datadict; - -import cn.iocoder.common.framework.enums.MallConstants; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping(MallConstants.ROOT_PATH_ADMIN + "/data-dict") -@Api(tags = "管理员 - 数据字典 API") -public class AdminsDataDictController { - -// @Reference(validation = "true", version = "${dubbo.provider.DataDictService.version}") -// private DataDictService dataDictService; - -// @GetMapping("/list") -// @ApiOperation(value = "数据字典全列表") -// @RequiresPermissions("system.dataDict.list") -// public CommonResult> list() { -// return success( dataDictService.selectDataDictList()); -// } -// -// @GetMapping("/tree") -// @RequiresPermissions // 因为是通用的接口，所以无需权限标识 -// @ApiOperation(value = "数据字典树结构", notes = "该接口返回的信息更为精简。一般用于前端缓存数据字典到本地。") -// public CommonResult> tree() { -// // 查询数据字典全列表 -// List dataDicts = dataDictService.selectDataDictList(); -// // 构建基于 enumValue 聚合的 Multimap -// ImmutableListMultimap dataDictMap = Multimaps.index(dataDicts, DataDictBO::getEnumValue); // KEY 是 enumValue ，VALUE 是 DataDictBO 数组 -// // 构建返回结果 -// List dataDictEnumVOs = new ArrayList<>(dataDictMap.size()); -// dataDictMap.keys().forEach(enumValue -> { -// DataDictEnumVO dataDictEnumVO = new DataDictEnumVO().setEnumValue(enumValue) -// .setValues(DataDictConvert.INSTANCE.convert2(dataDictMap.get(enumValue))); -// dataDictEnumVOs.add(dataDictEnumVO); -// }); -// return success(dataDictEnumVOs); -// } -// -// @PostMapping("/add") -// @RequiresPermissions("system.dataDict.add") -// @ApiOperation(value = "创建数据字典") -// public CommonResult add(DataDictAddDTO dataDictAddDTO) { -// return success(dataDictService.addDataDict(AdminSecurityContextHolder.getContext().getAdminId(), dataDictAddDTO)); -// } -// -// @PostMapping("/update") -// @RequiresPermissions("system.dataDict.update") -// @ApiOperation(value = "更新数据字典") -// public CommonResult update(DataDictUpdateDTO dataDictUpdateDTO) { -// return success(dataDictService.updateDataDict(AdminSecurityContextHolder.getContext().getAdminId(), dataDictUpdateDTO)); -// } -// -// @PostMapping("/delete") -// @RequiresPermissions("system.dataDict.delete") -// @ApiOperation(value = "删除数据字典") -// @ApiImplicitParam(name = "id", value = "编号", required = true, example = "100") -// public CommonResult delete(@RequestParam("id") Integer id) { -// return success(dataDictService.deleteDataDict(AdminSecurityContextHolder.getContext().getAdminId(), id)); -// } - -} diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/errorCode/SystemErrorCodeController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/errorCode/SystemErrorCodeController.java deleted file mode 100644 index 9abb68938..000000000 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/errorCode/SystemErrorCodeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.errorCode; - -import cn.iocoder.common.framework.enums.MallConstants; -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.security.core.annotation.RequiresPermissions; -import cn.iocoder.mall.system.biz.bo.errorcode.ErrorCodeBO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeAddDTO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeDeleteDTO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodePageDTO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeUpdateDTO; -import cn.iocoder.mall.system.biz.service.errorcode.ErrorCodeService; -import cn.iocoder.mall.system.rest.convert.errorcode.ErrorCodeConvert; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodeAddRequest; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodePageRequest; -import cn.iocoder.mall.system.rest.response.errorcode.ErrorCodePageResponse; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodeUpdateRequest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * 错误码 - * - * @author youyusi - */ -@RestController -@RequestMapping(MallConstants.ROOT_PATH_ADMIN + "/errorcode") // TODO FROM 芋艿 to 鱿鱼须：error-code -@Api("错误码") -public class SystemErrorCodeController { // TODO FROM 芋艿 to 鱿鱼须：变量要空行 - @Autowired - private ErrorCodeService errorCodeService; - - @GetMapping("/page") - @ApiOperation(value = "错误码分页") - @RequiresPermissions("system:errorcode:page") - public CommonResult> page(ErrorCodePageRequest request) { - ErrorCodePageDTO pageDTO = ErrorCodeConvert.INSTANCE.convert(request); - PageResult pageResult = errorCodeService.getErrorCodePage(pageDTO); - return CommonResult.success(ErrorCodeConvert.INSTANCE.convertPage(pageResult)); - } - - @PostMapping("/add") - @ApiOperation(value = "创建错误码") - @RequiresPermissions("system:errorcode:add") - public CommonResult add(ErrorCodeAddRequest request) { - ErrorCodeAddDTO addDTO = ErrorCodeConvert.INSTANCE.convert(request); - return CommonResult.success(errorCodeService.addErrorCode(addDTO)); - } - - @PostMapping("/update") - @ApiOperation(value = "更新错误码") - @RequiresPermissions("system:errorcode:update") - public CommonResult update(ErrorCodeUpdateRequest request) { - ErrorCodeUpdateDTO updateDTO = ErrorCodeConvert.INSTANCE.convert(request); - errorCodeService.updateErrorCode(updateDTO); - return CommonResult.success(true); - } - - @PostMapping("/delete") - @ApiOperation(value = "删除错误码") - @RequiresPermissions("system:errorcode:delete") - @ApiImplicitParam(name = "id", value = "错误码编号", required = true, example = "1") - public CommonResult delete(@RequestParam("id") Integer id) { - ErrorCodeDeleteDTO deleteDTO = new ErrorCodeDeleteDTO().setId(id); - errorCodeService.deleteErrorCode(deleteDTO); - return CommonResult.success(true); - } -} diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/systemlog/SystemLogController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/systemlog/SystemLogController.java deleted file mode 100644 index 096fa19ec..000000000 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/systemlog/SystemLogController.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.systemlog; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.biz.bo.systemlog.AccessLogBO; -import cn.iocoder.mall.system.biz.dto.system.AccessLogPageDTO; -import cn.iocoder.mall.system.biz.service.systemlog.SystemLogService; -import cn.iocoder.mall.system.rest.convert.systemlog.AccessLogConvert; -import cn.iocoder.mall.system.rest.response.systemlog.AccessLogPageResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author:ycjx - * @descriptio - * @create:2019-06-23 16:42 - */ -@RestController -@RequestMapping("admins/system/logs") -@Api("系统日志") -public class SystemLogController { - - @Autowired - private SystemLogService systemLogService; - - @GetMapping("/access/page") - @ApiOperation(value = "访问日志分页") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "用户id", example = "1"), - @ApiImplicitParam(name = "pageNo", value = "页码，从 1 开始", example = "1"), - @ApiImplicitParam(name = "pageSize", value = "每页条数", required = true, example = "10"), - }) - public CommonResult> page(@RequestParam(value = "accountId", required = false) Integer accountId, - @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { - - // TODO FROM 芋艿 to 2447007062：不要留这么大的空行； - // TODO FROM 芋艿 to 2447007062：使用 Request 接收参数噢； - AccessLogPageDTO accessLogPageDTO = new AccessLogPageDTO().setAccountId(accountId) - .setPageNo(pageNo).setPageSize(pageSize); - // 查询分页 - PageResult result = systemLogService.getAccessLogPage(accessLogPageDTO); - // 转换结果 - return CommonResult.success(AccessLogConvert.INSTANCE.convert(result)); - - } - - -} diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/errorcode/ErrorCodeConvert.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/errorcode/ErrorCodeConvert.java deleted file mode 100644 index 49dabc8bb..000000000 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/errorcode/ErrorCodeConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.system.rest.convert.errorcode; - -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.biz.bo.errorcode.ErrorCodeBO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeAddDTO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodePageDTO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeUpdateDTO; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodeAddRequest; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodePageRequest; -import cn.iocoder.mall.system.rest.response.errorcode.ErrorCodePageResponse; -import cn.iocoder.mall.system.rest.request.errorcode.ErrorCodeUpdateRequest; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author ding - */ -@Mapper -public interface ErrorCodeConvert { - ErrorCodeConvert INSTANCE = Mappers.getMapper(ErrorCodeConvert.class); - - ErrorCodeAddDTO convert(ErrorCodeAddRequest bean); - - ErrorCodeUpdateDTO convert(ErrorCodeUpdateRequest bean); - - ErrorCodePageDTO convert(ErrorCodePageRequest bean); - - PageResult convertPage(PageResult bean); -} diff --git a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/api/errorcode/ErrorCodeRPC.java b/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/api/errorcode/ErrorCodeRPC.java deleted file mode 100644 index 07d602ba4..000000000 --- a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/api/errorcode/ErrorCodeRPC.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.mall.system.rpc.api.errorcode; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.system.rpc.request.errorcode.ErrorCodeAddRequest; -import cn.iocoder.mall.system.rpc.request.systemlog.ExceptionLogAddRequest; -import cn.iocoder.mall.system.rpc.response.errorcode.ErrorCodeResponse; - -import java.util.List; - -/** - * ErrorCode RPC 接口 - * 提供其他服务初始化加载错误码到db中，同时提供读取该服务的错误码信息， - * 同时提供删除接口， - * @author ding - */ -public interface ErrorCodeRPC { - - CommonResult> getErrorCodeByGroup(Integer group); - - CommonResult addErrorCode(ErrorCodeAddRequest errorCodeAddRequest); - - CommonResult addErrorCodeList(List list); - - CommonResult deleteErrorCodeByGroup(Integer group, Integer type); - -} diff --git a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/request/errorcode/ErrorCodeAddRequest.java b/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/request/errorcode/ErrorCodeAddRequest.java deleted file mode 100644 index 79d35d091..000000000 --- a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/request/errorcode/ErrorCodeAddRequest.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.mall.system.rpc.request.errorcode; - - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; - -/** - * 错误码模块，枚举初始化错误码时使用 - * @author ding - */ -@Data -@Accessors(chain = true) -public class ErrorCodeAddRequest implements Serializable { - @ApiModelProperty(value = "错误码信息", required = true) - @NotEmpty(message = "错误码信息不能为空") - private String message; - - @ApiModelProperty(value = "错误码编码") - @NotEmpty(message = "错误码编码不能为空") - private Integer code; - - @ApiModelProperty(value = "错误码分组，字典表获取") - @NotEmpty(message = "错误码分组不能为空") - private Integer group; - - @ApiModelProperty(value = "错误码角色，系统内置（枚举）还是自定义") - @NotEmpty(message = "错误码角色不能空") - private Integer type; -} diff --git a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/response/errorcode/ErrorCodeResponse.java b/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/response/errorcode/ErrorCodeResponse.java deleted file mode 100644 index c88dcfe7f..000000000 --- a/system/system-rpc-api/src/main/java/cn/iocoder/mall/system/rpc/response/errorcode/ErrorCodeResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.mall.system.rpc.response.errorcode; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 类 描 述：错误码模块 - * @author ding - */ -@ApiModel("管理员 - 错误码模块 - 查询错误码") -@Data -@Accessors(chain = true) -public class ErrorCodeResponse { - /** - * 错误码编号 - */ - private Integer id; - /** - * 错误码编码 - */ - private Integer code; - /** - * 错误码错误信息 - */ - private String message; - /** - * 添加时间 - */ - private Date createTime; -} diff --git a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/errorcode/ErrorCodeConvert.java b/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/errorcode/ErrorCodeConvert.java deleted file mode 100644 index af84d591f..000000000 --- a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/errorcode/ErrorCodeConvert.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.mall.system.rpc.convert.errorcode; - -import cn.iocoder.mall.system.biz.bo.errorcode.ErrorCodeBO; -import cn.iocoder.mall.system.biz.dto.errorcode.ErrorCodeAddDTO; -import cn.iocoder.mall.system.rpc.request.errorcode.ErrorCodeAddRequest; -import cn.iocoder.mall.system.rpc.response.errorcode.ErrorCodeResponse; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -@Mapper -public interface ErrorCodeConvert { - - ErrorCodeConvert INSTANCE = Mappers.getMapper(ErrorCodeConvert.class); - - List convert(List bean); - - ErrorCodeAddDTO convert(ErrorCodeAddRequest errorCodeAddRequest); - - List convertList(List bean); - -} diff --git a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/systemlog/SystemLogConvert.java b/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/systemlog/SystemLogConvert.java deleted file mode 100644 index 02b949642..000000000 --- a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/convert/systemlog/SystemLogConvert.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.mall.system.rpc.convert.systemlog; - -import cn.iocoder.mall.system.biz.dto.system.AccessLogAddDTO; -import cn.iocoder.mall.system.biz.dto.system.ExceptionLogAddDTO; -import cn.iocoder.mall.system.rpc.request.systemlog.AccessLogAddRequest; -import cn.iocoder.mall.system.rpc.request.systemlog.ExceptionLogAddRequest; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface SystemLogConvert { - - SystemLogConvert INSTANCE = Mappers.getMapper(SystemLogConvert.class); - - AccessLogAddDTO convert(AccessLogAddRequest bean); - - ExceptionLogAddDTO convert(ExceptionLogAddRequest bean); - -} diff --git a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/rpc/errorcode/ErrorCodeRPCImpl.java b/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/rpc/errorcode/ErrorCodeRPCImpl.java deleted file mode 100644 index efba09450..000000000 --- a/system/system-rpc/src/main/java/cn/iocoder/mall/system/rpc/rpc/errorcode/ErrorCodeRPCImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.mall.system.rpc.rpc.errorcode; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.system.biz.bo.errorcode.ErrorCodeBO; -import cn.iocoder.mall.system.biz.service.errorcode.ErrorCodeService; -import cn.iocoder.mall.system.rpc.api.errorcode.ErrorCodeRPC; -import cn.iocoder.mall.system.rpc.convert.errorcode.ErrorCodeConvert; -import cn.iocoder.mall.system.rpc.convert.user.UserConvert; -import cn.iocoder.mall.system.rpc.request.errorcode.ErrorCodeAddRequest; -import cn.iocoder.mall.system.rpc.response.errorcode.ErrorCodeResponse; -import org.apache.dubbo.config.annotation.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * - * @author ding - */ -@Service(version = "${dubbo.provider.ErrorCodeRPC.version}", validation = "true") -public class ErrorCodeRPCImpl implements ErrorCodeRPC { - - @Autowired - private ErrorCodeService errorCodeService; - - /** - * 根据分组获取错误码信息 - * @param group 分组 - * @return 错误码信息 - */ - @Override - public CommonResult> getErrorCodeByGroup(Integer group) { - List list = errorCodeService.getErrorCodeByGroup(group); - return CommonResult.success(ErrorCodeConvert.INSTANCE.convert(list)); - } - - /** - * 添加错误码信息，如果是枚举错误码，角色一定是系统内置 - * @param errorCodeAddRequest 错误码 - * @return 是否成功 - */ - @Override - public CommonResult addErrorCode(ErrorCodeAddRequest errorCodeAddRequest) { - errorCodeService.addErrorCode(ErrorCodeConvert.INSTANCE.convert(errorCodeAddRequest)); - return CommonResult.success(true); - } - - /** - * 批量添加错误码信息 - * @param list 错误码信息集合 - * @return 是否成功 - */ - @Override - public CommonResult addErrorCodeList(List list) { - errorCodeService.addErrorCodeList(ErrorCodeConvert.INSTANCE.convertList(list)); - return CommonResult.success(true); - } - - /** - * 根据分组和角色条件删除错误码信息，只能删除db信息，删除后会进行校验，刷新utils - * @param group 分组 - * @param type 角色 - * @return 是否成功 - */ - @Override - public CommonResult deleteErrorCodeByGroup(Integer group, Integer type) { - return null; - } -} diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SystemLogService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SystemLogService.java deleted file mode 100644 index 872f6de1b..000000000 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SystemLogService.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.mall.system.api; - -import cn.iocoder.mall.system.api.bo.systemlog.AccessLogPageBO; -import cn.iocoder.mall.system.api.dto.systemlog.AccessLogPageDTO; - -/** - * 系统日志 Service 接口 - * - * 例如说，访问日志、错误日志、操作日志等等 - */ -public interface SystemLogService { - - AccessLogPageBO getAccessLogPage(AccessLogPageDTO accessLogPageDTO); - -} diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SystemLogServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SystemLogServiceImpl.java deleted file mode 100644 index f12841af7..000000000 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SystemLogServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.iocoder.mall.admin.service; - -import cn.iocoder.common.framework.util.StringUtil; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.api.SystemLogService; -import cn.iocoder.mall.system.api.bo.systemlog.AccessLogBO; -import cn.iocoder.mall.system.api.bo.systemlog.AccessLogPageBO; -import cn.iocoder.mall.system.api.dto.systemlog.AccessLogAddDTO; -import cn.iocoder.mall.system.api.dto.systemlog.AccessLogPageDTO; -import cn.iocoder.mall.system.api.dto.systemlog.ExceptionLogAddDTO; -import cn.iocoder.mall.admin.convert.AccessLogConvert; -import cn.iocoder.mall.admin.dao.AccessLogMapper; -import cn.iocoder.mall.admin.dao.ExceptionLogMapper; -import cn.iocoder.mall.admin.dataobject.AccessLogDO; -import cn.iocoder.mall.admin.dataobject.ExceptionLogDO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -@org.apache.dubbo.config.annotation.Service(validation = "true", version = "${dubbo.provider.AdminAccessLogService.version}") -public class SystemLogServiceImpl implements SystemLogService { - - /** - * 请求参数最大长度。 - */ - private static final Integer QUERY_STRING_MAX_LENGTH = 4096; - /** - * 请求地址最大长度。 - */ - private static final Integer URI_MAX_LENGTH = 4096; - /** - * User-Agent 最大长度。 - */ - private static final Integer USER_AGENT_MAX_LENGTH = 1024; - - @Autowired - private AccessLogMapper accessLogMapper; - @Autowired - private ExceptionLogMapper exceptionLogMapper; - - @Override - @SuppressWarnings("Duplicates") - public void addAccessLog(AccessLogAddDTO adminAccessLogAddDTO) { - // 创建 AdminAccessLogDO - AccessLogDO accessLog = AccessLogConvert.INSTANCE.convert(adminAccessLogAddDTO); - accessLog.setCreateTime(new Date()); - // 截取最大长度 - if (accessLog.getUri().length() > URI_MAX_LENGTH) { - accessLog.setUri(StringUtil.substring(accessLog.getUri(), URI_MAX_LENGTH)); - } - if (accessLog.getQueryString().length() > QUERY_STRING_MAX_LENGTH) { - accessLog.setQueryString(StringUtil.substring(accessLog.getQueryString(), QUERY_STRING_MAX_LENGTH)); - } - if (accessLog.getUserAgent().length() > USER_AGENT_MAX_LENGTH) { - accessLog.setUserAgent(StringUtil.substring(accessLog.getUserAgent(), USER_AGENT_MAX_LENGTH)); - } - // 插入 - accessLogMapper.insert(accessLog); - } - - @Override - @SuppressWarnings("Duplicates") - public void addExceptionLog(ExceptionLogAddDTO exceptionLogAddDTO) { - // 创建 AdminAccessLogDO - ExceptionLogDO exceptionLog = AccessLogConvert.INSTANCE.convert(exceptionLogAddDTO); - exceptionLog.setCreateTime(new Date()); - // 截取最大长度 - if (exceptionLog.getUri().length() > URI_MAX_LENGTH) { - exceptionLog.setUri(StringUtil.substring(exceptionLog.getUri(), URI_MAX_LENGTH)); - } - if (exceptionLog.getQueryString().length() > QUERY_STRING_MAX_LENGTH) { - exceptionLog.setQueryString(StringUtil.substring(exceptionLog.getQueryString(), QUERY_STRING_MAX_LENGTH)); - } - if (exceptionLog.getUserAgent().length() > USER_AGENT_MAX_LENGTH) { - exceptionLog.setUserAgent(StringUtil.substring(exceptionLog.getUserAgent(), USER_AGENT_MAX_LENGTH)); - } - // 插入 - exceptionLogMapper.insert(exceptionLog); - } - - @Override - @SuppressWarnings("Duplicates") - public AccessLogPageBO getAccessLogPage(AccessLogPageDTO accessLogPageDTO) { - AccessLogPageBO accessLogPageBO = new AccessLogPageBO(); - PageResult accessLogPageBOPageResult = AccessLogConvert.INSTANCE.convert( - accessLogMapper.selectPage(accessLogPageDTO)); - accessLogPageBO.setList(accessLogPageBOPageResult.getList()); - accessLogPageBO.setTotal(accessLogPageBOPageResult.getTotal()); - return accessLogPageBO; - } - -}