From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
index d2806d5..e1c1286 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
@@ -8,14 +8,16 @@
import com.zy.asrs.wcs.system.controller.param.LoginParam;
import com.zy.asrs.wcs.system.controller.param.UpdatePasswordParam;
import com.zy.asrs.wcs.system.controller.result.LoginResult;
+import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.UserLoginService;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.JwtUtil;
-import com.zy.asrs.wcs.utils.Utils;
+import com.zy.asrs.wcs.utils.CommonUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +42,8 @@
private UserLoginService userLoginService;
@Resource
private RoleMenuService roleMenuService;
+ @Resource
+ private HostService hostService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
@@ -55,9 +59,9 @@
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
return R.error("瀵嗙爜閿欒");
}
- userLoginService.saveAsync(user.getId(), UserLogin.TYPE_LOGIN, null, hostId, request);
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getHostId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, hostId, null, request);
return R.ok("鐧诲綍鎴愬姛").add(new LoginResult(accessToken, user));
}
@@ -69,7 +73,13 @@
@GetMapping("/auth/menu")
public R userMenu() {
List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
- return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+ return R.ok().add(CommonUtils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+ }
+
+ @GetMapping("/auth/host")
+ public R authHost() {
+ List<Host> list = hostService.list();
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('sys:auth:user')")
--
Gitblit v1.9.1