Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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];