tijiao

app/goahead-3.6.5/src/auth.c

@@ -540,7 +540,6 @@ static void loginServiceProc(Webs *wp)
     cJSON * data =  cJSON_CreateObject();
     cJSON_AddItemToObject(root, "data", data);//根节点下添加
     cJSON_AddStringToObject(root, "msg", "");
-    cJSON_AddNumberToObject(root, "code", 200);
     if (websLoginUser(wp, websGetVar(wp, "username", ""), websGetVar(wp, "password", ""))) {
         /* If the application defines a referrer session var, redirect to that */
         char *referrer;
@@ -550,21 +549,18 @@ static void loginServiceProc(Webs *wp)
         //     websRedirectByStatus(wp, HTTP_CODE_OK);
         // }
 
-         cJSON_AddNumberToObject(root, "code", 200);
-       
-        
-       
-
+        cJSON_AddNumberToObject(root, "code", 200);
         websSetSessionVar(wp, "loginStatus", "ok");
     } else {
         // if (route->askLogin) {
         //     (route->askLogin)(wp);
         // }
-        // websSetSessionVar(wp, "loginStatus", "failed");
+        websSetSessionVar(wp, "loginStatus", "failed");
         // websRedirectByStatus(wp, HTTP_CODE_UNAUTHORIZED);
          cJSON_AddNumberToObject(root, "code", 201);
     }
-
+    char *loginStatus = (char*) websGetSessionVar(wp, "loginStatus", 0);
+    printf(">>>>>>>>>>>>>>>>>%s<<<<<<<<<<<11<<<<<<<<<<loginStatus\n", loginStatus);
      pStr = cJSON_PrintUnformatted(root);
 
     printf("---> cJSON Str: %d \n%s\n", strlen(pStr), pStr);

app/goahead-3.6.5/src/goahead.c

@@ -233,8 +233,7 @@ websDefineAction("restoreFactorySettings", restoreFactorySettings);
 websDefineAction("web_ResetBMC", web_ResetBMC);
 websDefineAction("web_GetLanInfo", web_GetLanInfo);
 websDefineAction("web_SetLanInfo", web_SetLanInfo);
-
-
+websDefineAction("checkLoginStatus", checkLoginStatus);
 /**************** user code after goahead end************************/
 
 #if ME_UNIX_LIKE && !MACOSX

app/goahead-3.6.5/src/web/static/css/index.css

@@ -1 +1 @@
-.head-contener[data-v-b4a4d200]{width:1180px;height:125px;margin:0 auto}.logo-box[data-v-b4a4d200]{float:left;width:184px;height:23px;margin-top:16px}.logo-line[data-v-b4a4d200]{float:left;height:54px;width:1px;background:#77adff;margin-left:12px}.logo-text[data-v-b4a4d200]{float:left;margin-left:12px;font-size:14px;display:-webkit-box;display:-ms-flexbox;display:flex}.logo-title[data-v-b4a4d200]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px}.logo-subtitle[data-v-b4a4d200]{color:#77adff;font-size:12px;height:14px;margin-left:5px;margin-top:31px}.logo-table[data-v-b4a4d200]{position:relative;padding-top:37px}.userDetails[data-v-b4a4d200]{font-size:12px;color:#fff;height:48px;line-height:48px;padding-left:20px;padding-right:20px;background:rgba(24,116,255,.1);border-bottom-left-radius:3px;border-bottom-right-radius:3px;position:absolute;right:0;top:0;color:#77adff}.userDetails img[data-v-b4a4d200]{width:12px;position:relative;margin-right:3px;margin-left:3px;height:12px}.userDetails a[data-v-b4a4d200]{padding-left:15px;text-decoration:none;color:#77adff}.menu-contente[data-v-eb3e1cb0]{width:1180px;margin-left:auto;margin-right:auto}.dashbord-contanier[data-v-6f96fa40]{margin:10 auto}.content[data-v-6f96fa40]{width:1200px;margin:10px auto;height:800px;overflow-y:scroll;overflow-x:hidden}
+.head-contener[data-v-20411ab2]{width:1180px;height:125px;margin:0 auto}.logo-box[data-v-20411ab2]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px;float:left;width:113px;height:23px}.logo-box img[data-v-20411ab2]{width:114px}.logo-line[data-v-20411ab2]{float:left;height:54px;width:1px;background:#77adff;margin-left:12px}.logo-text[data-v-20411ab2]{float:left;margin-left:12px;font-size:14px;display:-webkit-box;display:-ms-flexbox;display:flex}.logo-title[data-v-20411ab2]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px}.logo-subtitle[data-v-20411ab2]{color:#77adff;font-size:12px;height:14px;margin-left:5px;margin-top:31px}.logo-table[data-v-20411ab2]{position:relative;padding-top:37px}.userDetails[data-v-20411ab2]{font-size:12px;color:#fff;height:48px;line-height:48px;padding-left:20px;padding-right:20px;background:rgba(24,116,255,.1);border-bottom-left-radius:3px;border-bottom-right-radius:3px;position:absolute;right:0;top:0;color:#77adff}.userDetails img[data-v-20411ab2]{width:12px;position:relative;margin-right:3px;margin-left:3px;height:12px}.userDetails a[data-v-20411ab2]{padding-left:15px;text-decoration:none;color:#77adff}.menu-contente[data-v-eb3e1cb0]{width:1180px;margin-left:auto;margin-right:auto}.dashbord-contanier[data-v-6f96fa40]{margin:10 auto}.content[data-v-6f96fa40]{width:1200px;margin:10px auto;height:800px;overflow-y:scroll;overflow-x:hidden}

app/goahead-3.6.5/src/web/static/css/login.css

@@ -1 +1 @@
-.head-contener[data-v-b4a4d200]{width:1180px;height:125px;margin:0 auto}.logo-box[data-v-b4a4d200]{float:left;width:184px;height:23px;margin-top:16px}.logo-line[data-v-b4a4d200]{float:left;height:54px;width:1px;background:#77adff;margin-left:12px}.logo-text[data-v-b4a4d200]{float:left;margin-left:12px;font-size:14px;display:-webkit-box;display:-ms-flexbox;display:flex}.logo-title[data-v-b4a4d200]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px}.logo-subtitle[data-v-b4a4d200]{color:#77adff;font-size:12px;height:14px;margin-left:5px;margin-top:31px}.logo-table[data-v-b4a4d200]{position:relative;padding-top:37px}.userDetails[data-v-b4a4d200]{font-size:12px;color:#fff;height:48px;line-height:48px;padding-left:20px;padding-right:20px;background:rgba(24,116,255,.1);border-bottom-left-radius:3px;border-bottom-right-radius:3px;position:absolute;right:0;top:0;color:#77adff}.userDetails img[data-v-b4a4d200]{width:12px;position:relative;margin-right:3px;margin-left:3px;height:12px}.userDetails a[data-v-b4a4d200]{padding-left:15px;text-decoration:none;color:#77adff}.login-context[data-v-e932024c]{height:250px;width:450px;margin:0 auto;margin-top:180px;padding:30px;border-radius:7px}.tips-attion[data-v-e932024c]{margin-top:30px;color:#fff}.tips-attion h3[data-v-e932024c]{font-size:14px}.tips-attion h2[data-v-e932024c]{font-size:15px}.tips-attion ul li[data-v-e932024c]{height:28px;font-size:13px}.tips-attion ul li img[data-v-e932024c]{padding-left:4px;position:relative;width:20px}.login-context[data-v-e932024c] .ivu-form-item-label{color:#fff}
+.head-contener[data-v-20411ab2]{width:1180px;height:125px;margin:0 auto}.logo-box[data-v-20411ab2]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px;float:left;width:113px;height:23px}.logo-box img[data-v-20411ab2]{width:114px}.logo-line[data-v-20411ab2]{float:left;height:54px;width:1px;background:#77adff;margin-left:12px}.logo-text[data-v-20411ab2]{float:left;margin-left:12px;font-size:14px;display:-webkit-box;display:-ms-flexbox;display:flex}.logo-title[data-v-20411ab2]{font-size:28px;color:#fff;font-weight:700;line-height:41px;margin-top:9px}.logo-subtitle[data-v-20411ab2]{color:#77adff;font-size:12px;height:14px;margin-left:5px;margin-top:31px}.logo-table[data-v-20411ab2]{position:relative;padding-top:37px}.userDetails[data-v-20411ab2]{font-size:12px;color:#fff;height:48px;line-height:48px;padding-left:20px;padding-right:20px;background:rgba(24,116,255,.1);border-bottom-left-radius:3px;border-bottom-right-radius:3px;position:absolute;right:0;top:0;color:#77adff}.userDetails img[data-v-20411ab2]{width:12px;position:relative;margin-right:3px;margin-left:3px;height:12px}.userDetails a[data-v-20411ab2]{padding-left:15px;text-decoration:none;color:#77adff}.login-context[data-v-9e17c252]{height:250px;width:450px;margin:0 auto;margin-top:180px;padding:30px;border-radius:7px}.tips-attion[data-v-9e17c252]{margin-top:30px;color:#fff}.tips-attion h3[data-v-9e17c252]{font-size:14px}.tips-attion h2[data-v-9e17c252]{font-size:15px}.tips-attion ul li[data-v-9e17c252]{height:28px;font-size:13px}.tips-attion ul li img[data-v-9e17c252]{padding-left:4px;position:relative;width:20px}.login-context[data-v-9e17c252] .ivu-form-item-label{color:#fff}

app/goahead-3.6.5/src/web_interface/inc/user.h

@@ -8,5 +8,5 @@ void addUser(Webs *wp);
 void setUserPassword(Webs *wp);
 void getAllUserInfo(Webs *wp);
 void delUser(Webs *wp);
-
+void checkLoginStatus(Webs *wp);
 #endif

app/goahead-3.6.5/src/web_interface/src/user.c

@@ -266,6 +266,35 @@ void delUser(Webs *wp){
     websFlush(wp, 0);
     websDone(wp);
 
+    if(pStr)
+        wfree(pStr);
+    if(root)
+        cJSON_Delete(root);
+}
+
+
+void checkLoginStatus(Webs *wp){
+    char *loginStatus = (char*) websGetSessionVar(wp, "loginStatus", 0);
+    printf(">>>>>>>>>>>>>>>>>%s<<<<<<<<<<<<<<<<<<<<<loginStatus\n", loginStatus);
+
+    char *pStr;
+    cJSON * root =  cJSON_CreateObject();
+    cJSON * data =  cJSON_CreateObject();
+    cJSON_AddItemToObject(root, "data", data);//根节点下添加
+    cJSON_AddStringToObject(root, "msg", "");
+    cJSON_AddNumberToObject(root, "code", 200);
+    cJSON_AddStringToObject(data, "loginStatus", loginStatus);
+   
+    pStr = cJSON_PrintUnformatted(root);
+
+    printf("---> cJSON Str:\n%s\n", pStr);
+    websSetStatus(wp, 200);
+    websWriteHeaders(wp, -1, 0);
+    websWriteEndHeaders(wp); 
+    websWrite(wp,"%s", pStr);
+    websFlush(wp, 0);
+    websDone(wp);
+
     if(pStr)
         wfree(pStr);
     if(root)

gd32450i-eval.initramfs

@@ -173,7 +173,6 @@ file /var/www/goahead/static/img/crit.png ${INSTALL_ROOT}/projects/${SAMPLE}/app
 file /var/www/goahead/static/img/helpicon.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/helpicon.png 755 0 0
 file /var/www/goahead/static/img/icon_right.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/icon_right.png 755 0 0
 file /var/www/goahead/static/img/ionicons.svg ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/ionicons.svg 755 0 0
-file /var/www/goahead/static/img/logo.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/logo.png 755 0 0
 file /var/www/goahead/static/img/logout_1.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/logout_1.png 755 0 0
 file /var/www/goahead/static/img/ok.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/ok.png 755 0 0
 file /var/www/goahead/static/img/print_1.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/img/print_1.png 755 0 0
@@ -202,4 +201,3 @@ file /var/www/goahead/static/js/set_proctrol.js ${INSTALL_ROOT}/projects/${SAMPL
 file /var/www/goahead/static/js/system_logs.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/js/system_logs.js 755 0 0
 file /var/www/goahead/static/js/UploadProgre.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/js/UploadProgre.js 755 0 0
 file /var/www/goahead/static/js/UserManage.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-3.6.5/src/web/static/js/UserManage.js 755 0 0
-