update

vzex · Feb 16, 2016 · dbb2bab · dbb2bab
1 parent 5b92531
commit dbb2bab
Show file tree

Hide file tree

Showing 23 changed files with 1,078 additions and 17 deletions.
diff --git a/server/httpserver.go b/server/httpserver.go
@@ -1,23 +1,23 @@
 package server
 import "net/http"
-import "net"
+import "html/template"
 import "log"
-import "strconv"
 
-func InitAdminPort(port int) error {
-        mux := http.NewServeMux()
-        f := func(w http.ResponseWriter, r *http.Request) {
-        }
-        mux.HandleFunc("/admin", f)
-        addr := "0.0.0.0:" + strconv.Itoa(port)
-        server := &http.Server{Addr: addr, Handler: mux}
-        listener, err := net.Listen("tcp", addr)
-        if err != nil {
-                return err 
-        }   
-        log.Println("begin serve admin port:", addr)
-        go server.Serve(listener)
-        return nil 
+func InitAdminPort(addr, websock string) error {
+        http.Handle("/css/", http.FileServer(http.Dir("website")))
+        http.Handle("/fonts/", http.FileServer(http.Dir("website")))
+        http.Handle("/js/", http.FileServer(http.Dir("website")))
+        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+                t, er := template.ParseFiles("website/index.html")
+                if er == nil {
+                        t.Execute(w, websock)
+                } else {
+                        log.Println("err:", er.Error())
+                }
+        })
+        log.Println("begin serve http:", addr)
+        er := http.ListenAndServe(addr, nil)
+        return er
 }
 
 
diff --git a/server/init.go b/server/init.go
@@ -1,11 +1,17 @@
 package server
 
 import "flag"
+import "log"
 
 var service = flag.String("service", "", "for remote client connect")
 var webservice = flag.String("web", ":8080", "http server port")
-var websocket = flag.String("websocket", ":8081", "http web-socket port")
+var websocket = flag.String("websocket", "10.240.160.17:8081", "http web-socket port")
 func Init() {
 	flag.Parse()
+        er:=InitAdminPort(*webservice, *websocket)
+        if er !=nil {
+                log.Println("web server fail", er.Error())
+                return
+        }
 	Listen(*service)
 }
diff --git a/website/css/sui.min.css b/website/css/sui.min.css
diff --git a/website/fonts/icon-moon.eot b/website/fonts/icon-moon.eot
diff --git a/website/fonts/icon-moon.svg b/website/fonts/icon-moon.svg
diff --git a/website/fonts/icon-moon.ttf b/website/fonts/icon-moon.ttf
diff --git a/website/fonts/icon-moon.woff b/website/fonts/icon-moon.woff
diff --git a/website/fonts/icon-pc.eot b/website/fonts/icon-pc.eot
diff --git a/website/fonts/icon-pc.svg b/website/fonts/icon-pc.svg
diff --git a/website/fonts/icon-pc.ttf b/website/fonts/icon-pc.ttf
diff --git a/website/fonts/icon-pc.woff b/website/fonts/icon-pc.woff
diff --git a/website/fonts/icon-tb.eot b/website/fonts/icon-tb.eot
diff --git a/website/fonts/icon-tb.svg b/website/fonts/icon-tb.svg
diff --git a/website/fonts/icon-tb.ttf b/website/fonts/icon-tb.ttf
diff --git a/website/fonts/icon-tb.woff b/website/fonts/icon-tb.woff
diff --git a/website/fonts/icon-touch.eot b/website/fonts/icon-touch.eot
diff --git a/website/fonts/icon-touch.svg b/website/fonts/icon-touch.svg
diff --git a/website/fonts/icon-touch.ttf b/website/fonts/icon-touch.ttf
diff --git a/website/fonts/icon-touch.woff b/website/fonts/icon-touch.woff
diff --git a/website/index.html b/website/index.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+        <head>
+                <meta charset="utf-8">
+                <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                <meta name="description" content="">
+                <title>gds</title>
+                <link href="css/sui.min.css" rel="stylesheet">
+                <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+                <script type="text/javascript" src="js/sui.min.js"></script>
+        </head>
+        <body>
+                <div class="sui-layout">
+                        <div class="sidebar">
+                                <ul class="sui-nav nav-tabs nav-large tab-vertical">
+                                        <li><a>语文</a></li>
+                                        <li class="active"><a href="#index" data-toggle="tab">数学</a></li>
+                                        <li><a href="#profile" data-toggle="tab">英语</a></li>
+                                </ul>
+                        </div>
+                        <div class="content">
+                                <div class="tab-content tab-wraped">
+                                        <div id="index" class="tab-pane active">
+                                                <p>qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
+                                        </div>
+                                        <div id="profile" class="tab-pane">
+                                                <p>Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park</p>
+                                        </div>
+                                        <div id="about" class="tab-pane">
+                                                <p>Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
+                                        </div>
+                                        <div id="help" class="tab-pane">
+                                                <p>help!!!help!!!help!!!help!!!help!!!help!!!help!!!help!!!help!!!help!!!help!!!</p>
+                                        </div>
+                                </div>
+                        </div>
+                </div>
+                <script>
+                        function Decode(content) {
+                                var vars = content.split(":");
+                                var head, msg;
+                                if (vars.length > 0) {
+                                        head = vars[0];
+                                }
+                                if (vars.length > 1) {
+                                        msg = "";
+                                        for(var i=1;i<vars.length;i++) {
+                                                if(i==1) {
+                                                        msg=vars[i];
+                                                }
+                                                else {
+                                                        msg=msg+":"+vars[i];
+                                                }
+                                        }
+                                }
+                                return [head, msg];
+                        }
+
+                        function OnRecv(data) {
+                                var arr= Decode(data)
+                                var head = arr[0];
+                                var msg= arr[1];
+                                switch(head){
+                                        case "needinit":
+                                }
+                        }
+                        if (window["WebSocket"]) {
+                                conn = new WebSocket("ws://{{.}}/ws");
+                                conn.onclose = function() {
+                                }
+                                conn.onerror = function(ev) {
+                                        $.alert("connect error");
+                                }
+                                conn.onmessage = function(evt) {
+                                        OnRecv(evt.data);
+                                }   
+                                } else {
+                                $.alert("<div><b>Your browser does not support WebSockets.</b></div>");
+                        }  
+                </script>
+        </body>
+</html>
diff --git a/website/js/jquery-1.10.2.min.js b/website/js/jquery-1.10.2.min.js
diff --git a/website/js/sui-extends.min.js b/website/js/sui-extends.min.js
diff --git a/website/js/sui.min.js b/website/js/sui.min.js