From 2091712057220ca9b3d98ae756e97fad1ddbc630 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Fri, 11 Jun 2021 01:18:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-oms/oms-boot/pom.xml | 6 ++ .../mall/oms/config/RabbitMQConfig.java | 6 +- .../oms/controller/admin/OrderController.java | 2 +- .../youlai/mall/pms/api/SkuFeignClient.java | 2 +- mall-pms/pms-boot/pom.xml | 3 +- .../pms/controller/app/SearchController.java | 3 - .../sms/pojo/domain/SmsSeckillSession.java | 6 +- .../sms/controller/app/AdvertController.java | 2 +- .../ums/api/MemberAddressFeignClient.java | 4 +- .../mall/ums/api/MemberFeignClient.java | 2 +- .../youlai/mall/ums/pojo/dto/MemberDTO.java | 1 + .../ums/controller/app/MemberController.java | 6 +- .../auth/controller/OAuthController.java | 16 ++- .../com/youlai/auth/domain/OAuthToken.java | 24 ++++- .../com/youlai/auth/service/IAuthService.java | 5 +- .../auth/service/impl/WeAppServiceImpl.java | 102 ------------------ .../service/impl/WechatAuthServiceImpl.java | 70 ++++++++++++ .../security/AuthorizationManager.java | 5 +- 18 files changed, 136 insertions(+), 129 deletions(-) delete mode 100644 youlai-auth/src/main/java/com/youlai/auth/service/impl/WeAppServiceImpl.java create mode 100644 youlai-auth/src/main/java/com/youlai/auth/service/impl/WechatAuthServiceImpl.java diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml index 797288c7e..179ebc744 100644 --- a/mall-oms/oms-boot/pom.xml +++ b/mall-oms/oms-boot/pom.xml @@ -107,6 +107,12 @@ common-rabbitmq + + com.youlai + common-log + ${youlai.version} + + diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/RabbitMQConfig.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/RabbitMQConfig.java index 25862344c..ce9a9e918 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/RabbitMQConfig.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/RabbitMQConfig.java @@ -41,7 +41,7 @@ public class RabbitMQConfig { // 延时队列的消息过期了，会自动触发消息的转发，根据routingKey发送到指定的exchange中，exchange路由到死信队列 Map args = new HashMap<>(); args.put("x-dead-letter-exchange", "order.exchange"); - args.put("x-dead-letter-routing-key", "order:close"); // 死信路由Key + args.put("x-dead-letter-routing-key", "order.close"); // 死信路由Key args.put("x-message-ttl", 60000); // 单位：毫秒，1分钟测试使用 return new Queue("order.delay.queue", true, false, false, args); } @@ -66,11 +66,11 @@ public class RabbitMQConfig { /** * 死信队列绑定交换机 - * 其中死信路由的routingKey=order:close和延时队列的routingKey一致，延时队列过期时将消息发送给exchange，exchange再路由到死信队列 + * 其中死信路由的routingKey=order.close和延时队列的routingKey一致，延时队列过期时将消息发送给exchange，exchange再路由到死信队列 */ @Bean public Binding closeOrderQueueBinding() { - return new Binding("order.close.queue", Binding.DestinationType.QUEUE,"order.exchange","order:close",null); + return new Binding("order.close.queue", Binding.DestinationType.QUEUE,"order.exchange","order.close",null); } } diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java index 67af6196e..7328e20b5 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java @@ -30,7 +30,7 @@ import java.util.Optional; * @date 2020-12-30 22:31:10 */ @Api(tags = "【系统管理】订单服务") -@RestController("V1-OrderController") +@RestController("AdminOrderController") @RequestMapping("/api/v1/orders") @Slf4j @AllArgsConstructor diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java index 8f456cdc8..a55728bdc 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java @@ -30,7 +30,7 @@ public interface SkuFeignClient { Result unlockStock(@RequestParam String orderToken); - @PutMapping("/v2/skus/deduct_stock") + @PutMapping("/app-api/v1/skus/deduct_stock") Result deductStock(@RequestParam String orderToken); diff --git a/mall-pms/pms-boot/pom.xml b/mall-pms/pms-boot/pom.xml index e042bf49c..c8def622c 100644 --- a/mall-pms/pms-boot/pom.xml +++ b/mall-pms/pms-boot/pom.xml @@ -102,7 +102,8 @@ com.youlai - common-es + common-log + ${youlai.version} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/SearchController.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/SearchController.java index 7676feb1a..e4436918b 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/SearchController.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/SearchController.java @@ -1,6 +1,5 @@ package com.youlai.mall.pms.controller.app; -import com.youlai.common.elasticsearch.service.ElasticSearchService; import com.youlai.common.result.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.*; @AllArgsConstructor public class SearchController { - private ElasticSearchService elasticSearchService; - @ApiOperation(value = "关键字搜索商品") @ApiImplicitParams({ @ApiImplicitParam(name = "key", value = "关键字", paramType = "query", dataType = "String"), diff --git a/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/domain/SmsSeckillSession.java b/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/domain/SmsSeckillSession.java index 5848a925d..06239181b 100644 --- a/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/domain/SmsSeckillSession.java +++ b/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/domain/SmsSeckillSession.java @@ -41,15 +41,15 @@ public class SmsSeckillSession implements Serializable { /** * 创建时间 */ - private Date gmtCreate; + private Date createTime; /** * 修改时间 */ - private Date gmtModified; + private Date updateTime; @TableField(exist = false) private List relations; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertController.java b/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertController.java index 6ffcb1a28..efc323ca3 100644 --- a/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertController.java +++ b/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertController.java @@ -16,7 +16,7 @@ import java.util.List; @Api(tags = "【移动端】营销广告") @RestController("APPAdvertController") -@RequestMapping("/api-app/v1/adverts") +@RequestMapping("/app-api/v1/adverts") @Slf4j @AllArgsConstructor public class AdvertController { diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberAddressFeignClient.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberAddressFeignClient.java index fc49a2275..80bbca8eb 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberAddressFeignClient.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberAddressFeignClient.java @@ -15,11 +15,11 @@ public interface MemberAddressFeignClient { /** * 获取地址详情 */ - @GetMapping("/v1/addresses/{id}") + @GetMapping("/app-api/v1/addresses/{id}") Result getById(@PathVariable("id") Long id); - @GetMapping("/v1/addresses") + @GetMapping("/app-api/v1/addresses") Result> list(@RequestParam Long memberId); } diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java index e962117cf..74058b0b0 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/MemberFeignClient.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; public interface MemberFeignClient { @PostMapping("/app-api/v1/members") - Result add(@RequestBody UmsMember member); + Result add(@RequestBody UmsMember member); @PutMapping("/app-api/v1/members/{id}") diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/MemberDTO.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/MemberDTO.java index ed50c6d8f..653e9f45d 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/MemberDTO.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/MemberDTO.java @@ -14,4 +14,5 @@ public class MemberDTO { private String mobile; private Long balance; + } diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java index 9b2f93ffb..6ffc6e123 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/app/MemberController.java @@ -61,10 +61,10 @@ public class MemberController { @ApiOperation(value = "新增会员") @ApiImplicitParam(name = "member", value = "实体JSON对象", required = true, paramType = "body", dataType = "UmsMember") @PostMapping - public Result add(@RequestBody UmsMember member) { + public Result add(@RequestBody UmsMember member) { boolean status = iUmsMemberService.save(member); if (status) { - return Result.success(member); + return Result.success(member.getId()); } else { return Result.failed(); } @@ -78,7 +78,7 @@ public class MemberController { return Result.judge(status); } - @ApiOperation(value = "获取当前请求的会员信息") + @ApiOperation(value = "获取登录会员信息") @GetMapping("/me") public Result getMemberInfo() { Long userId = JwtUtils.getUserId(); diff --git a/youlai-auth/src/main/java/com/youlai/auth/controller/OAuthController.java b/youlai-auth/src/main/java/com/youlai/auth/controller/OAuthController.java index 33a4a4446..ad2c5ecb3 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/controller/OAuthController.java +++ b/youlai-auth/src/main/java/com/youlai/auth/controller/OAuthController.java @@ -4,7 +4,9 @@ import cn.hutool.json.JSONObject; import com.nimbusds.jose.jwk.JWKSet; import com.nimbusds.jose.jwk.RSAKey; import com.youlai.auth.common.enums.OAuthClientEnum; -import com.youlai.auth.service.impl.WeAppServiceImpl; +import com.youlai.auth.domain.OAuthToken; +import com.youlai.auth.domain.UserInfo; +import com.youlai.auth.service.IAuthService; import com.youlai.common.constant.AuthConstants; import com.youlai.common.result.Result; import com.youlai.common.web.util.JwtUtils; @@ -34,7 +36,7 @@ import java.util.concurrent.TimeUnit; public class OAuthController { private TokenEndpoint tokenEndpoint; - private WeAppServiceImpl weAppServiceImpl; + private IAuthService wechatAuthService; private RedisTemplate redisTemplate; private KeyPair keyPair; @@ -63,8 +65,6 @@ public class OAuthController { String clientId = JwtUtils.getAuthClientId(); OAuthClientEnum client = OAuthClientEnum.getByClientId(clientId); switch (client) { - case WEAPP: // 微信小程序 - return Result.success(weAppServiceImpl.login(parameters)); case TEST: // knife4j接口测试文档使用 client_id/client_secret : client/123456 return tokenEndpoint.postAccessToken(principal, parameters).getBody(); default: @@ -72,6 +72,14 @@ public class OAuthController { } } + @ApiOperation(value = "微信登录") + @PostMapping("/token/{code}") + public Result wechatLogin(@PathVariable String code, @RequestBody UserInfo userInfo) { + OAuthToken token = wechatAuthService.login(code, userInfo); + return Result.success(token); + } + + @ApiOperation(value = "注销", notes = "logout") @DeleteMapping("/logout") public Result logout() { diff --git a/youlai-auth/src/main/java/com/youlai/auth/domain/OAuthToken.java b/youlai-auth/src/main/java/com/youlai/auth/domain/OAuthToken.java index 29fb0b65f..a3f92d9fd 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/domain/OAuthToken.java +++ b/youlai-auth/src/main/java/com/youlai/auth/domain/OAuthToken.java @@ -1,15 +1,37 @@ package com.youlai.auth.domain; +import com.youlai.auth.common.jwt.JwtPayloadBuilder; +import lombok.*; + +import java.util.Set; + /** - * 描述: [类型描述] + * 描述: [自定义token] * 创建时间: 2021/6/8 * * @author hxr * @version 1.0.0 * @update [序号][日期YYYY-MM-DD] [更改人姓名][变更描述] */ + +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Data public class OAuthToken { + private String access_token; + private String token_type = "bearer"; + + public OAuthToken accessToken(String accessToken) { + this.access_token = accessToken; + return this; + } + + public OAuthToken tokenType(String tokenType) { + this.token_type = tokenType; + return this; + } } diff --git a/youlai-auth/src/main/java/com/youlai/auth/service/IAuthService.java b/youlai-auth/src/main/java/com/youlai/auth/service/IAuthService.java index ee7c9a062..6ac7bcb33 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/service/IAuthService.java +++ b/youlai-auth/src/main/java/com/youlai/auth/service/IAuthService.java @@ -1,5 +1,8 @@ package com.youlai.auth.service; +import com.youlai.auth.domain.OAuthToken; +import com.youlai.auth.domain.UserInfo; + import java.util.Map; /** @@ -12,5 +15,5 @@ import java.util.Map; */ public interface IAuthService { - Map login(Map parameters); + OAuthToken login(String code, UserInfo userInfo); } diff --git a/youlai-auth/src/main/java/com/youlai/auth/service/impl/WeAppServiceImpl.java b/youlai-auth/src/main/java/com/youlai/auth/service/impl/WeAppServiceImpl.java deleted file mode 100644 index 3ef529bc2..000000000 --- a/youlai-auth/src/main/java/com/youlai/auth/service/impl/WeAppServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.youlai.auth.service.impl; - -import cn.binarywang.wx.miniapp.api.WxMaService; -import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.json.JSONUtil; -import com.youlai.auth.common.jwt.JwtGenerator; -import com.youlai.auth.domain.UserInfo; -import com.youlai.auth.service.IAuthService; -import com.youlai.common.constant.AuthConstants; -import com.youlai.common.result.Result; -import com.youlai.common.result.ResultCode; -import com.youlai.common.web.exception.BizException; -import com.youlai.mall.ums.api.MemberFeignClient; -import com.youlai.mall.ums.pojo.domain.UmsMember; -import lombok.AllArgsConstructor; -import lombok.SneakyThrows; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * @author haoxr - * @description 微信小程序认证接口 - * @createTime 2021/5/20 23:37 - */ -@Service -@AllArgsConstructor -public class WeAppServiceImpl implements IAuthService { - - private MemberFeignClient memberFeignClient; - private WxMaService wxMaService; - private JwtGenerator jwtGenerator; - - /** - * @param parameters code=小程序授权code - * rawData=不包括敏感信息的原始数据字符串，用于计算签名 - * signature=使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，详见 用户数据的签名验证和加解密 - * @return - */ - @SneakyThrows - @Override - public Map login(Map parameters) { - Map resultMap = new HashMap<>(); - - String code = parameters.get("code"); - String rawData = parameters.get("rawData"); - String signature = parameters.get("signature"); - WxMaJscode2SessionResult sessionInfo = wxMaService.getUserService().getSessionInfo(code); - String sessionKey = sessionInfo.getSessionKey(); - // 校验微信用户信息 - boolean checkResult = wxMaService.getUserService().checkUserInfo(sessionKey, rawData, signature); - if (checkResult) { - String openid = sessionInfo.getOpenid(); - Result result = memberFeignClient.getByOpenid(openid); - - UmsMember member = null; - Result memberOptResult = null; - if (ResultCode.USER_NOT_EXIST.getCode().equals(result.getCode())) { - // 用户不存在，注册成为新用户 - UserInfo userInfo = JSONUtil.toBean(rawData, UserInfo.class); - member = new UmsMember(); - BeanUtil.copyProperties(userInfo, member); - member.setOpenid(openid); - member.setSessionKey(sessionKey); - memberOptResult = memberFeignClient.add(member); - if (ResultCode.SUCCESS.getCode().equals(memberOptResult.getCode())) { - member = (UmsMember) memberOptResult.getData(); - } - } else if (ResultCode.SUCCESS.getCode().equals(result.getCode()) && result.getData() != null) { - member = result.getData(); - UserInfo userInfo = JSONUtil.toBean(rawData, UserInfo.class); - BeanUtil.copyProperties(userInfo, member); - member.setSessionKey(sessionKey); - memberOptResult = memberFeignClient.update(member.getId(), member); - } - if (memberOptResult != null && ResultCode.SUCCESS.getCode().equals(memberOptResult.getCode())) { - - // JWT授权，一般存放用户的角色标识，用于资源服务器（网关）鉴权 - Set authorities = new HashSet<>(); - - // JWT增强，携带用户ID等信息 - Map additional = new HashMap<>(); - additional.put(AuthConstants.USER_ID_KEY, Convert.toStr(member.getId())); - - String accessToken = jwtGenerator.createAccessToken(authorities, additional); - String tokenType = "bearer"; - - resultMap.put("access_token", accessToken); - resultMap.put("token_type", tokenType); - return resultMap; - } - } else { - throw new BizException("非法用户"); - } - throw new BizException("认证失败"); - } -} diff --git a/youlai-auth/src/main/java/com/youlai/auth/service/impl/WechatAuthServiceImpl.java b/youlai-auth/src/main/java/com/youlai/auth/service/impl/WechatAuthServiceImpl.java new file mode 100644 index 000000000..2ae212324 --- /dev/null +++ b/youlai-auth/src/main/java/com/youlai/auth/service/impl/WechatAuthServiceImpl.java @@ -0,0 +1,70 @@ +package com.youlai.auth.service.impl; + +import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Assert; +import com.youlai.auth.common.jwt.JwtGenerator; +import com.youlai.auth.domain.OAuthToken; +import com.youlai.auth.domain.UserInfo; +import com.youlai.auth.service.IAuthService; +import com.youlai.common.constant.AuthConstants; +import com.youlai.common.result.Result; +import com.youlai.common.result.ResultCode; +import com.youlai.mall.ums.api.MemberFeignClient; +import com.youlai.mall.ums.pojo.domain.UmsMember; +import lombok.AllArgsConstructor; +import lombok.SneakyThrows; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * @author haoxr + * @description 微信小程序认证接口 + * @createTime 2021/5/20 23:37 + */ +@Service +@AllArgsConstructor +public class WechatAuthServiceImpl implements IAuthService { + + private MemberFeignClient memberFeignClient; + private WxMaService wxMaService; + private JwtGenerator jwtGenerator; + + + @SneakyThrows + @Override + public OAuthToken login(String code, UserInfo userInfo) { + WxMaJscode2SessionResult sessionInfo = wxMaService.getUserService().getSessionInfo(code); + String openid = sessionInfo.getOpenid(); + Result result = memberFeignClient.getByOpenid(openid); + UmsMember member; + if (ResultCode.USER_NOT_EXIST.getCode().equals(result.getCode())) { + // 用户不存在，注册成为新用户 + member = new UmsMember(); + BeanUtil.copyProperties(userInfo, member); + member.setOpenid(openid); + Result addRes = memberFeignClient.add(member); + Assert.isTrue(ResultCode.SUCCESS.getCode().equals(addRes.getCode()), "微信用户注册失败"); + member.setId(addRes.getData()); // 新增后有了会员ID + } else { + member = result.getData(); + } + + // 自定义JWT生成 + // 1. JWT授权，一般存放用户的角色标识，用于资源服务器（网关）鉴权 + Set authorities = new HashSet<>(); + // 2. JWT增强，携带用户ID等信息 + Map additional = new HashMap<>(); + additional.put(AuthConstants.USER_ID_KEY, Convert.toStr(member.getId())); + String accessToken = jwtGenerator.createAccessToken(authorities, additional); + + OAuthToken token = new OAuthToken().accessToken(accessToken); + return token; + } +} diff --git a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java b/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java index 5ba894a9f..703316ad3 100644 --- a/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java +++ b/youlai-gateway/src/main/java/com/youlai/gateway/security/AuthorizationManager.java @@ -40,7 +40,8 @@ public class AuthorizationManager implements ReactiveAuthorizationManager permRoles : permRolesRule.entrySet()) { String perm = permRoles.getKey(); // URL权限标识 - if (pathMatcher.match(perm, restPath)) { + if (pathMatcher.match(perm, restfulPath)) { List roles = Convert.toList(String.class, permRoles.getValue()); hasPermRoles.addAll(Convert.toList(String.class, roles)); needCheck = true;