diff --git a/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java index c6f349a..ebfe425 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java @@ -22,7 +22,7 @@ public class GroupMessageVO { @ApiModelProperty(value = "发送内容") private String content; - @NotNull(message="发送内容不可为空") + @NotNull(message="消息类型不可为空") @ApiModelProperty(value = "消息类型") private Integer type; } diff --git a/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java b/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java index d1e5e1f..7efdcc4 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java @@ -24,7 +24,7 @@ public class PrivateMessageVO { @ApiModelProperty(value = "发送内容") private String content; - @NotNull(message="发送内容不可为空") + @NotNull(message="消息类型不可为空") @ApiModelProperty(value = "消息类型") private Integer type; diff --git a/im-ui/.env.development b/im-ui/.env.development index 0ec9e1c..4eee0c7 100644 --- a/im-ui/.env.development +++ b/im-ui/.env.development @@ -1,7 +1,8 @@ ENV = 'development' - +# app名称 +VUE_APP_NAME = "盒子IM" // 接口请求地址 VUE_APP_BASE_API = '/api' - +# ws地址 VUE_APP_WS_URL = 'ws://localhost:8878/im' \ No newline at end of file diff --git a/im-ui/src/assets/iconfont/iconfont.css b/im-ui/src/assets/iconfont/iconfont.css new file mode 100644 index 0000000..c76ce8c --- /dev/null +++ b/im-ui/src/assets/iconfont/iconfont.css @@ -0,0 +1,43 @@ +@font-face { + font-family: "iconfont"; /* Project id 3776657 */ + src: url('iconfont.woff2?t=1668665799410') format('woff2'), + url('iconfont.woff?t=1668665799410') format('woff'), + url('iconfont.ttf?t=1668665799410') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-biaoqing:before { + content: "\e60c"; +} + +.icon-youyinpin:before { + content: "\e649"; +} + +.icon-audio:before { + content: "\e800"; +} + +.icon-group_fill:before { + content: "\e7f4"; +} + +.icon-yinpin:before { + content: "\e68a"; +} + +.icon-emoji:before { + content: "\e6f6"; +} + +.icon-voiceprint:before { + content: "\e953"; +} + diff --git a/im-ui/src/assets/iconfont/iconfont.ttf b/im-ui/src/assets/iconfont/iconfont.ttf new file mode 100644 index 0000000..9a4d5b0 Binary files /dev/null and b/im-ui/src/assets/iconfont/iconfont.ttf differ diff --git a/im-ui/src/assets/iconfont/iconfont.woff b/im-ui/src/assets/iconfont/iconfont.woff new file mode 100644 index 0000000..cbd67e3 Binary files /dev/null and b/im-ui/src/assets/iconfont/iconfont.woff differ diff --git a/im-ui/src/assets/iconfont/iconfont.woff2 b/im-ui/src/assets/iconfont/iconfont.woff2 new file mode 100644 index 0000000..94a9411 Binary files /dev/null and b/im-ui/src/assets/iconfont/iconfont.woff2 differ diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue index c5c4fdb..904fb5b 100644 --- a/im-ui/src/components/chat/ChatBox.vue +++ b/im-ui/src/components/chat/ChatBox.vue @@ -21,7 +21,7 @@
-
+
- + diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue index 7a43dfc..c25fa33 100644 --- a/im-ui/src/view/Login.vue +++ b/im-ui/src/view/Login.vue @@ -1,6 +1,6 @@