From 48943671240927b50cad06754a6d5e4f71c79a69 Mon Sep 17 00:00:00 2001 From: swr <396341246@qq.com> Date: Sat, 11 May 2024 17:59:01 +0800 Subject: [PATCH 1/3] 1 --- .../org/springblade/common/constant/LauncherConstant.java | 4 +++- .../com/kening/vordm/controller/DisasterInfoController.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kn-launcher/src/main/java/org/springblade/common/constant/LauncherConstant.java b/kn-launcher/src/main/java/org/springblade/common/constant/LauncherConstant.java index 7f36900..b410c98 100644 --- a/kn-launcher/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/kn-launcher/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -14,7 +14,9 @@ public interface LauncherConstant { /** * nacos namespace id */ - String NACOS_NAMESPACE = "62fddd43-b621-43f6-9733-75a6e4d6756b"; +// String NACOS_NAMESPACE = "62fddd43-b621-43f6-9733-75a6e4d6756b"; + String NACOS_NAMESPACE = "vordm"; + /** * nacos dev 地址 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 1f9c5a9..73a5eac 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -201,7 +201,7 @@ public class DisasterInfoController { //Latest six month 上3个月 date = LocalDate.now().minusMonths(3); break; - case "4": + case "5": //Latest six month 上6个月 date = LocalDate.now().minusMonths(6); break; From cc368940894fff3fdd34a45ed0f77fab1d52b2cc Mon Sep 17 00:00:00 2001 From: swr <396341246@qq.com> Date: Fri, 17 May 2024 17:51:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/GuestInfo.java | 16 ++++++++++++++ .../java/com/kening/vordm/entity/Tool.java | 21 +++++++++++++++++++ .../controller/DisasterInfoController.java | 1 - 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java index d4923b2..2ecc74d 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java @@ -71,6 +71,22 @@ public class GuestInfo implements Serializable { */ private String firstName; + /** + * 姓名 + */ + private String realName; + + /** + * 学历，教育机构 + */ + private String education; + + /** + * 自我介绍 + */ + private String introduction; + + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java index 2621151..728a9ce 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java @@ -113,5 +113,26 @@ public class Tool implements Serializable { */ private int paperVisits; + /** + * 灾害类型 + */ + private String disasterType; + + /** + * vordmIds(,分割) + */ + private String vordmIds; + + /** + * disaster_info表 Id(,分割) + */ + private String disasterInfoIds; + + /** + * 相关灾害类型 + */ + private String relatedDisasterType; + + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 73a5eac..e6a51ba 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -242,7 +242,6 @@ public class DisasterInfoController { .orderByDesc(DisasterInfoVo::getVordmId) )); } - } From 26e43f434efb022f30777265f58d13fb8774c119 Mon Sep 17 00:00:00 2001 From: swr <396341246@qq.com> Date: Thu, 23 May 2024 15:02:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/controller/LoginController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java index 198caf2..08307db 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java @@ -1,5 +1,6 @@ package com.kening.vordm.controller; +import com.kening.vordm.entity.Email; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.EmailService; import com.kening.vordm.vo.UserVo; @@ -8,6 +9,7 @@ import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import javax.mail.MessagingException; +import java.util.Random; @RestController @RequiredArgsConstructor @@ -59,4 +61,24 @@ public class LoginController { public R getBladeUserByEmail(String email) { return R.data(disasterInfoService.getBladeUserByEmail(email)); } + + /** + * 发送电子邮件验证码 + * @return + * @throws MessagingException + */ + @GetMapping("/sendEmailVerificationCode") + public R sendEmailVerificationCode(String emailUrl) throws MessagingException { + Email email = new Email(); + Random random = new Random(); + int randomNumber = random.nextInt(999999); + String formattedNumber = String.format("%06d", randomNumber); + email.setSubject("[VoRDM] Please verify your device"); + email.setText("Verification code: "+formattedNumber); + email.setHtmlText(false); + email.setTos(emailUrl.split(",")); + emailService.sendMimeMessage(email); + return R.data(formattedNumber); + } + }