|
@@ -151,17 +151,17 @@ public class SysLoginService {
|
|
|
try {
|
|
|
// 保存用户
|
|
|
// 查询第三方用户信息
|
|
|
- String getResult = HttpUtil.createGet(dajiaoguan_token).header("Authorization", Constants.TOKEN_PREFIX + thirdToken).execute().body();
|
|
|
+ String getResult = HttpUtil.createGet(dajiaoguan_token).header("Authorization", thirdToken).execute().body();
|
|
|
JSONObject getJson = JSONUtil.parseObj(getResult);
|
|
|
int infoCode = getJson.getInt("code");
|
|
|
if (infoCode == 1) {
|
|
|
+ JSONObject data = getJson.getJSONObject("data");
|
|
|
// 校验用户是否存在
|
|
|
-// String username = getJson.getStr("account");
|
|
|
- String username = "qinxq@zjgmsa";
|
|
|
+ String username = data.getStr("account");
|
|
|
+// String username = "qinxq@zjgmsa";
|
|
|
if (UserConstants.UNIQUE.equals(userService.checkUserNameUnique(username))) {
|
|
|
SysUser sysUser = new SysUser();
|
|
|
// 将此用户新增入系统
|
|
|
- JSONObject data = getJson.getJSONObject("data");
|
|
|
sysUser.setUserId(data.getLong("userId"));
|
|
|
sysUser.setUserName(username);
|
|
|
sysUser.setDeptId(data.getStr("depId"));
|