zouxuan 5 سال پیش
والد
کامیت
9df502c8cc

+ 16 - 0
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -1,9 +1,13 @@
 package com.ym.mec.auth.web.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.core.service.AccessTokenService;
+import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
@@ -37,6 +41,9 @@ public class TokenController extends BaseController {
 	
 	@Autowired
 	private AccessTokenService accessTokenService;
+
+	@Autowired
+	private SysUserService userService;
     
     @PostMapping("/smsLogin")
     public Object smsLogin(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
@@ -49,6 +56,15 @@ public class TokenController extends BaseController {
 		
         return succeed(accessTokenService.getAccessToken(clientId, clientSecret, authentication));
     }
+
+    @PostMapping("/queryUserInfo")
+    public SysUser queryUserInfo() {
+		AuthUser authUser = SecurityUtils.getUser();
+		if(authUser != null){
+			return userService.get(authUser.getUserId());
+		}
+		return null;
+    }
     
     @PostMapping("/usernameLogin")
     public Object usernameLogin(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {

+ 1 - 1
mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -9,7 +9,7 @@
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
         <result column="id_" property="id"/>
         <result column="username_" property="username"/>
-        <result column="password_" property="password"/>
+        <!--<result column="password_" property="password"/>-->
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>
         <result column="avatar_" property="avatar"/>

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
-@RequestMapping("category")
+@RequestMapping("classGroup")
 @Api(tags = "班级服务")
 @RestController
 public class ClassGroupController extends BaseController {