remove druid

ansjsun · ansjsun · commit 6e9b6c83274c · 2018-07-09T17:44:58.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 	compile 'org.nutz:nutz:1.r.65'
 	compile 'com.alibaba:fastjson:1.2.28'
 	compile 'com.h2database:h2:1.3.176'
-	compile 'com.alibaba:druid:1.1.9'
+	compile 'com.zaxxer:HikariCP:3.1.0'
 	compile 'org.quartz-scheduler:quartz:2.2.1'
 	compile 'javax.mail:mail:1.4.1'
 	compile 'com.google.guava:guava:18.0'
diff --git a/src/main/java/org/nlpcn/jcoder/job/StatisticalJob.java b/src/main/java/org/nlpcn/jcoder/job/StatisticalJob.java
@@ -1,6 +1,5 @@
 package org.nlpcn.jcoder.job;
 
-import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
@@ -119,11 +118,11 @@ public static void add(LogInfo log) {
         if (message.startsWith("Execute OK")) {
             // Execute OK  ApiTest/test succesed ! use Time : 0
             (stats = new Stats()).successCount.set(1);
-            duration = Integer.parseInt(StringUtils.subString(message, " succesed ! use Time : ", null).trim());
+            duration = Integer.parseInt(StringUtil.subString(message, " succesed ! use Time : ", null).trim());
         } else if (message.startsWith("Execute ERR")) {
             // Execute ERR  ApiTest/test useTime 0 erred : java.lang.reflect.InvocationTargetException...
             (stats = new Stats()).errorCount.set(1);
-            duration = Integer.parseInt(StringUtils.subString(message, " useTime ", " erred : ").trim());
+            duration = Integer.parseInt(StringUtil.subString(message, " useTime ", " erred : ").trim());
         } else {
             // 忽略其他日志信息
             return;
diff --git a/src/main/java/org/nlpcn/jcoder/server/H2Server.java b/src/main/java/org/nlpcn/jcoder/server/H2Server.java
@@ -1,6 +1,6 @@
 package org.nlpcn.jcoder.server;
 
-import com.alibaba.druid.pool.DruidDataSource;
+import com.zaxxer.hikari.HikariDataSource;
 import org.h2.tools.Server;
 import org.nlpcn.jcoder.util.IOUtil;
 import org.nlpcn.jcoder.util.StaticValue;
@@ -44,15 +44,11 @@ public static void startServer(NutConfig nc) {
 				}
 			}
 
-			DruidDataSource dds = new DruidDataSource();
+			HikariDataSource dds = new HikariDataSource();
 			dds.setDriverClassName("org.h2.Driver");
-			dds.setUrl("jdbc:h2:" + h2db);
+			dds.setJdbcUrl("jdbc:h2:" + h2db);
 			dds.setUsername("sa");
 			dds.setPassword("");
-			dds.setInitialSize(10);
-			dds.setMaxActive(100);
-			dds.setTestOnReturn(true);
-			dds.setValidationQuery("select 1");
 			BasicDao basicDao = new BasicDao(dds);
 
 			StaticValue.systemDao = basicDao;
diff --git a/src/main/java/org/nlpcn/jcoder/util/StringUtil.java b/src/main/java/org/nlpcn/jcoder/util/StringUtil.java
@@ -80,4 +80,28 @@ public static String trim(String value) {
 		}
 		return ((st > 0) || (len < value.length())) ? value.substring(st, len) : value;
 	}
+
+
+	/**
+	 * Example: subString("abcd","a","c")="b"
+	 *
+	 * @param src
+	 * @param start null while start from index=0
+	 * @param to null while to index=src.length
+	 * @return
+	 */
+	public static String subString(String src, String start, String to) {
+		int indexFrom = start == null ? 0 : src.indexOf(start);
+		int indexTo = to == null ? src.length() : src.indexOf(to);
+		if (indexFrom < 0 || indexTo < 0 || indexFrom > indexTo) {
+			return null;
+		}
+
+		if (null != start) {
+			indexFrom += start.length();
+		}
+
+		return src.substring(indexFrom, indexTo);
+
+	}
 }
diff --git a/src/main/java/org/nlpcn/jcoder/util/dao/BasicDao.java b/src/main/java/org/nlpcn/jcoder/util/dao/BasicDao.java
@@ -1,6 +1,6 @@
 package org.nlpcn.jcoder.util.dao;
 
-import com.alibaba.druid.pool.DruidDataSource;
+import com.zaxxer.hikari.HikariDataSource;
 import org.nutz.castor.Castors;
 import org.nutz.dao.*;
 import org.nutz.dao.entity.Entity;
@@ -29,14 +29,13 @@ public class BasicDao {
 
 	@Inject
 	protected Dao dao;
-	private DruidDataSource ds;
+	private HikariDataSource ds;
 
 	public BasicDao(String jdbcUrl, String username, String password) {
-		ds = new DruidDataSource();
-		ds.setUrl(jdbcUrl);
+		ds = new HikariDataSource();
+		ds.setJdbcUrl(jdbcUrl);
 		ds.setUsername(username);
 		ds.setPassword(password);
-		ds.setMaxWait(60000);
 		this.dao = new NutDao(ds);
 	}
 
