From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java
index bdfbd00..17344bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java
@@ -5,11 +5,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -17,7 +20,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.email.MailSenderUtil;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/email")
@@ -42,7 +44,7 @@
* @param out
*/
@RequestMapping(value = "sendExtractCode")
- public void sendExtractCode(String callback, HttpSession session, PrintWriter out) {
+ public void sendExtractCode(AdminAcceptData acceptData, String callback, HttpSession session, PrintWriter out) {
AdminUser adminUser = (AdminUser) session.getAttribute(Constant.SESSION_ADMIN);
if (adminUser == null) {
if (StringUtil.isNullOrEmpty(callback))
@@ -54,7 +56,7 @@
// 鑾峰彇鐩爣閭
adminUser = adminUserService.selectByPrimaryKey(adminUser.getId());
- Config config = configService.getConfig("extract_code_email_from");
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey(),acceptData.getSystem());
String[] sts = config.getValue().split(",");
String account = sts[0];
String pwd = sts[1];
@@ -87,7 +89,7 @@
* @param out
*/
@RequestMapping(value = "verifyExtractCode")
- public void verifyExtractCode(String callback, String code, HttpSession session, PrintWriter out) {
+ public void verifyExtractCode(AdminAcceptData acceptData,String callback, String code, HttpSession session, PrintWriter out) {
AdminUser adminUser = (AdminUser) session.getAttribute(Constant.SESSION_ADMIN);
if (adminUser == null) {
if (StringUtil.isNullOrEmpty(callback))
--
Gitblit v1.8.0