marge: 合并代码

2024-02-07 12:31:25 +08:00
parent 6d9123314c
commit d5f7a2077e
65 changed files with 2445 additions and 99 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ restagent/log/
 restagent/upload/
 restagent/software/
 restagent/database/
+restagent/license/
 restagent/restagent

 sshsvc/sshsvc
@@ -36,6 +37,7 @@ captrace/log/
 tools/loadmconf/loadmconf
 tools/loadpconf/loadpconf

+reference
 vendor

 # Built Visual Studio Code Extensions
@@ -43,5 +45,6 @@ vendor
 *.log
 *.log-*
 *.bak
+*.exe
 __debug_bin*.exe