5 年之前 · 795e949ce9
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,5 +1,5 @@
 
															 all	: 
														
 
															-	make -C ./web
														
 
															+	make -C ./goahead-5.1.0
														
 
															 #	apps modules test_apps
														
 
															 clean	: clean_apps clean_modules clean_test_apps
														
--- a/app/goahead-5.1.0/build/linux-arm-static/.install-certs-modified
+++ b/app/goahead-5.1.0/build/linux-arm-static/.install-certs-modified
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/goahead-test
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/goahead-test
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/goahead-test.gdb
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/goahead-test.gdb
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/goahead.gdb
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/goahead.gdb
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/gopass
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/gopass
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/gopass.gdb
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/gopass.gdb
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/libgo.a
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/libgo.a
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/libgoahead-mbedtls.a
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/libgoahead-mbedtls.a
--- a/app/goahead-5.1.0/build/linux-arm-static/bin/libmbedtls.a
+++ b/app/goahead-5.1.0/build/linux-arm-static/bin/libmbedtls.a
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/action.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/action.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/alloc.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/alloc.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/auth.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/auth.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/cgi.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/cgi.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/crypt.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/crypt.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/file.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/file.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/fs.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/fs.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/goahead-mbedtls.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/goahead-mbedtls.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/goahead.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/goahead.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/gopass.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/gopass.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/http.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/http.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/js.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/js.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/jst.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/jst.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/mbedtls.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/mbedtls.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/options.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/options.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/osdep.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/osdep.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/rom.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/rom.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/route.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/route.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/runtime.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/runtime.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/socket.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/socket.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/test.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/test.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/time.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/time.o
--- a/app/goahead-5.1.0/build/linux-arm-static/obj/upload.o
+++ b/app/goahead-5.1.0/build/linux-arm-static/obj/upload.o
--- a/app/goahead-5.1.0/src/action.c
+++ b/app/goahead-5.1.0/src/action.c
@@ -119,6 +119,8 @@ PUBLIC void websFooter(Webs *wp)
 
															 }
														
 
															 #endif
														
 
															+
														
 
															+
														
 
															 /*
														
 
															     Copyright (c) Embedthis Software. All Rights Reserved.
														
 
															     This software is distributed under commercial and open source licenses.
														
--- a/app/goahead-5.1.0/src/goahead.c
+++ b/app/goahead-5.1.0/src/goahead.c
@@ -38,10 +38,94 @@ static LRESULT CALLBACK websWindProc(HWND hwnd, UINT msg, UINT wp, LPARAM lp);
 
															 static void sigHandler(int signo);
														
 
															 #endif
														
 
															+static void buy(Webs *wp);
														
 
															+static void actionTest(Webs *wp);
														
 
															+static void personInfoAction(Webs *wp);
														
 
															+
														
 
															+
														
 
															+typedef struct PERSON
														
 
															+{
														
 
															+  char *name;
														
 
															+  int age;
														
 
															+  char *gender;
														
 
															+}Person;
														
 
															+
														
 
															+
														
 
															+
														
 
															+static void personInfoAction(Webs *wp)
														
 
															+{
														
 
															+    logmsg(2, "-----------------------111----------------------");
														
 
															+    int i; 
														
 
															+    Person person[2];
														
 
															+    person[0].name = "kangkang";
														
 
															+    person[0].age = 12;
														
 
															+    person[0].gender = "male";
														
 
															+    person[1].name = "Jane";
														
 
															+    person[1].age = 14;
														
 
															+    person[1].gender = "female";
														
 
															+
														
 
															+   websSetStatus(wp, 200);
														
 
															+   websWriteHeaders(wp, -1, 0);
														
 
															+   websWriteEndHeaders(wp);
														
 
															+
														
 
															+    websWrite(wp, "[");
														
 
															+     for (i = 0;i < 2; i++)
														
 
															+     {
														
 
															+      
														
 
															+      websWrite(wp, "       {\"name\":\"%s\",\"age\":\"%d\",\"gender\":\"%s\"}",
														
 
															+       person[i].name, person[i].age, person[i].gender);
														
 
															+      if (i != 1)
														
 
															+      {
														
 
															+       websWrite(wp, ",");
														
 
															+      }
														
 
															+      
														
 
															+     }
														
 
															+     websWrite(wp, "]");
														
 
															+     websDone(wp);
														
 
															+}
														
 
															+
														
 
															+
														
 
															+static void buy(Webs *wp)
														
 
															+{
														
 
															+    char    *name, *age;
														
 
															+    name = websGetVar(wp, "name", NULL);
														
 
															+    age = websGetVar(wp, "age", NULL);
														
 
															+     logmsg(2, "---------------------------------------------");
														
 
															+    logmsg(2, "name value is : %s", name );
														
 
															+     logmsg(2, "age value is : %s", age );
														
 
															+    websSetStatus(wp, 200);
														
 
															+    websWriteHeaders(wp, 0, 0);
														
 
															+    websWriteEndHeaders(wp);
														
 
															+    websWrite(wp, "Name %s", name); 
														
 
															+    websWrite(wp,  "Age %s", age);
														
 
															+    websFlush(wp, 0);
														
 
															+    websDone(wp);
														
 
															+}
														
 
															+
														
 
															+
														
 
															+
														
 
															+/*
														
 
															+    Implement /action/actionTest. Parse the form variables: name, address and echo back.
														
 
															+ */
														
 
															+static void actionTest(Webs *wp)
														
 
															+{
														
 
															+    cchar   *name, *address;
														
 
															+
														
 
															+    name = websGetVar(wp, "name", NULL);
														
 
															+    address = websGetVar(wp, "address", NULL);
														
 
															+    websSetStatus(wp, 200);
														
 
															+    websWriteHeaders(wp, -1, 0);
														
 
															+    websWriteEndHeaders(wp);
														
 
															+    websWrite(wp, "<html><body><h2>name: %s, address: %s</h2></body></html>\n", name, address);
														
 
															+    websFlush(wp, 0);
														
 
															+    websDone(wp);
														
 
															+}
														
 
															+
														
 
															 /*********************************** Code *************************************/
														
 
															 MAIN(goahead, int argc, char **argv, char **envp)
														
 
															 {
														
 
															+   
														
 
															     char    *argp, *home, *documents, *endpoints, *endpoint, *route, *auth, *tok, *lspec;
														
 
															     int     argind;
														
 
															 	logmsg(2, "---> log1\n");
														
@@ -151,6 +235,13 @@ MAIN(goahead, int argc, char **argv, char **envp)
 
															      */
														
 
															     websAddRoute("/", "file", 0);
														
 
															 #endif
														
 
															+
														
 
															+//add by lusa start 
														
 
															+        websDefineAction("buy", buy);
														
 
															+        websDefineAction("test", actionTest);
														
 
															+        websDefineAction("person", personInfoAction);
														
 
															+        
														
 
															+// add by lusa end 
														
 
															 #ifdef GOAHEAD_INIT
														
 
															     /*
														
 
															         Define your init function in main.me goahead.init, or
														
--- a/app/goahead-5.1.0/src/web/index.html
+++ b/app/goahead-5.1.0/src/web/index.html
@@ -1 +1,36 @@
 
															-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>bmc-ui</title><link href=/static/css/app.css rel=preload as=style><link href=/static/js/app.js rel=preload as=script><link href=/static/js/chunk-vendors.js rel=preload as=script><link href=/static/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but bmc-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.js></script><script src=/static/js/app.js></script></body></html>
														
 
															+ <p>Please log in</p>

														
 
															+    <form action=/action/test method="post">

														
 
															+        <table>

														
 
															+        <tr><td>账号:</td><td><input type="text" name="name"></td></tr>

														
 
															+        <tr><td>密码:</td><td><input type="password" name="address"></td></tr>

														
 
															+        <tr><td><input type="submit" name="submit" value="submit"></td>

														
 
															+            <td><input type="reset" value="reset"></td></tr>

														
 
															+        </table>

														
 
															+    </form>

														
 
															+    

														
 
															+    <script type="text/javascript">

														
 
															+    function loadXMLDoc()

														
 
															+    {

														
 
															+        var xmlhttp;

														
 
															+        if (window.XMLHttpRequest)

														
 
															+          {// code for IE7+, Firefox, Chrome, Opera, Safari

														
 
															+              xmlhttp=new XMLHttpRequest();

														
 
															+          }

														
 
															+        else

														
 
															+          {// code for IE6, IE5

														
 
															+              xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");

														
 
															+          }

														
 
															+        xmlhttp.onreadystatechange=function()

														
 
															+          {

														
 
															+              if (xmlhttp.readyState==4 && xmlhttp.status==200)

														
 
															+            {

														
 
															+                document.getElementById("myDiv").innerHTML=xmlhttp.responseText;

														
 
															+                }

														
 
															+          }

														
 
															+        xmlhttp.open("GET","action/test",true);

														
 
															+        xmlhttp.send();

														
 
															+    }

														
 
															+    </script>

														
 
															+    

														
 
															+    <div id="myDiv"><h2>需要刷新的局部内容</h2></div>

														
 
															+    <button type="button" onclick="loadXMLDoc()">通过 AJAX 实现局部刷新</button>
														
--- a/app/goahead-5.1.0/src/web/static/js/app.js
+++ b/app/goahead-5.1.0/src/web/static/js/app.js
--- a/app/goahead-5.1.0/src/web/static/js/chunk-vendors.js
+++ b/app/goahead-5.1.0/src/web/static/js/chunk-vendors.js
--- a/local/rc
+++ b/local/rc
@@ -9,4 +9,4 @@ ifconfig lo 127.0.0.1
 
															 #run bmc function 
														
 
															 #./usr/bin/bmc.sh 
														
 
															-
														
 
															+/usr/bin/goahead -v --home /etc/goahead /var/www/goahead &