From aaa812c654225f595f12a32bc7d56bcc225f3ee4 Mon Sep 17 00:00:00 2001
From: ChenLing <chenlinghy@cmhi.chinamobile.com>
Date: Mon, 1 Jul 2019 16:28:16 +0800
Subject: [PATCH] =?UTF-8?q?ADD=20=20aaa-12=20=20CONFIG=5FSERVICE=5FARRAY?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0portal=20server?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E5=85=8D=E8=AE=A4=E8=AF=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Achenling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configm/config-server/include/configm.h   | 33 ++++++++++++++++++-
 .../include/{configm.h.bak => configm.h.back} |  0
 2 files changed, 32 insertions(+), 1 deletion(-)
 rename Platform/user/configm/config-server/include/{configm.h.bak => configm.h.back} (100%)

diff --git a/Platform/user/configm/config-server/include/configm.h b/Platform/user/configm/config-server/include/configm.h
index 84ee91de8..41c643ccb 100644
--- a/Platform/user/configm/config-server/include/configm.h
+++ b/Platform/user/configm/config-server/include/configm.h
@@ -13,12 +13,23 @@
 /* USER MANAGER CONFIG */
 #define USER_MANAGER_CONFIG_MODULE 0x00000002
 
+/*PORTAL SERVER CONFIG */
+#define PORTAL_CONFIG_MODULE 0x00000003
+
+/* AUTHFREE CONFIG*/
+#define AUTHFREE_CONFIG_MODULE 0x00000004
+
+
+
 /* config id define*/
 #define IPCONFIG_V4 (uint64)((uint64)IPCONFIG_MODULE<<32|1)
 
 #define USER_MANAGER_CONFIG_GROUP (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|1)
 #define USER_MANAGER_CONFIG_USER (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|2)
 
+#define PORTALSERVER_CONFIG (uint64)((uint64)PORTAL_CONFIG_MODULE<<32|1)
+
+#define AUTHFREE_CONFIG (uint64)((uint64)AUTHFREE_CONFIG_MODULE<<32|1)
 /* 
    1、配置ID，全局唯一，用于寻找对应的配置业务
    2、配置源检查，全局唯一，用于寻找对应的配置业务,
@@ -51,7 +62,27 @@
         usergroup_config_proc,    \
         usergroup_config_get,     \
         usergroup_config_get_all  \
-    }\
+    },\
+    {\
+        PORTALSERVER_CONFIG,  \
+        CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,          \
+        FALSE,                    \
+        FALSE,                    \
+        portalserver_config_chk,     \
+        portalserver_config_proc,    \
+        portalserver_config_get,     \
+        portalserver_get_all  \
+    },\
+    {\
+        AUTHFREE_CONFIG,  \
+        CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
+        FALSE,                    \
+        FALSE,                    \
+        freeauth_config_chk,     \
+        freeauth_config_proc,    \
+        freeauth_config_get,     \
+        freeauth_config_get_all  \
+    },\
 }
 
 typedef ret_code (*cm_config_chk)(uint source, uint config_type,
diff --git a/Platform/user/configm/config-server/include/configm.h.bak b/Platform/user/configm/config-server/include/configm.h.back
similarity index 100%
rename from Platform/user/configm/config-server/include/configm.h.bak
rename to Platform/user/configm/config-server/include/configm.h.back