|
@@ -22,11 +22,9 @@ import com.fdkankan.ucenter.constant.LoginConstant;
|
|
|
import com.fdkankan.ucenter.constant.QrCodeFilePath;
|
|
|
import com.fdkankan.ucenter.entity.Camera;
|
|
|
import com.fdkankan.ucenter.entity.CameraDetail;
|
|
|
+import com.fdkankan.ucenter.entity.MailTemplate;
|
|
|
import com.fdkankan.ucenter.entity.User;
|
|
|
-import com.fdkankan.ucenter.service.ICameraDetailService;
|
|
|
-import com.fdkankan.ucenter.service.ICameraService;
|
|
|
-import com.fdkankan.ucenter.service.ILoginLogService;
|
|
|
-import com.fdkankan.ucenter.service.IUserService;
|
|
|
+import com.fdkankan.ucenter.service.*;
|
|
|
import com.fdkankan.ucenter.vo.request.LoginParam;
|
|
|
import com.fdkankan.ucenter.vo.request.RegisterParam;
|
|
|
import com.fdkankan.ucenter.vo.response.LoginVo;
|
|
@@ -65,7 +63,8 @@ public class LoginService {
|
|
|
private String registerValidCode;
|
|
|
@Autowired
|
|
|
private FYunFileServiceInterface fYunFileServiceInterface;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ IMailTemplateService mailTemplateService;
|
|
|
|
|
|
public LoginVo login(LoginParam param) {
|
|
|
if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
|
|
@@ -244,18 +243,11 @@ public class LoginService {
|
|
|
}
|
|
|
String code = String.valueOf((int)((Math.random()*9+1)*100000));
|
|
|
|
|
|
- switch (country) {
|
|
|
- case "1":
|
|
|
- case "33":
|
|
|
- SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, MailUtil.EN_CODE_MSG.replace("${code}", code), null);
|
|
|
- break;
|
|
|
- case "2":
|
|
|
- SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
|
|
|
- break;
|
|
|
- default:
|
|
|
- SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
|
|
|
- break;
|
|
|
- }
|
|
|
+
|
|
|
+ MailTemplate mailTemplate = mailTemplateService.getById(2);
|
|
|
+
|
|
|
+ SendMailAcceUtils.sendMail(email, mailTemplate.getSubject(), mailTemplate.getMsg().replace("{code}", code), null);
|
|
|
+
|
|
|
|
|
|
//删除缓存
|
|
|
if (redisUtil.hasKey(RedisKeyUtil.PREFIX_MSG_AUTH_CODE + email)){
|