|
|
@@ -56,6 +56,7 @@ import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -223,49 +224,49 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
|
|
|
if(ObjectUtil.isEmpty(code)){
|
|
|
return CommonResult.error("code为空");
|
|
|
}
|
|
|
+
|
|
|
+ String url = ssoUrl+ "/oauth2/oauth/token";
|
|
|
+ String key = APP_ID_TT;
|
|
|
+
|
|
|
+ String grant_type ="authorization_code";
|
|
|
+ String secret = PRIVATE_KEY_TT;
|
|
|
+ HashMap<String,String> param = new HashMap<String,String>(2);
|
|
|
+
|
|
|
+ //资源认证服务器地址
|
|
|
+ param.put("code",code);
|
|
|
+ param.put("grant_type",grant_type);
|
|
|
+
|
|
|
+
|
|
|
+ log.info("根据code获取token请求参数============"+param.toString());
|
|
|
+
|
|
|
+ String mapflag= HttpRequest.sendForm(url,param,key,secret);
|
|
|
+ JSONObject jsonmsg = JSONObject.parseObject(mapflag);
|
|
|
+ String token = jsonmsg.getString("access_token");
|
|
|
+
|
|
|
+
|
|
|
+ //根据token获取用户信息请求参数
|
|
|
+ JSONObject paramUser = new JSONObject();
|
|
|
+ paramUser.put("token",token);
|
|
|
+ paramUser.put("key",key);
|
|
|
+ paramUser.put("secret",secret);
|
|
|
+ String userUrl = ssoUrl+"/resourcesb/resources/index";
|
|
|
+
|
|
|
+ log.info("根据token获取用户信息请求参数============"+paramUser.toString());
|
|
|
+
|
|
|
+
|
|
|
+ String rs = HttpRequest.sendPost(userUrl, paramUser.toString());
|
|
|
+ JSONObject userRs = JSONObject.parseObject(rs);
|
|
|
+
|
|
|
+ JSONObject user=userRs.getJSONObject("data");
|
|
|
+ String account=user.getString("iamUserCode");
|
|
|
+// String account="";
|
|
|
+// if("teacher".equals(code)){
|
|
|
+// account="ww";
|
|
|
+// }
|
|
|
//
|
|
|
-// String url = ssoUrl+ "/oauth2/oauth/token";
|
|
|
-// String key = APP_ID_TT;
|
|
|
-//
|
|
|
-// String grant_type ="authorization_code";
|
|
|
-// String secret = PRIVATE_KEY_TT;
|
|
|
-// HashMap<String,String> param = new HashMap<String,String>(2);
|
|
|
-//
|
|
|
-// //资源认证服务器地址
|
|
|
-// param.put("code",code);
|
|
|
-// param.put("grant_type",grant_type);
|
|
|
-//
|
|
|
-//
|
|
|
-// log.info("根据code获取token请求参数============"+param.toString());
|
|
|
-//
|
|
|
-// String mapflag= HttpRequest.sendForm(url,param,key,secret);
|
|
|
-// JSONObject jsonmsg = JSONObject.parseObject(mapflag);
|
|
|
-// String token = jsonmsg.getString("access_token");
|
|
|
-//
|
|
|
-//
|
|
|
-// //根据token获取用户信息请求参数
|
|
|
-// JSONObject paramUser = new JSONObject();
|
|
|
-// paramUser.put("token",token);
|
|
|
-// paramUser.put("key",key);
|
|
|
-// paramUser.put("secret",secret);
|
|
|
-// String userUrl = ssoUrl+"/resourcesb/resources/index";
|
|
|
-//
|
|
|
-// log.info("根据token获取用户信息请求参数============"+paramUser.toString());
|
|
|
-//
|
|
|
-//
|
|
|
-// String rs = HttpRequest.sendPost(userUrl, paramUser.toString());
|
|
|
-// JSONObject userRs = JSONObject.parseObject(rs);
|
|
|
-//
|
|
|
-// JSONObject user=userRs.getJSONObject("data");
|
|
|
-// String account=user.getString("iamUserCode");
|
|
|
- String account="";
|
|
|
- if("teacher".equals(code)){
|
|
|
- account="ww";
|
|
|
- }
|
|
|
-
|
|
|
- if("student".equals(code)){
|
|
|
- account="zhiduoxing";
|
|
|
- }
|
|
|
+// if("student".equals(code)){
|
|
|
+// account="zhiduoxing";
|
|
|
+// }
|
|
|
|
|
|
SaBaseLoginUser saBaseLoginUser = loginUserApi.getUserByAccount(account);
|
|
|
|