From 231de0bfc74fdaf4e2121d3dff3bd87fbfb7ddc3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 12 May 2020 15:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/ueditor/upload/BinaryUploader.java   | 6 ++++--
 .../com/jeesite/modules/msg/service/MsgInnerService.java    | 6 ++++--
 modules/core/src/main/resources/db/upgrade/core/versions    | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java b/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java
index 964e2503..7ce64f3c 100644
--- a/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java
+++ b/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java
@@ -121,7 +121,7 @@ public class BinaryUploader {
 					// 先截图 
 					if (v.cutPic()){
 						// 开启进程，在转换视频文件
-						new Thread(new Runnable() {
+						Thread thread = new Thread("video-convert") {
 							@Override
 							public void run() {
 								try {
@@ -131,7 +131,9 @@ public class BinaryUploader {
 									e.printStackTrace();
 								}
 							}
-						}).start();  
+						};
+						thread.setDaemon(true);
+						thread.start();  
 						storageState.putInfo("url", ctx + PathFormat.format(savePath) + "." + v.getOutputFileExtension());
 						storageState.putInfo("type", "." + v.getOutputFileExtension());
 						storageState.putInfo("original", originFileName +"."+ v.getInputFileExtension());
diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
index ff3f0ecf..14bfb59e 100644
--- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
+++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
@@ -190,7 +190,7 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
 		});
 		// 手动触发消息推送任务
 		if (Global.TRUE.equals(Global.getProperty("msg.realtime.enabled"))){
-			new Thread(){
+			Thread thread = new Thread("msg-push-task-execute"){
 				public void run() {
 					try{
 						MsgPushUtils.getMsgPushTask().execute();
@@ -198,7 +198,9 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
 						logger.error("实时消息发送失败，推送服务配置不正确。", ex);
 					}
 				}
-			}.start();
+			};
+			thread.setDaemon(true);
+			thread.start();
 		}
 	}
 	
diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions
index 56c4ac67..1324211c 100644
--- a/modules/core/src/main/resources/db/upgrade/core/versions
+++ b/modules/core/src/main/resources/db/upgrade/core/versions
@@ -14,4 +14,5 @@
 4.1.5
 4.1.6
 4.1.7
-4.1.8
\ No newline at end of file
+4.1.8
+4.1.9
\ No newline at end of file