zhanglianghy 2b50b3b181 Merge branch 'master' of http://git.komect.net/ISG/secogateway ... # Conflicts: # Platform/user/configm/config-server/include/configm.h		2019-08-27 11:50:47 +08:00
..
dhcp_config	Add aaa-12 添加dhcp模块	2019-08-21 18:32:05 +08:00
include	Merge branch 'master' of http://git.komect.net/ISG/secogateway	2019-08-27 11:50:47 +08:00
log_config	Add aaa-12 支持日志文件配置、获取console配置、获取tty配置、获取远端服务器日志配置	2019-08-27 08:49:47 +08:00
nat_config	MOD aaa-12 添加nat配置管理模块	2019-08-21 19:42:12 +08:00
netconfig	MOD aaa-12 修改返回值json格式	2019-08-27 11:36:32 +08:00
user_manager_config	Mod aaa-12 新增用户管理配置恢复、修改数据库连接	2019-08-23 14:12:49 +08:00
vlan_config	Add aaa-12 添加VLAN转发模块功能代码	2019-08-26 01:28:51 -07:00
web_config	Mod aaa-12 修改配置文件-未认证权限、认证参数	2019-08-27 10:38:00 +08:00
configserver.c	MOD aaa-12 修改返回值json格式	2019-08-27 11:36:32 +08:00