diff --git a/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java b/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java index f298808..f6998e9 100644 --- a/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java +++ b/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java @@ -9,7 +9,7 @@ import org.hibernate.validator.constraints.Length; @Schema(description = "用户注册DTO") public class RegisterDTO { - @Length(max = 64, message = "用户名不能大于64字符") + @Length(max = 20, message = "用户名不能大于20字符") @NotEmpty(message = "用户名不可为空") @Schema(description = "用户名") private String userName; @@ -19,7 +19,7 @@ public class RegisterDTO { @Schema(description = "用户密码") private String password; - @Length(max = 64, message = "昵称不能大于64字符") + @Length(max = 20, message = "昵称不能大于20字符") @NotEmpty(message = "用户昵称不可为空") @Schema(description = "用户昵称") private String nickName; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index bf42251..87ce164 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -24,6 +24,7 @@ import com.bx.implatform.service.UserService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.session.UserSession; import com.bx.implatform.util.BeanUtils; +import com.bx.implatform.util.SensitiveFilterUtil; import com.bx.implatform.vo.LoginVO; import com.bx.implatform.vo.OnlineTerminalVO; import com.bx.implatform.vo.UserVO; @@ -46,6 +47,7 @@ public class UserServiceImpl extends ServiceImpl implements Us private final FriendService friendService; private final JwtProperties jwtProperties; private final IMClient imClient; + private final SensitiveFilterUtil sensitiveFilterUtil; @Override public LoginVO login(LoginDTO dto) { @@ -108,6 +110,12 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override public void register(RegisterDTO dto) { User user = this.findUserByUserName(dto.getUserName()); + if(!dto.getUserName().equals(sensitiveFilterUtil.filter(dto.getUserName()))){ + throw new GlobalException("用户名包含敏感字符"); + } + if(!dto.getNickName().equals(sensitiveFilterUtil.filter(dto.getNickName()))){ + throw new GlobalException("昵称包含敏感字符"); + } if (!Objects.isNull(user)) { throw new GlobalException(ResultCode.USERNAME_ALREADY_REGISTER); } @@ -140,14 +148,19 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override public void update(UserVO vo) { UserSession session = SessionContext.getSession(); + if(!vo.getNickName().equals(sensitiveFilterUtil.filter(vo.getNickName()))){ + throw new GlobalException("昵称包含敏感字符"); + } + if(!vo.getSignature().equals(sensitiveFilterUtil.filter(vo.getSignature()))){ + throw new GlobalException("签名内容包含敏感字符"); + } if (!session.getUserId().equals(vo.getId())) { - throw new GlobalException("不允许修改其他用户的信息!"); + throw new GlobalException("不允许修改其他用户的信息"); } User user = this.getById(vo.getId()); if (Objects.isNull(user)) { throw new GlobalException("用户不存在"); } - if (!user.getNickName().equals(vo.getNickName()) || !user.getHeadImageThumb().equals(vo.getHeadImageThumb())) { // 更新好友昵称和头像 LambdaUpdateWrapper wrapper1 = Wrappers.lambdaUpdate(); diff --git a/im-uniapp/components/chat-at-box/chat-at-box.vue b/im-uniapp/components/chat-at-box/chat-at-box.vue index d4b7c30..8f7c257 100644 --- a/im-uniapp/components/chat-at-box/chat-at-box.vue +++ b/im-uniapp/components/chat-at-box/chat-at-box.vue @@ -20,10 +20,12 @@ @@ -152,11 +154,11 @@ export default { background-color: white; white-space: nowrap; margin-bottom: 1px; - - &.checked { - background-color: $im-color-primary-light-9; + + &:hover { + background-color: $im-bg-active; } - + .member-name { flex: 1; padding-left: 20rpx; diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue index 0904bad..aa7441c 100644 --- a/im-uniapp/components/chat-message-item/chat-message-item.vue +++ b/im-uniapp/components/chat-message-item/chat-message-item.vue @@ -1,31 +1,31 @@ @@ -241,15 +240,14 @@ export default { return this.$emo.transform(text, 'emoji-normal') } } - } \ No newline at end of file diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue index cd6627a..543ef87 100644 --- a/im-uniapp/components/friend-item/friend-item.vue +++ b/im-uniapp/components/friend-item/friend-item.vue @@ -7,6 +7,7 @@ + @@ -19,14 +20,20 @@ export default { }, methods: { showFriendInfo() { - uni.navigateTo({ - url: "/pages/common/user-info?id=" + this.friend.id - }) - }, + if (this.detail) { + uni.navigateTo({ + url: "/pages/common/user-info?id=" + this.friend.id + }) + } + } }, props: { friend: { type: Object + }, + detail: { + type: Boolean, + default: true } } } @@ -51,11 +58,11 @@ export default { .friend-info { flex: 1; display: flex; - flex-direction: column; padding-left: 20rpx; text-align: left; .friend-name { + flex: 1; font-size: $im-font-size; white-space: nowrap; overflow: hidden; @@ -72,4 +79,4 @@ export default { } } } - + \ No newline at end of file diff --git a/im-uniapp/im.scss b/im-uniapp/im.scss index 4059c19..e5aefe7 100644 --- a/im-uniapp/im.scss +++ b/im-uniapp/im.scss @@ -102,9 +102,34 @@ button[size='mini'] { } } + +.uni-radio-input svg{ + border-color: white !important; + background-color: $im-color-primary !important; +} + +.uni-radio-input svg { + background-color: $im-color-primary !important; + border-color: $im-color-primary !important; + background-clip: content-box !important; + box-sizing: border-box; + border-radius: 50%; + transform: translate(-50%, -50%) scale(0.7)!important; +} + +.uni-radio-input svg path{ + fill: $im-color-primary !important; +} + .uni-radio-input { - //border-color: $im-color-primary !important; - //background-color: $im-color-primary !important; + background-color: white !important; + border-color: $im-color-primary !important; +} + +.uni-radio-input-disabled { + background-color: rgb(225, 225, 225) !important; + border-color: rgb(209, 209, 209) !important; + opacity: 0.5; } .uni-section__content-title { diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json index dd86682..68c9b75 100644 --- a/im-uniapp/pages.json +++ b/im-uniapp/pages.json @@ -78,26 +78,26 @@ "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/chat/chat", - "iconPath": "static/tarbar/chat.png", - "selectedIconPath": "static/tarbar/chat_active.png", + "iconPath": "static/tab/chat.png", + "selectedIconPath": "static/tab/chat_active.png", "text": "消息" }, { "pagePath": "pages/friend/friend", - "iconPath": "static/tarbar/friend.png", - "selectedIconPath": "static/tarbar/friend_active.png", + "iconPath": "static/tab/friend.png", + "selectedIconPath": "static/tab/friend_active.png", "text": "好友" }, { "pagePath": "pages/group/group", - "iconPath": "static/tarbar/group.png", - "selectedIconPath": "static/tarbar/group_active.png", + "iconPath": "static/tab/group.png", + "selectedIconPath": "static/tab/group_active.png", "text": "群聊" }, { "pagePath": "pages/mine/mine", - "iconPath": "static/tarbar/mine.png", - "selectedIconPath": "static/tarbar/mine_active.png", + "iconPath": "static/tab/mine.png", + "selectedIconPath": "static/tab/mine_active.png", "text": "我的" } ] diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue index eebf384..8875d3d 100644 --- a/im-uniapp/pages/chat/chat-box.vue +++ b/im-uniapp/pages/chat/chat-box.vue @@ -1,8 +1,8 @@