From 92728eaaf8d8565b1a68cd961f718c13d671e142 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 21:35:30 +0800
Subject: [PATCH] :bug: Fixing a bug.fix hikari cp conflict

---
 .../com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java | 3 ---
 pigx-common/pigx-common-job/pom.xml                         | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
index 53738f210..fb897a81c 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
@@ -111,9 +111,6 @@ public class PigxTokenEndpoint {
 	@Inner
 	@DeleteMapping("/{token}")
 	public R<Boolean> delToken(@PathVariable("token") String token) {
-		if (token != null) {
-			throw new RuntimeException("lalalala");
-		}
 		OAuth2AccessToken oAuth2AccessToken = tokenStore.readAccessToken(token);
 		tokenStore.removeAccessToken(oAuth2AccessToken);
 		return new R<>();
diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml
index f016255db..68f866d29 100644
--- a/pigx-common/pigx-common-job/pom.xml
+++ b/pigx-common/pigx-common-job/pom.xml
@@ -38,6 +38,12 @@
 			<groupId>com.dangdang</groupId>
 			<artifactId>elastic-job-lite-core</artifactId>
 			<version>${elastic-job-lite.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.zaxxer</groupId>
+					<artifactId>HikariCP-java7</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- import other module if need -->
 		<dependency>