logpath & jar commit

6 files changed, 69 insertions, 52 deletions

diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9ab4003
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Main-Class: UaAnalyser

+

diff --git a/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java b/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java
index 83c1e94..b20d3a4 100644
--- a/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java
+++ b/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java
@@ -9,7 +9,10 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
- * get possible categories of terminal
+ * 终端设备分类
+ * @author yjy
+ * @version 1.0
+ * @date 2020/11/15 12:20 下午
  */
 public class TerminalClassify {
 
@@ -43,12 +46,15 @@ public class TerminalClassify {
             }
         }
 
-        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_WINDOWS.getCode())!=0)
+        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_WINDOWS.getCode())!=0) {
             catList.add(RegexFeatureEnum.TERMINAL_CAT_WINDOWS.getCode());
-        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_ANDROID.getCode())!=0)
+        }
+        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_ANDROID.getCode())!=0) {
             catList.add(RegexFeatureEnum.TERMINAL_CAT_ANDROID.getCode());
-        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_APPLE.getCode())!=0)
+        }
+        if (catCnt.get(RegexFeatureEnum.TERMINAL_CAT_APPLE.getCode())!=0) {
             catList.add(RegexFeatureEnum.TERMINAL_CAT_APPLE.getCode());
+        }
 
         userInfo.setTerminalCatList(catList);
     }
diff --git a/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java b/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java
index 50c9131..4e0abf0 100644
--- a/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java
+++ b/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java
@@ -1,5 +1,11 @@
+/**
+ * @author yjy
+ * @version 1.0
+ * @date 2020/11/15 12:20 下午
+ */
 package com.example.ua.analyser.impl;
 
+import java.sql.SQLException;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -10,17 +16,18 @@ import com.example.ua.utils.MariaDBConnect;
 import com.example.ua.analyser.enums.RegexFeatureEnum;
 
 import org.mariadb.jdbc.MariaDbStatement;
-//import org.slf4j.Logger;
 import org.apache.log4j.Logger;
 
 public class UaAnalyserImpl implements UaAnalyser {
     final Logger LOG = Logger.getLogger(UaAnalyser.class);
     MariaDbStatement connStatement = MariaDBConnect.getMariaDB();
 
+    public UaAnalyserImpl() throws SQLException {
+    }
+
     @Override
     public UserInfo getUserinfo(String inputString){
         UserInfo userInfo = parseInfo(inputString);
-        List<List<String>> terminalList = userInfo.getTerminalList();
 
         // get terminalCatInfo in userInfo
         TerminalClassify.checkSys(userInfo);
@@ -40,8 +47,6 @@ public class UaAnalyserImpl implements UaAnalyser {
             AppleAnalyser appleAnalyser = new AppleAnalyser(connStatement, userInfo);
             userInfo = appleAnalyser.getTriples();
         }
-
-//        userInfo.setTerminalList(terminalList);
         userInfo.update();
         return userInfo;
     }
@@ -51,16 +56,21 @@ public class UaAnalyserImpl implements UaAnalyser {
         List<String> uaList = userInfo.getUaList();
 
         String[] info = inputString.split("\t");
-        try{
-            userInfo.setUserId(info[0]);
-            userInfo.setIp(info[1]);
-            userInfo.setTimeStamp(info[2]);
-            userInfo.setUaCntInfo(info[3]);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            LOG.error("Input Format Error: " + inputString);
-            userInfo.update();
-            return userInfo;
-        }
+//        try{
+//            userInfo.setUserId(info[0]);
+//            userInfo.setIp(info[1]);
+//            userInfo.setTimeStamp(info[2]);
+//            userInfo.setUaCntInfo(info[3]);
+//        } catch (ArrayIndexOutOfBoundsException e) {
+//            LOG.error("Input Format Error: " + inputString);
+//            userInfo.update();
+//            return userInfo;
+//        }
+
+        userInfo.setUserId(info[0]);
+        userInfo.setIp(info[1]);
+        userInfo.setTimeStamp(info[2]);
+        userInfo.setUaCntInfo(info[3]);
 
         Pattern pattern = Pattern.compile("\\'(.*?)\\'");
         Matcher matcher = pattern.matcher(userInfo.getUaCntInfo());
diff --git a/src/main/java/com/example/ua/utils/MariaDBConnect.java b/src/main/java/com/example/ua/utils/MariaDBConnect.java
index cb95e51..915b690 100644
--- a/src/main/java/com/example/ua/utils/MariaDBConnect.java
+++ b/src/main/java/com/example/ua/utils/MariaDBConnect.java
@@ -4,20 +4,21 @@ import com.example.ua.config.ApplicationConfig;
 
 import org.mariadb.jdbc.MariaDbDataSource;
 import org.mariadb.jdbc.MariaDbStatement;
-//import org.slf4j.Logger;
 import org.apache.log4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.mariadb.jdbc.MariaDbConnection;
 import java.sql.SQLException;
 
 /**
  * 建立连接
+ * @author yjy
+ * @version 1.0
+ * @date 2020/11/15 12:20 下午
  */
 public class MariaDBConnect{
     private static final Logger LOG = Logger.getLogger(MariaDBConnect.class);
 
-    public static MariaDbStatement getMariaDB(){
+    public static MariaDbStatement getMariaDB() throws SQLException {
         String addr = "jdbc:mariadb://"
                 + ApplicationConfig.MARIADB_HOST + ":"
                 + ApplicationConfig.MARIADB_PORT + "/"
@@ -26,14 +27,12 @@ public class MariaDBConnect{
         MariaDbDataSource dataSource = new MariaDbDataSource(addr);
         MariaDbStatement statement = null;
 
-        try {
-            MariaDbConnection conn = (MariaDbConnection) dataSource.getConnection(
-                    ApplicationConfig.MARIADB_USER,
-                    ApplicationConfig.MARIADB_PASSWORD);
-            statement = (MariaDbStatement) conn.createStatement();
-        } catch (SQLException e) {
-            LOG.error("GetMariaDBConnection Faild. " + e.toString());
-        }
+        MariaDbConnection conn = (MariaDbConnection) dataSource.getConnection(
+                ApplicationConfig.MARIADB_USER,
+                ApplicationConfig.MARIADB_PASSWORD);
+        statement = (MariaDbStatement) conn.createStatement();
+
+
         return statement;
     }
 
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 023da7a..342a12e 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,26 +1,27 @@
 ########################## logger ##############################
 
 ### 设置###
-log4j.rootLogger = debug,stdout,D,E
+log4j.rootLogger = error,E
 
-### 输出信息到控制抬 ###
-log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target = System.out
-log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
-
-### 输出DEBUG 级别以上的日志###
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.D.File = /Users/joy/work/iie/project/cyber_narrator/multiAccess/UaAnalyserV2/logs/debug.log
-log4j.appender.D.Append = true
-log4j.appender.D.Threshold = DEBUG 
-log4j.appender.D.layout = org.apache.log4j.PatternLayout
-log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
+#### 输出信息到控制抬 ###
+#log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target = System.out
+#log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
+#
+#### 输出DEBUG 级别以上的日志###
+#log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.D.File = /home/tsg3.0-volumes/galaxy-qgw-service/logs/galaxy-qgw-service.log
+#log4j.appender.D.Append = true
+#log4j.appender.D.Threshold = DEBUG
+#log4j.appender.D.layout = org.apache.log4j.PatternLayout
+#log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
 
 ### 输出ERROR 级别以上的日志 ###
 log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.E.File =/Users/joy/work/iie/project/cyber_narrator/multiAccess/UaAnalyserV2/logs/error.log
+#log4j.appender.E.File = /home/tsg3.0-volumes/galaxy-qgw-service/logs/galaxy-qgw-service.log
+log4j.appender.E.File =/Users/joy/work/iie/project/cyber_narrator/multiAccess/UaAnalyser/logs/error.log
 log4j.appender.E.Append = true
-log4j.appender.E.Threshold = ERROR 
+log4j.appender.E.Threshold = ERROR
 log4j.appender.E.layout = org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
\ No newline at end of file
diff --git a/src/test/java/UaAnalyserTest.java b/src/test/java/UaAnalyserTest.java
index b8c73d3..3782070 100644
--- a/src/test/java/UaAnalyserTest.java
+++ b/src/test/java/UaAnalyserTest.java
@@ -1,19 +1,17 @@
 import com.example.ua.analyser.UaAnalyser;
 import com.example.ua.analyser.enums.UserInfo;
 import com.example.ua.analyser.impl.UaAnalyserImpl;
-import com.example.ua.config.ApplicationConfig;
 
-import java.awt.*;
-import java.lang.reflect.Field;
+import java.sql.SQLException;
 
 public class UaAnalyserTest {
 
 
-    public static void main(String[] args){
+    public static void main(String[] args) throws SQLException {
 
-        String inputString = "69765" + "\t" +      // userId
-                "192.168.50.13" + "\t" +       // ip
-                "1765433230" + "\t" +         // timeStamp
+        String inputString = "69765" + "\t" +
+                "192.168.50.13" + "\t" +
+                "1765433230" + "\t" +
                 "'Dalvik/1.6.0 (Linux; U; Android 4.0.3; LG-E612f Build/IML74K)':4, " +
                 "'Dalvik/2.1.0 (Linux; U; Android 10; TNYAL00 Build/HUAWEITNY-AL00)':4" +
                 "'Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15G77 ===  iOS/11.4.1 Model/iPhone10,1 BundleID/com.xunmeng.pinduoduo AppVersion/5.32.0 AppBuild/2009212125 pversion/1221 cURL/7.48.0':5" +