.

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 @@
             <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><span class="fly-mid"></span></li>
 
             <!-- 用户登入后显示 -->
-            <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><a href="/user?#index">我发表的贴</a></li>
+            <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><a href="/user?#index">我的投稿</a></li>
             <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><a href="/user?#collection">我收藏的贴</a></li>
         </ul>
 
         <div class="fly-column-right layui-hide-xs">
             <span class="fly-search"><i class="layui-icon"></i></span>
-            <a href="/jie/add" class="layui-btn">发表新帖</a>
+            <a href="/jie/add" class="layui-btn">文章投稿</a>
         </div>
         <div class="layui-hide-sm layui-show-xs-block" style="margin-top: -10px; padding-bottom: 10px; text-align: center;">
-            <a href="/jie/add" class="layui-btn">发表新帖</a>
+            <a href="/jie/add" class="layui-btn">文章投稿</a>
         </div>
     </div>
 </div>

root/index.html

@@ -177,8 +177,8 @@
 
                 <div class="fly-panel fly-signin">
                     <div class="fly-panel-main fly-signin-main">
-                        <div>JAVA后端架构设计群:<cite>237626260</cite></div>
+                        <div>Redbbs交流群:<cite>237626260</cite></div>
-                        <div>Redkale技术交流群:<cite>527523235</cite></div>
+                        <div>Redkale技术交流群:<cite>237626260</cite></div>
                     </div>
                 </div>
 
@@ -205,7 +205,7 @@
                     #for(x : hotView.rows??)
                     <dd>
                         <a href="/jie/detail/#(x.contentid)">#(x.title)</a>
-                        <span><i class="iconfont icon-pinglun1"></i> #(x.viewnum)</span>
+                        <span><i class="iconfont">&#xe60b;</i> #(x.viewnum)</span>
                     </dd>
                     #else
                     <div class="fly-none">没有相关数据</div>

root/jie/detail.html

@@ -179,7 +179,7 @@
 			#for(x : hotView.rows??)
 			<dd>
 				<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
-				<span><i class="iconfont icon-pinglun1"></i> #(x.viewnum)</span>
+				<span><i class="iconfont">&#xe60b;</i> #(x.viewnum)</span>
 			</dd>
 			#else
 			<div class="fly-none">没有相关数据</div>

root/jie/index.html

@@ -88,7 +88,7 @@
                 #for(x : hotView.rows??)
                 <dd>
                     <a href="/jie/detail/#(x.contentid)">#(x.title)</a>
-                    <span><i class="iconfont icon-pinglun1"></i> #(x.viewnum)</span>
+                    <span><i class="iconfont">&#xe60b;</i> #(x.viewnum)</span>
                 </dd>
                 #else
                 <div class="fly-none">没有相关数据</div>

src/com/lxyer/bbs/base/TaskQueue.java

@@ -126,7 +126,7 @@ public class TaskQueue<T extends Object> extends BaseService implements Runnable
             cacheSource.set(30 * 60, cacheKey, ids);
         }
 
-        int[] contentids = new int[limit];
+        int[] contentids = new int[((List<Integer>) ids).size()];
         for (int i = 0; i < ((List<Integer>) ids).size(); i++) {
             contentids[i] = ((List<Integer>) ids).get(i);
         }

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 {
 

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<Kv> friend = new ArrayList<>();
         List<Kv> group = new ArrayList<>();
 
-        List list = new ArrayList();
+        List<Kv> 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<Kv> _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);