From b3feb26e5509e787d939490843017f15d73ba4d6 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Thu, 17 Nov 2022 15:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=98=BF=E9=87=8C=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bx/implatform/vo/GroupMessageVO.java | 2 +- .../bx/implatform/vo/PrivateMessageVO.java | 2 +- im-ui/.env.development | 5 +- im-ui/src/assets/iconfont/iconfont.css | 43 ++++++++++++++++++ im-ui/src/assets/iconfont/iconfont.ttf | Bin 0 -> 3464 bytes im-ui/src/assets/iconfont/iconfont.woff | Bin 0 -> 2260 bytes im-ui/src/assets/iconfont/iconfont.woff2 | Bin 0 -> 1864 bytes im-ui/src/components/chat/ChatBox.vue | 2 +- im-ui/src/main.js | 1 + im-ui/src/view/Home.vue | 2 +- im-ui/src/view/Login.vue | 5 +- 11 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 im-ui/src/assets/iconfont/iconfont.css create mode 100644 im-ui/src/assets/iconfont/iconfont.ttf create mode 100644 im-ui/src/assets/iconfont/iconfont.woff create mode 100644 im-ui/src/assets/iconfont/iconfont.woff2 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 0000000000000000000000000000000000000000..9a4d5b0ed14e2e781d634150eb6379964038165f GIT binary patch literal 3464 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 D_q+4V literal 0 HcmV?d00001 diff --git a/im-ui/src/assets/iconfont/iconfont.woff2 b/im-ui/src/assets/iconfont/iconfont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..94a9411d6faf1bd3aa7de6af5230cbae4674791a GIT binary patch literal 1864 zcmV-O2ehIkHUcCAAPW)z1Rw>3X9sZ`%?rqm)1@}xWzyyI|83fRGlR`Q zoMboVwRjyG;zp`*AjF0eQqiGx*!8LkvZkc%epUbWkN^RU_wCo}8LFZ125*E&Ewg_= zGP{V|i8VwwQ6XugU8A`-^OAXlM5VOGLc4}Qtvcz2+kgOIk!Auazp%U>K0U3LK7?Wr z%q2kWN_vcjR!H?yFf&mE(gLycSO(-9hyZFO^$5V%`S+9mkdYLiAfgdmq*`ClfomT5 z>pEKS3PAsYlpk&wZBGFZ0iXd4zc6+peZJNPx}@Q`WXG%-Gy(7nefnZ`F*a0c!h!)Vjz@F>k1>SjqXT$gELa7ca+Srr9x;6`>3$a|Iw2+Y_P2p z*4sCRrQ42JkJ=9lhqS9!39FTB*IL)K_};C8!(nr|Nb6~Kb`k4Z`)UYIr`_$Y86Ktg zh0k10%ueAbwwYsc>K{B%?RHyT+F+H^>6~a~IrW+3Y1j8G3t3YrLIp+vpwO+~D_l9hB z7unZdAd6e4u(qH>aY-@OsbLaJf| zlFH7|sjxo(DF3FwpnzD9lP|K1jdRtjBFxU2?enQJH%1dxK0QyeLa|OVF2Bt()`o~f z$4S;HR!H&&KUou%8#7fL86649$x(a=|Jzq4yXm)?runAdf8>AW@#Dg_($o1xm#Ql3 z9{p8!uc|8cQAU12>B&!1LCC}AknrwMV`yi(epN;6!?>K>kSW0vgB#&d_r?;6ev}z! zkNYw!<6_*(u%584&d(a&{MQg$SF5e1(Gx!W{f9Z@_4@I1BFxS?S8XWI4Q=B6ih@Vv zKT^Q|ObN}lzO0E)m26d&{JS| zykyjp(Mu*zOXE()s8yYvDs_iC!D3T&%tgtr#j#NT&NSz#Y zAu4Ug>MND(kt{tP@?Q2>mM-MQ%ic9g)7VZin>O%>O(!V&UDJ@JvMWKwS^1-L4>5g1 zS{g40>a*H5&w@9*v1C~BkRipxN{&RBVTDcg5p!Mb)y_#-+Vpg7)}&_7ipIInoT?Et&2r5J&F?)L zXcks!wk6_eN!f!X3%x{FF{t_J%U~e@z^3_zmA00e&a0|g(P2O56v8W}$~h!AWL#PIV!u+S34`8Xujo@dszT67)J zZL_0|?R=j;DzN0f*6IucJ+0=UF0IboZ^Vx1^pv#jK#{IbXWrw0{uzc0i$x!;H}k#G zh3d_8Jw1H1$;@}@+AS%a7K>?IYN~$hfRuK=7kMy4hgMk9lpToHhS?d7Xa|oz=+&0? z&#Q$F1`MDFtuPCX+G;cUStH-0rAv_}Fc!%^(Wn>V-H#bCAcKXf^@xtiOw?QE7rNCt z^n|@UqM63G>VgjKupmX}hHewaNhOtDDpO9M-}^SN0ALY3hLli*CJYe~F_91{kwMyK zY~`mL`wX(#{J?BupDDV5sCA&j$g>7BKVWLs8+&@hW0%nN@?A!D25)TFnasvM3jhFV C^o#HS literal 0 HcmV?d00001 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 @@