From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/api/HelpController.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/HelpController.java b/src/main/java/com/yeshi/buwan/controller/api/HelpController.java
index 3f3946b..b7e17e4 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/HelpController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/HelpController.java
@@ -1,11 +1,8 @@
package com.yeshi.buwan.controller.api;
-import com.yeshi.buwan.controller.EmailController;
import com.yeshi.buwan.util.COSManager;
import com.yeshi.buwan.util.JsonUtilV2;
-import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.TimeUtil;
-import com.yeshi.buwan.util.email.MailSenderUtil;
import com.yeshi.buwan.vo.AcceptData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,12 +11,12 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.annotation.RequestSerializableByKey;
+import org.yeshi.utils.exception.MailSendException;
+import org.yeshi.utils.mail.EmailApiUtil;
+import org.yeshi.utils.mail.EmailInfo;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
@Controller
@RequestMapping("api/v2/help")
@@ -36,7 +33,7 @@
* @param: acceptData
* @param: loginUid
**/
- @RequestSerializableByKey(key="#acceptData.device")
+ @RequestSerializableByKey(key = "#acceptData.device")
@RequestMapping("privacyReport")
@ResponseBody
public String privacyReport(AcceptData acceptData, HttpServletRequest request, MultipartFile[] images) {
@@ -56,19 +53,44 @@
}
String title = "闅愮鎶曡瘔锛�" + content;
StringBuffer buffer = new StringBuffer();
- buffer.append("鍖呭悕锛�"+acceptData.getPackageName());
+ buffer.append("鍖呭悕锛�" + acceptData.getPackageName());
buffer.append("\n\r");
- buffer.append("UTDID锛�"+acceptData.getUtdId());
+ buffer.append("UTDID锛�" + acceptData.getUtdId());
buffer.append("\n\r");
- buffer.append("DEVICE锛�"+acceptData.getDevice());
+ buffer.append("DEVICE锛�" + acceptData.getDevice());
buffer.append("\n\r");
buffer.append("鎶曡瘔鍐呭锛�");
buffer.append(content);
buffer.append("\n\r");
buffer.append("鎻愪緵鐨勬埅鍥句负锛�" + urlList);
- MailSenderUtil.sendEmail("yesbd@qq.com","buwanysdq@163.com", "weikou2014",title,buffer.toString());
+
+
+ EmailInfo emailInfo = new EmailInfo();
+ emailInfo.setToEmail("yesbd@qq.com");
+ emailInfo.setTitle(title);
+ emailInfo.setFromEmail("buwanysdq@163.com");
+ emailInfo.setFormEmailPwd("weikou2014");
+ emailInfo.setContent(buffer.toString());
+ emailInfo.setApp("褰辫");
+
+ try {
+ EmailApiUtil.sendEmail(emailInfo);
+ } catch (MailSendException e) {
+ e.printStackTrace();
+ }
+
return JsonUtilV2.loadTrueJson("鎴愬姛");
}
+ @RequestMapping("advice")
+ @ResponseBody
+ public String advice(AcceptData acceptData, HttpServletRequest request) {
+ String content = request.getParameter("content");
+ String type = request.getParameter("type");
+ String uid = request.getParameter("uid");
+ logger.info(String.format("\n鎰忚鍙嶉锛歕n鐢ㄦ埛ID锛�%s\n绫诲瀷锛�%s\n鍐呭锛�%s", uid, type, content));
+ return JsonUtilV2.loadTrueJson("");
+ }
+
}
--
Gitblit v1.8.0