From 846ff7c7570ef124b10e48d6816955a1bbc02db5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 23 May 2024 01:33:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
src/main/java/com/nq/controller/UserApiController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index d5bf5ac..7f2629a 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -54,13 +54,47 @@
@Autowired
ISiteSpreadService iSiteSpreadService;
-
//注册
@RequestMapping(value = {"reg.do"}, method = {RequestMethod.POST})
@ResponseBody
- public ServerResponse reg(@RequestParam("agentCode") String agentCode, @RequestParam("phone") String phone, @RequestParam(value = "yzmCode", defaultValue = "") String yzmCode, @RequestParam("userPwd") String userPwd, HttpServletRequest httpServletRequest) {
- return this.iUserService.reg(yzmCode, agentCode, phone, userPwd, httpServletRequest);
-}
+ public ServerResponse reg(@RequestParam("agentCode") String agentCode,
+ @RequestParam("phone") String phone,
+ @RequestParam("phoneCode") String phoneCode,
+ @RequestParam("userPwd") String userPwd,
+ HttpServletRequest httpServletRequest) {
+ return this.iUserService.reg(agentCode, phone,phoneCode, userPwd,httpServletRequest);
+ }
+
+ @RequestMapping(value = {"sendMailCode.do"}, method = {RequestMethod.POST})
+ @ResponseBody
+ public ServerResponse sendMailCode(@RequestParam("email") String email) {
+ try {
+ if (email == null || email.isEmpty()) { // 判断email参数是否为空
+ return ServerResponse.createByErrorMsg("邮箱不能为空");
+ }
+ log.info("-------->发送邮件");
+ return this.iUserService.sendMailCode(email);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ServerResponse.createByErrorMsg("发送失败，发生异常");
+ }
+ }
+
+ @RequestMapping(value = {"sendSms.do"}, method = {RequestMethod.POST})
+ @ResponseBody
+ public ServerResponse sendSms(@RequestParam("phone") String phone,HttpServletRequest request) {
+ try {
+ if (phone == null || phone.isEmpty()) {
+ return ServerResponse.createByErrorMsg("手机号不能为空",request);
+ }
+ log.info("-------->发送短信");
+ return this.iUserService.sendSms(phone,request);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ServerResponse.createByErrorMsg("发送失败，发生异常");
+ }
+ }
+
//登录
@RequestMapping(value = {"login.do"}, method = {RequestMethod.POST})
@@ -76,7 +110,7 @@
UserLoginResultVO resultVO = new UserLoginResultVO();
resultVO.setKey(pc_cookie_name);
resultVO.setToken(token);
- return ServerResponse.createBySuccess("Login Success", resultVO);
+ return ServerResponse.createBySuccess("登录成功", resultVO);
}
return serverResponse;
}
--
Gitblit v1.9.3