From 8edc49f4e70e74299c4455fe34deafc5d92847fc Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 22 Jul 2020 07:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E5=AE=8C=E5=96=84?= =?UTF-8?q?=20Dubbo=20=E8=B7=AF=E7=94=B1=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/ServiceExceptionUtil.java | 2 +- .../common/framework/util/OSUtils.java | 14 ++++ .../config/DubboEnvironmentPostProcessor.java | 66 +++++++++++++++++++ .../filter/DubboProviderExceptionFilter.java | 1 + .../web/DubboRouterTagWebInterceptor.java | 11 +++- .../main/resources/META-INF/spring.factories | 3 + .../interceptor/AdminDemoInterceptor.java | 2 +- .../interceptor/AdminSecurityInterceptor.java | 2 +- .../interceptor/UserSecurityInterceptor.java | 2 +- .../errorcode/core/ErrorCodeRemoteLoader.java | 2 +- .../admin/DepartmentController.http | 2 +- .../src/main/resources/application-local.yml | 10 +-- .../src/main/resources/http-client.env.json | 3 +- .../SystemServiceApplication.java | 4 +- .../service/admin/AdminService.java | 2 +- .../service/admin/DepartmentService.java | 2 +- .../service/datadict/DataDictService.java | 2 +- .../service/errorcode/ErrorCodeService.java | 2 +- .../service/oauth/OAuth2Service.java | 2 +- .../service/permission/PermissionService.java | 2 +- .../service/permission/ResourceService.java | 2 +- .../service/permission/RoleService.java | 2 +- .../systemlog/SystemExceptionLogService.java | 2 +- .../src/main/resources/application-local.yaml | 7 +- .../src/main/resources/application.yaml | 1 - .../config/ServiceExceptionConfiguration.java | 2 +- .../service/sms/UserSmsCodeService.java | 2 +- .../user/biz/enums/UserErrorCodeEnum.java | 2 +- .../service/user/UserAddressServiceImpl.java | 2 +- 29 files changed, 122 insertions(+), 36 deletions(-) rename common/common-framework/src/main/java/cn/iocoder/common/framework/{ => exception}/util/ServiceExceptionUtil.java (98%) create mode 100644 common/common-framework/src/main/java/cn/iocoder/common/framework/util/OSUtils.java create mode 100644 common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboEnvironmentPostProcessor.java diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ServiceExceptionUtil.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/exception/util/ServiceExceptionUtil.java similarity index 98% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/util/ServiceExceptionUtil.java rename to common/common-framework/src/main/java/cn/iocoder/common/framework/exception/util/ServiceExceptionUtil.java index ea4adfe4..0a758db9 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ServiceExceptionUtil.java +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/exception/util/ServiceExceptionUtil.java @@ -1,4 +1,4 @@ -package cn.iocoder.common.framework.util; +package cn.iocoder.common.framework.exception.util; import cn.iocoder.common.framework.exception.ErrorCode; import cn.iocoder.common.framework.exception.ServiceException; diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/OSUtils.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/OSUtils.java new file mode 100644 index 00000000..930902c7 --- /dev/null +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/OSUtils.java @@ -0,0 +1,14 @@ +package cn.iocoder.common.framework.util; + +import cn.hutool.system.SystemUtil; + +/** + * 操作系统工具类 + */ +public class OSUtils { + + public static String getHostName() { + return SystemUtil.getHostInfo().getName(); + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboEnvironmentPostProcessor.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboEnvironmentPostProcessor.java new file mode 100644 index 00000000..e17fc597 --- /dev/null +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/config/DubboEnvironmentPostProcessor.java @@ -0,0 +1,66 @@ +package cn.iocoder.mall.dubbo.config; + +import cn.iocoder.common.framework.util.OSUtils; +import cn.iocoder.common.framework.util.StringUtils; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.core.env.PropertySource; +import org.springframework.util.CollectionUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * Dubbo 配置项的后置处理器，主要目的如下： + * + * 1. 生成 {@link #DUBBO_TAG_PROPERTIES_KEY} 配置项，可用于本地开发环境下的 dubbo.provider.tag 配置项 + */ +public class DubboEnvironmentPostProcessor implements EnvironmentPostProcessor { + + /** + * 默认配置项的 PropertySource 名字 + */ + private static final String PROPERTY_SOURCE_NAME = "mallDubboProperties"; + + /** + * Dubbo 路由标签属性 KEY + */ + private static final String DUBBO_TAG_PROPERTIES_KEY = "DUBBO_TAG"; + + @Override + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { + // 需要修改的配置项 + Map modifyProperties = new HashMap<>(); + // 生成 DUBBO_TAG_PROPERTIES_KEY，使用 hostname + String dubboTag = OSUtils.getHostName(); + if (!StringUtils.hasText(dubboTag)) { + dubboTag = StringUtils.uuid(true); // 兜底，强行生成一个 + } + modifyProperties.put(DUBBO_TAG_PROPERTIES_KEY, dubboTag); + // 添加到 environment 中，排在最优，最低优先级 + addOrReplace(environment.getPropertySources(), modifyProperties); + } + + private void addOrReplace(MutablePropertySources propertySources, Map map) { + if (CollectionUtils.isEmpty(map)) { + return; + } + // 情况一，如果存在 defaultProperties 的 PropertySource，则进行 key 的修改 + if (propertySources.contains(PROPERTY_SOURCE_NAME)) { + PropertySource source = propertySources.get(PROPERTY_SOURCE_NAME); + if (source instanceof MapPropertySource) { + MapPropertySource target = (MapPropertySource) source; + for (String key : map.keySet()) { + target.getSource().put(key, map.get(key)); + } + } + return; + } + // 情况二，不存在 defaultProperties 的 PropertySource，则直接添加到其中 + propertySources.addLast(new MapPropertySource(PROPERTY_SOURCE_NAME, map)); + } + +} diff --git a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboProviderExceptionFilter.java b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboProviderExceptionFilter.java index 7f6328ed..9a33e167 100644 --- a/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboProviderExceptionFilter.java +++ b/common/mall-spring-boot-starter-dubbo/src/main/java/cn/iocoder/mall/dubbo/core/filter/DubboProviderExceptionFilter.java @@ -51,6 +51,7 @@ public class DubboProviderExceptionFilter implements Filter, Filter.Listener { appResponse.setValue(CommonResult.error((ServiceException) exception)); // 2.2 如果是 GlobalException 全局异常，则直接抛出 } else { + // TODO 优化点：尝试修改成 RpcException appResponse.setException(exception); } } catch (Throwable e) { 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 index c7ce6271..17bf0bbc 100644 --- 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 @@ -1,11 +1,10 @@ package cn.iocoder.mall.dubbo.core.web; +import cn.iocoder.common.framework.util.OSUtils; import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.mall.dubbo.core.cluster.interceptor.DubboConsumerRouterTagClusterInterceptor; import cn.iocoder.mall.dubbo.core.filter.DubboProviderRouterTagFilter; import cn.iocoder.mall.dubbo.core.router.DubboRouterTagContextHolder; -import org.apache.dubbo.common.constants.CommonConstants; -import org.apache.dubbo.rpc.RpcContext; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; @@ -22,12 +21,18 @@ public class DubboRouterTagWebInterceptor implements HandlerInterceptor { private static final String HEADER_DUBBO_TAG = "dubbo-tag"; + private static final String HOST_NAME_VALUE = "${HOSTNAME}"; + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { String tag = request.getHeader(HEADER_DUBBO_TAG); if (StringUtils.hasText(tag)) { + // 特殊逻辑，解决 IDEA Rest Client 不支持环境变量的读取，所以就服务器来做 + if (HOST_NAME_VALUE.equals(tag)) { + tag = OSUtils.getHostName(); + } + // 设置到 DubboRouterTagContextHolder 上下文 DubboRouterTagContextHolder.setTag(tag); - RpcContext.getContext().setAttachment(CommonConstants.TAG_KEY, tag); } return true; } 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 index 0427a506..4e6ca3aa 100644 --- 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 @@ -1,2 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ cn.iocoder.mall.dubbo.config.DubboWebAutoConfiguration + +org.springframework.boot.env.EnvironmentPostProcessor=\ + cn.iocoder.mall.dubbo.config.DubboEnvironmentPostProcessor diff --git a/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminDemoInterceptor.java b/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminDemoInterceptor.java index 9f72b5a6..3659b1f7 100644 --- a/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminDemoInterceptor.java +++ b/common/mall-spring-boot-starter-security-admin/src/main/java/cn/iocoder/mall/security/admin/core/interceptor/AdminDemoInterceptor.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.security.admin.core.interceptor; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.security.admin.core.context.AdminSecurityContextHolder; import cn.iocoder.mall.systemservice.enums.SystemErrorCodeConstants; import org.springframework.http.HttpMethod; 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 645e89e4..094a5333 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 @@ -4,7 +4,7 @@ import cn.iocoder.common.framework.enums.UserTypeEnum; import cn.iocoder.common.framework.exception.GlobalException; import cn.iocoder.common.framework.util.CollectionUtils; import cn.iocoder.common.framework.util.HttpUtil; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +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; 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 5085a27e..e0b2023c 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 @@ -3,7 +3,7 @@ package cn.iocoder.mall.security.user.core.interceptor; import cn.iocoder.common.framework.exception.enums.GlobalErrorCodeEnum; import cn.iocoder.common.framework.enums.UserTypeEnum; import cn.iocoder.common.framework.util.HttpUtil; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; 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; 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 db5d8d2d..527d6449 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 @@ -2,7 +2,7 @@ package cn.iocoder.mall.system.errorcode.core; import cn.iocoder.common.framework.util.CollectionUtils; import cn.iocoder.common.framework.util.DateUtil; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +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.vo.ErrorCodeVO; 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 ea970182..64cc9394 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,7 +2,7 @@ POST {{baseUrl}}/department/create Content-Type: application/x-www-form-urlencoded Authorization: Bearer {{accessToken}} -dubbo-tag: yunai +dubbo-tag: {{dubboTag}} name=测试部门&pid=0&sort=0 diff --git a/management-web-app/src/main/resources/application-local.yml b/management-web-app/src/main/resources/application-local.yml index b0388107..4a84b973 100644 --- a/management-web-app/src/main/resources/application-local.yml +++ b/management-web-app/src/main/resources/application-local.yml @@ -5,16 +5,12 @@ spring: # Spring Cloud Nacos Discovery 配置项 discovery: server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址 - namespace: local # Nacos 命名空间 + namespace: dev # Nacos 命名空间 # Dubbo 配置项 dubbo: # Dubbo 注册中心 registry: # address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址 -# address: nacos://400-infra.server.iocoder.cn:8848?namespace=local # 指定 Dubbo 服务注册中心的地址 - protocol: nacos - address: 400-infra.server.iocoder.cn:8848?namespace=local - timeout: 20000 - register: true - subscribe: true + address: nacos://400-infra.server.iocoder.cn:8848?namespace=dev # 指定 Dubbo 服务注册中心的地址 + diff --git a/management-web-app/src/main/resources/http-client.env.json b/management-web-app/src/main/resources/http-client.env.json index 5c4488e1..5f4c4600 100644 --- a/management-web-app/src/main/resources/http-client.env.json +++ b/management-web-app/src/main/resources/http-client.env.json @@ -1,6 +1,7 @@ { "local": { "baseUrl": "http://127.0.0.1:18083/management-api/", - "accessToken": "yudaoyuanma" + "accessToken": "yudaoyuanma", + "dubboTag": "${HOSTNAME}" } } 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 7c1623bb..13349c96 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,14 +2,12 @@ package cn.iocoder.mall.systemservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; @SpringBootApplication public class SystemServiceApplication { public static void main(String[] args) { - ConfigurableApplicationContext context = SpringApplication.run(SystemServiceApplication.class, args); - System.out.println(context); + SpringApplication.run(SystemServiceApplication.class, args); } } diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/AdminService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/AdminService.java index 37d167dd..2ea251f5 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/AdminService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/AdminService.java @@ -2,7 +2,7 @@ package cn.iocoder.mall.systemservice.service.admin; import cn.iocoder.common.framework.enums.CommonStatusEnum; import cn.iocoder.common.framework.util.DigestUtils; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.systemservice.convert.admin.AdminConvert; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/DepartmentService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/DepartmentService.java index dfd322c5..fe424229 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/DepartmentService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/DepartmentService.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.systemservice.service.admin; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.systemservice.convert.admin.DepartmentConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.admin.DepartmentDO; import cn.iocoder.mall.systemservice.dal.mysql.mapper.admin.AdminMapper; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/datadict/DataDictService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/datadict/DataDictService.java index 695aafc0..f30fb8cb 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/datadict/DataDictService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/datadict/DataDictService.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.systemservice.service.datadict; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.systemservice.convert.datadict.DataDictConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.datadict.DataDictDO; import cn.iocoder.mall.systemservice.dal.mysql.mapper.datadict.DataDictMapper; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/errorcode/ErrorCodeService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/errorcode/ErrorCodeService.java index 3616bf1d..766f5440 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/errorcode/ErrorCodeService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/errorcode/ErrorCodeService.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.systemservice.service.errorcode; import cn.iocoder.common.framework.util.CollectionUtils; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.systemservice.convert.errorcode.ErrorCodeConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.errorcode.ErrorCodeDO; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/oauth/OAuth2Service.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/oauth/OAuth2Service.java index 61b9fb58..5c7167f0 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/oauth/OAuth2Service.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/oauth/OAuth2Service.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.systemservice.service.oauth; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.mall.systemservice.convert.oauth.OAuth2Convert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.oauth.OAuth2AccessTokenDO; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/PermissionService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/PermissionService.java index 57bd0c9d..782196c4 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/PermissionService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/PermissionService.java @@ -3,7 +3,7 @@ package cn.iocoder.mall.systemservice.service.permission; import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.common.framework.exception.GlobalException; import cn.iocoder.common.framework.util.CollectionUtils; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.admin.AdminDO; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.permission.AdminRoleDO; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.permission.ResourceDO; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/ResourceService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/ResourceService.java index 41ddb7e2..64ef9c91 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/ResourceService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/ResourceService.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.systemservice.service.permission; import cn.iocoder.common.framework.util.CollectionUtils; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.systemservice.convert.permission.ResourceConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.permission.ResourceDO; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.permission.RoleResourceDO; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/RoleService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/RoleService.java index f800ac6e..68555bc4 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/RoleService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/RoleService.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.systemservice.service.permission; import cn.iocoder.common.framework.util.CollectionUtils; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.systemservice.convert.permission.RoleConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.permission.AdminRoleDO; diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/SystemExceptionLogService.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/SystemExceptionLogService.java index 4742a5d9..18270ddf 100644 --- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/SystemExceptionLogService.java +++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/SystemExceptionLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.systemservice.service.systemlog; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.systemservice.convert.systemlog.SystemExceptionLogConvert; import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.SystemExceptionLogDO; diff --git a/system-service-project/system-service-app/src/main/resources/application-local.yaml b/system-service-project/system-service-app/src/main/resources/application-local.yaml index e15afd4d..1b5420be 100644 --- a/system-service-project/system-service-app/src/main/resources/application-local.yaml +++ b/system-service-project/system-service-app/src/main/resources/application-local.yaml @@ -11,11 +11,14 @@ spring: # Spring Cloud Nacos Discovery 配置项 discovery: server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址 - namespace: local # Nacos 命名空间 + namespace: dev # Nacos 命名空间 # Dubbo 配置项 dubbo: # Dubbo 注册中心 registry: # address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址 - address: nacos://400-infra.server.iocoder.cn:8848?namespace=local # 指定 Dubbo 服务注册中心的地址 + address: nacos://400-infra.server.iocoder.cn:8848?namespace=dev # 指定 Dubbo 服务注册中心的地址 + # Dubbo 服务提供者的配置 + provider: + tag: ${DUBBO_TAG} # Dubbo 路由分组 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 8fd84f97..fb911809 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,7 +34,6 @@ dubbo: provider: filter: -exception validation: true # 开启 Provider 参数校验 - tag: OAuth2Rpc: version: 1.0.0 AdminRpc: diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/ServiceExceptionConfiguration.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/ServiceExceptionConfiguration.java index 8a9596bd..beea8870 100644 --- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/ServiceExceptionConfiguration.java +++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/ServiceExceptionConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.userservice.config; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.userservice.enums.UserErrorCodeConstants; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.annotation.Configuration; diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/sms/UserSmsCodeService.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/sms/UserSmsCodeService.java index f3a1f758..e3e627c4 100644 --- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/sms/UserSmsCodeService.java +++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/sms/UserSmsCodeService.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.userservice.service.sms; import cn.iocoder.common.framework.exception.ServiceException; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.common.framework.validator.Mobile; import cn.iocoder.mall.userservice.dal.mysql.dataobject.sms.UserSmsCodeDO; import cn.iocoder.mall.userservice.dal.mysql.mapper.sms.UserSmsCodeMapper; diff --git a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/enums/UserErrorCodeEnum.java b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/enums/UserErrorCodeEnum.java index 10ce8d33..1b30e491 100644 --- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/enums/UserErrorCodeEnum.java +++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/enums/UserErrorCodeEnum.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.user.biz.enums; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; /** * 错误码枚举类 diff --git a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java index c36c74d8..7b2652c8 100644 --- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java +++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.user.biz.service.user; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil; import cn.iocoder.mall.mybatis.core.enums.DeletedStatusEnum; import cn.iocoder.mall.user.biz.bo.user.UserAddressBO; import cn.iocoder.mall.user.biz.convert.user.UserAddressConvert;