diff --git a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/AliMailUtil.java b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/AliMailUtil.java index 2dc67ef..9c57f5e 100644 --- a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/AliMailUtil.java +++ b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/AliMailUtil.java @@ -100,12 +100,4 @@ public class AliMailUtil { Transport.send(message); } - public static void main(String[] args) throws Exception{ - String uuid = IdUtils.fastUUID(); - String EM = "

欢迎来到我们的服务！！

" - + "

请点击下面的网址确认您的注册:

" - + "注册账号" - + ""; - sendMail(EM,"2922936090@qq.com"); - } } \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java index f051ec0..5c8a593 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java @@ -145,6 +145,14 @@ public class AppLoginController { return R.ok(null, "您的账号已通过"); case 2: register.setStatus(0); + register.setAvatarUrl(registerForm.getAvatarUrl()); + register.setUsername(registerForm.getUsername()); + register.setSchoolId(registerForm.getSchoolId()); + register.setEmail(registerForm.getEmail()); + register.setProve(registerForm.getProve()); + register.setInvitationCode(registerForm.getInvitationCode()); + register.setEducation(registerForm.getEducation()); + register.setMajor(registerForm.getMajor()); appRegisterService.updateAppRegisterByPhone(register); break; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java index 9b7a34e..2f19544 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java @@ -39,9 +39,9 @@ public class PhoneCodeController { if (appRegister != null && appRegister.getStatus() == 0) { return AjaxResult.error(201, "请等待，您的账号正在审核中！"); } - if (appRegister != null && appRegister.getStatus() == 2) { - return AjaxResult.error(201, "您的账号申请被驳回，驳回原因: " + appRegister.getRemark()); - } +// if (appRegister != null && appRegister.getStatus() == 2) { +// return AjaxResult.error(201, "您的账号申请被驳回，驳回原因: " + appRegister.getRemark()); +// } send = sendNoteUtil.sendNoteMessgae(phoneNum); }else { send = sendNoteUtil.sendNoteMessgae(phoneNum);