From ee1e2f8556b80764ab3f969da89f5346c749a221 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 2 Jan 2025 17:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/controller/AccountController.java | 4 ++-- src/main/java/com/ai/da/controller/TagsController.java | 2 +- src/main/java/com/ai/da/mapper/primary/entity/Tags.java | 3 +++ src/main/java/com/ai/da/service/AccountService.java | 4 ++-- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 5 ++--- src/main/java/com/ai/da/service/impl/TagsServiceImpl.java | 6 +++++- src/main/resources/application-dev.properties | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 9d2b0f4d..1afac49d 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -235,7 +235,7 @@ public class AccountController { return Response.success("success"); } - @ApiOperation(value = "verifyUserEmail") + /*@ApiOperation(value = "verifyUserEmail") @GetMapping("/verifyUserEmail") public Response verifyUserEmail(@RequestParam("verifyCode") String verifyCode){ accountService.verifyUserEmail(verifyCode); @@ -254,7 +254,7 @@ public class AccountController { public Response activateNewEmail(@RequestParam("token") String token){ accountService.activateNewEmail(token); return Response.success("success"); - } + }*/ @PostMapping("halfPricePromotion") @ApiOperation(value = "十月半价活动") diff --git a/src/main/java/com/ai/da/controller/TagsController.java b/src/main/java/com/ai/da/controller/TagsController.java index 8a2b3209..a248cfcd 100644 --- a/src/main/java/com/ai/da/controller/TagsController.java +++ b/src/main/java/com/ai/da/controller/TagsController.java @@ -25,7 +25,7 @@ public class TagsController { @ApiOperation("获取标签") @GetMapping("/getTags") - public Response> getTags(@RequestParam("userInput") String userInput) { + public Response> getTags(@RequestParam(value = "userInput", required = false) String userInput) { return Response.success(tagsService.getTags(userInput)); } } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Tags.java b/src/main/java/com/ai/da/mapper/primary/entity/Tags.java index fc7dfd90..7ffe7a62 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Tags.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Tags.java @@ -10,4 +10,7 @@ import lombok.EqualsAndHashCode; public class Tags extends BaseEntity{ private String tagName; + + // 表示标签是否正在活动中 0->不在活动中 1->在活动中 + private byte active = (byte)0; } diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index bff69738..e37d4b09 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -177,11 +177,11 @@ public interface AccountService extends IService { void editUserName(String newUserName); - void verifyUserEmail(String verifyCode); + /*void verifyUserEmail(String verifyCode); void changeUserEmail(String newMailbox); - void activateNewEmail(String token); + void activateNewEmail(String token);*/ String updateNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 83b82a8e..964be51d 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1863,7 +1863,7 @@ public class AccountServiceImpl extends ServiceImpl impl } } - // 验证是否是本人进行邮箱绑定更改 + /*// 验证是否是本人进行邮箱绑定更改 public void verifyUserEmail(String verifyCode){ // 向旧邮箱发送验证码，以保证是当前邮箱拥有者在进行更改 String userEmail = baseMapper.selectById(UserContext.getUserHolder().getId()).getUserEmail(); @@ -1896,7 +1896,6 @@ public class AccountServiceImpl extends ServiceImpl impl // 验证激活链接 public void activateNewEmail(String token){ // 获取链接地址信息，更新指定用户邮箱 - String emailAndId = jwtTokenHelper.parseToEmailAndId(token); String newMailbox = emailAndId.substring(0, emailAndId.lastIndexOf("_")); String accountId = emailAndId.substring(emailAndId.lastIndexOf("_") + 1); @@ -1918,7 +1917,7 @@ public class AccountServiceImpl extends ServiceImpl impl account.setId(Long.parseLong(accountId)); baseMapper.updateById(account); log.info("邮箱绑定更改完成，用户id:{}，新邮箱：{}", accountId, newMailbox); - } + }*/ @Override public String googleCallback(String code, HttpSession session) { diff --git a/src/main/java/com/ai/da/service/impl/TagsServiceImpl.java b/src/main/java/com/ai/da/service/impl/TagsServiceImpl.java index c0a1182c..f3321499 100644 --- a/src/main/java/com/ai/da/service/impl/TagsServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TagsServiceImpl.java @@ -5,6 +5,7 @@ import com.ai.da.mapper.primary.entity.Tags; import com.ai.da.service.TagsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -19,7 +20,10 @@ public class TagsServiceImpl extends ServiceImpl implements Ta public List getTags(String tagPrefix){ // 1、根据tag前缀,查询 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.likeRight("tag_name", tagPrefix); + if (!StringUtil.isNullOrEmpty(tagPrefix)) { + queryWrapper.like("tag_name", tagPrefix); + } + queryWrapper.orderByDesc("id").last("limit 10"); // 需返回标签内容和id return baseMapper.selectList(queryWrapper); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 19854ce9..5daaa774 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -20,7 +20,7 @@ spring.security.jwtExpiration=8640000000 spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\ /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\ /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**,\ - /api/stripe/**,/api/message/**,/notification/**,/api/affiliate/** + /api/stripe/**,/api/message/**,/api/tags/**,/notification/**,/api/affiliate/** spring.security.authApi=/auth/login