fix 新增小程序扫码登录PC

boman-api/boman-api-system/src/main/java/com/boman/system/api/model/LoginUser.java

@@ -76,6 +76,20 @@ public class LoginUser implements Serializable
      */
     private List<Long> deptUserIds;
 
+    /**
+     * 小程序登录的状态码
+     */
+    private Integer code;
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
     public String getToken()
     {
         return token;

boman-api/boman-domain/src/main/java/com.boman.domain/constant/Constants.java

@@ -34,6 +34,11 @@ public class Constants
      */
     public static final Integer SUCCESS = 200;
 
+    /**
+     * 授权成功
+     */
+    public static final Integer EMPOWER = 201;
+
     /**
      * 登录状态失效
      */

boman-auth/src/main/java/com/boman/auth/controller/TokenController.java

@@ -4,13 +4,10 @@ import com.boman.auth.service.SysLoginService;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.alibaba.fastjson.JSONObject;
-import com.boman.auth.form.PoolCache;
-import com.boman.auth.form.ScanPool;
+
 import com.boman.common.core.exception.BaseException;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.security.service.TokenService;
-import com.boman.common.core.utils.SecurityUtils;
 import com.boman.domain.SysUser;
 import com.boman.domain.WechatEnum;
 import com.boman.domain.dto.AjaxResult;
@@ -19,16 +16,9 @@ import com.boman.domain.form.LoginBody;
 import com.boman.system.api.model.LoginUser;
 import com.boman.wechat.api.RemoteWechatService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import com.boman.wechat.api.RemoteWechatService;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
 import java.util.Map;
-import java.util.UUID;
+
 
 /**
  * token 控制
@@ -115,9 +105,8 @@ public class TokenController {
      * @return
      */
     @PostMapping("phoneScanLogin")
-    public R<?> phoneScanLogin(@RequestBody LoginBody form) {
-        LoginUser loginUser = sysLoginService.phoneScanLogin(form);
-        return R.ok(tokenService.createToken(loginUser));
+    public void phoneScanLogin(@RequestBody LoginBody form) {
+        sysLoginService.phoneScanLogin(form);
     }
 
     @DeleteMapping("logout")

boman-auth/src/main/java/com/boman/auth/service/SysLoginService.java

@@ -17,6 +17,8 @@ import com.boman.system.api.RemoteUserService;
 import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
+import static com.boman.domain.constant.Constants.SUCCESS;
+
 /**
  * 登录校验方法
  *
@@ -94,9 +96,9 @@ public class SysLoginService {
      * @param form
      * @return
      */
-    public LoginUser phoneScanLogin(LoginBody form) {
-        Object cacheObject = redisService.getCacheObject(form.getUuid());
-        if (cacheObject == null) {
+    public void phoneScanLogin(LoginBody form) {
+        LoginUser loginUser = redisService.getCacheObject(form.getUuid());
+        if (loginUser == null) {
             throw new BaseException("登录超时,请重新登录");
         }
         String phone = form.getPhone();
@@ -115,9 +117,9 @@ public class SysLoginService {
             throw new BaseException("对不起，您的账号：" + userName + " 已停用");
         }
         remoteLogService.saveLogininfor(userName, Constants.LOGIN_SUCCESS, "登录成功");
-        redisService.deleteObject(form.getUuid());
-        LoginUser loginUser = remoteUserService.packInfo(user);
-        return loginUser;
+        loginUser = remoteUserService.packInfo(user);
+        loginUser.setCode(SUCCESS);
+        redisService.setCacheObject(form.getUuid(),loginUser);
     }
 
     public AjaxResult updateUnionId(SysUser sysUser) {

boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -199,24 +199,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select * from sys_user where open_id = #{openId} limit 1;
 	</select>
 
-	<select id="getByPhone" resultType="com.boman.domain.SysUser">
-		select id,
-			   dept_id deptId,
-			   user_name userName,
-			   nick_name nickName,
-			   user_type userType,
-			   email,
-			   phonenumber,
-			   sex,
-			   avatar,
-			   password,
-			   status,
-			   del_flag delFlag,
-			   login_ip loginIp,
-			   login_date loginDate,
-			   union_id unionId,
-			   open_id openId
-		from sys_user where phonenumber = #{phone} limit 1;
+	<select id="getByPhone" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		 where phonenumber = #{phone} limit 1;
 	</select>
 	
 </mapper>