From 67b76d75f4625881b7b65d6f48757f03e7d9ff35 Mon Sep 17 00:00:00 2001 From: zzp <34701892@qq.com> Date: Thu, 12 Dec 2024 14:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=94=B9=E6=88=90=E6=95=B0?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminUserService.java | 18 +++++++++--------- admin/src/main/resources/application.yml | 16 ++++++++++++++++ .../reference/core/mapper/NewsMapper.java | 4 ++-- .../core/model/dto/news/SaveDraftTag.java | 14 ++++++++++---- .../reference/core/service/NewsService.java | 4 ++++ 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java index e4ceb63..699cf73 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java +++ b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java @@ -62,15 +62,15 @@ public class AdminUserService { } jedis.expire(redisLockKey, 3L); - String redisCaptchaKey = getRedisCaptchaKey(phone); - incrResult = jedis.incr(redisCaptchaKey); - if (incrResult > 1) { - log.warn("手机号{}在一分钟内已发送过短信，请勿重复发送!", phone); - jedis.decr(redisLockKey); - jedis.decr(redisCaptchaKey); - return ResultObject.failed("该手机号一分钟内已发送过短信，请勿重复发送!"); - } - jedis.expire(redisCaptchaKey, 60L); +// String redisCaptchaKey = getRedisCaptchaKey(phone); +// incrResult = jedis.incr(redisCaptchaKey); +// if (incrResult > 1) { +// log.warn("手机号{}在一分钟内已发送过短信，请勿重复发送!", phone); +// jedis.decr(redisLockKey); +// jedis.decr(redisCaptchaKey); +// return ResultObject.failed("该手机号一分钟内已发送过短信，请勿重复发送!"); +// } +// jedis.expire(redisCaptchaKey, 60L); AdminUser adminUser = adminUserMapper.getAdminUserByPhone(phone); if (adminUser == null) { diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index ecd773f..fe544c1 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -1,5 +1,9 @@ server: port: 13579 + compression: + enabled: true + servlet: + context-path: /admin oss: ak: LTAI5t8z9QNdCG6b54mDgx8p sk: F3M41hTgH8g99ZgVWyelj42825YbZM @@ -10,3 +14,15 @@ oss: baseUrl: https://lengfeng-test.oss-cn-hangzhou.aliyuncs.com sts: endPoint: sts.cn-hangzhou.aliyuncs.com + +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai + username: root + password: Xgf_8000 +redis: + host: 123.60.153.169 + port: 6379 + password: Xgf_redis diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java index bc5c551..8375762 100644 --- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java +++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java @@ -92,7 +92,7 @@ public interface NewsMapper { "" + "" + "" + - "news.keyword like concat('%', #{keyword}, '%') " + + "news.title like concat('%', #{keyword}, '%') " + "" + "" + "and news_column_rel.column_id = #{column} " + @@ -126,7 +126,7 @@ public interface NewsMapper { "" + "" + "" + - "news.keyword like concat('%', #{keyword}, '%') " + + "news.title like concat('%', #{keyword}, '%') " + "" + "" + "and news_column_rel.column_id = #{column} " + diff --git a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftTag.java b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftTag.java index 54230af..4be7029 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftTag.java +++ b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveDraftTag.java @@ -3,6 +3,7 @@ package com.jinrui.reference.core.model.dto.news; import com.jinrui.reference.core.model.vo.news.NewsDetailTag; import com.jinrui.reference.core.model.vo.news.NewsDetailTagItem; +import java.util.ArrayList; import java.util.List; @SuppressWarnings("unused") @@ -13,17 +14,22 @@ public class SaveDraftTag { private Long field; private List fieldArr; - public SaveDraftTag() {} + public SaveDraftTag() { + } public SaveDraftTag(NewsDetailTag newsDetailTag) { NewsDetailTagItem sourceItem = newsDetailTag.getSource(); if (sourceItem != null) { this.source = sourceItem.getId(); } - NewsDetailTagItem fieldItem = newsDetailTag.getField(); - if (fieldItem != null) { - this.field = fieldItem.getId(); + this.fieldArr = new ArrayList<>(); + for (NewsDetailTagItem item : newsDetailTag.getFieldArr()) { + this.fieldArr.add(item.getId()); } +// NewsDetailTagItem fieldItem = newsDetailTag.getField(); +// if (fieldItem != null) { +// this.field = fieldItem.getId(); +// } } public Long getSource() { diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java index 86c5d5e..8d8d7a3 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java @@ -235,6 +235,7 @@ public class NewsService { NewsDetailTag newsDetailTag = new NewsDetailTag(); newsDetailVO.setTag(newsDetailTag); if (!CollectionUtils.isEmpty(tagRelList)) { + List arr = new ArrayList<>(); for (NewsTagRel rel : tagRelList) { Long tagId = rel.getTagId(); Tag tag = tagMap.get(tagId); @@ -245,9 +246,12 @@ public class NewsService { if (parentId != null && parentId == 1) { newsDetailTag.setSource(tagItem); } else { +// newsDetailTag.setField(tagItem); newsDetailTag.setField(tagItem); + arr.add(tagItem); } } + newsDetailTag.setFieldArr(arr); } return ResultObject.success(newsDetailVO); }