Merge remote-tracking branch 'origin/main' into multi-tenant

.gitignore

@@ -11,29 +11,18 @@
 .idea/
 
 # Run temp file and dir
-crontask/log/
-crontask/ftp/
-crontask/database/
-crontask/export/
-crontask/temp
-crontask/crontask
-
 restagent/backup/
 restagent/log/
 restagent/upload/
 restagent/software/
 restagent/database/
 restagent/license/
-restagent/restagent
 
 sshsvc/sshsvc
 sshsvc/mmllog/
 sshsvc/mmlhome/
 sshsvc/log/
 
-captrace/captrace
-captrace/log/
-
 tools/loadmconf/loadmconf
 tools/loadpconf/loadpconf