From feee59af9b9d8173e28d7cde588b1ef9fcdb7efd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 四月 2020 19:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/EmailAdminController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..bd99fd3 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
@@ -7,9 +7,11 @@
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 +19,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")
@@ -54,7 +55,7 @@
// 鑾峰彇鐩爣閭
adminUser = adminUserService.selectByPrimaryKey(adminUser.getId());
- Config config = configService.getConfig("extract_code_email_from");
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());
String[] sts = config.getValue().split(",");
String account = sts[0];
String pwd = sts[1];
--
Gitblit v1.8.0