diff --git a/admin-web/config/proxy/proxy.dev.js b/admin-web/config/proxy/proxy.dev.js index 958c70da5..f8fc22be5 100644 --- a/admin-web/config/proxy/proxy.dev.js +++ b/admin-web/config/proxy/proxy.dev.js @@ -2,7 +2,7 @@ export default { '/admin-api/': { - target: 'http://180.167.213.26:18083/', + target: 'http://127.0.0.1:18083/', // target: 'http://180.167.213.26:18083/', changeOrigin: true, pathRewrite: {}, diff --git a/admin-web/src/utils/cache.js b/admin-web/src/utils/cache.js index 491830084..e7ce31f07 100644 --- a/admin-web/src/utils/cache.js +++ b/admin-web/src/utils/cache.js @@ -3,8 +3,8 @@ // localStorage 操作 const cacheKeys = { - accessTokenKey: 'accessToken', - refreshTokenKey: 'refreshToken', + ACCESS_TOKEN: 'accessToken', + REFRESH_TOKEN: 'refreshToken', }; /// @@ -49,4 +49,4 @@ function removeLocalStorage(key) { } catch (e) { throw new Error(`localStorage 设置错误! ${e}`); } -} \ No newline at end of file +} diff --git a/mobile-web/src/config/request.js b/mobile-web/src/config/request.js index 5e0a412df..f429d5368 100644 --- a/mobile-web/src/config/request.js +++ b/mobile-web/src/config/request.js @@ -1,8 +1,9 @@ import axios from 'axios' import {baseUrl, dataSources} from './env'; import datas from '../data/data'; -import { getAccessToken } from '../utils/cache.js'; +import { getAccessToken, getRefreshToken } from '../utils/cache.js'; import { Dialog } from 'vant'; +import {setLoginToken} from "../utils/cache"; const serviceRouter = function(requestUrl) { function getConfig() { @@ -75,8 +76,9 @@ const serviceRouter = function(requestUrl) { // }); // } // } - const config = getConfig(); + + // TODO 芋艿，临时加下。 // const createServer = doCreateServer(config); const indexOf = requestUrl.indexOf("/", 1); const _urlPrefix = requestUrl.substring(0, indexOf); @@ -130,9 +132,10 @@ const servicef = function (parameter) { return service(parameter); }; - service.interceptors.request.use( config => { + // 记录下原始请求的地址 + config.originUrl = config.url; // Do something before request is sent // if (store.getters.token) { // // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 @@ -144,7 +147,8 @@ service.interceptors.request.use( let url = config.url = config.url.replace(`${prefix}`, target); // TODO 芋艿，这些 url 不用增加认证 token 。可能这么写，有点脏，后面看看咋优化下。 if (url.indexOf('user-api/users/passport/mobile/send_register_code') !== -1 - || url.indexOf('user-api/users/passport/mobile/register') !== -1) { + || url.indexOf('user-api/users/passport/mobile/register') !== -1 + || url.indexOf('user-api/users/passport/refresh_token') !== -1) { return config; } @@ -152,7 +156,6 @@ service.interceptors.request.use( if (getAccessToken()) { config.headers['Authorization'] = `Bearer ${getAccessToken()}`; } - return config }, error => { @@ -162,6 +165,30 @@ service.interceptors.request.use( } ); +function refreshToken(lastResponse) { + // TODO 芋艿，可能会存在多个异步 callback 的情况。 + let refreshToken = getRefreshToken(); + return servicef({ + url: '/user-api/users/passport/refresh_token', + method: 'post', + params: { + refreshToken + } + }).then(data => { + // 设置新的 accessToken + setLoginToken(data.accessToken, data.refreshToken); + // 重新发起请求 + let config = lastResponse.config; + return servicef({ + url: config.originUrl, + method: config.method, + params: { + ...config.params, + } + }); + }); +} + // response interceptor service.interceptors.response.use( //response => response, @@ -194,7 +221,11 @@ service.interceptors.response.use( // TODO token 过期 // TODO 需要拿 refresh token 置换 - if (code === 1001001012) { + if (code === 1001001011 // 访问令牌不存在 + || code === 1001001013 // 访问令牌已失效 + || code === 1001001021 // 刷新令牌不存在 + || code === 1001001022 // 刷新令牌已过期 + || code === 1001001023) { // 刷新令牌已失效 Dialog.confirm({ title: '系统提示', message: res.message, @@ -210,6 +241,8 @@ service.interceptors.response.use( } } }); + } else if (code === 1001001012) { // 访问令牌已过期 + return refreshToken(response); } else { Dialog.alert({ title: '系统提示', diff --git a/mobile-web/src/config/router.js b/mobile-web/src/config/router.js index 859b7fcb3..d00ed074d 100644 --- a/mobile-web/src/config/router.js +++ b/mobile-web/src/config/router.js @@ -66,21 +66,24 @@ const routes = [ path: '/user/address', component: () => import('../page/user/address/list'), meta: { - title: '我的地址' + title: '我的地址', + requireAuth: true, } }, { path: '/user/address/edit', component: () => import('../page/user/address/edit'), meta: { - title: '修改地址' + title: '修改地址', + requireAuth: true, } }, { path: '/user/favorite', component: () => import('../page/user/favorite/list'), meta: { - title: '我的收藏' + title: '我的收藏', + requireAuth: true, } }, { @@ -102,21 +105,24 @@ const routes = [ path: '/user/order/:id', component: () => import('../page/user/order/list'), meta: { - title: '我的订单' + title: '我的订单', + requireAuth: true, } }, { path: '/user/order/info/:id', component: () => import('../page/user/order/info'), meta: { - title: '我的订单' + title: '我的订单', + requireAuth: true, } }, { path: '/user/order/logistics/:id', component: () => import('../page/user/order/logistics'), meta: { - title: '订单追踪' + title: '订单追踪', + requireAuth: true, } }, { @@ -172,7 +178,8 @@ const routes = [ name: 'cart', component: () => import('../page/cart/index'), meta: { - title: '购物车' + title: '购物车', + requireAuth: true, } }, { @@ -187,7 +194,8 @@ const routes = [ path: '/order/success', component: () => import('../page/shipping/order-success'), meta: { - title: '确认订单' + title: '确认订单', + requireAuth: true, } }, { @@ -208,7 +216,8 @@ const routes = [ path: '/pay', component: () => import('../page/pay/index'), meta: { - title: '收银台' + title: '收银台', + requireAuth: true, } } ]; diff --git a/mobile-web/src/page/page/index.vue b/mobile-web/src/page/page/index.vue index 75f2669a3..9093796b3 100644 --- a/mobile-web/src/page/page/index.vue +++ b/mobile-web/src/page/page/index.vue @@ -12,15 +12,37 @@ - + + + + + +
分类
+ + + + + +
热卖
+ + + + + +
新品
+ + + + + -
+
-
+
@@ -28,21 +50,20 @@
diff --git a/mobile-web/src/page/user/order/info.vue b/mobile-web/src/page/user/order/info.vue index 0a2e48ad8..05caa56af 100644 --- a/mobile-web/src/page/user/order/info.vue +++ b/mobile-web/src/page/user/order/info.vue @@ -39,15 +39,16 @@
- - - + + + +
退货 确认收货 - 支付 + 支付
@@ -88,6 +89,9 @@ this.queryOrderPage(this.queryParams) }) }, + goPay(itemId) { + this.$router.push('/pay?appId=POd4RC6a&orderId=' + itemId + '&returnUrl=' + encodeURI('/user/order/info/' + itemId)); + }, }, mounted() { const { id } = this.$route.params; diff --git a/mobile-web/src/page/user/order/list.vue b/mobile-web/src/page/user/order/list.vue index c11a4abc8..c12c1e17c 100644 --- a/mobile-web/src/page/user/order/list.vue +++ b/mobile-web/src/page/user/order/list.vue @@ -33,7 +33,7 @@
- 总价：{{item.payAmount / 100}} 元 + 总价：{{item.presentPrice / 100}} 元 查看物流 @@ -114,7 +114,7 @@ state: `${statusArray[order.status]}`, status: order.status, products, - payAmount: order.payAmount, + presentPrice: order.presentPrice, }; }); diff --git a/mobile-web/src/utils/cache.js b/mobile-web/src/utils/cache.js index 9f3830d09..4473d3253 100644 --- a/mobile-web/src/utils/cache.js +++ b/mobile-web/src/utils/cache.js @@ -3,32 +3,41 @@ // localStorage 操作 const cacheKeys = { - accessTokenKey: 'accessToken', - refreshTokenKey: 'refreshToken', + ACCESS_TOKEN: 'accessToken', + REFRESH_TOKEN: 'refreshToken', }; /// /// 设置 loginToken，分为 accessToken 和 refreshToken +export function checkLogin() { + let accessToken = getAccessToken(); + return accessToken && accessToken.length > 0; +} + export function setLoginToken(accessToken, refreshToken) { - setLocalStorage(cacheKeys.accessTokenKey, accessToken); - setLocalStorage(cacheKeys.refreshTokenKey, refreshToken); + setLocalStorage(cacheKeys.ACCESS_TOKEN, accessToken); + setLocalStorage(cacheKeys.REFRESH_TOKEN, refreshToken); } export function getLoginToken() { const res = {}; - res[cacheKeys.accessTokenKey] = getLocalStorage(cacheKeys.accessTokenKey); - res[cacheKeys.refreshTokenKey] = getLocalStorage(cacheKeys.refreshTokenKey); + res[cacheKeys.ACCESS_TOKEN] = getLocalStorage(cacheKeys.ACCESS_TOKEN); + res[cacheKeys.REFRESH_TOKEN] = getLocalStorage(cacheKeys.REFRESH_TOKEN); return res; } export function clearLoginToken() { - removeLocalStorage(cacheKeys.accessTokenKey); - removeLocalStorage(cacheKeys.refreshTokenKey); + removeLocalStorage(cacheKeys.ACCESS_TOKEN); + removeLocalStorage(cacheKeys.REFRESH_TOKEN); } export function getAccessToken() { - return getLocalStorage(cacheKeys.accessTokenKey); + return getLocalStorage(cacheKeys.ACCESS_TOKEN); +} + +export function getRefreshToken() { + return getLocalStorage(cacheKeys.REFRESH_TOKEN); } /// @@ -56,4 +65,4 @@ function removeLocalStorage(key) { } catch (e) { throw new Error(`localStorage 设置错误! ${e}`); } -} \ No newline at end of file +} 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 01e1ed7b2..075b40b19 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 @@ -13,6 +13,7 @@ import cn.iocoder.mall.order.application.vo.UsersCartDetailVO; import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO; 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.springframework.web.bind.annotation.*; @@ -144,6 +145,7 @@ public class UsersCartController { } @GetMapping("/calc_sku_price") + @PermitAll public CommonResult calcSkuPrice(@RequestParam("skuId") Integer skuId) { // 计算 sku 的价格 CommonResult calcSkuPriceResult = cartService.calcSkuPrice(skuId); diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java index fad41763c..aff731e3c 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java @@ -25,16 +25,32 @@ public class OrderBO implements Serializable { * 用户编号 */ private Integer userId; - /** - * 物流id - */ - private Integer orderLogisticsId; /** * 订单编号 */ private String orderNo; /** - * 交易金额 + * 购买（商品）总金额，单位：分 + */ + private Integer buyPrice; + /** + * 优惠总金额，单位：分。 + */ + private Integer discountPrice; + /** + * 物流金额 (分) + */ + private Integer logisticsPrice; + /** + * 最终金额，单位：分 + * + * buyPrice + logisticsPrice - discountPrice = presentPrice + */ + private Integer presentPrice; + /** + * 实际已支付金额，单位：分 + * + * 初始时，金额为 0 。等到支付成功后，会进行更新。 */ private Integer payAmount; diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderInfoBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderInfoBO.java index e244f830c..283e3d8f4 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderInfoBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderInfoBO.java @@ -16,22 +16,39 @@ import java.util.Date; @Accessors(chain = true) public class OrderInfoBO implements Serializable { + /** + * id + */ + private Integer id; /** * 订单编号 */ private String orderNo; /** - * 价格(分) + * 购买（商品）总金额，单位：分 */ - private Integer price; + private Integer buyPrice; /** - * 交易金额 + * 优惠总金额，单位：分。 */ - private Integer payAmount; + private Integer discountPrice; /** * 物流金额 (分) */ private Integer logisticsPrice; + /** + * 最终金额，单位：分 + * + * buyPrice + logisticsPrice - discountPrice = presentPrice + */ + private Integer presentPrice; + /** + * 实际已支付金额，单位：分 + * + * 初始时，金额为 0 。等到支付成功后，会进行更新。 + */ + private Integer payAmount; + /** * 付款时间（待发货） */ diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 4558849d3..4633a9966 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -85,6 +85,12 @@ io.springfox springfox-swagger-ui + + cn.iocoder.mall + user-sdk + 1.0-SNAPSHOT + compile + 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 c20b41b6a..a7d6721e2 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 @@ -5,6 +5,7 @@ import cn.iocoder.mall.product.api.ProductCategoryService; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.security.PermitAll; import java.util.List; @RestController 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 9f2d1c585..897b47f2c 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 @@ -7,6 +7,7 @@ import cn.iocoder.mall.product.api.dto.ProductSpuPageDTO; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -17,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.security.PermitAll; - @RestController @RequestMapping("users/spu") @Api("商品 SPU + SKU") 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 05241d778..11e3be9cf 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 @@ -6,6 +6,7 @@ import cn.iocoder.mall.promotion.api.BannerService; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,7 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.security.PermitAll; import java.util.Comparator; import java.util.List; 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 65ba58919..af1a898f3 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 @@ -8,6 +8,7 @@ import cn.iocoder.mall.promotion.api.ProductRecommendService; 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 com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.security.PermitAll; import java.util.Collection; import java.util.Comparator; import java.util.List; 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 3951c14c2..29b1ea399 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 @@ -2,12 +2,13 @@ package cn.iocoder.mall.user.application.controller.users; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.convert.PassportConvert; +import cn.iocoder.mall.user.application.vo.users.UsersAccessTokenVO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; import cn.iocoder.mall.user.api.MobileCodeService; 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.MobileRegisterVO; +import cn.iocoder.mall.user.application.vo.users.UsersMobileRegisterVO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -44,8 +45,8 @@ public class PassportController { @ApiImplicitParam(name = "mobile", value = "手机号", required = true, example = "15601691300"), @ApiImplicitParam(name = "code", value = "验证码", required = true, example = "9999") }) - public CommonResult mobileRegister(@RequestParam("mobile") String mobile, - @RequestParam("code") String code) { + public CommonResult mobileRegister(@RequestParam("mobile") String mobile, + @RequestParam("code") String code) { CommonResult result = oauth2Service.getAccessToken(mobile, code); return PassportConvert.INSTANCE.convert(result); } @@ -74,7 +75,12 @@ public class PassportController { return null; } - // TODO 功能：刷新 token + @PermitAll + @PostMapping("/refresh_token") // TODO 功能：刷新 token + public CommonResult refreshToken(@RequestParam("refreshToken") String refreshToken) { + CommonResult result = oauth2Service.refreshToken(refreshToken); + return PassportConvert.INSTANCE.convert2(result); + } // TODO 功能：退出，销毁 token -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java index a40ba1ed9..889c9878a 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java @@ -2,7 +2,8 @@ package cn.iocoder.mall.user.application.convert; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.user.application.vo.users.MobileRegisterVO; +import cn.iocoder.mall.user.application.vo.users.UsersAccessTokenVO; +import cn.iocoder.mall.user.application.vo.users.UsersMobileRegisterVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -13,9 +14,12 @@ public interface PassportConvert { PassportConvert INSTANCE = Mappers.getMapper(PassportConvert.class); @Mappings({}) - MobileRegisterVO convert(OAuth2AccessTokenBO oauth2AccessTokenBO); + UsersMobileRegisterVO convert(OAuth2AccessTokenBO oauth2AccessTokenBO); @Mappings({}) - CommonResult convert(CommonResult oauth2AccessTokenBO); + CommonResult convert(CommonResult oauth2AccessTokenBO); -} \ No newline at end of file + @Mappings({}) + CommonResult convert2(CommonResult result); + +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersAccessTokenVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersAccessTokenVO.java new file mode 100644 index 000000000..54d2b5531 --- /dev/null +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersAccessTokenVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.mall.user.application.vo.users; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +@ApiModel("认证令牌 VO") +@Data +@Accessors(chain = true) +public class UsersAccessTokenVO { + + @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") + private String accessToken; + @ApiModelProperty(value = "刷新令牌", required = true, example = "d091e7c35bbb4313b0f557a6ef23d033") + private String refreshToken; + @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") + private Integer expiresIn; + +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersMobileRegisterVO.java similarity index 94% rename from user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersMobileRegisterVO.java index 04c8debff..380dd7262 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersMobileRegisterVO.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; @ApiModel("手机注册结果 VO") @Data @Accessors(chain = true) -public class MobileRegisterVO { +public class UsersMobileRegisterVO { @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") private String accessToken; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java index 6f6295686..cfdd792a7 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java @@ -17,8 +17,8 @@ public interface OAuth2Service { */ CommonResult checkToken(String accessToken); - // TODO @see 刷新 token + CommonResult refreshToken(String refreshToken); // TODO @see 移除 token -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java index 6641b2e6b..5398fd070 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java @@ -12,10 +12,13 @@ public enum UserErrorCodeEnum { OAUTH2_INVALID_GRANT_BAD_CREDENTIALS(1001001001, "密码不正确"), // 暂时没用到 OAUTH2_INVALID_GRANT_USERNAME_NOT_FOUND(1001001002, "账号不存在"), // 暂时没用到 OAUTH2_INVALID_GRANT(1001001010, ""), // 预留 - OAUTH_INVALID_TOKEN_NOT_FOUND(1001001011, "访问令牌不存在"), - OAUTH_INVALID_TOKEN_EXPIRED(1001001012, "访问令牌已过期"), - OAUTH_INVALID_TOKEN_INVALID(1001001013, "访问令牌已失效"), - OAUTH_INVALID_TOKEN(1001001020, ""), // 预留 + OAUTH_INVALID_ACCESS_TOKEN_NOT_FOUND(1001001011, "访问令牌不存在"), + OAUTH_INVALID_ACCESS_TOKEN_EXPIRED(1001001012, "访问令牌已过期"), + OAUTH_INVALID_ACCESS_TOKEN_INVALID(1001001013, "访问令牌已失效"), + OAUTH_INVALID_REFRESH_TOKEN(1001001020, ""), // 预留 + OAUTH_INVALID_REFRESH_TOKEN_NOT_FOUND(1001001021, "刷新令牌不存在"), + OAUTH_INVALID_REFRESH_TOKEN_EXPIRED(1001001022, "访问令牌已过期"), + OAUTH_INVALID_REFRESH_TOKEN_INVALID(1001001023, "刷新令牌已失效"), // ========== 用户模块 ========== USER_MOBILE_NOT_REGISTERED(1001002000, "手机号未注册用户"), @@ -54,4 +57,4 @@ public enum UserErrorCodeEnum { return message; } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java index 77f9c8918..0a7f41a3c 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java @@ -13,4 +13,6 @@ public interface OAuth2AccessTokenMapper { void updateToInvalidByUserId(@Param("userId") Integer userId); -} \ No newline at end of file + void updateToInvalidByRefreshToken(@Param("refreshToken") String refreshToken); + +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java index 281718b7e..ee0c41a25 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java @@ -11,4 +11,6 @@ public interface OAuth2RefreshTokenMapper { void updateToInvalidByUserId(@Param("userId") Integer userId); -} \ No newline at end of file + OAuth2RefreshTokenDO selectById(@Param("id") String id); + +} 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 0c58772b8..d10b0f16a 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 @@ -82,18 +82,39 @@ public class OAuth2ServiceImpl implements OAuth2Service { public CommonResult checkToken(String accessToken) throws ServiceException { OAuth2AccessTokenDO accessTokenDO = oauth2AccessTokenMapper.selectByTokenId(accessToken); if (accessTokenDO == null) { // 不存在 - return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_TOKEN_NOT_FOUND.getCode()); + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_ACCESS_TOKEN_NOT_FOUND.getCode()); } if (accessTokenDO.getExpiresTime().getTime() < System.currentTimeMillis()) { // 已过期 - return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_TOKEN_EXPIRED.getCode()); + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_ACCESS_TOKEN_EXPIRED.getCode()); } if (!accessTokenDO.getValid()) { // 无效 - return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_TOKEN_INVALID.getCode()); + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_ACCESS_TOKEN_INVALID.getCode()); } // 转换返回 return CommonResult.success(OAuth2Convert.INSTANCE.convertToAuthentication(accessTokenDO)); } + @Override + public CommonResult refreshToken(String refreshToken) { + OAuth2RefreshTokenDO refreshTokenDO = oauth2RefreshTokenMapper.selectById(refreshToken); + // 校验刷新令牌是否合法 + if (refreshTokenDO == null) { // 不存在 + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_REFRESH_TOKEN_NOT_FOUND.getCode()); + } + if (refreshTokenDO.getExpiresTime().getTime() < System.currentTimeMillis()) { // 已过期 + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_REFRESH_TOKEN_EXPIRED.getCode()); + } + if (!refreshTokenDO.getValid()) { // 无效 + return ServiceExceptionUtil.error(UserErrorCodeEnum.OAUTH_INVALID_REFRESH_TOKEN_INVALID.getCode()); + } + // 标记 refreshToken 对应的 accessToken 都不合法 + oauth2AccessTokenMapper.updateToInvalidByRefreshToken(refreshToken); + // 创建访问令牌 + OAuth2AccessTokenDO oauth2AccessTokenDO = createOAuth2AccessToken(refreshTokenDO.getUserId(), refreshTokenDO.getId()); + // 转换返回 + return CommonResult.success(OAuth2Convert.INSTANCE.convertToAccessTokenWithExpiresIn(oauth2AccessTokenDO)); + } + /** * 移除用户对应的 Token * @@ -134,4 +155,4 @@ public class OAuth2ServiceImpl implements OAuth2Service { return UUID.randomUUID().toString().replaceAll("-", ""); } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml b/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml index dbfdc9036..3f7e67d09 100644 --- a/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml @@ -26,4 +26,11 @@ AND valid = 1 - \ No newline at end of file + + UPDATE oauth2_access_token + SET valid = 0 + WHERE refresh_token = #{refreshToken} + AND valid = 1 + + + diff --git a/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml b/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml index c68474081..729332839 100644 --- a/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml @@ -17,4 +17,11 @@ AND valid = 1 - \ No newline at end of file + + +