glj-合并冲突并提交

kn-launcher/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -17,6 +17,7 @@ public interface LauncherConstant {
 //	String NACOS_NAMESPACE = "62fddd43-b621-43f6-9733-75a6e4d6756b";
 	String NACOS_NAMESPACE = "vordm";
 
+
 	/**
 	 * nacos dev 地址
 	 * 8.142.16.8(公网)

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;
 

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;
+
+
 
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java

@@ -214,7 +214,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;
@@ -255,7 +255,6 @@ public class DisasterInfoController {
 				.orderByDesc(DisasterInfoVo::getVordmId)
 			));
 		}
-
 	}
 
 

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);
+	}
+
 }