何知谦 4 лет назад
Родитель
Сommit
2821729e74
31 измененных файлов с 74 добавлено и 15 удалено
  1. 0 3
      .idea/compiler.xml
  2. 2 2
      Dockerfile
  3. 1 1
      pom.xml
  4. 3 5
      seecoder-logTracking-client/src/main/java/client/LogTrackingClient.java
  5. BIN
      seecoder-logTracking-client/target/classes/client/LogTrackingClient.class
  6. 3 0
      seecoder-logTracking-client/target/maven-archiver/pom.properties
  7. 5 0
      seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  8. 5 0
      seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  9. 0 0
      seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  10. 0 0
      seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  11. BIN
      seecoder-logTracking-client/target/seecoder-logTracking-client-1.0-SNAPSHOT.jar
  12. 3 0
      seecoder-logTracking-common/target/maven-archiver/pom.properties
  13. 7 0
      seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  14. 6 0
      seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  15. 0 0
      seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  16. 0 0
      seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  17. BIN
      seecoder-logTracking-common/target/seecoder-logTracking-common-1.0-SNAPSHOT.jar
  18. 3 0
      seecoder-logTracking-consumer/target/maven-archiver/pom.properties
  19. 2 0
      seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  20. 1 0
      seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  21. 0 0
      seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  22. 0 0
      seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  23. BIN
      seecoder-logTracking-consumer/target/seecoder-logTracking-consumer-1.0-SNAPSHOT.jar
  24. 1 1
      seecoder-logTracking-server/pom.xml
  25. 0 3
      seecoder-logTracking-server/target/classes/log4j.properties
  26. 3 0
      seecoder-logTracking-server/target/maven-archiver/pom.properties
  27. 15 0
      seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  28. 14 0
      seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  29. 0 0
      seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  30. 0 0
      seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  31. BIN
      seecoder-logTracking-server/target/seecoder-logTracking-server-1.0.RELEASE.jar

+ 0 - 3
.idea/compiler.xml

@@ -13,9 +13,6 @@
         <module name="seecoder-logTracking-consumer" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="seecoder-logTracking-client" target="8" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">

+ 2 - 2
Dockerfile

@@ -1,12 +1,12 @@
 FROM maven:3.6.1 AS compile_stage
-ENV PROJECT_NAME seec-logTracking
+ENV PROJECT_NAME app
 ENV WORK_PATH /opt/$PROJECT_NAME
 COPY settings.xml /root/.m2/settings.xml
 COPY . $WORK_PATH
 RUN cd $WORK_PATH && mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
 
 FROM java:8-jre-alpine
-ENV PROJECT_NAME seec-logTracking
+ENV PROJECT_NAME app
 ENV WORK_PATH /opt/$PROJECT_NAME
 WORKDIR /app
 COPY --from=compile_stage $WORK_PATH/seecoder-logTracking-server/target/${PROJECT_NAME}.jar .

+ 1 - 1
pom.xml

@@ -19,7 +19,7 @@
     </parent>
     <groupId>com.nju.edu</groupId>
     <artifactId>seecoder-logTracking</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.RELEASE</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

+ 3 - 5
seecoder-logTracking-client/src/main/java/client/LogTrackingClient.java

@@ -5,17 +5,15 @@ import Utils.PostHelper;
 import com.nju.edu.logTracking.dto.LogConfigDto;
 import com.nju.edu.logTracking.enums.Level;
 import com.nju.edu.logTracking.enums.PublishMode;
-import com.sun.org.slf4j.internal.Logger;
-import com.sun.org.slf4j.internal.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 public class LogTrackingClient implements logTrackingApi {
-    private final Logger logger = LoggerFactory.getLogger(LogTrackingClient.class);
-
     private static final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 20,
             10000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(50));
 
@@ -64,7 +62,7 @@ public class LogTrackingClient implements logTrackingApi {
             try {
                 PostHelper.post("http://localhost:8080/api/publish", logConfigDto);
             } catch (IOException e) {
-                logger.error(e.getMessage());
+                log.error(e.getMessage());
             }
         });
     }

BIN
seecoder-logTracking-client/target/classes/client/LogTrackingClient.class


+ 3 - 0
seecoder-logTracking-client/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=seecoder-logTracking-client
+groupId=com.nju.edu
+version=1.0-SNAPSHOT

+ 5 - 0
seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,5 @@
+client\logTrackingApi.class
+client\LogTrackingClient.class
+exception\LogTrackingException.class
+Utils\LogBuilder.class
+Utils\PostHelper.class

+ 5 - 0
seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,5 @@
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-client\src\main\java\exception\LogTrackingException.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-client\src\main\java\client\logTrackingApi.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-client\src\main\java\Utils\LogBuilder.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-client\src\main\java\client\LogTrackingClient.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-client\src\main\java\Utils\PostHelper.java

+ 0 - 0
seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst


+ 0 - 0
seecoder-logTracking-client/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


BIN
seecoder-logTracking-client/target/seecoder-logTracking-client-1.0-SNAPSHOT.jar


+ 3 - 0
seecoder-logTracking-common/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=seecoder-logTracking-common
+groupId=com.nju.edu
+version=1.0-SNAPSHOT

+ 7 - 0
seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,7 @@
+com\nju\edu\logTracking\kafka\KafkaUtils.class
+com\nju\edu\logTracking\dto\LogConfigDto.class
+com\nju\edu\logTracking\enums\System.class
+com\nju\edu\logTracking\kafka\Config.class
+com\nju\edu\logTracking\enums\Level.class
+com\nju\edu\logTracking\enums\PublishMode.class
+com\nju\edu\logTracking\kafka\Config$Topic.class

+ 6 - 0
seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,6 @@
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\enums\PublishMode.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\enums\Level.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\kafka\Config.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\kafka\KafkaUtils.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\enums\System.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-common\src\main\java\com\nju\edu\logTracking\dto\LogConfigDto.java

+ 0 - 0
seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst


+ 0 - 0
seecoder-logTracking-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


BIN
seecoder-logTracking-common/target/seecoder-logTracking-common-1.0-SNAPSHOT.jar


+ 3 - 0
seecoder-logTracking-consumer/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=seecoder-logTracking-consumer
+groupId=com.nju.edu
+version=1.0-SNAPSHOT

+ 2 - 0
seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,2 @@
+com\nju\edu\logTracking\LogConsumer$1.class
+com\nju\edu\logTracking\LogConsumer.class

+ 1 - 0
seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1 @@
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-consumer\src\main\java\com\nju\edu\logTracking\LogConsumer.java

+ 0 - 0
seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst


+ 0 - 0
seecoder-logTracking-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


BIN
seecoder-logTracking-consumer/target/seecoder-logTracking-consumer-1.0-SNAPSHOT.jar


+ 1 - 1
seecoder-logTracking-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seecoder-logTracking</artifactId>
         <groupId>com.nju.edu</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 3
seecoder-logTracking-server/target/classes/log4j.properties

@@ -1,3 +0,0 @@
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.maxBackupIndex=5
-log4j.appender.file.File=.\\bak.log

+ 3 - 0
seecoder-logTracking-server/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=seecoder-logTracking-server
+groupId=com.nju.edu
+version=1.0.RELEASE

+ 15 - 0
seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,15 @@
+com\nju\edu\logTracking\producer\publishMode\Log.class
+com\nju\edu\logTracking\controller\LogTrackingController.class
+com\nju\edu\logTracking\LogTrackingApplication.class
+com\nju\edu\logTracking\producer\level\LowLevel.class
+com\nju\edu\logTracking\service\impl\LogTrackingServiceImpl.class
+com\nju\edu\logTracking\web\Exception\ServiceException.class
+com\nju\edu\logTracking\producer\level\HighLevel.class
+com\nju\edu\logTracking\web\response\Response.class
+com\nju\edu\logTracking\producer\publishMode\BatchLog.class
+com\nju\edu\logTracking\producer\publishMode\SingleLog.class
+com\nju\edu\logTracking\service\impl\LogTrackingServiceImpl$1.class
+com\nju\edu\logTracking\producer\level\MediumLevel.class
+com\nju\edu\logTracking\producer\level\Level.class
+com\nju\edu\logTracking\web\Exception\ExceptionHandle.class
+com\nju\edu\logTracking\service\LogTrackingService.class

+ 14 - 0
seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,14 @@
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\LogTrackingApplication.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\level\LowLevel.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\controller\LogTrackingController.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\level\HighLevel.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\web\Exception\ServiceException.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\publishMode\Log.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\level\MediumLevel.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\publishMode\BatchLog.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\level\Level.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\service\impl\LogTrackingServiceImpl.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\web\Exception\ExceptionHandle.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\producer\publishMode\SingleLog.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\service\LogTrackingService.java
+D:\SEEC\SEEC-LogTracking\seecoder-logTracking-server\src\main\java\com\nju\edu\logTracking\web\response\Response.java

+ 0 - 0
seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst


+ 0 - 0
seecoder-logTracking-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst


BIN
seecoder-logTracking-server/target/seecoder-logTracking-server-1.0.RELEASE.jar