radius 网页以及bug修复

cust_data/web/unique/css/chunk-2085c22a.3ba553ce.css

@@ -0,0 +1 @@
+.row-item[data-v-60ce012e]{display:-webkit-box;line-height:40px}.row-item-title[data-v-60ce012e]{font-weight:700;padding-right:10px}.row-item-content[data-v-60ce012e]{width:50%;white-space:nowrap;word-wrap:normal;word-break:keep-all;text-overflow:ellipsis;overflow:hidden}.disabledEdit[data-v-60ce012e]{.el-form-item__content{pointer-events:none}}

cust_data/web/unique/i18n/i18n_deguo.js

@@ -494,5 +494,8 @@ const i18n_deguo= {
   "sygjzt":"Alarmstatus",
   "gjjg":"Alarmintervall(ms)",
   "gjsj":"Alarmzeit(s)",
+  "radiussz":"Radius-Konfiguration",
+  "bhyh":"Einwahlbenutzer",
+  "bhmm":"Wähltastencode"
 
 }

cust_data/web/unique/i18n/i18n_eguo.js

@@ -495,4 +495,7 @@ const i18n_eguo={
   "sygjzt":"Звуковая тревога.",
   "gjjg":"Интервал оповещения(ms)",
   "gjsj":"Время оповещения(s)",
+  "radiussz":"Конфигурация радиуса",
+  "bhyh":"абонент коммутируемого доступа",
+  "bhmm":"код набора"
 }

cust_data/web/unique/i18n/i18n_faguo.js

@@ -494,6 +494,8 @@ const i18n_faguo={
   "sygjzt":"Statut d'alerte sonore",
   "gjjg":"Intervalle d'alerte(ms)",
   "gjsj":"Temps d'alerte(s)",
-
+  "radiussz":"Configuration du rayon",
+  "bhyh":"utilisateur de numérotation",
+  "bhmm":"Code de numérotation"
 
 }

cust_data/web/unique/i18n/i18n_putaoya.js

@@ -494,7 +494,9 @@ const i18n_putaoya={
   "sygjzt":"Estado de alerta sonoro",
   "gjjg":"Intervalo de alerta(ms)",
   "gjsj":"Horário de alerta(s)",
-
+  "radiussz":"Configuração de Raio",
+  "bhyh":"utilizador de discagem",
+  "bhmm":"código de discagem"
 
 
 

cust_data/web/unique/i18n/i18n_riben.js

@@ -495,7 +495,9 @@ const i18n_riben={
   "sygjzt":"音声アラーム状態",
   "gjjg":"アラーム間隔(ms)",
   "gjsj":"アラーム時間(s)",
-
+  "radiussz":"Radius設定",
+  "bhyh":"ダイヤルアップユーザー",
+  "bhmm":"ダイヤルパスワード"
 
 
 }

cust_data/web/unique/i18n/i18n_xibanya.js

@@ -496,6 +496,8 @@ const i18n_xibanya={
   "gjjg":"Intervalo de alarma(ms)",
   "gjsj":"Tiempo de alarma(s)",
 
-
+  "radiussz":"Configuración de Radio",
+  "bhyh":"usuario de marcación",
+  "bhmm":"Contraseña de marcación"
 
 }

cust_data/web/unique/i18n/i18n_yidali.js

@@ -494,6 +494,9 @@ const i18n_yidali={
   "sygjzt":"Stato di allarme sonoro",
   "gjjg":"Intervallo di allarme(ms)",
   "gjsj":"Orario di allarme(s)",
+  "radiussz":"Configurazione del raggio",
+  "bhyh":"utente di dial-up",
+  "bhmm":"Password di chiamata"
 
 
 

cust_data/web/unique/i18n/i18n_yingguo.js

@@ -495,4 +495,7 @@ const i18n_yingguo={
   "sygjzt":"Sound alarm status",
   "gjjg":"Alarm interval(ms)",
   "gjsj":"Alarm Time(s)",
+  "radiussz":"Radius configuration",
+  "bhyh":"dial-up user",
+  "bhmm":"dial-up password"
 }

cust_data/web/unique/i18n/i18n_zh_CN.js

@@ -495,6 +495,9 @@ const i18n_zh_CN = {
   "sygjzt":"声音告警状态",
   "gjjg":"告警间隔(ms)",
   "gjsj1":"告警时间(s)",
+  "radiussz":"Radius配置",
+  "bhyh":"拨号用户",
+  "bhmm":"拨号密码"
 
 
 

pro/src/json_handle.c

@@ -780,6 +780,20 @@ char* user_routers_info_to_json(void)
     if(_GlobalMenuAuthority.FzszEnabled)cJSON_AddItemToObject(children6_data_array, "children", children6_data8_filed);
 
 
+    cJSON* children6_data9_filed = cJSON_CreateObject(); 
+    cJSON_AddStringToObject(children6_data9_filed,"name","Radiussz");    
+    cJSON_AddStringToObject(children6_data9_filed,"path","Radiussz");  
+    cJSON_AddBoolToObject(children6_data9_filed,"hidden",false); 
+    cJSON_AddStringToObject(children6_data9_filed,"component","fwgl/radiussz/index");  
+    cJSON* children6_meta9_data1_filed = cJSON_CreateObject(); 
+    cJSON_AddStringToObject(children6_meta9_data1_filed,"title",language_Radius_setting[dm->_globalDevInfo.product.language]);   
+    cJSON_AddStringToObject(children6_meta9_data1_filed,"icon","size");   
+    cJSON_AddBoolToObject(children6_meta9_data1_filed,"noCache",false); 
+    cJSON_AddStringToObject(children6_meta9_data1_filed,"link","");    
+    cJSON_AddItemToObject(children6_data9_filed, "meta", children6_meta9_data1_filed);
+    if(_GlobalMenuAuthority.RadiusEnabled)cJSON_AddItemToObject(children6_data_array, "children", children6_data9_filed);
+
+
     cJSON_AddItemToObject(data6_filed, "children", children6_data_array);
     if(_GlobalMenuAuthority.ServiceEnabled)cJSON_AddItemToObject(data_array, "data", data6_filed);
 

pro/src/language_common.c

@@ -461,6 +461,25 @@ const char* language_Group_setting[LANG_MAX] =
     "グループ設定",
 } ;
 
+
+
+
+const char * language_Radius_setting[LANG_MAX] =
+{
+    "Radius设置",   
+    "Radius settings",
+    "РНастройка радиуса",
+    "Réglage du rayon",
+    "RadiusEinstellung",
+    "Ajuste de radio",
+    "Configuração de raio",
+    "Impostazione del raggio",
+    "Radius設定",
+};
+
+
+
+
 const char* language_maintenance_equipment[LANG_MAX] =
 {
     "设备维护",

pro/src/language_common.h

@@ -105,4 +105,6 @@ extern const char* language_login_query_failed[LANG_MAX];
 extern const char* language_Broadcast_install[LANG_MAX];
 extern const char* language_Operation_Failed[LANG_MAX];
 extern const char * language_alarm_immerse[LANG_MAX];
+extern const char * language_Radius_setting[LANG_MAX];
+
 #endif

pro/src/radius.c

@@ -184,11 +184,7 @@ int radius_init()
         close (fd);
         sync();
     }
-    if(misc->radius == 0)
-    {
-        LOGD("radius status is close!!\n");
-        goto failed;
-    }
+    memset(temp,0,1024);
     fd = open(RADIUS_CONF,O_RDONLY,0777);
     if(fd < 0)
     {
@@ -200,9 +196,15 @@ int radius_init()
     close(fd);
 
     radius_get_config(temp,&radius);
+    if(misc->radius == 0)
+    {
+        LOGD("radius status is close!!\n");
+        goto failed;
+    }
+
     ////////////////////////////////////////////////////////////////
 
-    memset(temp,0,1024);
+
 
     sprintf(temp,"wpa_supplicant -i eth0 -c %s  -D wired -B",RADIUS_CONF);               
 
@@ -252,6 +254,7 @@ int radius_config(radius_config_t* cfg)
 {
     MiscInfo_t *misc=get_misc();
     radius.status = cfg->status;
+    misc->radius = radius.status;
     paras_save();
 
     if(cfg->status == 0)