Merge branch 'glj'

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

@@ -37,5 +37,4 @@ public class CaptchaController extends BladeController {
 		}
 		return R.success("OK");
 	}
-
 }

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

@@ -0,0 +1,31 @@
+package com.kening.vordm.controller;
+
+import com.kening.vordm.entity.Email;
+import com.kening.vordm.service.EmailService;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.mail.MessagingException;
+
+@RestController
+@RequestMapping("/ui/email")
+@RequiredArgsConstructor
+@Api(value = "邮箱发送", tags = "邮箱发送")
+public class EmailController {
+
+	private final EmailService emailService;
+
+	@PostMapping("/emailSend")
+	public R emailSend(Email email) {
+		try {
+			emailService.sendMimeMessage(email);
+			return R.success("OK");
+		} catch (MessagingException e) {
+			return R.fail(e.getMessage());
+		}
+	}
+}