Authored by zhangmingm

Merge branch 'master' of http://101.201.115.224/guizhou-monitorV2.0.1/agent into master_zmm

1 -ip=127.0.0.1  
2 -port=162  
3 -swap_path=D://  
4 -trap_config_path=trap_config  
5 -error_file_path=D://error