diff --git a/merlin/src/main/resources/initDoc.sh b/merlin/src/main/resources/initDoc.sh index 0a4e120..110e351 100644 --- a/merlin/src/main/resources/initDoc.sh +++ b/merlin/src/main/resources/initDoc.sh @@ -22,4 +22,5 @@ if [ ! -d "${SOURCE}/docs" ]; then fi mkdir -p ${TARGET}/docs -cp -r ${SOURCE}/docs/docs/zh ${TARGET}/docs/ \ No newline at end of file +cp -r ${SOURCE}/docs/docs/zh ${TARGET}/docs/ +cp -r ${SOURCE}/docs/docs/en ${TARGET}/docs/ \ No newline at end of file diff --git a/merlin/src/main/resources/log4j.properties b/merlin/src/main/resources/log4j.properties new file mode 100644 index 0000000..51c270a --- /dev/null +++ b/merlin/src/main/resources/log4j.properties @@ -0,0 +1,8 @@ +### #配置根Logger ### +log4j.rootLogger=INFO,stdout + +### 输出到控制台 ### +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=%d{yyy-MM-dd HH\:mm\:ss} %5p %c{1}\:%L - %m%n \ No newline at end of file