浏览代码

7.25 一级电子市场 - 注册 - 登录 - 忘记密码

Mechrevo 2 年之前
父节点
当前提交
b7b1715ed8

+ 7 - 6
sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -77,7 +77,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	 * 审核
 	 */
 	boolean judge(TbPeople tbPeople){
-		//获取当前登陆人
+		//获取当前登陆人 todo:
 		String loginUser = "admin";
 		//获取当前被审核人的编号和审核情况
 		Long id = tbPeople.getId();
@@ -121,6 +121,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		int i = tbPeopleMapper.updateById(tbPeople1);
 		//远程调用停用app user表中的边民账号
 		int lock = adminInterface.isLock(id.toString(), People.PEOPLE_TYPE_ONE.getCode(), isLock);
+		//todo: 处理远程调用后的返回结果
 //		if((lock + i) != 2)throw new RuntimeException("停用失败!");
 //
 //		return i == 1 && lock == 1;
@@ -134,11 +135,11 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
 	}
 
-
-	/** 边民账号停用后不能登录app */
-	void loginPeople(String userName,String password){
-
-	}
+//
+//	/** 边民账号停用后不能登录app */
+//	void loginPeople(String userName,String password){
+//
+//	}
 
 
 

+ 56 - 0
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -0,0 +1,56 @@
+package com.pj.project.app_user;
+
+import com.pj.project.app_user.dto.ForgetPasswordDto;
+import com.pj.project.app_user.dto.RegisterDto;
+import com.pj.utils.sg.AjaxJson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+/**
+ * Controller: app_user -- 移动端账号
+ * @author qzy 
+ */
+@RestController
+@RequestMapping("/app/AppUser/")
+public class AppUserApiController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	AppUserService appUserService;
+
+
+	/** 用户注册 */
+	@RequestMapping("register")
+	public AjaxJson register(@Validated @RequestBody RegisterDto registerDto) {
+		boolean register = appUserService.register(registerDto);
+		if(!register)return AjaxJson.getError("注册失败!");
+		return AjaxJson.getSuccess( "注册完成!");
+	}
+
+	/** 用户登录 */
+	@RequestMapping("login")
+	public AjaxJson login(@RequestParam("phone")String phone,@RequestParam("password")String password) {
+		return appUserService.login(phone,password);
+	}
+
+	/** 忘记密码 */
+	@RequestMapping("forgetPassword")
+	public AjaxJson forgetPassword(@Validated ForgetPasswordDto forgetPasswordDto) {
+		return appUserService.forgetPassword(forgetPasswordDto);
+	}
+
+	/** 获取短信验证码 */
+	@RequestMapping("getPhoneSmsCode")
+	public AjaxJson getPhoneSmsCode(String phone) {
+		boolean phoneSmsCode = appUserService.getPhoneSmsCode(phone);
+		if(phoneSmsCode)return AjaxJson.getSuccess(phoneSmsCode + "");
+		return AjaxJson.getError();
+	}
+
+}

+ 0 - 20
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserController.java

@@ -80,26 +80,6 @@ public class AppUserController {
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
-	/** 用户注册 */
-	@RequestMapping("register")
-	public AjaxJson register(@Validated @RequestBody RegisterDto registerDto) {
-		boolean register = appUserService.register(registerDto);
-		if(!register)return AjaxJson.getError("注册失败!");
-		return AjaxJson.getSuccess(register + "");
-	}
-
-	/** 用户登录 */
-	@RequestMapping("login")
-	public AjaxJson login(@RequestParam("phone")String phone,@RequestParam("password")String password) {
-		return appUserService.login(phone,password);
-	}
-
-	/** 忘记密码 */
-	@RequestMapping("forgetPassword")
-	public AjaxJson forgetPassword(ForgetPasswordDto forgetPasswordDto) {
-		return appUserService.forgetPassword(forgetPasswordDto);
-	}
-
 
 
 	/*-----               正常业务接口👆👆    不越界     rpc远程调用 👇👇                     -----*/

+ 17 - 5
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -40,9 +40,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	//权限字符
 	@Autowired
 	private ReRoleMenuMapper reRoleMenuMapper;
-	/** 方法抽取 */
-	@Autowired
-	private MethodAppUserService methodAppUserService;
+
 
 
 
@@ -58,6 +56,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 
 	/** 改 */
 	void update(AppUser a){
+		a.setUpdateTime(new Date());
 		updateById(a);
 
 	}
@@ -187,8 +186,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		//获取当前手机号对象
 		AppUser appUser = appUserList.get(0);
 		//获取短信验证码发送结果
-		boolean sendResult = methodAppUserService.getSmsCode(forgetPasswordDto.getPhone());
-		if(!sendResult)return AjaxJson.getError("验证码发送失败!");
+		boolean phoneSmsCode = getPhoneSmsCode(forgetPasswordDto.getPhone());
+		if(!phoneSmsCode)return AjaxJson.getError("验证码发送失败!");
 		//从缓存中获取验证码
 		String smsCode = RedisUtil.get(forgetPasswordDto.getPhone());
 		if(smsCode == null)return AjaxJson.getError("验证码发送失败!");
@@ -218,4 +217,17 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		return AjaxJson.getError("验证码输入错误,请检查!");
 	}
 
+	/** 获取验证码 */
+	boolean getPhoneSmsCode(String phone){
+		//todo: 发送短信,其短信商回调验证码
+		String smsCode = "123";
+		//todo: 根据其短信发送情况返回不同的结果
+
+		// return false;
+
+		//todo: 保存到缓存,默认1分钟
+		RedisUtil.setByMINUTES(phone,smsCode, 1);
+
+		return true;
+	}
 }

+ 0 - 23
sp-service/sp-admin/src/main/java/com/pj/project/app_user/MethodAppUserService.java

@@ -1,13 +1,8 @@
 package com.pj.project.app_user;
 
-import com.pj.utils.cache.RedisUtil;
-import org.omg.CORBA.TIMEOUT;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * @Author Mechrevo
  * @Date 2023 07 25 15 05
@@ -16,24 +11,6 @@ import java.util.concurrent.TimeUnit;
 @Transactional(rollbackFor = Exception.class)
 public class MethodAppUserService {
 
-    /** App User mapper */
-    @Autowired
-    private AppUserMapper appUserMapper;
-
-
-    /** 获取手机验证码 */
-    boolean getSmsCode(String phone){
-        //todo: 发送短信,其短信商回调验证码
-        String smsCode = "123";
-        //todo: 可能存在短信发送失败情况
-//        if(false)return null;
-//        return false;
-
-
-        //todo: 保存到缓存,默认1分钟
-        RedisUtil.setByMINUTES(phone,smsCode, 1);
 
-        return true;
-    }
 
 }