diff --git a/src/main/java/xuan/controller/UserController.java b/src/main/java/xuan/controller/UserController.java index 7c58127..f12482e 100644 --- a/src/main/java/xuan/controller/UserController.java +++ b/src/main/java/xuan/controller/UserController.java @@ -77,7 +77,6 @@ public class UserController { data.put("id", user.getId()); data.put("userId", user.getUserId()); data.put("openId", user.getOpenId()); - data.put("nickname", user.getNickname()); data.put("avatarUrl", user.getAvatarUrl()); data.put("username", user.getUsername()); data.put("phone", user.getPhone()); @@ -139,7 +138,6 @@ public class UserController { data.put("id", user.getId()); data.put("userId", user.getUserId()); data.put("openId", user.getOpenId()); - data.put("nickname", user.getNickname()); data.put("avatarUrl", user.getAvatarUrl()); data.put("username", user.getUsername()); data.put("phone", user.getPhone()); diff --git a/src/main/java/xuan/entity/UserInfo.java b/src/main/java/xuan/entity/UserInfo.java index ffed590..0ae41c4 100644 --- a/src/main/java/xuan/entity/UserInfo.java +++ b/src/main/java/xuan/entity/UserInfo.java @@ -14,9 +14,6 @@ public class UserInfo { @Column(nullable = false, unique = true, length = 64) private String openId; - @Column(length = 50) - private String nickname; - @Column(length = 255) private String avatarUrl; @@ -63,9 +60,6 @@ public class UserInfo { public String getOpenId() { return openId; } public void setOpenId(String openId) { this.openId = openId; } - public String getNickname() { return nickname; } - public void setNickname(String nickname) { this.nickname = nickname; } - public String getAvatarUrl() { return avatarUrl; } public void setAvatarUrl(String avatarUrl) { this.avatarUrl = avatarUrl; } diff --git a/src/main/java/xuan/service/UserInfoService.java b/src/main/java/xuan/service/UserInfoService.java index 0b78f50..6dcb1fb 100644 --- a/src/main/java/xuan/service/UserInfoService.java +++ b/src/main/java/xuan/service/UserInfoService.java @@ -22,19 +22,18 @@ public class UserInfoService { @Autowired private CoinConsumeRecordRepository coinConsumeRecordRepository; - public UserInfo loginOrRegister(String openId, String nickname, String avatarUrl) { + public UserInfo loginOrRegister(String openId, String username, String avatarUrl) { UserInfo user = userInfoRepository.findByOpenId(openId); if (user != null) { - user.setNickname(nickname); + user.setUsername(username); user.setAvatarUrl(avatarUrl); return userInfoRepository.save(user); } user = new UserInfo(); user.setOpenId(openId); - user.setNickname(nickname); + user.setUsername(username); user.setAvatarUrl(avatarUrl); - user.setUsername(generateUsername()); user.setUserId(generateUserId()); user.setVipLevel(0); user.setStreakDays(0); diff --git a/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue b/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue index 6d8bc25..d81f875 100644 --- a/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue +++ b/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue @@ -223,7 +223,7 @@ export default { uni.setStorageSync('userInfo', JSON.stringify(res.data)) uni.setStorageSync('userCoins', res.data.coins || 0) uni.setStorageSync('vipLevel', res.data.vipLevel || 0) - uni.setStorageSync('username', res.data.nickname || this.nickname) + uni.setStorageSync('username', res.data.username || this.nickname) uni.setStorageSync('userAvatar', res.data.avatarUrl || this.avatarUrl) uni.setStorageSync('isLoggedIn', true) diff --git a/xuan-deduct-uniapp/src/pages/mine/account.vue b/xuan-deduct-uniapp/src/pages/mine/account.vue index 77b40b3..652824f 100644 --- a/xuan-deduct-uniapp/src/pages/mine/account.vue +++ b/xuan-deduct-uniapp/src/pages/mine/account.vue @@ -3,7 +3,7 @@ - {{ userInfo.nickname || userInfo.username || '玄机用户' }} + {{ userInfo.username || '玄机用户' }} ID: {{ userInfo.userId || '100001' }} @@ -57,7 +57,6 @@ export default { username: '玄机用户', avatarUrl: '', phone: '', - nickname: '', vipLevel: 0, coins: 0, streakDays: 0 @@ -94,7 +93,7 @@ export default { uni.setStorageSync('userInfo', JSON.stringify(res.data)) uni.setStorageSync('userAvatar', avatarUrl) - uni.setStorageSync('username', this.userInfo.nickname || this.userInfo.username || '玄机用户') + uni.setStorageSync('username', this.userInfo.username || '玄机用户') } else { this.userInfo = localUserInfo } diff --git a/xuan-deduct-uniapp/src/pages/mine/mine.vue b/xuan-deduct-uniapp/src/pages/mine/mine.vue index 04d86dd..72f7538 100644 --- a/xuan-deduct-uniapp/src/pages/mine/mine.vue +++ b/xuan-deduct-uniapp/src/pages/mine/mine.vue @@ -123,7 +123,7 @@ export default { const userData = res.data this.coins = userData.coins || 0 this.vipLevel = userData.vipLevel || 0 - this.username = userData.nickname || userData.username || '玄机用户' + this.username = userData.username || '玄机用户' let avatarUrl = userData.avatarUrl || '' if (avatarUrl && !avatarUrl.startsWith('http') && !avatarUrl.startsWith('wxfile://')) { @@ -208,7 +208,6 @@ export default { if (userInfoStr) { const userInfo = JSON.parse(userInfoStr) userInfo.username = res.content - userInfo.nickname = res.content uni.setStorageSync('userInfo', JSON.stringify(userInfo)) }