diff --git a/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml b/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
index 4ed696e..c4de14f 100644
--- a/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
+++ b/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
@@ -6,10 +6,14 @@
-
+
+
+
+
-
-
+
+
+
@@ -24,16 +28,79 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -44,88 +111,23 @@
-
-
+
+
-
-
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -166,18 +168,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -245,195 +248,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -643,7 +462,7 @@
-
+
1500458878821
@@ -764,11 +583,18 @@
1503454197179
-
+
+ 1503455663070
+
+
+
+ 1503455663070
+
+
-
+
@@ -788,11 +614,11 @@
-
+
-
+
@@ -1045,32 +871,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1089,40 +889,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1131,52 +897,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1195,23 +915,129 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/src/go.hoteas.com/hotime/application.go b/trunk/src/go.hoteas.com/hotime/application.go
index 219d960..008f1c1 100644
--- a/trunk/src/go.hoteas.com/hotime/application.go
+++ b/trunk/src/go.hoteas.com/hotime/application.go
@@ -14,7 +14,7 @@ import (
type Application struct {
Router
- Error
+ contextBase
Port string //端口号
connectListener []func(this *Context) bool //所有的访问监听,true按原计划继续使用，false表示有监听器处理
connectDbFunc func(err ...*Error) *sql.DB
diff --git a/trunk/src/go.hoteas.com/hotime/cache_db.go b/trunk/src/go.hoteas.com/hotime/cache_db.go
index f0ba7bb..04dcc36 100644
--- a/trunk/src/go.hoteas.com/hotime/cache_db.go
+++ b/trunk/src/go.hoteas.com/hotime/cache_db.go
@@ -8,7 +8,7 @@ import (
type CacheDb struct {
Time int64
Db *HoTimeDB
- baseContext
+ contextBase
isInit bool
}
diff --git a/trunk/src/go.hoteas.com/hotime/cache_memory.go b/trunk/src/go.hoteas.com/hotime/cache_memory.go
index 014830b..f7195e6 100644
--- a/trunk/src/go.hoteas.com/hotime/cache_memory.go
+++ b/trunk/src/go.hoteas.com/hotime/cache_memory.go
@@ -7,7 +7,7 @@ import (
type CacheMemory struct {
Time int64
Map
- baseContext
+ contextBase
}
//获取Cache键只能为string类型
diff --git a/trunk/src/go.hoteas.com/hotime/context.go b/trunk/src/go.hoteas.com/hotime/context.go
index c518111..eb0a1d8 100644
--- a/trunk/src/go.hoteas.com/hotime/context.go
+++ b/trunk/src/go.hoteas.com/hotime/context.go
@@ -7,7 +7,7 @@ import (
)
type Context struct {
- baseContext
+ contextBase
Resp http.ResponseWriter
Req *http.Request
Application *Application
diff --git a/trunk/src/go.hoteas.com/hotime/base_context.go b/trunk/src/go.hoteas.com/hotime/context_base.go
similarity index 70%
rename from trunk/src/go.hoteas.com/hotime/base_context.go
rename to trunk/src/go.hoteas.com/hotime/context_base.go
index 23ccc8f..5dee7ca 100644
--- a/trunk/src/go.hoteas.com/hotime/base_context.go
+++ b/trunk/src/go.hoteas.com/hotime/context_base.go
@@ -2,13 +2,13 @@ package hotime
import "time"
-type baseContext struct {
+type contextBase struct {
Error
tag int64
}
//唯一标志
-func (this *baseContext) GetTag() int64 {
+func (this *contextBase) GetTag() int64 {
if this.tag == int64(0) {
this.tag = time.Now().UnixNano()
diff --git a/trunk/src/go.hoteas.com/hotime/db.go b/trunk/src/go.hoteas.com/hotime/db.go
index 80f65cc..ad2db16 100644
--- a/trunk/src/go.hoteas.com/hotime/db.go
+++ b/trunk/src/go.hoteas.com/hotime/db.go
@@ -11,7 +11,7 @@ import (
type HoTimeDB struct {
*sql.DB
- baseContext
+ contextBase
Cached bool
LastQuery string
diff --git a/trunk/src/go.hoteas.com/hotime/obj.go b/trunk/src/go.hoteas.com/hotime/obj.go
index f9efea8..60f5c1d 100644
--- a/trunk/src/go.hoteas.com/hotime/obj.go
+++ b/trunk/src/go.hoteas.com/hotime/obj.go
@@ -3,7 +3,7 @@ package hotime
//对象封装方便取用
type Obj struct {
Data interface{}
- baseContext
+ contextBase
}
func (this *Obj) Put(data interface{}) {
diff --git a/trunk/src/go.hoteas.com/hotime/session.go b/trunk/src/go.hoteas.com/hotime/session.go
index ab6170e..57ae874 100644
--- a/trunk/src/go.hoteas.com/hotime/session.go
+++ b/trunk/src/go.hoteas.com/hotime/session.go
@@ -6,7 +6,7 @@ type SessionIns struct {
LongCache CacheIns
SessionId string
Map
- baseContext
+ contextBase
}
func (this *SessionIns) set() {