diff --git a/root/_t/layout.html b/root/_t/layout.html index 8d39196..d0f3e8d 100644 --- a/root/_t/layout.html +++ b/root/_t/layout.html @@ -136,7 +136,7 @@ layui.use('layim', function(layim){ var $ = layui.jquery;// - var target = 'ws://120.24.230.60:6060/os/ws/chat?token=#(token)'; + var target = 'ws://127.0.0.1/os/ws/chat?token=#(token)'; var ws; if ('WebSocket' in window) { @@ -426,16 +426,16 @@
    • -
  • 我发表的贴
    • +
  • 我的投稿
  • 我收藏的贴
    • - 发表新帖 + 文章投稿
    - 发表新帖 + 文章投稿
    diff --git a/root/index.html b/root/index.html index aa57977..300ac77 100644 --- a/root/index.html +++ b/root/index.html @@ -177,8 +177,8 @@
    -
    JAVA后端架构设计群:237626260
    -
    Redkale技术交流群:527523235
    +
    Redbbs交流群:237626260
    +
    Redkale技术交流群:237626260
    @@ -205,7 +205,7 @@ #for(x : hotView.rows??)
    #(x.title) - #(x.viewnum) + #(x.viewnum)
    #else
    没有相关数据
    diff --git a/root/jie/detail.html b/root/jie/detail.html index 97975c9..d8086e2 100644 --- a/root/jie/detail.html +++ b/root/jie/detail.html @@ -179,7 +179,7 @@ #for(x : hotView.rows??)
    #(x.title) - #(x.viewnum) + #(x.viewnum)
    #else
    没有相关数据
    diff --git a/root/jie/index.html b/root/jie/index.html index b0f75c3..8b2bfa4 100644 --- a/root/jie/index.html +++ b/root/jie/index.html @@ -88,7 +88,7 @@ #for(x : hotView.rows??)
    #(x.title) - #(x.viewnum) + #(x.viewnum)
    #else
    没有相关数据
    diff --git a/src/com/lxyer/bbs/base/TaskQueue.java b/src/com/lxyer/bbs/base/TaskQueue.java index bc8a790..410573d 100644 --- a/src/com/lxyer/bbs/base/TaskQueue.java +++ b/src/com/lxyer/bbs/base/TaskQueue.java @@ -126,7 +126,7 @@ public class TaskQueue extends BaseService implements Runnable cacheSource.set(30 * 60, cacheKey, ids); } - int[] contentids = new int[limit]; + int[] contentids = new int[((List) ids).size()]; for (int i = 0; i < ((List) ids).size(); i++) { contentids[i] = ((List) ids).get(i); } diff --git a/src/com/lxyer/redim/ChatWebSocket.java b/src/com/lxyer/redim/ChatWebSocket.java index e553034..48ab824 100644 --- a/src/com/lxyer/redim/ChatWebSocket.java +++ b/src/com/lxyer/redim/ChatWebSocket.java @@ -17,6 +17,7 @@ import java.util.concurrent.CompletableFuture; * * Created by liangxianyou at 2018/7/8 22:51. */ +@SuppressWarnings("Duplicates") @RestWebSocket(name = "chat", catalog = "ws", comment = "文字聊天", anyuser = true) public class ChatWebSocket extends WebSocket { diff --git a/src/com/lxyer/redim/impl/ImFriendServiceImpl.java b/src/com/lxyer/redim/impl/ImFriendServiceImpl.java index d1f1030..50dca63 100644 --- a/src/com/lxyer/redim/impl/ImFriendServiceImpl.java +++ b/src/com/lxyer/redim/impl/ImFriendServiceImpl.java @@ -18,7 +18,9 @@ import org.redkale.util.ResourceType; import javax.annotation.Resource; import java.net.InetSocketAddress; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; @ResourceType(ImFriendService.class) @RestService(name = "imfriend",automapping = true, comment = "好友管理") @@ -51,7 +53,7 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService List friend = new ArrayList<>(); List group = new ArrayList<>(); - List list = new ArrayList(); + List list = new ArrayList(); records.forEach(x->{ Kv _friend = Kv.by("id", x.getUserid()); _friend.set("username", x.getNickname()); @@ -61,7 +63,10 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService list.add(_friend); }); - friend.add(Kv.by("groupname", "默认分组").set("id", 1).set("online", list.size()).set("list", list)); + //把自己排在最上面 + List _list = list.stream().sorted(Comparator.comparing(x -> !x.getStr("username").equals(mine.getStr("username")))).collect(Collectors.toList()); + + friend.add(Kv.by("groupname", "默认分组").set("id", 1).set("online", _list.size()).set("list", _list)); group.add(Kv.by("groupname", "默认分组").set("id", 1).set("avatar", "/res/images/avatar/13.jpg")); data.set("mine", mine).set("friend", friend).set("group", group);