opt web.get

Change-Id: I7c97cf9e748c767953ffb051c3ae65853977ed11

src/contexts/cli/cli.go

@@ -141,6 +141,10 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 		}, Help: "启动脚本"},
 	},
 	Commands: map[string]*ctx.Command{
+		"ps": &ctx.Command{Name: "ps", Help: "ps", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) {
+			m.Cmdy("cli.system", "ps", "-ef", "cmd_parse", "cli")
+			return
+		}},
 		"runtime": &ctx.Command{Name: "runtime", Help: "runtime", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) {
 			mem := &runtime.MemStats{}
 			runtime.ReadMemStats(mem)
@@ -177,6 +181,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 			"cmd_temp":    -1,
 			"cmd_parse":   1,
 			"cmd_error":   0,
+			"app_log":     1,
 		}, Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) {
 			pid := ""
 			if len(arg) > 0 && m.Confs("daemon", arg[0]) {
@@ -215,7 +220,9 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 				if cmd, ok := m.Confm("daemon", pid)["sub"].(*exec.Cmd); ok {
 					switch arg[0] {
 					case "stop":
-						cmd.Process.Kill()
+						kit.Log("error", "kill: %s", cmd.Process.Pid)
+						m.Log("kill", "kill: %d", cmd.Process.Pid)
+						m.Echo("%s", cmd.Process.Signal(os.Interrupt))
 					default:
 						m.Echo("%v", cmd)
 					}
@@ -303,7 +310,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 				// 守护列表
 				h, _ := kit.Hash("uniq")
 				m.Conf("daemon", h, map[string]interface{}{
-					"create_time": m.Time(), "log": m.Option("cmd_log"), "sub": cmd,
+					"create_time": m.Time(), "log": kit.Select(m.Option("cmd_log"), m.Option("app_log")), "sub": cmd,
 				})
 				m.Echo(h)
 
@@ -366,6 +373,21 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 						}
 					}
 					m.Table()
+
+				case "cli":
+					read := csv.NewReader(out)
+					read.Comma = ' '
+					read.TrimLeadingSpace = true
+					read.FieldsPerRecord = 3
+					data, e := read.ReadAll()
+					m.Assert(e)
+					for i := 1; i < len(data); i++ {
+						for j := 0; j < len(data[i]); j++ {
+							m.Add("append", data[0][j], data[i][j])
+						}
+					}
+					m.Table()
+
 				default:
 					m.Echo(out.String())
 				}

src/contexts/mdb/mdb.go

@@ -567,10 +567,15 @@ var Index = &ctx.Context{Name: "mdb", Help: "数据中心",
 						hv, hn = "prev", m.Conf("note", []string{hm, "ship", "note", "data"})
 					}
 
+					fuck := 0
 					for i := 0; hn != "" && i < limit+offset; hn, i = m.Conf("note", []string{hn, "ship", hv, "data"}), i+1 {
 						m.Log("fuck", "what %d %d %d %s", offset, limit, i, hn)
 						// m.Log("fuck", "what hn: %v %v", hn, kit.Formats(m.Confv("note", hn)))
 						// 翻页
+						if fuck++; fuck > 1000 {
+							break
+						}
+
 						if i < offset {
 							continue
 						}

src/contexts/web/web.go

@@ -470,6 +470,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 		"get": &ctx.Command{Name: "get [which] name [method GET|POST] url arg...", Help: "访问服务, method: 请求方法, url: 请求地址, arg: 请求参数",
 			Form: map[string]int{"which": 1, "method": 1, "headers": 2, "content_type": 1, "file": 2, "body": 1, "parse": 1, "temp": -1, "save": 1, "temp_expire": 1},
 			Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) {
+				// 查看配置
 				if len(arg) == 0 {
 					m.Cmdy("web.spide")
 					return
@@ -479,8 +480,10 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 					return
 				}
 
-				uri_arg := ""
+				web, ok := m.Target().Server.(*WEB)
-				if web, ok := m.Target().Server.(*WEB); m.Assert(ok) {
+				m.Assert(ok)
+
+				// 查找配置
 				which, client := m.Option("which"), m.Confm("spide", []string{m.Option("which"), "client"})
 				if c := m.Confm("spide", []string{arg[0], "client"}); c != nil {
 					which, client, arg = arg[0], c, arg[1:]
@@ -489,12 +492,13 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				method := kit.Select(kit.Format(client["method"]), m.Option("method"))
 				uri := Merge(m, client, arg[0], arg[1:]...)
 
+				uri_arg := ""
 				body, ok := m.Optionv("body").(io.Reader)
 				if method == "POST" && !ok {
 					uuu, e := url.Parse(uri)
 					m.Assert(e)
 
-						if m.Has("file") {
+					if m.Has("file") { // POST file
 						writer := multipart.NewWriter(&bytes.Buffer{})
 						defer writer.Close()
 
@@ -515,7 +519,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 						m.Option("content_type", writer.FormDataContentType())
 					} else if index := strings.Index(uri, "?"); index > 0 {
 						switch m.Option("content_type") {
-							case "application/json":
+						case "application/json": // POST json
 							var data interface{}
 							for k, v := range uuu.Query() {
 								if len(v) == 1 {
@@ -530,7 +534,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 							m.Log("info", "json %v", string(b))
 							body = bytes.NewReader(b)
 
-							default:
+						default: // POST form
 							m.Log("info", "body %v", string(uri[index+1:]))
 							body = strings.NewReader(uri[index+1:])
 							m.Option("content_type", "application/x-www-form-urlencoded")
@@ -540,6 +544,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 					}
 				}
 
+				// 查找缓存
 				if m.Options("temp_expire") {
 					if h := m.Cmdx("mdb.temp", "check", "url", uri+uri_arg); h != "" {
 						m.Cmdy("mdb.temp", h, "data", "data", m.Meta["temp"])
@@ -547,6 +552,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 					}
 				}
 
+				// 构造请求
 				req, e := http.NewRequest(method, uri, body)
 				m.Assert(e)
 				m.Log("info", "%s %s", req.Method, req.URL)
@@ -574,6 +580,11 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 
 				})
 
+				if web.Client == nil {
+					web.Client = &http.Client{Timeout: kit.Duration(kit.Format(client["timeout"]))}
+				}
+
+				// 请求日志
 				if kit.Right(client["logheaders"]) {
 					for k, v := range req.Header {
 						m.Log("info", "%s: %s", k, v)
@@ -581,37 +592,37 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 					m.Log("info", "")
 				}
 
-					if web.Client == nil {
+				// 发送请求
-						web.Client = &http.Client{Timeout: kit.Duration(kit.Format(client["timeout"]))}
-					}
-
 				res, e := web.Client.Do(req)
 				if e != nil {
 					m.Log("warn", "%v", e)
 					return e
 				}
 
+				// 响应日志
 				var result interface{}
 				ct := res.Header.Get("Content-Type")
 				parse := kit.Select(kit.Format(client["parse"]), m.Option("parse"))
 				m.Log("info", "status %s parse: %s content: %s", res.Status, parse, ct)
-
 				if kit.Right(client["logheaders"]) {
 					for k, v := range res.Header {
 						m.Log("info", "%s: %v", k, v)
 					}
 				}
 
+				// 响应失败
+				if res.StatusCode != http.StatusOK {
+					m.Echo("%d: %s", res.StatusCode, res.Status)
+					return nil
+				}
+
 				// 响应cookie
 				for _, v := range res.Cookies() {
 					m.Magic("user", []string{"cookie", which, v.Name}, v.Value)
 					m.Log("info", "get-cookie %s: %v", v.Name, v.Value)
 				}
 
-					if res.StatusCode != http.StatusOK {
+				// 解析响应
-						return nil
-					}
-
 				switch {
 				case parse == "json" || strings.HasPrefix(ct, "application/json") || strings.HasPrefix(ct, "application/javascript"):
 					if json.NewDecoder(res.Body).Decode(&result); !m.Has("temp") {
@@ -682,7 +693,6 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 						m.Echo(string(buf))
 					}
 				}
-				}
 				return
 			}},
 		"post": &ctx.Command{Name: "post args...", Help: "post请求", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) {