opt some

base/aaa/sess.go

@@ -15,7 +15,7 @@ func _sess_check(m *ice.Message, sessid string) bool {
 	}
 
 	m.Richs(SESS, nil, sessid, func(value ice.Map) {
-		if value = kit.GetMeta(value); m.Warn(kit.Time(kit.Format(value[mdb.TIME])) < kit.Time(m.Time()), ice.ErrExpire) {
+		if value = kit.GetMeta(value); m.Warn(kit.Time(kit.Format(value[mdb.TIME])) < kit.Time(m.Time()), ice.ErrNotValid) {
 			return // 会话超时
 		}
 		if m.Richs(USER, nil, value[USERNAME], func(value ice.Map) {

base/cli/runtime.go

@@ -25,16 +25,6 @@ func _runtime_init(m *ice.Message) {
 	m.Conf(RUNTIME, kit.Keys(HOST, GOOS), runtime.GOOS)
 	m.Conf(RUNTIME, kit.Keys(HOST, PID), os.Getpid())
 	m.Conf(RUNTIME, kit.Keys(HOST, HOME), kit.Env(HOME))
-	osid := ""
-	m.Cmd(nfs.CAT, "/etc/os-release", func(text string) {
-		if ls := kit.Split(text, "="); len(ls) > 1 {
-			switch ls[0] {
-			case "ID", "ID_LIKE":
-				osid = strings.TrimSpace(ls[1] + ice.SP + osid)
-			}
-		}
-	})
-	m.Conf(RUNTIME, kit.Keys(HOST, OSID), osid)
 
 	// 启动信息 boot
 	if name, e := os.Hostname(); e == nil {
@@ -61,6 +51,17 @@ func _runtime_init(m *ice.Message) {
 	for _, k := range []string{CTX_SHY, CTX_DEV, CTX_OPS, CTX_ARG, CTX_PID, CTX_USER, CTX_SHARE, CTX_RIVER} {
 		m.Conf(RUNTIME, kit.Keys(CONF, k), kit.Env(k))
 	}
+
+	osid := ""
+	m.Cmd(nfs.CAT, "/etc/os-release", func(text string) {
+		if ls := kit.Split(text, "="); len(ls) > 1 {
+			switch ls[0] {
+			case "ID", "ID_LIKE":
+				osid = strings.TrimSpace(ls[1] + ice.SP + osid)
+			}
+		}
+	})
+	m.Conf(RUNTIME, kit.Keys(HOST, OSID), osid)
 }
 func _runtime_hostinfo(m *ice.Message) {
 	m.Push("nCPU", strings.Count(m.Cmdx(nfs.CAT, "/proc/cpuinfo"), "processor"))

base/mdb/mdb.go

@@ -24,10 +24,15 @@ const (
 	JSON = "json"
 )
 const (
-	DICT = "dict"
-	META = "meta"
+	DICT = kit.MDB_DICT
+	META = kit.MDB_META
+	UNIQ = kit.MDB_UNIQ
+
+	FOREACH = kit.MDB_FOREACH
+	RANDOMS = kit.MDB_RANDOMS
 )
 const (
+	// 数据
 	ID   = kit.MDB_ID
 	KEY  = kit.MDB_KEY
 	TIME = kit.MDB_TIME
@@ -36,6 +41,7 @@ const (
 	NAME = kit.MDB_NAME
 	TEXT = kit.MDB_TEXT
 
+	// 文件
 	LINK = kit.MDB_LINK
 	SCAN = kit.MDB_SCAN
 	SHOW = kit.MDB_SHOW
@@ -43,6 +49,7 @@ const (
 	DATA = kit.MDB_DATA
 	FILE = kit.MDB_FILE
 
+	// 存储
 	SHORT = kit.MDB_SHORT
 	FIELD = kit.MDB_FIELD
 	TOTAL = kit.MDB_TOTAL
@@ -52,6 +59,7 @@ const (
 	STORE = kit.MDB_STORE
 	FSIZE = kit.MDB_FSIZE
 
+	// 索引
 	INDEX  = kit.MDB_INDEX
 	VALUE  = kit.MDB_VALUE
 	EXTRA  = kit.MDB_EXTRA
@@ -59,11 +67,6 @@ const (
 	EXPIRE = kit.MDB_EXPIRE
 	STATUS = kit.MDB_STATUS
 	STREAM = kit.MDB_STREAM
-
-	FOREACH = "*"
-	RANDOMS = "%"
-
-	UNIQ = kit.MDB_UNIQ
 )
 const (
 	DETAIL = "detail"

conf.go

@@ -295,12 +295,12 @@ const ( // LOG
 	LOG_IMPORT = "import"
 )
 const ( // Err
-	ErrWarn   = "warn: "
-	ErrExpire = "expire: "
+	ErrWarn = "warn: "
 
 	ErrNotLogin     = "not login: "
 	ErrNotRight     = "not right: "
 	ErrNotFound     = "not found: "
+	ErrNotValid     = "not valid: "
 	ErrNotStart     = "not start: "
 	ErrNotImplement = "not implement: "
 )

core/chat/action.go

@@ -54,7 +54,7 @@ func _action_exec(m *ice.Message, river, storm, index string, arg ...string) {
 func _action_share(m *ice.Message, arg ...string) {
 	switch msg := m.Cmd(web.SHARE, arg[0]); msg.Append(mdb.TYPE) {
 	case web.STORM:
-		if m.Warn(kit.Time() > kit.Time(msg.Append(mdb.TIME)), ice.ErrExpire, arg) {
+		if m.Warn(kit.Time() > kit.Time(msg.Append(mdb.TIME)), ice.ErrNotValid, arg) {
 			break // 分享超时
 		}
 		if len(arg) == 1 {
@@ -77,7 +77,7 @@ func _action_share(m *ice.Message, arg ...string) {
 		_action_exec(m, msg.Append(web.RIVER), msg.Append(web.STORM), arg[1], arg[2:]...)
 
 	case web.FIELD:
-		if m.Warn(kit.Time() > kit.Time(msg.Append(mdb.TIME)), ice.ErrExpire, arg) {
+		if m.Warn(kit.Time() > kit.Time(msg.Append(mdb.TIME)), ice.ErrNotValid, arg) {
 			break // 分享超时
 		}
 		if arg[0] = msg.Append(mdb.NAME); len(arg) == 1 {

core/code/inner.go

@@ -61,7 +61,7 @@ func _inner_make(m *ice.Message, msg *ice.Message) {
 func LoadPlug(m *ice.Message, language ...string) {
 	for _, language := range language {
 		m.Conf(nfs.CAT, kit.Keym(nfs.SOURCE, kit.Ext(language)), ice.TRUE)
-		m.Confm(language, kit.Keym(PLUG, PREPARE), func(key string, value ice.Any) {
+		m.Confm(language, kit.Keym(PLUG, PREPARE), func(key string, value interface{}) {
 			for _, v := range kit.Simple(value) {
 				m.Conf(language, kit.Keym(PLUG, KEYWORD, v), key)
 			}

exec.go

@@ -89,7 +89,7 @@ func (m *Message) Call(sync bool, cb func(*Message) *Message) *Message {
 
 	p := kit.Select("10s", m.Option("timeout"))
 	t := time.AfterFunc(kit.Duration(p), func() {
-		m.Warn(true, ErrExpire, m.Detailv())
+		m.Warn(true, ErrNotValid, m.Detailv())
 		m.Back(nil)
 		wait <- false
 	})

misc/java/maven.go

@@ -9,9 +9,9 @@ type maven struct {
 }
 
 func (s maven) Order(m *ice.Message) {
-	s.Code.Order(m, s.PathOther(m, s.Link(m, "")), ice.BIN)
+	s.Code.Order(m, "", ice.BIN)
 }
 func (s maven) List(m *ice.Message, arg ...string) {
-	s.Code.Source(m, s.PathOther(m, s.Link(m, "")), arg...)
+	s.Code.Source(m, "", arg...)
 }
 func init() { ice.CodeCtxCmd(maven{}) }

misc/java/server.go

@@ -22,10 +22,10 @@ type server struct {
 }
 
 func (s server) Order(m *ice.Message) {
-	s.Code.Order(m, s.PathOther(m, s.Link(m, "")), ice.BIN)
+	s.Code.Order(m, "", ice.BIN)
 }
 func (s server) List(m *ice.Message, arg ...string) {
-	s.Code.Source(m, s.PathOther(m, s.Link(m, "")), arg...)
+	s.Code.Source(m, "", arg...)
 }
 func (s server) RunScript(m *ice.Message) {
 	if s.Code.System(m, nfs.PWD, JAVAC, "-d", ice.BIN, m.Option(nfs.PATH)); cli.IsSuccess(m.Message) {

misc/java/spring.go

@@ -25,7 +25,7 @@ type spring struct {
 }
 
 func (s spring) Order(m *ice.Message) {
-	s.Code.Order(m, s.PathOther(m, s.Link(m, "")), ice.BIN)
+	s.Code.Order(m, "", ice.BIN)
 }
 func (s spring) Create(m *ice.Message, arg ...string) {
 	s.Hash.Create(m, arg...)