Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/jd/cms/Application.java

@@ -1,6 +1,6 @@
 package com.jd.cms;
 
-import com.jd.cms.NettySocket.NioWebSocketServer;
+import com.jd.cms.nettySocket.NioWebSocketServer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,10 +8,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import javax.annotation.Resource;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 
 @SpringBootApplication
 @EnableScheduling

cms/src/main/java/com/jd/cms/NettySocket/ChannelManage.java → cms/src/main/java/com/jd/cms/nettySocket/ChannelManage.java

@@ -1,4 +1,4 @@
-package com.jd.cms.NettySocket;
+package com.jd.cms.nettySocket;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelId;

cms/src/main/java/com/jd/cms/NettySocket/NioWebSocketHandler.java → cms/src/main/java/com/jd/cms/nettySocket/NioWebSocketHandler.java

@@ -1,4 +1,4 @@
-package com.jd.cms.NettySocket;
+package com.jd.cms.nettySocket;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;

cms/src/main/java/com/jd/cms/NettySocket/NioWebSocketServer.java → cms/src/main/java/com/jd/cms/nettySocket/NioWebSocketServer.java

@@ -1,4 +1,4 @@
-package com.jd.cms.NettySocket;
+package com.jd.cms.nettySocket;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;

spring-cloud/server-page/src/main/resources/static/lbzd/xxtx.html

@@ -112,23 +112,16 @@
         const imgReg = new RegExp(/png|jpg|jpeg/);
         $("input[type=file]").on("change", function(e) {
             const {
-                size,
                 name
             } = this.files[0]; //上传的图片对象
-            const imgSize = size; //上传图片大小
-            const limitSize = 5 * 102400; //限制图片大小
             const nameArr = name.split(".");
             const fileFormat = nameArr[nameArr.length - 1]; //上传文件格式
             // 判断文件格式
             const bool = imgReg.test(fileFormat);
             if (bool) {
-                if (imgSize <= limitSize) {
-                    putImg(this.files[0]);
-                } else {
-                    hiddenTip("图片太大！");
-                }
+                putImg(this.files[0]);
             } else {
-                hiddenTip("请上传图片！");
+                hiddenTip("请上传图片,格式为:png/jpg/jpeg！");
             }
         })
 
@@ -136,15 +129,20 @@
         $(".put").on("click", function() {
             // 输入的信息
             const val = $(".put-info>input").val();
-            const html = `<div class="zj">
+            // 判断是否为空
+            if (val.trim() !== "") {
+                const html = `<div class="zj">
                     <div class="zj-in">${val}</div>
                     <div class="av">
                         <img src="img/avator.png" />
                     </div>
                 </div>`
-            $(".xx-list").append(html); //插入自己的
-            // 发送到其他人
-            sent(val);
+                $(".xx-list").append(html); //插入自己的
+                // 发送到其他人
+                sent(val);
+            } else {
+                hiddenTip("输入不能为空！");
+            }
             $(".put-info>input").val(""); //清空输入的数据
         })