|
|
@@ -525,6 +525,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
|
|
|
userData.setBsStudentNo(su.getBsStudentNo());
|
|
|
userData.setXwTeacherCode(su.getXwTeacherCode());
|
|
|
userData.setBsStaffCode(su.getBsStaffCode());
|
|
|
+ userData.setUserhead(AesUtils.encrypt(String.valueOf(su.getId())));
|
|
|
userDatas.add(userData);
|
|
|
}
|
|
|
|
|
|
@@ -639,14 +640,19 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
|
|
|
if (user.isEmpty()) {
|
|
|
return CommonResult.fail("该用户不存在");
|
|
|
}
|
|
|
- user.get(0).setXOpenId(openid);
|
|
|
- smartUserService.updateSmartUser(user.get(0));
|
|
|
+ for (SmartUser u: user) {
|
|
|
+ u.setXOpenId(openid);
|
|
|
+ }
|
|
|
+
|
|
|
+ smartUserService.saveBatch(user);
|
|
|
long expired = 1000 * 60 * 60 * 24 * 365;
|
|
|
String token = JWTUtil.getToken(user.get(0), expired);
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("token", token);
|
|
|
+ for (SmartUser u:user) {
|
|
|
+ u.setUserhead(AesUtils.encrypt(String.valueOf(u.getId())));
|
|
|
+ }
|
|
|
jsonObject.put("user", user);
|
|
|
- jsonObject.put("userhead", AesUtils.encrypt(String.valueOf(user.get(0).getId())));
|
|
|
return CommonResult.ok(jsonObject);
|
|
|
}
|
|
|
|
|
|
@@ -805,6 +811,6 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
|
|
|
JSONObject result = new JSONObject();
|
|
|
result.put("phone", purePhoneNumber);
|
|
|
|
|
|
- return CommonResult.ok(result.toString());
|
|
|
+ return CommonResult.ok("200","获取成功",result.toString());
|
|
|
}
|
|
|
}
|