From e331c30050a128d63712136744ab374e947cc286 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 10 Jul 2023 16:45:24 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kening/vordm/entity/VisualData.java | 3 +++ .../src/main/java/com/kening/vordm/VoRdmApplication.java | 2 +- .../kening/vordm/controller/AdministratorController.java | 7 ++++--- .../com/kening/vordm/controller/CrawlInfoController.java | 7 ------- .../com/kening/vordm/service/impl/EmailServiceImpl.java | 4 ++++ .../kening/vordm/service/impl/VisualDataServiceImpl.java | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VisualData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VisualData.java index 2a8f430..4871329 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VisualData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VisualData.java @@ -32,4 +32,7 @@ public class VisualData { * @description 区分上传的是词云还是热点数据 */ private Integer type; + + //news或gdacs 来源0 news /1gdacs + private String source; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 6097f7d..cd32db5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("yyhouc-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java index 890f803..c18ecca 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java @@ -8,11 +8,10 @@ import lombok.AllArgsConstructor; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.BladeUser; +import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.HttpRequest; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -31,6 +30,7 @@ public class AdministratorController { private AdministratorService service; + private BladeRedis bladeRedis; /** * 管理员用户分页列表 * @param query @@ -73,7 +73,8 @@ public class AdministratorController { * @return */ @DeleteMapping("/delete") - public R delete(@RequestParam String ids){ + public R delete(@RequestParam String ids,@RequestParam String email){ + bladeRedis.del("blade:user::user:account:595035-"+email); return R.status(service.deleteLogic(Func.toLongList(ids))); } /** diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java index 487a988..86cf542 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java @@ -1,7 +1,5 @@ package com.kening.vordm.controller; -import cn.hutool.crypto.digest.MD5; -import com.alibaba.nacos.common.utils.MD5Utils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -104,11 +102,6 @@ public class CrawlInfoController { return R.data(list); } - public static void main(String[] args) { - String key = encrypt("^RUWY6@d&%hVf5qYY9basW21KIaBmuER"); - long time = System.currentTimeMillis()/1000; - System.out.println(time+"-"+encrypt((key+time))); - } public static String encrypt(String plaintext) { try { MessageDigest md = MessageDigest.getInstance("MD5"); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java index 477af04..1b00bd8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java @@ -6,6 +6,7 @@ import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.EmailService; import com.kening.vordm.vo.UserVo; import lombok.RequiredArgsConstructor; +import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DigestUtil; @@ -38,6 +39,8 @@ public class EmailServiceImpl implements EmailService { private final DisasterInfoMapper disasterInfoMapper; + private final BladeRedis bladeRedis; + @Value("${spring.mail.username}") private String from; @@ -65,6 +68,7 @@ public class EmailServiceImpl implements EmailService { return R.data(1405, "There are currently no bound users for this email"); } disasterInfoMapper.updataUserByEmail(userVo.getEmail(),"1790ae2beb8e6c6a4c6744667e11c4ba26abeb09"); + bladeRedis.del("blade:user::user:account:595035-"+userVo.getEmail()); Email email = new Email(); email.setSubject("Your login password has been updated"); String encrypt = DigestUtil.encrypt(bladeUser.getPassword()); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/VisualDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/VisualDataServiceImpl.java index 3e47d44..c9804cf 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/VisualDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/VisualDataServiceImpl.java @@ -101,6 +101,7 @@ public class VisualDataServiceImpl extends ServiceImpl