Merge remote-tracking branch 'origin/master'

Author: OptiJava

README-en.md

@@ -51,29 +51,23 @@ adding dozens of jar packages at once when using gradle)
 9.Class, method and other information output in the log is absolutely accurate, because optilog uses stacktrace to
 determine this information internally, and there is no need to write the class instance when initializing the log
 
-10.optilog can directly generate a default configuration file. Beginners do not need to look for configuration file
+10.Optilog can directly generate a default configuration file. Beginners do not need to look for configuration file
 examples
 
-11.Support configuration files in multiple formats, including JSON, XML and properties. Support for yaml and toml
-configuration files will be added later
+11.Support configuration files in multiple formats, including JSON, XML and properties. Support for toml
+configuration files will be added later(Yaml was supported at latest commit)
 
 # Defects of optilog
 
 1. No JDBC support
 
-2. XML configuration files are not supported <- in the latest submission, optilog already supports XML format
-   configuration files
-
-3. The configuration of file output path is relatively troublesome <- this defect has been solved, and the defects of
-   optilog will be solved one after another
-
 # Optilog log picture:
 
 ![image](https://user-images.githubusercontent.com/106148777/170864247-7da18dd5-f5b9-4e5c-aee7-4174d29a8969.png)
 
 # Dependency:
 
-`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper:9.0.26`
+`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper:9.0.26`(You needn't add dependency if you don't use these function.)
 
 # Author:
 
@@ -85,6 +79,4 @@ JavauserO
 
 # Future plans
 
-add support for XML format configuration files (implemented)
-
 realize remote call

README.md

@@ -42,27 +42,23 @@ _如果你愿意，欢迎Fork这个仓库为Optilog做出贡献，本项目的
 
 10.Optilog可以直接生成一个默认的配置文件，初学者不用找配置文件范例
 
-11.支持多种格式的配置文件，包括json,xml和properties，后续还会增加对yaml和toml配置文件的支持
+11.支持多种格式的配置文件，包括json,xml和properties，后续还会增加对toml配置文件的支持（在最新的提交中，OptilogClient已经支持yaml格式配置文件，使用还是看wiki）
 
 12.Optilog支持在运行期修改配置，当然只能修改true和false的一些配置项，输出文件路径什么的不能修改
 
 # Optilog的缺陷
 
 1.没有对jdbc的支持
 
-2.不支持xml配置文件  <-在最新的提交中，Optilog已经支持xml格式配置文件
-
-3.文件输出路径的配置相对麻烦    <-这个缺陷已经解决了，Optilog的缺陷将会陆续解决
-
 # Optilog输出日志预览：
 
 ~~"输出十分整齐"~~
 ![image](https://user-images.githubusercontent.com/106148777/170864247-7da18dd5-f5b9-4e5c-aee7-4174d29a8969.png)
 
 # Dependency:
 
-`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper:9.0.26`(
-Tomcat依赖如果你不用的话可以没有，如果你只用properties作为配置文件的话Gson和Jackson也可以不加)
+`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper-9.0.26` `snakeyaml-1.3.0`(
+Tomcat依赖如果你不用的话可以没有，如果你只用properties作为配置文件的话Gson，Jackson，snakeyaml也可以不加)
 
 # Author:
 
@@ -74,6 +70,4 @@ Tomcat依赖如果你不用的话可以没有，如果你只用properties作为
 
 # 未来计划
 
-1.添加对xml格式配置文件的支持（已实现）
-\
-2.实现远程调用
+1.实现远程调用