!14 merlin数据导入英文、添加日志配置文件

Merge pull request !14 from 李凡/master
opensourceways · Apr 29, 2024 · 0fec4d2 · 0fec4d2
2 parents 1a07c82 + 9cb27ad
commit 0fec4d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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/
+cp -r ${SOURCE}/docs/docs/zh ${TARGET}/docs/
+cp -r ${SOURCE}/docs/docs/en ${TARGET}/docs/
diff --git a/merlin/src/main/resources/log4j.properties 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