Merge branch 'master' of http://180.167.91.206:8714/lilt/sh-ds

eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/controller/AuthController.java

@@ -4,10 +4,7 @@ import cn.sh.chineseall.framework.core.util.ArrayUtils;
 import cn.sh.chineseall.framework.core.util.StringUtils;
 import cn.sh.chineseall.framework.lang.calendar.DateUtils;
 import com.alibaba.fastjson.JSON;
-import com.chineseall.eden.authcenter.agent.client.AuthUserInfo;
-import com.chineseall.eden.authcenter.agent.client.ClientDataInfo;
-import com.chineseall.eden.authcenter.agent.client.ClientItem;
-import com.chineseall.eden.authcenter.agent.client.OauthClient;
+import com.chineseall.eden.authcenter.agent.client.*;
 import com.chineseall.eden.authcenter.agent.oauth.OauthConfig;
 import com.chineseall.eden.authcenter.agent.oauth.OauthConfigItem;
 import com.chineseall.eden.authcenter.agent.oauth.OauthType;
@@ -336,9 +333,14 @@ public class AuthController {
             Map<String, Object> userInfoMap = null;
             // 转换用户信息
             AuthUserInfo userInfo = new AuthUserInfo();
-            String userType = request.getParameter("user_type");
+            //String userType = request.getParameter("user_type");
             userInfo.setRealName(request.getParameter("real_name"));
             userInfo.setId(request.getParameter("login_name"));
+//            if ("student".equals(userType)){
+//                userInfo.setUserType(UserType.STUDENT);
+//            }else if ("tearcher".equals(userType)){
+//                userInfo.setUserType(UserType.TEACHER);
+//            }
             // 封装下游数据
             ClientDataInfo clientDataInfo = new ClientDataInfo();
             if(userInfo != null) {