From a8cf882e20df95102509e9548162e57cbba347cd Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期五, 28 四月 2023 10:20:14 +0800
Subject: [PATCH] 工程错误提交
---
/dev/null | 69 ----------------------------------
product-server-admin/pom.xml | 6 --
product-server-admin/src/main/java/com/product/admin/controller/PromptController.java | 1
3 files changed, 1 insertions(+), 75 deletions(-)
diff --git a/product-server-admin/pom.xml b/product-server-admin/pom.xml
index fc8223f..4e7d51b 100644
--- a/product-server-admin/pom.xml
+++ b/product-server-admin/pom.xml
@@ -48,11 +48,7 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
- <dependency>
- <groupId>com.sendgrid</groupId>
- <artifactId>sendgrid-java</artifactId>
- <version>4.0.1</version>
- </dependency>
+
<dependency>
<groupId>com.lx</groupId>
diff --git a/product-server-admin/src/main/java/com/product/admin/controller/PromptController.java b/product-server-admin/src/main/java/com/product/admin/controller/PromptController.java
index 5809e42..f38449b 100644
--- a/product-server-admin/src/main/java/com/product/admin/controller/PromptController.java
+++ b/product-server-admin/src/main/java/com/product/admin/controller/PromptController.java
@@ -16,7 +16,6 @@
import com.product.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;
import com.product.util.support.AbstractBaseController;
-import com.sun.org.apache.regexp.internal.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/product-server-admin/src/main/java/com/product/admin/util/email/SendGridSendEmail.java b/product-server-admin/src/main/java/com/product/admin/util/email/SendGridSendEmail.java
deleted file mode 100644
index 34c8f31..0000000
--- a/product-server-admin/src/main/java/com/product/admin/util/email/SendGridSendEmail.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.product.admin.util.email;
-
-import java.io.IOException;
-
-import com.product.admin.config.CmnConst;
-import org.springframework.beans.factory.annotation.Value;
-
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.exception.BaseException;
-import com.sendgrid.Content;
-import com.sendgrid.Email;
-import com.sendgrid.Mail;
-import com.sendgrid.Method;
-import com.sendgrid.Request;
-import com.sendgrid.Response;
-import com.sendgrid.SendGrid;
-
-public class SendGridSendEmail {
-
- @Value("${sendGrid.mail.user}")
- private static String sendGridUser;
-
- @Value("${sendGrid.mail.key}")
- private static String sendGridKey;
-
- /**
- * SendGrid鍙戦�侀偖浠�
- * @param addressInfo 鏀朵欢浜轰俊鎭�
- * @throws BaseException
- */
- public static void sendMail(FieldSetEntity fseMailInfo) throws BaseException {
-
-
- //鍙戜欢浜猴紝鍗抽厤缃殑鍙戜欢浜洪偖绠卞湴鍧�
- Email from = new Email(sendGridUser);
- //鏀朵欢浜洪偖浠跺湴鍧�
- Email to = new Email(fseMailInfo.getString("addressee"));
- //閭欢涓婚
- String subject =fseMailInfo.getString("mail_title");
- //閭欢鍐呭
- Content content=null;
- if(fseMailInfo.getString(CmnConst.MAIN_CONTENT).indexOf("</html>")>-1) {
- content = new Content("text/html", fseMailInfo.getString(CmnConst.MAIN_CONTENT));
- }else {
- content = new Content("text/plain", fseMailInfo.getString(CmnConst.MAIN_CONTENT));
- }
- Mail mail = new Mail(from, subject, to, content);
- try {
- String apiKey = sendGridKey;
- SendGrid sg = new SendGrid(apiKey);
- Request request = new Request();
- request.setMethod(Method.POST);
- request.setEndpoint("mail/send");
- request.setBody(mail.build());
- Response response = sg.api(request);
- int statCode=response.getStatusCode();
- if(statCode<200 || statCode>=300) { //鍙戦�佸け璐�!
- fseMailInfo.setValue(CmnConst.SEND_STAT, 2);
- }else { //鍙戦�佹垚鍔�
- fseMailInfo.setValue(CmnConst.SEND_STAT, 1);
- }
- } catch (IOException ex) {
- fseMailInfo.setValue(CmnConst.SEND_STAT, 2);
- fseMailInfo.setValue("failure_reason", ex.getStackTrace());
- }
- fseMailInfo.setValue("smtp_username", sendGridUser);
- fseMailInfo.setValue("smtp_license_code", sendGridKey);
- }
-}
--
Gitblit v1.9.2