|
@@ -29,11 +29,16 @@ import com.fdkankan.ucenter.vo.request.RegisterParam;
|
|
import com.fdkankan.ucenter.vo.response.LoginVo;
|
|
import com.fdkankan.ucenter.vo.response.LoginVo;
|
|
import com.fdkankan.ucenter.vo.response.UserVo;
|
|
import com.fdkankan.ucenter.vo.response.UserVo;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.Map;
|
|
|
|
+
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.thymeleaf.TemplateEngine;
|
|
|
|
+import org.thymeleaf.context.Context;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -58,6 +63,9 @@ public class LoginService {
|
|
@Value("${admin.register.validCode:2a22bac40f44af4d3b5fdc20ea706fc5}")
|
|
@Value("${admin.register.validCode:2a22bac40f44af4d3b5fdc20ea706fc5}")
|
|
private String registerValidCode;
|
|
private String registerValidCode;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private TemplateEngine templateEngine;
|
|
|
|
+
|
|
public LoginVo login(LoginParam param) {
|
|
public LoginVo login(LoginParam param) {
|
|
if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
|
|
if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
@@ -236,6 +244,12 @@ public class LoginService {
|
|
SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, SendMailAcceUtils.EN_CODE_MSG.replace("${code}", code), null);
|
|
SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, SendMailAcceUtils.EN_CODE_MSG.replace("${code}", code), null);
|
|
}if("2".equals(country)){
|
|
}if("2".equals(country)){
|
|
SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
|
|
SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
|
|
|
|
+ }else if("33".equals(country)){
|
|
|
|
+ Context context = new Context();
|
|
|
|
+ Map<String,Object> params= new HashMap<>();
|
|
|
|
+ params.put("code",code);
|
|
|
|
+ context.setVariables(params);
|
|
|
|
+ SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, templateEngine.process("registerCompanyEmail-".concat(country), context), null);
|
|
}else {
|
|
}else {
|
|
SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
|
|
SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
|
|
}
|
|
}
|