|
|
@@ -414,6 +414,23 @@ public class UserInfoServiceImpl implements UserInfoService {
|
|
|
public UserInfo login(String username, String password) {
|
|
|
logger.info("login");
|
|
|
try {
|
|
|
+
|
|
|
+ UserInfo userInfo = new UserInfo();
|
|
|
+ userInfo.setUsername(username);
|
|
|
+ userInfo = getUserInfo(userInfo);
|
|
|
+ if (userInfo == null) {
|
|
|
+ userInfo = new UserInfo();
|
|
|
+ userInfo.setPassword(password);
|
|
|
+ userInfo.setPhone(username);
|
|
|
+ userInfo.setUsername(username);
|
|
|
+ userInfo.setNickname("用户" + MbappUtil.getRandomNum(6));
|
|
|
+ userInfo.setIcon("https://microball.oss-cn-hangzhou.aliyuncs.com/quanmingdianjing.png");
|
|
|
+ if (!createUserInfo(userInfo)) {
|
|
|
+ throw new LoginException("登录失败");
|
|
|
+ }
|
|
|
+ return userInfo;
|
|
|
+ }
|
|
|
+
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("username", username);
|
|
|
map.put("password", MD5Util.getMD5(password));
|
|
|
@@ -480,7 +497,7 @@ public class UserInfoServiceImpl implements UserInfoService {
|
|
|
userInfo = new UserInfo();
|
|
|
userInfo.setPhone(phone);
|
|
|
userInfo.setUsername(phone);
|
|
|
- userInfo.setNickname("用户"+ MbappUtil.getRandomNum(6));
|
|
|
+ userInfo.setNickname("用户" + MbappUtil.getRandomNum(6));
|
|
|
userInfo.setIcon("https://microball.oss-cn-hangzhou.aliyuncs.com/quanmingdianjing.png");
|
|
|
if (!createUserInfo(userInfo)) {
|
|
|
throw new LoginException("登录失败");
|