2.3.0-rc2

Signed-off-by: owentou <owentou@tencent.com>

.gitignore

@@ -7,6 +7,7 @@
 # *.jar
 *.war
 *.ear
+*.log
 
 /.idea
 
@@ -16,8 +17,7 @@ hs_err_pid*
 /tools/nwjs_download_cache
 /tools/nwjs-build.sh
 
-
 # nodejs modules
 /node_modules
 /out
-/src/lib
+/src/lib

CHANGELOG.md

@@ -1,16 +1,28 @@
 更新记录
 ==========
 
+2.3.0-rc2
+------
+
+1. 增加 `--log-configure` 选项，用于指定log4js日志配置。增加默认的本地文件日志。
+2. 修复配置文件过大被拆分的BUG
+3. 更新依赖库
+
+  > + electron -> 14.0.0
+  > + bootstrap -> 5.1.0
+  > + jquery.fancytree -> 2.38.0
+  > + electron-packer -> 15.3.0
+
 2.3.0-rc1
 ------
 
 1. 更新依赖库
 
-  > electron -> 11.1.1
-  > bootstrap -> 5.0.0-beta1
-  > jquery.fancytree -> 2.37.0
-  > electron-packer -> 15.2.0
-  > popper.js 替换为 @popperjs/core
+  > + electron -> 11.1.1
+  > + bootstrap -> 5.0.0-beta1
+  > + jquery.fancytree -> 2.37.0
+  > + electron-packer -> 15.2.0
+  > + popper.js 替换为 @popperjs/core
 
 2. 增加命令行选项 ```--custom-selector/--custom-button <json文件名>``` 用于增加自定义选择器
 3. 允许事件可勾选是否执行

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 OWenT
+Copyright (c) 2021 xresloader
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xresconv-gui",
-  "version": "2.3.0-rc1",
+  "version": "2.3.0-rc2",
   "publisher": "owent",
   "description": "xresconv 批量转表工具-GUI\r ==========",
   "main": "src/setup.js",
@@ -19,10 +19,11 @@
     "bootstrap": "^5.1.0",
     "jquery": "^3.6.0",
     "jquery.fancytree": "^2.38.0",
+    "log4js": "^6.3.0",
     "minimatch": "^3.0.4"
   },
   "devDependencies": {
-    "electron": "^13.2.1",
+    "electron": "^14.0.0",
     "electron-packager": "^15.3.0",
     "gulp": "^4.0.2"
   },

src/log4js.json

@@ -0,0 +1,22 @@
+{
+  "appenders": {
+    "app": {
+      "type": "file",
+      "filename": "xresconv-gui.info.log",
+      "maxLogSize": 10485760,
+      "numBackups": 3
+    },
+    "errorFile": {
+      "type": "file",
+      "filename": "xresconv-gui.error.log"
+    },
+    "errors": {
+      "type": "logLevelFilter",
+      "level": "ERROR",
+      "appender": "errorFile"
+    }
+  },
+  "categories": {
+    "default": { "appenders": [ "app", "errors" ], "level": "DEBUG" }
+  }
+}