|
|
@@ -9,9 +9,8 @@ import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.model.SysRole;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
-import com.ydtech.modules.admin.model.SysUserRole;
|
|
|
import com.ydtech.modules.admin.model.vo.LoginBean;
|
|
|
-import com.ydtech.modules.admin.service.SysRoleService;
|
|
|
+import com.ydtech.modules.admin.model.vo.PhoneLoginVo;
|
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
|
@@ -28,7 +27,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.imageio.ImageIO;
|
|
|
-import javax.servlet.ServletException;
|
|
|
import javax.servlet.ServletOutputStream;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -204,15 +202,14 @@ public class SysLoginController {
|
|
|
/**
|
|
|
* 手机验证码登录
|
|
|
*
|
|
|
- * @param phone
|
|
|
- * @param phoneMsg
|
|
|
- * @param request
|
|
|
- * @return
|
|
|
- * @throws IOException
|
|
|
+ * @param phoneLoginVo 手机号登录实体
|
|
|
+ * @return token
|
|
|
*/
|
|
|
@PostMapping("/loginByPhone")
|
|
|
- public HttpResult loginByPhone(@RequestParam String phone, @RequestParam String phoneMsg, HttpServletRequest request) {
|
|
|
+ public HttpResult<String> loginByPhone(PhoneLoginVo phoneLoginVo) {
|
|
|
// 用户信息
|
|
|
+ String phone = phoneLoginVo.getPhone();
|
|
|
+ String phoneMsg = phoneLoginVo.getPhoneMsg();
|
|
|
SysUser user = sysUserService.findByPhone(phone);
|
|
|
//验证用户
|
|
|
SysUser.verifyUser(user);
|