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

dsk-srm-server/src/api/login.js

@@ -53,6 +53,6 @@ export const loginOutApi = () => network({
 });
 
 export const getUserInfoApi = () => network({
-  url: "",
+  url: "/getInfo",
   method: "post"
 });

dsk-srm-server/src/store/modules/user-module.js

@@ -27,8 +27,8 @@ const actions = {
       // 登录api调用
       loginApi(payload).then(res => {
         // 获取token
-        commit("SET_TOKEN", res.data);
-        setToken(res.data);
+        commit("SET_TOKEN", res.token);
+        setToken(res.token);
         resolve(res);
       }).catch(err => {
         console.log(err);

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","/validateCaptcha","/file/uploadFile").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);
+    }
 }