diff --git a/README.md b/README.md index 33068f94f..df87b8e82 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ TODO 此处应有一个架构图的装逼 JPG 图。 | [Redis](https://redis.io/) | key-value 数据库 | 暂未引入，等压测后，部分模块 | | [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 暂未引入，等压测后，部分模块 | | [Elasticsearch](https://www.elastic.co/cn/) | 分布式搜索引擎 | 6.7.1 | -| [Dubbo](http://dubbo.apache.org/) | 分布式 RPC 服务框架 | 2.6.5 | +| [Dubbo](http://dubbo.apache.org/) | 分布式 RPC 服务框架 | 2.7.1 | | [RocketMQ](http://dubbo.apache.org/) | 消息中间件 | 4.3.2 | | [SkyWalking](http://skywalking.apache.org/) | 分布式应用追踪系统 | 6.0.0 | | [Zookeeper](http://zookeeper.apache.org/) | 分布式系统协调 | 3.4.9 作为注册中心 | diff --git a/admin/admin-application/pom.xml b/admin/admin-application/pom.xml index 78b019b24..16dbb54e3 100644 --- a/admin/admin-application/pom.xml +++ b/admin/admin-application/pom.xml @@ -39,20 +39,6 @@ test - - com.alibaba - dubbo - - - com.alibaba.boot - dubbo-spring-boot-starter - - - - org.apache.curator - curator-framework - - io.springfox springfox-swagger2 diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java index 802debaa8..b4f199ad4 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java @@ -1,9 +1,12 @@ package cn.iocoder.mall.admin.application.config; import cn.iocoder.common.framework.config.GlobalExceptionHandler; +import cn.iocoder.common.framework.servlet.CorsFilter; import cn.iocoder.mall.admin.sdk.interceptor.AdminAccessLogInterceptor; import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.web.servlet.config.annotation.*; @@ -37,13 +40,12 @@ public class MVCConfiguration implements WebMvcConfigurer { registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); } - // TODO 芋艿，允许跨域 - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedHeaders("*") - .allowedMethods("*") - .allowedOrigins("*"); + @Bean + public FilterRegistrationBean corsFilter() { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + registrationBean.setFilter(new CorsFilter()); + registrationBean.addUrlPatterns("/*"); + return registrationBean; } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java index 6dfbe3a12..95a68fbc7 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java @@ -18,11 +18,11 @@ import cn.iocoder.mall.admin.application.vo.AdminPageVO; import cn.iocoder.mall.admin.application.vo.AdminRoleVO; import cn.iocoder.mall.admin.application.vo.AdminVO; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -33,11 +33,11 @@ import java.util.stream.Collectors; @Api("管理员模块") public class AdminController { - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private ResourceService resourceService; - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private AdminService adminService; - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private RoleService roleService; // =========== 当前管理员相关的资源 API =========== @@ -171,4 +171,4 @@ public class AdminController { return adminService.assignRole(AdminSecurityContextHolder.getContext().getAdminId(), id, roleIds); } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java index 8e283a710..2bf7a66e1 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java @@ -9,7 +9,7 @@ import cn.iocoder.mall.admin.application.convert.DataDictConvert; import cn.iocoder.mall.admin.application.vo.DataDictEnumVO; import cn.iocoder.mall.admin.application.vo.DataDictVO; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Multimaps; import io.swagger.annotations.Api; @@ -26,7 +26,7 @@ import java.util.List; @Api("数据字典模块") public class DataDictController { - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private DataDictService dataDictService; @GetMapping("/list") @@ -107,4 +107,4 @@ public class DataDictController { return dataDictService.deleteDataDict(AdminSecurityContextHolder.getContext().getAdminId(), id); } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java index 2c52286f9..8903b9ac5 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java @@ -5,11 +5,11 @@ import cn.iocoder.mall.admin.api.OAuth2Service; import cn.iocoder.mall.admin.api.bo.OAuth2AccessTokenBO; import cn.iocoder.mall.admin.application.convert.PassportConvert; import cn.iocoder.mall.admin.application.vo.PassportLoginVO; -import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @Api("Admin Passport 模块") public class PassportController { - @Reference + @Reference(validation = "true", lazy = true) private OAuth2Service oauth2Service; @PostMapping("/login") @@ -39,4 +39,4 @@ public class PassportController { // TODO 功能 refresh_token -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java index 55faed61d..3fb45e1d9 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java @@ -10,7 +10,7 @@ import cn.iocoder.mall.admin.application.convert.ResourceConvert; import cn.iocoder.mall.admin.application.vo.ResourceTreeNodeVO; import cn.iocoder.mall.admin.application.vo.ResourceVO; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; @Api("资源模块") public class ResourceController { - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private ResourceService resourceService; @SuppressWarnings("Duplicates") @@ -106,4 +106,4 @@ public class ResourceController { return resourceService.deleteResource(AdminSecurityContextHolder.getContext().getAdminId(), id); } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java index a0494807b..3560fc518 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java @@ -16,7 +16,7 @@ import cn.iocoder.mall.admin.application.vo.RolePageVO; import cn.iocoder.mall.admin.application.vo.RoleResourceTreeNodeVO; import cn.iocoder.mall.admin.application.vo.RoleVO; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -29,9 +29,9 @@ import java.util.stream.Collectors; @RequestMapping("admins/role") public class RoleController { - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private RoleService roleService; - @Reference(validation = "true") + @Reference(validation = "true", lazy = true) private ResourceService resourceService; @GetMapping("/page") @@ -124,4 +124,4 @@ public class RoleController { return roleService.assignResource(AdminSecurityContextHolder.getContext().getAdminId(), id, resourceIds); } -} \ No newline at end of file +} diff --git a/admin/admin-sdk/pom.xml b/admin/admin-sdk/pom.xml index 376cb059b..80f49a798 100644 --- a/admin/admin-sdk/pom.xml +++ b/admin/admin-sdk/pom.xml @@ -17,19 +17,16 @@ org.springframework spring-context 5.1.5.RELEASE - compile org.springframework spring-webmvc 5.1.5.RELEASE - compile - com.alibaba + org.apache.dubbo dubbo - 2.6.5 diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java index 7cd08dda8..d101dde3a 100644 --- a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java +++ b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java @@ -3,9 +3,9 @@ package cn.iocoder.mall.admin.sdk.interceptor; import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.mall.admin.api.AdminAccessLogService; import cn.iocoder.mall.admin.api.dto.AdminAccessLogAddDTO; -import com.alibaba.dubbo.config.annotation.Reference; 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.stereotype.Component; @@ -32,7 +32,7 @@ public class AdminAccessLogInterceptor extends HandlerInterceptorAdapter { */ private static final ThreadLocal ADMIN_ID = new ThreadLocal<>(); - @Reference + @Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。 private AdminAccessLogService adminAccessLogService; @Override @@ -44,6 +44,9 @@ public class AdminAccessLogInterceptor extends HandlerInterceptorAdapter { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { + if (adminAccessLogService == null) { + throw new IllegalStateException("AdminAccessLogService 服务未引入成功"); + } AdminAccessLogAddDTO accessLog = new AdminAccessLogAddDTO(); try { accessLog.setAdminId(ADMIN_ID.get()); diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java index 876071167..1845793e1 100644 --- a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java +++ b/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java @@ -8,7 +8,7 @@ import cn.iocoder.mall.admin.api.bo.OAuth2AuthenticationBO; import cn.iocoder.mall.admin.api.constant.AdminErrorCodeEnum; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContext; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -22,7 +22,7 @@ import java.util.Set; @Component public class AdminSecurityInterceptor extends HandlerInterceptorAdapter { - @Reference + @Reference(lazy = true) // TODO 芋艿，初始化时，会存在 spring boot 启动时，服务无法引用的情况，先暂时这么解决。 private OAuth2Service oauth2Service; @Override @@ -74,4 +74,4 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter { } } -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java index 5291f40aa..c85823ed2 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; /** @@ -10,7 +11,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class AdminBO { +public class AdminBO implements Serializable { /** * 管理员编号 diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java index 21501ebbf..ad82042ae 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.List; /** @@ -10,7 +11,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class AdminPageBO { +public class AdminPageBO implements Serializable { /** * 管理员数组 diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java index 533d7f424..8cbebc291 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; /** @@ -10,7 +11,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class ResourceBO { +public class ResourceBO implements Serializable { /** * 资源编号 diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java index ee82360d8..c80d62475 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; /** @@ -10,7 +11,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class RoleBO { +public class RoleBO implements Serializable { /** * 角色编号 diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java index 13957afa7..d6eecf4c4 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.api.bo; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.List; /** @@ -10,7 +11,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class RolePageBO { +public class RolePageBO implements Serializable { /** * 角色数组 diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java index 1155404ed..684fe0736 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -12,7 +13,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class AdminAccessLogAddDTO { +public class AdminAccessLogAddDTO implements Serializable { /** * 管理员编号 - 空 diff --git a/admin/admin-service-impl/pom.xml b/admin/admin-service-impl/pom.xml index 7897c833a..67c28849f 100644 --- a/admin/admin-service-impl/pom.xml +++ b/admin/admin-service-impl/pom.xml @@ -29,9 +29,21 @@ - com.alibaba + org.apache.dubbo dubbo + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.dubbo + dubbo-spring-boot-starter + org.mybatis.spring.boot diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java index c2f5d7160..5b2efa419 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import java.util.Date; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class AdminAccessLogServiceImpl implements AdminAccessLogService { /** @@ -53,4 +53,4 @@ public class AdminAccessLogServiceImpl implements AdminAccessLogService { return CommonResult.success(true); } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java index c71f21ccb..e9bad1796 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.stream.Collectors; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class AdminServiceImpl implements AdminService { @Autowired diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java index 8262f9394..22ec7cf1e 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 数据字典 Service */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class DataDictServiceImpl implements DataDictService { @Autowired @@ -111,4 +111,4 @@ public class DataDictServiceImpl implements DataDictService { List dataDictBOList = DataDictConvert.INSTANCE.convert(dataDictDOList); return CommonResult.success(dataDictBOList); } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java index 3215002dc..3086f9d1e 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.UUID; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class OAuth2ServiceImpl implements OAuth2Service { /** @@ -142,4 +142,4 @@ public class OAuth2ServiceImpl implements OAuth2Service { return UUID.randomUUID().toString().replaceAll("-", ""); } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java index d0b83b8a2..d81b83286 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ResourceServiceImpl implements ResourceService { @Autowired @@ -156,4 +156,4 @@ public class ResourceServiceImpl implements ResourceService { return false; } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java index 32948452b..083c82a20 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.stream.Collectors; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class RoleServiceImpl implements RoleService { @Autowired @@ -160,4 +160,4 @@ public class RoleServiceImpl implements RoleService { return roleMapper.selectListByIds(roleIds); } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/resources/config/application.yaml b/admin/admin-service-impl/src/main/resources/config/application.yaml index 6aa6f2f99..c1b859cdb 100644 --- a/admin/admin-service-impl/src/main/resources/config/application.yaml +++ b/admin/admin-service-impl/src/main/resources/config/application.yaml @@ -22,4 +22,4 @@ dubbo: port: -1 name: dubbo scan: - base-packages: cn.iocoder.mall.admin.service \ No newline at end of file + base-packages: cn.iocoder.mall.admin.service diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ExceptionUtil.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ExceptionUtil.java index 35c81c4a5..43aa06242 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ExceptionUtil.java +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/ExceptionUtil.java @@ -21,6 +21,7 @@ public class ExceptionUtil { // 原因是： // 1. Dubbo 动态代理 Wrapper 会将抛出的异常，包装成 InvocationTargetException 异常 // 2. Spring AOP 发现是 InvocationTargetException 异常是非方法定义的异常，则会包装成 UndeclaredThrowableException 异常。 + @Deprecated // https://github.com/apache/incubator-dubbo/issues/3386 Dubbo 2.6.5 会触发该问题，在 2.7.1 版本已经解决。 public static ServiceException getServiceException(UndeclaredThrowableException e) { Throwable undeclaredThrowable = e.getUndeclaredThrowable(); if (undeclaredThrowable instanceof InvocationTargetException) { @@ -33,12 +34,13 @@ public class ExceptionUtil { return null; } + @Deprecated // https://github.com/apache/incubator-dubbo/issues/3386 Dubbo 2.6.5 会触发该问题，在 2.7.1 版本已经解决。 public static ConstraintViolationException getConstraintViolationException(UndeclaredThrowableException e) { Throwable undeclaredThrowable = e.getUndeclaredThrowable(); if (undeclaredThrowable instanceof InvocationTargetException) { InvocationTargetException invocationTargetException = (InvocationTargetException) undeclaredThrowable; Throwable targetException = invocationTargetException.getTargetException(); - if (targetException != null && targetException instanceof ConstraintViolationException) { + if (targetException instanceof ConstraintViolationException) { return (ConstraintViolationException) targetException; } } @@ -49,4 +51,4 @@ public class ExceptionUtil { return ExceptionUtils.getRootCauseMessage(th); } -} \ No newline at end of file +} diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java index 76da3c6dc..3b3bff303 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java @@ -21,7 +21,7 @@ import cn.iocoder.mall.order.application.po.user.OrderCreatePO; import cn.iocoder.mall.order.application.po.user.OrderReturnApplyPO; import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java index b5caefa19..b8a4b7410 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java @@ -10,7 +10,7 @@ import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoWithOrderBO; import cn.iocoder.mall.order.api.constant.DictKeyConstants; import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java index 113bde6fb..a19249ce4 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java @@ -9,7 +9,7 @@ import cn.iocoder.mall.order.api.constant.DictKeyConstants; import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO; import cn.iocoder.mall.order.application.convert.OrderReturnConvert; import cn.iocoder.mall.order.application.po.user.OrderReturnApplyPO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersCartController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersCartController.java index 075b40b19..46d3ca5c5 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersCartController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersCartController.java @@ -15,7 +15,7 @@ import cn.iocoder.mall.promotion.api.CouponService; import cn.iocoder.mall.promotion.api.bo.CouponCardAvailableBO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java index 745562581..f9c4c0f1e 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java @@ -21,7 +21,7 @@ import cn.iocoder.mall.promotion.api.PromotionActivityService; import cn.iocoder.mall.promotion.api.bo.CouponCardDetailBO; import cn.iocoder.mall.promotion.api.bo.PromotionActivityBO; import cn.iocoder.mall.promotion.api.constant.*; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 购物车服务 Service 实现类 */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class CartServiceImpl implements CartService { @Reference(validation = "true") diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java index 07542769c..b00c40fcb 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; * @time 2019-04-12 21:32 */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class OrderLogisticsServiceImpl implements OrderLogisticsService { @Autowired diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java index a56a23ef2..4e99c2f93 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java @@ -1,7 +1,6 @@ package cn.iocoder.mall.order.biz.service; import cn.iocoder.common.framework.constant.DeletedStatusEnum; -import cn.iocoder.common.framework.exception.ServiceException; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.order.api.OrderLogisticsService; @@ -13,13 +12,12 @@ import cn.iocoder.mall.order.api.constant.OrderReturnStatusEnum; import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO; import cn.iocoder.mall.order.biz.convert.OrderReturnConvert; import cn.iocoder.mall.order.biz.dao.OrderItemMapper; -import cn.iocoder.mall.order.biz.dao.OrderLogisticsMapper; import cn.iocoder.mall.order.biz.dao.OrderMapper; import cn.iocoder.mall.order.biz.dao.OrderReturnMapper; import cn.iocoder.mall.order.biz.dataobject.OrderDO; import cn.iocoder.mall.order.biz.dataobject.OrderItemDO; import cn.iocoder.mall.order.biz.dataobject.OrderReturnDO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -35,7 +33,7 @@ import java.util.UUID; * @time 2019-03-30 15:35 */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class OrderReturnServiceImpl implements OrderReturnService { @Autowired diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java index c5d5266bc..38808005a 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java @@ -21,7 +21,7 @@ import cn.iocoder.mall.product.api.bo.ProductSkuDetailBO; import cn.iocoder.mall.promotion.api.CouponService; import cn.iocoder.mall.user.api.UserAddressService; import cn.iocoder.mall.user.api.bo.UserAddressBO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; * @time 2019-03-16 15:08 */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class OrderServiceImpl implements OrderService { /** diff --git a/pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/controller/users/PayTransactionController.java b/pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/controller/users/PayTransactionController.java index fff014ffe..ffa43427a 100644 --- a/pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/controller/users/PayTransactionController.java +++ b/pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/controller/users/PayTransactionController.java @@ -8,7 +8,7 @@ import cn.iocoder.mall.pay.api.bo.PayTransactionSubmitBO; import cn.iocoder.mall.pay.api.constant.PayChannelEnum; import cn.iocoder.mall.pay.api.dto.PayTransactionSubmitDTO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; diff --git a/pay/pay-application/src/test/java/DubboGenericInvokerTest.java b/pay/pay-application/src/test/java/DubboGenericInvokerTest.java index 082193a0a..0cf7cfd2d 100644 --- a/pay/pay-application/src/test/java/DubboGenericInvokerTest.java +++ b/pay/pay-application/src/test/java/DubboGenericInvokerTest.java @@ -1,7 +1,7 @@ -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.rpc.service.GenericService; public class DubboGenericInvokerTest { diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java index 9cbbe1102..c6e6a47c3 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java @@ -4,8 +4,8 @@ import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.pay.biz.dataobject.PayRefundDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import org.apache.fastjson.JSON; +import org.apache.fastjson.JSONObject; import com.google.common.collect.ImmutableMap; import com.pingplusplus.Pingpp; import com.pingplusplus.exception.*; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java index b04ae34d1..11f3785d7 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java @@ -1,9 +1,9 @@ package cn.iocoder.mall.pay.biz.component; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.rpc.service.GenericService; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java index 4ff7343d4..67b89f678 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/AbstractPayNotifySuccessConsumer.java @@ -9,7 +9,7 @@ import cn.iocoder.mall.pay.biz.dao.PayNotifyLogMapper; import cn.iocoder.mall.pay.biz.dao.PayNotifyTaskMapper; import cn.iocoder.mall.pay.biz.dataobject.PayNotifyLogDO; import cn.iocoder.mall.pay.biz.dataobject.PayNotifyTaskDO; -import com.alibaba.fastjson.JSON; +import org.apache.fastjson.JSON; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayRefundSuccessConsumer.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayRefundSuccessConsumer.java index bd1816f0f..c35e7be5f 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayRefundSuccessConsumer.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayRefundSuccessConsumer.java @@ -4,7 +4,7 @@ import cn.iocoder.mall.pay.api.message.PayRefundSuccessMessage; import cn.iocoder.mall.pay.biz.component.DubboReferencePool; import cn.iocoder.mall.pay.biz.dao.PayRefundMapper; import cn.iocoder.mall.pay.biz.dataobject.PayRefundDO; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.service.GenericService; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayTransactionSuccessConsumer.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayTransactionSuccessConsumer.java index dc2249db1..215fe7633 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayTransactionSuccessConsumer.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/mq/PayTransactionSuccessConsumer.java @@ -4,7 +4,7 @@ import cn.iocoder.mall.pay.api.message.PayTransactionSuccessMessage; import cn.iocoder.mall.pay.biz.component.DubboReferencePool; import cn.iocoder.mall.pay.biz.dao.PayTransactionMapper; import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.service.GenericService; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayRefundServiceImpl.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayRefundServiceImpl.java index 3f7cd0c58..9f8a038a2 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayRefundServiceImpl.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayRefundServiceImpl.java @@ -30,7 +30,7 @@ import javax.annotation.Resource; import java.util.Date; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class PayRefundServiceImpl implements PayRefundService { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayTransactionServiceImpl.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayTransactionServiceImpl.java index 52837735c..16dbe3fa4 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayTransactionServiceImpl.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayTransactionServiceImpl.java @@ -30,7 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class PayTransactionServiceImpl implements PayTransactionService { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/pom.xml b/pom.xml index 2a0412533..f2bef62f1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,11 +28,13 @@ 2.1.4.RELEASE - 2.6.5 + + 2.7.1 5.1.47 - 0.2.1.RELEASE + 1.3.0.Final - 2.12.0 + + 2.13.0 2.9.2 2.0.0 2.0.1 @@ -47,15 +49,26 @@ + + + + + + + + + + + - com.alibaba + org.apache.dubbo dubbo - ${com.alibab.dubbo.version} + ${dubbo.version} - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter - ${dubbo-spring-boot-starter.version} + ${dubbo.version} @@ -86,6 +99,11 @@ curator-framework ${curator.version} + + org.apache.curator + curator-recipes + ${curator.version} + io.springfox diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 4633a9966..b66f0b947 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -64,14 +64,9 @@ - com.alibaba - dubbo - - - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter - org.apache.curator curator-framework diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java index 9ffa32a25..9c11bc9ea 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java @@ -13,7 +13,7 @@ import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrPageVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrSimpleVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductAttrValueVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -135,4 +135,4 @@ public class AdminsProductAttrController { // TODO 芋艿 暂时不考虑 delete Attr Value 。因为关联逻辑比较多 -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java index c71ea9e55..78f921ff7 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java @@ -10,7 +10,7 @@ import cn.iocoder.mall.product.api.dto.ProductCategoryUpdateDTO; import cn.iocoder.mall.product.application.convert.ProductCategoryConvert; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryTreeNodeVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java index fc2c122d0..a5b13b23c 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java @@ -12,7 +12,7 @@ import cn.iocoder.mall.product.api.dto.ProductSpuUpdateDTO; import cn.iocoder.mall.product.application.convert.ProductSpuConvert; import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuDetailVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductSpuPageVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java index a7d6721e2..9b82cdad2 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java @@ -6,7 +6,7 @@ import cn.iocoder.mall.product.api.bo.ProductCategoryBO; import cn.iocoder.mall.product.application.convert.ProductCategoryConvert; import cn.iocoder.mall.product.application.vo.users.UsersProductCategoryVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java index 27238c00e..9760dff38 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java @@ -8,7 +8,7 @@ import cn.iocoder.mall.product.application.convert.ProductSpuConvert; import cn.iocoder.mall.product.application.vo.users.UsersProductSpuDetailVO; import cn.iocoder.mall.product.application.vo.users.UsersProductSpuPageVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/product/product-service-impl/pom.xml b/product/product-service-impl/pom.xml index 5e6269a2d..689429bf9 100644 --- a/product/product-service-impl/pom.xml +++ b/product/product-service-impl/pom.xml @@ -33,7 +33,7 @@ - com.alibaba + org.apache.dubbo dubbo diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java index b4c17695d..4d3003e53 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; * @see cn.iocoder.mall.product.dataobject.ProductAttrValueDO */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ProductAttrServiceImpl implements ProductAttrService { @Autowired @@ -233,4 +233,4 @@ public class ProductAttrServiceImpl implements ProductAttrService { || ProductAttrConstants.ATTR_VALUE_STATUS_DISABLE.equals(status); } -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductCategoryServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductCategoryServiceImpl.java index 6af47567c..a235a56f0 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductCategoryServiceImpl.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductCategoryServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ProductCategoryServiceImpl implements ProductCategoryService { @Autowired diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java index 82059ea17..94396ebfc 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.stream.Collectors; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ProductSpuServiceImpl implements ProductSpuService { @Autowired diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsBannerController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsBannerController.java index b3d4b5f70..60fe256c2 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsBannerController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsBannerController.java @@ -10,7 +10,7 @@ import cn.iocoder.mall.promotion.api.dto.BannerUpdateDTO; import cn.iocoder.mall.promotion.application.convert.BannerConvert; import cn.iocoder.mall.promotion.application.vo.admins.AdminsBannerPageVO; import cn.iocoder.mall.promotion.application.vo.admins.AdminsBannerVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -96,4 +96,4 @@ public class AdminsBannerController { return bannerService.deleteBanner(AdminSecurityContextHolder.getContext().getAdminId(), id); } -} \ No newline at end of file +} diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsCouponController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsCouponController.java index 7bb9f199f..0ac9cc84d 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsCouponController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsCouponController.java @@ -12,7 +12,7 @@ import cn.iocoder.mall.promotion.api.dto.CouponTemplatePageDTO; import cn.iocoder.mall.promotion.application.convert.CouponTemplateConvert; import cn.iocoder.mall.promotion.application.vo.admins.AdminsCouponTemplatePageVO; import cn.iocoder.mall.promotion.application.vo.admins.AdminsCouponTemplateVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java index 2f2d28021..d71237f73 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsProductRecommendController.java @@ -10,7 +10,7 @@ import cn.iocoder.mall.promotion.api.dto.ProductRecommendUpdateDTO; import cn.iocoder.mall.promotion.application.convert.ProductRecommendConvert; import cn.iocoder.mall.promotion.application.vo.admins.AdminsProductRecommendPageVO; import cn.iocoder.mall.promotion.application.vo.admins.AdminsProductRecommendVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -93,4 +93,4 @@ public class AdminsProductRecommendController { return productRecommendService.deleteProductRecommend(AdminSecurityContextHolder.getContext().getAdminId(), id); } -} \ No newline at end of file +} diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java index 11e3be9cf..60810e9f1 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java @@ -7,7 +7,7 @@ import cn.iocoder.mall.promotion.api.bo.BannerBO; import cn.iocoder.mall.promotion.application.convert.BannerConvert; import cn.iocoder.mall.promotion.application.vo.users.UsersBannerVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java index ba8011eac..f44dcbcaa 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java @@ -13,7 +13,7 @@ import cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardVO; import cn.iocoder.mall.promotion.application.vo.users.UsersCouponTemplateVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java index af1a898f3..77e2b6a80 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersProductRecommendController.java @@ -9,7 +9,7 @@ import cn.iocoder.mall.promotion.api.bo.ProductRecommendBO; import cn.iocoder.mall.promotion.application.convert.ProductRecommendConvert; import cn.iocoder.mall.promotion.application.vo.users.UsersProductRecommendVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import io.swagger.annotations.Api; diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/BannerServiceImpl.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/BannerServiceImpl.java index b408ba87c..83e6f39d7 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/BannerServiceImpl.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/BannerServiceImpl.java @@ -22,7 +22,7 @@ import java.util.Date; import java.util.List; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class BannerServiceImpl implements BannerService { @Autowired @@ -100,4 +100,4 @@ public class BannerServiceImpl implements BannerService { return CommonResult.success(true); } -} \ No newline at end of file +} diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java index 05039e978..f138d1771 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java @@ -24,7 +24,7 @@ import java.util.*; import java.util.stream.Collectors; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class CouponServiceImpl implements CouponService { @Autowired diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/ProductRecommendServiceImpl.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/ProductRecommendServiceImpl.java index e3bf5ce9c..7c3a14348 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/ProductRecommendServiceImpl.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/ProductRecommendServiceImpl.java @@ -16,7 +16,7 @@ import cn.iocoder.mall.promotion.api.dto.ProductRecommendUpdateDTO; import cn.iocoder.mall.promotion.biz.convert.ProductRecommendConvert; import cn.iocoder.mall.promotion.biz.dao.ProductRecommendMapper; import cn.iocoder.mall.promotion.biz.dataobject.ProductRecommendDO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ProductRecommendServiceImpl implements ProductRecommendService { @Reference(validation = "true") diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/PromotionActivityServiceImpl.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/PromotionActivityServiceImpl.java index 1d3aec970..26ec6c484 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/PromotionActivityServiceImpl.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/PromotionActivityServiceImpl.java @@ -18,7 +18,7 @@ import java.util.Iterator; import java.util.List; @Service // 实际上不用添加。添加的原因是，必须 Spring 报错提示 -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class PromotionActivityServiceImpl implements PromotionActivityService { @Autowired diff --git a/search/search-application/src/main/java/cn/iocoder/mall/search/application/controller/users/UsersProductSearchController.java b/search/search-application/src/main/java/cn/iocoder/mall/search/application/controller/users/UsersProductSearchController.java index b253820bb..cd5768202 100644 --- a/search/search-application/src/main/java/cn/iocoder/mall/search/application/controller/users/UsersProductSearchController.java +++ b/search/search-application/src/main/java/cn/iocoder/mall/search/application/controller/users/UsersProductSearchController.java @@ -8,7 +8,7 @@ import cn.iocoder.mall.search.api.bo.ProductConditionBO; import cn.iocoder.mall.search.api.bo.ProductPageBO; import cn.iocoder.mall.search.api.dto.ProductConditionDTO; import cn.iocoder.mall.search.api.dto.ProductSearchPageDTO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/search/search-service-impl/src/main/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImpl.java b/search/search-service-impl/src/main/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImpl.java index 6e552934e..c481271fe 100644 --- a/search/search-service-impl/src/main/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImpl.java +++ b/search/search-service-impl/src/main/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImpl.java @@ -18,7 +18,7 @@ import cn.iocoder.mall.search.api.dto.ProductSearchPageDTO; import cn.iocoder.mall.search.biz.convert.ProductSearchConvert; import cn.iocoder.mall.search.biz.dao.ProductRepository; import cn.iocoder.mall.search.biz.dataobject.ESProductDO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationBuilders; @@ -37,7 +37,7 @@ import java.util.Map; import java.util.stream.Collectors; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class ProductSearchServiceImpl implements ProductSearchService { private static final Integer REBUILD_FETCH_PER_SIZE = 100; diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 0f990a9a4..2667b748d 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -36,15 +36,15 @@ common-framework 1.0-SNAPSHOT - cn.iocoder.mall - user-sdk + admin-sdk 1.0-SNAPSHOT cn.iocoder.mall - admin-sdk + user-sdk + 1.0-SNAPSHOT @@ -58,20 +58,6 @@ test - - com.alibaba - dubbo - - - com.alibaba.boot - dubbo-spring-boot-starter - - - - org.apache.curator - curator-framework - - io.springfox springfox-swagger2 @@ -80,13 +66,6 @@ io.springfox springfox-swagger-ui - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - compile - - diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java index a82a6c0d4..d864b8c88 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java @@ -1,17 +1,18 @@ package cn.iocoder.mall.user.application.controller.admins; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.application.convert.UserConvert; -import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO; -import cn.iocoder.mall.user.api.dto.UserPageDTO; -import cn.iocoder.mall.user.api.dto.UserUpdateDTO; import cn.iocoder.mall.user.api.UserService; import cn.iocoder.mall.user.api.bo.UserPageBO; -import com.alibaba.dubbo.config.annotation.Reference; +import cn.iocoder.mall.user.api.dto.UserPageDTO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.application.convert.UserConvert; +import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; public class AdminsUserController { @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private UserService userService; // 分页 @@ -66,4 +68,4 @@ public class AdminsUserController { return userService.updateUserStatus(id, status); } -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java index 29b1ea399..f36ace62f 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java @@ -9,11 +9,12 @@ import cn.iocoder.mall.user.api.OAuth2Service; import cn.iocoder.mall.user.api.UserService; import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; import cn.iocoder.mall.user.application.vo.users.UsersMobileRegisterVO; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController; @Api("Passport 模块") public class PassportController { - @Reference + @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private OAuth2Service oauth2Service; - @Reference + @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private UserService userService; - @Reference + @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private MobileCodeService mobileCodeService; // TODO 功能：手机密码登陆 diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java index 15482399e..25f2df4b2 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java @@ -1,16 +1,17 @@ package cn.iocoder.mall.user.application.controller.users; import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.user.api.UserAddressService; import cn.iocoder.mall.user.api.bo.UserAddressBO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import cn.iocoder.mall.user.application.convert.UserAddressConvert; import cn.iocoder.mall.user.application.po.UserAddressAddPO; import cn.iocoder.mall.user.application.po.UserAddressUpdatePO; -import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import cn.iocoder.mall.user.api.UserAddressService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,10 +26,11 @@ import java.util.List; */ @RestController @RequestMapping("users/address") -@Api(description = "用户地址API") +@Api(value = "用户地址API") public class UserAddressController { - @Autowired + @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private UserAddressService userAddressService; @PostMapping("add") diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java index df4759a65..762c90890 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java @@ -7,9 +7,10 @@ import cn.iocoder.mall.user.api.dto.UserUpdateDTO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; import cn.iocoder.mall.user.application.vo.users.UsersUserVO; import cn.iocoder.mall.user.api.UserService; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; public class UserController { @Reference(validation = "true") + @Autowired // TODO dubbo 2.7.2 删除，用于解决 bug private UserService userService; @GetMapping("/info") @@ -47,4 +49,4 @@ public class UserController { return userService.updateUser(userUpdateDTO); } -} \ No newline at end of file +} diff --git a/user/user-sdk/pom.xml b/user/user-sdk/pom.xml index f595da36f..3a0b3ae28 100644 --- a/user/user-sdk/pom.xml +++ b/user/user-sdk/pom.xml @@ -15,36 +15,31 @@ cn.iocoder.mall common-framework 1.0-SNAPSHOT - compile cn.iocoder.mall user-service-api 1.0-SNAPSHOT - compile org.springframework spring-context 5.1.5.RELEASE - compile org.springframework spring-webmvc 5.1.5.RELEASE - compile org.springframework spring-webmvc 5.1.5.RELEASE - compile - com.alibaba + org.apache.dubbo dubbo diff --git a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java index a701afa09..a99293ca8 100644 --- a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java +++ b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java @@ -3,11 +3,12 @@ package cn.iocoder.mall.user.sdk.interceptor; import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.mall.user.api.UserAccessLogService; import cn.iocoder.mall.user.api.dto.UserAccessLogAddDTO; -import com.alibaba.dubbo.config.annotation.Reference; 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.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -34,6 +35,7 @@ public class UserAccessLogInterceptor extends HandlerInterceptorAdapter { private static final ThreadLocal USER_ID = new ThreadLocal<>(); @Reference + @Autowired(required = false) private UserAccessLogService userAccessLogService; @Override diff --git a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java index c39b50d8b..2740dbe49 100644 --- a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java +++ b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java @@ -8,7 +8,8 @@ import cn.iocoder.mall.user.api.bo.OAuth2AuthenticationBO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; import cn.iocoder.mall.user.sdk.context.UserSecurityContext; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -16,7 +17,6 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - /** * 安全拦截器 */ @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse; public class UserSecurityInterceptor extends HandlerInterceptorAdapter { @Reference + @Autowired(required = false) private OAuth2Service oauth2Service; @Override @@ -63,4 +64,4 @@ public class UserSecurityInterceptor extends HandlerInterceptorAdapter { UserSecurityContextHolder.clear(); } -} \ No newline at end of file +} diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index 7c93c432c..c5546ec9e 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -15,12 +15,10 @@ user-service-impl - cn.iocoder.mall user-service-api 1.0-SNAPSHOT - compile @@ -38,9 +36,21 @@ - com.alibaba + org.apache.dubbo dubbo + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.dubbo + dubbo-spring-boot-starter + diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java index 4bc2c6669..68b958fa1 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java @@ -18,7 +18,7 @@ import java.util.Date; * MobileCodeService ，实现用户登陆时需要的验证码 */ @Service -@com.alibaba.dubbo.config.annotation.Service +@org.apache.dubbo.config.annotation.Service public class MobileCodeServiceImpl implements MobileCodeService { /** @@ -107,4 +107,4 @@ public class MobileCodeServiceImpl implements MobileCodeService { return CommonResult.success(null); } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java index d10b0f16a..da5ec7a5d 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java @@ -27,7 +27,7 @@ import java.util.UUID; * OAuth2Service ，实现用户授权相关的逻辑 */ @Service -@com.alibaba.dubbo.config.annotation.Service +@org.apache.dubbo.config.annotation.Service public class OAuth2ServiceImpl implements OAuth2Service { /** diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java index 598decd2e..9bb717e27 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import java.util.Date; @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class UserAccessLogServiceImpl implements UserAccessLogService { /** @@ -53,4 +53,4 @@ public class UserAccessLogServiceImpl implements UserAccessLogService { return CommonResult.success(true); } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java index 17658a040..f1bb66c44 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java @@ -26,7 +26,7 @@ import java.util.List; * @time 2019-04-06 13:26 */ @Service -@com.alibaba.dubbo.config.annotation.Service(validation = "true") +@org.apache.dubbo.config.annotation.Service(validation = "true") public class UserAddressServiceImpl implements UserAddressService { @Autowired diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java index e959e5c6a..c870855f4 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java @@ -5,10 +5,6 @@ import cn.iocoder.common.framework.constant.SysErrorCodeEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.ValidationUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.biz.dao.UserMapper; -import cn.iocoder.mall.user.biz.dao.UserRegisterMapper; -import cn.iocoder.mall.user.biz.dataobject.UserDO; -import cn.iocoder.mall.user.biz.dataobject.UserRegisterDO; import cn.iocoder.mall.user.api.UserService; import cn.iocoder.mall.user.api.bo.UserBO; import cn.iocoder.mall.user.api.bo.UserPageBO; @@ -17,7 +13,12 @@ import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; import cn.iocoder.mall.user.api.dto.UserPageDTO; import cn.iocoder.mall.user.api.dto.UserUpdateDTO; import cn.iocoder.mall.user.biz.convert.UserConvert; +import cn.iocoder.mall.user.biz.dao.UserMapper; +import cn.iocoder.mall.user.biz.dao.UserRegisterMapper; +import cn.iocoder.mall.user.biz.dataobject.UserDO; +import cn.iocoder.mall.user.biz.dataobject.UserRegisterDO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; @@ -25,8 +26,8 @@ import java.util.Date; /** * UserService ，实现和用户信息相关的逻辑 */ -@org.springframework.stereotype.Service -@com.alibaba.dubbo.config.annotation.Service +@Service +@org.apache.dubbo.config.annotation.Service(validation = "true") public class UserServiceImpl implements UserService { @Autowired @@ -148,4 +149,4 @@ public class UserServiceImpl implements UserService { || UserConstants.STATUS_DISABLE.equals(status); } -} \ No newline at end of file +}