edit mariaConect

16 files changed, 55 insertions, 44 deletions

diff --git a/UaAnalyser.jar b/UaAnalyser.jar
index 84ccfe5..e18e9ca 100644
--- a/UaAnalyser.jar
+++ b/UaAnalyser.jar
diff --git a/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java b/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java
index df06447..bd9e8c5 100644
--- a/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java
+++ b/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java
@@ -1,6 +1,6 @@
-package com.example.ua.analyser;
+package com.mesalab.ua.analyser;
 
-import com.example.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.analyser.enums.UserInfo;
 
 /**
  * @author yjy
diff --git a/src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java b/src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java
index 209664f..bf104fe 100644
--- a/src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java
+++ b/src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java
@@ -1,4 +1,4 @@
-package com.example.ua.analyser.enums;
+package com.mesalab.ua.analyser.enums;
 
 /**
  * @author yjy
diff --git a/src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java b/src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java
index 95f43c0..fce03c2 100644
--- a/src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java
+++ b/src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java
@@ -1,4 +1,4 @@
-package com.example.ua.analyser.enums;
+package com.mesalab.ua.analyser.enums;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java b/src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java
index b56f3bf..466cf26 100644
--- a/src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java
+++ b/src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java
@@ -1,4 +1,4 @@
-package com.example.ua.analyser.enums;
+package com.mesalab.ua.analyser.enums;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java
index 5e8f6a7..f071126 100644
--- a/src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java
+++ b/src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java
@@ -1,4 +1,4 @@
-package com.example.ua.analyser.impl;
+package com.mesalab.ua.analyser.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,10 +6,10 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.example.ua.analyser.enums.RegexFeatureEnum;
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.dao.QueryMariaDb;
-import com.example.ua.dao.impl.QueryMariaDbImpl;
+import com.mesalab.ua.analyser.enums.RegexFeatureEnum;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.dao.QueryMariaDb;
+import com.mesalab.ua.dao.impl.QueryMariaDbImpl;
 import org.mariadb.jdbc.MariaDbStatement;
 
 /**
diff --git a/src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java
index 1e4f9a2..4546795 100644
--- a/src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java
+++ b/src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java
@@ -1,8 +1,8 @@
-package com.example.ua.analyser.impl;
+package com.mesalab.ua.analyser.impl;
 
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.dao.QueryMariaDb;
-import com.example.ua.dao.impl.QueryMariaDbImpl;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.dao.QueryMariaDb;
+import com.mesalab.ua.dao.impl.QueryMariaDbImpl;
 import org.mariadb.jdbc.MariaDbStatement;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java b/src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java
index b20d3a4..ae511e8 100644
--- a/src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java
+++ b/src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java
@@ -1,7 +1,7 @@
-package com.example.ua.analyser.impl;
+package com.mesalab.ua.analyser.impl;
 
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.analyser.enums.RegexFeatureEnum;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.analyser.enums.RegexFeatureEnum;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java b/src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java
index 4e0abf0..8ab48ac 100644
--- a/src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java
+++ b/src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java
@@ -3,18 +3,20 @@
  * @version 1.0
  * @date 2020/11/15 12:20 下午
  */
-package com.example.ua.analyser.impl;
+package com.mesalab.ua.analyser.impl;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.example.ua.analyser.UaAnalyser;
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.utils.MariaDBConnect;
-import com.example.ua.analyser.enums.RegexFeatureEnum;
+import com.mesalab.ua.analyser.UaAnalyser;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.dao.QueryMariaDb;
+import com.mesalab.ua.utils.MariaDBConnect;
+import com.mesalab.ua.analyser.enums.RegexFeatureEnum;
 
+import org.mariadb.jdbc.MariaDbConnection;
 import org.mariadb.jdbc.MariaDbStatement;
 import org.apache.log4j.Logger;
 
@@ -47,6 +49,8 @@ public class UaAnalyserImpl implements UaAnalyser {
             AppleAnalyser appleAnalyser = new AppleAnalyser(connStatement, userInfo);
             userInfo = appleAnalyser.getTriples();
         }
+
+        MariaDBConnect.clear();
         userInfo.update();
         return userInfo;
     }
diff --git a/src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java
index adafc43..ace258a 100644
--- a/src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java
+++ b/src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java
@@ -1,9 +1,9 @@
-package com.example.ua.analyser.impl;
+package com.mesalab.ua.analyser.impl;
 
-import com.example.ua.analyser.enums.StandardUaList;
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.dao.QueryMariaDb;
-import com.example.ua.dao.impl.QueryMariaDbImpl;
+import com.mesalab.ua.analyser.enums.StandardUaList;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.dao.QueryMariaDb;
+import com.mesalab.ua.dao.impl.QueryMariaDbImpl;
 import org.mariadb.jdbc.MariaDbStatement;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/mesalab/ua/config/ApplicationConfig.java b/src/main/java/com/mesalab/ua/config/ApplicationConfig.java
index f22e594..89e300b 100644
--- a/src/main/java/com/mesalab/ua/config/ApplicationConfig.java
+++ b/src/main/java/com/mesalab/ua/config/ApplicationConfig.java
@@ -1,6 +1,6 @@
-package com.example.ua.config;
+package com.mesalab.ua.config;
 
-import com.example.ua.utils.ConfigUtils;
+import com.mesalab.ua.utils.ConfigUtils;
 
 
 /**
diff --git a/src/main/java/com/mesalab/ua/dao/QueryMariaDb.java b/src/main/java/com/mesalab/ua/dao/QueryMariaDb.java
index f8f9ec9..e60d95a 100644
--- a/src/main/java/com/mesalab/ua/dao/QueryMariaDb.java
+++ b/src/main/java/com/mesalab/ua/dao/QueryMariaDb.java
@@ -1,4 +1,4 @@
-package com.example.ua.dao;
+package com.mesalab.ua.dao;
 
 import org.mariadb.jdbc.MariaDbStatement;
 
diff --git a/src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java b/src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java
index 3c32049..7f0e7fc 100644
--- a/src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java
+++ b/src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java
@@ -1,7 +1,7 @@
-package com.example.ua.dao.impl;
+package com.mesalab.ua.dao.impl;
 
-import com.example.ua.config.ApplicationConfig;
-import com.example.ua.dao.QueryMariaDb;
+import com.mesalab.ua.config.ApplicationConfig;
+import com.mesalab.ua.dao.QueryMariaDb;
 import org.mariadb.jdbc.MariaDbStatement;
 import org.apache.log4j.Logger;
 
@@ -39,12 +39,13 @@ public class QueryMariaDbImpl implements QueryMariaDb {
             } else {
                 LOG.info("QueryMariaDB.Empty " + ua);
             }
-            return triple;
+            results.close();
+            connStatement.close();
 
         } catch (SQLException e){
             LOG.info("QueryMariaDB.Fail " + e.toString());
-            return null;
         }
+        return triple;
     }
 
     private String getSqlPattern(String ua){
diff --git a/src/main/java/com/mesalab/ua/utils/ConfigUtils.java b/src/main/java/com/mesalab/ua/utils/ConfigUtils.java
index 1a84ee5..8a94080 100644
--- a/src/main/java/com/mesalab/ua/utils/ConfigUtils.java
+++ b/src/main/java/com/mesalab/ua/utils/ConfigUtils.java
@@ -1,4 +1,4 @@
-package com.example.ua.utils;
+package com.mesalab.ua.utils;
 
 import org.apache.log4j.Logger;
 import java.util.Properties;
diff --git a/src/main/java/com/mesalab/ua/utils/MariaDBConnect.java b/src/main/java/com/mesalab/ua/utils/MariaDBConnect.java
index 915b690..a59f9f2 100644
--- a/src/main/java/com/mesalab/ua/utils/MariaDBConnect.java
+++ b/src/main/java/com/mesalab/ua/utils/MariaDBConnect.java
@@ -1,6 +1,6 @@
-package com.example.ua.utils;
+package com.mesalab.ua.utils;
 
-import com.example.ua.config.ApplicationConfig;
+import com.mesalab.ua.config.ApplicationConfig;
 
 import org.mariadb.jdbc.MariaDbDataSource;
 import org.mariadb.jdbc.MariaDbStatement;
@@ -17,6 +17,7 @@ import java.sql.SQLException;
  */
 public class MariaDBConnect{
     private static final Logger LOG = Logger.getLogger(MariaDBConnect.class);
+    private static MariaDbConnection conn = null;
 
     public static MariaDbStatement getMariaDB() throws SQLException {
         String addr = "jdbc:mariadb://"
@@ -27,13 +28,18 @@ public class MariaDBConnect{
         MariaDbDataSource dataSource = new MariaDbDataSource(addr);
         MariaDbStatement statement = null;
 
-        MariaDbConnection conn = (MariaDbConnection) dataSource.getConnection(
+        conn = (MariaDbConnection) dataSource.getConnection(
                 ApplicationConfig.MARIADB_USER,
                 ApplicationConfig.MARIADB_PASSWORD);
         statement = (MariaDbStatement) conn.createStatement();
-
-
         return statement;
     }
 
+    public static void clear(){
+        try{
+            conn.close();
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/UaAnalyserTest.java b/src/test/java/UaAnalyserTest.java
index 3782070..57cb123 100644
--- a/src/test/java/UaAnalyserTest.java
+++ b/src/test/java/UaAnalyserTest.java
@@ -1,6 +1,6 @@
-import com.example.ua.analyser.UaAnalyser;
-import com.example.ua.analyser.enums.UserInfo;
-import com.example.ua.analyser.impl.UaAnalyserImpl;
+import com.mesalab.ua.analyser.UaAnalyser;
+import com.mesalab.ua.analyser.enums.UserInfo;
+import com.mesalab.ua.analyser.impl.UaAnalyserImpl;
 
 import java.sql.SQLException;