|
@@ -267,12 +267,12 @@ public class AppLoginController extends AppBaseController{
|
|
|
if (StringUtils.isNotEmpty(param.getJpushId())) {
|
|
if (StringUtils.isNotEmpty(param.getJpushId())) {
|
|
|
user.setJpushId(param.getJpushId());
|
|
user.setJpushId(param.getJpushId());
|
|
|
}
|
|
}
|
|
|
- userService.insertFsUser(user);
|
|
|
|
|
- String token = jwtUtils.generateToken(user.getUserId());
|
|
|
|
|
- redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
|
|
|
|
|
- map.put("token", token);
|
|
|
|
|
|
|
+// userService.insertFsUser(user);
|
|
|
|
|
+// String token = jwtUtils.generateToken(user.getUserId());
|
|
|
|
|
+// redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
|
|
|
|
|
+// map.put("token", token);
|
|
|
map.put("isNew", true);
|
|
map.put("isNew", true);
|
|
|
- map.put("user", user);
|
|
|
|
|
|
|
+// map.put("user", user);
|
|
|
map.put("unionid",unionid);
|
|
map.put("unionid",unionid);
|
|
|
return R.ok(map);
|
|
return R.ok(map);
|
|
|
} else {
|
|
} else {
|
|
@@ -290,11 +290,11 @@ public class AppLoginController extends AppBaseController{
|
|
|
updateExistingUserJpushId(user, param.getJpushId());
|
|
updateExistingUserJpushId(user, param.getJpushId());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isEmpty(user.getPhone())) {
|
|
if (StringUtils.isEmpty(user.getPhone())) {
|
|
|
- String token = jwtUtils.generateToken(user.getUserId());
|
|
|
|
|
- redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
|
|
|
|
|
- map.put("token", token);
|
|
|
|
|
|
|
+// String token = jwtUtils.generateToken(user.getUserId());
|
|
|
|
|
+// redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
|
|
|
|
|
+// map.put("token", token);
|
|
|
map.put("isNew", true);
|
|
map.put("isNew", true);
|
|
|
- map.put("user", user);
|
|
|
|
|
|
|
+// map.put("user", user);
|
|
|
map.put("unionid",user.getUnionId());
|
|
map.put("unionid",user.getUnionId());
|
|
|
return R.ok(map);
|
|
return R.ok(map);
|
|
|
}
|
|
}
|