From 98ca2bed97d20c543a0c5aed863276814462d0bb Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 8 Dec 2022 14:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=89=B4=E6=9D=83token?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E5=88=A4=E6=96=AD=20sqlite=E3=80=81?=
 =?UTF-8?q?mysql=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java | 3 +--
 .../fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java    | 2 +-
 .../fun/asgc/neutrino/proxy/server/service/UserService.java    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java
index 7906387b..73cb862f 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java
@@ -126,7 +126,6 @@ public class DBInitialize {
 			() -> null == jdbcTemplate,
 			DBInitialize.class,
 			() -> {
-				Class.forName(dbConfig.getDriverClass());
 				if (DbTypeEnum.SQLITE == dbTypeEnum) {
 					//建立一个数据库名data.db的连接，如果不存在就在当前目录下创建之
 					DriverManager.getConnection(dbConfig.getUrl());
@@ -138,7 +137,7 @@ public class DBInitialize {
 					jdbcTemplate = new JdbcTemplate(dataSource);
 				} else if (DbTypeEnum.MYSQL == dbTypeEnum) {
 					DruidDataSource dataSource = new DruidDataSource();
-					dataSource.setDriverClassName("com.mysql.jdbc.Driver");
+					dataSource.setDriverClassName(dbConfig.getDriverClass());
 					dataSource.setUrl(dbConfig.getUrl());
 					dataSource.setInitialSize(5);
 					dataSource.setMinIdle(5);
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
index c3673d80..eeae8fd2 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
@@ -56,7 +56,7 @@ public interface UserTokenMapper extends SqlMapper {
 	 * @return
 	 */
 //	@Select("select * from user_token where token = ? and expiration_time > ?")
-	UserTokenDO findByAvailableToken(String token, Long time);
+	UserTokenDO findByAvailableToken(String token, Date date);
 
 	/**
 	 * 根据token删除记录
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
index e45d08dd..4b8dbae5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
@@ -115,7 +115,7 @@ public class UserService {
 
 	public UserDO findByToken(String token) {
 		Date now = new Date();
-		UserTokenDO userTokenDO = userTokenMapper.findByAvailableToken(token, now.getTime());
+		UserTokenDO userTokenDO = userTokenMapper.findByAvailableToken(token, now);
 		if (null == userTokenDO) {
 			return null;
 		}