diff --git a/src/contexts/aaa/aaa.go b/src/contexts/aaa/aaa.go index 8ed2a642..d36cd69d 100644 --- a/src/contexts/aaa/aaa.go +++ b/src/contexts/aaa/aaa.go @@ -130,11 +130,7 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", "secrete": map[string]interface{}{"password": true, "token": true, "uuid": true, "ppid": true}, }, Help: "散列"}, - "secrete_key": &ctx.Config{Name: "secrete_key", Value: map[string]interface{}{"password": 1, "uuid": 1}, Help: "私钥文件"}, - "expire": &ctx.Config{Name: "expire(s)", Value: "72000", Help: "会话超时"}, - "cert": &ctx.Config{Name: "cert", Value: "etc/pem/cert.pem", Help: "证书文件"}, - "pub": &ctx.Config{Name: "pub", Value: "etc/pem/pub.pem", Help: "公钥文件"}, - "key": &ctx.Config{Name: "key", Value: "etc/pem/key.pem", Help: "私钥文件"}, + "expire": &ctx.Config{Name: "expire(s)", Value: "72000", Help: "会话超时"}, }, Commands: map[string]*ctx.Command{ "init": &ctx.Command{Name: "init", Help: "数字摘要", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { diff --git a/src/examples/chat/chat.go b/src/examples/chat/chat.go index 1d6d672b..605b936c 100644 --- a/src/examples/chat/chat.go +++ b/src/examples/chat/chat.go @@ -36,6 +36,37 @@ func Marshal(m *ctx.Message, meta string) string { var Index = &ctx.Context{Name: "chat", Help: "会议中心", Caches: map[string]*ctx.Cache{}, Configs: map[string]*ctx.Config{ + "login": &ctx.Config{Name: "login", Value: map[string]interface{}{"check": "false"}, Help: "默认组件"}, + "componet": &ctx.Config{Name: "componet", Value: map[string]interface{}{ + "index": []interface{}{ + map[string]interface{}{"componet_name": "chat", "componet_tmpl": "head", "metas": []interface{}{ + map[string]interface{}{"name": "viewport", "content": "width=device-width, initial-scale=0.7, user-scalable=no"}, + }, "favicon": "favicon.ico", "styles": []interface{}{"example.css", "chat.css"}}, + map[string]interface{}{"componet_name": "header", "componet_tmpl": "fieldset", + "componet_view": "Header", "componet_init": "initHeader", + "title": "shylinux 天行健,君子以自强不息", + }, + + map[string]interface{}{"componet_name": "ocean", "componet_tmpl": "fieldset", + "componet_view": "Ocean", "componet_init": "initOcean", + "componet_ctx": "web.chat", "componet_cmd": "flow", "arguments": []interface{}{"ocean"}, + }, + map[string]interface{}{"componet_name": "river", "componet_tmpl": "fieldset", + "componet_view": "River", "componet_init": "initRiver", + "componet_ctx": "web.chat", "componet_cmd": "flow", "arguments": []interface{}{"river"}, + }, + + map[string]interface{}{"componet_name": "footer", "componet_tmpl": "fieldset", + "componet_view": "Footer", "componet_init": "initFooter", + "title": "shycontext 地势坤,君子以厚德载物", + }, + map[string]interface{}{"componet_name": "tail", "componet_tmpl": "tail", + "scripts": []interface{}{"toolkit.js", "context.js", "example.js", "chat.js"}, + }, + }, + }, Help: "组件列表"}, + "componet_group": &ctx.Config{Name: "component_group", Value: "index", Help: "默认组件"}, + "chat_msg": &ctx.Config{Name: "chat_msg", Value: []interface{}{}, Help: "聊天记录"}, "default": &ctx.Config{Name: "default", Value: "", Help: "聊天记录"}, "weather_site": &ctx.Config{Name: "weather_site", Value: "http://weather.sina.com.cn", Help: "聊天记录"}, @@ -60,6 +91,17 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", }, Help: "聊天记录"}, }, Commands: map[string]*ctx.Command{ + "flow": &ctx.Command{Name: "flow", Help: "信息流", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { + switch arg[0] { + case "ocean": + m.Confm("") + m.Echo("ocean") + case "river": + m.Echo("river") + } + return + }}, + "/chat": &ctx.Command{Name: "user", Help: "应用示例", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { // 信息验证 nonce := []string{m.Option("timestamp"), m.Option("nonce"), m.Conf("chat", "token")} @@ -224,12 +266,6 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", return }}, - "talk": &ctx.Command{Name: "talk", Help: "talk", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { - if m.Confs("default") { - m.Echo(m.Conf("default")) - } - return - }}, "weather": &ctx.Command{Name: "weather where field", Help: "weather", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { where := "beijing" if len(arg) > 0 { diff --git a/usr/librarys/context.js b/usr/librarys/context.js index ed7c6e6d..f4fd34e8 100644 --- a/usr/librarys/context.js +++ b/usr/librarys/context.js @@ -7,7 +7,7 @@ ctx = context = { } this.GET("", option, function(msg) { msg = msg && msg[0] - msg && (msg.__proto__ = page || {}) + // msg && (msg.__proto__ = (page || {})) typeof cb == "function" && cb(msg || {}) }) }, diff --git a/usr/librarys/example.js b/usr/librarys/example.js index fc30347c..eec5123a 100644 --- a/usr/librarys/example.js +++ b/usr/librarys/example.js @@ -12,6 +12,10 @@ exp = example = { initHeader: function(page, field, option, output) { return [{"text": ["shycontext", "div", "title"]}] }, + initField: function(page, field, option, output) { + ctx.Runs(page, option) + return + }, initBanner: function(page, field, option, output) { field.querySelectorAll("li").forEach(function(item) { item.onclick = function(event) { diff --git a/usr/librarys/wiki.css b/usr/librarys/wiki.css index 2d037bfc..b86a24a2 100644 --- a/usr/librarys/wiki.css +++ b/usr/librarys/wiki.css @@ -33,3 +33,9 @@ fieldset.Text>div.output>div.text { overflow:auto; padding:10px; } +fieldset.Text>div.output>div.text strong { + background-color:yellow; + border-left:solid 2px green; + border-top:solid 2px green; + color:red; +} diff --git a/usr/librarys/wiki.js b/usr/librarys/wiki.js index affc3633..a3112251 100644 --- a/usr/librarys/wiki.js +++ b/usr/librarys/wiki.js @@ -130,9 +130,11 @@ var page = Page({ ui.text.style.height = height+"px" ui.text.style.width = field.offsetWidth-30-width+"px" - // ui.text.style.width = field.offsetWidth-ui.menu.offsetWidth+"px" } + if (location.hash) { + location.href = location.hash + } }) return }, diff --git a/usr/template/chat/chat.tmpl b/usr/template/chat/chat.tmpl index 189dbe6e..e69de29b 100644 --- a/usr/template/chat/chat.tmpl +++ b/usr/template/chat/chat.tmpl @@ -1,218 +0,0 @@ -{{define "head"}} - -
- - -