From 258ab7cdd419ee0c9687033510fb45b85786284e Mon Sep 17 00:00:00 2001
From: zhouzian <zhouzian@cmhi.chinamobile.com>
Date: Fri, 23 Aug 2019 15:21:06 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E6=B3=A8=E5=86=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=88=B0webserver?=
 =?UTF-8?q?=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9Azhouzian=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Azhouzia?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/src/lighttpd-1.4.51/src/mod_webm.c | 93 +++++++++++++++++++++----
 1 file changed, 79 insertions(+), 14 deletions(-)

diff --git a/libs/src/lighttpd-1.4.51/src/mod_webm.c b/libs/src/lighttpd-1.4.51/src/mod_webm.c
index 0485000c2..f5473f59f 100644
--- a/libs/src/lighttpd-1.4.51/src/mod_webm.c
+++ b/libs/src/lighttpd-1.4.51/src/mod_webm.c
@@ -23,11 +23,20 @@ typedef enum { WEBM_HANDLE_INVALID_INDEX = -1,
 		WEBM_HANDLE_LOGIN,
 		WEBM_HANDLE_HOMEPAGE,
 
-		/* ������ҳ��ȡ��չʾ��case�������������ܿ���ͨ�����ݿ��ѯ�������ȷŵ�һ�� */
+		/* ������ҳ��ȡ��չʾ��case�������������ܿ���ͨ�����ݿ��ѯ�������ȷŵ�һ�� */
 		WEBM_HANDLE_CONFIG_LIST_GROUP,
 		
-		/* ���������ò�����ص�case */
+		/* ���������ò�����ص�case */
 		WEBM_HANDLE_CONFIG_ADD_GROUP,
+		WEBM_HANDLE_CONFIG_UUID_GROUP,
+		WEBM_HANDLE_CONFIG_MOD_GROUP,
+
+		WEBM_HANDLE_CONFIG_ADD_USER,
+		WEBM_HANDLE_CONFIG_MODWEB_USER,
+		WEBM_HANDLE_CONFIG_MODGROUP_USER,
+		WEBM_HANDLE_CONFIG_LIST_USER,
+		WEBM_HANDLE_CONFIG_UUID_USER,
+		WEBM_HANDLE_CONFIG_DETAIL_USER,
 		WEBM_HANDLE_CONFIG_IPV4,
 		WEBM_HANDLE_MAX
 } webm_handle_index;
@@ -84,8 +93,8 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
 \
 	{\
 		WEBM_HANDLE_CONFIG_LIST_GROUP,  \
-		"/FSG-CF/um-group-showlist", 	   \
-		4,	\
+		"/FSG-GF/um-group-showlist", 	   \
+		CM_CONFIG_GET,	\
 		USER_MANAGER_CONFIG_GROUP,	\
 		webm_config_send_proc \
 	},\
@@ -98,6 +107,62 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
 		webm_config_send_proc \
 	},\
 \
+	{\
+		WEBM_HANDLE_CONFIG_UUID_GROUP,  \
+		"/FSG-GF/um-group-getgid",		   \
+		CM_CONFIG_GET,	\
+		USER_MANAGER_CONFIG_GROUP,  \
+		webm_config_send_proc \
+	},\
+	{\
+		WEBM_HANDLE_CONFIG_MOD_GROUP,  \
+		"/FSG-CF/um-group-mod",		   \
+		CM_CONFIG_SET,	\
+		USER_MANAGER_CONFIG_GROUP,  \
+		webm_config_send_proc \
+	},\
+		{\
+		WEBM_HANDLE_CONFIG_ADD_USER,  \
+		"/FSG-CF/um-user-add",		   \
+		CM_CONFIG_SET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
+		{\
+		WEBM_HANDLE_CONFIG_MODWEB_USER,  \
+		"/FSG-CF/um-user-mod",		   \
+		CM_CONFIG_SET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
+		{\
+		WEBM_HANDLE_CONFIG_MODGROUP_USER, \
+		"/FSG-CF/um-user-movegroup",		   \
+		CM_CONFIG_SET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
+		{\
+		WEBM_HANDLE_CONFIG_LIST_USER,  \
+		"/FSG-GF/um-user-showlist",		   \
+		CM_CONFIG_GET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
+		{\
+		WEBM_HANDLE_CONFIG_UUID_USER, \
+		"/FSG-GF/um-user-getgid",		   \
+		CM_CONFIG_GET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
+	{\
+		WEBM_HANDLE_CONFIG_DETAIL_USER, \
+		"/FSG-GF/um-user-getuser",		   \
+		CM_CONFIG_GET,	\
+		USER_MANAGER_CONFIG_USER,  \
+		webm_config_send_proc \
+	},\
 	{\
 		WEBM_HANDLE_CONFIG_IPV4,  \
 		"/ISG-CF/ipv4",           \
@@ -194,7 +259,7 @@ int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg_id, ch
 			mess_str = "";
 		}
 		
-		if (NULL == cJSON_AddStringToObject(root,"message","ϵͳ����"))
+		if (NULL == cJSON_AddStringToObject(root,"message","ϵͳ����"))
 		{
 			log_error_write(srv, __FILE__, __LINE__, "s", "json fail");
 			goto end;
@@ -284,9 +349,9 @@ int webm_login_proc(server *srv, uint32_t config_type, uint64 confg_id, char *da
 	int ret = 1;
 	mod_webm_plugin_data *p_d = point;
 
-	p_d = p_d;//�������澯��
-	confg_id = confg_id;//�������澯��
-	config_type = config_type;//�������澯��
+	p_d = p_d;//�������澯��
+	confg_id = confg_id;//�������澯��
+	config_type = config_type;//�������澯��
 
 	if (NULL == data_out)
 	{
@@ -347,10 +412,10 @@ int webm_homepage_ifstatus_proc(server *srv, uint32_t config_type, uint64 confg_
 	int ret = 1;
 	mod_webm_plugin_data *p_d = point;
 
-	p_d = p_d;//�������澯��
-	confg_id = confg_id;//�������澯��
-	data_in = data_in;//�������澯��
-	config_type = config_type;//�������澯��
+	p_d = p_d;//�������澯��
+	confg_id = confg_id;//�������澯��
+	data_in = data_in;//�������澯��
+	config_type = config_type;//�������澯��
 
 	if (NULL == data_out)
 	{
@@ -536,8 +601,8 @@ static handler_t mod_webm_uri_handler(server *srv, connection *con, void *p_d)
 SETDEFAULTS_FUNC(mod_webm_set_defaults) 
 {
 	mod_webm_plugin_data *p = p_d;
-	p = p;//�������澯��
-	srv = srv;//�������澯��
+	p = p;//�������澯��
+	srv = srv;//�������澯��
 
 	return HANDLER_GO_ON;
 }