登录去掉admin判断

purchase-admin/src/main/java/com/ozs/web/controller/system/SysLoginController.java

@@ -34,8 +34,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @Api(tags = "登录验证")
-public class SysLoginController
-{
+public class SysLoginController {
     @Autowired
     private SysLoginService loginService;
 
@@ -56,8 +55,7 @@ public class SysLoginController
      */
     @ApiOperation("登录方法")
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -73,8 +71,7 @@ public class SysLoginController
      */
     @GetMapping("getInfo")
     @ApiOperation("获取用户信息")
-    public AjaxResult getInfo()
-    {
+    public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
@@ -94,8 +91,7 @@ public class SysLoginController
      */
     @GetMapping("getRouters")
     @ApiOperation("获取路由信息")
-    public AjaxResult getRouters()
-    {
+    public AjaxResult getRouters() {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
@@ -108,19 +104,15 @@ public class SysLoginController
      */
     @ApiOperation("退出方法")
     @PostMapping("/logout")
-    public AjaxResult logout(HttpServletRequest request)
-    {
+    public AjaxResult logout(HttpServletRequest request) {
         AjaxResult ajax = AjaxResult.success();
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
-        {
+        if (StringUtils.isNotNull(loginUser)) {
             String userName = loginUser.getUsername();
             // 删除用户缓存记录
             tokenService.delLoginUser(loginUser.getToken());
-            if (!loginUser.getUserId().equals(Long.parseLong("-1"))) {
-                // 记录用户退出日志
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
-            }
+            // 记录用户退出日志
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
         }
         return ajax;
     }

purchase-framework/src/main/java/com/ozs/framework/aspectj/LogAspect.java

@@ -69,9 +69,7 @@ public class LogAspect
     {
         // 获取当前的用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if(!loginUser.getUsername().equals(PurchaseConfig.getSname())){
             try {
-
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
             operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
@@ -106,7 +104,6 @@ public class LogAspect
                 log.error("异常信息:{}", exp.getMessage());
                 exp.printStackTrace();
             }
-        }
     }
 
     /**

purchase-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

@@ -75,68 +75,34 @@ public class SysLoginService {
      * @param uuid     唯一标识
      * @return 结果
      */
-    public String login(String username, String password, String code, String uuid)
-    {
+    public String login(String username, String password, String code, String uuid) {
         boolean captchaEnabled = configService.selectCaptchaEnabled();
-        if(PurchaseConfig.getSname().equals(username) && PurchaseConfig.getSname().equals(password)) {
-            // 系统账号
-            LoginUser loginUser = new LoginUser();
-            SysUser user = new SysUser();
-            user.setUserId(1L);
-            user.setUserName(username);
-            List<SysDept> list = sysDeptService.selectMaxDeptByParentId(0l);
-            if (!ObjectUtils.isEmpty(list)) {
-                user.setDept(list.get(0));
-                user.setDeptId(list.get(0).getDeptId());
-                user.setDeptName(list.get(0).getDeptName());
-                SysRole sysRole = iSysRoleService.selectRoleById(1L);
-                user.setRoleId(sysRole.getRoleId());
-                user.setRoles(Arrays.asList(sysRole));
-                loginUser.setDeptId(list.get(0).getDeptId());
-            }
-            loginUser.setUser(user);
-            loginUser.setUserId(1L);
-            // 生成token
-            String token = tokenService.createToken(loginUser);
-            Constants.map.put(token, loginUser);
-            return token;
-        }else {
-            // 验证码开关
-            if (captchaEnabled)
-            {
-                validateCaptcha(username, code, uuid);
-            }
-            // 用户验证
-            Authentication authentication = null;
-            try
-            {
-                UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
-                AuthenticationContextHolder.setContext(authenticationToken);
-                // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
-                authentication = authenticationManager.authenticate(authenticationToken);
-            }
-            catch (Exception e)
-            {
-                if (e instanceof BadCredentialsException)
-                {
-                    AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
-                    throw new UserPasswordNotMatchException();
-                }
-                else
-                {
-                    AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
-                    throw new ServiceException(e.getMessage());
-                }
-            }
-            finally
-            {
-                AuthenticationContextHolder.clearContext();
+        // 验证码开关
+        if (captchaEnabled) {
+            validateCaptcha(username, code, uuid);
+        }
+        // 用户验证
+        Authentication authentication = null;
+        try {
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+            AuthenticationContextHolder.setContext(authenticationToken);
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager.authenticate(authenticationToken);
+        } catch (Exception e) {
+            if (e instanceof BadCredentialsException) {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            } else {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new ServiceException(e.getMessage());
             }
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-            LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-            recordLoginInfo(loginUser.getUserId());
-            return tokenService.createToken(loginUser);
+        } finally {
+            AuthenticationContextHolder.clearContext();
         }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        recordLoginInfo(loginUser.getUserId());
+        return tokenService.createToken(loginUser);
 
     }