mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、修复组织产品过期无法购买产品;2、修复组织更新会校验产品列表;3、优化token中产品id不存在时的提示;
This commit is contained in:
+1
@@ -26,6 +26,7 @@ public class GlobalErrorCodeConstants {
|
||||
public static final ErrorCode LOCKED = new ErrorCode(423, "请求失败,请稍后重试"); // 并发请求,不允许
|
||||
public static final ErrorCode TOO_MANY_REQUESTS = new ErrorCode(429, "请求过于频繁,请稍后重试");
|
||||
public static final ErrorCode ORG_PRODUCT_EXPIRED = new ErrorCode(410, "组织产品套餐已过期,请续费后继续使用");
|
||||
public static final ErrorCode USER_PRODUCTID_NOT_EXIST = new ErrorCode(411, "账号登录异常,套餐信息不存在,请重新登陆");
|
||||
|
||||
// ========== 服务端错误段 ==========
|
||||
|
||||
|
||||
+9
-2
@@ -128,9 +128,16 @@ public class OrganSecurityWebFilter extends ApiRequestFilter {
|
||||
* @param request
|
||||
*/
|
||||
private void validOrgnProduct(LoginUser user, HttpServletRequest request) {
|
||||
Long productId = user.getProductId();
|
||||
boolean isManageEndPoint = Objects.equals(user.getUserType(), UserTypeEnum.ADMIN.getValue());
|
||||
// 非管理端校验产品的有效性
|
||||
if (!Objects.equals(user.getUserType(), UserTypeEnum.ADMIN.getValue()) && !isProductIgnoreUrl(request)) {
|
||||
organFrameworkService.validOrgProduct(user.getOrganId(), user.getProductId());
|
||||
if (!isManageEndPoint) {
|
||||
if (ObjectUtil.isNull(productId)) {
|
||||
throw new ServiceException(GlobalErrorCodeConstants.UNAUTHORIZED.getCode(), GlobalErrorCodeConstants.USER_PRODUCTID_NOT_EXIST.getMsg());
|
||||
}
|
||||
if (!isProductIgnoreUrl(request)) {
|
||||
organFrameworkService.validOrgProduct(user.getOrganId(), productId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user