Merge branch 'feature/202504' into feature/202504-1
This commit is contained in:
commit
a8fbca23e8
|
|
@ -291,7 +291,7 @@ public class UserController extends ControllerBase {
|
|||
String subject = dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_EMAIL_NOTIFY, Constant.DICTIONARY_ITEM_EMAIL_TITLE_ACCOUNT_RESET_PASSWORD, appUser.getLanguageCode());
|
||||
String content = dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_EMAIL_NOTIFY, Constant.DICTIONARY_ITEM_EMAIL_CONTENT_RESET_PASSWORD_NOTIFY, appUser.getLanguageCode())
|
||||
.replace("${loginName}",appUser.getLoginName())
|
||||
.replace("${url}",activateUrl + "?code=" + Base64.getUrlEncoder().encodeToString(email.getBytes()))
|
||||
.replace("${url}",activateUrl + "?code=" + Base64.getUrlEncoder().encodeToString((email+"|0").getBytes()))
|
||||
.replace("${password}",password);
|
||||
emailService.sendEmail(email, subject,content);
|
||||
} catch (Exception ex) {
|
||||
|
|
@ -315,7 +315,7 @@ public class UserController extends ControllerBase {
|
|||
String subject = dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_EMAIL_NOTIFY, Constant.DICTIONARY_ITEM_EMAIL_TITLE_ACCOUNT_RESET_PASSWORD, appUser.getLanguageCode());
|
||||
String content = dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_EMAIL_NOTIFY, Constant.DICTIONARY_ITEM_EMAIL_CONTENT_RESET_PASSWORD_NOTIFY, appUser.getLanguageCode())
|
||||
.replace("${loginName}",appUser.getLoginName())
|
||||
.replace("${url}",activateUrl + "?code=" + Base64.getUrlEncoder().encodeToString(appUser.getEmail().getBytes()))
|
||||
.replace("${url}",activateUrl + "?code=" + Base64.getUrlEncoder().encodeToString((appUser.getEmail()+"|0").getBytes()))
|
||||
.replace("${password}",password)
|
||||
.replace("${website}",websiteUrl);
|
||||
emailService.sendEmail(appUser.getEmail(), subject, content);
|
||||
|
|
|
|||
Loading…
Reference in New Issue