Skip to content
This repository has been archived by the owner on Jan 9, 2024. It is now read-only.

Commit

Permalink
1. upgrade to Java11
Browse files Browse the repository at this point in the history
2. use log4j2
  • Loading branch information
vran-dev committed Oct 11, 2019
1 parent 5239f9a commit a673474
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 39 deletions.
53 changes: 43 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,44 @@
plugins {
id 'java'
id 'war'
id 'application'
id 'org.springframework.boot' version '2.1.7.RELEASE' apply true
id 'idea'
id 'org.openjfx.javafxplugin' version '0.0.8'
id 'org.beryx.jlink' version '2.16.0'
id "io.freefair.lombok" version "4.1.2"
}


group 'cc.c1234'
version '0.1.7'
version '0.1.8'

sourceCompatibility = 1.8
sourceCompatibility = 11

bootJar {
mainClassName = 'cc.cc1234.main.PrettyZooApplication'
idea {
module {
inheritOutputDirs = true
}
}
lombok {
version = "1.18.10"
}

javafx {
version = "11.0.2"
modules = ['javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.base']
}

mainClassName = "PrettyZoo.main/cc.cc1234.main.PrettyZooApplication"
jlink {
options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
addExtraDependencies("javafx")
forceMerge("jackson", "log4j-api")
launcher {
name = 'prettyZoo'
}
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

repositories {
Expand All @@ -26,17 +52,24 @@ dependencies {
compile('org.apache.curator:curator-recipes:4.2.0') {
exclude group: 'org.apache.zookeeper', module: 'zookeeper'
}

compile ('org.apache.zookeeper:zookeeper:3.4.6') {
exclude group: 'junit', module: 'junit'
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'io.netty', module: 'netty'
exclude group: 'log4j', module: 'log4j'
}

compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28'
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'

compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.1'
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.1'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.1'

compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.0'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.0'
compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10'
compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2'
compile group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.3.1.Final'

testCompile group: 'junit', name: 'junit', version: '4.12'
}
2 changes: 2 additions & 0 deletions lombok.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This file is generated by the 'io.freefair.lombok' Gradle plugin
config.stopBubbling = true
23 changes: 23 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
open module PrettyZoo.main {
requires static lombok;
requires javafx.fxml;
requires javafx.graphics;
requires javafx.controls;
requires curator.framework;
requires curator.recipes;
requires curator.client;
requires zookeeper;
requires org.slf4j;
requires log4j.slf4j.impl;
requires org.apache.logging.log4j;
requires org.apache.logging.log4j.core;
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
requires com.google.common;
requires richtextfx;
requires flowless;
exports cc.cc1234.main;
uses org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory;
uses org.apache.logging.log4j.spi.Provider;
uses org.apache.logging.log4j.util.PropertySource;
}
30 changes: 30 additions & 0 deletions src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<configuration status="debug" monitorInterval="30">
<!-- 先定义所有的appender -->
<appenders>
<!-- 这个输出控制台的配置 -->
<Console name="Console" target="SYSTEM_OUT">
<!-- 控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch) -->
<!-- <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>-->
<PatternLayout pattern="[%d{HH:mm:ss.SSS}] [%-5p] %l - %m%n"/>
</Console>

<!-- 这个会打印出所有的信息,每次大小超过size,则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩,作为存档 -->
<RollingFile name="RollingFile" fileName="${sys:user.home}/.prettyZoo/pretty.log"
filePattern="${user.home}/.prettyZoo/prettyZoo.%d{yyyy-MM-dd}.log">
<PatternLayout pattern="[%d{yyyy-MM-dd 'at' HH:mm:ss z}] [%-5p] %l - %m%n"/>
<TimeBasedTriggeringPolicy interval="1"/>
</RollingFile>
</appenders>

<loggers>
<logger name="cc.cc1234.main" level="DEBUG"></logger>
<!-- 建立一个默认的root的logger -->
<root level="INFO">
<appender-ref ref="RollingFile"/>
<appender-ref ref="Console"/>
</root>

</loggers>
</configuration>
29 changes: 0 additions & 29 deletions src/main/resources/logback.xml

This file was deleted.

0 comments on commit a673474

Please sign in to comment.