wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.mowei.com.cn/wyh/gan into main

main
linhw 2024-08-16 11:49:39 +08:00
parent 0df4da3f1f f4a69cc371
commit f0bebb23be
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/AliMailUtil.java
View File

@ -100,12 +100,4 @@ public class AliMailUtil {
Transport.send(message); Transport.send(message);
} }
public static void main(String[] args) throws Exception{
String uuid = IdUtils.fastUUID();
String EM = "<html><body><h2>欢迎来到我们的服务！！</h2>"
+ "<p>请点击下面的网址确认您的注册:</p>"
+ "<a href=https://gobig.flameby.com/api/app/activation/" + uuid + "/2922936090@qq.com>注册账号</a>"
+ "</body></html>";
sendMail(EM,"2922936090@qq.com");
}
} }

8
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
View File

@ -145,6 +145,14 @@ public class AppLoginController {
return R.ok(null, "您的账号已通过"); return R.ok(null, "您的账号已通过");
case 2: case 2:
register.setStatus(0); 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); appRegisterService.updateAppRegisterByPhone(register);
break; break;
} }

6
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java
View File

@ -39,9 +39,9 @@ public class PhoneCodeController {
if (appRegister != null && appRegister.getStatus() == 0) { if (appRegister != null && appRegister.getStatus() == 0) {
return AjaxResult.error(201, "请等待，您的账号正在审核中！"); return AjaxResult.error(201, "请等待，您的账号正在审核中！");
} }
if (appRegister != null && appRegister.getStatus() == 2) { // if (appRegister != null && appRegister.getStatus() == 2) {
return AjaxResult.error(201, "您的账号申请被驳回，驳回原因: " + appRegister.getRemark()); // return AjaxResult.error(201, "您的账号申请被驳回，驳回原因: " + appRegister.getRemark());
} // }
send = sendNoteUtil.sendNoteMessgae(phoneNum); send = sendNoteUtil.sendNoteMessgae(phoneNum);
}else { }else {
send = sendNoteUtil.sendNoteMessgae(phoneNum); send = sendNoteUtil.sendNoteMessgae(phoneNum);