添加app登录接口

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -1,11 +1,14 @@
 package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.util.BeanMapperUtils;
 import com.usky.common.core.util.JwtUtils;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.auth.AuthUtil;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.system.domain.SysUser;
+import com.usky.system.domain.SysUserVO;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysPermissionService;
 import com.usky.system.service.ISysUserService;
@@ -49,6 +52,22 @@ public class TokenController
         return ApiResult.success(tokenService.createToken(userInfo));
     }
 
+
+    @PostMapping("appLogin")
+    public ApiResult<?> appLogin(@RequestBody LoginBody form)
+    {
+        String phone = null;
+        // 用户登录
+        SysUser userInfo = sysLoginService.appLogin(form.getUsername(), form.getPassword(), form.getTenantId(),phone);
+        LoginUser SysUser = new LoginUser();
+        SysUserVO sysUserVO = BeanMapperUtils.map(userInfo, SysUserVO.class);
+        SysUser.setSysUser(sysUserVO);
+        // 获取登录token
+        return ApiResult.success(tokenService.createToken(SysUser));
+    }
+
+
+
     @PostMapping("login1")
     public ApiResult<?> login1(@RequestBody LoginBody form)
     {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -1,7 +1,6 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
@@ -144,4 +143,7 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
 
     public List<SysUser> userList(@Param("tenantId") Integer tenantId,
                                   @Param("createBy") String createBy);
+
+    SysUser selectUserData(@Param("userName") String userName,
+                           @Param("tenantId") Integer tenantId);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -200,7 +200,8 @@ public interface ISysUserService extends CrudService<SysUser> {
 
     public LoginUser getUserInfoOne(String username,Integer tenantId);
 
-
+    SysUser getAppUserInfo(String username, Integer tenantId);
+    
     public Boolean register(SysUser sysUser);
 
     public int addUser(SysUser user);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -19,12 +19,11 @@ import org.springframework.stereotype.Component;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class SysLoginService
-{
+public class SysLoginService {
 
     @Autowired
     private ISysLogininforService sysLogininforService;
@@ -35,50 +34,43 @@ public class SysLoginService
     /**
      * 登录
      */
-    public LoginUser login(String username, String password,Integer tenantId)
-    {
+    public LoginUser login(String username, String password, Integer tenantId) {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
-        {
+        if (StringUtils.isAnyBlank(username, password)) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new BusinessException("用户/密码必须填写");
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
-        {
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new BusinessException("用户密码不在指定范围");
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
-        {
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new BusinessException("用户名不在指定范围");
         }
 
         // 查询用户信息
         LoginUser loginUser = new LoginUser();
-        if (tenantId!=null&&tenantId!=0){
-            loginUser = sysUserService.getUserInfoOne(username,tenantId);
-        }else {
+        if (tenantId != null && tenantId != 0) {
+            loginUser = sysUserService.getUserInfoOne(username, tenantId);
+        } else {
             loginUser = sysUserService.getUserInfo(username);
         }
 
         SysUserVO user = loginUser.getSysUser();
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
-        {
+        if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
         }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
-        {
+        if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new BusinessException("对不起，您的账号：" + username + " 已停用");
         }
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
-        {
+        if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
             recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
             throw new BusinessException("用户不存在/密码错误");
         }
@@ -86,29 +78,73 @@ public class SysLoginService
         return loginUser;
     }
 
-    public void logout(String loginName)
-    {
+
+    public SysUser appLogin(String username, String password, Integer tenantId, String phone) {
+        SysUser loginUser = new SysUser();
+        if (username != null && !"".equals(username)) {
+            // 用户名或密码为空 错误
+            if (StringUtils.isAnyBlank(username, password)) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+                throw new BusinessException("用户/密码必须填写");
+            }
+
+            // 密码如果不在指定范围内 错误
+            if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+                    || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+                throw new BusinessException("用户密码不在指定范围");
+            }
+
+            // 用户名不在指定范围内 错误
+            if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+                    || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+                throw new BusinessException("用户名不在指定范围");
+            }
+
+            //查询用户信息
+            loginUser = sysUserService.getAppUserInfo(username, tenantId);
+
+            if (!SecurityUtils.matchesPassword(password, loginUser.getPassword())) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
+                throw new BusinessException("用户不存在/密码错误");
+            }
+        } else if (phone != null && !"".equals(phone)) {
+
+        }
+
+        if (UserStatus.DELETED.getCode().equals(loginUser.getDelFlag())) {
+            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
+        }
+        if (UserStatus.DISABLE.getCode().equals(loginUser.getStatus())) {
+            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new BusinessException("对不起，您的账号：" + username + " 已停用");
+        }
+
+        recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        return loginUser;
+    }
+
+
+    public void logout(String loginName) {
         recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
     }
 
     /**
      * 注册
      */
-    public void register(String username, String password)
-    {
+    public void register(String username, String password) {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
-        {
+        if (StringUtils.isAnyBlank(username, password)) {
             throw new BusinessException("用户/密码必须填写");
         }
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
-        {
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
             throw new BusinessException("账户长度必须在2到20个字符之间");
         }
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
-        {
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
             throw new BusinessException("密码长度必须在5到20个字符之间");
         }
 
@@ -123,25 +159,21 @@ public class SysLoginService
 
     /**
      * 记录登录信息
-     * 
+     *
      * @param username 用户名
-     * @param status 状态
-     * @param message 消息内容
+     * @param status   状态
+     * @param message  消息内容
      * @return
      */
-    public void recordLogininfor(String username, String status, String message)
-    {
+    public void recordLogininfor(String username, String status, String message) {
         SysLogininforVO logininfor = new SysLogininforVO();
         logininfor.setUserName(username);
         logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
         logininfor.setMsg(message);
         // 日志状态
-        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
-        {
+        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
             logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
-        }
-        else if (Constants.LOGIN_FAIL.equals(status))
-        {
+        } else if (Constants.LOGIN_FAIL.equals(status)) {
             logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
         }
         sysLogininforService.insertLogininfor(BeanMapperUtils.map(logininfor, SysLogininfor.class));

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -489,6 +489,19 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return SysUser;
     }
 
+    @Override
+    public SysUser getAppUserInfo(String username, Integer tenantId)
+    {
+        SysUser sysUser = userMapper.selectUserData(username,tenantId);
+        if (Objects.isNull(sysUser))
+        {
+            throw new BusinessException("用户信息/密码不存在");
+        }
+        return sysUser;
+    }
+
+
+
     @Override
     public Boolean register(SysUser sysUser)
     {

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -280,4 +280,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		order by user_id desc
 	</select>
+
+	<select id="selectUserData" resultMap="SysUserResult">
+		select * from sys_user
+		where user_name = #{userName}
+		<if test="tenantId != null and tenantId != 0">
+			and tenant_id = #{tenantId}
+		</if>
+
+	</select>
 </mapper>