diff --git a/UaAnalyser.jar b/UaAnalyser.jar index 1228dd4..84ccfe5 100644 Binary files a/UaAnalyser.jar and b/UaAnalyser.jar differ diff --git a/pom.xml b/pom.xml index 3e1cdb1..6438831 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.example - UaAnalyserV2 - 1.0-SNAPSHOT + com.mesalab.ua + UaAnalyser + 1.0-RELEASE 8 8 + + + nexus + Team Nexus Repository + http://192.168.40.125:8099/content/repositories/UaAnalyser + + + + + + nexus + releases + http://192.168.40.125:8099/content/repositories/UaAnalyser + true + + + org.mariadb.jdbc diff --git a/src/main/java/com/example/ua/analyser/UaAnalyser.java b/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java similarity index 100% rename from src/main/java/com/example/ua/analyser/UaAnalyser.java rename to src/main/java/com/mesalab/ua/analyser/UaAnalyser.java diff --git a/src/main/java/com/example/ua/analyser/enums/RegexFeatureEnum.java b/src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java similarity index 100% rename from src/main/java/com/example/ua/analyser/enums/RegexFeatureEnum.java rename to src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java diff --git a/src/main/java/com/example/ua/analyser/enums/StandardUaList.java b/src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java similarity index 100% rename from src/main/java/com/example/ua/analyser/enums/StandardUaList.java rename to src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java diff --git a/src/main/java/com/example/ua/analyser/enums/UserInfo.java b/src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java similarity index 100% rename from src/main/java/com/example/ua/analyser/enums/UserInfo.java rename to src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java diff --git a/src/main/java/com/example/ua/analyser/impl/AndroidAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java similarity index 100% rename from src/main/java/com/example/ua/analyser/impl/AndroidAnalyser.java rename to src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java diff --git a/src/main/java/com/example/ua/analyser/impl/AppleAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java similarity index 100% rename from src/main/java/com/example/ua/analyser/impl/AppleAnalyser.java rename to src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java diff --git a/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java b/src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java similarity index 100% rename from src/main/java/com/example/ua/analyser/impl/TerminalClassify.java rename to src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java diff --git a/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java b/src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java similarity index 100% rename from src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java rename to src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java diff --git a/src/main/java/com/example/ua/analyser/impl/WindowsAnalyser.java b/src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java similarity index 100% rename from src/main/java/com/example/ua/analyser/impl/WindowsAnalyser.java rename to src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java diff --git a/src/main/java/com/example/ua/config/ApplicationConfig.java b/src/main/java/com/mesalab/ua/config/ApplicationConfig.java similarity index 100% rename from src/main/java/com/example/ua/config/ApplicationConfig.java rename to src/main/java/com/mesalab/ua/config/ApplicationConfig.java diff --git a/src/main/java/com/example/ua/dao/QueryMariaDb.java b/src/main/java/com/mesalab/ua/dao/QueryMariaDb.java similarity index 100% rename from src/main/java/com/example/ua/dao/QueryMariaDb.java rename to src/main/java/com/mesalab/ua/dao/QueryMariaDb.java diff --git a/src/main/java/com/example/ua/dao/impl/QueryMariaDbImpl.java b/src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java similarity index 100% rename from src/main/java/com/example/ua/dao/impl/QueryMariaDbImpl.java rename to src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java diff --git a/src/main/java/com/example/ua/utils/ConfigUtils.java b/src/main/java/com/mesalab/ua/utils/ConfigUtils.java similarity index 100% rename from src/main/java/com/example/ua/utils/ConfigUtils.java rename to src/main/java/com/mesalab/ua/utils/ConfigUtils.java diff --git a/src/main/java/com/example/ua/utils/MariaDBConnect.java b/src/main/java/com/mesalab/ua/utils/MariaDBConnect.java similarity index 100% rename from src/main/java/com/example/ua/utils/MariaDBConnect.java rename to src/main/java/com/mesalab/ua/utils/MariaDBConnect.java diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index af5f61d..eca7972 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -1,27 +1,5 @@ -########################## logger ############################## - -### 设置### -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 = /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 = /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.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 +log4j.rootLogger=info,stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Threshold=INFO +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] [%-5p] [Thread\:%t] %l %x - <%m>%n \ No newline at end of file