Merge branch 'dev' of https://gogs.storlead.com/lusa/gd32450i-eval into dev

app/goahead-5.1.0/src/route.c

@@ -165,7 +165,7 @@ PUBLIC void websRouteRequest(Webs *wp)
         wp->route = route;
          logmsg(2,"-----------------------11-----------------------");
 #if ME_GOAHEAD_AUTH
-        logmsg(2,"-----------------------22------------%#X-----------", route->authType);
+        logmsg(2,"-----------------------22-----111-------%#X-----------", route->authType);
         if (route->authType) {
             // personInfoAction(wp);// 
             logmsg(2,"-----------------------33--444---------------------");

app/goahead-5.1.0/src/route.txt

@@ -64,6 +64,7 @@ route uri=/secure/ protocol=http redirect=https handler=redirect
 #
 route uri=/cgi-bin handler=cgi
 route uri=/action handler=action 
+route uri=/static
 route uri=/ methods=OPTIONS|TRACE handler=options
 route uri=/ extensions=jst,asp handler=jst
 

app/goahead-5.1.0/src/web_interface/src/dashboard.c

@@ -50,7 +50,7 @@ void getDeviceInfo(Webs *wp){
         }
         else
         {
-            sprintf(MacAddr, "%02x:%02x:%02x:%02x:%02x:%02x\n",
+            sprintf(MacAddr, "%02x:%02x:%02x:%02x:%02x:%02x",
                     (unsigned char)ifreq.ifr_hwaddr.sa_data[0],
                     (unsigned char)ifreq.ifr_hwaddr.sa_data[1],
                     (unsigned char)ifreq.ifr_hwaddr.sa_data[2],
@@ -100,8 +100,8 @@ void getDeviceInfo(Webs *wp){
     cJSON_AddItemToObject(root, "code", cJSON_CreateString("200"));
     cJSON_AddStringToObject(data, "buildTime", BuildTime);
     cJSON_AddStringToObject(data, "fwVersion", FwVersion);
-    cJSON_AddStringToObject(data, "macAddr", BuildTime);
-    cJSON_AddStringToObject(data, "ipAddr", FwVersion);
+    cJSON_AddStringToObject(data, "macAddr", MacAddr);
+    cJSON_AddStringToObject(data, "ipAddr", IpAddr);
 
     pStr = cJSON_Print(root);
 

gd32450i-eval.initramfs

@@ -145,12 +145,12 @@ file /var/www/goahead/static/css/login.css ${INSTALL_ROOT}/projects/${SAMPLE}/ap
 file /var/www/goahead/static/css/sensor_history.css ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/css/sensor_history.css 755 0 0
 file /var/www/goahead/static/css/set_proctrol.css ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/css/set_proctrol.css 755 0 0
 file /var/www/goahead/static/css/system_logs.css ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/css/system_logs.css 755 0 0
-file /var/www/goahead/static/fonts/ionicons.143146fa.woff2 ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.143146fa.woff2 755 0 0
-file /var/www/goahead/static/fonts/ionicons.99ac3308.woff ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.99ac3308.woff 755 0 0
-file /var/www/goahead/static/fonts/ionicons.d535a25a.ttf ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.d535a25a.ttf 755 0 0
-file /var/www/goahead/static/img/bg1.9f8ed6c0.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/bg1.9f8ed6c0.png 755 0 0
-file /var/www/goahead/static/img/ionicons.a2c4a261.svg ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/ionicons.a2c4a261.svg 755 0 0
-file /var/www/goahead/static/img/logo.762a400a.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/logo.762a400a.png 755 0 0
+file /var/www/goahead/static/fonts/ionicons.woff2 ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.woff2 755 0 0
+file /var/www/goahead/static/fonts/ionicons.woff ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.woff 755 0 0
+file /var/www/goahead/static/fonts/ionicons.ttf ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/fonts/ionicons.ttf 755 0 0
+file /var/www/goahead/static/img/bg1.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/bg1.png 755 0 0
+file /var/www/goahead/static/img/ionicons.svg ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/ionicons.svg 755 0 0
+file /var/www/goahead/static/img/logo.png ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/img/logo.png 755 0 0
 file /var/www/goahead/static/js/app.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/js/app.js 755 0 0
 file /var/www/goahead/static/js/BSODScreen.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/js/BSODScreen.js 755 0 0
 file /var/www/goahead/static/js/chunk-vendors.js ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/web/static/js/chunk-vendors.js 755 0 0