wms / wms4_hunanhongwang · Commits

Commit dfd790dd9f6a1152df5a3ff0a02fecb97d3eeb97

Authored by zhangdaiscott
1 parent b315ccc3

调整登录接口返回内容顺序，token放到前面，方便查看

Inline Side-by-side
Showing 1 changed file with 32 additions and 28 deletions
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  View file @dfd790d
... ... @@ -400,27 +400,18 @@ public class LoginController {
400 400 * @return
401 401 */
402 402 private Result<JSONObject> userInfo(SysUser sysUser, Result<JSONObject> result) {
403   - String syspassword = sysUser.getPassword();
404 403 String username = sysUser.getUsername();
  404 + String syspassword = sysUser.getPassword();
405 405 // 获取用户部门信息
406   - JSONObject obj = new JSONObject();
407   - List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
408   - obj.put("departs", departs);
409   - if (departs == null || departs.size() == 0) {
410   - obj.put("multi_depart", 0);
411   - } else if (departs.size() == 1) {
412   - sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
413   - obj.put("multi_depart", 1);
414   - } else {
415   - //查询当前是否有登录部门
416   - // update-begin--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
417   - SysUser sysUserById = sysUserService.getById(sysUser.getId());
418   - if(oConvertUtils.isEmpty(sysUserById.getOrgCode())){
419   - sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
420   - }
421   - // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
422   - obj.put("multi_depart", 2);
423   - }
  406 + JSONObject obj = new JSONObject(new LinkedHashMap<>());
  407 +
  408 + // 生成token
  409 + String token = JwtUtil.sign(username, syspassword);
  410 + // 设置token缓存有效时间
  411 + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
  412 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
  413 + obj.put("token", token);
  414 +
424 415 // update-begin--Author:sunjianlei Date:20210802 for：获取用户租户信息
425 416 String tenantIds = sysUser.getRelTenantIds();
426 417 if (oConvertUtils.isNotEmpty(tenantIds)) {
... ... @@ -438,13 +429,26 @@ public class LoginController {
438 429 }
439 430 }
440 431 // update-end--Author:sunjianlei Date:20210802 for：获取用户租户信息
441   - // 生成token
442   - String token = JwtUtil.sign(username, syspassword);
443   - // 设置token缓存有效时间
444   - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
445   - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
446   - obj.put("token", token);
  432 +
447 433 obj.put("userInfo", sysUser);
  434 +
  435 + List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
  436 + obj.put("departs", departs);
  437 + if (departs == null || departs.size() == 0) {
  438 + obj.put("multi_depart", 0);
  439 + } else if (departs.size() == 1) {
  440 + sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
  441 + obj.put("multi_depart", 1);
  442 + } else {
  443 + //查询当前是否有登录部门
  444 + // update-begin--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
  445 + SysUser sysUserById = sysUserService.getById(sysUser.getId());
  446 + if(oConvertUtils.isEmpty(sysUserById.getOrgCode())){
  447 + sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
  448 + }
  449 + // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
  450 + obj.put("multi_depart", 2);
  451 + }
448 452 obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
449 453 result.setResult(obj);
450 454 result.success("登录成功");
... ... @@ -588,9 +592,9 @@ public class LoginController {
588 592 return Result.ok();
589 593 }
590 594 /**
591   - * 登录二维码
  595 + * 获取登录二维码
592 596 */
593   - @ApiOperation(value = "登录二维码", notes = "登录二维码")
  597 + @ApiOperation(value = "获取登录二维码", notes = "获取登录二维码")
594 598 @GetMapping("/getLoginQrcode")
595 599 public Result<?> getLoginQrcode() {
596 600 String qrcodeId = CommonConstant.LOGIN_QRCODE_PRE+IdWorker.getIdStr();
... ... @@ -621,7 +625,7 @@ public class LoginController {
621 625 /**
622 626 * 获取用户扫码后保存的token
623 627 */
624   - @ApiOperation(value = "获取用户扫码后保存的token", notes = "获取用户扫码后保存的token")
  628 + @ApiOperation(value = "获取用户扫码后Token", notes = "获取用户扫码后Token")
625 629 @GetMapping("/getQrcodeToken")
626 630 public Result getQrcodeToken(@RequestParam String qrcodeId) {
627 631 Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId);
... ...