From ca5bca13bbedb08d5cb485195db340e5bc2ed32d Mon Sep 17 00:00:00 2001 From: liqf Date: Thu, 25 Nov 2021 23:16:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 78b1d6a..c5e1b35 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8200 spring: thymeleaf: -- Gitee From 295c7f248a71496cc4d153b771c87058510fd172 Mon Sep 17 00:00:00 2001 From: liqf Date: Thu, 25 Nov 2021 23:23:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..7efeccc --- /dev/null +++ b/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +PID=$(ps -ef | grep websocket-demo | grep -v grep | awk '{ print $2 }') +if [ -z "$PID" ] +then + echo Application is not found +else + echo kill $PID + kill -9 $PID +fi +BUILD_ID=dontKillMe +# 跳过测试编译 +mvn clean package -Dmaven.test.skip=true +nohup java -jar -Xms256m -Xmx256m target/*.jar & \ No newline at end of file -- Gitee From 7f46ff58ea029defeec37eada751c4ef4ebd16a0 Mon Sep 17 00:00:00 2001 From: liqf Date: Thu, 25 Nov 2021 23:35:32 +0800 Subject: [PATCH 3/9] java8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e223b70..3cabf2a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Demo project for Spring Boot UTF-8 - 11 + 8 -- Gitee From 43dc7faa8750df645a5db9db1b660d10bf1c3bc7 Mon Sep 17 00:00:00 2001 From: liqf Date: Thu, 25 Nov 2021 23:45:02 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shutdown.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 shutdown.sh diff --git a/shutdown.sh b/shutdown.sh new file mode 100644 index 0000000..0ee86e0 --- /dev/null +++ b/shutdown.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +PID=$(ps -ef | grep websocket-demo | grep -v grep | awk '{ print $2 }') +if [ -z "$PID" ] +then + echo Application is not found +else + echo kill $PID + kill -9 $PID + echo Application is already stopped +fi -- Gitee From 74695f4806d08b5c6380e445d2fd0a901fb609c4 Mon Sep 17 00:00:00 2001 From: liqf Date: Fri, 26 Nov 2021 00:27:02 +0800 Subject: [PATCH 5/9] optimize --- .../controller/CertificationController.java | 3 +-- src/main/resources/templates/main.html | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/websocket/websocketdemo/controller/CertificationController.java b/src/main/java/com/websocket/websocketdemo/controller/CertificationController.java index f2376b4..c77a46a 100644 --- a/src/main/java/com/websocket/websocketdemo/controller/CertificationController.java +++ b/src/main/java/com/websocket/websocketdemo/controller/CertificationController.java @@ -33,8 +33,7 @@ public class CertificationController { result.setFlag(true); log.info(user+"登录验证成功"); httpSession.setAttribute("user",user); - } - else if ("王五".equals(user)&&"123".equals(pwd)){ + }else if ("王五".equals(user)&&"123".equals(pwd)){ result.setFlag(true); log.info(user+"登录验证成功"); httpSession.setAttribute("user",user); diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index f0fcb95..c7cb054 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -205,19 +205,19 @@ }) }) - + - + + + + + + + + \ No newline at end of file -- Gitee From 9a5c1fee5c5062f410eff5565b5dea256ec5c8b1 Mon Sep 17 00:00:00 2001 From: liqf Date: Wed, 1 Dec 2021 00:13:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=AE=80=E5=8D=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebsocketDemoApplication.java | 2 +- .../interceptor/UserInterceptor.java | 7 +- src/main/resources/logback.xml | 176 ++++++++++++++++++ 3 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/logback.xml diff --git a/src/main/java/com/websocket/websocketdemo/WebsocketDemoApplication.java b/src/main/java/com/websocket/websocketdemo/WebsocketDemoApplication.java index 2ca1112..69e3e5b 100644 --- a/src/main/java/com/websocket/websocketdemo/WebsocketDemoApplication.java +++ b/src/main/java/com/websocket/websocketdemo/WebsocketDemoApplication.java @@ -12,4 +12,4 @@ public class WebsocketDemoApplication { SpringApplication.run(WebsocketDemoApplication.class, args); } -} +} \ No newline at end of file diff --git a/src/main/java/com/websocket/websocketdemo/interceptor/UserInterceptor.java b/src/main/java/com/websocket/websocketdemo/interceptor/UserInterceptor.java index ad111cd..fa2bcad 100644 --- a/src/main/java/com/websocket/websocketdemo/interceptor/UserInterceptor.java +++ b/src/main/java/com/websocket/websocketdemo/interceptor/UserInterceptor.java @@ -26,7 +26,12 @@ public class UserInterceptor implements HandlerInterceptor { HttpSession httpSession = request.getSession(); String username = (String) httpSession.getAttribute("user"); log.info("进入拦截器"+"==="+"进入拦截器的用户是："+username); - if(username != null && !onLineUsers.containsKey(username)){ + + /* + session有效用户放行username + */ + if(username != null){ +// if(username != null && !onLineUsers.containsKey(username)){ onLineUsers.put(username,username); log.info("已进入拦截器判断"); log.info("已存储的用户01"+onLineUsers); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..0ef4ebb --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,176 @@ + + + + + SpringBootLogbacK + + + + + + + + + ${LOG_PATH}/${APPDIR}/log_error.log + + + + ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + ===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + error + ACCEPT + DENY + + + + + + + ${LOG_PATH}/${APPDIR}/log_debug.log + + + + ${LOG_PATH}/${APPDIR}/debug/log-debug-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + ===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + debug + ACCEPT + DENY + + + + + + + + + + + + ${LOG_PATH}/${APPDIR}/log_info.log + + + + ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + ===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + info + ACCEPT + DENY + + + + + + + ${LOG_PATH}/${APPDIR}/log_mybatis.log + + + + ${LOG_PATH}/${APPDIR}/mybatis/log-mybatis-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + ===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + + ACCEPT + DENY + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS, Asia/Shanghai} %highlight(%5p) --- [%-5t] %cyan(%c{36}): %m%n + utf-8 + + + + debug + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- Gitee From 6f6cd460a73a612f1dbcd1ead7b18a7f62396ac7 Mon Sep 17 00:00:00 2001 From: liqf Date: Fri, 3 Dec 2021 22:28:35 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 debug.sh diff --git a/debug.sh b/debug.sh new file mode 100644 index 0000000..be0a53a --- /dev/null +++ b/debug.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +PID=$(ps -ef | grep websocket-demo | grep -v grep | awk '{ print $2 }') +if [ -z "$PID" ] +then + echo Application is not found +else + echo kill $PID + kill -9 $PID +fi +BUILD_ID=dontKillMe +# 跳过测试编译 +mvn clean package -Dmaven.test.skip=true + +nohup java -Xdebug -Xrunjdwp:transport=dt_socket,address=8280,server=y,suspend=n -jar -Dhudson.util.ProcessTree.disable=true target/*.jar & +#nohup java -jar -Xms256m -Xmx256m target/*.jar & \ No newline at end of file -- Gitee From f643959ba7094e9b13c5f603edf50cca33543dcd Mon Sep 17 00:00:00 2001 From: liqf Date: Sun, 19 Dec 2021 16:41:35 +0800 Subject: [PATCH 8/9] todo --- README.md | 4 ++-- src/main/resources/templates/main.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 980a63a..e25ba0a 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ 2. ~~没有顶号的功能，当登录两个同样的A用户，（先登录叫A-1，后登录叫A-2），A-2可以接受消息，A-1、A-2都能发消息。~~ 3. 出现过一次空指针（不影响功能，退出时出现的与io流有关）。 4. 优化重定向，目前是重定向到错误页面。 -5. 刷新导致onclose方法取出user为null，从而无法在拦截器正确移除已退出的用户。(重要) - +5. ~~刷新导致onclose方法取出user为null~~，~~从而无法在拦截器正确移除已退出的用户~~。(重要) +6. ssl生成证书, 保证通信的安全 #### Lombok的使用 1. 引入依赖 diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index c7cb054..90e525a 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -132,6 +132,7 @@ //获取host解决后端获取httpsession的空指针异常 var host = window.location.host; var ws = new WebSocket("ws://"+host+"/chat"); + //ws建立onopen会不会阻塞 ?? ws.onopen = function (evt) { $("#username").html("

用户："+ username +"-在线

"); } -- Gitee From 15e46f87e1c6080fd91f2757a2414569cbc81efc Mon Sep 17 00:00:00 2001 From: liqf Date: Sun, 19 Dec 2021 16:44:55 +0800 Subject: [PATCH 9/9] todo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e25ba0a..a2c2064 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ 4. 优化重定向，目前是重定向到错误页面。 5. ~~刷新导致onclose方法取出user为null~~，~~从而无法在拦截器正确移除已退出的用户~~。(重要) 6. ssl生成证书, 保证通信的安全 +7. 定义发送快捷键 alt+enter #### Lombok的使用 1. 引入依赖 -- Gitee