Merge branch 'master' of http://47.105.106.177:66/root/sup-server

src/main/java/com/supServer/framework/config/SecurityConfig.java

@@ -101,7 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/resetPwd","/findAccount","/smsLogin","/forgotPassword","/checkUser").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/resetPwd","/findAccount","/smsLogin","/forgotPassword","/checkUser","/category/list/tree").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

src/main/java/com/supServer/project/controller/UserController.java

@@ -3,6 +3,7 @@ package com.supServer.project.controller;
 import com.supServer.common.constant.Constants;
 import com.supServer.common.constant.UserConstants;
 import com.supServer.framework.security.mode.LoginBody;
+import com.supServer.framework.security.mode.LoginUser;
 import com.supServer.framework.security.mode.RegisterBody;
 import com.supServer.framework.security.mode.SmsLoginBody;
 import com.supServer.framework.security.service.TokenService;
@@ -178,4 +179,14 @@ public class UserController {
     }
 
 
+
+    /*** 获取用户信息
+     *@Param:
+     *@return:
+     */
+    @GetMapping("/getInfo")
+    public AjaxResult getInfo(HttpServletRequest request){
+        LoginUser user = tokenService.getLoginUser(request);
+        return AjaxResult.success("操作成功",user);
+    }
 }