|
@@ -314,7 +314,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public UserDTO login(String phone, String password, Integer loginType, String raw, String ip) throws ServiceException {
|
|
|
+ public UserDTO login(String phone, String password, Integer loginType, String raw, String cid,String ip) throws ServiceException {
|
|
|
String cryptPassword = Md5Crypt.md5Crypt(password.getBytes(), "$1$" + phone.substring(0, 7));
|
|
|
UserDTO userDTO = userMapper.login(phone, cryptPassword);
|
|
|
|
|
@@ -363,6 +363,7 @@ public class UserServiceImpl implements UserService {
|
|
|
//返回用户DTO
|
|
|
cacheComponent.del(VERIFY_CODE_PREFIX + phone);
|
|
|
String accessToken = GeneratorUtil.genSessionId();
|
|
|
+ userDO.setCid(cid);
|
|
|
BeanUtils.copyProperties(userDO,userDTO);
|
|
|
userDTO.setAccessToken(accessToken);
|
|
|
//放入SESSION专用Redis数据源中
|