summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryinjiangyi <[email protected]>2020-11-17 17:39:05 +0800
committeryinjiangyi <[email protected]>2020-11-17 17:39:05 +0800
commitdd4cbff48e269d3150f32250d195c9802c6e8ec2 (patch)
tree90f787d5e876644132fb8bd0d8b75fb4d8693340
parentb58d0233f5dbc33c58bbb50586b6b60bb9c6831e (diff)
edit pom.xml & log4j
-rw-r--r--UaAnalyser.jarbin1135348 -> 1134540 bytes
-rw-r--r--pom.xml23
-rw-r--r--src/main/java/com/mesalab/ua/analyser/UaAnalyser.java (renamed from src/main/java/com/example/ua/analyser/UaAnalyser.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/enums/RegexFeatureEnum.java (renamed from src/main/java/com/example/ua/analyser/enums/RegexFeatureEnum.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/enums/StandardUaList.java (renamed from src/main/java/com/example/ua/analyser/enums/StandardUaList.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/enums/UserInfo.java (renamed from src/main/java/com/example/ua/analyser/enums/UserInfo.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/impl/AndroidAnalyser.java (renamed from src/main/java/com/example/ua/analyser/impl/AndroidAnalyser.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/impl/AppleAnalyser.java (renamed from src/main/java/com/example/ua/analyser/impl/AppleAnalyser.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/impl/TerminalClassify.java (renamed from src/main/java/com/example/ua/analyser/impl/TerminalClassify.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/impl/UaAnalyserImpl.java (renamed from src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java)0
-rw-r--r--src/main/java/com/mesalab/ua/analyser/impl/WindowsAnalyser.java (renamed from src/main/java/com/example/ua/analyser/impl/WindowsAnalyser.java)0
-rw-r--r--src/main/java/com/mesalab/ua/config/ApplicationConfig.java (renamed from src/main/java/com/example/ua/config/ApplicationConfig.java)0
-rw-r--r--src/main/java/com/mesalab/ua/dao/QueryMariaDb.java (renamed from src/main/java/com/example/ua/dao/QueryMariaDb.java)0
-rw-r--r--src/main/java/com/mesalab/ua/dao/impl/QueryMariaDbImpl.java (renamed from src/main/java/com/example/ua/dao/impl/QueryMariaDbImpl.java)0
-rw-r--r--src/main/java/com/mesalab/ua/utils/ConfigUtils.java (renamed from src/main/java/com/example/ua/utils/ConfigUtils.java)0
-rw-r--r--src/main/java/com/mesalab/ua/utils/MariaDBConnect.java (renamed from src/main/java/com/example/ua/utils/MariaDBConnect.java)0
-rw-r--r--src/main/resources/log4j.properties32
17 files changed, 25 insertions, 30 deletions
diff --git a/UaAnalyser.jar b/UaAnalyser.jar
index 1228dd4..84ccfe5 100644
--- a/UaAnalyser.jar
+++ b/UaAnalyser.jar
Binary files 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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.example</groupId>
- <artifactId>UaAnalyserV2</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>com.mesalab.ua</groupId>
+ <artifactId>UaAnalyser</artifactId>
+ <version>1.0-RELEASE</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
+ <repositories>
+ <repository>
+ <id>nexus</id>
+ <name>Team Nexus Repository</name>
+ <url>http://192.168.40.125:8099/content/repositories/UaAnalyser</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>nexus</id>
+ <name>releases</name>
+ <url>http://192.168.40.125:8099/content/repositories/UaAnalyser</url>
+ <uniqueVersion>true</uniqueVersion>
+ </repository>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
diff --git a/src/main/java/com/example/ua/analyser/UaAnalyser.java b/src/main/java/com/mesalab/ua/analyser/UaAnalyser.java
index df06447..df06447 100644
--- a/src/main/java/com/example/ua/analyser/UaAnalyser.java
+++ b/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
index 209664f..209664f 100644
--- a/src/main/java/com/example/ua/analyser/enums/RegexFeatureEnum.java
+++ b/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
index 95f43c0..95f43c0 100644
--- a/src/main/java/com/example/ua/analyser/enums/StandardUaList.java
+++ b/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
index b56f3bf..b56f3bf 100644
--- a/src/main/java/com/example/ua/analyser/enums/UserInfo.java
+++ b/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
index 5e8f6a7..5e8f6a7 100644
--- a/src/main/java/com/example/ua/analyser/impl/AndroidAnalyser.java
+++ b/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
index 1e4f9a2..1e4f9a2 100644
--- a/src/main/java/com/example/ua/analyser/impl/AppleAnalyser.java
+++ b/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
index b20d3a4..b20d3a4 100644
--- a/src/main/java/com/example/ua/analyser/impl/TerminalClassify.java
+++ b/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
index 4e0abf0..4e0abf0 100644
--- a/src/main/java/com/example/ua/analyser/impl/UaAnalyserImpl.java
+++ b/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
index adafc43..adafc43 100644
--- a/src/main/java/com/example/ua/analyser/impl/WindowsAnalyser.java
+++ b/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
index f22e594..f22e594 100644
--- a/src/main/java/com/example/ua/config/ApplicationConfig.java
+++ b/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
index f8f9ec9..f8f9ec9 100644
--- a/src/main/java/com/example/ua/dao/QueryMariaDb.java
+++ b/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
index 3c32049..3c32049 100644
--- a/src/main/java/com/example/ua/dao/impl/QueryMariaDbImpl.java
+++ b/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
index 1a84ee5..1a84ee5 100644
--- a/src/main/java/com/example/ua/utils/ConfigUtils.java
+++ b/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
index 915b690..915b690 100644
--- a/src/main/java/com/example/ua/utils/MariaDBConnect.java
+++ b/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