From 88bc4c66650c224294831c13f92e62e2211c5f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?=
 <shangshili@hotmail.com>
Date: Sat, 6 Apr 2019 11:55:24 +0800
Subject: [PATCH] :wrench: Changing configuration files.remove some default
 config

---
 .../src/main/resources/config/application-dev.yml   |  8 ++------
 .../pig4cloud/pigx/act/config/WebSocketConfig.java  | 13 +++++++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml
index f17f4065e..3caf8d041 100644
--- a/pigx-config/src/main/resources/config/application-dev.yml
+++ b/pigx-config/src/main/resources/config/application-dev.yml
@@ -70,12 +70,8 @@ mybatis-plus:
     # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      # 主键类型 0:数据库ID自增 1.未定义 2.用户输入 3 id_worker 4.uuid 5.id_worker字符串表示
-      id-type: 0
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: 1
-      # 默认数据库表下划线命名
-      table-underline: true
+      # 主键类型
+      id-type: auto
 
 #swagger公共信息
 swagger:
diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java
index 012ec28cb..ffff77397 100644
--- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java
+++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/WebSocketConfig.java
@@ -1,5 +1,6 @@
 package com.pig4cloud.pigx.act.config;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -49,16 +50,24 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 			@Override
 			public Message<?> preSend(Message<?> message, MessageChannel channel) {
 				StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+				// 判断是否首次连接请求
 				if (StompCommand.CONNECT.equals(accessor.getCommand())) {
 					String tokens = accessor.getFirstNativeHeader("Authorization");
 					log.info("webSocket token is {}", tokens);
 					if (StrUtil.isBlank(tokens)) {
 						return null;
 					}
+					// 验证令牌信息
 					OAuth2Authentication auth2Authentication = tokenService.loadAuthentication(tokens.split(" ")[1]);
-					SecurityContextHolder.getContext().setAuthentication(auth2Authentication);
-					accessor.setUser(() -> (String) auth2Authentication.getPrincipal());
+					if(ObjectUtil.isNotNull(auth2Authentication)) {
+						SecurityContextHolder.getContext().setAuthentication(auth2Authentication);
+						accessor.setUser(() -> (String) auth2Authentication.getPrincipal());
+						return message;
+					}else{
+						return null;
+					}
 				}
+				//不是首次连接，已经成功登陆
 				return message;
 			}
 		});