diff --git a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java index 3d4c50fa..e8565984 100644 --- a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java +++ b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java @@ -7,12 +7,12 @@ import lombok.Getter; @Getter public enum CreditsEventsEnum { -// PRICE("price","6"), - PRICE("price","1"),// for test + PRICE("price","6"), +// PRICE("price","1"),// for test // PRICE("price","0.1"), -// BUY_CREDITS("Buy Credits","60"), - BUY_CREDITS("Buy Credits","10"),// for test + BUY_CREDITS("Buy Credits","60"), +// BUY_CREDITS("Buy Credits","10"),// for test REFUND("Refund","60"), // BUY_CREDITS("Buy Credits","10"), diff --git a/src/main/java/com/ai/da/common/enums/ProductEnum.java b/src/main/java/com/ai/da/common/enums/ProductEnum.java index 4a859b9c..11237ffe 100644 --- a/src/main/java/com/ai/da/common/enums/ProductEnum.java +++ b/src/main/java/com/ai/da/common/enums/ProductEnum.java @@ -7,7 +7,7 @@ import lombok.Getter; @AllArgsConstructor public enum ProductEnum { // 积分购买 - CreditsProduct("AiDA credits purchase", 1L), + CreditsProduct("AiDA credits purchase", 6L), // 年度订阅 AnnualSubscription("AiDA Annual Subscription", 5000L), // 月度订阅 diff --git a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java index 54dbf3a6..e26b267f 100644 --- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java +++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java @@ -1,6 +1,7 @@ package com.ai.da.common.security.filter; import cn.hutool.core.util.StrUtil; +import com.ai.da.common.config.exception.MissingTokenException; import com.ai.da.common.context.UserContext; import com.ai.da.common.security.config.SecurityProperties; import com.ai.da.common.security.jwt.JWTTokenHelper; @@ -101,7 +102,8 @@ public class AuthenticationFilter extends OncePerRequestFilter { if (StrUtil.isBlank(jwtToken)) { String ipAddress = RequestInfoUtil.getIpAddress(request); log.info("本次请求的ip为 : " + ipAddress); - throw new RuntimeException("请传入token!"); +// throw new RuntimeException("请传入token!"); + throw new MissingTokenException("请传入token!"); } if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){ //写死 暂时放行 diff --git a/src/main/resources/mapper/primary/PaymentInfoMapper.xml b/src/main/resources/mapper/primary/PaymentInfoMapper.xml index b5868c94..29a82d72 100644 --- a/src/main/resources/mapper/primary/PaymentInfoMapper.xml +++ b/src/main/resources/mapper/primary/PaymentInfoMapper.xml @@ -100,6 +100,7 @@ AND a.user_name = #{payer} + AND p.transaction_id NOT LIKE 'cs_test%' ORDER BY p.id ${order} LIMIT ${limit} OFFSET ${offset} @@ -145,6 +146,7 @@ AND a.user_name = #{payer} + AND p.transaction_id NOT LIKE 'cs_test%'