glj-代码提交
This commit is contained in:
parent
b87bd45d62
commit
e331c30050
|
@ -32,4 +32,7 @@ public class VisualData {
|
|||
* @description 区分上传的是词云还是热点数据
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
//news或gdacs 来源0 news /1gdacs
|
||||
private String source;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<Boolean> delete(@RequestParam String ids){
|
||||
public R<Boolean> delete(@RequestParam String ids,@RequestParam String email){
|
||||
bladeRedis.del("blade:user::user:account:595035-"+email);
|
||||
return R.status(service.deleteLogic(Func.toLongList(ids)));
|
||||
}
|
||||
/**
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -101,6 +101,7 @@ public class VisualDataServiceImpl extends ServiceImpl<VisualDataMapper, EntityD
|
|||
hotspot.setStatus(1);
|
||||
hotspot.setManagerId(AuthUtil.getUserId());
|
||||
hotspot.setReviewTime(new Date());
|
||||
hotspot.setSource(visualData.getSource());
|
||||
return hotspotService.save(hotspot);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue